[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-3430-gf00dfc5

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  f00dfc58ea2a6d5794b71136acf5d1532393132b (commit)
      from  de24718cbc55fa4b16a0370d335005f789e924f7 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit f00dfc58ea2a6d5794b71136acf5d1532393132b
Author: Günter Kukkukk <linux at kukkukk.com>
Date:   Thu Feb 5 18:59:03 2009 -0800

    Don't try and delete a default ACL from a file.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/posix_acls.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/posix_acls.c b/source/smbd/posix_acls.c
index 97c3f82..1a90db3 100644
--- a/source/smbd/posix_acls.c
+++ b/source/smbd/posix_acls.c
@@ -4063,10 +4063,14 @@ bool set_unix_posix_default_acl(connection_struct *conn, const char *fname, SMB_
 {
 	SMB_ACL_T def_acl = NULL;
 
-	if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
-		DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
-		errno = EISDIR;
-		return False;
+	if (!S_ISDIR(psbuf->st_mode)) {
+		if (num_def_acls) {
+			DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+			errno = EISDIR;
+			return False;
+		} else {
+			return True;
+		}
 	}
 
 	if (!num_def_acls) {


-- 
Samba Shared Repository