23 files changed, 70 insertions, 70 deletions

diff --git a/usr.sbin/amd/amd/ChangeLog b/usr.sbin/amd/amd/ChangeLog
index 2cd1807260d..db16488cebb 100644
--- a/usr.sbin/amd/amd/ChangeLog
+++ b/usr.sbin/amd/amd/ChangeLog
@@ -129,7 +129,7 @@ Fri Apr  5 19:23:50 1991  Jan-Simon Pendry  (jsp at forest)
 	* (srvr_nfs.c) calls make_nfs_auth() as required.
 
 	* (host_ops.c) calls make_nfs_auth() as required.
-	
+
 	* (afs_ops.c) allow foreground mounts to return pending.  This is
 	used by nfsx_ops.c.
 
diff --git a/usr.sbin/amd/amd/afs_ops.c b/usr.sbin/amd/amd/afs_ops.c
index 4f3d330d25d..08ca24f72b7 100644
--- a/usr.sbin/amd/amd/afs_ops.c
+++ b/usr.sbin/amd/amd/afs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: afs_ops.c,v 1.5 2002/06/11 05:29:54 itojun Exp $	*/
+/*	$OpenBSD: afs_ops.c,v 1.6 2002/07/18 02:03:00 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -136,7 +136,6 @@ char *opts;
 	/*
 	 * get fhandle of remote path for automount point
 	 */
-	
 	fhp = root_fh(dir);
 	if (!fhp) {
 		plog(XLOG_FATAL, "Can't find root file handle for %s", dir);
@@ -252,9 +251,9 @@ mntfs *mf;
 	 */
 	char *cache;
 	if (mf->mf_fo && mf->mf_fo->opt_cache)
-	  	cache = mf->mf_fo->opt_cache;
+		cache = mf->mf_fo->opt_cache;
 	else
-	  	cache = "none";
+		cache = "none";
 	mf->mf_private = (voidp) mapc_find(mf->mf_info, cache);
 	mf->mf_prfree = mapc_free;
 }
@@ -426,7 +425,7 @@ static void union_mounted(mf)
 mntfs *mf;
 {
 	int i;
-	
+
 	afs_mkcacheref(mf);
 
 	/*
@@ -1436,7 +1435,7 @@ in_progrss:
 	dlog("searching for /defaults entry");
 #endif /* DEBUG */
 	if (mapc_search((mnt_map*) mf->mf_private, "/defaults", &dflts) == 0) {
-	  	char *dfl;
+		char *dfl;
 		char **rvec;
 #ifdef DEBUG
 		dlog("/defaults gave %s", dflts);
@@ -1620,10 +1619,10 @@ int count;
 		 * Check for enough room.  This is extremely
 		 * approximate but is more than enough space.
 		 * Really need 2 times:
-		 * 	4byte fileid
-		 * 	4byte cookie
-		 * 	4byte name length
-		 * 	4byte name
+		 *	4byte fileid
+		 *	4byte cookie
+		 *	4byte name length
+		 *	4byte name
 		 * plus the dirlist structure
 		 */
 		if (count <
diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c
index 6c368a8a29a..b1407866af0 100644
--- a/usr.sbin/amd/amd/amq_subr.c
+++ b/usr.sbin/amd/amd/amq_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq_subr.c	8.1 (Berkeley) 6/6/93
- *	$Id: amq_subr.c,v 1.6 2002/06/11 05:29:54 itojun Exp $
+ *	$Id: amq_subr.c,v 1.7 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -251,9 +251,9 @@ struct svc_req *rqstp;
 {
 	static int rc;
 	char *s = *(amq_string *) argp;
-  
+
 	plog(XLOG_ERROR, "amq requested mount of %s, but code is disabled", s);
-   
+
 	rc = EACCES;
 	return &rc;
 }
diff --git a/usr.sbin/amd/amd/get_args.c b/usr.sbin/amd/amd/get_args.c
index e00f9051d3f..0ddf9112693 100644
--- a/usr.sbin/amd/amd/get_args.c
+++ b/usr.sbin/amd/amd/get_args.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)get_args.c	8.1 (Berkeley) 6/6/93
- *	$Id: get_args.c,v 1.4 2002/06/10 21:07:14 itojun Exp $
+ *	$Id: get_args.c,v 1.5 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -174,7 +174,7 @@ char *v[];
 			afs_timeo = atoi(optarg);
 		  }
 		  if (dot) {
-		  	afs_retrans = atoi(dot+1);
+			afs_retrans = atoi(dot+1);
 			*dot = '.';
 		  }
 		}
