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

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  ad034aa4601a784519fa83fef0eabba52811b314 (commit)
       via  1a8c825b5436de5812e71e323203fd414d37bc04 (commit)
       via  22c3a457bfddf234e3525c17d210408c864128e5 (commit)
       via  8e33a6bda1f026225cc8c05be9c0429744855b86 (commit)
      from  10d07c79dea075e62f4e9fdec3abd63996fec08c (commit)

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


- Log -----------------------------------------------------------------
commit ad034aa4601a784519fa83fef0eabba52811b314
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 11 14:20:32 2008 -0800

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

commit 1a8c825b5436de5812e71e323203fd414d37bc04
Merge: 22c3a457bfddf234e3525c17d210408c864128e5 10d07c79dea075e62f4e9fdec3abd63996fec08c
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Nov 11 10:24:41 2008 -0800

    Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

commit 22c3a457bfddf234e3525c17d210408c864128e5
Merge: 8e33a6bda1f026225cc8c05be9c0429744855b86 c16bfb0efcbe693616763d3f0d70b49e8e612fd1
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 31 16:55:49 2008 -0700

    Merge branch 'v3-3-test' of ssh://jra@git.samba.org/data/git/samba into v3-3-test

commit 8e33a6bda1f026225cc8c05be9c0429744855b86
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 31 16:53:32 2008 -0700

    Remove unused variable.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index b109ee6..f9e5e31 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -5072,8 +5072,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;
@@ -5099,9 +5107,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