sccs: Manual changes

For the uncommon items: Go through the tree and remove sccs tags that
didn't fit any nice pattern. If in the neighborhood, other SCM tags were
removed when they were detritis of long-ago CVS somehow in the early
mists of the project. Some adjacent copyrights stringswere removed (they
duplicated the copyright notices in the file). This also removed
non-standard formations of omission of SCCS tags (usually by adding an
extra #if 0 somewhere.

After this commit, a number of strings tagged with the 'what' @(#)
prefix remain, but they are primarily copyright notices.

Sponsored by:		Netflix

22 files changed, 1 insertions, 116 deletions

diff --git a/include/rpc/rpcb_prot.x b/include/rpc/rpcb_prot.x
index b5de5c6d865d..efbe8f4ba246 100644
--- a/include/rpc/rpcb_prot.x
+++ b/include/rpc/rpcb_prot.x
@@ -33,8 +33,6 @@
 
 #ifdef RPC_HDR
 %
-%/* #pragma ident	"@(#)rpcb_prot.x	1.5	94/04/29 SMI" */
-%
 %#ifndef _KERNEL
 %
 #endif
diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x
index 6e47bdb218d3..51d315327a00 100644
--- a/include/rpcsvc/bootparam_prot.x
+++ b/include/rpcsvc/bootparam_prot.x
@@ -45,12 +45,6 @@
 %#include <sys/errno.h>
 %#include <sys/param.h>
 %#include <sys/syslimits.h>
-#else
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)bootparam_prot.x 1.2 87/06/24 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)bootparam_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
 #endif
 
 const MAX_MACHINE_NAME  = 255;
diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x
index 7d6b94d96067..63e4c8798152 100644
--- a/include/rpcsvc/crypt.x
+++ b/include/rpcsvc/crypt.x
@@ -30,10 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 /*
  * This protocol definition exists because of the U.S. government and
  * its stupid export laws. We can't export DES code from the United
diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x
index 09a20049832e..9143b979f16f 100644
--- a/include/rpcsvc/key_prot.x
+++ b/include/rpcsvc/key_prot.x
@@ -45,10 +45,6 @@
  * requirements.
  */
 
-%/* From: #pragma ident	"@(#)key_prot.x	1.7	94/04/29 SMI" */
-%/* Copyright (c)  1990, 1991 Sun Microsystems, Inc. */
-%#include <sys/cdefs.h>
-%
 %/* 
 % * Compiled from key_prot.x using rpcgen.
 % * DO NOT EDIT THIS FILE!
diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x
index b78dbfc20c3c..4dcfa00aab24 100644
--- a/include/rpcsvc/klm_prot.x
+++ b/include/rpcsvc/klm_prot.x
@@ -38,14 +38,6 @@
  * above the kernel.
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)klm_prot.x 1.7 87/07/08 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)klm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 const	LM_MAXSTRLEN = 1024;
 
 /*
diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x
index e67cbc73d867..b3a4e11aa2c7 100644
--- a/include/rpcsvc/mount.x
+++ b/include/rpcsvc/mount.x
@@ -33,14 +33,6 @@
  * Protocol description for the mount program
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)mount.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 const MNTPATHLEN = 1024;	/* maximum bytes in a pathname argument */
 const MNTNAMLEN = 255;		/* maximum bytes in a name argument */
 const FHSIZE = 32;		/* size in bytes of a file handle */
diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x
index 9706c5a03bbd..99ac2fd68e85 100644
--- a/include/rpcsvc/nfs_prot.x
+++ b/include/rpcsvc/nfs_prot.x
@@ -29,14 +29,6 @@
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)nfs_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 const NFS_PORT          = 2049;
 const NFS_MAXDATA       = 8192;
 const NFS_MAXPATHLEN    = 1024;
diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x
index e83784159fe5..07a9c48e7638 100644
--- a/include/rpcsvc/nis.x
+++ b/include/rpcsvc/nis.x
@@ -29,10 +29,6 @@
 % *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 % */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 /* 
  *
  * RPC Language Protocol description file for NIS Plus
diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x
index c728736e3213..2b204f617b29 100644
--- a/include/rpcsvc/nis_cache.x
+++ b/include/rpcsvc/nis_cache.x
@@ -35,10 +35,6 @@
  *	All Rights Reserved.
  */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 #ifdef RPC_HDR
 %#include <rpc/types.h>
 %#include <rpcsvc/nis.h>
diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x
index af7a291d1baa..3e74bbca50cd 100644
--- a/include/rpcsvc/nis_callback.x
+++ b/include/rpcsvc/nis_callback.x
@@ -36,10 +36,6 @@
  *	All Rights Reserved.
  */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 /*
  *
  * RPCL description of the Callback Service.
diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x
index f53d81996801..a8581ce9da0d 100644
--- a/include/rpcsvc/nlm_prot.x
+++ b/include/rpcsvc/nlm_prot.x
@@ -8,14 +8,8 @@
 #ifdef RPC_HDR
 %#define LM_MAXSTRLEN	1024
 %#define MAXNAMELEN	LM_MAXSTRLEN+1
-#else
-%#include <sys/cdefs.h>
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)nlm_prot.x 1.8 87/09/21 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: * @(#)nlm_prot.x	2.1 88/08/01 4.0 RPCSRC";*/
-%__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $");
-%#endif /* not lint */
 #endif