diff --git a/usr.sbin/amd/amd/host_ops.c b/usr.sbin/amd/amd/host_ops.c
index c1db515f292..cc752d52c83 100644
--- a/usr.sbin/amd/amd/host_ops.c
+++ b/usr.sbin/amd/amd/host_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: host_ops.c,v 1.6 2002/06/11 05:29:54 itojun Exp $	*/
+/*	$OpenBSD: host_ops.c,v 1.7 2002/07/18 02:03:00 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -97,7 +97,6 @@ am_opts *fo;
 	if (!fo->opt_rfs)
 		fo->opt_rfs = "/";
 
-	
 	return (*nfs_ops.fs_match)(fo);
 }
 
@@ -614,7 +613,7 @@ char *opts;
 		char **cp = argv;
 		plog(XLOG_DEBUG, "executing (un)mount command...");
 		while (*cp) {
-	  		plog(XLOG_DEBUG, "arg[%d] = '%s'", cp-argv, *cp);
+			plog(XLOG_DEBUG, "arg[%d] = '%s'", cp-argv, *cp);
 			cp++;
 		}
 	}
diff --git a/usr.sbin/amd/amd/info_hes.c b/usr.sbin/amd/amd/info_hes.c
index 6905b8535df..e90e3658c0a 100644
--- a/usr.sbin/amd/amd/info_hes.c
+++ b/usr.sbin/amd/amd/info_hes.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)info_hes.c	8.1 (Berkeley) 6/6/93
- *	$Id: info_hes.c,v 1.8 2002/07/18 00:50:23 pvalchev Exp $
+ *	$Id: info_hes.c,v 1.9 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -273,7 +273,7 @@ hs_res_send(char *buf, int buflen, char *answer, int anslen)
 				      sizeof(struct in_addr));
 				server.sin_family = AF_INET;
 				server.sin_port = htons(NAMESERVER_PORT);
-					
+
 				if (connect(s, &server,
 					    sizeof(struct sockaddr)) < 0) {
 					(void) close(s);
@@ -458,7 +458,7 @@ hs_strip_our_domain(char *name)
 {
 	char *end_pos;
 	short targ_len, cur_len;
-	
+
 	targ_len = strlen(hs_domain);
 	cur_len = strlen(name);
 	if (cur_len <= targ_len)
diff --git a/usr.sbin/amd/amd/info_nis.c b/usr.sbin/amd/amd/info_nis.c
index fd128fdfdc4..7f6d4461e2c 100644
--- a/usr.sbin/amd/amd/info_nis.c
+++ b/usr.sbin/amd/amd/info_nis.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)info_nis.c	8.1 (Berkeley) 6/6/93
- *	$Id: info_nis.c,v 1.5 2002/07/18 00:50:23 pvalchev Exp $
+ *	$Id: info_nis.c,v 1.6 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -207,7 +207,7 @@ int nis_search(mnt_map *m, char *map, char *key, char **val, time_t *tp)
 	} else {
 		/*
 		 * NIS+ server without yp_order
-		 * Check if timeout has expired to invalidate the cache 
+		 * Check if timeout has expired to invalidate the cache
 		 */
 		order = time(NULL);
 		if ((time_t)order - *tp > am_timeo) {
diff --git a/usr.sbin/amd/amd/info_passwd.c b/usr.sbin/amd/amd/info_passwd.c
index a5e59edcbec..035c75ee4d9 100644
--- a/usr.sbin/amd/amd/info_passwd.c
+++ b/usr.sbin/amd/amd/info_passwd.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)info_passwd.c	8.1 (Berkeley) 6/6/93
- *	$Id: info_passwd.c,v 1.4 2002/07/18 00:50:23 pvalchev Exp $
+ *	$Id: info_passwd.c,v 1.5 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -102,7 +102,7 @@ int passwd_search(mnt_map *m, char *map, char *key, char **pval, time_t *tp)
 		*user++ = '\0';
 		/*
 		 * Find start of host "path".  If no / then Invalid...
-		 */ 
+		 */
 		p = strchr(dir+1, '/');
 		if (!p)
 			goto enoent;
