diff options
author | Damien Miller <djm@mindrot.org> | 2002-05-08 12:24:42 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2002-05-08 12:24:42 +1000 |
commit | a33501bb5f8a7057dc56fd49a8a40c57468d86d4 (patch) | |
tree | 1155836d804b883af933f51bf70efc93acbf193b | |
parent | 52910ddc664ec7ae8148cff1b796d9b27ac6924f (diff) |
- (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola
<pekkas@netcore.fi>
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | monitor.c | 12 |
2 files changed, 12 insertions, 4 deletions
@@ -1,5 +1,7 @@ | |||
1 | 20020506 | 1 | 20020506 |
2 | - (djm) Unbreak auth-passwd.c for PAM and SIA | 2 | - (djm) Unbreak auth-passwd.c for PAM and SIA |
3 | - (djm) Unbreak PAM auth for protocol 1. Report from Pekka Savola | ||
4 | <pekkas@netcore.fi> | ||
3 | 5 | ||
4 | 20020506 | 6 | 20020506 |
5 | - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue | 7 | - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue |
@@ -531,4 +533,4 @@ | |||
531 | - (stevesk) entropy.c: typo in debug message | 533 | - (stevesk) entropy.c: typo in debug message |
532 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 534 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
533 | 535 | ||
534 | $Id: ChangeLog,v 1.2093 2002/05/08 02:18:26 djm Exp $ | 536 | $Id: ChangeLog,v 1.2094 2002/05/08 02:24:42 djm Exp $ |
@@ -182,6 +182,9 @@ struct mon_table mon_dispatch_proto15[] = { | |||
182 | {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed}, | 182 | {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed}, |
183 | {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge}, | 183 | {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge}, |
184 | {MONITOR_REQ_RSARESPONSE, MON_ONCE|MON_AUTHDECIDE, mm_answer_rsa_response}, | 184 | {MONITOR_REQ_RSARESPONSE, MON_ONCE|MON_AUTHDECIDE, mm_answer_rsa_response}, |
185 | #ifdef USE_PAM | ||
186 | {MONITOR_REQ_PAM_START, MON_ONCE, mm_answer_pam_start}, | ||
187 | #endif | ||
185 | #ifdef BSD_AUTH | 188 | #ifdef BSD_AUTH |
186 | {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, | 189 | {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, |
187 | {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond}, | 190 | {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond}, |
@@ -190,6 +193,9 @@ struct mon_table mon_dispatch_proto15[] = { | |||
190 | {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, | 193 | {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, |
191 | {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, | 194 | {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, |
192 | #endif | 195 | #endif |
196 | #ifdef USE_PAM | ||
197 | {MONITOR_REQ_PAM_START, MON_ONCE, mm_answer_pam_start}, | ||
198 | #endif | ||
193 | {0, 0, NULL} | 199 | {0, 0, NULL} |
194 | }; | 200 | }; |
195 | 201 | ||
@@ -464,9 +470,6 @@ mm_answer_sign(int socket, Buffer *m) | |||
464 | /* Turn on permissions for getpwnam */ | 470 | /* Turn on permissions for getpwnam */ |
465 | monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); | 471 | monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); |
466 | 472 | ||
467 | #ifdef USE_PAM | ||
468 | monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); | ||
469 | #endif | ||
470 | return (0); | 473 | return (0); |
471 | } | 474 | } |
472 | 475 | ||
@@ -525,6 +528,9 @@ mm_answer_pwnamallow(int socket, Buffer *m) | |||
525 | /* Allow service/style information on the auth context */ | 528 | /* Allow service/style information on the auth context */ |
526 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); | 529 | monitor_permit(mon_dispatch, MONITOR_REQ_AUTHSERV, 1); |
527 | 530 | ||
531 | #ifdef USE_PAM | ||
532 | monitor_permit(mon_dispatch, MONITOR_REQ_PAM_START, 1); | ||
533 | #endif | ||
528 | 534 | ||
529 | return (0); | 535 | return (0); |
530 | } | 536 | } |