- (stevesk) [monitor.c] PAM should work again; will *not* work with

   UsePrivilegeSeparation=yes.

diff --git a/ChangeLog b/ChangeLog
index 9dfa0d43fafef35c033a8a1eb42be7d55ee669cc..d704cb0dab03e794a5f4ffba16e1d29052257f87 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020401
+ - (stevesk) [monitor.c] PAM should work again; will *not* work with
+   UsePrivilegeSeparation=yes.
+
 20020331
  - (tim) [configure.ac] use /bin/test -L to work around broken builtin on
    Solaris 8

diff --git a/monitor.c b/monitor.c
index 008010795fa17b5fa15c8cee785fe1c4a5683f80..7b4e53eb55103f01664161516c7f5f1e66f1d892 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -143,7 +143,9 @@ struct mon_table mon_dispatch_proto20[] = {
     {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign},
     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
     {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv},
+#if !defined(USE_PAM)
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
+#endif
 #ifdef BSD_AUTH
     {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery},
     {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond},
@@ -170,7 +172,9 @@ struct mon_table mon_dispatch_proto15[] = {
     {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow},
     {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey},
     {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid},
+#if !defined(USE_PAM)
     {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword},
+#endif
     {MONITOR_REQ_RSAKEYALLOWED, MON_ISAUTH, mm_answer_rsa_keyallowed},
     {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed},
     {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge},
@@ -533,6 +537,7 @@ mm_answer_authserv(int socket, Buffer *m)
        return (0);
 }
 
+#if !defined(USE_PAM)
 int
 mm_answer_authpassword(int socket, Buffer *m)
 {
@@ -561,6 +566,7 @@ mm_answer_authpassword(int socket, Buffer *m)
        /* Causes monitor loop to terminate if authenticated */
        return (authenticated);
 }
+#endif
 
 #ifdef BSD_AUTH
 int