From 2adf4e49c231c423489d94f395dc0c69d8e57e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= Date: Mon, 3 Feb 2003 14:10:28 +0000 Subject: [PATCH] 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 --- crypto/openssh/auth2-pam-freebsd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crypto/openssh/auth2-pam-freebsd.c b/crypto/openssh/auth2-pam-freebsd.c index 4094965b979..87033f30366 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,