pretty

14 files changed, 139 insertions, 137 deletions

diff --git a/lib/librpcsvc/bootparam_prot.x b/lib/librpcsvc/bootparam_prot.x
index e21b0c51648..5d791c7ecf4 100644
--- a/lib/librpcsvc/bootparam_prot.x
+++ b/lib/librpcsvc/bootparam_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bootparam_prot.x,v 1.5 2003/12/25 19:05:09 deraadt Exp $	*/
+/*	$OpenBSD: bootparam_prot.x,v 1.6 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -49,7 +49,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.5 2003/12/25 19:05:09 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: bootparam_prot.x,v 1.6 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -88,7 +88,7 @@ struct bp_getfile_arg {
 	bp_machine_name_t	client_name;
 	bp_fileid_t		file_id;
 };
-	
+
 struct bp_getfile_res {
 	bp_machine_name_t	server_name;
 	bp_address		server_address;
diff --git a/lib/librpcsvc/klm_prot.x b/lib/librpcsvc/klm_prot.x
index 9b940f9f994..8a1425dcf1c 100644
--- a/lib/librpcsvc/klm_prot.x
+++ b/lib/librpcsvc/klm_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: klm_prot.x,v 1.3 2002/01/21 17:30:38 deraadt Exp $	*/
+/*	$OpenBSD: klm_prot.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -42,7 +42,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: klm_prot.x,v 1.3 2002/01/21 17:30:38 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: klm_prot.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -55,7 +55,7 @@ enum klm_stats {
 	klm_granted = 0,	/* lock is granted */
 	klm_denied = 1,		/* lock is denied */
 	klm_denied_nolocks = 2, /* no lock entry available */
-	klm_working = 3 	/* lock is being processed */
+	klm_working = 3	/* lock is being processed */
 };
 
 /*
diff --git a/lib/librpcsvc/mount.x b/lib/librpcsvc/mount.x
index 44450e01f44..2e99117933a 100644
--- a/lib/librpcsvc/mount.x
+++ b/lib/librpcsvc/mount.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.x,v 1.2 1997/08/19 07:54:47 niklas Exp $	*/
+/*	$OpenBSD: mount.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -37,7 +37,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: mount.x,v 1.2 1997/08/19 07:54:47 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: mount.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -51,10 +51,10 @@ const FHSIZE = 32;		/* size in bytes of a file handle */
  * or a directory. The file handle can contain whatever information the
  * server needs to distinguish an individual file.
  */
-typedef opaque fhandle[FHSIZE];	
+typedef opaque fhandle[FHSIZE];
 
 /*
- * If a status of zero is returned, the call completed successfully, and 
+ * If a status of zero is returned, the call completed successfully, and
  * a file handle for the directory follows. A non-zero status indicates
  * some sort of error. The status corresponds with UNIX error numbers.
  */