diff --git a/usr.sbin/amd/amd/map.c b/usr.sbin/amd/amd/map.c
index ec2ece5db48..a874611de76 100644
--- a/usr.sbin/amd/amd/map.c
+++ b/usr.sbin/amd/amd/map.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: map.c,v 1.4 2001/03/02 06:22:03 deraadt Exp $	*/
+/*	$OpenBSD: map.c,v 1.5 2002/07/18 02:03:00 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -40,7 +40,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)map.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: map.c,v 1.4 2001/03/02 06:22:03 deraadt Exp $";
+static char *rcsid = "$OpenBSD: map.c,v 1.5 2002/07/18 02:03:00 deraadt Exp $";
 #endif /* not lint */
 
 #include "am.h"
@@ -125,7 +125,6 @@ int nsize;
 	return 1;
 }
 
-	
 /*
  * The root of the mount tree.
  */
diff --git a/usr.sbin/amd/amd/mapc.c b/usr.sbin/amd/amd/mapc.c
index 32fa7e2acbd..c11cec0ed50 100644
--- a/usr.sbin/amd/amd/mapc.c
+++ b/usr.sbin/amd/amd/mapc.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)mapc.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: mapc.c,v 1.4 2002/06/11 05:29:54 itojun Exp $";
+static char *rcsid = "$Id: mapc.c,v 1.5 2002/07/18 02:03:00 deraadt Exp $";
 #endif /* not lint */
 
 /*
@@ -163,7 +163,7 @@ qelem map_list_head = { &map_list_head, &map_list_head };
 /*
  * Configuration
  */
- 
+
 /* ROOT MAP */
 static int root_init P((char*, time_t*));
 
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index d10747fccf2..c5b93400521 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_ops.c,v 1.13 2002/07/18 00:50:23 pvalchev Exp $	*/
+/*	$OpenBSD: nfs_ops.c,v 1.14 2002/07/18 02:03:00 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -40,7 +40,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)nfs_ops.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.13 2002/07/18 00:50:23 pvalchev Exp $";
+static char *rcsid = "$OpenBSD: nfs_ops.c,v 1.14 2002/07/18 02:03:00 deraadt Exp $";
 #endif /* not lint */
 
 #include "am.h"
