regen

4 files changed, 75 insertions, 103 deletions

diff --git a/usr.sbin/amd/rpcx/amq.h b/usr.sbin/amd/rpcx/amq.h
index 484c3b1f717..c51fdd34455 100644
--- a/usr.sbin/amd/rpcx/amq.h
+++ b/usr.sbin/amd/rpcx/amq.h
@@ -22,7 +22,7 @@ bool_t xdr_amq_string();
 #endif /* Old Style C */
 
 
-typedef int time_type;
+typedef int64_t time_type;
 #ifdef __cplusplus
 extern "C" bool_t xdr_time_type(XDR *, time_type *);
 #elif defined(__STDC__)
@@ -160,94 +160,85 @@ bool_t xdr_amq_setopt();
 
 
 #define AMQ_PROGRAM ((u_long)300019)
-#define AMQ_VERSION ((u_long)1)
+#define AMQ_VERSION ((u_long)57)
 
 #ifdef __cplusplus
 #define AMQPROC_NULL ((u_long)0)
-extern "C" void * amqproc_null_1(void *, CLIENT *);
-extern "C" void * amqproc_null_1_svc(void *, struct svc_req *);
+extern "C" void * amqproc_null_57(void *, CLIENT *);
+extern "C" void * amqproc_null_57_svc(void *, struct svc_req *);
 #define AMQPROC_MNTTREE ((u_long)1)
-extern "C" amq_mount_tree_p * amqproc_mnttree_1(amq_string *, CLIENT *);
-extern "C" amq_mount_tree_p * amqproc_mnttree_1_svc(amq_string *, struct svc_req *);
+extern "C" amq_mount_tree_p * amqproc_mnttree_57(amq_string *, CLIENT *);
+extern "C" amq_mount_tree_p * amqproc_mnttree_57_svc(amq_string *, struct svc_req *);
 #define AMQPROC_UMNT ((u_long)2)
-extern "C" void * amqproc_umnt_1(amq_string *, CLIENT *);
-extern "C" void * amqproc_umnt_1_svc(amq_string *, struct svc_req *);
+extern "C" void * amqproc_umnt_57(amq_string *, CLIENT *);
+extern "C" void * amqproc_umnt_57_svc(amq_string *, struct svc_req *);
 #define AMQPROC_STATS ((u_long)3)
-extern "C" amq_mount_stats * amqproc_stats_1(void *, CLIENT *);
-extern "C" amq_mount_stats * amqproc_stats_1_svc(void *, struct svc_req *);
+extern "C" amq_mount_stats * amqproc_stats_57(void *, CLIENT *);
+extern "C" amq_mount_stats * amqproc_stats_57_svc(void *, struct svc_req *);
 #define AMQPROC_EXPORT ((u_long)4)
-extern "C" amq_mount_tree_list * amqproc_export_1(void *, CLIENT *);
-extern "C" amq_mount_tree_list * amqproc_export_1_svc(void *, struct svc_req *);
+extern "C" amq_mount_tree_list * amqproc_export_57(void *, CLIENT *);
+extern "C" amq_mount_tree_list * amqproc_export_57_svc(void *, struct svc_req *);
 #define AMQPROC_SETOPT ((u_long)5)
-extern "C" int * amqproc_setopt_1(amq_setopt *, CLIENT *);
-extern "C" int * amqproc_setopt_1_svc(amq_setopt *, struct svc_req *);
+extern "C" int * amqproc_setopt_57(amq_setopt *, CLIENT *);
+extern "C" int * amqproc_setopt_57_svc(amq_setopt *, struct svc_req *);
 #define AMQPROC_GETMNTFS ((u_long)6)
-extern "C" amq_mount_info_list * amqproc_getmntfs_1(void *, CLIENT *);
-extern "C" amq_mount_info_list * amqproc_getmntfs_1_svc(void *, struct svc_req *);
-#define AMQPROC_MOUNT ((u_long)7)
-extern "C" int * amqproc_mount_1(amq_string *, CLIENT *);
-extern "C" int * amqproc_mount_1_svc(amq_string *, struct svc_req *);
-#define AMQPROC_GETVERS ((u_long)8)
-extern "C" amq_string * amqproc_getvers_1(void *, CLIENT *);
-extern "C" amq_string * amqproc_getvers_1_svc(void *, struct svc_req *);
+extern "C" amq_mount_info_list * amqproc_getmntfs_57(void *, CLIENT *);
+extern "C" amq_mount_info_list * amqproc_getmntfs_57_svc(void *, struct svc_req *);
+#define AMQPROC_GETVERS ((u_long)7)
+extern "C" amq_string * amqproc_getvers_57(void *, CLIENT *);
+extern "C" amq_string * amqproc_getvers_57_svc(void *, struct svc_req *);
 
 #elif defined(__STDC__)
 #define AMQPROC_NULL ((u_long)0)
