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

Diff for /src/usr.bin/ssh/auth2-hostbased.c between version 1.35 and 1.36

version 1.35, 2018/07/09 21:35:50 version 1.36, 2018/07/31 03:10:27
Line 66 
Line 66 
         size_t alen, blen, slen;          size_t alen, blen, slen;
         int r, pktype, authenticated = 0;          int r, pktype, authenticated = 0;
   
         if (!authctxt->valid) {  
                 debug2("%s: disabled because of invalid user", __func__);  
                 return 0;  
         }  
         /* XXX use sshkey_froms() */          /* XXX use sshkey_froms() */
         if ((r = sshpkt_get_cstring(ssh, &pkalg, &alen)) != 0 ||          if ((r = sshpkt_get_cstring(ssh, &pkalg, &alen)) != 0 ||
             (r = sshpkt_get_string(ssh, &pkblob, &blen)) != 0 ||              (r = sshpkt_get_string(ssh, &pkblob, &blen)) != 0 ||
Line 113 
Line 109 
         if (match_pattern_list(pkalg, options.hostbased_key_types, 0) != 1) {          if (match_pattern_list(pkalg, options.hostbased_key_types, 0) != 1) {
                 logit("%s: key type %s not in HostbasedAcceptedKeyTypes",                  logit("%s: key type %s not in HostbasedAcceptedKeyTypes",
                     __func__, sshkey_type(key));                      __func__, sshkey_type(key));
                   goto done;
           }
   
           if (!authctxt->valid || authctxt->user == NULL) {
                   debug2("%s: disabled because of invalid user", __func__);
                 goto done;                  goto done;
         }          }
   
Legend:
Removed from v.1.35  
changed lines
  Added in v.1.36