[SCM] Samba Shared Repository - branch master updated - 0baca66589d72acf7b3d6edf7c7d21fa17f98915

[Jeremy Allison]

The branch, master has been updated
       via  0baca66589d72acf7b3d6edf7c7d21fa17f98915 (commit)
       via  4f2635b729e636e123afacb0970c3d49343b3e90 (commit)
       via  8cb23a6b2950d7419767845b6097470f76f348a7 (commit)
      from  2e6bf03e519e180a1ee672dc9c9171d9e0cd114f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0baca66589d72acf7b3d6edf7c7d21fa17f98915
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 11 14:21:09 2008 -0800

    Fix bug  5889. "delete veto files = no" seems to break.
    Jeremy.

commit 4f2635b729e636e123afacb0970c3d49343b3e90
Merge: 8cb23a6b2950d7419767845b6097470f76f348a7 2e6bf03e519e180a1ee672dc9c9171d9e0cd114f
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 11 10:20:24 2008 -0800

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit 8cb23a6b2950d7419767845b6097470f76f348a7
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 31 16:54:22 2008 -0700

    Remove unused variable.
    Jeremy.

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

Summary of changes:
 source3/smbd/reply.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index be39fd4..c363ed5 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -4989,8 +4989,16 @@ NTSTATUS rmdir_internals(TALLOC_CTX *ctx,
 			}
 		}
 
-		/* We only have veto files/directories. Recursive delete. */
+		/* We only have veto files/directories.
+		 * Are we allowed to delete them ? */
 
+		if(!lp_recursive_veto_delete(SNUM(conn))) {
+			TALLOC_FREE(dir_hnd);
+			errno = ENOTEMPTY;
+			goto err;
+		}
+
+		/* Do a recursive delete. */
 		RewindDir(dir_hnd,&dirpos);
 		while ((dname = ReadDirName(dir_hnd,&dirpos))) {
 			char *fullname = NULL;
@@ -5016,9 +5024,8 @@ NTSTATUS rmdir_internals(TALLOC_CTX *ctx,
 				break;
 			}
 			if(st.st_mode & S_IFDIR) {
-				if(lp_recursive_veto_delete(SNUM(conn))) {
-					if(!recursive_rmdir(ctx, conn, fullname))
-						break;
+				if(!recursive_rmdir(ctx, conn, fullname)) {
+					break;
 				}
 				if(SMB_VFS_RMDIR(conn,fullname) != 0) {
 					break;


-- 
Samba Shared Repository