3 files changed, 10 insertions, 4 deletions
diff --git a/xlators/nfs/lib/src/rpcsvc.c b/xlators/nfs/lib/src/rpcsvc.c
index 0a105ab0dff..930634d6553 100644
--- a/xlators/nfs/lib/src/rpcsvc.c
+++ b/xlators/nfs/lib/src/rpcsvc.c
@@ -219,7 +219,12 @@ nfs_rpcsvc_conn_peer_check_search (dict_t *options, char *pattern, char *clstr)
         addrtok = strtok_r (addrstr, ",", &svptr);
         while (addrtok) {
 
+                /* CASEFOLD not present on Solaris */
+#ifdef FNM_CASEFOLD
                 ret = fnmatch (addrtok, clstr, FNM_CASEFOLD);
+#else
+                ret = fnmatch (addrtok, clstr, 0);
+#endif
                 if (ret == 0)
                         goto err;
 
diff --git a/xlators/nfs/lib/src/xdr-nfs3.c b/xlators/nfs/lib/src/xdr-nfs3.c
index 0360203961c..0ea23dc1cb1 100644
--- a/xlators/nfs/lib/src/xdr-nfs3.c
+++ b/xlators/nfs/lib/src/xdr-nfs3.c
@@ -29,7 +29,7 @@
 bool_t
 xdr_uint64 (XDR *xdrs, uint64 *objp)
 {
-	 if (!xdr_u_quad_t (xdrs, objp))
+	 if (!xdr_uint64_t (xdrs, objp))
 		 return FALSE;
 	return TRUE;
 }
@@ -37,7 +37,7 @@ xdr_uint64 (XDR *xdrs, uint64 *objp)
 bool_t
 xdr_int64 (XDR *xdrs, int64 *objp)
 {
-	 if (!xdr_quad_t (xdrs, objp))
+	 if (!xdr_int64_t (xdrs, objp))
 		 return FALSE;
 	return TRUE;
 }
diff --git a/xlators/nfs/lib/src/xdr-nfs3.h b/xlators/nfs/lib/src/xdr-nfs3.h
index fe4046584ff..5af65e6b0e1 100644
--- a/xlators/nfs/lib/src/xdr-nfs3.h
+++ b/xlators/nfs/lib/src/xdr-nfs3.h
@@ -21,6 +21,7 @@
 #define _XDR_NFS3_H
 
 #include <rpc/rpc.h>
+#include <sys/types.h>
 
 #define NFS3_FHSIZE             64
 #define NFS3_COOKIEVERFSIZE     8
@@ -42,8 +43,8 @@
  */
 #define NFS3_ENTRYP3_FIXED_SIZE  (NFS3_ENTRY3_FIXED_SIZE + NFS3_POSTOPATTR_SIZE + NFS3_POSTOPFH3_FIXED_SIZE)
 
-typedef u_quad_t uint64;
-typedef quad_t int64;
+typedef uint64_t uint64;
+typedef int64_t int64;
 typedef uint32_t uint32;
 typedef int32_t int32;
 typedef char *filename3;