===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/local_passwd.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/passwd/local_passwd.c	2002/02/16 21:27:50	1.25
--- src/usr.bin/passwd/local_passwd.c	2002/06/28 22:28:17	1.26
***************
*** 1,4 ****
! /*	$OpenBSD: local_passwd.c,v 1.25 2002/02/16 21:27:50 millert Exp $	*/
  
  /*-
   * Copyright (c) 1990 The Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: local_passwd.c,v 1.26 2002/06/28 22:28:17 deraadt Exp $	*/
  
  /*-
   * Copyright (c) 1990 The Regents of the University of California.
***************
*** 35,41 ****
  
  #ifndef lint
  /*static const char sccsid[] = "from: @(#)local_passwd.c	5.5 (Berkeley) 5/6/91";*/
! static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.25 2002/02/16 21:27:50 millert Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
--- 35,41 ----
  
  #ifndef lint
  /*static const char sccsid[] = "from: @(#)local_passwd.c	5.5 (Berkeley) 5/6/91";*/
! static const char rcsid[] = "$OpenBSD: local_passwd.c,v 1.26 2002/06/28 22:28:17 deraadt Exp $";
  #endif /* not lint */
  
  #include <sys/types.h>
***************
*** 62,70 ****
  void kbintr(int);
  
  int
! local_passwd(uname, authenticated)
! 	char *uname;
! 	int authenticated;
  {
  	struct passwd *pw;
  	login_cap_t *lc;
--- 62,68 ----
  void kbintr(int);
  
  int
! local_passwd(char *uname, int authenticated)
  {
  	struct passwd *pw;
  	login_cap_t *lc;
***************
*** 143,152 ****
  }
  
  char *
! getnewpasswd(pw, lc, authenticated)
! 	struct passwd *pw;
! 	login_cap_t *lc;
! 	int authenticated;
  {
  	char *p;
  	int tries, pwd_tries;
--- 141,147 ----
  }
  
  char *
! getnewpasswd(struct passwd *pw, login_cap_t *lc, int authenticated)
  {
  	char *p;
  	int tries, pwd_tries;
***************
*** 165,171 ****
  			pw_error(NULL, 1, 1);
  		}
  	}
! 	
  	pwd_tries = pwd_gettries(pw, lc);
  
  	for (buf[0] = '\0', tries = 0;;) {
--- 160,166 ----
  			pw_error(NULL, 1, 1);
  		}
  	}
! 
  	pwd_tries = pwd_gettries(pw, lc);
  
  	for (buf[0] = '\0', tries = 0;;) {
***************
*** 178,184 ****
  			printf("That password collides with a system feature. Choose another.\n");
  			continue;
  		}
! 		
  		if ((tries++ < pwd_tries || pwd_tries == 0) 
  		    && pwd_check(pw, lc, p) == 0)
  			continue;
--- 173,179 ----
  			printf("That password collides with a system feature. Choose another.\n");
  			continue;
  		}
! 
  		if ((tries++ < pwd_tries || pwd_tries == 0) 
  		    && pwd_check(pw, lc, p) == 0)
  			continue;
***************
*** 198,205 ****
  }
  
  void
! kbintr(signo)
! 	int signo;
  {
  	char msg[] = "\nPassword unchanged.\n";
  	struct iovec iv[5];
--- 193,199 ----
  }
  
  void
! kbintr(int signo)
  {
  	char msg[] = "\nPassword unchanged.\n";
  	struct iovec iv[5];