[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.2 and 1.2.8.2

version 1.2, 2002/05/31 11:35:15 version 1.2.8.2, 2004/03/04 18:18:15
Line 42 
Line 42 
 /* import */  /* import */
 extern ServerOptions options;  extern ServerOptions options;
 extern u_char *session_id2;  extern u_char *session_id2;
 extern int session_id2_len;  extern u_int session_id2_len;
   
 static int  static int
 userauth_hostbased(Authctxt *authctxt)  userauth_hostbased(Authctxt *authctxt)
Line 77 
Line 77 
         pktype = key_type_from_name(pkalg);          pktype = key_type_from_name(pkalg);
         if (pktype == KEY_UNSPEC) {          if (pktype == KEY_UNSPEC) {
                 /* this is perfectly legal */                  /* this is perfectly legal */
                 log("userauth_hostbased: unsupported "                  logit("userauth_hostbased: unsupported "
                     "public key algorithm: %s", pkalg);                      "public key algorithm: %s", pkalg);
                 goto done;                  goto done;
         }          }
Line 114 
Line 114 
                         buffer_len(&b))) == 1)                          buffer_len(&b))) == 1)
                 authenticated = 1;                  authenticated = 1;
   
         buffer_clear(&b);          buffer_free(&b);
 done:  done:
         debug2("userauth_hostbased: authenticated %d", authenticated);          debug2("userauth_hostbased: authenticated %d", authenticated);
         if (key != NULL)          if (key != NULL)
Line 136 
Line 136 
         HostStatus host_status;          HostStatus host_status;
         int len;          int len;
   
         resolvedname = get_canonical_hostname(options.verify_reverse_mapping);          resolvedname = get_canonical_hostname(options.use_dns);
         ipaddr = get_remote_ipaddr();          ipaddr = get_remote_ipaddr();
   
         debug2("userauth_hostbased: chost %s resolvedname %s ipaddr %s",          debug2("userauth_hostbased: chost %s resolvedname %s ipaddr %s",
Line 152 
Line 152 
                         chost[len - 1] = '\0';                          chost[len - 1] = '\0';
                 }                  }
                 if (strcasecmp(resolvedname, chost) != 0)                  if (strcasecmp(resolvedname, chost) != 0)
                         log("userauth_hostbased mismatch: "                          logit("userauth_hostbased mismatch: "
                             "client sends %s, but we resolve %s to %s",                              "client sends %s, but we resolve %s to %s",
                             chost, ipaddr, resolvedname);                              chost, ipaddr, resolvedname);
                 if (auth_rhosts2(pw, cuser, resolvedname, ipaddr) == 0)                  if (auth_rhosts2(pw, cuser, resolvedname, ipaddr) == 0)

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.2.8.2