-extern void * amqproc_null_1(void *, CLIENT *);
-extern void * amqproc_null_1_svc(void *, struct svc_req *);
+extern void * amqproc_null_57(void *, CLIENT *);
+extern void * amqproc_null_57_svc(void *, struct svc_req *);
 #define AMQPROC_MNTTREE ((u_long)1)
-extern amq_mount_tree_p * amqproc_mnttree_1(amq_string *, CLIENT *);
-extern amq_mount_tree_p * amqproc_mnttree_1_svc(amq_string *, struct svc_req *);
+extern amq_mount_tree_p * amqproc_mnttree_57(amq_string *, CLIENT *);
+extern amq_mount_tree_p * amqproc_mnttree_57_svc(amq_string *, struct svc_req *);
 #define AMQPROC_UMNT ((u_long)2)
-extern void * amqproc_umnt_1(amq_string *, CLIENT *);
-extern void * amqproc_umnt_1_svc(amq_string *, struct svc_req *);
+extern void * amqproc_umnt_57(amq_string *, CLIENT *);
+extern void * amqproc_umnt_57_svc(amq_string *, struct svc_req *);
 #define AMQPROC_STATS ((u_long)3)
-extern amq_mount_stats * amqproc_stats_1(void *, CLIENT *);
-extern amq_mount_stats * amqproc_stats_1_svc(void *, struct svc_req *);
+extern amq_mount_stats * amqproc_stats_57(void *, CLIENT *);
+extern amq_mount_stats * amqproc_stats_57_svc(void *, struct svc_req *);
 #define AMQPROC_EXPORT ((u_long)4)
-extern amq_mount_tree_list * amqproc_export_1(void *, CLIENT *);
-extern amq_mount_tree_list * amqproc_export_1_svc(void *, struct svc_req *);
+extern amq_mount_tree_list * amqproc_export_57(void *, CLIENT *);
+extern amq_mount_tree_list * amqproc_export_57_svc(void *, struct svc_req *);
 #define AMQPROC_SETOPT ((u_long)5)
-extern int * amqproc_setopt_1(amq_setopt *, CLIENT *);
-extern int * amqproc_setopt_1_svc(amq_setopt *, struct svc_req *);
+extern int * amqproc_setopt_57(amq_setopt *, CLIENT *);
+extern int * amqproc_setopt_57_svc(amq_setopt *, struct svc_req *);
 #define AMQPROC_GETMNTFS ((u_long)6)
-extern amq_mount_info_list * amqproc_getmntfs_1(void *, CLIENT *);
-extern amq_mount_info_list * amqproc_getmntfs_1_svc(void *, struct svc_req *);
-#define AMQPROC_MOUNT ((u_long)7)
-extern int * amqproc_mount_1(amq_string *, CLIENT *);
-extern int * amqproc_mount_1_svc(amq_string *, struct svc_req *);
-#define AMQPROC_GETVERS ((u_long)8)
-extern amq_string * amqproc_getvers_1(void *, CLIENT *);
-extern amq_string * amqproc_getvers_1_svc(void *, struct svc_req *);
+extern amq_mount_info_list * amqproc_getmntfs_57(void *, CLIENT *);
+extern amq_mount_info_list * amqproc_getmntfs_57_svc(void *, struct svc_req *);
+#define AMQPROC_GETVERS ((u_long)7)
+extern amq_string * amqproc_getvers_57(void *, CLIENT *);
+extern amq_string * amqproc_getvers_57_svc(void *, struct svc_req *);
 
 #else /* Old Style C */
 #define AMQPROC_NULL ((u_long)0)
-extern void * amqproc_null_1();
-extern void * amqproc_null_1_svc();
+extern void * amqproc_null_57();
+extern void * amqproc_null_57_svc();
 #define AMQPROC_MNTTREE ((u_long)1)
-extern amq_mount_tree_p * amqproc_mnttree_1();
-extern amq_mount_tree_p * amqproc_mnttree_1_svc();
+extern amq_mount_tree_p * amqproc_mnttree_57();
+extern amq_mount_tree_p * amqproc_mnttree_57_svc();
 #define AMQPROC_UMNT ((u_long)2)
-extern void * amqproc_umnt_1();
-extern void * amqproc_umnt_1_svc();
+extern void * amqproc_umnt_57();
+extern void * amqproc_umnt_57_svc();
 #define AMQPROC_STATS ((u_long)3)
