diff options
Diffstat (limited to 'auth-pam.c')
| -rw-r--r-- | auth-pam.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/auth-pam.c b/auth-pam.c index 348fe370acd77..7d8b2926b571f 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -66,6 +66,11 @@ #include <pam/pam_appl.h> #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 */ @@ -947,18 +951,6 @@ do_pam_account(void) } 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) { sshpam_err = pam_set_item(sshpam_handle, PAM_CONV, |