Remove multiply defined Id string. Hide sccsid string.

6 files changed, 54 insertions, 46 deletions

diff --git a/usr.sbin/rpc.yppasswdd/pw_copy.c b/usr.sbin/rpc.yppasswdd/pw_copy.c
index 449057c..653f5e8 100644
--- a/usr.sbin/rpc.yppasswdd/pw_copy.c
+++ b/usr.sbin/rpc.yppasswdd/pw_copy.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pw_copy.c	8.4 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.yppasswdd/pw_util.c b/usr.sbin/rpc.yppasswdd/pw_util.c
index a4912d0..4b5de7c 100644
--- a/usr.sbin/rpc.yppasswdd/pw_util.c
+++ b/usr.sbin/rpc.yppasswdd/pw_util.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pw_util.c	8.3 (Berkeley) 4/2/94";
+#endif
+static const char rcsid[] =
+	"$Id$";
 #endif /* not lint */
 
 /*
diff --git a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
index a54ec40..4506722 100644
--- a/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
+++ b/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	$Id$
+.\"	$Id: rpc.yppasswdd.8,v 1.7 1997/02/22 16:12:53 peter Exp $
 .\"
 .Dd February 8, 1996
 .Dt RPC.YPPASSWDD 8
@@ -51,7 +51,7 @@
 .Op Fl h
 .Sh DESCRIPTION
 The
-.Nm rpc.yppasswdd
+.Nm
 daemon allows users to change their NIS passwords and certain
 other information using the
 .Xr yppasswd 1
@@ -69,7 +69,7 @@ and
 maps.
 .Pp
 The
-.Nm rpc.yppasswdd
+.Nm
 server allows a normal NIS user to change
 his or her NIS password, full name (also
 known as 'GECOS' field) or shell. These updates are typically done using
@@ -89,7 +89,7 @@ rules outlined in
 (See the
 .Xr ypserv 8
 manual page for more information on securenets; the
-.Nm rpc.yppasswdd
+.Nm
 server uses the same access control mechanism as
 .Xr ypserv 8 .)
 .Pp
@@ -108,8 +108,10 @@ and the name of the domain that is to be updated. These in turn are
 passed to
 .Pa /var/yp/Makefile ) .
 .Pp
-The FreeBSD version of
-.Nm rpc.yppasswdd
+The
+.Bx Free
+version of
+.Nm
 also allows the super-user on the NIS master server to perform more
 sophisticated updates on the NIS passwd maps. The super-user can modify
 any field in any user's master.passwd entry in any domain, and can
@@ -124,15 +126,14 @@ master server: none of these special functions can be peformed over
 the network.
 .Pp
 The
-.Nm rpc.yppasswdd
+.Nm
 daemon can only be run on a machine that is an NIS master server.
 .Sh OPTIONS
-The following options and flags are supported by
-.Nm rpc.yppasswdd :
-.Bl -tag -width flag
+The following options are available:
+.Bl -tag -width indent
 .It Fl t Ar master.passwd template file
 By default,
-.Nm rpc.yppasswdd
+.Nm
 assumes that the template file used to generates the
 .Pa master.passwd
 and
@@ -146,14 +147,14 @@ flag.
 .Pp
 Note: if the template file specified with this flag is
 .Pa /etc/master.passwd ,
-.Nm rpc.yppasswdd
+.Nm
 will also automatically invoke
 .Xr pwd_mkdb 8
 to rebuild the local password databases in addition to the NIS
 maps. 
 .It Fl d Ar domain
 The
-.Nm rpc.yppasswdd
+.Nm
 server can support multiple domains, however it must
 choose one domain as a default.
 It will try to use the system default domain name as set by the
@@ -179,7 +180,7 @@ NIS master server is permitted to use the
 command to perform unrestricted modifications to any field in a user's
 .Pa master.passwd
 map entry. When
-.Nm rpc.yppasswdd
+.Nm
 is started with this flag, it will also allow the super-user to add new
 records to the NIS passwd maps, just as is possible when using
 .Xr chpass 1
@@ -188,17 +189,18 @@ to modify the local password database.
 Turn on multi-domain mode. Even though
 .Xr ypserv 8
 can handle several simultaneous domains, most implementations of
-.Nm rpc.yppasswdd
+.Nm
 can only operate on a single NIS domain, which is generally the same as
-the system default domain of the NIS master server. The FreeBSD
-.Nm rpc.yppasswdd
+the system default domain of the NIS master server. The
+.Bx Free
+.Nm
 attempts to overcome this problem in spite of the inherent limitations
 of the
 .Pa yppasswd
 protocol, which does not allow for a
 .Pa domain
 argument in client requests. In multi-domain mode,
-.Nm rpc.yppasswdd
+.Nm
 will search through all the passwd maps of all the domains it
 can find under
 .Pa /var/yp
@@ -236,7 +238,7 @@ matches its search criteria. Even so, paranoid administrators
 may wish to leave multi-domain mode disabled.
 .It Fl i
 If
-.Nm rpc.yppasswdd
+.Nm
 is invoked with this flag, it will perform map updates in place. This
 means that instead of just modifying the password template file and
 starting a map update, the server will modify the map databases
@@ -264,7 +266,7 @@ program is not installed set-uid root, or because the RPC
 implementation does not place any emphasis on binding to reserved
 ports when establishing client connections for the super-user.
 By default,
-.Nm rpc.yppasswdd
+.Nm
 expects to receive requests from clients using reserved ports; requests
 received from non-privileged ports are rejected. Unfortunately, this
 behavior prevents any client systems that to not use privileged
@@ -272,21 +274,21 @@ ports from sucessfully submitting password updates. Specifying
 the
 .Fl u
 flag to
-.Nm rpc.yppasswdd
+.Nm
 disables the privileged port check so that it will work with
 .Xr yppasswd 1
 clients that don't use privileged ports. This reduces security to
 a certain small degree, but it might be necessary in cases where it
 is not possible to change the client behavior.
 .It Fl h
-Displays the list of flags and options understood by
+Display the list of flags and options understood by
 .Nm rpc.yppasswdd .
 .El
 .Sh FILES
 .Bl -tag -width Pa -compact
 .It Pa /usr/libexec/yppwupdate
 The script invoked by
-.Nm rpc.yppasswdd
+.Nm
 to update and push the NIS maps after
 an update.
 .It Pa /var/yp/master.passwd
@@ -307,7 +309,7 @@ As listed in the yppasswd.x protocol definition, the YPPASSWDPROC_UPDATE
 procedure takes two arguments: a V7-style passwd structure containing
 updated user information and the user's existing unencrypted (cleartext)
 password. Since
-.Nm rpc.yppasswdd
+.Nm
 is supposed to handle update requests from remote NIS client machines,
 this means that
 .Xr yppasswd 1
@@ -322,4 +324,4 @@ will still be valid once the update is completed. If the network is
 insecure, this cleartext password could be intercepted and used to
 gain unauthorized access to the user's account.
 .Sh AUTHOR
-Bill Paul <wpaul@ctr.columbia.edu>
+.An Bill Paul Aq wpaul@ctr.columbia.edu
diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
index 7a101c0..9f50671 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x
+++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
@@ -28,13 +28,12 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: yppasswd_private.x,v 1.2 1997/07/28 18:31:11 wpaul Exp $
  */
 
 #ifndef RPC_HDR
 %#ifndef lint