@@ -432,7 +432,7 @@ static int nfs_init(mntfs *mf)
 	if (!mf->mf_private) {
 		int error;
 		fhstatus fhs;
-	
+
 		char *colon = strchr(mf->mf_info, ':');
 		if (colon == 0)
 			return ENOENT;
@@ -568,7 +568,7 @@ int mount_nfs_fh(fhstatus *fhp, char *dir, char *fs_name, char *opts, mntfs *mf)
  * This isn't supported by the ping algorithm yet.
  * In any case, it is all done in nfs_init().
  */
- 	if (port = hasmntval(&mnt, "port"))
+	if (port = hasmntval(&mnt, "port"))
 		sin.sin_port = htons(port);
 	else
 		sin.sin_port = htons(NFS_PORT);	/* XXX should use portmapper */
diff --git a/usr.sbin/amd/amd/nfs_start.c b/usr.sbin/amd/amd/nfs_start.c
index 44c72da8724..e3cc5e167c0 100644
--- a/usr.sbin/amd/amd/nfs_start.c
+++ b/usr.sbin/amd/amd/nfs_start.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nfs_start.c	8.1 (Berkeley) 6/6/93
- *	$Id: nfs_start.c,v 1.8 2002/07/18 00:50:23 pvalchev Exp $
+ *	$Id: nfs_start.c,v 1.9 2002/07/18 02:03:00 deraadt Exp $
  */
 
 #include "am.h"
@@ -315,7 +315,7 @@ static serv_state run_rpc(P_void)
 #ifdef FD_SET
 			if (FD_ISSET(fwd_sock, fdsp)) {
 				FD_CLR(fwd_sock, fdsp);
-				--nsel;	
+				--nsel;
 				do {
 					fwd_reply();
 				} while (rpc_pending_now() > 0);
@@ -323,7 +323,7 @@ static serv_state run_rpc(P_void)
 #else
 			if (readfds & (1 << fwd_sock)) {
 				readfds &= ~(1 << fwd_sock);
-				--nsel;	
+				--nsel;
 				do {
 					fwd_reply();
 				} while (rpc_pending_now() > 0);
@@ -390,7 +390,7 @@ int mount_automounter(pid_t ppid)
 		return 1;
 	}
 
-	if ((nfsxprt = svcudp_create(so)) == NULL || 
+	if ((nfsxprt = svcudp_create(so)) == NULL ||
 			(amqp = svcudp_create(so)) == NULL) {
 		plog(XLOG_FATAL, "cannot create rpc/udp service");
 		return 2;
diff --git a/usr.sbin/amd/amd/nfsx_ops.c b/usr.sbin/amd/amd/nfsx_ops.c
index 177bd6dc242..e5ba0bacbb1 100644
--- a/usr.sbin/amd/amd/nfsx_ops.c
+++ b/usr.sbin/amd/amd/nfsx_ops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)nfsx_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: nfsx_ops.c,v 1.2 2001/03/02 06:22:04 deraadt Exp $
+ *	$Id: nfsx_ops.c,v 1.3 2002/07/18 02:03:00 deraadt Exp $
  */
 
 #include "am.h"
@@ -200,9 +200,9 @@ mntfs *mf;
 		  char *fs = mf->mf_fo->opt_fs;
 		  char *rfs = 0;
 		  for (i = 0; i < nx->nx_c; i++) {
-		  	char *path = ivec[i+1];
+			char *path = ivec[i+1];
 			rfs = str3cat(rfs, pref, "/", path);
-		  	/*
+			/*
 			 * Determine the mount point.
 			 * If this is the root, then don't remove
 			 * the trailing slash to avoid mntfs name clashes.
diff --git a/usr.sbin/amd/amd/pfs_ops.c b/usr.sbin/amd/amd/pfs_ops.c
index e9d9b67a97c..93ea8078ef2 100644
--- a/usr.sbin/amd/amd/pfs_ops.c
+++ b/usr.sbin/amd/amd/pfs_ops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pfs_ops.c	8.1 (Berkeley) 6/6/93
- *	$Id: pfs_ops.c,v 1.2 2001/03/02 06:22:04 deraadt Exp $
+ *	$Id: pfs_ops.c,v 1.3 2002/07/18 02:03:00 deraadt Exp $
  */
 
 #include "am.h"
@@ -106,7 +106,7 @@ char *info;
 		char **cp = xivec;
 		plog(XLOG_DEBUG, "executing (un)mount command...");
 		while (*cp) {
-	  		plog(XLOG_DEBUG, "arg[%d] = '%s'", cp-xivec, *cp);
+			plog(XLOG_DEBUG, "arg[%d] = '%s'", cp-xivec, *cp);
 			cp++;
 		}
 	}
diff --git a/usr.sbin/amd/amd/restart.c b/usr.sbin/amd/amd/restart.c
index 9d75d32503b..b85b0a4c207 100644
--- a/usr.sbin/amd/amd/restart.c
+++ b/usr.sbin/amd/amd/restart.c
@@ -38,7 +38,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)restart.c	8.1 (Berkeley) 6/6/93";*/
-static char *rcsid = "$Id: restart.c,v 1.1 1995/10/18 08:47:12 deraadt Exp $";
+static char *rcsid = "$Id: restart.c,v 1.2 2002/07/18 02:03:00 deraadt Exp $";
 #endif /* not lint */
 
 #include "am.h"
@@ -120,7 +120,7 @@ void restart()
 				mo.opt_rfs = strdup(cp+1);
 				*cp = ':';
 			} else if (fs_ops->ffserver == find_nfs_srvr) {
-				/* 
+				/*
 				 * Prototype 4.4 BSD used to end up here -
 				 * might as well keep the workaround for now
 				 */
diff --git a/usr.sbin/amd/amd/rpc_fwd.c b/usr.sbin/amd/amd/rpc_fwd.c
index e92286377bc..906aadae330 100644
--- a/usr.sbin/amd/amd/rpc_fwd.c
+++ b/usr.sbin/amd/amd/rpc_fwd.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)rpc_fwd.c	8.1 (Berkeley) 6/6/93
- *	$Id: rpc_fwd.c,v 1.2 2002/06/11 05:29:54 itojun Exp $
+ *	$Id: rpc_fwd.c,v 1.3 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -134,7 +134,7 @@ static rpc_forward *fwd_alloc()
 
 	/*
 	 * Set the time to live field
-	 * Timeout in 43 seconds 
+	 * Timeout in 43 seconds
 	 */
 	p->rf_ttl = now + 43;
 
@@ -291,8 +291,11 @@ fwd_fun cb;
 	 * rest of "p" otherwise nasty things happen later...
 	 */
 #ifdef DEBUG
-	{ char dq[20]; 
-	dlog("Sending packet id %#x to %s.%d", p->rf_xid, inet_dquad(dq, sizeof(dq), fwdto->sin_addr.s_addr), ntohs(fwdto->sin_port));
+	{ char dq[20];
+
+	dlog("Sending packet id %#x to %s.%d", p->rf_xid,
+	    inet_dquad(dq, sizeof(dq), fwdto->sin_addr.s_addr),
+	    ntohs(fwdto->sin_port));
 	}
 #endif /* DEBUG */
 	if (sendto(fwd_sock, (char *) pkt, len, 0,
diff --git a/usr.sbin/amd/amd/srvr_nfs.c b/usr.sbin/amd/amd/srvr_nfs.c
index de5984c15ee..8c872ae4d6c 100644
--- a/usr.sbin/amd/amd/srvr_nfs.c
+++ b/usr.sbin/amd/amd/srvr_nfs.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)srvr_nfs.c	8.1 (Berkeley) 6/6/93
- *	$Id: srvr_nfs.c,v 1.2 1997/01/31 14:42:02 graichen Exp $
+ *	$Id: srvr_nfs.c,v 1.3 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -243,7 +243,7 @@ static void nfs_keepalive P((fserver*));
 static void recompute_portmap P((fserver *fs));
 static void recompute_portmap(fs)
 fserver *fs;
-{				
+{
 	int error;
 
 	if (nfs_auth)
@@ -356,7 +356,7 @@ int done;
 			if (np->np_mountd_inval)
 				recompute_portmap(fs);
 
-#ifdef DEBUG	
+#ifdef DEBUG
 			found_map++;
 #endif /* DEBUG */
 			break;
diff --git a/usr.sbin/amd/amd/umount_fs.c b/usr.sbin/amd/amd/umount_fs.c
index 8b81aa4f657..6e6ba2e1f40 100644
--- a/usr.sbin/amd/amd/umount_fs.c
+++ b/usr.sbin/amd/amd/umount_fs.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)umount_fs.c	8.1 (Berkeley) 6/6/93
- *	$Id: umount_fs.c,v 1.1 1995/10/18 08:47:12 deraadt Exp $
+ *	$Id: umount_fs.c,v 1.2 2002/07/18 02:03:00 deraadt Exp $
  */
 
 #include "am.h"
@@ -187,7 +187,7 @@ char *fs_name;
 		if (!error) {
 		        free_mntlist(mlist);
 			mp = mlist = read_mtab(fs_name);
-			
+
 			/*
 			 * Search the mount table looking for
 			 * the correct (ie last) matching entry
@@ -199,7 +199,7 @@ char *fs_name;
 					mp_save = mp;
 				mp = mp->mnext;
 			}
-			
+
 			if (mp_save) {
 				mnt_free(mp_save->mnt);
 				mp_save->mnt = 0;
diff --git a/usr.sbin/amd/amd/util.c b/usr.sbin/amd/amd/util.c
index 837616f83ed..bb65761b2f2 100644
--- a/usr.sbin/amd/amd/util.c
+++ b/usr.sbin/amd/amd/util.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)util.c	8.1 (Berkeley) 6/6/93
- *	$Id: util.c,v 1.6 2002/06/11 05:29:54 itojun Exp $
+ *	$Id: util.c,v 1.7 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -144,7 +144,7 @@ int qc;
 				 */
 				s++;
 				while (*s && *s != qc)
-				 	s++;
+					s++;
 				if (*s == qc)
 					s++;
 			}
diff --git a/usr.sbin/amd/amd/wire.c b/usr.sbin/amd/amd/wire.c
index 6c0f0781d60..1d209430a4a 100644
--- a/usr.sbin/amd/amd/wire.c
+++ b/usr.sbin/amd/amd/wire.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)wire.c	8.1 (Berkeley) 6/6/93
- *	$Id: wire.c,v 1.8 2002/06/11 05:29:54 itojun Exp $
+ *	$Id: wire.c,v 1.9 2002/07/18 02:03:00 deraadt Exp $
  */
 
 /*
@@ -186,9 +186,9 @@ char *getwire()
 			 * Figure out the subnet's network address
 			 */
 			subnet = address & netmask;
-		  
+
 #ifdef IN_CLASSA
-			subnet = ntohl(subnet); 
+			subnet = ntohl(subnet);
 
 			if (IN_CLASSA(subnet)) {
 				mask = IN_CLASSA_NET;
@@ -244,7 +244,7 @@ char *getwire()
 
 out:
 	if (sk >= 0)
-		(void) close(sk); 
+		(void) close(sk);
 	if (netname)
 		return netname;
 	return strdup(NO_SUBNET);
diff --git a/usr.sbin/amd/amd/xutil.c b/usr.sbin/amd/amd/xutil.c
index 445bc20879d..54c8d765779 100644
--- a/usr.sbin/amd/amd/xutil.c
+++ b/usr.sbin/amd/amd/xutil.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)xutil.c	8.1 (Berkeley) 6/6/93
- *	$Id: xutil.c,v 1.6 2002/05/26 02:49:50 deraadt Exp $
+ *	$Id: xutil.c,v 1.7 2002/07/18 02:03:00 deraadt Exp $
  */
 
 #include "config.h"
@@ -240,7 +240,7 @@ extern char **gargv;
 
 	switch (lvl) {
 	case XLOG_FATAL:	sev = "fatal:"; break;
-	case XLOG_ERROR: 	sev = "error:"; break;
+	case XLOG_ERROR:	sev = "error:"; break;
 	case XLOG_USER:		sev = "user: "; break;
 	case XLOG_WARNING:	sev = "warn: "; break;
 	case XLOG_INFO:		sev = "info: "; break;
@@ -301,7 +301,7 @@ char *j, *s, *_, *p, *e, *n, *d, *r, *y;
 	if (syslogging) {
 		switch(lvl) {	/* from mike <mcooper@usc.edu> */
 		case XLOG_FATAL:	lvl = LOG_CRIT; break;
-		case XLOG_ERROR: 	lvl = LOG_ERR; break;
+		case XLOG_ERROR:	lvl = LOG_ERR; break;
 		case XLOG_USER:		lvl = LOG_WARNING; break;
 		case XLOG_WARNING:	lvl = LOG_WARNING; break;
 		case XLOG_INFO:		lvl = LOG_INFO; break;
diff --git a/usr.sbin/amd/rpcx/amq.x b/usr.sbin/amd/rpcx/amq.x
index 82d5e2a05c5..f72fc82b793 100644
--- a/usr.sbin/amd/rpcx/amq.x
+++ b/usr.sbin/amd/rpcx/amq.x
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq.x	8.1 (Berkeley) 6/6/93
- *	$Id: amq.x,v 1.2 1997/01/31 14:42:22 graichen Exp $
+ *	$Id: amq.x,v 1.3 2002/07/18 02:03:00 deraadt Exp $
  *
  */
 
@@ -62,8 +62,8 @@ typedef int time_type;
  */
 struct amq_mount_tree {
 	amq_string	mt_mountinfo;	/* Mounted filesystem */
-	amq_string 	mt_directory;	/* Virtual mount */
-	amq_string 	mt_mountpoint;	/* Mount point */
+	amq_string	mt_directory;	/* Virtual mount */
+	amq_string	mt_mountpoint;	/* Mount point */
 	amq_string	mt_type;	/* Filesystem type */
 	time_type	mt_mounttime;	/* Mount time */
 	u_short		mt_mountuid;	/* Mounter */
diff --git a/usr.sbin/amd/rpcx/mount.h b/usr.sbin/amd/rpcx/mount.h
index 4e9f16ac433..7b133b0cfed 100644
--- a/usr.sbin/amd/rpcx/mount.h
+++ b/usr.sbin/amd/rpcx/mount.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mount.h,v 1.2 1996/03/25 15:54:56 niklas Exp $	*/
+/*	$OpenBSD: mount.h,v 1.3 2002/07/18 02:03:00 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -55,7 +55,7 @@ typedef struct fhstatus {
 typedef char fhandle[NFSX_V3FHMAX];
 typedef struct fhstatus {
 	u_long		fhs_stat;
- 	long		fhs_vers;
+	long		fhs_vers;
 	long		fhs_auth;
 	long		fhs_size;
 	fhandle		fhs_fhandle;