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

Diff for /src/usr.bin/ssh/auth2.c between version 1.122 and 1.123

version 1.122, 2010/08/31 09:58:37 version 1.123, 2011/03/10 02:52:57
Line 254 
Line 254 
 #endif  #endif
   
         authctxt->postponed = 0;          authctxt->postponed = 0;
           authctxt->server_caused_failure = 0;
   
         /* try to authenticate user */          /* try to authenticate user */
         m = authmethod_lookup(method);          m = authmethod_lookup(method);
Line 299 
Line 300 
                 authctxt->success = 1;                  authctxt->success = 1;
         } else {          } else {
                 /* Allow initial try of "none" auth without failure penalty */                  /* Allow initial try of "none" auth without failure penalty */
                 if (authctxt->attempt > 1 || strcmp(method, "none") != 0)                  if (!authctxt->server_caused_failure &&
                       (authctxt->attempt > 1 || strcmp(method, "none") != 0))
                         authctxt->failures++;                          authctxt->failures++;
                 if (authctxt->failures >= options.max_authtries)                  if (authctxt->failures >= options.max_authtries)
                         packet_disconnect(AUTH_FAIL_MSG, authctxt->user);                          packet_disconnect(AUTH_FAIL_MSG, authctxt->user);
Legend:
Removed from v.1.122  
changed lines
  Added in v.1.123