-extern amq_mount_stats * amqproc_stats_1();
-extern amq_mount_stats * amqproc_stats_1_svc();
+extern amq_mount_stats * amqproc_stats_57();
+extern amq_mount_stats * amqproc_stats_57_svc();
 #define AMQPROC_EXPORT ((u_long)4)
-extern amq_mount_tree_list * amqproc_export_1();
-extern amq_mount_tree_list * amqproc_export_1_svc();
+extern amq_mount_tree_list * amqproc_export_57();
+extern amq_mount_tree_list * amqproc_export_57_svc();
 #define AMQPROC_SETOPT ((u_long)5)
-extern int * amqproc_setopt_1();
-extern int * amqproc_setopt_1_svc();
+extern int * amqproc_setopt_57();
+extern int * amqproc_setopt_57_svc();
 #define AMQPROC_GETMNTFS ((u_long)6)
-extern amq_mount_info_list * amqproc_getmntfs_1();
-extern amq_mount_info_list * amqproc_getmntfs_1_svc();
-#define AMQPROC_MOUNT ((u_long)7)
-extern int * amqproc_mount_1();
-extern int * amqproc_mount_1_svc();
-#define AMQPROC_GETVERS ((u_long)8)
-extern amq_string * amqproc_getvers_1();
-extern amq_string * amqproc_getvers_1_svc();
+extern amq_mount_info_list * amqproc_getmntfs_57();
+extern amq_mount_info_list * amqproc_getmntfs_57_svc();
+#define AMQPROC_GETVERS ((u_long)7)
+extern amq_string * amqproc_getvers_57();
+extern amq_string * amqproc_getvers_57_svc();
 #endif /* Old Style C */
 
 #endif /* !_AMQ_H_RPCGEN */
diff --git a/usr.sbin/amd/rpcx/amq_clnt.c b/usr.sbin/amd/rpcx/amq_clnt.c
index 65988e0ea6e..1d2637b1529 100644
--- a/usr.sbin/amd/rpcx/amq_clnt.c
+++ b/usr.sbin/amd/rpcx/amq_clnt.c
@@ -10,7 +10,7 @@
 static struct timeval TIMEOUT = { 25, 0 };
 
 void *
-amqproc_null_1(void *argp, CLIENT *clnt)
+amqproc_null_57(void *argp, CLIENT *clnt)
 {
 	static char clnt_res;
 
@@ -22,7 +22,7 @@ amqproc_null_1(void *argp, CLIENT *clnt)
 }
 
 amq_mount_tree_p *
-amqproc_mnttree_1(amq_string *argp, CLIENT *clnt)
+amqproc_mnttree_57(amq_string *argp, CLIENT *clnt)
 {
 	static amq_mount_tree_p clnt_res;
 
@@ -34,7 +34,7 @@ amqproc_mnttree_1(amq_string *argp, CLIENT *clnt)
 }
 
 void *
-amqproc_umnt_1(amq_string *argp, CLIENT *clnt)
+amqproc_umnt_57(amq_string *argp, CLIENT *clnt)
 {
 	static char clnt_res;
 
@@ -46,7 +46,7 @@ amqproc_umnt_1(amq_string *argp, CLIENT *clnt)
 }
 
 amq_mount_stats *
-amqproc_stats_1(void *argp, CLIENT *clnt)
+amqproc_stats_57(void *argp, CLIENT *clnt)
 {
 	static amq_mount_stats clnt_res;
 
@@ -58,7 +58,7 @@ amqproc_stats_1(void *argp, CLIENT *clnt)
 }
 
 amq_mount_tree_list *
-amqproc_export_1(void *argp, CLIENT *clnt)
+amqproc_export_57(void *argp, CLIENT *clnt)
 {
 	static amq_mount_tree_list clnt_res;
 
@@ -70,7 +70,7 @@ amqproc_export_1(void *argp, CLIENT *clnt)
 }
 
 int *
-amqproc_setopt_1(amq_setopt *argp, CLIENT *clnt)
+amqproc_setopt_57(amq_setopt *argp, CLIENT *clnt)
 {
 	static int clnt_res;
 
@@ -82,7 +82,7 @@ amqproc_setopt_1(amq_setopt *argp, CLIENT *clnt)
 }
 
 amq_mount_info_list *
-amqproc_getmntfs_1(void *argp, CLIENT *clnt)
+amqproc_getmntfs_57(void *argp, CLIENT *clnt)
 {
 	static amq_mount_info_list clnt_res;
 
@@ -93,20 +93,8 @@ amqproc_getmntfs_1(void *argp, CLIENT *clnt)
 	return (&clnt_res);
 }
 
