===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/login/login.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -c -r1.36 -r1.37
*** src/usr.bin/login/login.c	2001/05/29 21:39:26	1.36
--- src/usr.bin/login/login.c	2001/06/19 16:21:49	1.37
***************
*** 1,4 ****
! /*	$OpenBSD: login.c,v 1.36 2001/05/29 21:39:26 millert Exp $	*/
  /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: login.c,v 1.37 2001/06/19 16:21:49 millert Exp $	*/
  /*	$NetBSD: login.c,v 1.13 1996/05/15 23:50:16 jtc Exp $	*/
  
  /*-
***************
*** 77,83 ****
  #if 0
  static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
  #endif
! static char rcsid[] = "$OpenBSD: login.c,v 1.36 2001/05/29 21:39:26 millert Exp $";
  #endif /* not lint */
  
  /*
--- 77,83 ----
  #if 0
  static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
  #endif
! static char rcsid[] = "$OpenBSD: login.c,v 1.37 2001/06/19 16:21:49 millert Exp $";
  #endif /* not lint */
  
  /*
***************
*** 138,146 ****
  #define	TTYGRPNAME	"tty"		/* name of group to own ttys */
  
  /*
!  * This bounds the time given to login.  Not a define so it can
!  * be patched on machines where it's too small.
!  * XXX - should be a login.conf variable!
   */
  u_int		timeout = 300;
  
--- 138,144 ----
  #define	TTYGRPNAME	"tty"		/* name of group to own ttys */
  
  /*
!  * This bounds the time given to login; may be overridden by /etc/login.conf.
   */
  u_int		timeout = 300;
  
***************
*** 167,173 ****
  	quad_t expire, warning;
  	uid_t uid;
  	int ask, ch, cnt, fflag, pflag, quietlog, rootlogin, lastchance;
! 	int error, homeless, needto, authok;
  	char *domain, *p, *ttyn, *shell, *fullname, *instance;
  	char *lipaddr, *script, *ripaddr, *style, *type, *fqdn, *copyright;
  	char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
--- 165,171 ----
  	quad_t expire, warning;
  	uid_t uid;
  	int ask, ch, cnt, fflag, pflag, quietlog, rootlogin, lastchance;
! 	int error, homeless, needto, authok, tries, backoff;
  	char *domain, *p, *ttyn, *shell, *fullname, *instance;
  	char *lipaddr, *script, *ripaddr, *style, *type, *fqdn, *copyright;
  	char tbuf[MAXPATHLEN + 2], tname[sizeof(_PATH_TTY) + 10];
***************
*** 186,192 ****
  
  	openlog("login", LOG_ODELAY, LOG_AUTH);
  
! 	fqdn = lipaddr = ripaddr = fullname = NULL;
  
  	/*
  	 * Since login deals with sensitive information, turn off coredumps.
--- 184,193 ----
  
  	openlog("login", LOG_ODELAY, LOG_AUTH);
  
! 	fqdn = lipaddr = ripaddr = fullname = type = NULL;
! 	authok = 0;
! 	tries = 10;
! 	backoff = 3;
  
  	/*
  	 * Since login deals with sensitive information, turn off coredumps.
***************
*** 338,343 ****
--- 339,345 ----
  		warnx("Failure to retrieve default class");
  		quickexit(1);
  	}
+ 	timeout = (u_int)login_getcapnum(lc, "login-timeout", 300, 300);
  	if ((script = login_getcapstr(lc, "classify", NULL, NULL)) != NULL) {
  		unsetenv("AUTH_TYPE");
  		unsetenv("REMOTE_NAME");
***************
*** 442,457 ****
  		}
  
  		lc = login_getclass(pwd ? pwd->pw_class : NULL);
- 
  		if (!lc)
  			goto failed;
  
  		style = login_getstyle(lc, style, type);
- 
  		if (!style)
  			goto failed;
  
  		/*
  		 * Turn off the fflag if we have an an invalid user
  		 * or we are not root and we are trying to change uids.
  		 */
--- 444,464 ----
  		}
  
  		lc = login_getclass(pwd ? pwd->pw_class : NULL);
  		if (!lc)
  			goto failed;
  
  		style = login_getstyle(lc, style, type);
  		if (!style)
  			goto failed;
  
  		/*
+ 		 * We allow "login-tries" attempts to login but start
+ 		 * slowing down after "login-backoff" attempts.
+ 		 */
+ 		tries = (int)login_getcapnum(lc, "login-tries", 10, 10);
+ 		backoff = (int)login_getcapnum(lc, "login-backoff", 3, 3);
+ 
+ 		/*
  		 * Turn off the fflag if we have an an invalid user
  		 * or we are not root and we are trying to change uids.
  		 */
***************
*** 540,553 ****
  		failures++;
  		if (pwd)
  			log_failedlogin(pwd->pw_uid, hostname, rusername, tty);
! 		/* we allow 10 tries, but after 3 we start backing off */
! 		/* XXX - should be configurable */
! 		if (++cnt > 3) {
! 			if (cnt >= 10) {
  				badlogin(username);
  				sleepexit(1);
  			}
! 			sleep((u_int)((cnt - 3) * 5));
  		}
  	}
  
--- 547,562 ----
  		failures++;
  		if (pwd)
  			log_failedlogin(pwd->pw_uid, hostname, rusername, tty);
! 		/*
! 		 * By default, we allow 10 tries, but after 3 we start
! 		 * backing off to slow down password guessers.
! 		 */
! 		if (++cnt > backoff) {
! 			if (cnt >= tries) {
  				badlogin(username);
  				sleepexit(1);
  			}
! 			sleep((u_int)((cnt - backoff) * tries / 2));
  		}
  	}
  
***************
*** 845,850 ****
--- 854,861 ----
  	int signo;
  {
  	(void)fprintf(stderr, "Login timed out after %d seconds\n", timeout);
+ 	if (username)
+ 		badlogin(username);
  	exit(0);
  }