Changeset 429 for trunk/server/source3/modules/vfs_scannedonly.c

Timestamp:

Apr 9, 2010, 3:51:41 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: trunk update to 3.5.2

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/modules/vfs_scannedonly.c (modified) (2 diffs)

trunk/server/source3/modules/vfs_scannedonly.c

@@ -823 +823 @@
         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)) {
@@ -879 +882 @@
                 }
         }
-        return SMB_VFS_NEXT_CLOSEDIR(handle, dirp);
+        SMB_VFS_NEXT_CLOSEDIR(handle, dirp);
+        return SMB_VFS_NEXT_RMDIR(handle, path);
 }