-int *
-amqproc_mount_1(amq_string *argp, CLIENT *clnt)
-{
-	static int clnt_res;
-
-	memset((char *)&clnt_res, 0, sizeof(clnt_res));
-	if (clnt_call(clnt, AMQPROC_MOUNT, xdr_amq_string, argp, xdr_int, &clnt_res, TIMEOUT) != RPC_SUCCESS) {
-		return (NULL);
-	}
-	return (&clnt_res);
-}
-
 amq_string *
-amqproc_getvers_1(void *argp, CLIENT *clnt)
+amqproc_getvers_57(void *argp, CLIENT *clnt)
 {
 	static amq_string clnt_res;
 
diff --git a/usr.sbin/amd/rpcx/amq_svc.c b/usr.sbin/amd/rpcx/amq_svc.c
index fff6090fd08..8ac1536b077 100644
--- a/usr.sbin/amd/rpcx/amq_svc.c
+++ b/usr.sbin/amd/rpcx/amq_svc.c
@@ -36,16 +36,15 @@ extern int _rpcpmstart;		/* Started by a port monitor ? */
 extern int _rpcfdtype;		/* Whether Stream or Datagram ? */
 
 
-void	amq_program_1(struct svc_req *rqstp, SVCXPRT *transp);
+void	amq_program_57(struct svc_req *rqstp, SVCXPRT *transp);
 
 void
-amq_program_1(struct svc_req *rqstp, SVCXPRT *transp)
+amq_program_57(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;
+		amq_string amqproc_mnttree_57_arg;
+		amq_string amqproc_umnt_57_arg;
+		amq_setopt amqproc_setopt_57_arg;
 	} argument;
 	char *result;
 	xdrproc_t xdr_argument, xdr_result;
@@ -66,55 +65,49 @@ amq_program_1(struct svc_req *rqstp, SVCXPRT *transp)
 	case AMQPROC_NULL:
 		xdr_argument = (xdrproc_t) xdr_void;
 		xdr_result = (xdrproc_t) xdr_void;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_null_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_null_57_svc;
 		break;
 
 	case AMQPROC_MNTTREE:
 		xdr_argument = (xdrproc_t) xdr_amq_string;
 		xdr_result = (xdrproc_t) xdr_amq_mount_tree_p;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_mnttree_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_mnttree_57_svc;
 		break;
 
 	case AMQPROC_UMNT:
 		xdr_argument = (xdrproc_t) xdr_amq_string;
 		xdr_result = (xdrproc_t) xdr_void;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_umnt_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_umnt_57_svc;
 		break;
 
 	case AMQPROC_STATS:
 		xdr_argument = (xdrproc_t) xdr_void;
 		xdr_result = (xdrproc_t) xdr_amq_mount_stats;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_stats_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_stats_57_svc;
 		break;
 
 	case AMQPROC_EXPORT:
 		xdr_argument = (xdrproc_t) xdr_void;
 		xdr_result = (xdrproc_t) xdr_amq_mount_tree_list;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_export_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_export_57_svc;
 		break;
 
 	case AMQPROC_SETOPT:
 		xdr_argument = (xdrproc_t) xdr_amq_setopt;
 		xdr_result = (xdrproc_t) xdr_int;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_setopt_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_setopt_57_svc;
 		break;
 
 	case AMQPROC_GETMNTFS:
 		xdr_argument = (xdrproc_t) xdr_void;
 		xdr_result = (xdrproc_t) xdr_amq_mount_info_list;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_getmntfs_1_svc;
-		break;
-
-	case AMQPROC_MOUNT:
-		xdr_argument = (xdrproc_t) xdr_amq_string;
-		xdr_result = (xdrproc_t) xdr_int;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_mount_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_getmntfs_57_svc;
 		break;
 
 	case AMQPROC_GETVERS:
 		xdr_argument = (xdrproc_t) xdr_void;
 		xdr_result = (xdrproc_t) xdr_amq_string;
-		local = (char *(*)(char *, struct svc_req *)) amqproc_getvers_1_svc;
+		local = (char *(*)(char *, struct svc_req *)) amqproc_getvers_57_svc;
 		break;
 
 	default:
diff --git a/usr.sbin/amd/rpcx/amq_xdr.c b/usr.sbin/amd/rpcx/amq_xdr.c
index 1f054da2d1c..31c453afb3c 100644
--- a/usr.sbin/amd/rpcx/amq_xdr.c
+++ b/usr.sbin/amd/rpcx/amq_xdr.c
@@ -18,7 +18,7 @@ bool_t
 xdr_time_type(XDR *xdrs, time_type *objp)
 {
 
-	if (!xdr_int(xdrs, objp))
+	if (!xdr_int64_t(xdrs, objp))
 		return (FALSE);
 	return (TRUE);
 }