- (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola

   <pekkas@netcore.fi>

1 files changed, 9 insertions, 3 deletions

diff --git a/monitor.c b/monitor.c
index 01adabe38..a27cf0f3d 100644
--- a/monitor.c
+++ b/monitor.c
@@ -182,6 +182,9 @@ struct mon_table mon_dispatch_proto15[] = {
     {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed},
     {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge},
     {MONITOR_REQ_RSARESPONSE, MON_ONCE|MON_AUTHDECIDE, mm_answer_rsa_response},
+#ifdef USE_PAM
+    {MONITOR_REQ_PAM_START, MON_ONCE, mm_answer_pam_start},
+#endif
 #ifdef BSD_AUTH
     {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery},
     {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond},
@@ -190,6 +193,9 @@ struct mon_table mon_dispatch_proto15[] = {
     {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery},
     {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond},
 #endif
+#ifdef USE_PAM
+    {MONITOR_REQ_PAM_START, MON_ONCE, mm_answer_pam_start},
+#endif
     {0, 0, NULL}
 };
 
@@ -464,9 +470,6 @@ mm_answer_sign(int socket, Buffer *m)
         /* Turn on permissions for getpwnam */
         monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1);
 
-#ifdef USE_PAM
-        monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
-#endif
         return (0);
 }
 
@@ -525,6 +528,9 @@ mm_answer_pwnamallow(int socket, Buffer *m)
                 /* Allow service/style information on the auth context */
                 monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1);
 
+#ifdef USE_PAM
+        monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1);
+#endif
 
         return (0);
 }