the yppasswd command is not needed. the user should always let the

passwd command figure out where their password is located. if they
really need to change a specific one, they can use the flags - bet
noone ever needs to use that.

diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile
index 872bc73..7c04edf 100644 (file)
--- a/usr.bin/passwd/Makefile
+++ b/usr.bin/passwd/Makefile
@@ -1,5 +1,5 @@
 #      from: @(#)Makefile      5.11 (Berkeley) 2/19/91
-#      $Id: Makefile,v 1.2 1995/12/16 22:20:28 tholo Exp $
+#      $Id: Makefile,v 1.3 1996/01/16 07:22:13 deraadt Exp $
 
 PROG=  passwd
 SRCS=  local_passwd.c yp_passwd.c passwd.c pw_copy.c pw_util.c getpwent.c
@@ -21,10 +21,6 @@ DPADD+=      ${LIBKRB} ${LIBDES}
 LDADD+=        -lkrb -ldes
 .endif
 
-LINKS= ${BINDIR}/passwd ${BINDIR}/yppasswd
-MLINKS=        passwd.1 yppasswd.1
-
-BINOWN=        root
 BINMODE=4555
 
 .include <bsd.prog.mk>

diff --git a/usr.bin/passwd/passwd.1 b/usr.bin/passwd/passwd.1
index 168333f..a8c1f76 100644 (file)
--- a/usr.bin/passwd/passwd.1
+++ b/usr.bin/passwd/passwd.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"    from: @(#)passwd.1      6.11 (Berkeley) 7/24/91
-.\"    $Id: passwd.1,v 1.1.1.1 1995/10/18 08:45:54 deraadt Exp $
+.\"    $Id: passwd.1,v 1.2 1996/01/16 07:22:14 deraadt Exp $
 .\"
 .Dd July 24, 1991
 .Dt PASSWD 1
@@ -44,8 +44,6 @@
 .Op Fl k
 .Op Fl y
 .Op Ar user
-.Nm yppasswd
-.Op Ar user
 .Sh DESCRIPTION
 .Nm Passwd
 changes the user's local, Kerberos, or YP password.  First, the user is prompted
@@ -79,12 +77,6 @@ This forces the YP password database entry to be changed, even if
 the user has an entry in the local database.  The
 .Xr rpc.yppasswdd 8
 daemon should be running on the YP master server.
-.Nm yppasswd
-is the equivalent of
-.Nm passwd
-with the
-.Fl y
-flag.
 .El
 .Pp
 This is the behavior if no flags are specified:

diff --git a/usr.bin/passwd/passwd.c b/usr.bin/passwd/passwd.c
index 6efcd88..042fa3a 100644 (file)
--- a/usr.bin/passwd/passwd.c
+++ b/usr.bin/passwd/passwd.c
@@ -39,7 +39,7 @@ char copyright[] =
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)passwd.c   5.5 (Berkeley) 7/6/91";*/
-static char rcsid[] = "$Id: passwd.c,v 1.1.1.1 1995/10/18 08:45:54 deraadt Exp $";
+static char rcsid[] = "$Id: passwd.c,v 1.2 1996/01/16 07:22:15 deraadt Exp $";
 #endif /* not lint */
 
 #include <stdio.h>
@@ -80,21 +80,6 @@ main(argc, argv)
        basename = strrchr(argv[0], '/');
        if (basename == NULL)
                basename = argv[0];
-       if (strcmp(basename, "yppasswd") == 0) {
-#ifdef YP
-               if (!use_yp) {
-                       fprintf(stderr, "yppasswd: YP not in use.\n");
-                       exit (1);
-               }
-               use_kerberos = 0;
-               use_yp = 1;
-               force_yp = 1;
-#else
-               fprintf(stderr, "yppasswd: YP not compiled in\n");
-               exit(1);
-#endif
-       }
-
        
        while ((ch = getopt(argc, argv, "lky")) != EOF)
                switch (ch) {