From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Jun 2024 06:41:29 +0000 (+1000)
Subject: sshd: don't use argv[0] as PAM service name
X-Git-Tag: V_9_8_P1~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8fbe2f7d0d96d299ee8e69769e3b51067978748;p=thirdparty%2Fopenssh-portable.git

sshd: don't use argv[0] as PAM service name

sshd would implicitly use argv[0] as the PAM service name to
allow people to select different PAM service names by making
differently-named copies/links to the sshd binary.

Splitting sshd into sshd/sshd-session broke this, as the process
that starts PAM is always sshd-session and the user has no control
over this.

Hardcode "sshd" as the default PAM service name unless/until we
figure out a better way. Should unbreak OSX integration tests.
---

diff --git a/auth-pam.c b/auth-pam.c
index ed5b165bd..d64802371 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -68,8 +68,7 @@
 #endif
 
 #if !defined(SSHD_PAM_SERVICE)
-extern char *__progname;
-# define SSHD_PAM_SERVICE		__progname
+# define SSHD_PAM_SERVICE		"sshd"
 #endif
 
 /* OpenGroup RFC86.0 and XSSO specify no "const" on arguments */