6751647 TRANS2_FIND_NEXT continuation by filename restarts search at beginning of directory

6753904 SVCCTL server side service
6741484 Local users cannot connect to CIFS shares from MacOS 10.5
6746898 win98 can not overwrite *.files
6753310 Incorrect handling of SmbNegotiate request when invalid dialects are negotiated.
6751123 Unable to join domain, core dump generated with IPMP setting
6722437 SMB_TRANS2_FIND returns wrong status code when stream file is passed
6716578 can not delete file in extended attribute name space in cifs client when cifs server is solaris
PSARC 2008/584 Correction in nbmand behavior
6734067 Long delay when viewing MS Word Read-only file properties with nbmand enabled.
PSARC/2007/281 NFS share properties for Montana compatibility
6475452 Need Solaris support for Montana approve file functionality in NFS
6582170 Host-based access control (approve file)
6749075 Unable to join domain if user password exceeds 20 characters
6612716 Join domain fails if hostname is > 15 chars
6753251 server signing: wrong signature is generated for the NetShareEnum reply
6757521 SMB daemon leaks memory after displaying GSS status
6760315 Local user cannot connnect to CIFS shares if CIFS server's hostname is not specified
6757333 Share publisher thread runs into infinite loop of displaying GSS major/minor status
6757132 smbd crashes at smb_idmap_batch_getmappings
6760876 security descriptor decoding function has a glitch
6761491 Cannot open or delete a named stream on a directory file.
6741449 Cleanup list in smbns_ads module
6593958 Users with restore privilege can take ownership of files

--HG--
rename : usr/src/lib/smbsrv/libmlsvc/common/secdb.c => usr/src/lib/smbsrv/libmlsvc/common/smb_logon.c
rename : usr/src/lib/smbsrv/libmlsvc/common/mlsvc_svcctl.c => usr/src/lib/smbsrv/libmlsvc/common/svcctl_svc.c

1 files changed, 7 insertions, 8 deletions

diff --git a/usr/src/uts/common/fs/nfs/nfs_auth.c b/usr/src/uts/common/fs/nfs/nfs_auth.c
index f34b4c15bc..ac8fbe75cc 100644
--- a/usr/src/uts/common/fs/nfs/nfs_auth.c
+++ b/usr/src/uts/common/fs/nfs/nfs_auth.c
@@ -23,8 +23,6 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include <sys/param.h>
 #include <sys/errno.h>
 #include <sys/vfs.h>
@@ -99,8 +97,8 @@ nfsauth_init(void)
 	 * Allocate nfsauth cache handle
 	 */
 	exi_cache_handle = kmem_cache_create("exi_cache_handle",
-		sizeof (struct auth_cache), 0, NULL, NULL,
-		exi_cache_reclaim, NULL, NULL, 0);
+	    sizeof (struct auth_cache), 0, NULL, NULL,
+	    exi_cache_reclaim, NULL, NULL, 0);
 }
 
 /*
@@ -177,9 +175,8 @@ nfsauth4_access(struct exportinfo *exi, vnode_t *vp, struct svc_req *req)
 		 * Allow ro permission with LIMITED view if there is a
 		 * sub-dir exported under vp.
 		 */
-		if (has_visible(exi, vp)) {
+		if (has_visible(exi, vp))
 			return (NFSAUTH_LIMITED);
-		}
 	}
 
 	return (access);
@@ -517,7 +514,7 @@ nfsauth4_secinfo_access(struct exportinfo *exi, struct svc_req *req,
 	/*
 	 * Optimize if there are no lists
 	 */
-	if ((perm & M_ROOT) == 0) {
+	if ((perm & (M_ROOT|M_NONE)) == 0) {
 		perm &= ~M_4SEC_EXPORTED;
 		if (perm == M_RO)
 			return (NFSAUTH_RO);
@@ -598,7 +595,7 @@ nfsauth_access(struct exportinfo *exi, struct svc_req *req)
 	 * Optimize if there are no lists
 	 */
 	perm = sp[i].s_flags;
-	if ((perm & M_ROOT) == 0) {
+	if ((perm & (M_ROOT|M_NONE)) == 0) {
 		perm &= ~M_4SEC_EXPORTED;
 		if (perm == M_RO)
 			return (mapaccess | NFSAUTH_RO);
@@ -607,6 +604,8 @@ nfsauth_access(struct exportinfo *exi, struct svc_req *req)
 	}
 
 	access = nfsauth_cache_get(exi, req, flavor);
+	if (access & NFSAUTH_DENIED)
+		access = NFSAUTH_DENIED;
 
 	return (access | mapaccess);
 }