diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | monitor.c | 6 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ | |||
1 | 20020401 | ||
2 | - (stevesk) [monitor.c] PAM should work again; will *not* work with | ||
3 | UsePrivilegeSeparation=yes. | ||
4 | |||
1 | 20020331 | 5 | 20020331 |
2 | - (tim) [configure.ac] use /bin/test -L to work around broken builtin on | 6 | - (tim) [configure.ac] use /bin/test -L to work around broken builtin on |
3 | Solaris 8 | 7 | Solaris 8 |
@@ -8098,4 +8102,4 @@ | |||
8098 | - Wrote replacements for strlcpy and mkdtemp | 8102 | - Wrote replacements for strlcpy and mkdtemp |
8099 | - Released 1.0pre1 | 8103 | - Released 1.0pre1 |
8100 | 8104 | ||
8101 | $Id: ChangeLog,v 1.2004 2002/03/31 20:49:38 tim Exp $ | 8105 | $Id: ChangeLog,v 1.2005 2002/04/01 18:04:35 stevesk Exp $ |
@@ -143,7 +143,9 @@ struct mon_table mon_dispatch_proto20[] = { | |||
143 | {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, | 143 | {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, |
144 | {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, | 144 | {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, |
145 | {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, | 145 | {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, |
146 | #if !defined(USE_PAM) | ||
146 | {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, | 147 | {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, |
148 | #endif | ||
147 | #ifdef BSD_AUTH | 149 | #ifdef BSD_AUTH |
148 | {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, | 150 | {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, |
149 | {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond}, | 151 | {MONITOR_REQ_BSDAUTHRESPOND, MON_AUTH,mm_answer_bsdauthrespond}, |
@@ -170,7 +172,9 @@ struct mon_table mon_dispatch_proto15[] = { | |||
170 | {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, | 172 | {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, |
171 | {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey}, | 173 | {MONITOR_REQ_SESSKEY, MON_ONCE, mm_answer_sesskey}, |
172 | {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid}, | 174 | {MONITOR_REQ_SESSID, MON_ONCE, mm_answer_sessid}, |
175 | #if !defined(USE_PAM) | ||
173 | {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, | 176 | {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, |
177 | #endif | ||
174 | {MONITOR_REQ_RSAKEYALLOWED, MON_ISAUTH, mm_answer_rsa_keyallowed}, | 178 | {MONITOR_REQ_RSAKEYALLOWED, MON_ISAUTH, mm_answer_rsa_keyallowed}, |
175 | {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed}, | 179 | {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed}, |
176 | {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge}, | 180 | {MONITOR_REQ_RSACHALLENGE, MON_ONCE, mm_answer_rsa_challenge}, |
@@ -533,6 +537,7 @@ mm_answer_authserv(int socket, Buffer *m) | |||
533 | return (0); | 537 | return (0); |
534 | } | 538 | } |
535 | 539 | ||
540 | #if !defined(USE_PAM) | ||
536 | int | 541 | int |
537 | mm_answer_authpassword(int socket, Buffer *m) | 542 | mm_answer_authpassword(int socket, Buffer *m) |
538 | { | 543 | { |
@@ -561,6 +566,7 @@ mm_answer_authpassword(int socket, Buffer *m) | |||
561 | /* Causes monitor loop to terminate if authenticated */ | 566 | /* Causes monitor loop to terminate if authenticated */ |
562 | return (authenticated); | 567 | return (authenticated); |
563 | } | 568 | } |
569 | #endif | ||
564 | 570 | ||
565 | #ifdef BSD_AUTH | 571 | #ifdef BSD_AUTH |
566 | int | 572 | int |