Imported Upstream version 1.9.5

diff --git a/configure.ac b/configure.ac
index 2cb979eb8a7dc4680689e86b3090821346f00c5b..b84a8c52db40c017202669beee7ea43beecbf46a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.9.4], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [1.9.5], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST

diff --git a/examples/nfs-cp.c b/examples/nfs-cp.c
index fe9911de50b6e79c520086ab0413b23db05fd975..bbd136a91c1dbddfbf4f7123df0ded70ac02b74a 100644 (file)
--- a/examples/nfs-cp.c
+++ b/examples/nfs-cp.c
@@ -49,7 +49,6 @@ WSADATA wsaData;
 #include <stdint.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"

diff --git a/examples/nfs-io.c b/examples/nfs-io.c
index bda05d59bd10725958d8d2138ea9e09a9b1cb94c..3a43084eaf08bb5e0a9993a24e7e3788636aa1ff 100644 (file)
--- a/examples/nfs-io.c
+++ b/examples/nfs-io.c
@@ -51,7 +51,6 @@ WSADATA wsaData;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"

diff --git a/examples/nfsclient-async.c b/examples/nfsclient-async.c
index d2b92e3297e6221f0d485b4a8e7ea60a6c371f2b..739f220ea5a9225b7100eeb189b16956e7a2ec5e 100644 (file)
--- a/examples/nfsclient-async.c
+++ b/examples/nfsclient-async.c
@@ -45,7 +45,6 @@
 #include <stdint.h>
 #include <sys/types.h>
 #include <fcntl.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"

diff --git a/examples/nfsclient-bcast.c b/examples/nfsclient-bcast.c
index 45a638532e786a809851e48a4f49d7f7b3eedcc7..ec19a69f958b23ed0f3c4b9949268f294f73250e 100644 (file)
--- a/examples/nfsclient-bcast.c
+++ b/examples/nfsclient-bcast.c
@@ -58,7 +58,6 @@
 #include <sys/socket.h>
 #endif
 
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-private.h"

diff --git a/examples/nfsclient-listservers.c b/examples/nfsclient-listservers.c
index e275e7f6ed904dde67a988f9789bbfa7de9dd196..a67e74f9de3c6caf9519470ea3f99ce764abce4f 100644 (file)
--- a/examples/nfsclient-listservers.c
+++ b/examples/nfsclient-listservers.c
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 
 int main(int argc _U_, char *argv[] _U_)

diff --git a/examples/nfsclient-raw.c b/examples/nfsclient-raw.c
index 8b7d727781c3265c3124df4e875ac3c6a4907253..5838c2f28a48e622d9bfd909f8e0ecaf8eb1ac59 100644 (file)
--- a/examples/nfsclient-raw.c
+++ b/examples/nfsclient-raw.c
@@ -39,7 +39,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"

diff --git a/examples/nfsclient-sync.c b/examples/nfsclient-sync.c
index 29a4daf3dc9c24e3a7f53532155624ff622f3c3f..0985acdbf61c233e36f147d0b4d42a15b4b32b30 100644 (file)
--- a/examples/nfsclient-sync.c
+++ b/examples/nfsclient-sync.c
@@ -52,7 +52,6 @@ WSADATA wsaData;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"

diff --git a/examples/portmap-client.c b/examples/portmap-client.c
index 526e3488544dca378662d754adf9f581e6146a8c..cae90d7a72f5b4fab5904926e3b3edf08be5a085 100644 (file)
--- a/examples/portmap-client.c
+++ b/examples/portmap-client.c
@@ -40,7 +40,6 @@
 #include <string.h>
 #include <sys/socket.h>
 #include <time.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1f9a55a7d0e55515730d1c214ff24c162ab1612a..2f12325d6bb22bf51a2f4da599bace7c665f5899 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -18,9 +18,9 @@ libnfs_la_SOURCES = \
        pdu.c \
        socket.c
 
-SOCURRENT=5
+SOCURRENT=6
 SOREVISION=0
-SOAGE=1
+SOAGE=2
 libnfs_la_LDFLAGS = -version-info $(SOCURRENT):$(SOREVISION):$(SOAGE)
 libnfs_la_LIBADD = \
        ../mount/libmount.la \

diff --git a/mount/Makefile.am b/mount/Makefile.am
index de7fdbdeb0fb28bb7f2ab996e36a9edfb960f598..5a9c65e2a19c9d2dcc4f671b687c91db7cabb2c6 100644 (file)
--- a/mount/Makefile.am
+++ b/mount/Makefile.am
@@ -19,6 +19,6 @@ mount-stamp : mount.x
 
 compile_rpc:
        cat mount.x | head -29 >libnfs-raw-mount.h
-       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-mount.h
+       rpcgen -h mount.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.h
        cat mount.x | head -29 >libnfs-raw-mount.c
-       rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n      buf = NULL;/" >> libnfs-raw-mount.c
+       rpcgen -c mount.x | sed -e "s/#include \".*mount.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-mount.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n      buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-mount.c

diff --git a/mount/libnfs-raw-mount.c b/mount/libnfs-raw-mount.c
index 0a70d43e0fd6762803aff9c1d7482f8d8c216c5c..f47064c88dd6a5b17262aad07cb7a7693927515e 100644 (file)
--- a/mount/libnfs-raw-mount.c
+++ b/mount/libnfs-raw-mount.c
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "libnfs-zdr.h"
 #include "libnfs-raw-mount.h"
 
