===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/passwd.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/passwd/passwd.c	1998/01/20 15:32:21	1.7
--- src/usr.bin/passwd/passwd.c	2000/05/19 02:14:31	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: passwd.c,v 1.7 1998/01/20 15:32:21 art Exp $	*/
  
  /*
   * Copyright (c) 1988 The Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: passwd.c,v 1.8 2000/05/19 02:14:31 ericj Exp $	*/
  
  /*
   * Copyright (c) 1988 The Regents of the University of California.
***************
*** 41,47 ****
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)passwd.c	5.5 (Berkeley) 7/6/91";*/
! static char rcsid[] = "$OpenBSD: passwd.c,v 1.7 1998/01/20 15:32:21 art Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
--- 41,47 ----
  
  #ifndef lint
  /*static char sccsid[] = "from: @(#)passwd.c	5.5 (Berkeley) 7/6/91";*/
! static char rcsid[] = "$OpenBSD: passwd.c,v 1.8 2000/05/19 02:14:31 ericj Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 69,75 ****
  extern int local_passwd(char *);
  extern int yp_passwd(char *);
  extern int krb_passwd(int, char **);
! void usage(void);
  
  
  int
--- 69,75 ----
  extern int local_passwd(char *);
  extern int yp_passwd(char *);
  extern int krb_passwd(int, char **);
! void usage(int value);
  
  
  int
***************
*** 123,130 ****
  			exit(1);
  #endif
  		default:
! 			usage();
! 			exit(1);
  		}
  
  	argc -= optind;
--- 123,129 ----
  			exit(1);
  #endif
  		default:
! 			usage(1);
  		}
  
  	argc -= optind;
***************
*** 152,159 ****
  		username = argv[0];
  		break;
  	default:
! 		usage();
! 		exit(1);
  	}
  
  #if defined(KERBEROS) || defined(KERBEROS5)
--- 151,157 ----
  		username = argv[0];
  		break;
  	default:
! 		usage(1);
  	}
  
  #if defined(KERBEROS) || defined(KERBEROS5)
***************
*** 170,176 ****
  }
  
  void
! usage(void)
  {
  	fprintf(stderr, "usage: passwd [-l] [-y] [-k [-n name] [-i instance] [-r realm] [-u username[.instance][@realm]] [user]\n");
  }
--- 168,176 ----
  }
  
  void
! usage(retval)
! 	int retval;
  {
  	fprintf(stderr, "usage: passwd [-l] [-y] [-k [-n name] [-i instance] [-r realm] [-u username[.instance][@realm]] [user]\n");
+ 	exit(retval);
  }