+/* $NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $ */
 
 /*
  * status of a call to the lock manager
diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x
index fb8a3bbde044..d64bfc3cf73a 100644
--- a/include/rpcsvc/pmap_prot.x
+++ b/include/rpcsvc/pmap_prot.x
@@ -34,9 +34,6 @@
 
 #ifdef RPC_HDR
 %
-%#pragma ident	"@(#)pmap_prot.x	1.6	94/04/29 SMI"
-%#include <sys/cdefs.h>
-%
 %#ifndef _KERNEL
 %
 #endif
diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x
index 20cce24e0ffa..78003204df0f 100644
--- a/include/rpcsvc/rex.x
+++ b/include/rpcsvc/rex.x
@@ -33,14 +33,6 @@
  * Remote execution (rex) protocol specification
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rex.x 1.3 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rex.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 const STRINGSIZE = 1024;
 typedef string rexstring<1024>;
 
diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x
index 1b6dcada2ff1..3e2a426b6b9f 100644
--- a/include/rpcsvc/rnusers.x
+++ b/include/rpcsvc/rnusers.x
@@ -33,14 +33,6 @@
  * Find out about remote users
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rnusers.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 const MAXUSERS = 100;
 const MAXUTLEN = 256;
 
diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x
index 31cf2f31e856..6349c35413d3 100644
--- a/include/rpcsvc/rquota.x
+++ b/include/rpcsvc/rquota.x
@@ -3,10 +3,6 @@
  * Requires unix authentication
  */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 const RQ_PATHLEN = 1024;
 
 struct sq_dqblk {
diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x
index 1b62470777e8..17e9c9fedf3a 100644
--- a/include/rpcsvc/rstat.x
+++ b/include/rpcsvc/rstat.x
@@ -44,13 +44,6 @@
 %
 %#endif /* ndef FSCALE */
 
-#else
-
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)rstat.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)rstat.x	2.2 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
 #endif /* def RPC_HDR */
 
 const RSTAT_CPUSTATES = 4;
diff --git a/include/rpcsvc/rwall.x b/include/rpcsvc/rwall.x
index 6c26c1f18f3e..0c3a989ede0f 100644
--- a/include/rpcsvc/rwall.x
+++ b/include/rpcsvc/rwall.x
@@ -31,8 +31,6 @@
 %/*
 % * Copyright (c) 1984, 1990 by Sun Microsystems, Inc.
 % */
-%
-%/* from @(#)rwall.x	1.6 91/03/11 TIRPC 1.0 */
 
 #ifdef RPC_HDR
 %
diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x
index 89c51ca1b543..14aaeadee8a7 100644
--- a/include/rpcsvc/sm_inter.x
+++ b/include/rpcsvc/sm_inter.x
@@ -35,10 +35,6 @@
  *
  */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 program SM_PROG { 
 	version SM_VERS  {
 		/* res_stat = stat_succ if status monitor agrees to monitor */
diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x
index 406d318a4943..8ef42f972c44 100644
--- a/include/rpcsvc/spray.x
+++ b/include/rpcsvc/spray.x
@@ -34,14 +34,6 @@
  * Useful for testing flakiness of network interfaces
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)spray.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)spray.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 const SPRAYMAX = 8845;	/* max amount can spray */
 
 /*
diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x
index 3567e2bd3fad..fff06557b67e 100644
--- a/include/rpcsvc/yp.x
+++ b/include/rpcsvc/yp.x
@@ -33,10 +33,6 @@
  * Protocol description file for the Yellow Pages Service
  */
 
-#ifndef RPC_HDR
-%#include <sys/cdefs.h>
-#endif
-
 const YPMAXRECORD = 16777216;
 const YPMAXDOMAIN = 64;
 const YPMAXMAP = 64;
diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x
index 2ad2215689f3..15741f37b27d 100644
--- a/include/rpcsvc/yppasswd.x
+++ b/include/rpcsvc/yppasswd.x
@@ -34,14 +34,6 @@
  * Requires unix authentication
  */
 
-#ifndef RPC_HDR
-%#ifndef lint
-%/*static char sccsid[] = "from: @(#)yppasswd.x 1.1 87/04/13 Copyr 1987 Sun Micro";*/
-%/*static char sccsid[] = "from: @(#)yppasswd.x	2.1 88/08/01 4.0 RPCSRC";*/
-%#endif /* not lint */
-%#include <sys/cdefs.h>
-#endif
-
 program YPPASSWDPROG {
 	version YPPASSWDVERS {
 		/*
diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x
index 328a07432f0d..b989ad29468b 100644
--- a/include/rpcsvc/ypupdate_prot.x
+++ b/include/rpcsvc/ypupdate_prot.x
@@ -32,7 +32,6 @@
 % * Copyright (c) 1986, 1990 by Sun Microsystems, Inc.
 % */
 %
-%/* from @(#)ypupdate_prot.x	1.3 91/03/11 TIRPC 1.0 */
 #ifndef RPC_HDR
 %#include <sys/cdefs.h>
 #endif