-bool_t
+uint32_t
 zdr_fhandle3 (ZDR *zdrs, fhandle3 *objp)
 {
        register int32_t *buf;
@@ -46,7 +46,7 @@ zdr_fhandle3 (ZDR *zdrs, fhandle3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_dirpath (ZDR *zdrs, dirpath *objp)
 {
        register int32_t *buf;
@@ -57,7 +57,7 @@ zdr_dirpath (ZDR *zdrs, dirpath *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_name (ZDR *zdrs, name *objp)
 {
        register int32_t *buf;
@@ -68,7 +68,7 @@ zdr_name (ZDR *zdrs, name *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountstat3 (ZDR *zdrs, mountstat3 *objp)
 {
        register int32_t *buf;
@@ -79,7 +79,7 @@ zdr_mountstat3 (ZDR *zdrs, mountstat3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountlist (ZDR *zdrs, mountlist *objp)
 {
        register int32_t *buf;
@@ -90,7 +90,7 @@ zdr_mountlist (ZDR *zdrs, mountlist *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountbody (ZDR *zdrs, mountbody *objp)
 {
        register int32_t *buf;
@@ -105,7 +105,7 @@ zdr_mountbody (ZDR *zdrs, mountbody *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_groups (ZDR *zdrs, groups *objp)
 {
        register int32_t *buf;
@@ -116,7 +116,7 @@ zdr_groups (ZDR *zdrs, groups *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_groupnode (ZDR *zdrs, groupnode *objp)
 {
        register int32_t *buf;
@@ -129,7 +129,7 @@ zdr_groupnode (ZDR *zdrs, groupnode *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_exports (ZDR *zdrs, exports *objp)
 {
        register int32_t *buf;
@@ -140,7 +140,7 @@ zdr_exports (ZDR *zdrs, exports *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_exportnode (ZDR *zdrs, exportnode *objp)
 {
        register int32_t *buf;
@@ -155,7 +155,7 @@ zdr_exportnode (ZDR *zdrs, exportnode *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountres3_ok (ZDR *zdrs, mountres3_ok *objp)
 {
        register int32_t *buf;
@@ -169,7 +169,7 @@ zdr_mountres3_ok (ZDR *zdrs, mountres3_ok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountres3 (ZDR *zdrs, mountres3 *objp)
 {
        register int32_t *buf;
@@ -188,7 +188,7 @@ zdr_mountres3 (ZDR *zdrs, mountres3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountstat1 (ZDR *zdrs, mountstat1 *objp)
 {
        register int32_t *buf;
@@ -199,7 +199,7 @@ zdr_mountstat1 (ZDR *zdrs, mountstat1 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_fhandle1 (ZDR *zdrs, fhandle1 objp)
 {
        register int32_t *buf;
@@ -210,7 +210,7 @@ zdr_fhandle1 (ZDR *zdrs, fhandle1 objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountres1_ok (ZDR *zdrs, mountres1_ok *objp)
 {
        register int32_t *buf;
@@ -221,7 +221,7 @@ zdr_mountres1_ok (ZDR *zdrs, mountres1_ok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mountres1 (ZDR *zdrs, mountres1 *objp)
 {
        register int32_t *buf;

diff --git a/mount/libnfs-raw-mount.h b/mount/libnfs-raw-mount.h
index 9f07d31a38c4b9d2d537edd00c3d36bad934671b..23ca6ba85190314030a6771d445a2b992c185820 100644 (file)
--- a/mount/libnfs-raw-mount.h
+++ b/mount/libnfs-raw-mount.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _MOUNT_H_RPCGEN
 #define _MOUNT_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -147,24 +147,24 @@ typedef struct mountres1 mountres1;
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define MOUNT1_NULL 0
-extern  void * mount1_null_1(void *, CLIENT *);
+extern  void * mount1_null_1(void *, void *);
 extern  void * mount1_null_1_svc(void *, struct svc_req *);
 #define MOUNT1_MNT 1
-extern  mountres1 * mount1_mnt_1(dirpath *, CLIENT *);
+extern  mountres1 * mount1_mnt_1(dirpath *, void *);
 extern  mountres1 * mount1_mnt_1_svc(dirpath *, struct svc_req *);
 #define MOUNT1_DUMP 2
-extern  mountlist * mount1_dump_1(void *, CLIENT *);
+extern  mountlist * mount1_dump_1(void *, void *);
 extern  mountlist * mount1_dump_1_svc(void *, struct svc_req *);
 #define MOUNT1_UMNT 3
-extern  void * mount1_umnt_1(dirpath *, CLIENT *);
+extern  void * mount1_umnt_1(dirpath *, void *);
 extern  void * mount1_umnt_1_svc(dirpath *, struct svc_req *);
 #define MOUNT1_UMNTALL 4
-extern  void * mount1_umntall_1(void *, CLIENT *);
+extern  void * mount1_umntall_1(void *, void *);
 extern  void * mount1_umntall_1_svc(void *, struct svc_req *);
 #define MOUNT1_EXPORT 5
-extern  exports * mount1_export_1(void *, CLIENT *);
+extern  exports * mount1_export_1(void *, void *);
 extern  exports * mount1_export_1_svc(void *, struct svc_req *);
-extern int mount_program_1_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int mount_program_1_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define MOUNT1_NULL 0
@@ -191,24 +191,24 @@ extern int mount_program_1_freeresult ();
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define MOUNT3_NULL 0
-extern  void * mount3_null_3(void *, CLIENT *);
+extern  void * mount3_null_3(void *, void *);
 extern  void * mount3_null_3_svc(void *, struct svc_req *);
 #define MOUNT3_MNT 1
-extern  mountres3 * mount3_mnt_3(dirpath *, CLIENT *);
+extern  mountres3 * mount3_mnt_3(dirpath *, void *);
 extern  mountres3 * mount3_mnt_3_svc(dirpath *, struct svc_req *);
 #define MOUNT3_DUMP 2
-extern  mountlist * mount3_dump_3(void *, CLIENT *);
+extern  mountlist * mount3_dump_3(void *, void *);
 extern  mountlist * mount3_dump_3_svc(void *, struct svc_req *);
 #define MOUNT3_UMNT 3
-extern  void * mount3_umnt_3(dirpath *, CLIENT *);
+extern  void * mount3_umnt_3(dirpath *, void *);
 extern  void * mount3_umnt_3_svc(dirpath *, struct svc_req *);
 #define MOUNT3_UMNTALL 4
-extern  void * mount3_umntall_3(void *, CLIENT *);
+extern  void * mount3_umntall_3(void *, void *);
 extern  void * mount3_umntall_3_svc(void *, struct svc_req *);
 #define MOUNT3_EXPORT 5
-extern  exports * mount3_export_3(void *, CLIENT *);
+extern  exports * mount3_export_3(void *, void *);
 extern  exports * mount3_export_3_svc(void *, struct svc_req *);
-extern int mount_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int mount_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define MOUNT3_NULL 0
@@ -235,40 +235,40 @@ extern int mount_program_3_freeresult ();
 /* the zdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t zdr_fhandle3 (ZDR *, fhandle3*);
-extern  bool_t zdr_dirpath (ZDR *, dirpath*);
-extern  bool_t zdr_name (ZDR *, name*);
-extern  bool_t zdr_mountstat3 (ZDR *, mountstat3*);
-extern  bool_t zdr_mountlist (ZDR *, mountlist*);
-extern  bool_t zdr_mountbody (ZDR *, mountbody*);
-extern  bool_t zdr_groups (ZDR *, groups*);
-extern  bool_t zdr_groupnode (ZDR *, groupnode*);
-extern  bool_t zdr_exports (ZDR *, exports*);
-extern  bool_t zdr_exportnode (ZDR *, exportnode*);
-extern  bool_t zdr_mountres3_ok (ZDR *, mountres3_ok*);
-extern  bool_t zdr_mountres3 (ZDR *, mountres3*);
-extern  bool_t zdr_mountstat1 (ZDR *, mountstat1*);
-extern  bool_t zdr_fhandle1 (ZDR *, fhandle1);
-extern  bool_t zdr_mountres1_ok (ZDR *, mountres1_ok*);
-extern  bool_t zdr_mountres1 (ZDR *, mountres1*);
+extern  uint32_t zdr_fhandle3 (ZDR *, fhandle3*);
+extern  uint32_t zdr_dirpath (ZDR *, dirpath*);
+extern  uint32_t zdr_name (ZDR *, name*);
+extern  uint32_t zdr_mountstat3 (ZDR *, mountstat3*);
+extern  uint32_t zdr_mountlist (ZDR *, mountlist*);
+extern  uint32_t zdr_mountbody (ZDR *, mountbody*);
+extern  uint32_t zdr_groups (ZDR *, groups*);
+extern  uint32_t zdr_groupnode (ZDR *, groupnode*);
+extern  uint32_t zdr_exports (ZDR *, exports*);
+extern  uint32_t zdr_exportnode (ZDR *, exportnode*);
+extern  uint32_t zdr_mountres3_ok (ZDR *, mountres3_ok*);
+extern  uint32_t zdr_mountres3 (ZDR *, mountres3*);
+extern  uint32_t zdr_mountstat1 (ZDR *, mountstat1*);
+extern  uint32_t zdr_fhandle1 (ZDR *, fhandle1);
+extern  uint32_t zdr_mountres1_ok (ZDR *, mountres1_ok*);
+extern  uint32_t zdr_mountres1 (ZDR *, mountres1*);
 
 #else /* K&R C */
-extern bool_t zdr_fhandle3 ();
-extern bool_t zdr_dirpath ();
-extern bool_t zdr_name ();
-extern bool_t zdr_mountstat3 ();
-extern bool_t zdr_mountlist ();
-extern bool_t zdr_mountbody ();
-extern bool_t zdr_groups ();
-extern bool_t zdr_groupnode ();
-extern bool_t zdr_exports ();
-extern bool_t zdr_exportnode ();
-extern bool_t zdr_mountres3_ok ();
-extern bool_t zdr_mountres3 ();
-extern bool_t zdr_mountstat1 ();
-extern bool_t zdr_fhandle1 ();
-extern bool_t zdr_mountres1_ok ();
-extern bool_t zdr_mountres1 ();
+extern uint32_t zdr_fhandle3 ();
+extern uint32_t zdr_dirpath ();
+extern uint32_t zdr_name ();
+extern uint32_t zdr_mountstat3 ();
+extern uint32_t zdr_mountlist ();
+extern uint32_t zdr_mountbody ();
+extern uint32_t zdr_groups ();
+extern uint32_t zdr_groupnode ();
+extern uint32_t zdr_exports ();
+extern uint32_t zdr_exportnode ();
+extern uint32_t zdr_mountres3_ok ();
+extern uint32_t zdr_mountres3 ();
+extern uint32_t zdr_mountstat1 ();
+extern uint32_t zdr_fhandle1 ();
+extern uint32_t zdr_mountres1_ok ();
+extern uint32_t zdr_mountres1 ();
 
 #endif /* K&R C */
 

diff --git a/nfs/Makefile.am b/nfs/Makefile.am
index 2177519c8b71576ee5ec72e2a74bb7dd93258e7f..c15537299f7a0397b2b5d5a82f4293cc0f175107 100644 (file)
--- a/nfs/Makefile.am
+++ b/nfs/Makefile.am
@@ -19,6 +19,6 @@ nfs-stamp : nfs.x
 
 compile_rpc:   
        cat nfs.x | head -29 >libnfs-raw-nfs.h
-       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>//" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" >> libnfs-raw-nfs.h
+       rpcgen -h nfs.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/#define _NFS_H_RPCGEN/#define _NFS_H_RPCGEN\n#include <nfsc\/libnfs-zdr.h>/g" -e "s/#define NFS3_COOKIEVERFSIZE 8/#define NFS3_COOKIEVERFSIZE 8\n\n#if defined(ANDROID)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif\n#if defined(WIN32)\ntypedef long long int quad_t;\ntypedef long long unsigned u_quad_t;\n#endif/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.h
        cat nfs.x | head -29 >libnfs-raw-nfs.c
-       rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" >> libnfs-raw-nfs.c
+       rpcgen -c nfs.x | sed -e "s/#include \".*nfs.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nfs.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nfs.c

diff --git a/nfs/libnfs-raw-nfs.c b/nfs/libnfs-raw-nfs.c
index 30d05a584be7fad86771cd427d4d5e999f7b9389..925048a32d36f32264a69f33092631b247058be5 100644 (file)
--- a/nfs/libnfs-raw-nfs.c
+++ b/nfs/libnfs-raw-nfs.c
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "libnfs-zdr.h"
 #include "libnfs-raw-nfs.h"
 
-bool_t
+uint32_t
 zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp)
 {
        register int32_t *buf;
@@ -46,7 +46,7 @@ zdr_cookieverf3 (ZDR *zdrs, cookieverf3 objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_cookie3 (ZDR *zdrs, cookie3 *objp)
 {
        register int32_t *buf;
@@ -57,7 +57,7 @@ zdr_cookie3 (ZDR *zdrs, cookie3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp)
 {
        register int32_t *buf;
@@ -68,7 +68,7 @@ zdr_nfs_fh3 (ZDR *zdrs, nfs_fh3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_filename3 (ZDR *zdrs, filename3 *objp)
 {
        register int32_t *buf;
@@ -79,7 +79,7 @@ zdr_filename3 (ZDR *zdrs, filename3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp)
 {
        register int32_t *buf;
@@ -92,7 +92,7 @@ zdr_diropargs3 (ZDR *zdrs, diropargs3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_ftype3 (ZDR *zdrs, ftype3 *objp)
 {
        register int32_t *buf;
@@ -103,7 +103,7 @@ zdr_ftype3 (ZDR *zdrs, ftype3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mode3 (ZDR *zdrs, mode3 *objp)
 {
        register int32_t *buf;
@@ -114,7 +114,7 @@ zdr_mode3 (ZDR *zdrs, mode3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_uid3 (ZDR *zdrs, uid3 *objp)
 {
        register int32_t *buf;
@@ -125,7 +125,7 @@ zdr_uid3 (ZDR *zdrs, uid3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_gid3 (ZDR *zdrs, gid3 *objp)
 {
        register int32_t *buf;
@@ -136,7 +136,7 @@ zdr_gid3 (ZDR *zdrs, gid3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_size3 (ZDR *zdrs, size3 *objp)
 {
        register int32_t *buf;
@@ -147,7 +147,7 @@ zdr_size3 (ZDR *zdrs, size3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_fileid3 (ZDR *zdrs, fileid3 *objp)
 {
        register int32_t *buf;
@@ -158,7 +158,7 @@ zdr_fileid3 (ZDR *zdrs, fileid3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_specdata3 (ZDR *zdrs, specdata3 *objp)
 {
        register int32_t *buf;
@@ -171,7 +171,7 @@ zdr_specdata3 (ZDR *zdrs, specdata3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp)
 {
        register int32_t *buf;
@@ -184,7 +184,7 @@ zdr_nfstime3 (ZDR *zdrs, nfstime3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_fattr3 (ZDR *zdrs, fattr3 *objp)
 {
        register int32_t *buf;
@@ -219,7 +219,7 @@ zdr_fattr3 (ZDR *zdrs, fattr3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp)
 {
        register int32_t *buf;
@@ -240,7 +240,7 @@ zdr_post_op_attr (ZDR *zdrs, post_op_attr *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp)
 {
        register int32_t *buf;
@@ -251,7 +251,7 @@ zdr_nfsstat3 (ZDR *zdrs, nfsstat3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_stable_how (ZDR *zdrs, stable_how *objp)
 {
        register int32_t *buf;
@@ -262,7 +262,7 @@ zdr_stable_how (ZDR *zdrs, stable_how *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_offset3 (ZDR *zdrs, offset3 *objp)
 {
        register int32_t *buf;
@@ -273,7 +273,7 @@ zdr_offset3 (ZDR *zdrs, offset3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_count3 (ZDR *zdrs, count3 *objp)
 {
        register int32_t *buf;
@@ -284,7 +284,7 @@ zdr_count3 (ZDR *zdrs, count3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp)
 {
        register int32_t *buf;
@@ -299,7 +299,7 @@ zdr_wcc_attr (ZDR *zdrs, wcc_attr *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp)
 {
        register int32_t *buf;
@@ -320,7 +320,7 @@ zdr_pre_op_attr (ZDR *zdrs, pre_op_attr *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_wcc_data (ZDR *zdrs, wcc_data *objp)
 {
        register int32_t *buf;
@@ -333,7 +333,7 @@ zdr_wcc_data (ZDR *zdrs, wcc_data *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp)
 {
        register int32_t *buf;
@@ -352,7 +352,7 @@ zdr_WRITE3args (ZDR *zdrs, WRITE3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_writeverf3 (ZDR *zdrs, writeverf3 objp)
 {
        register int32_t *buf;
@@ -363,7 +363,7 @@ zdr_writeverf3 (ZDR *zdrs, writeverf3 objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp)
 {
        register int32_t *buf;
@@ -380,7 +380,7 @@ zdr_WRITE3resok (ZDR *zdrs, WRITE3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp)
 {
        register int32_t *buf;
@@ -391,7 +391,7 @@ zdr_WRITE3resfail (ZDR *zdrs, WRITE3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp)
 {
        register int32_t *buf;
@@ -412,7 +412,7 @@ zdr_WRITE3res (ZDR *zdrs, WRITE3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp)
 {
        register int32_t *buf;
@@ -423,7 +423,7 @@ zdr_LOOKUP3args (ZDR *zdrs, LOOKUP3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp)
 {
        register int32_t *buf;
@@ -438,7 +438,7 @@ zdr_LOOKUP3resok (ZDR *zdrs, LOOKUP3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp)
 {
        register int32_t *buf;
@@ -449,7 +449,7 @@ zdr_LOOKUP3resfail (ZDR *zdrs, LOOKUP3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp)
 {
        register int32_t *buf;
@@ -470,7 +470,7 @@ zdr_LOOKUP3res (ZDR *zdrs, LOOKUP3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp)
 {
        register int32_t *buf;
@@ -485,7 +485,7 @@ zdr_COMMIT3args (ZDR *zdrs, COMMIT3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp)
 {
        register int32_t *buf;
@@ -498,7 +498,7 @@ zdr_COMMIT3resok (ZDR *zdrs, COMMIT3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp)
 {
        register int32_t *buf;
@@ -509,7 +509,7 @@ zdr_COMMIT3resfail (ZDR *zdrs, COMMIT3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp)
 {
        register int32_t *buf;
@@ -530,7 +530,7 @@ zdr_COMMIT3res (ZDR *zdrs, COMMIT3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp)
 {
        register int32_t *buf;
@@ -543,7 +543,7 @@ zdr_ACCESS3args (ZDR *zdrs, ACCESS3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp)
 {
        register int32_t *buf;
@@ -556,7 +556,7 @@ zdr_ACCESS3resok (ZDR *zdrs, ACCESS3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp)
 {
        register int32_t *buf;
@@ -567,7 +567,7 @@ zdr_ACCESS3resfail (ZDR *zdrs, ACCESS3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp)
 {
        register int32_t *buf;
@@ -588,7 +588,7 @@ zdr_ACCESS3res (ZDR *zdrs, ACCESS3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp)
 {
        register int32_t *buf;
@@ -599,7 +599,7 @@ zdr_GETATTR3args (ZDR *zdrs, GETATTR3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp)
 {
        register int32_t *buf;
@@ -610,7 +610,7 @@ zdr_GETATTR3resok (ZDR *zdrs, GETATTR3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp)
 {
        register int32_t *buf;
@@ -629,7 +629,7 @@ zdr_GETATTR3res (ZDR *zdrs, GETATTR3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_time_how (ZDR *zdrs, time_how *objp)
 {
        register int32_t *buf;
@@ -640,7 +640,7 @@ zdr_time_how (ZDR *zdrs, time_how *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp)
 {
        register int32_t *buf;
@@ -659,7 +659,7 @@ zdr_set_mode3 (ZDR *zdrs, set_mode3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp)
 {
        register int32_t *buf;
@@ -678,7 +678,7 @@ zdr_set_uid3 (ZDR *zdrs, set_uid3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp)
 {
        register int32_t *buf;
@@ -697,7 +697,7 @@ zdr_set_gid3 (ZDR *zdrs, set_gid3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_set_size3 (ZDR *zdrs, set_size3 *objp)
 {
        register int32_t *buf;
@@ -716,7 +716,7 @@ zdr_set_size3 (ZDR *zdrs, set_size3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_set_atime (ZDR *zdrs, set_atime *objp)
 {
        register int32_t *buf;
@@ -735,7 +735,7 @@ zdr_set_atime (ZDR *zdrs, set_atime *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_set_mtime (ZDR *zdrs, set_mtime *objp)
 {
        register int32_t *buf;
@@ -754,7 +754,7 @@ zdr_set_mtime (ZDR *zdrs, set_mtime *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_sattr3 (ZDR *zdrs, sattr3 *objp)
 {
        register int32_t *buf;
@@ -775,7 +775,7 @@ zdr_sattr3 (ZDR *zdrs, sattr3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_createmode3 (ZDR *zdrs, createmode3 *objp)
 {
        register int32_t *buf;
@@ -786,7 +786,7 @@ zdr_createmode3 (ZDR *zdrs, createmode3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_createverf3 (ZDR *zdrs, createverf3 objp)
 {
        register int32_t *buf;
@@ -797,7 +797,7 @@ zdr_createverf3 (ZDR *zdrs, createverf3 objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_createhow3 (ZDR *zdrs, createhow3 *objp)
 {
        register int32_t *buf;
@@ -824,7 +824,7 @@ zdr_createhow3 (ZDR *zdrs, createhow3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp)
 {
        register int32_t *buf;
@@ -837,7 +837,7 @@ zdr_CREATE3args (ZDR *zdrs, CREATE3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp)
 {
        register int32_t *buf;
@@ -858,7 +858,7 @@ zdr_post_op_fh3 (ZDR *zdrs, post_op_fh3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp)
 {
        register int32_t *buf;
@@ -873,7 +873,7 @@ zdr_CREATE3resok (ZDR *zdrs, CREATE3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp)
 {
        register int32_t *buf;
@@ -884,7 +884,7 @@ zdr_CREATE3resfail (ZDR *zdrs, CREATE3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp)
 {
        register int32_t *buf;
@@ -905,7 +905,7 @@ zdr_CREATE3res (ZDR *zdrs, CREATE3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp)
 {
        register int32_t *buf;
@@ -916,7 +916,7 @@ zdr_REMOVE3args (ZDR *zdrs, REMOVE3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp)
 {
        register int32_t *buf;
@@ -927,7 +927,7 @@ zdr_REMOVE3resok (ZDR *zdrs, REMOVE3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp)
 {
        register int32_t *buf;
@@ -938,7 +938,7 @@ zdr_REMOVE3resfail (ZDR *zdrs, REMOVE3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp)
 {
        register int32_t *buf;
@@ -959,7 +959,7 @@ zdr_REMOVE3res (ZDR *zdrs, REMOVE3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ3args (ZDR *zdrs, READ3args *objp)
 {
        register int32_t *buf;
@@ -974,7 +974,7 @@ zdr_READ3args (ZDR *zdrs, READ3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ3resok (ZDR *zdrs, READ3resok *objp)
 {
        register int32_t *buf;
@@ -991,7 +991,7 @@ zdr_READ3resok (ZDR *zdrs, READ3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp)
 {
        register int32_t *buf;
@@ -1002,7 +1002,7 @@ zdr_READ3resfail (ZDR *zdrs, READ3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ3res (ZDR *zdrs, READ3res *objp)
 {
        register int32_t *buf;
@@ -1023,7 +1023,7 @@ zdr_READ3res (ZDR *zdrs, READ3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSINFO3args (ZDR *zdrs, FSINFO3args *objp)
 {
        register int32_t *buf;
@@ -1034,7 +1034,7 @@ zdr_FSINFO3args (ZDR *zdrs, FSINFO3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp)
 {
        register int32_t *buf;
@@ -1140,7 +1140,7 @@ zdr_FSINFO3resok (ZDR *zdrs, FSINFO3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp)
 {
        register int32_t *buf;
@@ -1151,7 +1151,7 @@ zdr_FSINFO3resfail (ZDR *zdrs, FSINFO3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp)
 {
        register int32_t *buf;
@@ -1172,7 +1172,7 @@ zdr_FSINFO3res (ZDR *zdrs, FSINFO3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp)
 {
        register int32_t *buf;
@@ -1183,7 +1183,7 @@ zdr_FSSTAT3args (ZDR *zdrs, FSSTAT3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp)
 {
        register int32_t *buf;
@@ -1208,7 +1208,7 @@ zdr_FSSTAT3resok (ZDR *zdrs, FSSTAT3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp)
 {
        register int32_t *buf;
@@ -1219,7 +1219,7 @@ zdr_FSSTAT3resfail (ZDR *zdrs, FSSTAT3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp)
 {
        register int32_t *buf;
@@ -1240,7 +1240,7 @@ zdr_FSSTAT3res (ZDR *zdrs, FSSTAT3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_PATHCONF3args (ZDR *zdrs, PATHCONF3args *objp)
 {
        register int32_t *buf;
@@ -1251,7 +1251,7 @@ zdr_PATHCONF3args (ZDR *zdrs, PATHCONF3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp)
 {
        register int32_t *buf;
@@ -1329,7 +1329,7 @@ zdr_PATHCONF3resok (ZDR *zdrs, PATHCONF3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp)
 {
        register int32_t *buf;
@@ -1340,7 +1340,7 @@ zdr_PATHCONF3resfail (ZDR *zdrs, PATHCONF3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp)
 {
        register int32_t *buf;
@@ -1361,7 +1361,7 @@ zdr_PATHCONF3res (ZDR *zdrs, PATHCONF3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp)
 {
        register int32_t *buf;
@@ -1372,7 +1372,7 @@ zdr_nfspath3 (ZDR *zdrs, nfspath3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp)
 {
        register int32_t *buf;
@@ -1385,7 +1385,7 @@ zdr_symlinkdata3 (ZDR *zdrs, symlinkdata3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp)
 {
        register int32_t *buf;
@@ -1398,7 +1398,7 @@ zdr_SYMLINK3args (ZDR *zdrs, SYMLINK3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp)
 {
        register int32_t *buf;
@@ -1413,7 +1413,7 @@ zdr_SYMLINK3resok (ZDR *zdrs, SYMLINK3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp)
 {
        register int32_t *buf;
@@ -1424,7 +1424,7 @@ zdr_SYMLINK3resfail (ZDR *zdrs, SYMLINK3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp)
 {
        register int32_t *buf;
@@ -1445,7 +1445,7 @@ zdr_SYMLINK3res (ZDR *zdrs, SYMLINK3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp)
 {
        register int32_t *buf;
@@ -1456,7 +1456,7 @@ zdr_READLINK3args (ZDR *zdrs, READLINK3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp)
 {
        register int32_t *buf;
@@ -1469,7 +1469,7 @@ zdr_READLINK3resok (ZDR *zdrs, READLINK3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp)
 {
        register int32_t *buf;
@@ -1480,7 +1480,7 @@ zdr_READLINK3resfail (ZDR *zdrs, READLINK3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp)
 {
        register int32_t *buf;
@@ -1501,7 +1501,7 @@ zdr_READLINK3res (ZDR *zdrs, READLINK3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp)
 {
        register int32_t *buf;
@@ -1514,7 +1514,7 @@ zdr_devicedata3 (ZDR *zdrs, devicedata3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp)
 {
        register int32_t *buf;
@@ -1545,7 +1545,7 @@ zdr_mknoddata3 (ZDR *zdrs, mknoddata3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp)
 {
        register int32_t *buf;
@@ -1558,7 +1558,7 @@ zdr_MKNOD3args (ZDR *zdrs, MKNOD3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp)
 {
        register int32_t *buf;
@@ -1573,7 +1573,7 @@ zdr_MKNOD3resok (ZDR *zdrs, MKNOD3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp)
 {
        register int32_t *buf;
@@ -1584,7 +1584,7 @@ zdr_MKNOD3resfail (ZDR *zdrs, MKNOD3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp)
 {
        register int32_t *buf;
@@ -1605,7 +1605,7 @@ zdr_MKNOD3res (ZDR *zdrs, MKNOD3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp)
 {
        register int32_t *buf;
@@ -1618,7 +1618,7 @@ zdr_MKDIR3args (ZDR *zdrs, MKDIR3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp)
 {
        register int32_t *buf;
@@ -1633,7 +1633,7 @@ zdr_MKDIR3resok (ZDR *zdrs, MKDIR3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp)
 {
        register int32_t *buf;
@@ -1644,7 +1644,7 @@ zdr_MKDIR3resfail (ZDR *zdrs, MKDIR3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp)
 {
        register int32_t *buf;
@@ -1665,7 +1665,7 @@ zdr_MKDIR3res (ZDR *zdrs, MKDIR3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp)
 {
        register int32_t *buf;
@@ -1676,7 +1676,7 @@ zdr_RMDIR3args (ZDR *zdrs, RMDIR3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp)
 {
        register int32_t *buf;
@@ -1687,7 +1687,7 @@ zdr_RMDIR3resok (ZDR *zdrs, RMDIR3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp)
 {
        register int32_t *buf;
@@ -1698,7 +1698,7 @@ zdr_RMDIR3resfail (ZDR *zdrs, RMDIR3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp)
 {
        register int32_t *buf;
@@ -1719,7 +1719,7 @@ zdr_RMDIR3res (ZDR *zdrs, RMDIR3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp)
 {
        register int32_t *buf;
@@ -1732,7 +1732,7 @@ zdr_RENAME3args (ZDR *zdrs, RENAME3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp)
 {
        register int32_t *buf;
@@ -1745,7 +1745,7 @@ zdr_RENAME3resok (ZDR *zdrs, RENAME3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp)
 {
        register int32_t *buf;
@@ -1758,7 +1758,7 @@ zdr_RENAME3resfail (ZDR *zdrs, RENAME3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp)
 {
        register int32_t *buf;
@@ -1779,7 +1779,7 @@ zdr_RENAME3res (ZDR *zdrs, RENAME3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp)
 {
        register int32_t *buf;
@@ -1798,7 +1798,7 @@ zdr_READDIRPLUS3args (ZDR *zdrs, READDIRPLUS3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp)
 {
        register int32_t *buf;
@@ -1819,7 +1819,7 @@ zdr_entryplus3 (ZDR *zdrs, entryplus3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp)
 {
        register int32_t *buf;
@@ -1832,7 +1832,7 @@ zdr_dirlistplus3 (ZDR *zdrs, dirlistplus3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp)
 {
        register int32_t *buf;
@@ -1847,7 +1847,7 @@ zdr_READDIRPLUS3resok (ZDR *zdrs, READDIRPLUS3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp)
 {
        register int32_t *buf;
@@ -1858,7 +1858,7 @@ zdr_READDIRPLUS3resfail (ZDR *zdrs, READDIRPLUS3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp)
 {
        register int32_t *buf;
@@ -1879,7 +1879,7 @@ zdr_READDIRPLUS3res (ZDR *zdrs, READDIRPLUS3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp)
 {
        register int32_t *buf;
@@ -1896,7 +1896,7 @@ zdr_READDIR3args (ZDR *zdrs, READDIR3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_entry3 (ZDR *zdrs, entry3 *objp)
 {
        register int32_t *buf;
@@ -1913,7 +1913,7 @@ zdr_entry3 (ZDR *zdrs, entry3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp)
 {
        register int32_t *buf;
@@ -1926,7 +1926,7 @@ zdr_dirlist3 (ZDR *zdrs, dirlist3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp)
 {
        register int32_t *buf;
@@ -1941,7 +1941,7 @@ zdr_READDIR3resok (ZDR *zdrs, READDIR3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp)
 {
        register int32_t *buf;
@@ -1952,7 +1952,7 @@ zdr_READDIR3resfail (ZDR *zdrs, READDIR3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp)
 {
        register int32_t *buf;
@@ -1973,7 +1973,7 @@ zdr_READDIR3res (ZDR *zdrs, READDIR3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LINK3args (ZDR *zdrs, LINK3args *objp)
 {
        register int32_t *buf;
@@ -1986,7 +1986,7 @@ zdr_LINK3args (ZDR *zdrs, LINK3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp)
 {
        register int32_t *buf;
@@ -1999,7 +1999,7 @@ zdr_LINK3resok (ZDR *zdrs, LINK3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp)
 {
        register int32_t *buf;
@@ -2012,7 +2012,7 @@ zdr_LINK3resfail (ZDR *zdrs, LINK3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LINK3res (ZDR *zdrs, LINK3res *objp)
 {
        register int32_t *buf;
@@ -2033,7 +2033,7 @@ zdr_LINK3res (ZDR *zdrs, LINK3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp)
 {
        register int32_t *buf;
@@ -2054,7 +2054,7 @@ zdr_sattrguard3 (ZDR *zdrs, sattrguard3 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp)
 {
        register int32_t *buf;
@@ -2069,7 +2069,7 @@ zdr_SETATTR3args (ZDR *zdrs, SETATTR3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp)
 {
        register int32_t *buf;
@@ -2080,7 +2080,7 @@ zdr_SETATTR3resok (ZDR *zdrs, SETATTR3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp)
 {
        register int32_t *buf;
@@ -2091,7 +2091,7 @@ zdr_SETATTR3resfail (ZDR *zdrs, SETATTR3resfail *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp)
 {
        register int32_t *buf;
@@ -2112,7 +2112,7 @@ zdr_SETATTR3res (ZDR *zdrs, SETATTR3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_fhandle2 (ZDR *zdrs, fhandle2 objp)
 {
        register int32_t *buf;
@@ -2123,7 +2123,7 @@ zdr_fhandle2 (ZDR *zdrs, fhandle2 objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_ftype2 (ZDR *zdrs, ftype2 *objp)
 {
        register int32_t *buf;
@@ -2134,7 +2134,7 @@ zdr_ftype2 (ZDR *zdrs, ftype2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_fattr2 (ZDR *zdrs, fattr2 *objp)
 {
        register int32_t *buf;
@@ -2264,7 +2264,7 @@ zdr_fattr2 (ZDR *zdrs, fattr2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_sattr2 (ZDR *zdrs, sattr2 *objp)
 {
        register int32_t *buf;
@@ -2334,7 +2334,7 @@ zdr_sattr2 (ZDR *zdrs, sattr2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_filename2 (ZDR *zdrs, filename2 *objp)
 {
        register int32_t *buf;
@@ -2345,7 +2345,7 @@ zdr_filename2 (ZDR *zdrs, filename2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_path2 (ZDR *zdrs, path2 *objp)
 {
        register int32_t *buf;
@@ -2356,7 +2356,7 @@ zdr_path2 (ZDR *zdrs, path2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfsdata2 (ZDR *zdrs, nfsdata2 *objp)
 {
        register int32_t *buf;
@@ -2367,7 +2367,7 @@ zdr_nfsdata2 (ZDR *zdrs, nfsdata2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfscookie2 (ZDR *zdrs, nfscookie2 objp)
 {
        register int32_t *buf;
@@ -2378,7 +2378,7 @@ zdr_nfscookie2 (ZDR *zdrs, nfscookie2 objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_entry2 (ZDR *zdrs, entry2 *objp)
 {
        register int32_t *buf;
@@ -2395,7 +2395,7 @@ zdr_entry2 (ZDR *zdrs, entry2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_diropargs2 (ZDR *zdrs, diropargs2 *objp)
 {
        register int32_t *buf;
@@ -2408,7 +2408,7 @@ zdr_diropargs2 (ZDR *zdrs, diropargs2 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETATTR2args (ZDR *zdrs, GETATTR2args *objp)
 {
        register int32_t *buf;
@@ -2419,7 +2419,7 @@ zdr_GETATTR2args (ZDR *zdrs, GETATTR2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETATTR2resok (ZDR *zdrs, GETATTR2resok *objp)
 {
        register int32_t *buf;
@@ -2430,7 +2430,7 @@ zdr_GETATTR2resok (ZDR *zdrs, GETATTR2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETATTR2res (ZDR *zdrs, GETATTR2res *objp)
 {
        register int32_t *buf;
@@ -2449,7 +2449,7 @@ zdr_GETATTR2res (ZDR *zdrs, GETATTR2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR2args (ZDR *zdrs, SETATTR2args *objp)
 {
        register int32_t *buf;
@@ -2462,7 +2462,7 @@ zdr_SETATTR2args (ZDR *zdrs, SETATTR2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR2resok (ZDR *zdrs, SETATTR2resok *objp)
 {
        register int32_t *buf;
@@ -2473,7 +2473,7 @@ zdr_SETATTR2resok (ZDR *zdrs, SETATTR2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETATTR2res (ZDR *zdrs, SETATTR2res *objp)
 {
        register int32_t *buf;
@@ -2492,7 +2492,7 @@ zdr_SETATTR2res (ZDR *zdrs, SETATTR2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP2args (ZDR *zdrs, LOOKUP2args *objp)
 {
        register int32_t *buf;
@@ -2503,7 +2503,7 @@ zdr_LOOKUP2args (ZDR *zdrs, LOOKUP2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP2resok (ZDR *zdrs, LOOKUP2resok *objp)
 {
        register int32_t *buf;
@@ -2516,7 +2516,7 @@ zdr_LOOKUP2resok (ZDR *zdrs, LOOKUP2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LOOKUP2res (ZDR *zdrs, LOOKUP2res *objp)
 {
        register int32_t *buf;
@@ -2535,7 +2535,7 @@ zdr_LOOKUP2res (ZDR *zdrs, LOOKUP2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK2args (ZDR *zdrs, READLINK2args *objp)
 {
        register int32_t *buf;
@@ -2546,7 +2546,7 @@ zdr_READLINK2args (ZDR *zdrs, READLINK2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK2resok (ZDR *zdrs, READLINK2resok *objp)
 {
        register int32_t *buf;
@@ -2557,7 +2557,7 @@ zdr_READLINK2resok (ZDR *zdrs, READLINK2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READLINK2res (ZDR *zdrs, READLINK2res *objp)
 {
        register int32_t *buf;
@@ -2576,7 +2576,7 @@ zdr_READLINK2res (ZDR *zdrs, READLINK2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ2args (ZDR *zdrs, READ2args *objp)
 {
        register int32_t *buf;
@@ -2593,7 +2593,7 @@ zdr_READ2args (ZDR *zdrs, READ2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ2resok (ZDR *zdrs, READ2resok *objp)
 {
        register int32_t *buf;
@@ -2606,7 +2606,7 @@ zdr_READ2resok (ZDR *zdrs, READ2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READ2res (ZDR *zdrs, READ2res *objp)
 {
        register int32_t *buf;
@@ -2625,7 +2625,7 @@ zdr_READ2res (ZDR *zdrs, READ2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE2args (ZDR *zdrs, WRITE2args *objp)
 {
        register int32_t *buf;
@@ -2687,7 +2687,7 @@ zdr_WRITE2args (ZDR *zdrs, WRITE2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE2resok (ZDR *zdrs, WRITE2resok *objp)
 {
        register int32_t *buf;
@@ -2698,7 +2698,7 @@ zdr_WRITE2resok (ZDR *zdrs, WRITE2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_WRITE2res (ZDR *zdrs, WRITE2res *objp)
 {
        register int32_t *buf;
@@ -2717,7 +2717,7 @@ zdr_WRITE2res (ZDR *zdrs, WRITE2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE2args (ZDR *zdrs, CREATE2args *objp)
 {
        register int32_t *buf;
@@ -2730,7 +2730,7 @@ zdr_CREATE2args (ZDR *zdrs, CREATE2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE2resok (ZDR *zdrs, CREATE2resok *objp)
 {
        register int32_t *buf;
@@ -2743,7 +2743,7 @@ zdr_CREATE2resok (ZDR *zdrs, CREATE2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_CREATE2res (ZDR *zdrs, CREATE2res *objp)
 {
        register int32_t *buf;
@@ -2762,7 +2762,7 @@ zdr_CREATE2res (ZDR *zdrs, CREATE2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_REMOVE2args (ZDR *zdrs, REMOVE2args *objp)
 {
        register int32_t *buf;
@@ -2773,7 +2773,7 @@ zdr_REMOVE2args (ZDR *zdrs, REMOVE2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_REMOVE2res (ZDR *zdrs, REMOVE2res *objp)
 {
        register int32_t *buf;
@@ -2784,7 +2784,7 @@ zdr_REMOVE2res (ZDR *zdrs, REMOVE2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RENAME2args (ZDR *zdrs, RENAME2args *objp)
 {
        register int32_t *buf;
@@ -2797,7 +2797,7 @@ zdr_RENAME2args (ZDR *zdrs, RENAME2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RENAME2res (ZDR *zdrs, RENAME2res *objp)
 {
        register int32_t *buf;
@@ -2808,7 +2808,7 @@ zdr_RENAME2res (ZDR *zdrs, RENAME2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LINK2args (ZDR *zdrs, LINK2args *objp)
 {
        register int32_t *buf;
@@ -2821,7 +2821,7 @@ zdr_LINK2args (ZDR *zdrs, LINK2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_LINK2res (ZDR *zdrs, LINK2res *objp)
 {
        register int32_t *buf;
@@ -2832,7 +2832,7 @@ zdr_LINK2res (ZDR *zdrs, LINK2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SYMLINK2args (ZDR *zdrs, SYMLINK2args *objp)
 {
        register int32_t *buf;
@@ -2847,7 +2847,7 @@ zdr_SYMLINK2args (ZDR *zdrs, SYMLINK2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SYMLINK2res (ZDR *zdrs, SYMLINK2res *objp)
 {
        register int32_t *buf;
@@ -2858,7 +2858,7 @@ zdr_SYMLINK2res (ZDR *zdrs, SYMLINK2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR2args (ZDR *zdrs, MKDIR2args *objp)
 {
        register int32_t *buf;
@@ -2871,7 +2871,7 @@ zdr_MKDIR2args (ZDR *zdrs, MKDIR2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR2resok (ZDR *zdrs, MKDIR2resok *objp)
 {
        register int32_t *buf;
@@ -2884,7 +2884,7 @@ zdr_MKDIR2resok (ZDR *zdrs, MKDIR2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_MKDIR2res (ZDR *zdrs, MKDIR2res *objp)
 {
        register int32_t *buf;
@@ -2903,7 +2903,7 @@ zdr_MKDIR2res (ZDR *zdrs, MKDIR2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RMDIR2args (ZDR *zdrs, RMDIR2args *objp)
 {
        register int32_t *buf;
@@ -2914,7 +2914,7 @@ zdr_RMDIR2args (ZDR *zdrs, RMDIR2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_RMDIR2res (ZDR *zdrs, RMDIR2res *objp)
 {
        register int32_t *buf;
@@ -2925,7 +2925,7 @@ zdr_RMDIR2res (ZDR *zdrs, RMDIR2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR2args (ZDR *zdrs, READDIR2args *objp)
 {
        register int32_t *buf;
@@ -2940,7 +2940,7 @@ zdr_READDIR2args (ZDR *zdrs, READDIR2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR2resok (ZDR *zdrs, READDIR2resok *objp)
 {
        register int32_t *buf;
@@ -2953,7 +2953,7 @@ zdr_READDIR2resok (ZDR *zdrs, READDIR2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_READDIR2res (ZDR *zdrs, READDIR2res *objp)
 {
        register int32_t *buf;
@@ -2972,7 +2972,7 @@ zdr_READDIR2res (ZDR *zdrs, READDIR2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_STATFS2args (ZDR *zdrs, STATFS2args *objp)
 {
        register int32_t *buf;
@@ -2983,7 +2983,7 @@ zdr_STATFS2args (ZDR *zdrs, STATFS2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_STATFS2resok (ZDR *zdrs, STATFS2resok *objp)
 {
        register int32_t *buf;
@@ -3047,7 +3047,7 @@ zdr_STATFS2resok (ZDR *zdrs, STATFS2resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_STATFS2res (ZDR *zdrs, STATFS2res *objp)
 {
        register int32_t *buf;
@@ -3066,7 +3066,7 @@ zdr_STATFS2res (ZDR *zdrs, STATFS2res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp)
 {
        register int32_t *buf;
@@ -3077,7 +3077,7 @@ zdr_nfsacl_type (ZDR *zdrs, nfsacl_type *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp)
 {
        register int32_t *buf;
@@ -3092,7 +3092,7 @@ zdr_nfsacl_ace (ZDR *zdrs, nfsacl_ace *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp)
 {
        register int32_t *buf;
@@ -3105,7 +3105,7 @@ zdr_GETACL3args (ZDR *zdrs, GETACL3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp)
 {
        register int32_t *buf;
@@ -3128,7 +3128,7 @@ zdr_GETACL3resok (ZDR *zdrs, GETACL3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp)
 {
        register int32_t *buf;
@@ -3147,7 +3147,7 @@ zdr_GETACL3res (ZDR *zdrs, GETACL3res *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp)
 {
        register int32_t *buf;
@@ -3170,7 +3170,7 @@ zdr_SETACL3args (ZDR *zdrs, SETACL3args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp)
 {
        register int32_t *buf;
@@ -3181,7 +3181,7 @@ zdr_SETACL3resok (ZDR *zdrs, SETACL3resok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_SETACL3res (ZDR *zdrs, SETACL3res *objp)
 {
        register int32_t *buf;

diff --git a/nfs/libnfs-raw-nfs.h b/nfs/libnfs-raw-nfs.h
index 4b4c87406f4b6b4cb4cb31bc68b833b9eeacc10f..835029e7ff4c88f1d8770586514d2339a37c437f 100644 (file)
--- a/nfs/libnfs-raw-nfs.h
+++ b/nfs/libnfs-raw-nfs.h
@@ -36,7 +36,7 @@ either expressed or implied, of the FreeBSD Project.
 #define _NFS_H_RPCGEN
 #include <nfsc/libnfs-zdr.h>
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -128,7 +128,7 @@ struct fattr3 {
 typedef struct fattr3 fattr3;
 
 struct post_op_attr {
-       bool_t attributes_follow;
+       uint32_t attributes_follow;
        union {
                fattr3 attributes;
        } post_op_attr_u;
@@ -187,7 +187,7 @@ struct wcc_attr {
 typedef struct wcc_attr wcc_attr;
 
 struct pre_op_attr {
-       bool_t attributes_follow;
+       uint32_t attributes_follow;
        union {
                wcc_attr attributes;
        } pre_op_attr_u;
@@ -347,7 +347,7 @@ enum time_how {
 typedef enum time_how time_how;
 
 struct set_mode3 {
-       bool_t set_it;
+       uint32_t set_it;
        union {
                mode3 mode;
        } set_mode3_u;
@@ -355,7 +355,7 @@ struct set_mode3 {
 typedef struct set_mode3 set_mode3;
 
 struct set_uid3 {
-       bool_t set_it;
+       uint32_t set_it;
        union {
                uid3 uid;
        } set_uid3_u;
@@ -363,7 +363,7 @@ struct set_uid3 {
 typedef struct set_uid3 set_uid3;
 
 struct set_gid3 {
-       bool_t set_it;
+       uint32_t set_it;
        union {
                gid3 gid;
        } set_gid3_u;
@@ -371,7 +371,7 @@ struct set_gid3 {
 typedef struct set_gid3 set_gid3;
 
 struct set_size3 {
-       bool_t set_it;
+       uint32_t set_it;
        union {
                size3 size;
        } set_size3_u;
@@ -430,7 +430,7 @@ struct CREATE3args {
 typedef struct CREATE3args CREATE3args;
 
 struct post_op_fh3 {
-       bool_t handle_follows;
+       uint32_t handle_follows;
        union {
                nfs_fh3 handle;
        } post_op_fh3_u;
@@ -492,7 +492,7 @@ typedef struct READ3args READ3args;
 struct READ3resok {
        post_op_attr file_attributes;
        count3 count;
-       bool_t eof;
+       uint32_t eof;
        struct {
                u_int data_len;
                char *data_val;
@@ -592,10 +592,10 @@ struct PATHCONF3resok {
        post_op_attr obj_attributes;
        u_int linkmax;
        u_int name_max;
-       bool_t no_trunc;
-       bool_t chown_restricted;
-       bool_t case_insensitive;
-       bool_t case_preserving;
+       uint32_t no_trunc;
+       uint32_t chown_restricted;
+       uint32_t case_insensitive;
+       uint32_t case_preserving;
 };
 typedef struct PATHCONF3resok PATHCONF3resok;
 
@@ -816,7 +816,7 @@ typedef struct entryplus3 entryplus3;
 
 struct dirlistplus3 {
        entryplus3 *entries;
-       bool_t eof;
+       uint32_t eof;
 };
 typedef struct dirlistplus3 dirlistplus3;
 
@@ -859,7 +859,7 @@ typedef struct entry3 entry3;
 
 struct dirlist3 {
        entry3 *entries;
-       bool_t eof;
+       uint32_t eof;
 };
 typedef struct dirlist3 dirlist3;
 
@@ -912,7 +912,7 @@ struct LINK3res {
 typedef struct LINK3res LINK3res;
 
 struct sattrguard3 {
-       bool_t check;
+       uint32_t check;
        union {
                nfstime3 obj_ctime;
        } sattrguard3_u;
@@ -1236,7 +1236,7 @@ typedef struct READDIR2args READDIR2args;
 
 struct READDIR2resok {
        entry2 *entries;
-       bool_t eof;
+       uint32_t eof;
 };
 typedef struct READDIR2resok READDIR2resok;
 
@@ -1365,54 +1365,54 @@ typedef struct SETACL3res SETACL3res;
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define NFS2_NULL 0
-extern  void * nfs2_null_2(void *, CLIENT *);
+extern  void * nfs2_null_2(void *, void *);
 extern  void * nfs2_null_2_svc(void *, struct svc_req *);
 #define NFS2_GETATTR 1
-extern  GETATTR2res * nfs2_getattr_2(GETATTR2args *, CLIENT *);
+extern  GETATTR2res * nfs2_getattr_2(GETATTR2args *, void *);
 extern  GETATTR2res * nfs2_getattr_2_svc(GETATTR2args *, struct svc_req *);
 #define NFS2_SETATTR 2
-extern  SETATTR2res * nfs2_setattr_2(SETATTR2args *, CLIENT *);
+extern  SETATTR2res * nfs2_setattr_2(SETATTR2args *, void *);
 extern  SETATTR2res * nfs2_setattr_2_svc(SETATTR2args *, struct svc_req *);
 #define NFS2_LOOKUP 4
-extern  LOOKUP2res * nfs2_lookup_2(LOOKUP2args *, CLIENT *);
+extern  LOOKUP2res * nfs2_lookup_2(LOOKUP2args *, void *);
 extern  LOOKUP2res * nfs2_lookup_2_svc(LOOKUP2args *, struct svc_req *);
 #define NFS2_READLINK 5
-extern  READLINK2res * nfs2_readlink_2(READLINK2args *, CLIENT *);
+extern  READLINK2res * nfs2_readlink_2(READLINK2args *, void *);
 extern  READLINK2res * nfs2_readlink_2_svc(READLINK2args *, struct svc_req *);
 #define NFS2_READ 6
-extern  READ2res * nfs2_read_2(READ2args *, CLIENT *);
+extern  READ2res * nfs2_read_2(READ2args *, void *);
 extern  READ2res * nfs2_read_2_svc(READ2args *, struct svc_req *);
 #define NFS2_WRITE 8
-extern  WRITE2res * nfs2_write_2(WRITE2args *, CLIENT *);
+extern  WRITE2res * nfs2_write_2(WRITE2args *, void *);
 extern  WRITE2res * nfs2_write_2_svc(WRITE2args *, struct svc_req *);
 #define NFS2_CREATE 9
-extern  CREATE2res * nfs2_create_2(CREATE2args *, CLIENT *);
+extern  CREATE2res * nfs2_create_2(CREATE2args *, void *);
 extern  CREATE2res * nfs2_create_2_svc(CREATE2args *, struct svc_req *);
 #define NFS2_REMOVE 10
-extern  REMOVE2res * nfs2_remove_2(REMOVE2args *, CLIENT *);
+extern  REMOVE2res * nfs2_remove_2(REMOVE2args *, void *);
 extern  REMOVE2res * nfs2_remove_2_svc(REMOVE2args *, struct svc_req *);
 #define NFS2_RENAME 11
-extern  RENAME2res * nfs2_rename_2(RENAME2args *, CLIENT *);
+extern  RENAME2res * nfs2_rename_2(RENAME2args *, void *);
 extern  RENAME2res * nfs2_rename_2_svc(RENAME2args *, struct svc_req *);
 #define NFS2_LINK 12
-extern  LINK2res * nfs2_link_2(LINK2args *, CLIENT *);
+extern  LINK2res * nfs2_link_2(LINK2args *, void *);
 extern  LINK2res * nfs2_link_2_svc(LINK2args *, struct svc_req *);
 #define NFS2_SYMLINK 13
-extern  SYMLINK2res * nfs2_symlink_2(SYMLINK2args *, CLIENT *);
+extern  SYMLINK2res * nfs2_symlink_2(SYMLINK2args *, void *);
 extern  SYMLINK2res * nfs2_symlink_2_svc(SYMLINK2args *, struct svc_req *);
 #define NFS2_MKDIR 14
-extern  MKDIR2res * nfs2_mkdir_2(MKDIR2args *, CLIENT *);
+extern  MKDIR2res * nfs2_mkdir_2(MKDIR2args *, void *);
 extern  MKDIR2res * nfs2_mkdir_2_svc(MKDIR2args *, struct svc_req *);
 #define NFS2_RMDIR 15
-extern  RMDIR2res * nfs2_rmdir_2(RMDIR2args *, CLIENT *);
+extern  RMDIR2res * nfs2_rmdir_2(RMDIR2args *, void *);
 extern  RMDIR2res * nfs2_rmdir_2_svc(RMDIR2args *, struct svc_req *);
 #define NFS2_READDIR 16
-extern  READDIR2res * nfs2_readdir_2(READDIR2args *, CLIENT *);
+extern  READDIR2res * nfs2_readdir_2(READDIR2args *, void *);
 extern  READDIR2res * nfs2_readdir_2_svc(READDIR2args *, struct svc_req *);
 #define NFS2_STATFS 17
-extern  STATFS2res * nfs2_statfs_2(STATFS2args *, CLIENT *);
+extern  STATFS2res * nfs2_statfs_2(STATFS2args *, void *);
 extern  STATFS2res * nfs2_statfs_2_svc(STATFS2args *, struct svc_req *);
-extern int nfs_program_2_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int nfs_program_2_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NFS2_NULL 0
@@ -1469,72 +1469,72 @@ extern int nfs_program_2_freeresult ();
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define NFS3_NULL 0
-extern  void * nfs3_null_3(void *, CLIENT *);
+extern  void * nfs3_null_3(void *, void *);
 extern  void * nfs3_null_3_svc(void *, struct svc_req *);
 #define NFS3_GETATTR 1
-extern  GETATTR3res * nfs3_getattr_3(GETATTR3args *, CLIENT *);
+extern  GETATTR3res * nfs3_getattr_3(GETATTR3args *, void *);
 extern  GETATTR3res * nfs3_getattr_3_svc(GETATTR3args *, struct svc_req *);
 #define NFS3_SETATTR 2
-extern  SETATTR3res * nfs3_setattr_3(SETATTR3args *, CLIENT *);
+extern  SETATTR3res * nfs3_setattr_3(SETATTR3args *, void *);
 extern  SETATTR3res * nfs3_setattr_3_svc(SETATTR3args *, struct svc_req *);
 #define NFS3_LOOKUP 3
-extern  LOOKUP3res * nfs3_lookup_3(LOOKUP3args *, CLIENT *);
+extern  LOOKUP3res * nfs3_lookup_3(LOOKUP3args *, void *);
 extern  LOOKUP3res * nfs3_lookup_3_svc(LOOKUP3args *, struct svc_req *);
 #define NFS3_ACCESS 4
-extern  ACCESS3res * nfs3_access_3(ACCESS3args *, CLIENT *);
+extern  ACCESS3res * nfs3_access_3(ACCESS3args *, void *);
 extern  ACCESS3res * nfs3_access_3_svc(ACCESS3args *, struct svc_req *);
 #define NFS3_READLINK 5
-extern  READLINK3res * nfs3_readlink_3(READLINK3args *, CLIENT *);
+extern  READLINK3res * nfs3_readlink_3(READLINK3args *, void *);
 extern  READLINK3res * nfs3_readlink_3_svc(READLINK3args *, struct svc_req *);
 #define NFS3_READ 6
-extern  READ3res * nfs3_read_3(READ3args *, CLIENT *);
+extern  READ3res * nfs3_read_3(READ3args *, void *);
 extern  READ3res * nfs3_read_3_svc(READ3args *, struct svc_req *);
 #define NFS3_WRITE 7
-extern  WRITE3res * nfs3_write_3(WRITE3args *, CLIENT *);
+extern  WRITE3res * nfs3_write_3(WRITE3args *, void *);
 extern  WRITE3res * nfs3_write_3_svc(WRITE3args *, struct svc_req *);
 #define NFS3_CREATE 8
-extern  CREATE3res * nfs3_create_3(CREATE3args *, CLIENT *);
+extern  CREATE3res * nfs3_create_3(CREATE3args *, void *);
 extern  CREATE3res * nfs3_create_3_svc(CREATE3args *, struct svc_req *);
 #define NFS3_MKDIR 9
-extern  MKDIR3res * nfs3_mkdir_3(MKDIR3args *, CLIENT *);
+extern  MKDIR3res * nfs3_mkdir_3(MKDIR3args *, void *);
 extern  MKDIR3res * nfs3_mkdir_3_svc(MKDIR3args *, struct svc_req *);
 #define NFS3_SYMLINK 10
-extern  SYMLINK3res * nfs3_symlink_3(SYMLINK3args *, CLIENT *);
+extern  SYMLINK3res * nfs3_symlink_3(SYMLINK3args *, void *);
 extern  SYMLINK3res * nfs3_symlink_3_svc(SYMLINK3args *, struct svc_req *);
 #define NFS3_MKNOD 11
-extern  MKNOD3res * nfs3_mknod_3(MKNOD3args *, CLIENT *);
+extern  MKNOD3res * nfs3_mknod_3(MKNOD3args *, void *);
 extern  MKNOD3res * nfs3_mknod_3_svc(MKNOD3args *, struct svc_req *);
 #define NFS3_REMOVE 12
-extern  REMOVE3res * nfs3_remove_3(REMOVE3args *, CLIENT *);
+extern  REMOVE3res * nfs3_remove_3(REMOVE3args *, void *);
 extern  REMOVE3res * nfs3_remove_3_svc(REMOVE3args *, struct svc_req *);
 #define NFS3_RMDIR 13
-extern  RMDIR3res * nfs3_rmdir_3(RMDIR3args *, CLIENT *);
+extern  RMDIR3res * nfs3_rmdir_3(RMDIR3args *, void *);
 extern  RMDIR3res * nfs3_rmdir_3_svc(RMDIR3args *, struct svc_req *);
 #define NFS3_RENAME 14
-extern  RENAME3res * nfs3_rename_3(RENAME3args *, CLIENT *);
+extern  RENAME3res * nfs3_rename_3(RENAME3args *, void *);
 extern  RENAME3res * nfs3_rename_3_svc(RENAME3args *, struct svc_req *);
 #define NFS3_LINK 15
-extern  LINK3res * nfs3_link_3(LINK3args *, CLIENT *);
+extern  LINK3res * nfs3_link_3(LINK3args *, void *);
 extern  LINK3res * nfs3_link_3_svc(LINK3args *, struct svc_req *);
 #define NFS3_READDIR 16
-extern  READDIR3res * nfs3_readdir_3(READDIR3args *, CLIENT *);
+extern  READDIR3res * nfs3_readdir_3(READDIR3args *, void *);
 extern  READDIR3res * nfs3_readdir_3_svc(READDIR3args *, struct svc_req *);
 #define NFS3_READDIRPLUS 17
-extern  READDIRPLUS3res * nfs3_readdirplus_3(READDIRPLUS3args *, CLIENT *);
+extern  READDIRPLUS3res * nfs3_readdirplus_3(READDIRPLUS3args *, void *);
 extern  READDIRPLUS3res * nfs3_readdirplus_3_svc(READDIRPLUS3args *, struct svc_req *);
 #define NFS3_FSSTAT 18
-extern  FSSTAT3res * nfs3_fsstat_3(FSSTAT3args *, CLIENT *);
+extern  FSSTAT3res * nfs3_fsstat_3(FSSTAT3args *, void *);
 extern  FSSTAT3res * nfs3_fsstat_3_svc(FSSTAT3args *, struct svc_req *);
 #define NFS3_FSINFO 19
-extern  FSINFO3res * nfs3_fsinfo_3(FSINFO3args *, CLIENT *);
+extern  FSINFO3res * nfs3_fsinfo_3(FSINFO3args *, void *);
 extern  FSINFO3res * nfs3_fsinfo_3_svc(FSINFO3args *, struct svc_req *);
 #define NFS3_PATHCONF 20
-extern  PATHCONF3res * nfs3_pathconf_3(PATHCONF3args *, CLIENT *);
+extern  PATHCONF3res * nfs3_pathconf_3(PATHCONF3args *, void *);
 extern  PATHCONF3res * nfs3_pathconf_3_svc(PATHCONF3args *, struct svc_req *);
 #define NFS3_COMMIT 21
-extern  COMMIT3res * nfs3_commit_3(COMMIT3args *, CLIENT *);
+extern  COMMIT3res * nfs3_commit_3(COMMIT3args *, void *);
 extern  COMMIT3res * nfs3_commit_3_svc(COMMIT3args *, struct svc_req *);
-extern int nfs_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int nfs_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NFS3_NULL 0
@@ -1611,15 +1611,15 @@ extern int nfs_program_3_freeresult ();
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define NFSACL3_NULL 0
-extern  void * nfsacl3_null_3(void *, CLIENT *);
+extern  void * nfsacl3_null_3(void *, void *);
 extern  void * nfsacl3_null_3_svc(void *, struct svc_req *);
 #define NFSACL3_GETACL 1
-extern  GETACL3res * nfsacl3_getacl_3(GETACL3args *, CLIENT *);
+extern  GETACL3res * nfsacl3_getacl_3(GETACL3args *, void *);
 extern  GETACL3res * nfsacl3_getacl_3_svc(GETACL3args *, struct svc_req *);
 #define NFSACL3_SETACL 2
-extern  SETACL3res * nfsacl3_setacl_3(SETACL3args *, CLIENT *);
+extern  SETACL3res * nfsacl3_setacl_3(SETACL3args *, void *);
 extern  SETACL3res * nfsacl3_setacl_3_svc(SETACL3args *, struct svc_req *);
-extern int nfsacl_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int nfsacl_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NFSACL3_NULL 0
@@ -1637,378 +1637,378 @@ extern int nfsacl_program_3_freeresult ();
 /* the zdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t zdr_cookieverf3 (ZDR *, cookieverf3);
-extern  bool_t zdr_cookie3 (ZDR *, cookie3*);
-extern  bool_t zdr_nfs_fh3 (ZDR *, nfs_fh3*);
-extern  bool_t zdr_filename3 (ZDR *, filename3*);
-extern  bool_t zdr_diropargs3 (ZDR *, diropargs3*);
-extern  bool_t zdr_ftype3 (ZDR *, ftype3*);
-extern  bool_t zdr_mode3 (ZDR *, mode3*);
-extern  bool_t zdr_uid3 (ZDR *, uid3*);
-extern  bool_t zdr_gid3 (ZDR *, gid3*);
-extern  bool_t zdr_size3 (ZDR *, size3*);
-extern  bool_t zdr_fileid3 (ZDR *, fileid3*);
-extern  bool_t zdr_specdata3 (ZDR *, specdata3*);
-extern  bool_t zdr_nfstime3 (ZDR *, nfstime3*);
-extern  bool_t zdr_fattr3 (ZDR *, fattr3*);
-extern  bool_t zdr_post_op_attr (ZDR *, post_op_attr*);
-extern  bool_t zdr_nfsstat3 (ZDR *, nfsstat3*);
-extern  bool_t zdr_stable_how (ZDR *, stable_how*);
-extern  bool_t zdr_offset3 (ZDR *, offset3*);
-extern  bool_t zdr_count3 (ZDR *, count3*);
-extern  bool_t zdr_wcc_attr (ZDR *, wcc_attr*);
-extern  bool_t zdr_pre_op_attr (ZDR *, pre_op_attr*);
-extern  bool_t zdr_wcc_data (ZDR *, wcc_data*);
-extern  bool_t zdr_WRITE3args (ZDR *, WRITE3args*);
-extern  bool_t zdr_writeverf3 (ZDR *, writeverf3);
-extern  bool_t zdr_WRITE3resok (ZDR *, WRITE3resok*);
-extern  bool_t zdr_WRITE3resfail (ZDR *, WRITE3resfail*);
-extern  bool_t zdr_WRITE3res (ZDR *, WRITE3res*);
-extern  bool_t zdr_LOOKUP3args (ZDR *, LOOKUP3args*);
-extern  bool_t zdr_LOOKUP3resok (ZDR *, LOOKUP3resok*);
-extern  bool_t zdr_LOOKUP3resfail (ZDR *, LOOKUP3resfail*);
-extern  bool_t zdr_LOOKUP3res (ZDR *, LOOKUP3res*);
-extern  bool_t zdr_COMMIT3args (ZDR *, COMMIT3args*);
-extern  bool_t zdr_COMMIT3resok (ZDR *, COMMIT3resok*);
-extern  bool_t zdr_COMMIT3resfail (ZDR *, COMMIT3resfail*);
-extern  bool_t zdr_COMMIT3res (ZDR *, COMMIT3res*);
-extern  bool_t zdr_ACCESS3args (ZDR *, ACCESS3args*);
-extern  bool_t zdr_ACCESS3resok (ZDR *, ACCESS3resok*);
-extern  bool_t zdr_ACCESS3resfail (ZDR *, ACCESS3resfail*);
-extern  bool_t zdr_ACCESS3res (ZDR *, ACCESS3res*);
-extern  bool_t zdr_GETATTR3args (ZDR *, GETATTR3args*);
-extern  bool_t zdr_GETATTR3resok (ZDR *, GETATTR3resok*);
-extern  bool_t zdr_GETATTR3res (ZDR *, GETATTR3res*);
-extern  bool_t zdr_time_how (ZDR *, time_how*);
-extern  bool_t zdr_set_mode3 (ZDR *, set_mode3*);
-extern  bool_t zdr_set_uid3 (ZDR *, set_uid3*);
-extern  bool_t zdr_set_gid3 (ZDR *, set_gid3*);
-extern  bool_t zdr_set_size3 (ZDR *, set_size3*);
-extern  bool_t zdr_set_atime (ZDR *, set_atime*);
-extern  bool_t zdr_set_mtime (ZDR *, set_mtime*);
-extern  bool_t zdr_sattr3 (ZDR *, sattr3*);
-extern  bool_t zdr_createmode3 (ZDR *, createmode3*);
-extern  bool_t zdr_createverf3 (ZDR *, createverf3);
-extern  bool_t zdr_createhow3 (ZDR *, createhow3*);
-extern  bool_t zdr_CREATE3args (ZDR *, CREATE3args*);
-extern  bool_t zdr_post_op_fh3 (ZDR *, post_op_fh3*);
-extern  bool_t zdr_CREATE3resok (ZDR *, CREATE3resok*);
-extern  bool_t zdr_CREATE3resfail (ZDR *, CREATE3resfail*);
-extern  bool_t zdr_CREATE3res (ZDR *, CREATE3res*);
-extern  bool_t zdr_REMOVE3args (ZDR *, REMOVE3args*);
-extern  bool_t zdr_REMOVE3resok (ZDR *, REMOVE3resok*);
-extern  bool_t zdr_REMOVE3resfail (ZDR *, REMOVE3resfail*);
-extern  bool_t zdr_REMOVE3res (ZDR *, REMOVE3res*);
-extern  bool_t zdr_READ3args (ZDR *, READ3args*);
-extern  bool_t zdr_READ3resok (ZDR *, READ3resok*);
-extern  bool_t zdr_READ3resfail (ZDR *, READ3resfail*);
-extern  bool_t zdr_READ3res (ZDR *, READ3res*);
-extern  bool_t zdr_FSINFO3args (ZDR *, FSINFO3args*);
-extern  bool_t zdr_FSINFO3resok (ZDR *, FSINFO3resok*);
-extern  bool_t zdr_FSINFO3resfail (ZDR *, FSINFO3resfail*);
-extern  bool_t zdr_FSINFO3res (ZDR *, FSINFO3res*);
-extern  bool_t zdr_FSSTAT3args (ZDR *, FSSTAT3args*);
-extern  bool_t zdr_FSSTAT3resok (ZDR *, FSSTAT3resok*);
-extern  bool_t zdr_FSSTAT3resfail (ZDR *, FSSTAT3resfail*);
-extern  bool_t zdr_FSSTAT3res (ZDR *, FSSTAT3res*);
-extern  bool_t zdr_PATHCONF3args (ZDR *, PATHCONF3args*);
-extern  bool_t zdr_PATHCONF3resok (ZDR *, PATHCONF3resok*);
-extern  bool_t zdr_PATHCONF3resfail (ZDR *, PATHCONF3resfail*);
-extern  bool_t zdr_PATHCONF3res (ZDR *, PATHCONF3res*);
-extern  bool_t zdr_nfspath3 (ZDR *, nfspath3*);
-extern  bool_t zdr_symlinkdata3 (ZDR *, symlinkdata3*);
-extern  bool_t zdr_SYMLINK3args (ZDR *, SYMLINK3args*);
-extern  bool_t zdr_SYMLINK3resok (ZDR *, SYMLINK3resok*);
-extern  bool_t zdr_SYMLINK3resfail (ZDR *, SYMLINK3resfail*);
-extern  bool_t zdr_SYMLINK3res (ZDR *, SYMLINK3res*);
-extern  bool_t zdr_READLINK3args (ZDR *, READLINK3args*);
-extern  bool_t zdr_READLINK3resok (ZDR *, READLINK3resok*);
-extern  bool_t zdr_READLINK3resfail (ZDR *, READLINK3resfail*);
-extern  bool_t zdr_READLINK3res (ZDR *, READLINK3res*);
-extern  bool_t zdr_devicedata3 (ZDR *, devicedata3*);
-extern  bool_t zdr_mknoddata3 (ZDR *, mknoddata3*);
-extern  bool_t zdr_MKNOD3args (ZDR *, MKNOD3args*);
-extern  bool_t zdr_MKNOD3resok (ZDR *, MKNOD3resok*);
-extern  bool_t zdr_MKNOD3resfail (ZDR *, MKNOD3resfail*);
-extern  bool_t zdr_MKNOD3res (ZDR *, MKNOD3res*);
-extern  bool_t zdr_MKDIR3args (ZDR *, MKDIR3args*);
-extern  bool_t zdr_MKDIR3resok (ZDR *, MKDIR3resok*);
-extern  bool_t zdr_MKDIR3resfail (ZDR *, MKDIR3resfail*);
-extern  bool_t zdr_MKDIR3res (ZDR *, MKDIR3res*);
-extern  bool_t zdr_RMDIR3args (ZDR *, RMDIR3args*);
-extern  bool_t zdr_RMDIR3resok (ZDR *, RMDIR3resok*);
-extern  bool_t zdr_RMDIR3resfail (ZDR *, RMDIR3resfail*);
-extern  bool_t zdr_RMDIR3res (ZDR *, RMDIR3res*);
-extern  bool_t zdr_RENAME3args (ZDR *, RENAME3args*);
-extern  bool_t zdr_RENAME3resok (ZDR *, RENAME3resok*);
-extern  bool_t zdr_RENAME3resfail (ZDR *, RENAME3resfail*);
-extern  bool_t zdr_RENAME3res (ZDR *, RENAME3res*);
-extern  bool_t zdr_READDIRPLUS3args (ZDR *, READDIRPLUS3args*);
-extern  bool_t zdr_entryplus3 (ZDR *, entryplus3*);
-extern  bool_t zdr_dirlistplus3 (ZDR *, dirlistplus3*);
-extern  bool_t zdr_READDIRPLUS3resok (ZDR *, READDIRPLUS3resok*);
-extern  bool_t zdr_READDIRPLUS3resfail (ZDR *, READDIRPLUS3resfail*);
-extern  bool_t zdr_READDIRPLUS3res (ZDR *, READDIRPLUS3res*);
-extern  bool_t zdr_READDIR3args (ZDR *, READDIR3args*);
-extern  bool_t zdr_entry3 (ZDR *, entry3*);
-extern  bool_t zdr_dirlist3 (ZDR *, dirlist3*);
-extern  bool_t zdr_READDIR3resok (ZDR *, READDIR3resok*);
-extern  bool_t zdr_READDIR3resfail (ZDR *, READDIR3resfail*);
-extern  bool_t zdr_READDIR3res (ZDR *, READDIR3res*);
-extern  bool_t zdr_LINK3args (ZDR *, LINK3args*);
-extern  bool_t zdr_LINK3resok (ZDR *, LINK3resok*);
-extern  bool_t zdr_LINK3resfail (ZDR *, LINK3resfail*);
-extern  bool_t zdr_LINK3res (ZDR *, LINK3res*);
-extern  bool_t zdr_sattrguard3 (ZDR *, sattrguard3*);
-extern  bool_t zdr_SETATTR3args (ZDR *, SETATTR3args*);
-extern  bool_t zdr_SETATTR3resok (ZDR *, SETATTR3resok*);
-extern  bool_t zdr_SETATTR3resfail (ZDR *, SETATTR3resfail*);
-extern  bool_t zdr_SETATTR3res (ZDR *, SETATTR3res*);
-extern  bool_t zdr_fhandle2 (ZDR *, fhandle2);
-extern  bool_t zdr_ftype2 (ZDR *, ftype2*);
-extern  bool_t zdr_fattr2 (ZDR *, fattr2*);
-extern  bool_t zdr_sattr2 (ZDR *, sattr2*);
-extern  bool_t zdr_filename2 (ZDR *, filename2*);
-extern  bool_t zdr_path2 (ZDR *, path2*);
-extern  bool_t zdr_nfsdata2 (ZDR *, nfsdata2*);
-extern  bool_t zdr_nfscookie2 (ZDR *, nfscookie2);
-extern  bool_t zdr_entry2 (ZDR *, entry2*);
-extern  bool_t zdr_diropargs2 (ZDR *, diropargs2*);
-extern  bool_t zdr_GETATTR2args (ZDR *, GETATTR2args*);
-extern  bool_t zdr_GETATTR2resok (ZDR *, GETATTR2resok*);
-extern  bool_t zdr_GETATTR2res (ZDR *, GETATTR2res*);
-extern  bool_t zdr_SETATTR2args (ZDR *, SETATTR2args*);
-extern  bool_t zdr_SETATTR2resok (ZDR *, SETATTR2resok*);
-extern  bool_t zdr_SETATTR2res (ZDR *, SETATTR2res*);
-extern  bool_t zdr_LOOKUP2args (ZDR *, LOOKUP2args*);
-extern  bool_t zdr_LOOKUP2resok (ZDR *, LOOKUP2resok*);
-extern  bool_t zdr_LOOKUP2res (ZDR *, LOOKUP2res*);
-extern  bool_t zdr_READLINK2args (ZDR *, READLINK2args*);
-extern  bool_t zdr_READLINK2resok (ZDR *, READLINK2resok*);
-extern  bool_t zdr_READLINK2res (ZDR *, READLINK2res*);
-extern  bool_t zdr_READ2args (ZDR *, READ2args*);
-extern  bool_t zdr_READ2resok (ZDR *, READ2resok*);
-extern  bool_t zdr_READ2res (ZDR *, READ2res*);
-extern  bool_t zdr_WRITE2args (ZDR *, WRITE2args*);
-extern  bool_t zdr_WRITE2resok (ZDR *, WRITE2resok*);
-extern  bool_t zdr_WRITE2res (ZDR *, WRITE2res*);
-extern  bool_t zdr_CREATE2args (ZDR *, CREATE2args*);
-extern  bool_t zdr_CREATE2resok (ZDR *, CREATE2resok*);
-extern  bool_t zdr_CREATE2res (ZDR *, CREATE2res*);
-extern  bool_t zdr_REMOVE2args (ZDR *, REMOVE2args*);
-extern  bool_t zdr_REMOVE2res (ZDR *, REMOVE2res*);
-extern  bool_t zdr_RENAME2args (ZDR *, RENAME2args*);
-extern  bool_t zdr_RENAME2res (ZDR *, RENAME2res*);
-extern  bool_t zdr_LINK2args (ZDR *, LINK2args*);
-extern  bool_t zdr_LINK2res (ZDR *, LINK2res*);
-extern  bool_t zdr_SYMLINK2args (ZDR *, SYMLINK2args*);
-extern  bool_t zdr_SYMLINK2res (ZDR *, SYMLINK2res*);
-extern  bool_t zdr_MKDIR2args (ZDR *, MKDIR2args*);
-extern  bool_t zdr_MKDIR2resok (ZDR *, MKDIR2resok*);
-extern  bool_t zdr_MKDIR2res (ZDR *, MKDIR2res*);
-extern  bool_t zdr_RMDIR2args (ZDR *, RMDIR2args*);
-extern  bool_t zdr_RMDIR2res (ZDR *, RMDIR2res*);
-extern  bool_t zdr_READDIR2args (ZDR *, READDIR2args*);
-extern  bool_t zdr_READDIR2resok (ZDR *, READDIR2resok*);
-extern  bool_t zdr_READDIR2res (ZDR *, READDIR2res*);
-extern  bool_t zdr_STATFS2args (ZDR *, STATFS2args*);
-extern  bool_t zdr_STATFS2resok (ZDR *, STATFS2resok*);
-extern  bool_t zdr_STATFS2res (ZDR *, STATFS2res*);
-extern  bool_t zdr_nfsacl_type (ZDR *, nfsacl_type*);
-extern  bool_t zdr_nfsacl_ace (ZDR *, nfsacl_ace*);
-extern  bool_t zdr_GETACL3args (ZDR *, GETACL3args*);
-extern  bool_t zdr_GETACL3resok (ZDR *, GETACL3resok*);
-extern  bool_t zdr_GETACL3res (ZDR *, GETACL3res*);
-extern  bool_t zdr_SETACL3args (ZDR *, SETACL3args*);
-extern  bool_t zdr_SETACL3resok (ZDR *, SETACL3resok*);
-extern  bool_t zdr_SETACL3res (ZDR *, SETACL3res*);
+extern  uint32_t zdr_cookieverf3 (ZDR *, cookieverf3);
+extern  uint32_t zdr_cookie3 (ZDR *, cookie3*);
+extern  uint32_t zdr_nfs_fh3 (ZDR *, nfs_fh3*);
+extern  uint32_t zdr_filename3 (ZDR *, filename3*);
+extern  uint32_t zdr_diropargs3 (ZDR *, diropargs3*);
+extern  uint32_t zdr_ftype3 (ZDR *, ftype3*);
+extern  uint32_t zdr_mode3 (ZDR *, mode3*);
+extern  uint32_t zdr_uid3 (ZDR *, uid3*);
+extern  uint32_t zdr_gid3 (ZDR *, gid3*);
+extern  uint32_t zdr_size3 (ZDR *, size3*);
+extern  uint32_t zdr_fileid3 (ZDR *, fileid3*);
+extern  uint32_t zdr_specdata3 (ZDR *, specdata3*);
+extern  uint32_t zdr_nfstime3 (ZDR *, nfstime3*);
+extern  uint32_t zdr_fattr3 (ZDR *, fattr3*);
+extern  uint32_t zdr_post_op_attr (ZDR *, post_op_attr*);
+extern  uint32_t zdr_nfsstat3 (ZDR *, nfsstat3*);
+extern  uint32_t zdr_stable_how (ZDR *, stable_how*);
+extern  uint32_t zdr_offset3 (ZDR *, offset3*);
+extern  uint32_t zdr_count3 (ZDR *, count3*);
+extern  uint32_t zdr_wcc_attr (ZDR *, wcc_attr*);
+extern  uint32_t zdr_pre_op_attr (ZDR *, pre_op_attr*);
+extern  uint32_t zdr_wcc_data (ZDR *, wcc_data*);
+extern  uint32_t zdr_WRITE3args (ZDR *, WRITE3args*);
+extern  uint32_t zdr_writeverf3 (ZDR *, writeverf3);
+extern  uint32_t zdr_WRITE3resok (ZDR *, WRITE3resok*);
+extern  uint32_t zdr_WRITE3resfail (ZDR *, WRITE3resfail*);
+extern  uint32_t zdr_WRITE3res (ZDR *, WRITE3res*);
+extern  uint32_t zdr_LOOKUP3args (ZDR *, LOOKUP3args*);
+extern  uint32_t zdr_LOOKUP3resok (ZDR *, LOOKUP3resok*);
+extern  uint32_t zdr_LOOKUP3resfail (ZDR *, LOOKUP3resfail*);
+extern  uint32_t zdr_LOOKUP3res (ZDR *, LOOKUP3res*);
+extern  uint32_t zdr_COMMIT3args (ZDR *, COMMIT3args*);
+extern  uint32_t zdr_COMMIT3resok (ZDR *, COMMIT3resok*);
+extern  uint32_t zdr_COMMIT3resfail (ZDR *, COMMIT3resfail*);
+extern  uint32_t zdr_COMMIT3res (ZDR *, COMMIT3res*);
+extern  uint32_t zdr_ACCESS3args (ZDR *, ACCESS3args*);
+extern  uint32_t zdr_ACCESS3resok (ZDR *, ACCESS3resok*);
+extern  uint32_t zdr_ACCESS3resfail (ZDR *, ACCESS3resfail*);
+extern  uint32_t zdr_ACCESS3res (ZDR *, ACCESS3res*);
+extern  uint32_t zdr_GETATTR3args (ZDR *, GETATTR3args*);
+extern  uint32_t zdr_GETATTR3resok (ZDR *, GETATTR3resok*);
+extern  uint32_t zdr_GETATTR3res (ZDR *, GETATTR3res*);
+extern  uint32_t zdr_time_how (ZDR *, time_how*);
+extern  uint32_t zdr_set_mode3 (ZDR *, set_mode3*);
+extern  uint32_t zdr_set_uid3 (ZDR *, set_uid3*);
+extern  uint32_t zdr_set_gid3 (ZDR *, set_gid3*);
+extern  uint32_t zdr_set_size3 (ZDR *, set_size3*);
+extern  uint32_t zdr_set_atime (ZDR *, set_atime*);
+extern  uint32_t zdr_set_mtime (ZDR *, set_mtime*);
+extern  uint32_t zdr_sattr3 (ZDR *, sattr3*);
+extern  uint32_t zdr_createmode3 (ZDR *, createmode3*);
+extern  uint32_t zdr_createverf3 (ZDR *, createverf3);
+extern  uint32_t zdr_createhow3 (ZDR *, createhow3*);
+extern  uint32_t zdr_CREATE3args (ZDR *, CREATE3args*);
+extern  uint32_t zdr_post_op_fh3 (ZDR *, post_op_fh3*);
+extern  uint32_t zdr_CREATE3resok (ZDR *, CREATE3resok*);
+extern  uint32_t zdr_CREATE3resfail (ZDR *, CREATE3resfail*);
+extern  uint32_t zdr_CREATE3res (ZDR *, CREATE3res*);
+extern  uint32_t zdr_REMOVE3args (ZDR *, REMOVE3args*);
+extern  uint32_t zdr_REMOVE3resok (ZDR *, REMOVE3resok*);
+extern  uint32_t zdr_REMOVE3resfail (ZDR *, REMOVE3resfail*);
+extern  uint32_t zdr_REMOVE3res (ZDR *, REMOVE3res*);
+extern  uint32_t zdr_READ3args (ZDR *, READ3args*);
+extern  uint32_t zdr_READ3resok (ZDR *, READ3resok*);
+extern  uint32_t zdr_READ3resfail (ZDR *, READ3resfail*);
+extern  uint32_t zdr_READ3res (ZDR *, READ3res*);
+extern  uint32_t zdr_FSINFO3args (ZDR *, FSINFO3args*);
+extern  uint32_t zdr_FSINFO3resok (ZDR *, FSINFO3resok*);
+extern  uint32_t zdr_FSINFO3resfail (ZDR *, FSINFO3resfail*);
+extern  uint32_t zdr_FSINFO3res (ZDR *, FSINFO3res*);
+extern  uint32_t zdr_FSSTAT3args (ZDR *, FSSTAT3args*);
+extern  uint32_t zdr_FSSTAT3resok (ZDR *, FSSTAT3resok*);
+extern  uint32_t zdr_FSSTAT3resfail (ZDR *, FSSTAT3resfail*);
+extern  uint32_t zdr_FSSTAT3res (ZDR *, FSSTAT3res*);
+extern  uint32_t zdr_PATHCONF3args (ZDR *, PATHCONF3args*);
+extern  uint32_t zdr_PATHCONF3resok (ZDR *, PATHCONF3resok*);
+extern  uint32_t zdr_PATHCONF3resfail (ZDR *, PATHCONF3resfail*);
+extern  uint32_t zdr_PATHCONF3res (ZDR *, PATHCONF3res*);
+extern  uint32_t zdr_nfspath3 (ZDR *, nfspath3*);
+extern  uint32_t zdr_symlinkdata3 (ZDR *, symlinkdata3*);
+extern  uint32_t zdr_SYMLINK3args (ZDR *, SYMLINK3args*);
+extern  uint32_t zdr_SYMLINK3resok (ZDR *, SYMLINK3resok*);
+extern  uint32_t zdr_SYMLINK3resfail (ZDR *, SYMLINK3resfail*);
+extern  uint32_t zdr_SYMLINK3res (ZDR *, SYMLINK3res*);
+extern  uint32_t zdr_READLINK3args (ZDR *, READLINK3args*);
+extern  uint32_t zdr_READLINK3resok (ZDR *, READLINK3resok*);
+extern  uint32_t zdr_READLINK3resfail (ZDR *, READLINK3resfail*);
+extern  uint32_t zdr_READLINK3res (ZDR *, READLINK3res*);
+extern  uint32_t zdr_devicedata3 (ZDR *, devicedata3*);
+extern  uint32_t zdr_mknoddata3 (ZDR *, mknoddata3*);
+extern  uint32_t zdr_MKNOD3args (ZDR *, MKNOD3args*);
+extern  uint32_t zdr_MKNOD3resok (ZDR *, MKNOD3resok*);
+extern  uint32_t zdr_MKNOD3resfail (ZDR *, MKNOD3resfail*);
+extern  uint32_t zdr_MKNOD3res (ZDR *, MKNOD3res*);
+extern  uint32_t zdr_MKDIR3args (ZDR *, MKDIR3args*);
+extern  uint32_t zdr_MKDIR3resok (ZDR *, MKDIR3resok*);
+extern  uint32_t zdr_MKDIR3resfail (ZDR *, MKDIR3resfail*);
+extern  uint32_t zdr_MKDIR3res (ZDR *, MKDIR3res*);
+extern  uint32_t zdr_RMDIR3args (ZDR *, RMDIR3args*);
+extern  uint32_t zdr_RMDIR3resok (ZDR *, RMDIR3resok*);
+extern  uint32_t zdr_RMDIR3resfail (ZDR *, RMDIR3resfail*);
+extern  uint32_t zdr_RMDIR3res (ZDR *, RMDIR3res*);
+extern  uint32_t zdr_RENAME3args (ZDR *, RENAME3args*);
+extern  uint32_t zdr_RENAME3resok (ZDR *, RENAME3resok*);
+extern  uint32_t zdr_RENAME3resfail (ZDR *, RENAME3resfail*);
+extern  uint32_t zdr_RENAME3res (ZDR *, RENAME3res*);
+extern  uint32_t zdr_READDIRPLUS3args (ZDR *, READDIRPLUS3args*);
+extern  uint32_t zdr_entryplus3 (ZDR *, entryplus3*);
+extern  uint32_t zdr_dirlistplus3 (ZDR *, dirlistplus3*);
+extern  uint32_t zdr_READDIRPLUS3resok (ZDR *, READDIRPLUS3resok*);
+extern  uint32_t zdr_READDIRPLUS3resfail (ZDR *, READDIRPLUS3resfail*);
+extern  uint32_t zdr_READDIRPLUS3res (ZDR *, READDIRPLUS3res*);
+extern  uint32_t zdr_READDIR3args (ZDR *, READDIR3args*);
+extern  uint32_t zdr_entry3 (ZDR *, entry3*);
+extern  uint32_t zdr_dirlist3 (ZDR *, dirlist3*);
+extern  uint32_t zdr_READDIR3resok (ZDR *, READDIR3resok*);
+extern  uint32_t zdr_READDIR3resfail (ZDR *, READDIR3resfail*);
+extern  uint32_t zdr_READDIR3res (ZDR *, READDIR3res*);
+extern  uint32_t zdr_LINK3args (ZDR *, LINK3args*);
+extern  uint32_t zdr_LINK3resok (ZDR *, LINK3resok*);
+extern  uint32_t zdr_LINK3resfail (ZDR *, LINK3resfail*);
+extern  uint32_t zdr_LINK3res (ZDR *, LINK3res*);
+extern  uint32_t zdr_sattrguard3 (ZDR *, sattrguard3*);
+extern  uint32_t zdr_SETATTR3args (ZDR *, SETATTR3args*);
+extern  uint32_t zdr_SETATTR3resok (ZDR *, SETATTR3resok*);
+extern  uint32_t zdr_SETATTR3resfail (ZDR *, SETATTR3resfail*);
+extern  uint32_t zdr_SETATTR3res (ZDR *, SETATTR3res*);
+extern  uint32_t zdr_fhandle2 (ZDR *, fhandle2);
+extern  uint32_t zdr_ftype2 (ZDR *, ftype2*);
+extern  uint32_t zdr_fattr2 (ZDR *, fattr2*);
+extern  uint32_t zdr_sattr2 (ZDR *, sattr2*);
+extern  uint32_t zdr_filename2 (ZDR *, filename2*);
+extern  uint32_t zdr_path2 (ZDR *, path2*);
+extern  uint32_t zdr_nfsdata2 (ZDR *, nfsdata2*);
+extern  uint32_t zdr_nfscookie2 (ZDR *, nfscookie2);
+extern  uint32_t zdr_entry2 (ZDR *, entry2*);
+extern  uint32_t zdr_diropargs2 (ZDR *, diropargs2*);
+extern  uint32_t zdr_GETATTR2args (ZDR *, GETATTR2args*);
+extern  uint32_t zdr_GETATTR2resok (ZDR *, GETATTR2resok*);
+extern  uint32_t zdr_GETATTR2res (ZDR *, GETATTR2res*);
+extern  uint32_t zdr_SETATTR2args (ZDR *, SETATTR2args*);
+extern  uint32_t zdr_SETATTR2resok (ZDR *, SETATTR2resok*);
+extern  uint32_t zdr_SETATTR2res (ZDR *, SETATTR2res*);
+extern  uint32_t zdr_LOOKUP2args (ZDR *, LOOKUP2args*);
+extern  uint32_t zdr_LOOKUP2resok (ZDR *, LOOKUP2resok*);
+extern  uint32_t zdr_LOOKUP2res (ZDR *, LOOKUP2res*);
+extern  uint32_t zdr_READLINK2args (ZDR *, READLINK2args*);
+extern  uint32_t zdr_READLINK2resok (ZDR *, READLINK2resok*);
+extern  uint32_t zdr_READLINK2res (ZDR *, READLINK2res*);
+extern  uint32_t zdr_READ2args (ZDR *, READ2args*);
+extern  uint32_t zdr_READ2resok (ZDR *, READ2resok*);
+extern  uint32_t zdr_READ2res (ZDR *, READ2res*);
+extern  uint32_t zdr_WRITE2args (ZDR *, WRITE2args*);
+extern  uint32_t zdr_WRITE2resok (ZDR *, WRITE2resok*);
+extern  uint32_t zdr_WRITE2res (ZDR *, WRITE2res*);
+extern  uint32_t zdr_CREATE2args (ZDR *, CREATE2args*);
+extern  uint32_t zdr_CREATE2resok (ZDR *, CREATE2resok*);
+extern  uint32_t zdr_CREATE2res (ZDR *, CREATE2res*);
+extern  uint32_t zdr_REMOVE2args (ZDR *, REMOVE2args*);
+extern  uint32_t zdr_REMOVE2res (ZDR *, REMOVE2res*);
+extern  uint32_t zdr_RENAME2args (ZDR *, RENAME2args*);
+extern  uint32_t zdr_RENAME2res (ZDR *, RENAME2res*);
+extern  uint32_t zdr_LINK2args (ZDR *, LINK2args*);
+extern  uint32_t zdr_LINK2res (ZDR *, LINK2res*);
+extern  uint32_t zdr_SYMLINK2args (ZDR *, SYMLINK2args*);
+extern  uint32_t zdr_SYMLINK2res (ZDR *, SYMLINK2res*);
+extern  uint32_t zdr_MKDIR2args (ZDR *, MKDIR2args*);
+extern  uint32_t zdr_MKDIR2resok (ZDR *, MKDIR2resok*);
+extern  uint32_t zdr_MKDIR2res (ZDR *, MKDIR2res*);
+extern  uint32_t zdr_RMDIR2args (ZDR *, RMDIR2args*);
+extern  uint32_t zdr_RMDIR2res (ZDR *, RMDIR2res*);
+extern  uint32_t zdr_READDIR2args (ZDR *, READDIR2args*);
+extern  uint32_t zdr_READDIR2resok (ZDR *, READDIR2resok*);
+extern  uint32_t zdr_READDIR2res (ZDR *, READDIR2res*);
+extern  uint32_t zdr_STATFS2args (ZDR *, STATFS2args*);
+extern  uint32_t zdr_STATFS2resok (ZDR *, STATFS2resok*);
+extern  uint32_t zdr_STATFS2res (ZDR *, STATFS2res*);
+extern  uint32_t zdr_nfsacl_type (ZDR *, nfsacl_type*);
+extern  uint32_t zdr_nfsacl_ace (ZDR *, nfsacl_ace*);
+extern  uint32_t zdr_GETACL3args (ZDR *, GETACL3args*);
+extern  uint32_t zdr_GETACL3resok (ZDR *, GETACL3resok*);
+extern  uint32_t zdr_GETACL3res (ZDR *, GETACL3res*);
+extern  uint32_t zdr_SETACL3args (ZDR *, SETACL3args*);
+extern  uint32_t zdr_SETACL3resok (ZDR *, SETACL3resok*);
+extern  uint32_t zdr_SETACL3res (ZDR *, SETACL3res*);
 
 #else /* K&R C */
-extern bool_t zdr_cookieverf3 ();
-extern bool_t zdr_cookie3 ();
-extern bool_t zdr_nfs_fh3 ();
-extern bool_t zdr_filename3 ();
-extern bool_t zdr_diropargs3 ();
-extern bool_t zdr_ftype3 ();
-extern bool_t zdr_mode3 ();
-extern bool_t zdr_uid3 ();
-extern bool_t zdr_gid3 ();
-extern bool_t zdr_size3 ();
-extern bool_t zdr_fileid3 ();
-extern bool_t zdr_specdata3 ();
-extern bool_t zdr_nfstime3 ();
-extern bool_t zdr_fattr3 ();
-extern bool_t zdr_post_op_attr ();
-extern bool_t zdr_nfsstat3 ();
-extern bool_t zdr_stable_how ();
-extern bool_t zdr_offset3 ();
-extern bool_t zdr_count3 ();
-extern bool_t zdr_wcc_attr ();
-extern bool_t zdr_pre_op_attr ();
-extern bool_t zdr_wcc_data ();
-extern bool_t zdr_WRITE3args ();
-extern bool_t zdr_writeverf3 ();
-extern bool_t zdr_WRITE3resok ();
-extern bool_t zdr_WRITE3resfail ();
-extern bool_t zdr_WRITE3res ();
-extern bool_t zdr_LOOKUP3args ();
-extern bool_t zdr_LOOKUP3resok ();
-extern bool_t zdr_LOOKUP3resfail ();
-extern bool_t zdr_LOOKUP3res ();
-extern bool_t zdr_COMMIT3args ();
-extern bool_t zdr_COMMIT3resok ();
-extern bool_t zdr_COMMIT3resfail ();
-extern bool_t zdr_COMMIT3res ();
-extern bool_t zdr_ACCESS3args ();
-extern bool_t zdr_ACCESS3resok ();
-extern bool_t zdr_ACCESS3resfail ();
-extern bool_t zdr_ACCESS3res ();
-extern bool_t zdr_GETATTR3args ();
-extern bool_t zdr_GETATTR3resok ();
-extern bool_t zdr_GETATTR3res ();
-extern bool_t zdr_time_how ();
-extern bool_t zdr_set_mode3 ();
-extern bool_t zdr_set_uid3 ();
-extern bool_t zdr_set_gid3 ();
-extern bool_t zdr_set_size3 ();
-extern bool_t zdr_set_atime ();
-extern bool_t zdr_set_mtime ();
-extern bool_t zdr_sattr3 ();
-extern bool_t zdr_createmode3 ();
-extern bool_t zdr_createverf3 ();
-extern bool_t zdr_createhow3 ();
-extern bool_t zdr_CREATE3args ();
-extern bool_t zdr_post_op_fh3 ();
-extern bool_t zdr_CREATE3resok ();
-extern bool_t zdr_CREATE3resfail ();
-extern bool_t zdr_CREATE3res ();
-extern bool_t zdr_REMOVE3args ();
-extern bool_t zdr_REMOVE3resok ();
-extern bool_t zdr_REMOVE3resfail ();
-extern bool_t zdr_REMOVE3res ();
-extern bool_t zdr_READ3args ();
-extern bool_t zdr_READ3resok ();
-extern bool_t zdr_READ3resfail ();
-extern bool_t zdr_READ3res ();
-extern bool_t zdr_FSINFO3args ();
-extern bool_t zdr_FSINFO3resok ();
-extern bool_t zdr_FSINFO3resfail ();
-extern bool_t zdr_FSINFO3res ();
-extern bool_t zdr_FSSTAT3args ();
-extern bool_t zdr_FSSTAT3resok ();
-extern bool_t zdr_FSSTAT3resfail ();
-extern bool_t zdr_FSSTAT3res ();
-extern bool_t zdr_PATHCONF3args ();
-extern bool_t zdr_PATHCONF3resok ();
-extern bool_t zdr_PATHCONF3resfail ();
-extern bool_t zdr_PATHCONF3res ();
-extern bool_t zdr_nfspath3 ();
-extern bool_t zdr_symlinkdata3 ();
-extern bool_t zdr_SYMLINK3args ();
-extern bool_t zdr_SYMLINK3resok ();
-extern bool_t zdr_SYMLINK3resfail ();
-extern bool_t zdr_SYMLINK3res ();
-extern bool_t zdr_READLINK3args ();
-extern bool_t zdr_READLINK3resok ();
-extern bool_t zdr_READLINK3resfail ();
-extern bool_t zdr_READLINK3res ();
-extern bool_t zdr_devicedata3 ();
-extern bool_t zdr_mknoddata3 ();
-extern bool_t zdr_MKNOD3args ();
-extern bool_t zdr_MKNOD3resok ();
-extern bool_t zdr_MKNOD3resfail ();
-extern bool_t zdr_MKNOD3res ();
-extern bool_t zdr_MKDIR3args ();
-extern bool_t zdr_MKDIR3resok ();
-extern bool_t zdr_MKDIR3resfail ();
-extern bool_t zdr_MKDIR3res ();
-extern bool_t zdr_RMDIR3args ();
-extern bool_t zdr_RMDIR3resok ();
-extern bool_t zdr_RMDIR3resfail ();
-extern bool_t zdr_RMDIR3res ();
-extern bool_t zdr_RENAME3args ();
-extern bool_t zdr_RENAME3resok ();
-extern bool_t zdr_RENAME3resfail ();
-extern bool_t zdr_RENAME3res ();
-extern bool_t zdr_READDIRPLUS3args ();
-extern bool_t zdr_entryplus3 ();
-extern bool_t zdr_dirlistplus3 ();
-extern bool_t zdr_READDIRPLUS3resok ();
-extern bool_t zdr_READDIRPLUS3resfail ();
-extern bool_t zdr_READDIRPLUS3res ();
-extern bool_t zdr_READDIR3args ();
-extern bool_t zdr_entry3 ();
-extern bool_t zdr_dirlist3 ();
-extern bool_t zdr_READDIR3resok ();
-extern bool_t zdr_READDIR3resfail ();
-extern bool_t zdr_READDIR3res ();
-extern bool_t zdr_LINK3args ();
-extern bool_t zdr_LINK3resok ();
-extern bool_t zdr_LINK3resfail ();
-extern bool_t zdr_LINK3res ();
-extern bool_t zdr_sattrguard3 ();
-extern bool_t zdr_SETATTR3args ();
-extern bool_t zdr_SETATTR3resok ();
-extern bool_t zdr_SETATTR3resfail ();
-extern bool_t zdr_SETATTR3res ();
-extern bool_t zdr_fhandle2 ();
-extern bool_t zdr_ftype2 ();
-extern bool_t zdr_fattr2 ();
-extern bool_t zdr_sattr2 ();
-extern bool_t zdr_filename2 ();
-extern bool_t zdr_path2 ();
-extern bool_t zdr_nfsdata2 ();
-extern bool_t zdr_nfscookie2 ();
-extern bool_t zdr_entry2 ();
-extern bool_t zdr_diropargs2 ();
-extern bool_t zdr_GETATTR2args ();
-extern bool_t zdr_GETATTR2resok ();
-extern bool_t zdr_GETATTR2res ();
-extern bool_t zdr_SETATTR2args ();
-extern bool_t zdr_SETATTR2resok ();
-extern bool_t zdr_SETATTR2res ();
-extern bool_t zdr_LOOKUP2args ();
-extern bool_t zdr_LOOKUP2resok ();
-extern bool_t zdr_LOOKUP2res ();
-extern bool_t zdr_READLINK2args ();
-extern bool_t zdr_READLINK2resok ();
-extern bool_t zdr_READLINK2res ();
-extern bool_t zdr_READ2args ();
-extern bool_t zdr_READ2resok ();
-extern bool_t zdr_READ2res ();
-extern bool_t zdr_WRITE2args ();
-extern bool_t zdr_WRITE2resok ();
-extern bool_t zdr_WRITE2res ();
-extern bool_t zdr_CREATE2args ();
-extern bool_t zdr_CREATE2resok ();
-extern bool_t zdr_CREATE2res ();
-extern bool_t zdr_REMOVE2args ();
-extern bool_t zdr_REMOVE2res ();
-extern bool_t zdr_RENAME2args ();
-extern bool_t zdr_RENAME2res ();
-extern bool_t zdr_LINK2args ();
-extern bool_t zdr_LINK2res ();
-extern bool_t zdr_SYMLINK2args ();
-extern bool_t zdr_SYMLINK2res ();
-extern bool_t zdr_MKDIR2args ();
-extern bool_t zdr_MKDIR2resok ();
-extern bool_t zdr_MKDIR2res ();
-extern bool_t zdr_RMDIR2args ();
-extern bool_t zdr_RMDIR2res ();
-extern bool_t zdr_READDIR2args ();
-extern bool_t zdr_READDIR2resok ();
-extern bool_t zdr_READDIR2res ();
-extern bool_t zdr_STATFS2args ();
-extern bool_t zdr_STATFS2resok ();
-extern bool_t zdr_STATFS2res ();
-extern bool_t zdr_nfsacl_type ();
-extern bool_t zdr_nfsacl_ace ();
-extern bool_t zdr_GETACL3args ();
-extern bool_t zdr_GETACL3resok ();
-extern bool_t zdr_GETACL3res ();
-extern bool_t zdr_SETACL3args ();
-extern bool_t zdr_SETACL3resok ();
-extern bool_t zdr_SETACL3res ();
+extern uint32_t zdr_cookieverf3 ();
+extern uint32_t zdr_cookie3 ();
+extern uint32_t zdr_nfs_fh3 ();
+extern uint32_t zdr_filename3 ();
+extern uint32_t zdr_diropargs3 ();
+extern uint32_t zdr_ftype3 ();
+extern uint32_t zdr_mode3 ();
+extern uint32_t zdr_uid3 ();
+extern uint32_t zdr_gid3 ();
+extern uint32_t zdr_size3 ();
+extern uint32_t zdr_fileid3 ();
+extern uint32_t zdr_specdata3 ();
+extern uint32_t zdr_nfstime3 ();
+extern uint32_t zdr_fattr3 ();
+extern uint32_t zdr_post_op_attr ();
+extern uint32_t zdr_nfsstat3 ();
+extern uint32_t zdr_stable_how ();
+extern uint32_t zdr_offset3 ();
+extern uint32_t zdr_count3 ();
+extern uint32_t zdr_wcc_attr ();
+extern uint32_t zdr_pre_op_attr ();
+extern uint32_t zdr_wcc_data ();
+extern uint32_t zdr_WRITE3args ();
+extern uint32_t zdr_writeverf3 ();
+extern uint32_t zdr_WRITE3resok ();
+extern uint32_t zdr_WRITE3resfail ();
+extern uint32_t zdr_WRITE3res ();
+extern uint32_t zdr_LOOKUP3args ();
+extern uint32_t zdr_LOOKUP3resok ();
+extern uint32_t zdr_LOOKUP3resfail ();
+extern uint32_t zdr_LOOKUP3res ();
+extern uint32_t zdr_COMMIT3args ();
+extern uint32_t zdr_COMMIT3resok ();
+extern uint32_t zdr_COMMIT3resfail ();
+extern uint32_t zdr_COMMIT3res ();
+extern uint32_t zdr_ACCESS3args ();
+extern uint32_t zdr_ACCESS3resok ();
+extern uint32_t zdr_ACCESS3resfail ();
+extern uint32_t zdr_ACCESS3res ();
+extern uint32_t zdr_GETATTR3args ();
+extern uint32_t zdr_GETATTR3resok ();
+extern uint32_t zdr_GETATTR3res ();
+extern uint32_t zdr_time_how ();
+extern uint32_t zdr_set_mode3 ();
+extern uint32_t zdr_set_uid3 ();
+extern uint32_t zdr_set_gid3 ();
+extern uint32_t zdr_set_size3 ();
+extern uint32_t zdr_set_atime ();
+extern uint32_t zdr_set_mtime ();
+extern uint32_t zdr_sattr3 ();
+extern uint32_t zdr_createmode3 ();
+extern uint32_t zdr_createverf3 ();
+extern uint32_t zdr_createhow3 ();
+extern uint32_t zdr_CREATE3args ();
+extern uint32_t zdr_post_op_fh3 ();
+extern uint32_t zdr_CREATE3resok ();
+extern uint32_t zdr_CREATE3resfail ();
+extern uint32_t zdr_CREATE3res ();
+extern uint32_t zdr_REMOVE3args ();
+extern uint32_t zdr_REMOVE3resok ();
+extern uint32_t zdr_REMOVE3resfail ();
+extern uint32_t zdr_REMOVE3res ();
+extern uint32_t zdr_READ3args ();
+extern uint32_t zdr_READ3resok ();
+extern uint32_t zdr_READ3resfail ();
+extern uint32_t zdr_READ3res ();
+extern uint32_t zdr_FSINFO3args ();
+extern uint32_t zdr_FSINFO3resok ();
+extern uint32_t zdr_FSINFO3resfail ();
+extern uint32_t zdr_FSINFO3res ();
+extern uint32_t zdr_FSSTAT3args ();
+extern uint32_t zdr_FSSTAT3resok ();
+extern uint32_t zdr_FSSTAT3resfail ();
+extern uint32_t zdr_FSSTAT3res ();
+extern uint32_t zdr_PATHCONF3args ();
+extern uint32_t zdr_PATHCONF3resok ();
+extern uint32_t zdr_PATHCONF3resfail ();
+extern uint32_t zdr_PATHCONF3res ();
+extern uint32_t zdr_nfspath3 ();
+extern uint32_t zdr_symlinkdata3 ();
+extern uint32_t zdr_SYMLINK3args ();
+extern uint32_t zdr_SYMLINK3resok ();
+extern uint32_t zdr_SYMLINK3resfail ();
+extern uint32_t zdr_SYMLINK3res ();
+extern uint32_t zdr_READLINK3args ();
+extern uint32_t zdr_READLINK3resok ();
+extern uint32_t zdr_READLINK3resfail ();
+extern uint32_t zdr_READLINK3res ();
+extern uint32_t zdr_devicedata3 ();
+extern uint32_t zdr_mknoddata3 ();
+extern uint32_t zdr_MKNOD3args ();
+extern uint32_t zdr_MKNOD3resok ();
+extern uint32_t zdr_MKNOD3resfail ();
+extern uint32_t zdr_MKNOD3res ();
+extern uint32_t zdr_MKDIR3args ();
+extern uint32_t zdr_MKDIR3resok ();
+extern uint32_t zdr_MKDIR3resfail ();
+extern uint32_t zdr_MKDIR3res ();
+extern uint32_t zdr_RMDIR3args ();
+extern uint32_t zdr_RMDIR3resok ();
+extern uint32_t zdr_RMDIR3resfail ();
+extern uint32_t zdr_RMDIR3res ();
+extern uint32_t zdr_RENAME3args ();
+extern uint32_t zdr_RENAME3resok ();
+extern uint32_t zdr_RENAME3resfail ();
+extern uint32_t zdr_RENAME3res ();
+extern uint32_t zdr_READDIRPLUS3args ();
+extern uint32_t zdr_entryplus3 ();
+extern uint32_t zdr_dirlistplus3 ();
+extern uint32_t zdr_READDIRPLUS3resok ();
+extern uint32_t zdr_READDIRPLUS3resfail ();
+extern uint32_t zdr_READDIRPLUS3res ();
+extern uint32_t zdr_READDIR3args ();
+extern uint32_t zdr_entry3 ();
+extern uint32_t zdr_dirlist3 ();
+extern uint32_t zdr_READDIR3resok ();
+extern uint32_t zdr_READDIR3resfail ();
+extern uint32_t zdr_READDIR3res ();
+extern uint32_t zdr_LINK3args ();
+extern uint32_t zdr_LINK3resok ();
+extern uint32_t zdr_LINK3resfail ();
+extern uint32_t zdr_LINK3res ();
+extern uint32_t zdr_sattrguard3 ();
+extern uint32_t zdr_SETATTR3args ();
+extern uint32_t zdr_SETATTR3resok ();
+extern uint32_t zdr_SETATTR3resfail ();
+extern uint32_t zdr_SETATTR3res ();
+extern uint32_t zdr_fhandle2 ();
+extern uint32_t zdr_ftype2 ();
+extern uint32_t zdr_fattr2 ();
+extern uint32_t zdr_sattr2 ();
+extern uint32_t zdr_filename2 ();
+extern uint32_t zdr_path2 ();
+extern uint32_t zdr_nfsdata2 ();
+extern uint32_t zdr_nfscookie2 ();
+extern uint32_t zdr_entry2 ();
+extern uint32_t zdr_diropargs2 ();
+extern uint32_t zdr_GETATTR2args ();
+extern uint32_t zdr_GETATTR2resok ();
+extern uint32_t zdr_GETATTR2res ();
+extern uint32_t zdr_SETATTR2args ();
+extern uint32_t zdr_SETATTR2resok ();
+extern uint32_t zdr_SETATTR2res ();
+extern uint32_t zdr_LOOKUP2args ();
+extern uint32_t zdr_LOOKUP2resok ();
+extern uint32_t zdr_LOOKUP2res ();
+extern uint32_t zdr_READLINK2args ();
+extern uint32_t zdr_READLINK2resok ();
+extern uint32_t zdr_READLINK2res ();
+extern uint32_t zdr_READ2args ();
+extern uint32_t zdr_READ2resok ();
+extern uint32_t zdr_READ2res ();
+extern uint32_t zdr_WRITE2args ();
+extern uint32_t zdr_WRITE2resok ();
+extern uint32_t zdr_WRITE2res ();
+extern uint32_t zdr_CREATE2args ();
+extern uint32_t zdr_CREATE2resok ();
+extern uint32_t zdr_CREATE2res ();
+extern uint32_t zdr_REMOVE2args ();
+extern uint32_t zdr_REMOVE2res ();
+extern uint32_t zdr_RENAME2args ();
+extern uint32_t zdr_RENAME2res ();
+extern uint32_t zdr_LINK2args ();
+extern uint32_t zdr_LINK2res ();
+extern uint32_t zdr_SYMLINK2args ();
+extern uint32_t zdr_SYMLINK2res ();
+extern uint32_t zdr_MKDIR2args ();
+extern uint32_t zdr_MKDIR2resok ();
+extern uint32_t zdr_MKDIR2res ();
+extern uint32_t zdr_RMDIR2args ();
+extern uint32_t zdr_RMDIR2res ();
+extern uint32_t zdr_READDIR2args ();
+extern uint32_t zdr_READDIR2resok ();
+extern uint32_t zdr_READDIR2res ();
+extern uint32_t zdr_STATFS2args ();
+extern uint32_t zdr_STATFS2resok ();
+extern uint32_t zdr_STATFS2res ();
+extern uint32_t zdr_nfsacl_type ();
+extern uint32_t zdr_nfsacl_ace ();
+extern uint32_t zdr_GETACL3args ();
+extern uint32_t zdr_GETACL3resok ();
+extern uint32_t zdr_GETACL3res ();
+extern uint32_t zdr_SETACL3args ();
+extern uint32_t zdr_SETACL3resok ();
+extern uint32_t zdr_SETACL3res ();
 
 #endif /* K&R C */
 

diff --git a/nlm/Makefile.am b/nlm/Makefile.am
index 0cc563dbf5b327c92010b6adace537c80ed5ded8..dd91cb97f707837e6f1724cdf1e9f546c2d97504 100644 (file)
--- a/nlm/Makefile.am
+++ b/nlm/Makefile.am
@@ -19,6 +19,6 @@ nlm-stamp : nlm.x
 
 compile_rpc:   
        cat nlm.x | head -29 >libnfs-raw-nlm.h
-       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-nlm.h
+       rpcgen -h nlm.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.h
        cat nlm.x | head -29 >libnfs-raw-nlm.c
-       rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" >> libnfs-raw-nlm.c
+       rpcgen -c nlm.x | sed -e "s/#include \".*nlm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nlm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nlm.c

diff --git a/nlm/libnfs-raw-nlm.c b/nlm/libnfs-raw-nlm.c
index 79302615eafc4d31b1f06283cc47bb1ca4fa7976..ccb2c822875ad9040647d4bd8b8bd39dad62a65d 100644 (file)
--- a/nlm/libnfs-raw-nlm.c
+++ b/nlm/libnfs-raw-nlm.c
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "libnfs-zdr.h"
 #include "libnfs-raw-nlm.h"
 
-bool_t
+uint32_t
 zdr_nlm_fh4 (ZDR *zdrs, nlm_fh4 *objp)
 {
        register int32_t *buf;
@@ -46,7 +46,7 @@ zdr_nlm_fh4 (ZDR *zdrs, nlm_fh4 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm4_oh (ZDR *zdrs, nlm4_oh *objp)
 {
        register int32_t *buf;
@@ -57,7 +57,7 @@ zdr_nlm4_oh (ZDR *zdrs, nlm4_oh *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm_cookie (ZDR *zdrs, nlm_cookie *objp)
 {
        register int32_t *buf;
@@ -68,7 +68,7 @@ zdr_nlm_cookie (ZDR *zdrs, nlm_cookie *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlmstat4 (ZDR *zdrs, nlmstat4 *objp)
 {
        register int32_t *buf;
@@ -79,7 +79,7 @@ zdr_nlmstat4 (ZDR *zdrs, nlmstat4 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm4_holder (ZDR *zdrs, nlm4_holder *objp)
 {
        register int32_t *buf;
@@ -98,7 +98,7 @@ zdr_nlm4_holder (ZDR *zdrs, nlm4_holder *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm4_lock (ZDR *zdrs, nlm4_lock *objp)
 {
        register int32_t *buf;
@@ -119,7 +119,7 @@ zdr_nlm4_lock (ZDR *zdrs, nlm4_lock *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm4_share (ZDR *zdrs, nlm4_share *objp)
 {
        register int32_t *buf;
@@ -138,7 +138,7 @@ zdr_nlm4_share (ZDR *zdrs, nlm4_share *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm4_testres_denied (ZDR *zdrs, nlm4_testres_denied *objp)
 {
        register int32_t *buf;
@@ -149,7 +149,7 @@ zdr_nlm4_testres_denied (ZDR *zdrs, nlm4_testres_denied *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nlm4_testreply (ZDR *zdrs, nlm4_testreply *objp)
 {
        register int32_t *buf;
@@ -168,7 +168,7 @@ zdr_nlm4_testreply (ZDR *zdrs, nlm4_testreply *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_TESTres (ZDR *zdrs, NLM4_TESTres *objp)
 {
        register int32_t *buf;
@@ -181,7 +181,7 @@ zdr_NLM4_TESTres (ZDR *zdrs, NLM4_TESTres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_TESTargs (ZDR *zdrs, NLM4_TESTargs *objp)
 {
        register int32_t *buf;
@@ -196,7 +196,7 @@ zdr_NLM4_TESTargs (ZDR *zdrs, NLM4_TESTargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_CANCres (ZDR *zdrs, NLM4_CANCres *objp)
 {
        register int32_t *buf;
@@ -209,7 +209,7 @@ zdr_NLM4_CANCres (ZDR *zdrs, NLM4_CANCres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_CANCargs (ZDR *zdrs, NLM4_CANCargs *objp)
 {
        register int32_t *buf;
@@ -226,7 +226,7 @@ zdr_NLM4_CANCargs (ZDR *zdrs, NLM4_CANCargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_UNLOCKres (ZDR *zdrs, NLM4_UNLOCKres *objp)
 {
        register int32_t *buf;
@@ -239,7 +239,7 @@ zdr_NLM4_UNLOCKres (ZDR *zdrs, NLM4_UNLOCKres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_UNLOCKargs (ZDR *zdrs, NLM4_UNLOCKargs *objp)
 {
        register int32_t *buf;
@@ -252,7 +252,7 @@ zdr_NLM4_UNLOCKargs (ZDR *zdrs, NLM4_UNLOCKargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_LOCKres (ZDR *zdrs, NLM4_LOCKres *objp)
 {
        register int32_t *buf;
@@ -265,7 +265,7 @@ zdr_NLM4_LOCKres (ZDR *zdrs, NLM4_LOCKres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_LOCKargs (ZDR *zdrs, NLM4_LOCKargs *objp)
 {
        register int32_t *buf;
@@ -286,7 +286,7 @@ zdr_NLM4_LOCKargs (ZDR *zdrs, NLM4_LOCKargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_GRANTEDargs (ZDR *zdrs, NLM4_GRANTEDargs *objp)
 {
        register int32_t *buf;
@@ -301,7 +301,7 @@ zdr_NLM4_GRANTEDargs (ZDR *zdrs, NLM4_GRANTEDargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NLM4_GRANTEDres (ZDR *zdrs, NLM4_GRANTEDres *objp)
 {
        register int32_t *buf;

diff --git a/nlm/libnfs-raw-nlm.h b/nlm/libnfs-raw-nlm.h
index eb73c1ac99bb3712bc4d5166336828c14feb58c0..ce852598ef3bedf96a021c2f8d6ff6e3d95c2aaf 100644 (file)
--- a/nlm/libnfs-raw-nlm.h
+++ b/nlm/libnfs-raw-nlm.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _NLM_H_RPCGEN
 #define _NLM_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -76,7 +76,7 @@ enum nlmstat4 {
 typedef enum nlmstat4 nlmstat4;
 
 struct nlm4_holder {
-       bool_t exclusive;
+       uint32_t exclusive;
        u_int svid;
        nlm4_oh oh;
        u_quad_t l_offset;
@@ -125,7 +125,7 @@ typedef struct NLM4_TESTres NLM4_TESTres;
 
 struct NLM4_TESTargs {
        nlm_cookie cookie;
-       bool_t exclusive;
+       uint32_t exclusive;
        nlm4_lock lock;
 };
 typedef struct NLM4_TESTargs NLM4_TESTargs;
@@ -138,8 +138,8 @@ typedef struct NLM4_CANCres NLM4_CANCres;
 
 struct NLM4_CANCargs {
        nlm_cookie cookie;
-       bool_t block;
-       bool_t exclusive;
+       uint32_t block;
+       uint32_t exclusive;
        nlm4_lock lock;
 };
 typedef struct NLM4_CANCargs NLM4_CANCargs;
@@ -164,17 +164,17 @@ typedef struct NLM4_LOCKres NLM4_LOCKres;
 
 struct NLM4_LOCKargs {
        nlm_cookie cookie;
-       bool_t block;
-       bool_t exclusive;
+       uint32_t block;
+       uint32_t exclusive;
        nlm4_lock lock;
-       bool_t reclaim;
+       uint32_t reclaim;
        int state;
 };
 typedef struct NLM4_LOCKargs NLM4_LOCKargs;
 
 struct NLM4_GRANTEDargs {
        nlm_cookie cookie;
-       bool_t exclusive;
+       uint32_t exclusive;
        nlm4_lock lock;
 };
 typedef struct NLM4_GRANTEDargs NLM4_GRANTEDargs;
@@ -190,54 +190,54 @@ typedef struct NLM4_GRANTEDres NLM4_GRANTEDres;
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define NLM4_NULL 0
-extern  void * nlm4_null_4(void *, CLIENT *);
+extern  void * nlm4_null_4(void *, void *);
 extern  void * nlm4_null_4_svc(void *, struct svc_req *);
 #define NLM4_TEST 1
-extern  NLM4_TESTres * nlm4_test_4(NLM4_TESTargs *, CLIENT *);
+extern  NLM4_TESTres * nlm4_test_4(NLM4_TESTargs *, void *);
 extern  NLM4_TESTres * nlm4_test_4_svc(NLM4_TESTargs *, struct svc_req *);
 #define NLM4_LOCK 2
-extern  NLM4_LOCKres * nlm4_lock_4(NLM4_LOCKargs *, CLIENT *);
+extern  NLM4_LOCKres * nlm4_lock_4(NLM4_LOCKargs *, void *);
 extern  NLM4_LOCKres * nlm4_lock_4_svc(NLM4_LOCKargs *, struct svc_req *);
 #define NLM4_CANCEL 3
-extern  NLM4_CANCres * nlm4_cancel_4(NLM4_CANCargs *, CLIENT *);
+extern  NLM4_CANCres * nlm4_cancel_4(NLM4_CANCargs *, void *);
 extern  NLM4_CANCres * nlm4_cancel_4_svc(NLM4_CANCargs *, struct svc_req *);
 #define NLM4_UNLOCK 4
-extern  NLM4_UNLOCKres * nlm4_unlock_4(NLM4_UNLOCKargs *, CLIENT *);
+extern  NLM4_UNLOCKres * nlm4_unlock_4(NLM4_UNLOCKargs *, void *);
 extern  NLM4_UNLOCKres * nlm4_unlock_4_svc(NLM4_UNLOCKargs *, struct svc_req *);
 #define NLM4_GRANT 5
-extern  NLM4_GRANTEDres * nlm4_grant_4(NLM4_GRANTEDargs *, CLIENT *);
+extern  NLM4_GRANTEDres * nlm4_grant_4(NLM4_GRANTEDargs *, void *);
 extern  NLM4_GRANTEDres * nlm4_grant_4_svc(NLM4_GRANTEDargs *, struct svc_req *);
 #define NLM4_TEST_MSG 6
-extern  void * nlm4_test_msg_4(NLM4_TESTargs *, CLIENT *);
+extern  void * nlm4_test_msg_4(NLM4_TESTargs *, void *);
 extern  void * nlm4_test_msg_4_svc(NLM4_TESTargs *, struct svc_req *);
 #define NLM4_LOCK_MSG 7
-extern  void * nlm4_lock_msg_4(NLM4_LOCKargs *, CLIENT *);
+extern  void * nlm4_lock_msg_4(NLM4_LOCKargs *, void *);
 extern  void * nlm4_lock_msg_4_svc(NLM4_LOCKargs *, struct svc_req *);
 #define NLM4_CANCEL_MSG 8
-extern  void * nlm4_cancel_msg_4(NLM4_CANCargs *, CLIENT *);
+extern  void * nlm4_cancel_msg_4(NLM4_CANCargs *, void *);
 extern  void * nlm4_cancel_msg_4_svc(NLM4_CANCargs *, struct svc_req *);
 #define NLM4_UNLOCK_MSG 9
-extern  void * nlm4_unlock_msg_4(NLM4_UNLOCKargs *, CLIENT *);
+extern  void * nlm4_unlock_msg_4(NLM4_UNLOCKargs *, void *);
 extern  void * nlm4_unlock_msg_4_svc(NLM4_UNLOCKargs *, struct svc_req *);
 #define NLM4_GRANT_MSG 10
-extern  void * nlm4_grant_msg_4(NLM4_GRANTEDargs *, CLIENT *);
+extern  void * nlm4_grant_msg_4(NLM4_GRANTEDargs *, void *);
 extern  void * nlm4_grant_msg_4_svc(NLM4_GRANTEDargs *, struct svc_req *);
 #define NLM4_TEST_RES 11
-extern  void * nlm4_test_res_4(NLM4_TESTres *, CLIENT *);
+extern  void * nlm4_test_res_4(NLM4_TESTres *, void *);
 extern  void * nlm4_test_res_4_svc(NLM4_TESTres *, struct svc_req *);
 #define NLM4_LOCK_RES 12
-extern  void * nlm4_lock_res_4(NLM4_LOCKres *, CLIENT *);
+extern  void * nlm4_lock_res_4(NLM4_LOCKres *, void *);
 extern  void * nlm4_lock_res_4_svc(NLM4_LOCKres *, struct svc_req *);
 #define NLM4_CANCEL_RES 13
-extern  void * nlm4_cancel_res_4(NLM4_CANCres *, CLIENT *);
+extern  void * nlm4_cancel_res_4(NLM4_CANCres *, void *);
 extern  void * nlm4_cancel_res_4_svc(NLM4_CANCres *, struct svc_req *);
 #define NLM4_UNLOCK_RES 14
-extern  void * nlm4_unlock_res_4(NLM4_UNLOCKres *, CLIENT *);
+extern  void * nlm4_unlock_res_4(NLM4_UNLOCKres *, void *);
 extern  void * nlm4_unlock_res_4_svc(NLM4_UNLOCKres *, struct svc_req *);
 #define NLM4_GRANT_RES 15
-extern  void * nlm4_grant_res_4(NLM4_GRANTEDres *, CLIENT *);
+extern  void * nlm4_grant_res_4(NLM4_GRANTEDres *, void *);
 extern  void * nlm4_grant_res_4_svc(NLM4_GRANTEDres *, struct svc_req *);
-extern int nlm_program_4_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int nlm_program_4_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NLM4_NULL 0
@@ -294,46 +294,46 @@ extern int nlm_program_4_freeresult ();
 /* the zdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t zdr_nlm_fh4 (ZDR *, nlm_fh4*);
-extern  bool_t zdr_nlm4_oh (ZDR *, nlm4_oh*);
-extern  bool_t zdr_nlm_cookie (ZDR *, nlm_cookie*);
-extern  bool_t zdr_nlmstat4 (ZDR *, nlmstat4*);
-extern  bool_t zdr_nlm4_holder (ZDR *, nlm4_holder*);
-extern  bool_t zdr_nlm4_lock (ZDR *, nlm4_lock*);
-extern  bool_t zdr_nlm4_share (ZDR *, nlm4_share*);
-extern  bool_t zdr_nlm4_testres_denied (ZDR *, nlm4_testres_denied*);
-extern  bool_t zdr_nlm4_testreply (ZDR *, nlm4_testreply*);
-extern  bool_t zdr_NLM4_TESTres (ZDR *, NLM4_TESTres*);
-extern  bool_t zdr_NLM4_TESTargs (ZDR *, NLM4_TESTargs*);
-extern  bool_t zdr_NLM4_CANCres (ZDR *, NLM4_CANCres*);
-extern  bool_t zdr_NLM4_CANCargs (ZDR *, NLM4_CANCargs*);
-extern  bool_t zdr_NLM4_UNLOCKres (ZDR *, NLM4_UNLOCKres*);
-extern  bool_t zdr_NLM4_UNLOCKargs (ZDR *, NLM4_UNLOCKargs*);
-extern  bool_t zdr_NLM4_LOCKres (ZDR *, NLM4_LOCKres*);
-extern  bool_t zdr_NLM4_LOCKargs (ZDR *, NLM4_LOCKargs*);
-extern  bool_t zdr_NLM4_GRANTEDargs (ZDR *, NLM4_GRANTEDargs*);
-extern  bool_t zdr_NLM4_GRANTEDres (ZDR *, NLM4_GRANTEDres*);
+extern  uint32_t zdr_nlm_fh4 (ZDR *, nlm_fh4*);
+extern  uint32_t zdr_nlm4_oh (ZDR *, nlm4_oh*);
+extern  uint32_t zdr_nlm_cookie (ZDR *, nlm_cookie*);
+extern  uint32_t zdr_nlmstat4 (ZDR *, nlmstat4*);
+extern  uint32_t zdr_nlm4_holder (ZDR *, nlm4_holder*);
+extern  uint32_t zdr_nlm4_lock (ZDR *, nlm4_lock*);
+extern  uint32_t zdr_nlm4_share (ZDR *, nlm4_share*);
+extern  uint32_t zdr_nlm4_testres_denied (ZDR *, nlm4_testres_denied*);
+extern  uint32_t zdr_nlm4_testreply (ZDR *, nlm4_testreply*);
+extern  uint32_t zdr_NLM4_TESTres (ZDR *, NLM4_TESTres*);
+extern  uint32_t zdr_NLM4_TESTargs (ZDR *, NLM4_TESTargs*);
+extern  uint32_t zdr_NLM4_CANCres (ZDR *, NLM4_CANCres*);
+extern  uint32_t zdr_NLM4_CANCargs (ZDR *, NLM4_CANCargs*);
+extern  uint32_t zdr_NLM4_UNLOCKres (ZDR *, NLM4_UNLOCKres*);
+extern  uint32_t zdr_NLM4_UNLOCKargs (ZDR *, NLM4_UNLOCKargs*);
+extern  uint32_t zdr_NLM4_LOCKres (ZDR *, NLM4_LOCKres*);
+extern  uint32_t zdr_NLM4_LOCKargs (ZDR *, NLM4_LOCKargs*);
+extern  uint32_t zdr_NLM4_GRANTEDargs (ZDR *, NLM4_GRANTEDargs*);
+extern  uint32_t zdr_NLM4_GRANTEDres (ZDR *, NLM4_GRANTEDres*);
 
 #else /* K&R C */
-extern bool_t zdr_nlm_fh4 ();
-extern bool_t zdr_nlm4_oh ();
-extern bool_t zdr_nlm_cookie ();
-extern bool_t zdr_nlmstat4 ();
-extern bool_t zdr_nlm4_holder ();
-extern bool_t zdr_nlm4_lock ();
-extern bool_t zdr_nlm4_share ();
-extern bool_t zdr_nlm4_testres_denied ();
-extern bool_t zdr_nlm4_testreply ();
-extern bool_t zdr_NLM4_TESTres ();
-extern bool_t zdr_NLM4_TESTargs ();
-extern bool_t zdr_NLM4_CANCres ();
-extern bool_t zdr_NLM4_CANCargs ();
-extern bool_t zdr_NLM4_UNLOCKres ();
-extern bool_t zdr_NLM4_UNLOCKargs ();
-extern bool_t zdr_NLM4_LOCKres ();
-extern bool_t zdr_NLM4_LOCKargs ();
-extern bool_t zdr_NLM4_GRANTEDargs ();
-extern bool_t zdr_NLM4_GRANTEDres ();
+extern uint32_t zdr_nlm_fh4 ();
+extern uint32_t zdr_nlm4_oh ();
+extern uint32_t zdr_nlm_cookie ();
+extern uint32_t zdr_nlmstat4 ();
+extern uint32_t zdr_nlm4_holder ();
+extern uint32_t zdr_nlm4_lock ();
+extern uint32_t zdr_nlm4_share ();
+extern uint32_t zdr_nlm4_testres_denied ();
+extern uint32_t zdr_nlm4_testreply ();
+extern uint32_t zdr_NLM4_TESTres ();
+extern uint32_t zdr_NLM4_TESTargs ();
+extern uint32_t zdr_NLM4_CANCres ();
+extern uint32_t zdr_NLM4_CANCargs ();
+extern uint32_t zdr_NLM4_UNLOCKres ();
+extern uint32_t zdr_NLM4_UNLOCKargs ();
+extern uint32_t zdr_NLM4_LOCKres ();
+extern uint32_t zdr_NLM4_LOCKargs ();
+extern uint32_t zdr_NLM4_GRANTEDargs ();
+extern uint32_t zdr_NLM4_GRANTEDres ();
 
 #endif /* K&R C */
 

diff --git a/nsm/Makefile.am b/nsm/Makefile.am
index 3bf06a84ed83051b931fbedd2f269eb9bba5d3bf..9e45099f0f134c58b723f1572c8987a04d3174d4 100644 (file)
--- a/nsm/Makefile.am
+++ b/nsm/Makefile.am
@@ -19,6 +19,6 @@ nsm-stamp : nsm.x
 
 compile_rpc:   
        cat nsm.x | head -29 >libnfs-raw-nsm.h
-       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-nsm.h
+       rpcgen -h nsm.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.h
        cat nsm.x | head -29 >libnfs-raw-nsm.c
-       rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" >> libnfs-raw-nsm.c
+       rpcgen -c nsm.x | sed -e "s/#include \".*nsm.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-nsm.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n    buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-nsm.c

diff --git a/nsm/libnfs-raw-nsm.c b/nsm/libnfs-raw-nsm.c
index d3be8328abcbab3a46f73fc5a81d32b041319185..cfd98e8367a461ed21a581ecffff04724c7f4464 100644 (file)
--- a/nsm/libnfs-raw-nsm.c
+++ b/nsm/libnfs-raw-nsm.c
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "libnfs-zdr.h"
 #include "libnfs-raw-nsm.h"
 
-bool_t
+uint32_t
 zdr_nsmstat1 (ZDR *zdrs, nsmstat1 *objp)
 {
        register int32_t *buf;
@@ -46,7 +46,7 @@ zdr_nsmstat1 (ZDR *zdrs, nsmstat1 *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nsm_my_id (ZDR *zdrs, nsm_my_id *objp)
 {
        register int32_t *buf;
@@ -63,7 +63,7 @@ zdr_nsm_my_id (ZDR *zdrs, nsm_my_id *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_nsm_mon_id (ZDR *zdrs, nsm_mon_id *objp)
 {
        register int32_t *buf;
@@ -76,7 +76,7 @@ zdr_nsm_mon_id (ZDR *zdrs, nsm_mon_id *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_STATres (ZDR *zdrs, NSM1_STATres *objp)
 {
        register int32_t *buf;
@@ -89,7 +89,7 @@ zdr_NSM1_STATres (ZDR *zdrs, NSM1_STATres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_STATargs (ZDR *zdrs, NSM1_STATargs *objp)
 {
        register int32_t *buf;
@@ -100,7 +100,7 @@ zdr_NSM1_STATargs (ZDR *zdrs, NSM1_STATargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_MONres (ZDR *zdrs, NSM1_MONres *objp)
 {
        register int32_t *buf;
@@ -113,7 +113,7 @@ zdr_NSM1_MONres (ZDR *zdrs, NSM1_MONres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_MONargs (ZDR *zdrs, NSM1_MONargs *objp)
 {
        register int32_t *buf;
@@ -127,7 +127,7 @@ zdr_NSM1_MONargs (ZDR *zdrs, NSM1_MONargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_UNMONres (ZDR *zdrs, NSM1_UNMONres *objp)
 {
        register int32_t *buf;
@@ -138,7 +138,7 @@ zdr_NSM1_UNMONres (ZDR *zdrs, NSM1_UNMONres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_UNMONargs (ZDR *zdrs, NSM1_UNMONargs *objp)
 {
        register int32_t *buf;
@@ -149,7 +149,7 @@ zdr_NSM1_UNMONargs (ZDR *zdrs, NSM1_UNMONargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_UNMONALLres (ZDR *zdrs, NSM1_UNMONALLres *objp)
 {
        register int32_t *buf;
@@ -160,7 +160,7 @@ zdr_NSM1_UNMONALLres (ZDR *zdrs, NSM1_UNMONALLres *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_UNMONALLargs (ZDR *zdrs, NSM1_UNMONALLargs *objp)
 {
        register int32_t *buf;
@@ -171,7 +171,7 @@ zdr_NSM1_UNMONALLargs (ZDR *zdrs, NSM1_UNMONALLargs *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_NSM1_NOTIFYargs (ZDR *zdrs, NSM1_NOTIFYargs *objp)
 {
        register int32_t *buf;

diff --git a/nsm/libnfs-raw-nsm.h b/nsm/libnfs-raw-nsm.h
index d656f3f560817c9e22c5163c90996de960dabbcc..e35e0c2015c9b949e7bd0e09557882ed58eaa9ff 100644 (file)
--- a/nsm/libnfs-raw-nsm.h
+++ b/nsm/libnfs-raw-nsm.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _NSM_H_RPCGEN
 #define _NSM_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -118,27 +118,27 @@ typedef struct NSM1_NOTIFYargs NSM1_NOTIFYargs;
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define NSM1_NULL 0
-extern  void * nsm1_null_1(void *, CLIENT *);
+extern  void * nsm1_null_1(void *, void *);
 extern  void * nsm1_null_1_svc(void *, struct svc_req *);
 #define NSM1_STAT 1
-extern  struct NSM1_STATres * nsm1_stat_1(struct NSM1_STATargs *, CLIENT *);
+extern  struct NSM1_STATres * nsm1_stat_1(struct NSM1_STATargs *, void *);
 extern  struct NSM1_STATres * nsm1_stat_1_svc(struct NSM1_STATargs *, struct svc_req *);
 #define NSM1_MON 2
-extern  struct NSM1_MONres * nsm1_mon_1(struct NSM1_MONargs *, CLIENT *);
+extern  struct NSM1_MONres * nsm1_mon_1(struct NSM1_MONargs *, void *);
 extern  struct NSM1_MONres * nsm1_mon_1_svc(struct NSM1_MONargs *, struct svc_req *);
 #define NSM1_UNMON 3
-extern  struct NSM1_UNMONres * nsm1_unmon_1(struct NSM1_UNMONargs *, CLIENT *);
+extern  struct NSM1_UNMONres * nsm1_unmon_1(struct NSM1_UNMONargs *, void *);
 extern  struct NSM1_UNMONres * nsm1_unmon_1_svc(struct NSM1_UNMONargs *, struct svc_req *);
 #define NSM1_UNMON_ALL 4
-extern  struct NSM1_UNMONALLres * nsm1_unmon_all_1(struct NSM1_UNMONALLargs *, CLIENT *);
+extern  struct NSM1_UNMONALLres * nsm1_unmon_all_1(struct NSM1_UNMONALLargs *, void *);
 extern  struct NSM1_UNMONALLres * nsm1_unmon_all_1_svc(struct NSM1_UNMONALLargs *, struct svc_req *);
 #define NSM1_SIMU_CRASH 5
-extern  void * nsm1_simu_crash_1(void *, CLIENT *);
+extern  void * nsm1_simu_crash_1(void *, void *);
 extern  void * nsm1_simu_crash_1_svc(void *, struct svc_req *);
 #define NSM1_NOTIFY 6
-extern  void * nsm1_notify_1(struct NSM1_NOTIFYargs *, CLIENT *);
+extern  void * nsm1_notify_1(struct NSM1_NOTIFYargs *, void *);
 extern  void * nsm1_notify_1_svc(struct NSM1_NOTIFYargs *, struct svc_req *);
-extern int nsm_program_1_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int nsm_program_1_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define NSM1_NULL 0
@@ -168,32 +168,32 @@ extern int nsm_program_1_freeresult ();
 /* the zdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t zdr_nsmstat1 (ZDR *, nsmstat1*);
-extern  bool_t zdr_nsm_my_id (ZDR *, nsm_my_id*);
-extern  bool_t zdr_nsm_mon_id (ZDR *, nsm_mon_id*);
-extern  bool_t zdr_NSM1_STATres (ZDR *, NSM1_STATres*);
-extern  bool_t zdr_NSM1_STATargs (ZDR *, NSM1_STATargs*);
-extern  bool_t zdr_NSM1_MONres (ZDR *, NSM1_MONres*);
-extern  bool_t zdr_NSM1_MONargs (ZDR *, NSM1_MONargs*);
-extern  bool_t zdr_NSM1_UNMONres (ZDR *, NSM1_UNMONres*);
-extern  bool_t zdr_NSM1_UNMONargs (ZDR *, NSM1_UNMONargs*);
-extern  bool_t zdr_NSM1_UNMONALLres (ZDR *, NSM1_UNMONALLres*);
-extern  bool_t zdr_NSM1_UNMONALLargs (ZDR *, NSM1_UNMONALLargs*);
-extern  bool_t zdr_NSM1_NOTIFYargs (ZDR *, NSM1_NOTIFYargs*);
+extern  uint32_t zdr_nsmstat1 (ZDR *, nsmstat1*);
+extern  uint32_t zdr_nsm_my_id (ZDR *, nsm_my_id*);
+extern  uint32_t zdr_nsm_mon_id (ZDR *, nsm_mon_id*);
+extern  uint32_t zdr_NSM1_STATres (ZDR *, NSM1_STATres*);
+extern  uint32_t zdr_NSM1_STATargs (ZDR *, NSM1_STATargs*);
+extern  uint32_t zdr_NSM1_MONres (ZDR *, NSM1_MONres*);
+extern  uint32_t zdr_NSM1_MONargs (ZDR *, NSM1_MONargs*);
+extern  uint32_t zdr_NSM1_UNMONres (ZDR *, NSM1_UNMONres*);
+extern  uint32_t zdr_NSM1_UNMONargs (ZDR *, NSM1_UNMONargs*);
+extern  uint32_t zdr_NSM1_UNMONALLres (ZDR *, NSM1_UNMONALLres*);
+extern  uint32_t zdr_NSM1_UNMONALLargs (ZDR *, NSM1_UNMONALLargs*);
+extern  uint32_t zdr_NSM1_NOTIFYargs (ZDR *, NSM1_NOTIFYargs*);
 
 #else /* K&R C */
-extern bool_t zdr_nsmstat1 ();
-extern bool_t zdr_nsm_my_id ();
-extern bool_t zdr_nsm_mon_id ();
-extern bool_t zdr_NSM1_STATres ();
-extern bool_t zdr_NSM1_STATargs ();
-extern bool_t zdr_NSM1_MONres ();
-extern bool_t zdr_NSM1_MONargs ();
-extern bool_t zdr_NSM1_UNMONres ();
-extern bool_t zdr_NSM1_UNMONargs ();
-extern bool_t zdr_NSM1_UNMONALLres ();
-extern bool_t zdr_NSM1_UNMONALLargs ();
-extern bool_t zdr_NSM1_NOTIFYargs ();
+extern uint32_t zdr_nsmstat1 ();
+extern uint32_t zdr_nsm_my_id ();
+extern uint32_t zdr_nsm_mon_id ();
+extern uint32_t zdr_NSM1_STATres ();
+extern uint32_t zdr_NSM1_STATargs ();
+extern uint32_t zdr_NSM1_MONres ();
+extern uint32_t zdr_NSM1_MONargs ();
+extern uint32_t zdr_NSM1_UNMONres ();
+extern uint32_t zdr_NSM1_UNMONargs ();
+extern uint32_t zdr_NSM1_UNMONALLres ();
+extern uint32_t zdr_NSM1_UNMONALLargs ();
+extern uint32_t zdr_NSM1_NOTIFYargs ();
 
 #endif /* K&R C */
 

diff --git a/packaging/RPM/libnfs.spec.in b/packaging/RPM/libnfs.spec.in
index 8b34636f30ce38d0146e1efc4d4144f5c56e43a5..0535743e48d7aabacaa75b83784f08b1747d9101 100644 (file)
--- a/packaging/RPM/libnfs.spec.in
+++ b/packaging/RPM/libnfs.spec.in
@@ -108,6 +108,8 @@ Utility programs for LibNFS
 %{_mandir}/man1/nfs-ls.1.gz
 
 %changelog
+* Sat Jul 19 2014 : Version 1.9.5
+ - Remove old ONC-RPC symbols
 * Wed Mar 19 2014 : Version 1.9.3
  - Add O_TRUNC support to nfs_open()
  - Add a simple but incomplete LD_PRELOAD tool

diff --git a/portmap/Makefile.am b/portmap/Makefile.am
index 682ca2ac5a6695fbe6a0aae59f5b567c2e365880..5fcccfa43f39af5bee1c14e7857239a6d52034cd 100644 (file)
--- a/portmap/Makefile.am
+++ b/portmap/Makefile.am
@@ -19,6 +19,6 @@ portmap-stamp : portmap.x
 
 compile_rpc:   
        cat portmap.x | head -29 >libnfs-raw-portmap.h
-       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-portmap.h
+       rpcgen -h portmap.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.h
        cat portmap.x | head -29 >libnfs-raw-portmap.c
-       rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n        buf = NULL;/" >> libnfs-raw-portmap.c
+       rpcgen -c portmap.x | sed -e "s/#include \".*portmap.h\"/#include \"libnfs-zdr.h\"\n#include \"libnfs-raw-portmap.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n        buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-portmap.c

diff --git a/portmap/libnfs-raw-portmap.c b/portmap/libnfs-raw-portmap.c
index 12b919d33a709c86369177f1ab1d3f9971c80fc0..8e2a3c53aee9b3cc7dae71aa359051a38c27aee1 100644 (file)
--- a/portmap/libnfs-raw-portmap.c
+++ b/portmap/libnfs-raw-portmap.c
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "libnfs-zdr.h"
 #include "libnfs-raw-portmap.h"
 
-bool_t
+uint32_t
 zdr_pmap2_mapping (ZDR *zdrs, pmap2_mapping *objp)
 {
        register int32_t *buf;
@@ -91,7 +91,7 @@ zdr_pmap2_mapping (ZDR *zdrs, pmap2_mapping *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap2_call_args (ZDR *zdrs, pmap2_call_args *objp)
 {
        register int32_t *buf;
@@ -147,7 +147,7 @@ zdr_pmap2_call_args (ZDR *zdrs, pmap2_call_args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap2_call_result (ZDR *zdrs, pmap2_call_result *objp)
 {
        register int32_t *buf;
@@ -160,7 +160,7 @@ zdr_pmap2_call_result (ZDR *zdrs, pmap2_call_result *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap2_mapping_list (ZDR *zdrs, pmap2_mapping_list *objp)
 {
        register int32_t *buf;
@@ -173,7 +173,7 @@ zdr_pmap2_mapping_list (ZDR *zdrs, pmap2_mapping_list *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap2_dump_result (ZDR *zdrs, pmap2_dump_result *objp)
 {
        register int32_t *buf;
@@ -184,7 +184,7 @@ zdr_pmap2_dump_result (ZDR *zdrs, pmap2_dump_result *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_string_result (ZDR *zdrs, pmap3_string_result *objp)
 {
        register int32_t *buf;
@@ -195,7 +195,7 @@ zdr_pmap3_string_result (ZDR *zdrs, pmap3_string_result *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_mapping (ZDR *zdrs, pmap3_mapping *objp)
 {
        register int32_t *buf;
@@ -214,7 +214,7 @@ zdr_pmap3_mapping (ZDR *zdrs, pmap3_mapping *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_mapping_list (ZDR *zdrs, pmap3_mapping_list *objp)
 {
        register int32_t *buf;
@@ -227,7 +227,7 @@ zdr_pmap3_mapping_list (ZDR *zdrs, pmap3_mapping_list *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_dump_result (ZDR *zdrs, pmap3_dump_result *objp)
 {
        register int32_t *buf;
@@ -238,7 +238,7 @@ zdr_pmap3_dump_result (ZDR *zdrs, pmap3_dump_result *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_call_args (ZDR *zdrs, pmap3_call_args *objp)
 {
        register int32_t *buf;
@@ -294,7 +294,7 @@ zdr_pmap3_call_args (ZDR *zdrs, pmap3_call_args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_call_result (ZDR *zdrs, pmap3_call_result *objp)
 {
        register int32_t *buf;
@@ -307,7 +307,7 @@ zdr_pmap3_call_result (ZDR *zdrs, pmap3_call_result *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_pmap3_netbuf (ZDR *zdrs, pmap3_netbuf *objp)
 {
        register int32_t *buf;

diff --git a/portmap/libnfs-raw-portmap.h b/portmap/libnfs-raw-portmap.h
index 676be5e8d4d08932630464fc8463eaf11577a546..6036de9b7c5c9be88306e91873aa68737adbc912 100644 (file)
--- a/portmap/libnfs-raw-portmap.h
+++ b/portmap/libnfs-raw-portmap.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _PORTMAP_H_RPCGEN
 #define _PORTMAP_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -142,35 +142,35 @@ typedef struct pmap3_netbuf pmap3_netbuf;
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define PMAP2_NULL 0
-extern  void * pmap2_null_2(void *, CLIENT *);
+extern  void * pmap2_null_2(void *, void *);
 extern  void * pmap2_null_2_svc(void *, struct svc_req *);
 #define PMAP2_SET 1
-extern  bool_t * pmap2_set_2(pmap2_mapping *, CLIENT *);
-extern  bool_t * pmap2_set_2_svc(pmap2_mapping *, struct svc_req *);
+extern  uint32_t * pmap2_set_2(pmap2_mapping *, void *);
+extern  uint32_t * pmap2_set_2_svc(pmap2_mapping *, struct svc_req *);
 #define PMAP2_UNSET 2
-extern  bool_t * pmap2_unset_2(pmap2_mapping *, CLIENT *);
-extern  bool_t * pmap2_unset_2_svc(pmap2_mapping *, struct svc_req *);
+extern  uint32_t * pmap2_unset_2(pmap2_mapping *, void *);
+extern  uint32_t * pmap2_unset_2_svc(pmap2_mapping *, struct svc_req *);
 #define PMAP2_GETPORT 3
-extern  u_int * pmap2_getport_2(pmap2_mapping *, CLIENT *);
+extern  u_int * pmap2_getport_2(pmap2_mapping *, void *);
 extern  u_int * pmap2_getport_2_svc(pmap2_mapping *, struct svc_req *);
 #define PMAP2_DUMP 4
-extern  pmap2_dump_result * pmap2_dump_2(void *, CLIENT *);
+extern  pmap2_dump_result * pmap2_dump_2(void *, void *);
 extern  pmap2_dump_result * pmap2_dump_2_svc(void *, struct svc_req *);
 #define PMAP2_CALLIT 5
-extern  pmap2_call_result * pmap2_callit_2(pmap2_call_args *, CLIENT *);
+extern  pmap2_call_result * pmap2_callit_2(pmap2_call_args *, void *);
 extern  pmap2_call_result * pmap2_callit_2_svc(pmap2_call_args *, struct svc_req *);
-extern int pmap_program_2_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int pmap_program_2_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define PMAP2_NULL 0
 extern  void * pmap2_null_2();
 extern  void * pmap2_null_2_svc();
 #define PMAP2_SET 1
-extern  bool_t * pmap2_set_2();
-extern  bool_t * pmap2_set_2_svc();
+extern  uint32_t * pmap2_set_2();
+extern  uint32_t * pmap2_set_2_svc();
 #define PMAP2_UNSET 2
-extern  bool_t * pmap2_unset_2();
-extern  bool_t * pmap2_unset_2_svc();
+extern  uint32_t * pmap2_unset_2();
+extern  uint32_t * pmap2_unset_2_svc();
 #define PMAP2_GETPORT 3
 extern  u_int * pmap2_getport_2();
 extern  u_int * pmap2_getport_2_svc();
@@ -186,44 +186,44 @@ extern int pmap_program_2_freeresult ();
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define PMAP3_NULL 0
-extern  void * pmap3_null_3(void *, CLIENT *);
+extern  void * pmap3_null_3(void *, void *);
 extern  void * pmap3_null_3_svc(void *, struct svc_req *);
 #define PMAP3_SET 1
-extern  bool_t * pmap3_set_3(pmap3_mapping *, CLIENT *);
-extern  bool_t * pmap3_set_3_svc(pmap3_mapping *, struct svc_req *);
+extern  uint32_t * pmap3_set_3(pmap3_mapping *, void *);
+extern  uint32_t * pmap3_set_3_svc(pmap3_mapping *, struct svc_req *);
 #define PMAP3_UNSET 2
-extern  bool_t * pmap3_unset_3(pmap3_mapping *, CLIENT *);
-extern  bool_t * pmap3_unset_3_svc(pmap3_mapping *, struct svc_req *);
+extern  uint32_t * pmap3_unset_3(pmap3_mapping *, void *);
+extern  uint32_t * pmap3_unset_3_svc(pmap3_mapping *, struct svc_req *);
 #define PMAP3_GETADDR 3
-extern  pmap3_string_result * pmap3_getaddr_3(pmap3_mapping *, CLIENT *);
+extern  pmap3_string_result * pmap3_getaddr_3(pmap3_mapping *, void *);
 extern  pmap3_string_result * pmap3_getaddr_3_svc(pmap3_mapping *, struct svc_req *);
 #define PMAP3_DUMP 4
-extern  pmap3_dump_result * pmap3_dump_3(void *, CLIENT *);
+extern  pmap3_dump_result * pmap3_dump_3(void *, void *);
 extern  pmap3_dump_result * pmap3_dump_3_svc(void *, struct svc_req *);
 #define PMAP3_CALLIT 5
-extern  pmap3_call_result * pmap3_callit_3(pmap3_call_args *, CLIENT *);
+extern  pmap3_call_result * pmap3_callit_3(pmap3_call_args *, void *);
 extern  pmap3_call_result * pmap3_callit_3_svc(pmap3_call_args *, struct svc_req *);
 #define PMAP3_GETTIME 6
-extern  u_int * pmap3_gettime_3(void *, CLIENT *);
+extern  u_int * pmap3_gettime_3(void *, void *);
 extern  u_int * pmap3_gettime_3_svc(void *, struct svc_req *);
 #define PMAP3_UADDR2TADDR 7
-extern  pmap3_netbuf * pmap3_uaddr2taddr_3(char **, CLIENT *);
+extern  pmap3_netbuf * pmap3_uaddr2taddr_3(char **, void *);
 extern  pmap3_netbuf * pmap3_uaddr2taddr_3_svc(char **, struct svc_req *);
 #define PMAP3_TADDR2UADDR 8
-extern  struct pmap3_string_result * pmap3_taddr2uaddr_3(pmap3_netbuf *, CLIENT *);
+extern  struct pmap3_string_result * pmap3_taddr2uaddr_3(pmap3_netbuf *, void *);
 extern  struct pmap3_string_result * pmap3_taddr2uaddr_3_svc(pmap3_netbuf *, struct svc_req *);
-extern int pmap_program_3_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int pmap_program_3_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define PMAP3_NULL 0
 extern  void * pmap3_null_3();
 extern  void * pmap3_null_3_svc();
 #define PMAP3_SET 1
-extern  bool_t * pmap3_set_3();
-extern  bool_t * pmap3_set_3_svc();
+extern  uint32_t * pmap3_set_3();
+extern  uint32_t * pmap3_set_3_svc();
 #define PMAP3_UNSET 2
-extern  bool_t * pmap3_unset_3();
-extern  bool_t * pmap3_unset_3_svc();
+extern  uint32_t * pmap3_unset_3();
+extern  uint32_t * pmap3_unset_3_svc();
 #define PMAP3_GETADDR 3
 extern  pmap3_string_result * pmap3_getaddr_3();
 extern  pmap3_string_result * pmap3_getaddr_3_svc();
@@ -248,32 +248,32 @@ extern int pmap_program_3_freeresult ();
 /* the zdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t zdr_pmap2_mapping (ZDR *, pmap2_mapping*);
-extern  bool_t zdr_pmap2_call_args (ZDR *, pmap2_call_args*);
-extern  bool_t zdr_pmap2_call_result (ZDR *, pmap2_call_result*);
-extern  bool_t zdr_pmap2_mapping_list (ZDR *, pmap2_mapping_list*);
-extern  bool_t zdr_pmap2_dump_result (ZDR *, pmap2_dump_result*);
-extern  bool_t zdr_pmap3_string_result (ZDR *, pmap3_string_result*);
-extern  bool_t zdr_pmap3_mapping (ZDR *, pmap3_mapping*);
-extern  bool_t zdr_pmap3_mapping_list (ZDR *, pmap3_mapping_list*);
-extern  bool_t zdr_pmap3_dump_result (ZDR *, pmap3_dump_result*);
-extern  bool_t zdr_pmap3_call_args (ZDR *, pmap3_call_args*);
-extern  bool_t zdr_pmap3_call_result (ZDR *, pmap3_call_result*);
-extern  bool_t zdr_pmap3_netbuf (ZDR *, pmap3_netbuf*);
+extern  uint32_t zdr_pmap2_mapping (ZDR *, pmap2_mapping*);
+extern  uint32_t zdr_pmap2_call_args (ZDR *, pmap2_call_args*);
+extern  uint32_t zdr_pmap2_call_result (ZDR *, pmap2_call_result*);
+extern  uint32_t zdr_pmap2_mapping_list (ZDR *, pmap2_mapping_list*);
+extern  uint32_t zdr_pmap2_dump_result (ZDR *, pmap2_dump_result*);
+extern  uint32_t zdr_pmap3_string_result (ZDR *, pmap3_string_result*);
+extern  uint32_t zdr_pmap3_mapping (ZDR *, pmap3_mapping*);
+extern  uint32_t zdr_pmap3_mapping_list (ZDR *, pmap3_mapping_list*);
+extern  uint32_t zdr_pmap3_dump_result (ZDR *, pmap3_dump_result*);
+extern  uint32_t zdr_pmap3_call_args (ZDR *, pmap3_call_args*);
+extern  uint32_t zdr_pmap3_call_result (ZDR *, pmap3_call_result*);
+extern  uint32_t zdr_pmap3_netbuf (ZDR *, pmap3_netbuf*);
 
 #else /* K&R C */
-extern bool_t zdr_pmap2_mapping ();
-extern bool_t zdr_pmap2_call_args ();
-extern bool_t zdr_pmap2_call_result ();
-extern bool_t zdr_pmap2_mapping_list ();
-extern bool_t zdr_pmap2_dump_result ();
-extern bool_t zdr_pmap3_string_result ();
-extern bool_t zdr_pmap3_mapping ();
-extern bool_t zdr_pmap3_mapping_list ();
-extern bool_t zdr_pmap3_dump_result ();
-extern bool_t zdr_pmap3_call_args ();
-extern bool_t zdr_pmap3_call_result ();
-extern bool_t zdr_pmap3_netbuf ();
+extern uint32_t zdr_pmap2_mapping ();
+extern uint32_t zdr_pmap2_call_args ();
+extern uint32_t zdr_pmap2_call_result ();
+extern uint32_t zdr_pmap2_mapping_list ();
+extern uint32_t zdr_pmap2_dump_result ();
+extern uint32_t zdr_pmap3_string_result ();
+extern uint32_t zdr_pmap3_mapping ();
+extern uint32_t zdr_pmap3_mapping_list ();
+extern uint32_t zdr_pmap3_dump_result ();
+extern uint32_t zdr_pmap3_call_args ();
+extern uint32_t zdr_pmap3_call_result ();
+extern uint32_t zdr_pmap3_netbuf ();
 
 #endif /* K&R C */
 

diff --git a/rquota/Makefile.am b/rquota/Makefile.am
index 5a604a8cc2ae9656ec388a65c4c99193a03e8449..fae3e1a8adc7b67fd4aa2850b525220374e96621 100644 (file)
--- a/rquota/Makefile.am
+++ b/rquota/Makefile.am
@@ -19,6 +19,6 @@ rquota-stamp : rquota.x
 
 compile_rpc:
        cat rquota.x | head -29 >libnfs-raw-rquota.h
-       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>//" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" >> libnfs-raw-rquota.h
+       rpcgen -h rquota.x | sed -e "s/#include <rpc\/rpc.h>/#include <nfsc\/libnfs-zdr.h>/" | sed -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/ CLIENT / void /g" -e "s/SVCXPRT /void /g" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.h
        cat rquota.x | head -29 >libnfs-raw-rquota.c
-       rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n   buf = NULL;/" >> libnfs-raw-rquota.c
+       rpcgen -c rquota.x | sed -e "s/#include \".*rquota.h\"/#include \"libnfs-xdr.h\"\n#include \"libnfs-raw-rquota.h\"/" -e "s/xdr/zdr/g" -e "s/XDR/ZDR/g" -e "s/register int32_t \*buf;/register int32_t *buf;\n   buf = NULL;/" -e "s/bool_t/uint32_t/g" >> libnfs-raw-rquota.c

diff --git a/rquota/libnfs-raw-rquota.c b/rquota/libnfs-raw-rquota.c
index 482645f2dc3f51541e2fc182fa6c1e076994a21f..4937cb9de1f1f354c31272bb680376e9a5cfb693 100644 (file)
--- a/rquota/libnfs-raw-rquota.c
+++ b/rquota/libnfs-raw-rquota.c
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #include "libnfs-zdr.h"
 #include "libnfs-raw-rquota.h"
 
-bool_t
+uint32_t
 zdr_rquotastat (ZDR *zdrs, rquotastat *objp)
 {
        register int32_t *buf;
@@ -46,7 +46,7 @@ zdr_rquotastat (ZDR *zdrs, rquotastat *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_exportpath (ZDR *zdrs, exportpath *objp)
 {
        register int32_t *buf;
@@ -57,7 +57,7 @@ zdr_exportpath (ZDR *zdrs, exportpath *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETQUOTA1args (ZDR *zdrs, GETQUOTA1args *objp)
 {
        register int32_t *buf;
@@ -70,7 +70,7 @@ zdr_GETQUOTA1args (ZDR *zdrs, GETQUOTA1args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_quotatype (ZDR *zdrs, quotatype *objp)
 {
        register int32_t *buf;
@@ -81,7 +81,7 @@ zdr_quotatype (ZDR *zdrs, quotatype *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETQUOTA2args (ZDR *zdrs, GETQUOTA2args *objp)
 {
        register int32_t *buf;
@@ -96,7 +96,7 @@ zdr_GETQUOTA2args (ZDR *zdrs, GETQUOTA2args *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETQUOTA1res_ok (ZDR *zdrs, GETQUOTA1res_ok *objp)
 {
        register int32_t *buf;
@@ -200,7 +200,7 @@ zdr_GETQUOTA1res_ok (ZDR *zdrs, GETQUOTA1res_ok *objp)
        return TRUE;
 }
 
-bool_t
+uint32_t
 zdr_GETQUOTA1res (ZDR *zdrs, GETQUOTA1res *objp)
 {
        register int32_t *buf;

diff --git a/rquota/libnfs-raw-rquota.h b/rquota/libnfs-raw-rquota.h
index ed5fcb9c9712f5ea10292032d4a0a478df3297f7..27ea104ad8637f1df9327f83ee79a45cc1cddbef 100644 (file)
--- a/rquota/libnfs-raw-rquota.h
+++ b/rquota/libnfs-raw-rquota.h
@@ -35,7 +35,7 @@ either expressed or implied, of the FreeBSD Project.
 #ifndef _RQUOTA_H_RPCGEN
 #define _RQUOTA_H_RPCGEN
 
-
+#include <nfsc/libnfs-zdr.h>
 
 
 #ifdef __cplusplus
@@ -99,15 +99,15 @@ typedef struct GETQUOTA1res GETQUOTA1res;
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define RQUOTA1_NULL 0
-extern  void * rquota1_null_1(void *, CLIENT *);
+extern  void * rquota1_null_1(void *, void *);
 extern  void * rquota1_null_1_svc(void *, struct svc_req *);
 #define RQUOTA1_GETQUOTA 1
-extern  GETQUOTA1res * rquota1_getquota_1(GETQUOTA1args *, CLIENT *);
+extern  GETQUOTA1res * rquota1_getquota_1(GETQUOTA1args *, void *);
 extern  GETQUOTA1res * rquota1_getquota_1_svc(GETQUOTA1args *, struct svc_req *);
 #define RQUOTA1_GETACTIVEQUOTA 2
-extern  GETQUOTA1res * rquota1_getactivequota_1(GETQUOTA1args *, CLIENT *);
+extern  GETQUOTA1res * rquota1_getactivequota_1(GETQUOTA1args *, void *);
 extern  GETQUOTA1res * rquota1_getactivequota_1_svc(GETQUOTA1args *, struct svc_req *);
-extern int rquota_program_1_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int rquota_program_1_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define RQUOTA1_NULL 0
@@ -125,15 +125,15 @@ extern int rquota_program_1_freeresult ();
 
 #if defined(__STDC__) || defined(__cplusplus)
 #define RQUOTA2_NULL 0
-extern  void * rquota2_null_2(void *, CLIENT *);
+extern  void * rquota2_null_2(void *, void *);
 extern  void * rquota2_null_2_svc(void *, struct svc_req *);
 #define RQUOTA2_GETQUOTA 1
-extern  GETQUOTA1res * rquota2_getquota_2(GETQUOTA2args *, CLIENT *);
+extern  GETQUOTA1res * rquota2_getquota_2(GETQUOTA2args *, void *);
 extern  GETQUOTA1res * rquota2_getquota_2_svc(GETQUOTA2args *, struct svc_req *);
 #define RQUOTA2_GETACTIVEQUOTA 2
-extern  GETQUOTA1res * rquota2_getactivequota_2(GETQUOTA2args *, CLIENT *);
+extern  GETQUOTA1res * rquota2_getactivequota_2(GETQUOTA2args *, void *);
 extern  GETQUOTA1res * rquota2_getactivequota_2_svc(GETQUOTA2args *, struct svc_req *);
-extern int rquota_program_2_freeresult (SVCXPRT *, zdrproc_t, caddr_t);
+extern int rquota_program_2_freeresult (void *, zdrproc_t, caddr_t);
 
 #else /* K&R C */
 #define RQUOTA2_NULL 0
@@ -151,22 +151,22 @@ extern int rquota_program_2_freeresult ();
 /* the zdr functions */
 
 #if defined(__STDC__) || defined(__cplusplus)
-extern  bool_t zdr_rquotastat (ZDR *, rquotastat*);
-extern  bool_t zdr_exportpath (ZDR *, exportpath*);
-extern  bool_t zdr_GETQUOTA1args (ZDR *, GETQUOTA1args*);
-extern  bool_t zdr_quotatype (ZDR *, quotatype*);
-extern  bool_t zdr_GETQUOTA2args (ZDR *, GETQUOTA2args*);
-extern  bool_t zdr_GETQUOTA1res_ok (ZDR *, GETQUOTA1res_ok*);
-extern  bool_t zdr_GETQUOTA1res (ZDR *, GETQUOTA1res*);
+extern  uint32_t zdr_rquotastat (ZDR *, rquotastat*);
+extern  uint32_t zdr_exportpath (ZDR *, exportpath*);
+extern  uint32_t zdr_GETQUOTA1args (ZDR *, GETQUOTA1args*);
+extern  uint32_t zdr_quotatype (ZDR *, quotatype*);
+extern  uint32_t zdr_GETQUOTA2args (ZDR *, GETQUOTA2args*);
+extern  uint32_t zdr_GETQUOTA1res_ok (ZDR *, GETQUOTA1res_ok*);
+extern  uint32_t zdr_GETQUOTA1res (ZDR *, GETQUOTA1res*);
 
 #else /* K&R C */
-extern bool_t zdr_rquotastat ();
-extern bool_t zdr_exportpath ();
-extern bool_t zdr_GETQUOTA1args ();
-extern bool_t zdr_quotatype ();
-extern bool_t zdr_GETQUOTA2args ();
-extern bool_t zdr_GETQUOTA1res_ok ();
-extern bool_t zdr_GETQUOTA1res ();
+extern uint32_t zdr_rquotastat ();
+extern uint32_t zdr_exportpath ();
+extern uint32_t zdr_GETQUOTA1args ();
+extern uint32_t zdr_quotatype ();
+extern uint32_t zdr_GETQUOTA2args ();
+extern uint32_t zdr_GETQUOTA1res_ok ();
+extern uint32_t zdr_GETQUOTA1res ();
 
 #endif /* K&R C */
 

diff --git a/utils/nfs-ls.c b/utils/nfs-ls.c
index 7653f56d9b6439981c8e1d4a6cdc5ed2e2e63d49..53152fc9c08e91b2948b13d18d46a9e853ed485e 100644 (file)
--- a/utils/nfs-ls.c
+++ b/utils/nfs-ls.c
@@ -51,7 +51,6 @@ WSADATA wsaData;
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "libnfs-zdr.h"
 #include "libnfs.h"
 #include "libnfs-raw.h"
 #include "libnfs-raw-mount.h"