svn commit: r184693 - head/sys/nfsserver

[Doug Rabson]

Author: dfr
Date: Wed Nov  5 16:25:26 2008
New Revision: 184693
URL: http://svn.freebsd.org/changeset/base/184693

Log:
  If mountd doesn't specify a secflavor list for the mount, assume that -sec=sys
  is what was wanted.

Modified:
  head/sys/nfsserver/nfs_srvsubs.c

Modified: head/sys/nfsserver/nfs_srvsubs.c
==============================================================================
--- head/sys/nfsserver/nfs_srvsubs.c	Wed Nov  5 16:24:31 2008	(r184692)
+++ head/sys/nfsserver/nfs_srvsubs.c	Wed Nov  5 16:25:26 2008	(r184693)
@@ -1103,6 +1103,7 @@ nfsrv_fhtovp(fhandle_t *fhp, int lockfla
 	int credflavor;
 	int vfslocked;
 	int numsecflavors, *secflavors;
+	int authsys;
 	int v3 = nfsd->nd_flag & ND_NFSV3;
 	int mountreq;
 
@@ -1123,6 +1124,15 @@ nfsrv_fhtovp(fhandle_t *fhp, int lockfla
 	    &numsecflavors, &secflavors);
 	if (error)
 		goto out;
+	if (numsecflavors == 0) {
+		/*
+		 * This can happen if the system is running with an
+		 * old mountd that doesn't pass in a secflavor list.
+		 */
+		numsecflavors = 1;
+		authsys = RPCAUTH_UNIX;
+		secflavors = &authsys;
+	}
 	credflavor = nfsd->nd_credflavor;
 	for (i = 0; i < numsecflavors; i++) {
 		if (secflavors[i] == credflavor)