[SCM] Samba Shared Repository - branch v3-5-test updated

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  39fad14... Fix bug 7075 - bug in vfs_scannedonly rmdir implementation.
      from  75a0354... s3: Fix a bad memleak in winbind (cherry picked from commit 13400a6589a20452097bc338fa742d834bbd6a34)

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


- Log -----------------------------------------------------------------
commit 39fad1417eefe69712fd1a805a41dcfe0d34fdf1
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Feb 4 16:23:32 2010 -0800

    Fix bug 7075 - bug in vfs_scannedonly rmdir implementation.
    
    Check for NULL on opendir, correctly call next rmdir.
    
    Jeremy.

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

Summary of changes:
 source3/modules/vfs_scannedonly.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c
index 20c54fb..0e32a6f 100644
--- a/source3/modules/vfs_scannedonly.c
+++ b/source3/modules/vfs_scannedonly.c
@@ -822,6 +822,9 @@ static int scannedonly_rmdir(vfs_handle_struct * handle, const char *path)
 
 	path_w_slash = name_w_ending_slash(ctx,path);
 	dirp = SMB_VFS_NEXT_OPENDIR(handle, path, NULL, 0);
+	if (!dirp) {
+		return -1;
+	}
 	while ((dire = SMB_VFS_NEXT_READDIR(handle, dirp, NULL)) != NULL) {
 		if (ISDOT(dire->d_name) || ISDOTDOT(dire->d_name)) {
 			continue;
@@ -878,7 +881,8 @@ static int scannedonly_rmdir(vfs_handle_struct * handle, const char *path)
 			TALLOC_FREE(smb_fname);
 		}
 	}
-	return SMB_VFS_NEXT_CLOSEDIR(handle, dirp);
+	SMB_VFS_NEXT_CLOSEDIR(handle, dirp);
+	return SMB_VFS_NEXT_RMDIR(handle, path);
 }
 
 static void free_scannedonly_data(void **data)


-- 
Samba Shared Repository