diff options
| author | des <des@FreeBSD.org> | 2003-02-03 14:10:28 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-02-03 14:10:28 +0000 |
| commit | b9730314a0fc938a5117fb56e9d0a274cf6c6c8b (patch) | |
| tree | e65e9e5cf075352a0df9d1dbf0c535547afb26eb /crypto | |
| parent | 8da928f615212a82a3ac9f2c0a699e3e121c5ebd (diff) | |
| download | FreeBSD-src-b9730314a0fc938a5117fb56e9d0a274cf6c6c8b.zip FreeBSD-src-b9730314a0fc938a5117fb56e9d0a274cf6c6c8b.tar.gz | |
Linux-PAM's pam_start(3) fails with a bogus error message if passed the
pam_conv argument is NULL. OpenPAM doesn't care, but to make things
easier for people porting this code to other systems (or -STABLE), use
a dummy struct pam_conv instead of NULL.
Pointed out by: Damien Miller <djm@mindrot.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openssh/auth2-pam-freebsd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/openssh/auth2-pam-freebsd.c b/crypto/openssh/auth2-pam-freebsd.c index 4094965..87033f3 100644 --- a/crypto/openssh/auth2-pam-freebsd.c +++ b/crypto/openssh/auth2-pam-freebsd.c @@ -242,6 +242,7 @@ pam_cleanup(void *arg) static int pam_init(const char *user) { + struct pam_conv no_conv = { NULL, NULL }; extern ServerOptions options; extern u_int utmp_len; const char *pam_rhost, *pam_user; @@ -257,7 +258,7 @@ pam_init(const char *user) pam_handle = NULL; } debug("PAM: initializing for \"%s\"", user); - pam_err = pam_start("sshd", user, NULL, &pam_handle); + pam_err = pam_start("sshd", user, &no_conv, &pam_handle); if (pam_err != PAM_SUCCESS) return (-1); pam_rhost = get_remote_name_or_ip(utmp_len, |
