From 8bd81e1596ab1bab355146cb65e82fb96ade3b23 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Tue, 16 Aug 2016 13:30:56 +1000 Subject: add --with-pam-service to specify PAM service name Saves messing around with CFLAGS to do it. --- auth-pam.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'auth-pam.c') diff --git a/auth-pam.c b/auth-pam.c index 348fe370a..7a14c89f4 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -66,6 +66,11 @@ #include #endif +#if !defined(SSHD_PAM_SERVICE) +extern char *__progname; +# define SSHD_PAM_SERVICE __progname +#endif + /* OpenGroup RFC86.0 and XSSO specify no "const" on arguments */ #ifdef PAM_SUN_CODEBASE # define sshpam_const /* Solaris, HP-UX, SunOS */ @@ -615,7 +620,6 @@ sshpam_cleanup(void) static int sshpam_init(Authctxt *authctxt) { - extern char *__progname; const char *pam_rhost, *pam_user, *user = authctxt->user; const char **ptr_pam_user = &pam_user; struct ssh *ssh = active_state; /* XXX */ -- cgit v1.2.3 From e0259a82ddd950cfb109ddee86fcebbc09c6bd04 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 15 Oct 2016 04:34:46 +1100 Subject: Remove do_pam_set_tty which is dead code. The callers of do_pam_set_tty were removed in 2008, so this is now dead code. bz#2604, pointed out by jjelen at redhat.com. --- auth-pam.c | 12 ------------ auth-pam.h | 1 - 2 files changed, 13 deletions(-) (limited to 'auth-pam.c') diff --git a/auth-pam.c b/auth-pam.c index 7a14c89f4..7d8b2926b 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -950,18 +950,6 @@ do_pam_account(void) return (sshpam_account_status); } -void -do_pam_set_tty(const char *tty) -{ - if (tty != NULL) { - debug("PAM: setting PAM_TTY to \"%s\"", tty); - sshpam_err = pam_set_item(sshpam_handle, PAM_TTY, tty); - if (sshpam_err != PAM_SUCCESS) - fatal("PAM: failed to set PAM_TTY: %s", - pam_strerror(sshpam_handle, sshpam_err)); - } -} - void do_pam_setcred(int init) { diff --git a/auth-pam.h b/auth-pam.h index f9a3fbf43..c47b442e4 100644 --- a/auth-pam.h +++ b/auth-pam.h @@ -29,7 +29,6 @@ void start_pam(Authctxt *); void finish_pam(void); u_int do_pam_account(void); void do_pam_session(void); -void do_pam_set_tty(const char *); void do_pam_setcred(int ); void do_pam_chauthtok(void); int do_pam_putenv(char *, char *); -- cgit v1.2.3