===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/passwd.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -c -r1.5 -r1.6
*** src/usr.bin/passwd/passwd.c	1997/01/15 23:43:01	1.5
--- src/usr.bin/passwd/passwd.c	1997/03/27 00:30:54	1.6
***************
*** 1,4 ****
! /*	$OpenBSD: passwd.c,v 1.5 1997/01/15 23:43:01 millert Exp $	*/
  
  /*
   * Copyright (c) 1988 The Regents of the University of California.
--- 1,4 ----
! /*	$OpenBSD: passwd.c,v 1.6 1997/03/27 00:30:54 weingart 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.5 1997/01/15 23:43:01 millert 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.6 1997/03/27 00:30:54 weingart Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 65,70 ****
--- 65,78 ----
  int force_yp;
  #endif
  
+ 
+ extern int local_passwd(char *);
+ extern int yp_passwd(char *);
+ extern int krb_passwd(void);
+ void usage(void);
+ 
+ 
+ int
  main(argc, argv)
  	int argc;
  	char **argv;
***************
*** 73,79 ****
  	register int ch;
  	char *username;
  	int status = 0;
- 	char *basename;
  #if defined(KERBEROS) || defined(KERBEROS5)
  	extern char realm[];
  
--- 81,86 ----
***************
*** 84,93 ****
  	use_yp = _yp_check(NULL);
  #endif
  
! 	basename = strrchr(argv[0], '/');
! 	if (basename == NULL)
! 		basename = argv[0];
! 	
  	while ((ch = getopt(argc, argv, "lky")) != -1)
  		switch (ch) {
  		case 'l':		/* change local password file */
--- 91,97 ----
  	use_yp = _yp_check(NULL);
  #endif
  
! 	/* Process args and options */
  	while ((ch = getopt(argc, argv, "lky")) != -1)
  		switch (ch) {
  		case 'l':		/* change local password file */
***************
*** 163,169 ****
  	exit(local_passwd(username));
  }
  
! usage()
  {
  	fprintf(stderr, "usage: passwd [-l] [-k] [-y] user\n");
  }
--- 167,174 ----
  	exit(local_passwd(username));
  }
  
! void
! usage(void)
  {
  	fprintf(stderr, "usage: passwd [-l] [-k] [-y] user\n");
  }