===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/server-fn.c	2009/09/02 16:38:35	1.17
--- src/usr.bin/tmux/server-fn.c	2009/09/05 17:42:16	1.18
***************
*** 1,4 ****
! /* $OpenBSD: server-fn.c,v 1.17 2009/09/02 16:38:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-fn.c,v 1.18 2009/09/05 17:42:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 233,240 ****
  	return (0);
  
  wrong:
- 	password_backoff = server_activity;
  	password_failures++;
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
--- 233,240 ----
  	return (0);
  
  wrong:
  	password_failures++;
+ 	password_backoff = 0;
  
  	for (i = 0; i < ARRAY_LENGTH(&clients); i++) {
  		c = ARRAY_ITEM(&clients, i);
***************
*** 260,266 ****
  	}
  	failures = password_failures % tries;
  	if (failures > backoff) {
! 		password_backoff += ((failures - backoff) * tries / 2);
  		return (-2);
  	}
  	return (-1);
--- 260,267 ----
  	}
  	failures = password_failures % tries;
  	if (failures > backoff) {
! 		password_backoff = 
! 		    server_activity + ((failures - backoff) * tries / 2);
  		return (-2);
  	}
  	return (-1);