[BACK]Return to auth2-hostbased.c CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / src / crypto / external / bsd / openssh / dist

Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.

Diff for /src/crypto/external/bsd/openssh/dist/auth2-hostbased.c between version 1.4 and 1.4.2.1

version 1.4, 2011/07/25 03:03:10 version 1.4.2.1, 2014/05/22 13:21:34
Line 1 
Line 1 
 /*      $NetBSD$        */  /*      $NetBSD$        */
 /* $OpenBSD: auth2-hostbased.c,v 1.14 2010/08/04 05:42:47 djm Exp $ */  /* $OpenBSD: auth2-hostbased.c,v 1.16 2013/06/21 00:34:49 djm Exp $ */
 /*  /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.   * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *   *
Line 117  userauth_hostbased(Authctxt *authctxt)
Line 117  userauth_hostbased(Authctxt *authctxt)
 #ifdef DEBUG_PK  #ifdef DEBUG_PK
         buffer_dump(&b);          buffer_dump(&b);
 #endif  #endif
   
           pubkey_auth_info(authctxt, key,
               "client user \"%.100s\", client host \"%.100s\"", cuser, chost);
   
         /* test for allowed key and correct signature */          /* test for allowed key and correct signature */
         authenticated = 0;          authenticated = 0;
         if (PRIVSEP(hostbased_key_allowed(authctxt->pw, cuser, chost, key)) &&          if (PRIVSEP(hostbased_key_allowed(authctxt->pw, cuser, chost, key)) &&
Line 129  done:
Line 133  done:
         debug2("userauth_hostbased: authenticated %d", authenticated);          debug2("userauth_hostbased: authenticated %d", authenticated);
         if (key != NULL)          if (key != NULL)
                 key_free(key);                  key_free(key);
         xfree(pkalg);          free(pkalg);
         xfree(pkblob);          free(pkblob);
         xfree(cuser);          free(cuser);
         xfree(chost);          free(chost);
         xfree(sig);          free(sig);
         return authenticated;          return authenticated;
 }  }
   
Line 208  hostbased_key_allowed(struct passwd *pw,
Line 212  hostbased_key_allowed(struct passwd *pw,
                         verbose("Accepted %s public key %s from %s@%s",                          verbose("Accepted %s public key %s from %s@%s",
                             key_type(key), fp, cuser, lookup);                              key_type(key), fp, cuser, lookup);
                 }                  }
                 xfree(fp);                  free(fp);
         }          }
   
         return (host_status == HOST_OK);          return (host_status == HOST_OK);
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.4.2.1
CVSweb <webmaster@jp.NetBSD.org>