Make way for the contrib_amd bmake frame work.

5 files changed, 0 insertions, 906 deletions

diff --git a/usr.sbin/amd/rpcx/amq.h b/usr.sbin/amd/rpcx/amq.h
deleted file mode 100644
index 622762e..0000000
--- a/usr.sbin/amd/rpcx/amq.h
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 1990 Jan-Simon Pendry
- * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry at Imperial College, London.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- *	@(#)amq.h	8.1 (Berkeley) 6/6/93
- *
- * $Id$
- *
- */
-
-#define AMQ_STRLEN 1024
-
-typedef char *amq_string;
-bool_t xdr_amq_string();
-
-
-typedef long time_type;
-bool_t xdr_time_type();
-
-
-struct amq_mount_tree {
-	amq_string mt_mountinfo;
-	amq_string mt_directory;
-	amq_string mt_mountpoint;
-	amq_string mt_type;
-	time_type mt_mounttime;
-	u_short mt_mountuid;
-	int mt_getattr;
-	int mt_lookup;
-	int mt_readdir;
-	int mt_readlink;
-	int mt_statfs;
-	struct amq_mount_tree *mt_next;
-	struct amq_mount_tree *mt_child;
-};
-typedef struct amq_mount_tree amq_mount_tree;
-bool_t xdr_amq_mount_tree();
-
-
-typedef amq_mount_tree *amq_mount_tree_p;
-bool_t xdr_amq_mount_tree_p();
-
-
-struct amq_mount_info {
-	amq_string mi_type;
-	amq_string mi_mountpt;
-	amq_string mi_mountinfo;
-	amq_string mi_fserver;
-	int mi_error;
-	int mi_refc;
-	int mi_up;
-};
-typedef struct amq_mount_info amq_mount_info;
-bool_t xdr_amq_mount_info();
-
-
-typedef struct {
-	u_int amq_mount_info_list_len;
-	amq_mount_info *amq_mount_info_list_val;
-} amq_mount_info_list;
-bool_t xdr_amq_mount_info_list();
-
-
-typedef struct {
-	u_int amq_mount_tree_list_len;
-	amq_mount_tree_p *amq_mount_tree_list_val;
-} amq_mount_tree_list;
-bool_t xdr_amq_mount_tree_list();
-
-
-struct amq_mount_stats {
-	int as_drops;
-	int as_stale;
-	int as_mok;
-	int as_merr;
-	int as_uerr;
-};
-typedef struct amq_mount_stats amq_mount_stats;
-bool_t xdr_amq_mount_stats();
-
-
-enum amq_opt {
-	AMOPT_DEBUG = 0,
-	AMOPT_LOGFILE = 1,
-	AMOPT_XLOG = 2,
-	AMOPT_FLUSHMAPC = 3
-};
-typedef enum amq_opt amq_opt;
-bool_t xdr_amq_opt();
-
-
-struct amq_setopt {
-	amq_opt as_opt;
-	amq_string as_str;
-};
-typedef struct amq_setopt amq_setopt;
-bool_t xdr_amq_setopt();
-
-
-#define AMQ_PROGRAM ((u_long)300019)
-#define AMQ_VERSION ((u_long)1)
-#define AMQPROC_NULL ((u_long)0)
-extern voidp amqproc_null_1();
-#define AMQPROC_MNTTREE ((u_long)1)
-extern amq_mount_tree_p *amqproc_mnttree_1();
-#define AMQPROC_UMNT ((u_long)2)
-extern voidp amqproc_umnt_1();
-#define AMQPROC_STATS ((u_long)3)
-extern amq_mount_stats *amqproc_stats_1();
-#define AMQPROC_EXPORT ((u_long)4)
-extern amq_mount_tree_list *amqproc_export_1();
-#define AMQPROC_SETOPT ((u_long)5)
-extern int *amqproc_setopt_1();
-#define AMQPROC_GETMNTFS ((u_long)6)
-extern amq_mount_info_list *amqproc_getmntfs_1();
-#define AMQPROC_MOUNT ((u_long)7)
-extern int *amqproc_mount_1();
-#define AMQPROC_GETVERS ((u_long)8)
-extern amq_string *amqproc_getvers_1();
-
diff --git a/usr.sbin/amd/rpcx/amq.x b/usr.sbin/amd/rpcx/amq.x
deleted file mode 100644
index 9a18905..0000000
--- a/usr.sbin/amd/rpcx/amq.x
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (c) 1990 Jan-Simon Pendry
- * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry at Imperial College, London.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- *	@(#)amq.x	8.1 (Berkeley) 6/6/93
- *
- * $Id$
- *
- */
-
-/*
- * Protocol description used by the amq program
- */
-
-const AMQ_STRLEN = 1024;	/* Maximum length of a pathname */
-
-/*
- * The type dirpath is the pathname of a directory
- */
-typedef string amq_string<AMQ_STRLEN>;
-
-/*
- * The type time_type should correspond to the system time_t
- */
-typedef long time_type;
-
-/*
- * A tree of what is mounted
- */
-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_type;	/* Filesystem type */
-	time_type	mt_mounttime;	/* Mount time */
-	u_short		mt_mountuid;	/* Mounter */
-	int		mt_getattr;	/* Count of getattrs */
-	int		mt_lookup;	/* Count of lookups */
-	int		mt_readdir;	/* Count of readdirs */
-	int		mt_readlink;	/* Count of readlinks */
-	int		mt_statfs;	/* Count of statfss */
-	amq_mount_tree	*mt_next;	/* Sibling mount tree */
-	amq_mount_tree	*mt_child;	/* Child mount tree */
-};
-typedef amq_mount_tree *amq_mount_tree_p;
-
-/*
- * List of mounted filesystems
- */
-struct amq_mount_info {
-	amq_string	mi_type;	/* Type of mount */
-	amq_string	mi_mountpt;	/* Mount point */
-	amq_string	mi_mountinfo;	/* Mount info */
-	amq_string	mi_fserver;	/* Fileserver */
-	int		mi_error;	/* Error code */
-	int		mi_refc;	/* References */
-	int		mi_up;		/* Filesystem available */
-};
-typedef amq_mount_info amq_mount_info_list<>;
-
-/*
- * A list of mount trees
- */
-typedef amq_mount_tree_p amq_mount_tree_list<>;
-
-/*
- * System wide stats
- */
-struct amq_mount_stats {
-	int	as_drops;	/* Dropped requests */
-	int	as_stale;	/* Stale NFS handles */
-	int	as_mok;		/* Succesful mounts */
-	int	as_merr;	/* Failed mounts */
-	int	as_uerr;	/* Failed unmounts */
-};
-
-enum amq_opt {
-	AMOPT_DEBUG=0,
-	AMOPT_LOGFILE=1,
-	AMOPT_XLOG=2,
-	AMOPT_FLUSHMAPC=3
-};
-
-struct amq_setopt {
-	amq_opt	as_opt;		/* Option */
-	amq_string as_str;	/* String */
-};
-
-program AMQ_PROGRAM {
-	version AMQ_VERSION {
-		/*
-		 * Does no work. It is made available in all RPC services
-		 * to allow server reponse testing and timing
-		 */
-		void
-		AMQPROC_NULL(void) = 0;
-
-		/*
-		 * Returned the mount tree descending from
-		 * the given directory.  The directory must
-		 * be a top-level mount point of the automounter.
-		 */
-		amq_mount_tree_p
-		AMQPROC_MNTTREE(amq_string) = 1;
-
-		/*
-		 * Force a timeout unmount on the specified directory.
-		 */
-		void
-		AMQPROC_UMNT(amq_string) = 2;
-
-		/*
-		 * Obtain system wide statistics from the automounter
-		 */
-		amq_mount_stats
-		AMQPROC_STATS(void) = 3;
-
-		/*
-		 * Obtain full tree
-		 */
-		amq_mount_tree_list
-		AMQPROC_EXPORT(void) = 4;
-
-		/*
-		 * Control debug options.
-		 * Return status:
-		 *	-1: debug not available
-		 *	 0: everything wonderful
-		 *	>0: number of options not recognised
-		 */
-		int
-		AMQPROC_SETOPT(amq_setopt) = 5;
-
-		/*
-		 * List of mounted filesystems
-		 */
-		amq_mount_info_list
-		AMQPROC_GETMNTFS(void) = 6;
-
-		/*
-		 * Mount a filesystem
-		 */
-		int
-		AMQPROC_MOUNT(amq_string) = 7;
-
-		/*
-		 * Get version info
-		 */
-		amq_string
-		AMQPROC_GETVERS(void) = 8;
-	} = 1;
-} = 300019;	/* Allocated by Sun, 89/8/29 */
diff --git a/usr.sbin/amd/rpcx/amq_clnt.c b/usr.sbin/amd/rpcx/amq_clnt.c
deleted file mode 100644
index 40288ad..0000000
--- a/usr.sbin/amd/rpcx/amq_clnt.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * Copyright (c) 1990 Jan-Simon Pendry
- * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry at Imperial College, London.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- *	@(#)amq_clnt.c	8.1 (Berkeley) 6/6/93
- *
- * $Id$
- *
- */
-
-#include "am.h"
-#include "amq.h"
-
-static struct timeval TIMEOUT = { ALLOWED_MOUNT_TIME, 0 };
-
-voidp
-amqproc_null_1(argp, clnt)
-	voidp argp;
-	CLIENT *clnt;
-{
-	static char res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_NULL, xdr_void, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return ((voidp)&res);
-}
-
-
-amq_mount_tree_p *
-amqproc_mnttree_1(argp, clnt)
-	amq_string *argp;
-	CLIENT *clnt;
-{
-	static amq_mount_tree_p res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_MNTTREE, xdr_amq_string, argp, xdr_amq_mount_tree_p, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
-
-voidp
-amqproc_umnt_1(argp, clnt)
-	amq_string *argp;
-	CLIENT *clnt;
-{
-	static char res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_UMNT, xdr_amq_string, argp, xdr_void, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return ((voidp)&res);
-}
-
-
-amq_mount_stats *
-amqproc_stats_1(argp, clnt)
-	voidp argp;
-	CLIENT *clnt;
-{
-	static amq_mount_stats res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_STATS, xdr_void, argp, xdr_amq_mount_stats, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
-
-amq_mount_tree_list *
-amqproc_export_1(argp, clnt)
-	voidp argp;
-	CLIENT *clnt;
-{
-	static amq_mount_tree_list res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_EXPORT, xdr_void, argp, xdr_amq_mount_tree_list, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
-int *
-amqproc_setopt_1(argp, clnt)
-	amq_setopt *argp;
-	CLIENT *clnt;
-{
-	static int res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_SETOPT, xdr_amq_setopt, argp, xdr_int, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
-
-amq_mount_info_list *
-amqproc_getmntfs_1(argp, clnt)
-	voidp argp;
-	CLIENT *clnt;
-{
-	static amq_mount_info_list res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_GETMNTFS, xdr_void, argp, xdr_amq_mount_info_list, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
-
-int *
-amqproc_mount_1(argp, clnt)
-	voidp argp;
-	CLIENT *clnt;
-{
-	static int res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_MOUNT, xdr_amq_string, argp, xdr_int, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
-
-amq_string *
-amqproc_getvers_1(argp, clnt)
-	voidp argp;
-	CLIENT *clnt;
-{
-	static amq_string res;
-
-	bzero((char *)&res, sizeof(res));
-	if (clnt_call(clnt, AMQPROC_GETVERS, xdr_void, argp, xdr_amq_string, &res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&res);
-}
-
diff --git a/usr.sbin/amd/rpcx/amq_svc.c b/usr.sbin/amd/rpcx/amq_svc.c
deleted file mode 100644
index 5688644..0000000
--- a/usr.sbin/amd/rpcx/amq_svc.c
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1990 Jan-Simon Pendry
- * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry at Imperial College, London.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- *	@(#)amq_svc.c	8.1 (Berkeley) 6/6/93
- *
- * $Id: amq_svc.c,v 1.3 1997/02/22 16:04:03 peter Exp $
- *
- */
-
-#include "am.h"
-#include "amq.h"
-extern bool_t xdr_amq_mount_info_qelem();
-
-void
-amq_program_1(rqstp, transp)
-	struct svc_req *rqstp;
-	SVCXPRT *transp;
-{
-	union {
-		amq_string amqproc_mnttree_1_arg;
-		amq_string amqproc_umnt_1_arg;
-		amq_setopt amqproc_setopt_1_arg;
-		amq_string amqproc_mount_1_arg;
-	} argument;
-	char *result;
-	bool_t (*xdr_argument)(), (*xdr_result)();
-	char *(*local)();
-
-	switch (rqstp->rq_proc) {
-	case AMQPROC_NULL:
-		xdr_argument = xdr_void;
-		xdr_result = xdr_void;
-		local = (char *(*)()) amqproc_null_1;
-		break;
-
-	case AMQPROC_MNTTREE:
-		xdr_argument = xdr_amq_string;
-		xdr_result = xdr_amq_mount_tree_p;
-		local = (char *(*)()) amqproc_mnttree_1;
-		break;
-
-	case AMQPROC_UMNT:
-		xdr_argument = xdr_amq_string;
-		xdr_result = xdr_void;
-		local = (char *(*)()) amqproc_umnt_1;
-		break;
-
-	case AMQPROC_STATS:
-		xdr_argument = xdr_void;
-		xdr_result = xdr_amq_mount_stats;
-		local = (char *(*)()) amqproc_stats_1;
-		break;
-
-	case AMQPROC_EXPORT:
-		xdr_argument = xdr_void;
-		xdr_result = xdr_amq_mount_tree_list;
-		local = (char *(*)()) amqproc_export_1;
-		break;
-
-	case AMQPROC_SETOPT:
-		xdr_argument = xdr_amq_setopt;
-		xdr_result = xdr_int;
-		local = (char *(*)()) amqproc_setopt_1;
-		break;
-
-	case AMQPROC_GETMNTFS:
-		xdr_argument = xdr_void;
-		xdr_result = xdr_amq_mount_info_qelem;
-		local = (char *(*)()) amqproc_getmntfs_1;
-		break;
-
-	case AMQPROC_MOUNT:
-		xdr_argument = xdr_amq_string;
-		xdr_result = xdr_int;
-		local = (char *(*)()) amqproc_mount_1;
-		break;
-
-	case AMQPROC_GETVERS:
-		xdr_argument = xdr_void;
-		xdr_result = xdr_amq_string;
-		local = (char *(*)()) amqproc_getvers_1;
-		break;
-
-	default:
-		svcerr_noproc(transp);
-		return;
-	}
-	bzero((char *)&argument, sizeof(argument));
-	if (!svc_getargs(transp, xdr_argument, (caddr_t) &argument)) {
-		svcerr_decode(transp);
-		return;
-	}
-	result = (*local)(&argument, rqstp);
-	if (result != NULL && !svc_sendreply(transp, xdr_result, result)) {
-		svcerr_systemerr(transp);
-	}
-	if (!svc_freeargs(transp, xdr_argument, (caddr_t) &argument)) {
-		plog(XLOG_FATAL, "unable to free rpc arguments in amqprog_1");
-		going_down(1);
-	}
-}
-
diff --git a/usr.sbin/amd/rpcx/amq_xdr.c b/usr.sbin/amd/rpcx/amq_xdr.c
deleted file mode 100644
index 9666b14..0000000
--- a/usr.sbin/amd/rpcx/amq_xdr.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * Copyright (c) 1990 Jan-Simon Pendry
- * Copyright (c) 1990 Imperial College of Science, Technology & Medicine
- * Copyright (c) 1990, 1993
- *	The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Jan-Simon Pendry at Imperial College, London.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * 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.
- *
- *	@(#)amq_xdr.c	8.1 (Berkeley) 6/6/93
- *
- * $Id$
- *
- */
-
-#include "am.h"
-#include "amq.h"
-
-
-bool_t
-xdr_amq_string(xdrs, objp)
-	XDR *xdrs;
-	amq_string *objp;
-{
-	if (!xdr_string(xdrs, objp, AMQ_STRLEN)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-
-bool_t
-xdr_time_type(xdrs, objp)
-	XDR *xdrs;
-	time_type *objp;
-{
-	if (!xdr_long(xdrs, objp)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-
-bool_t
-xdr_amq_mount_tree(xdrs, objp)
-	XDR *xdrs;
-	amq_mount_tree *objp;
-{
-	if (!xdr_amq_string(xdrs, &objp->mt_mountinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->mt_directory)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->mt_mountpoint)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->mt_type)) {
-		return (FALSE);
-	}
-	if (!xdr_time_type(xdrs, &objp->mt_mounttime)) {
-		return (FALSE);
-	}
-	if (!xdr_u_short(xdrs, &objp->mt_mountuid)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mt_getattr)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mt_lookup)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mt_readdir)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mt_readlink)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mt_statfs)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)&objp->mt_next, sizeof(amq_mount_tree), xdr_amq_mount_tree)) {
-		return (FALSE);
-	}
-	if (!xdr_pointer(xdrs, (char **)&objp->mt_child, sizeof(amq_mount_tree), xdr_amq_mount_tree)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-
-bool_t
-xdr_amq_mount_tree_p(xdrs, objp)
-	XDR *xdrs;
-	amq_mount_tree_p *objp;
-{
-	if (!xdr_pointer(xdrs, (char **)objp, sizeof(amq_mount_tree), xdr_amq_mount_tree)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-bool_t
-xdr_amq_mount_info(xdrs, objp)
-	XDR *xdrs;
-	amq_mount_info *objp;
-{
-	if (!xdr_amq_string(xdrs, &objp->mi_type)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->mi_mountpt)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->mi_mountinfo)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->mi_fserver)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mi_error)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mi_refc)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->mi_up)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-bool_t
-xdr_amq_mount_info_list(xdrs, objp)
-	XDR *xdrs;
-	amq_mount_info_list *objp;
-{
-	if (!xdr_array(xdrs, (char **)&objp->amq_mount_info_list_val, (u_int *)&objp->amq_mount_info_list_len, ~0, sizeof(amq_mount_info), xdr_amq_mount_info)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-bool_t
-xdr_amq_mount_tree_list(xdrs, objp)
-	XDR *xdrs;
-	amq_mount_tree_list *objp;
-{
-	if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, (u_int *)&objp->amq_mount_tree_list_len, ~0, sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-
-bool_t
-xdr_amq_mount_stats(xdrs, objp)
-	XDR *xdrs;
-	amq_mount_stats *objp;
-{
-	if (!xdr_int(xdrs, &objp->as_drops)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->as_stale)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->as_mok)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->as_merr)) {
-		return (FALSE);
-	}
-	if (!xdr_int(xdrs, &objp->as_uerr)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-
-bool_t
-xdr_amq_opt(xdrs, objp)
-	XDR *xdrs;
-	amq_opt *objp;
-{
-	if (!xdr_enum(xdrs, (enum_t *)objp)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-
-
-
-bool_t
-xdr_amq_setopt(xdrs, objp)
-	XDR *xdrs;
-	amq_setopt *objp;
-{
-	if (!xdr_amq_opt(xdrs, &objp->as_opt)) {
-		return (FALSE);
-	}
-	if (!xdr_amq_string(xdrs, &objp->as_str)) {
-		return (FALSE);
-	}
-	return (TRUE);
-}
-
-