[BACK]Return to auth2.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/auth2.c between version 1.95.2.2 and 1.96

version 1.95.2.2, 2003/09/16 21:20:24 version 1.96, 2003/02/06 21:22:43
Line 36 
Line 36 
 #include "pathnames.h"  #include "pathnames.h"
 #include "monitor_wrap.h"  #include "monitor_wrap.h"
   
 #ifdef GSSAPI  
 #include "ssh-gss.h"  
 #endif  
   
 /* import */  /* import */
 extern ServerOptions options;  extern ServerOptions options;
 extern u_char *session_id2;  extern u_char *session_id2;
 extern u_int session_id2_len;  extern int session_id2_len;
   
 Authctxt *x_authctxt = NULL;  Authctxt *x_authctxt = NULL;
   
Line 54 
Line 50 
 extern Authmethod method_passwd;  extern Authmethod method_passwd;
 extern Authmethod method_kbdint;  extern Authmethod method_kbdint;
 extern Authmethod method_hostbased;  extern Authmethod method_hostbased;
 #ifdef GSSAPI  
 extern Authmethod method_gssapi;  
 #endif  
   
 Authmethod *authmethods[] = {  Authmethod *authmethods[] = {
         &method_none,          &method_none,
         &method_pubkey,          &method_pubkey,
 #ifdef GSSAPI  
         &method_gssapi,  
 #endif  
         &method_passwd,          &method_passwd,
         &method_kbdint,          &method_kbdint,
         &method_hostbased,          &method_hostbased,
Line 163 
Line 153 
                         authctxt->valid = 1;                          authctxt->valid = 1;
                         debug2("input_userauth_request: setting up authctxt for %s", user);                          debug2("input_userauth_request: setting up authctxt for %s", user);
                 } else {                  } else {
                         logit("input_userauth_request: illegal user %s", user);                          log("input_userauth_request: illegal user %s", user);
                         authctxt->pw = fakepw();  
                 }                  }
                 setproctitle("%s%s", authctxt->pw ? user : "unknown",                  setproctitle("%s%s", authctxt->pw ? user : "unknown",
                     use_privsep ? " [net]" : "");                      use_privsep ? " [net]" : "");
Line 181 
Line 170 
         }          }
         /* reset state */          /* reset state */
         auth2_challenge_stop(authctxt);          auth2_challenge_stop(authctxt);
   
 #ifdef GSSAPI  
         dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);  
         dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL);  
 #endif  
   
         authctxt->postponed = 0;          authctxt->postponed = 0;
   
         /* try to authenticate user */          /* try to authenticate user */
Legend:
Removed from v.1.95.2.2  
changed lines
  Added in v.1.96