Changeset 427 for vendor/current/source3/modules

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

Location:

vendor/current/source3/modules

Files:

• vfs_acl_tdb.c (modified) (13 diffs)
• vfs_aixacl2.c (modified) (1 diff)
• vfs_netatalk.c (modified) (1 diff)
• vfs_scannedonly.c (modified) (2 diffs)

vendor/current/source3/modules/vfs_acl_tdb.c

@@ -38 +38 @@
 *******************************************************************/
 
-static bool acl_tdb_init(struct db_context **pp_db)
+static bool acl_tdb_init(void)
 {
         char *dbname;
 
         if (acl_db) {
-                *pp_db = acl_db;
                 ref_count++;
                 return true;
@@ -56 +55 @@
 
         become_root();
-        *pp_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        acl_db = db_open(NULL, dbname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
         unbecome_root();
 
-        if (*pp_db == NULL) {
+        if (acl_db == NULL) {
 #if defined(ENOTSUP)
                 errno = ENOTSUP;
@@ -78 +77 @@
 *******************************************************************/
 
-static void free_acl_tdb_data(void **pptr)
-{
-        struct db_context **pp_db = (struct db_context **)pptr;
-
+static void disconnect_acl_tdb(struct vfs_handle_struct *handle)
+{
+        SMB_VFS_NEXT_DISCONNECT(handle);
         ref_count--;
         if (ref_count == 0) {
-                TALLOC_FREE(*pp_db);
-                acl_db = NULL;
+                TALLOC_FREE(acl_db);
         }
 }
@@ -147 +144 @@
         TDB_DATA data;
         struct file_id id;
-        struct db_context *db;
+        struct db_context *db = acl_db;
         NTSTATUS status = NT_STATUS_OK;
         SMB_STRUCT_STAT sbuf;
-
-        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
-                return NT_STATUS_INTERNAL_DB_CORRUPTION);
 
         ZERO_STRUCT(sbuf);
@@ -205 +199 @@
         struct file_id id;
         TDB_DATA data;
-        struct db_context *db;
+        struct db_context *db = acl_db;
         struct db_record *rec;
         NTSTATUS status;
@@ -211 +205 @@
         DEBUG(10,("store_acl_blob_fsp: storing blob length %u on file %s\n",
                   (unsigned int)pblob->length, fsp_str_dbg(fsp)));
-
-        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context,
-                return NT_STATUS_INTERNAL_DB_CORRUPTION);
 
         status = vfs_stat_fsp(fsp);
@@ -244 +235 @@
 {
         struct smb_filename *smb_fname_tmp = NULL;
-        struct db_context *db;
+        struct db_context *db = acl_db;
         NTSTATUS status;
         int ret = -1;
-
-        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
 
         status = copy_smb_filename(talloc_tos(), smb_fname, &smb_fname_tmp);
@@ -285 +274 @@
 
         SMB_STRUCT_STAT sbuf;
-        struct db_context *db;
+        struct db_context *db = acl_db;
         int ret = -1;
-
-        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
 
         if (lp_posix_pathnames()) {
@@ -317 +304 @@
                                 const char *user)
 {
-        struct db_context *db;
         int ret = SMB_VFS_NEXT_CONNECT(handle, service, user);
 
@@ -324 +310 @@
         }
 
-        if (!acl_tdb_init(&db)) {
+        if (!acl_tdb_init()) {
                 SMB_VFS_NEXT_DISCONNECT(handle);
                 return -1;
         }
-
-        SMB_VFS_HANDLE_SET_DATA(handle, db, free_acl_tdb_data,
-                                struct db_context, return -1);
 
         /* Ensure we have "inherit acls = yes" if we're
@@ -353 +336 @@
 {
         SMB_STRUCT_STAT sbuf;
-        struct db_context *db;
+        struct db_context *db = acl_db;
         int ret = -1;
-
-        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
 
         if (lp_posix_pathnames()) {
@@ -388 +369 @@
                             SMB_ACL_T theacl)
 {
-        struct db_context *db;
+        struct db_context *db = acl_db;
         NTSTATUS status;
         int ret;
-
-        SMB_VFS_HANDLE_GET_DATA(handle, db, struct db_context, return -1);
 
         status = vfs_stat_fsp(fsp);
@@ -412 +391 @@
 static struct vfs_fn_pointers vfs_acl_tdb_fns = {
         .connect_fn = connect_acl_tdb,
+        .disconnect = disconnect_acl_tdb,
         .opendir = opendir_acl_common,
         .mkdir = mkdir_acl_common,

vendor/current/source3/modules/vfs_aixacl2.c

@@ -494 +494 @@
         .sys_acl_set_fd = aixjfs2_sys_acl_set_fd,
         .sys_acl_delete_def_file = aixjfs2_sys_acl_delete_def_file
-}
+};
 
 NTSTATUS vfs_aixacl2_init(void);

vendor/current/source3/modules/vfs_netatalk.c

@@ -132 +132 @@
         }
 
-        if (!(new_list = SMB_CALLOC_ARRAY(name_compare_entry, (count == 0 ? 1 : count + 1))))
+        if (!(new_list = SMB_CALLOC_ARRAY(name_compare_entry, count + 2)))
                 return;
 

vendor/current/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);
 }