- (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.

   ok djm@

diff --git a/ChangeLog b/ChangeLog
index 21d9be05b1d870846ef1ab8ee03fe117c9df93aa..92529c6633e8d659c7c186ac0a45219a87b839ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20040603
+ - (dtucker) [auth-pam.c] Don't use pam_* namespace for sshd's PAM functions.
+   ok djm@
+
 20040601
  - (djm) [auth-pam.c] Add copyright for local changes
 

diff --git a/auth-pam.c b/auth-pam.c
index 284873b5041021211bea94f745d737a2ffff4537..76801ea180cef84c3ec086ff29e3331b9a95ef4a 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -782,7 +782,7 @@ do_pam_setcred(int init)
 }
 
 static int
-pam_tty_conv(int n, const struct pam_message **msg,
+sshpam_tty_conv(int n, const struct pam_message **msg,
     struct pam_response **resp, void *data)
 {
        char input[PAM_MAX_MSG_SIZE];
@@ -835,7 +835,7 @@ pam_tty_conv(int n, const struct pam_message **msg,
        return (PAM_CONV_ERR);
 }
 
-static struct pam_conv tty_conv = { pam_tty_conv, NULL };
+static struct pam_conv tty_conv = { sshpam_tty_conv, NULL };
 
 /*
  * XXX this should be done in the authentication phase, but ssh1 doesn't
@@ -859,7 +859,7 @@ do_pam_chauthtok(void)
 }
 
 static int
-pam_store_conv(int n, const struct pam_message **msg,
+sshpam_store_conv(int n, const struct pam_message **msg,
     struct pam_response **resp, void *data)
 {
        struct pam_response *reply;
@@ -901,7 +901,7 @@ pam_store_conv(int n, const struct pam_message **msg,
        return (PAM_CONV_ERR);
 }
 
-static struct pam_conv store_conv = { pam_store_conv, NULL };
+static struct pam_conv store_conv = { sshpam_store_conv, NULL };
 
 void
 do_pam_session(void)