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

Diff for /src/usr.bin/ssh/monitor_wrap.c between version 1.84 and 1.85

version 1.84, 2015/02/16 22:13:32 version 1.85, 2015/05/01 03:23:51
Line 357 
Line 357 
 }  }
   
 int  int
 mm_user_key_allowed(struct passwd *pw, Key *key)  mm_user_key_allowed(struct passwd *pw, Key *key, int pubkey_auth_attempt)
 {  {
         return (mm_key_allowed(MM_USERKEY, NULL, NULL, key));          return (mm_key_allowed(MM_USERKEY, NULL, NULL, key,
               pubkey_auth_attempt));
 }  }
   
 int  int
 mm_hostbased_key_allowed(struct passwd *pw, char *user, char *host,  mm_hostbased_key_allowed(struct passwd *pw, char *user, char *host,
     Key *key)      Key *key)
 {  {
         return (mm_key_allowed(MM_HOSTKEY, user, host, key));          return (mm_key_allowed(MM_HOSTKEY, user, host, key, 0));
 }  }
   
 int  int
Line 376 
Line 377 
         int ret;          int ret;
   
         key->type = KEY_RSA; /* XXX hack for key_to_blob */          key->type = KEY_RSA; /* XXX hack for key_to_blob */
         ret = mm_key_allowed(MM_RSAHOSTKEY, user, host, key);          ret = mm_key_allowed(MM_RSAHOSTKEY, user, host, key, 0);
         key->type = KEY_RSA1;          key->type = KEY_RSA1;
         return (ret);          return (ret);
 }  }
   
 int  int
 mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key)  mm_key_allowed(enum mm_keytype type, char *user, char *host, Key *key,
       int pubkey_auth_attempt)
 {  {
         Buffer m;          Buffer m;
         u_char *blob;          u_char *blob;
Line 400 
Line 402 
         buffer_put_cstring(&m, user ? user : "");          buffer_put_cstring(&m, user ? user : "");
         buffer_put_cstring(&m, host ? host : "");          buffer_put_cstring(&m, host ? host : "");
         buffer_put_string(&m, blob, len);          buffer_put_string(&m, blob, len);
           buffer_put_int(&m, pubkey_auth_attempt);
         free(blob);          free(blob);
   
         mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m);          mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_KEYALLOWED, &m);
Legend:
Removed from v.1.84  
changed lines
  Added in v.1.85