-%static const char rcsid[] = "$Id: yppasswd_private.x,v 1.2 1997/07/28 18:31:11 wpaul Exp $";
+%static const char rcsid[] =
+%	"$Id: yppasswd_private.x,v 1.4 1997/07/29 15:43:18 wpaul Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
index d785d65..f1a65ab 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@@ -28,10 +28,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: yppasswdd_main.c,v 1.2 1997/07/28 18:31:11 wpaul Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include "yppasswd.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -71,9 +74,6 @@ struct dom_binding {};
 #endif
 
 #define	_RPCSVC_CLOSEDOWN 120
-#ifndef lint
-static const char rcsid[] = "$Id: yppasswdd_main.c,v 1.2 1997/07/28 18:31:11 wpaul Exp $";
-#endif /* not lint */
 int _rpcpmstart = 0;		/* Started by a port monitor ? */
 static int _rpcfdtype;
 		 /* Whether Stream or Datagram ? */
@@ -145,9 +145,9 @@ closedown(int sig)
 
 static void usage()
 {
-	fprintf(stderr, "Usage: %s [-t master.passwd file] [-d domain] \
-[-p path] [-s] [-f] [-m] [-i] [-a] [-v] [-u] [-h]\n",
-		progname);
+	fprintf(stderr, "%s\n%s\n",
+"usage: rpc.yppasswdd [-t master.passwd file] [-d domain] [-p path] [-s]",
+"                     [-f] [-m] [-i] [-a] [-v] [-u] [-h]");
 	exit(1);
 }
 
@@ -257,14 +257,14 @@ the %s domain -- aborting", yppasswd_domain);
 		sock = 0;
 		_rpcpmstart = 1;
 		proto = 0;
-		openlog(progname, LOG_PID, LOG_DAEMON);
+		openlog("rpc.yppasswdd", LOG_PID, LOG_DAEMON);
 	} else {
 		if (!debug) {
 			if (daemon(0,0)) {
 				err(1,"cannot fork");
 			}
 		}
-		openlog(progname, LOG_PID, LOG_DAEMON);
+		openlog("rpc.yppasswdd", LOG_PID, LOG_DAEMON);
 		sock = RPC_ANYSOCK;
 		(void) pmap_unset(YPPASSWDPROG, YPPASSWDVERS);
 		(void) pmap_unset(MASTER_YPPASSWDPROG, MASTER_YPPASSWDVERS);
diff --git a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
index 02a4746..f41cce2 100644
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@@ -28,10 +28,13 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	$Id: yppasswdd_server.c,v 1.3 1997/07/29 00:21:00 wpaul Exp $
  */
 
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
@@ -59,10 +62,6 @@ struct dom_binding {};
 #include "yppasswd.h"
 #include "yppasswd_private.h"
 
-#ifndef lint
-static const char rcsid[] = "$Id: yppasswdd_server.c,v 1.3 1997/07/29 00:21:00 wpaul Exp $";
-#endif /* not lint */
-
 char *tempname;
 
 void reaper(sig)
@@ -765,8 +764,8 @@ procedure!\n", inet_ntoa(rqhost->sin_addr), rqhost->sin_port);
 				yp_error("notice: adding user %s to \
 master.passwd database for domain %s", argp->newpw.pw_name, argp->domain);
 			else
-				yp_error("restart %s with the -a flag to \
-allow additions to be made to the password database", progname);
+				yp_error("restart rpc.yppasswdd with the -a flag to \
+allow additions to be made to the password database");
 		} else {
 			yp_error("database access error: %s",
 				 yperr_string(rval));