summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-05-16 11:38:46 +1000
committerDamien Miller <djm@mindrot.org>2003-05-16 11:38:46 +1000
commit99b4b88aba7131f04439ac6baaaae4dde02aa965 (patch)
tree0be4e9ed730650f483fd95a725aabeefb4e2b170
parentf9b3feb847011c56b3e2a26e67b388e9f746ca62 (diff)
- markus@cvs.openbsd.org 2003/05/15 14:09:21
[auth2-krb5.c] fix 64bit issue; report itojun@
-rw-r--r--ChangeLog5
-rw-r--r--auth2-krb5.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index be3c48c86..1e031aa46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
7 - jakob@cvs.openbsd.org 2003/05/15 14:02:47 7 - jakob@cvs.openbsd.org 2003/05/15 14:02:47
8 [readconf.c servconf.c] 8 [readconf.c servconf.c]
9 warn for unsupported config option. ok markus@ 9 warn for unsupported config option. ok markus@
10 - markus@cvs.openbsd.org 2003/05/15 14:09:21
11 [auth2-krb5.c]
12 fix 64bit issue; report itojun@
10 13
1120030515 1420030515
12 - (djm) OpenBSD CVS Sync 15 - (djm) OpenBSD CVS Sync
@@ -1538,4 +1541,4 @@
1538 save auth method before monitor_reset_key_state(); bugzilla bug #284; 1541 save auth method before monitor_reset_key_state(); bugzilla bug #284;
1539 ok provos@ 1542 ok provos@
1540 1543
1541$Id: ChangeLog,v 1.2725 2003/05/16 01:38:32 djm Exp $ 1544$Id: ChangeLog,v 1.2726 2003/05/16 01:38:46 djm Exp $
diff --git a/auth2-krb5.c b/auth2-krb5.c
index b4ff16b62..8a18a6092 100644
--- a/auth2-krb5.c
+++ b/auth2-krb5.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2-krb5.c,v 1.1 2003/05/14 02:15:47 markus Exp $"); 26RCSID("$OpenBSD: auth2-krb5.c,v 1.2 2003/05/15 14:09:21 markus Exp $");
27 27
28#ifdef KRB5 28#ifdef KRB5
29 29
@@ -44,10 +44,12 @@ static int
44userauth_kerberos(Authctxt *authctxt) 44userauth_kerberos(Authctxt *authctxt)
45{ 45{
46 krb5_data tkt, reply; 46 krb5_data tkt, reply;
47 u_int dlen;
47 char *client = NULL; 48 char *client = NULL;
48 int authenticated = 0; 49 int authenticated = 0;
49 50
50 tkt.data = packet_get_string(&tkt.length); 51 tkt.data = packet_get_string(&dlen);
52 tkt.length = dlen;
51 packet_check_eom(); 53 packet_check_eom();
52 54
53 if (PRIVSEP(auth_krb5(authctxt, &tkt, &client, &reply))) { 55 if (PRIVSEP(auth_krb5(authctxt, &tkt, &client, &reply))) {