summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:43:12 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:43:12 +1100
commit1fc2343e3523f4e018d9fdf3ed9959b3c2983b9f (patch)
tree42d0cc1d2a7434469f53cdebe9cc84255b7bf34a
parent4fbf08a8f0cf54a2e75cd003a32cf3c04c5642e6 (diff)
- (djm) Make auth2-pam.c compile again after dispatch.h and packet.h
changes
-rw-r--r--ChangeLog4
-rw-r--r--auth2-pam.c8
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0ebcb35c0..5267ec30b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -226,6 +226,8 @@
226 - stevesk@cvs.openbsd.org 2002/01/22 02:52:41 226 - stevesk@cvs.openbsd.org 2002/01/22 02:52:41
227 [servconf.c] 227 [servconf.c]
228 typo in error message; from djast@cs.toronto.edu 228 typo in error message; from djast@cs.toronto.edu
229 - (djm) Make auth2-pam.c compile again after dispatch.h and packet.h
230 changes
229 231
23020020121 23220020121
231 - (djm) Rework ssh-rand-helper: 233 - (djm) Rework ssh-rand-helper:
@@ -7373,4 +7375,4 @@
7373 - Wrote replacements for strlcpy and mkdtemp 7375 - Wrote replacements for strlcpy and mkdtemp
7374 - Released 1.0pre1 7376 - Released 1.0pre1
7375 7377
7376$Id: ChangeLog,v 1.1786 2002/01/22 12:35:09 djm Exp $ 7378$Id: ChangeLog,v 1.1787 2002/01/22 12:43:12 djm Exp $
diff --git a/auth2-pam.c b/auth2-pam.c
index cb32ae6e4..dd29ebd48 100644
--- a/auth2-pam.c
+++ b/auth2-pam.c
@@ -1,5 +1,5 @@
1#include "includes.h" 1#include "includes.h"
2RCSID("$Id: auth2-pam.c,v 1.11 2001/06/27 05:36:44 djm Exp $"); 2RCSID("$Id: auth2-pam.c,v 1.12 2002/01/22 12:43:13 djm Exp $");
3 3
4#ifdef USE_PAM 4#ifdef USE_PAM
5#include <security/pam_appl.h> 5#include <security/pam_appl.h>
@@ -16,7 +16,7 @@ RCSID("$Id: auth2-pam.c,v 1.11 2001/06/27 05:36:44 djm Exp $");
16static int do_pam_conversation_kbd_int(int num_msg, 16static int do_pam_conversation_kbd_int(int num_msg,
17 const struct pam_message **msg, struct pam_response **resp, 17 const struct pam_message **msg, struct pam_response **resp,
18 void *appdata_ptr); 18 void *appdata_ptr);
19void input_userauth_info_response_pam(int type, int plen, void *ctxt); 19void input_userauth_info_response_pam(int type, u_int32_t seqnr, void *ctxt);
20 20
21struct { 21struct {
22 int finished, num_received, num_expected; 22 int finished, num_received, num_expected;
@@ -128,7 +128,7 @@ do_pam_conversation_kbd_int(int num_msg, const struct pam_message **msg,
128} 128}
129 129
130void 130void
131input_userauth_info_response_pam(int type, int plen, void *ctxt) 131input_userauth_info_response_pam(int type, u_int32_t seqnr, void *ctxt)
132{ 132{
133 Authctxt *authctxt = ctxt; 133 Authctxt *authctxt = ctxt;
134 unsigned int nresp = 0, rlen = 0, i = 0; 134 unsigned int nresp = 0, rlen = 0, i = 0;
@@ -152,7 +152,7 @@ input_userauth_info_response_pam(int type, int plen, void *ctxt)
152 152
153 context_pam2.finished = 1; 153 context_pam2.finished = 1;
154 154
155 packet_done(); 155 packet_check_eom();
156} 156}
157 157
158#endif 158#endif