- markus@cvs.openbsd.org 2001/05/17 21:34:15

[openssh.git] / auth-krb4.c

diff --git a/auth-krb4.c b/auth-krb4.c
index 799cf261a70eba780d14fb06c6e678a6cc5f1e9a..8bb6e3d6f363ea13b34869631d630f3c71de03eb 100644 (file)
--- a/auth-krb4.c
+++ b/auth-krb4.c
@@ -23,12 +23,19 @@
  */
 
 #include "includes.h"
+RCSID("$OpenBSD: auth-krb4.c,v 1.23 2001/01/22 08:15:00 markus Exp $");
+
+#include "ssh.h"
+#include "ssh1.h"
 #include "packet.h"
 #include "xmalloc.h"
-#include "ssh.h"
+#include "log.h"
 #include "servconf.h"
+#include "auth.h"
 
-RCSID("$OpenBSD: auth-krb4.c,v 1.18 2000/09/07 20:27:49 deraadt Exp $");
+#ifdef AFS
+#include "radix.h"
+#endif
 
 #ifdef KRB4
 char *ticket = NULL;
@@ -46,7 +53,7 @@ auth_krb4_password(struct passwd * pw, const char *password)
        AUTH_DAT adata;
        KTEXT_ST tkt;
        struct hostent *hp;
-       unsigned long faddr;
+       u_long faddr;
        char localhost[MAXHOSTNAMELEN];
        char phost[INST_SZ];
        char realm[REALM_SZ];
@@ -280,6 +287,8 @@ auth_kerberos_tgt(struct passwd *pw, const char *string)
 {
        CREDENTIALS creds;
 
+       if (pw == NULL)
+               goto auth_kerberos_tgt_failure;
        if (!radix_to_creds(string, &creds)) {
                log("Protocol error decoding Kerberos V4 tgt");
                packet_send_debug("Protocol error decoding Kerberos V4 tgt");
@@ -334,8 +343,16 @@ int
 auth_afs_token(struct passwd *pw, const char *token_string)
 {
        CREDENTIALS creds;
-       uid_t uid = pw->pw_uid;
+       uid_t uid;
 
+       if (pw == NULL) {
+               /* XXX fake protocol error */
+               packet_send_debug("Protocol error decoding AFS token");
+               packet_start(SSH_SMSG_FAILURE);
+               packet_send();
+               packet_write_wait();
+               return 0;
+       }
        if (!radix_to_creds(token_string, &creds)) {
                log("Protocol error decoding AFS token");
                packet_send_debug("Protocol error decoding AFS token");
@@ -349,6 +366,8 @@ auth_afs_token(struct passwd *pw, const char *token_string)
 
        if (strncmp(creds.pname, "AFS ID ", 7) == 0)
                uid = atoi(creds.pname + 7);
+       else
+               uid = pw->pw_uid;
 
        if (kafs_settoken(creds.realm, uid, &creds)) {
                log("AFS token (%s@%s) rejected for %s", creds.pname, creds.realm,