@@ -107,7 +107,7 @@ struct exportnode {
 program MOUNTPROG {
 	/*
 	 * Version one of the mount protocol communicates with version two
-	 * of the NFS protocol. The only connecting point is the fhandle 
+	 * of the NFS protocol. The only connecting point is the fhandle
 	 * structure, which is the same for both protocols.
 	 */
 	version MOUNTVERS {
@@ -118,20 +118,20 @@ program MOUNTPROG {
 		void
 		MOUNTPROC_NULL(void) = 0;
 
-		/*	
+		/*
 		 * If fhs_status is 0, then fhs_fhandle contains the
-	 	 * file handle for the directory. This file handle may
+		 * file handle for the directory. This file handle may
 		 * be used in the NFS protocol. This procedure also adds
 		 * a new entry to the mount list for this client mounting
 		 * the directory.
 		 * Unix authentication required.
 		 */
-		fhstatus 
+		fhstatus
 		MOUNTPROC_MNT(dirpath) = 1;
 
 		/*
-		 * Returns the list of remotely mounted filesystems. The 
-		 * mountlist contains one entry for each hostname and 
+		 * Returns the list of remotely mounted filesystems. The
+		 * mountlist contains one entry for each hostname and
 		 * directory pair.
 		 */
 		mountlist
diff --git a/lib/librpcsvc/nfs_prot.x b/lib/librpcsvc/nfs_prot.x
index 3798db01677..cd4faad538b 100644
--- a/lib/librpcsvc/nfs_prot.x
+++ b/lib/librpcsvc/nfs_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_prot.x,v 1.2 1997/08/19 07:54:48 niklas Exp $	*/
+/*	$OpenBSD: nfs_prot.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -33,13 +33,13 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: nfs_prot.x,v 1.2 1997/08/19 07:54:48 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: nfs_prot.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
-const NFS_PORT          = 2049;
-const NFS_MAXDATA       = 8192;
-const NFS_MAXPATHLEN    = 1024;
+const NFS_PORT		= 2049;
+const NFS_MAXDATA	= 8192;
+const NFS_MAXPATHLEN	= 1024;
 const NFS_MAXNAMLEN	= 255;
 const NFS_FHSIZE	= 32;
 const NFS_COOKIESIZE	= 4;
@@ -93,7 +93,7 @@ enum ftype {
 	NFLNK = 5,	/* symbolic link */
 	NFSOCK = 6,	/* unix domain sockets */
 	NFBAD = 7,	/* unused */
-	NFFIFO = 8 	/* named pipe */
+	NFFIFO = 8	/* named pipe */
 };
 
 /*
@@ -103,7 +103,7 @@ struct nfs_fh {
 	opaque data[NFS_FHSIZE];
 };
 
-/* 
+/*
  * Timeval
  */
 struct nfstime {
@@ -145,7 +145,7 @@ struct sattr {
 };
 
 
-typedef string filename<NFS_MAXNAMLEN>; 
+typedef string filename<NFS_MAXNAMLEN>;
 typedef string nfspath<NFS_MAXPATHLEN>;
 
 /*
@@ -219,7 +219,7 @@ default:
 };
 
 /*
- * Arguments to remote write 
+ * Arguments to remote write
  */
 struct writeargs {
 	nfs_fh	file;		/* handle for file */
@@ -301,28 +301,28 @@ default:
  */
 program NFS_PROGRAM {
 	version NFS_VERSION {
-		void 
+		void
 		NFSPROC_NULL(void) = 0;
 
-		attrstat 
+		attrstat
 		NFSPROC_GETATTR(nfs_fh) =	1;
 
-		attrstat 
+		attrstat
 		NFSPROC_SETATTR(sattrargs) = 2;
 
-		void 
+		void
 		NFSPROC_ROOT(void) = 3;
 
-		diropres 
+		diropres
 		NFSPROC_LOOKUP(diropargs) = 4;
 
-		readlinkres 
+		readlinkres
 		NFSPROC_READLINK(nfs_fh) = 5;
 
-		readres 
+		readres
 		NFSPROC_READ(readargs) = 6;
 
-		void 
+		void
 		NFSPROC_WRITECACHE(void) = 7;
 
 		attrstat
diff --git a/lib/librpcsvc/nlm_prot.x b/lib/librpcsvc/nlm_prot.x
index 866ef9b2ea8..47c6389fe3e 100644
--- a/lib/librpcsvc/nlm_prot.x
+++ b/lib/librpcsvc/nlm_prot.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nlm_prot.x,v 1.3 1997/08/19 07:54:48 niklas Exp $	*/
+/*	$OpenBSD: nlm_prot.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Network lock manager protocol definition
@@ -14,7 +14,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: nlm_prot.x,v 1.3 1997/08/19 07:54:48 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: nlm_prot.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -77,20 +77,20 @@ struct nlm_lockargs {
 };
 
 struct nlm_cancargs {
-	netobj cookie;		
+	netobj cookie;
 	bool block;
 	bool exclusive;
 	struct nlm_lock alock;
 };
 
 struct nlm_testargs {
-	netobj cookie;		
+	netobj cookie;
 	bool exclusive;
 	struct nlm_lock alock;
 };
 
 struct nlm_unlockargs {
-	netobj cookie;		
+	netobj cookie;
 	struct nlm_lock alock;
 };
 
diff --git a/lib/librpcsvc/rex.x b/lib/librpcsvc/rex.x
index 14e2e568f6a..71b2a292e79 100644
--- a/lib/librpcsvc/rex.x
+++ b/lib/librpcsvc/rex.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rex.x,v 1.2 1997/08/19 07:54:49 niklas Exp $	*/
+/*	$OpenBSD: rex.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -37,7 +37,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: rex.x,v 1.2 1997/08/19 07:54:49 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: rex.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -50,7 +50,7 @@ typedef string rexstring<1024>;
 const SIGINT = 2;	/* interrupt */
 
 /*
- * Values for rst_flags, below 
+ * Values for rst_flags, below
  */
 const REX_INTERACTIVE = 1;	/* interactive mode */
 
@@ -67,7 +67,7 @@ struct rex_start {
 };
 
 struct rex_result {
-   	int rlt_stat;		/* integer status code */
+	int rlt_stat;		/* integer status code */
 	rexstring rlt_message;	/* string message for human consumption */
 };
 
@@ -176,10 +176,10 @@ struct rex_ttysize {
 };
 
 struct rex_ttymode {
-    sgttyb basic;    /* standard unix tty flags */
-    tchars more; /* interrupt, kill characters, etc. */
-    ltchars yetmore; /* special Berkeley characters */
-    unsigned andmore;     /* and Berkeley modes */
+    sgttyb basic;	/* standard unix tty flags */
+    tchars more;	/* interrupt, kill characters, etc. */
+    ltchars yetmore;	/* special Berkeley characters */
+    unsigned andmore;	/* and Berkeley modes */
 };
 
 /* values for andmore above */
@@ -206,7 +206,7 @@ program REXPROG {
 		/*
 		 * Start remote execution
 		 */
-		rex_result 
+		rex_result
 		REXPROC_START(rex_start) = 1;
 
 		/*
diff --git a/lib/librpcsvc/rnusers.x b/lib/librpcsvc/rnusers.x
index 73337e6877b..3edc3db03d5 100644
--- a/lib/librpcsvc/rnusers.x
+++ b/lib/librpcsvc/rnusers.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rnusers.x,v 1.11 2003/07/10 07:51:03 deraadt Exp $	*/
+/*	$OpenBSD: rnusers.x,v 1.12 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -37,7 +37,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: rnusers.x,v 1.11 2003/07/10 07:51:03 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: rnusers.x,v 1.12 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -48,7 +48,7 @@
 % * They were not developed with rpcgen, so they do not appear as RPCL.
 % */
 %
-%#define 	RUSERSVERS_ORIG 1	/* original version */
+%#define	RUSERSVERS_ORIG 1	/* original version */
 %#define	RUSERSVERS_IDLE 2
 %#define	MAXUSERS 100
 %
diff --git a/lib/librpcsvc/rquota.x b/lib/librpcsvc/rquota.x
index fe6afcf3c5d..83807f4368c 100644
--- a/lib/librpcsvc/rquota.x
+++ b/lib/librpcsvc/rquota.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rquota.x,v 1.2 1997/08/19 07:54:50 niklas Exp $	*/
+/*	$OpenBSD: rquota.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Remote quota protocol
@@ -9,15 +9,15 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)rquota.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: rquota.x,v 1.2 1997/08/19 07:54:50 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: rquota.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
 const RQ_PATHLEN = 1024;
 
 struct getquota_args {
-	string gqa_pathp<RQ_PATHLEN>;  	/* path to filesystem of interest */
-	int gqa_uid;	        	/* inquire about quota for uid */
+	string gqa_pathp<RQ_PATHLEN>;	/* path to filesystem of interest */
+	int gqa_uid;			/* inquire about quota for uid */
 };
 
 /*
@@ -25,7 +25,7 @@ struct getquota_args {
  */
 struct rquota {
 	int rq_bsize;			/* block size for block counts */
-	bool rq_active;  		/* indicates whether quota is active */
+	bool rq_active;			/* indicates whether quota is active */
 	unsigned int rq_bhardlimit;	/* absolute limit on disk blks alloc */
 	unsigned int rq_bsoftlimit;	/* preferred limit on disk blks */
 	unsigned int rq_curblocks;	/* current block count */
@@ -34,11 +34,11 @@ struct rquota {
 	unsigned int rq_curfiles;	/* current # allocated files */
 	unsigned int rq_btimeleft;	/* time left for excessive disk use */
 	unsigned int rq_ftimeleft;	/* time left for excessive files */
-};	
+};
 
 enum gqr_status {
 	Q_OK = 1,		/* quota returned */
-	Q_NOQUOTA = 2,  	/* noquota for uid */
+	Q_NOQUOTA = 2,		/* noquota for uid */
 	Q_EPERM = 3		/* no permission to access quota */
 };
 
@@ -60,7 +60,7 @@ program RQUOTAPROG {
 		RQUOTAPROC_GETQUOTA(getquota_args) = 1;
 
 		/*
-	 	 * Get active quotas only
+		 * Get active quotas only
 		 */
 		getquota_rslt
 		RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2;
diff --git a/lib/librpcsvc/rstat.x b/lib/librpcsvc/rstat.x
index a49621d1a8d..80b06f8c194 100644
--- a/lib/librpcsvc/rstat.x
+++ b/lib/librpcsvc/rstat.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rstat.x,v 1.3 2003/06/19 10:10:19 deraadt Exp $	*/
+/*	$OpenBSD: rstat.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -49,7 +49,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: rstat.x,v 1.3 2003/06/19 10:10:19 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: rstat.x,v 1.4 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 
 #endif /* def RPC_HDR */
diff --git a/lib/librpcsvc/rusers.x b/lib/librpcsvc/rusers.x
index 993bcf10756..85e1afbb987 100644
--- a/lib/librpcsvc/rusers.x
+++ b/lib/librpcsvc/rusers.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rusers.x,v 1.2 1997/08/19 07:54:50 niklas Exp $	*/
+/*	$OpenBSD: rusers.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -37,7 +37,7 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)rnusers.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/
 /* @(#)rusers.x 1.1 91/12/01 Copyright 1991 Sun Microsystems, Inc. */
-%static char rcsid[] = "$OpenBSD: rusers.x,v 1.2 1997/08/19 07:54:50 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: rusers.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
diff --git a/lib/librpcsvc/sm_inter.x b/lib/librpcsvc/sm_inter.x
index 9bb9c5ad497..8d232915da9 100644
--- a/lib/librpcsvc/sm_inter.x
+++ b/lib/librpcsvc/sm_inter.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sm_inter.x,v 1.2 1997/08/19 07:54:51 niklas Exp $	*/
+/*	$OpenBSD: sm_inter.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -39,11 +39,11 @@
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)sm_inter.x 1.7 87/06/24 Copyr 1987 Sun Micro";*/
 %/*static char sccsid[] = "from: @(#)sm_inter.x	2.2 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: sm_inter.x,v 1.2 1997/08/19 07:54:51 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: sm_inter.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
-program SM_PROG { 
+program SM_PROG {
 	version SM_VERS  {
 		/* res_stat = stat_succ if status monitor agrees to monitor */
 		/* res_stat = stat_fail if status monitor cannot monitor */
@@ -89,12 +89,14 @@ struct mon_id {
 
 struct mon {
 	struct mon_id mon_id;
-	opaque priv[16]; 		/* private information to store at monitor for requesting process */
+	opaque priv[16];			/* private information to store at */
+						/* monitor for requesting process */
 };
 
 struct stat_chge {
-	string	mon_name<SM_MAXSTRLEN>;		/* name of the site that had the state change */
-	int     state;
+	string	mon_name<SM_MAXSTRLEN>;		/* name of the site that had the */
+						/* state change */
+	int	state;
 };
 
 /*
@@ -117,7 +119,7 @@ struct sm_stat_res {
 	int state;
 };
 
-/* 
+/*
  * structure of the status message sent back by the status monitor
  * when monitor site status changes
  */
diff --git a/lib/librpcsvc/spray.x b/lib/librpcsvc/spray.x
index 9d9f5f3a413..63d5558b691 100644
--- a/lib/librpcsvc/spray.x
+++ b/lib/librpcsvc/spray.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spray.x,v 1.2 1997/08/19 07:54:52 niklas Exp $	*/
+/*	$OpenBSD: spray.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -38,7 +38,7 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: spray.x,v 1.2 1997/08/19 07:54:52 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: spray.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -77,7 +77,7 @@ program SPRAYPROG {
 	version SPRAYVERS {
 		/*
 		 * Just throw away the data and increment the counter
-		 * This call never returns, so the client should always 
+		 * This call never returns, so the client should always
 		 * time it out.
 		 */
 		void
@@ -87,7 +87,7 @@ program SPRAYPROG {
 		 * Get the value of the counter and elapsed time  since
 		 * last CLEAR.
 		 */
-		spraycumul	
+		spraycumul
 		SPRAYPROC_GET(void) = 2;
 
 		/*
diff --git a/lib/librpcsvc/yp.x b/lib/librpcsvc/yp.x
index d384bf6ac2e..552f61634f7 100644
--- a/lib/librpcsvc/yp.x
+++ b/lib/librpcsvc/yp.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yp.x,v 1.4 2003/07/10 07:51:13 deraadt Exp $	*/
+/*	$OpenBSD: yp.x,v 1.5 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -36,7 +36,7 @@
 #ifndef RPC_HDR
 %#ifndef lint
 %/*static char sccsid[] = "from: @(#)yp.x	2.1 88/08/01 4.0 RPCSRC";*/
-%static char rcsid[] = "$OpenBSD: yp.x,v 1.4 2003/07/10 07:51:13 deraadt Exp $";
+%static char rcsid[] = "$OpenBSD: yp.x,v 1.5 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
@@ -165,12 +165,12 @@ struct ypresp_maplist {
 
 enum yppush_status {
 	YPPUSH_SUCC	=  1,	/* Success */
-	YPPUSH_AGE 	=  2,	/* Master's version not newer */
+	YPPUSH_AGE	=  2,	/* Master's version not newer */
 	YPPUSH_NOMAP	= -1,	/* Can't find server for map */
 	YPPUSH_NODOM	= -2,	/* Domain not supported */
 	YPPUSH_RSRC	= -3,	/* Local resource alloc failure */
 	YPPUSH_RPC	= -4,	/* RPC failure talking to server */
-	YPPUSH_MADDR 	= -5,	/* Can't get master address */
+	YPPUSH_MADDR	= -5,	/* Can't get master address */
 	YPPUSH_YPERR	= -6,	/* YP server/map db error */
 	YPPUSH_BADARGS	= -7,	/* Request arguments bad */
 	YPPUSH_DBM	= -8,	/* Local dbm operation failed */
@@ -178,8 +178,8 @@ enum yppush_status {
 	YPPUSH_SKEW	= -10,	/* Map version skew during transfer */
 	YPPUSH_CLEAR	= -11,	/* Can't send "Clear" req to local ypserv */
 	YPPUSH_FORCE	= -12,	/* No local order number in map  use -f flag. */
-	YPPUSH_XFRERR 	= -13,	/* ypxfr error */
-	YPPUSH_REFUSED	= -14 	/* Transfer request refused by ypserv */
+	YPPUSH_XFRERR	= -13,	/* ypxfr error */
+	YPPUSH_REFUSED	= -14	/* Transfer request refused by ypserv */
 };
 
 struct yppushresp_xfr {
diff --git a/lib/librpcsvc/yppasswd.x b/lib/librpcsvc/yppasswd.x
index 16b3288ab44..c4980eccf7d 100644
--- a/lib/librpcsvc/yppasswd.x
+++ b/lib/librpcsvc/yppasswd.x
@@ -1,4 +1,4 @@
-/*	$OpenBSD: yppasswd.x,v 1.2 1997/08/19 07:54:53 niklas Exp $	*/
+/*	$OpenBSD: yppasswd.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $	*/
 
 /*
  * Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -7,23 +7,23 @@
  * may copy or modify Sun RPC without charge, but are not authorized
  * to license or distribute it to anyone else except as part of a product or
  * program developed by the user.
- * 
+ *
  * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE
  * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE.
- * 
+ *
  * Sun RPC is provided with no support and without any obligation on the
  * part of Sun Microsystems, Inc. to assist in its use, correction,
  * modification or enhancement.
- * 
+ *
  * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE
  * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC
  * OR ANY PART THEREOF.
- * 
+ *
  * In no event will Sun Microsystems, Inc. be liable for any lost revenue
  * or profits or other special, indirect and consequential damages, even if
  * Sun has been advised of the possibility of such damages.
- * 
+ *
  * Sun Microsystems, Inc.
  * 2550 Garcia Avenue
  * Mountain View, California  94043
@@ -38,14 +38,14 @@
 %#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";*/
-%static char rcsid[] = "$OpenBSD: yppasswd.x,v 1.2 1997/08/19 07:54:53 niklas Exp $";
+%static char rcsid[] = "$OpenBSD: yppasswd.x,v 1.3 2004/01/17 12:32:11 deraadt Exp $";
 %#endif /* not lint */
 #endif
 
 program YPPASSWDPROG {
 	version YPPASSWDVERS {
 		/*
-		 * Update my passwd entry 
+		 * Update my passwd entry
 		 */
 		int
 		YPPASSWDPROC_UPDATE(yppasswd) = 1;