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

Diff for /src/usr.bin/ssh/auth2-gss.c between version 1.25 and 1.26

version 1.25, 2017/05/30 14:29:59 version 1.26, 2017/06/24 06:34:38
Line 223 
Line 223 
 {  {
         Authctxt *authctxt = ssh->authctxt;          Authctxt *authctxt = ssh->authctxt;
         int authenticated;          int authenticated;
           const char *displayname;
   
         if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))          if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
                 fatal("No authentication or GSSAPI context");                  fatal("No authentication or GSSAPI context");
Line 236 
Line 237 
   
         authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));          authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user));
   
           if ((!use_privsep || mm_is_monitor()) &&
               (displayname = ssh_gssapi_displayname()) != NULL)
                   auth2_record_info(authctxt, "%s", displayname);
   
         authctxt->postponed = 0;          authctxt->postponed = 0;
         ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);          ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
         ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, NULL);          ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_ERRTOK, NULL);
Line 254 
Line 259 
         Buffer b;          Buffer b;
         gss_buffer_desc mic, gssbuf;          gss_buffer_desc mic, gssbuf;
         u_int len;          u_int len;
           const char *displayname;
   
         if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))          if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
                 fatal("No authentication or GSSAPI context");                  fatal("No authentication or GSSAPI context");
Line 276 
Line 282 
   
         buffer_free(&b);          buffer_free(&b);
         free(mic.value);          free(mic.value);
   
           if ((!use_privsep || mm_is_monitor()) &&
               (displayname = ssh_gssapi_displayname()) != NULL)
                   auth2_record_info(authctxt, "%s", displayname);
   
         authctxt->postponed = 0;          authctxt->postponed = 0;
         ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);          ssh_dispatch_set(ssh, SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL);
Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26