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

Diff for /src/usr.bin/ssh/auth.c between version 1.115 and 1.116

version 1.115, 2016/06/15 00:40:40 version 1.116, 2016/08/13 17:47:41
Line 226 
Line 226 
         else          else
                 authmsg = authenticated ? "Accepted" : "Failed";                  authmsg = authenticated ? "Accepted" : "Failed";
   
         authlog("%s %s%s%s for %s%.100s from %.200s port %d %s%s%s",          authlog("%s %s%s%s for %s%.100s from %.200s port %d ssh2%s%s",
             authmsg,              authmsg,
             method,              method,
             submethod != NULL ? "/" : "", submethod == NULL ? "" : submethod,              submethod != NULL ? "/" : "", submethod == NULL ? "" : submethod,
Line 234 
Line 234 
             authctxt->user,              authctxt->user,
             ssh_remote_ipaddr(ssh),              ssh_remote_ipaddr(ssh),
             ssh_remote_port(ssh),              ssh_remote_port(ssh),
             compat20 ? "ssh2" : "ssh1",  
             authctxt->info != NULL ? ": " : "",              authctxt->info != NULL ? ": " : "",
             authctxt->info != NULL ? authctxt->info : "");              authctxt->info != NULL ? authctxt->info : "");
         free(authctxt->info);          free(authctxt->info);
Line 247 
Line 246 
         struct ssh *ssh = active_state; /* XXX */          struct ssh *ssh = active_state; /* XXX */
   
         error("maximum authentication attempts exceeded for "          error("maximum authentication attempts exceeded for "
             "%s%.100s from %.200s port %d %s",              "%s%.100s from %.200s port %d ssh2",
             authctxt->valid ? "" : "invalid user ",              authctxt->valid ? "" : "invalid user ",
             authctxt->user,              authctxt->user,
             ssh_remote_ipaddr(ssh),              ssh_remote_ipaddr(ssh),
             ssh_remote_port(ssh),              ssh_remote_port(ssh));
             compat20 ? "ssh2" : "ssh1");  
         packet_disconnect("Too many authentication failures");          packet_disconnect("Too many authentication failures");
         /* NOTREACHED */          /* NOTREACHED */
 }  }
Legend:
Removed from v.1.115  
changed lines
  Added in v.1.116