X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmount%2Fnfsmount.c;h=f21aaff410133ef0262f78432d1f21c97a38a937;hb=e9b0bed761bc77ba046f53be2ec324c4b61357ff;hp=4049e662ca2d81c16f6049b27b16e058a51fc682;hpb=6facb22402a0bd8cd49be2ed1a0856b24fef42f4;p=nfs-utils.git

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index 4049e66..f21aaff 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -293,14 +293,14 @@ int nfs_gethostbyname(const char *hostname, struct sockaddr_in *saddr)
  * instead of reserve ports since reserve ports
  * are not needed for pmap requests.
  */
-static u_short
+u_short
 getport(
 	struct sockaddr_in *saddr, 
 	u_long prog, 
 	u_long vers, 
 	u_int prot)
 {
-	u_short port;
+	u_short port = 0;
 	int    socket;
 	CLIENT *clnt = NULL;
 	struct pmap parms;
@@ -800,6 +800,14 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
 				data->flags &= ~NFS_MOUNT_NOACL;
 				if (!val)
 					data->flags |= NFS_MOUNT_NOACL;
+			} else if (!strcmp(opt, "rdirplus")) {
+				data->flags &= ~NFS_MOUNT_NORDIRPLUS;
+				if (!val)
+					data->flags |= NFS_MOUNT_NORDIRPLUS;
+			} else if (!strcmp(opt, "sharecache")) {
+				data->flags &= ~NFS_MOUNT_UNSHARED;
+				if (!val)
+					data->flags |= NFS_MOUNT_UNSHARED;
 #endif
 			} else {
 			bad_option:
@@ -983,6 +991,7 @@ nfsmount(const char *spec, const char *node, int *flags,
 #endif
 #if NFS_MOUNT_VERSION >= 5
 	printf("sec = %u ", data.pseudoflavor);
+	printf("readdirplus = %d ", (data.flags & NFS_MOUNT_NORDIRPLUS) != 0);
 #endif
 	printf("\n");
 #endif