Changeset 860 for vendor/current/source3/modules

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

Location:

vendor/current/source3/modules

Files:

• vfs_acl_common.c (modified) (1 diff)
• vfs_aio_pthread.c (modified) (3 diffs)
• vfs_catia.c (modified) (6 diffs)
• vfs_dirsort.c (modified) (7 diffs)
• vfs_fake_perms.c (modified) (3 diffs)
• vfs_gpfs.c (modified) (1 diff)

vendor/current/source3/modules/vfs_acl_common.c

@@ -647 +647 @@
                                         fsp->access_mask,
                                         &access_granted);
-                if (!NT_STATUS_IS_OK(status)) {
+                /*
+                 * Check if we need to override ACCESS_DENIED for DELETE_ACCESS.
+                 * Do this if we only failed open on DELETE_ACCESS, and
+                 * we have permission to delete from the parent directory.
+                 */
+                if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
+                        (fsp->access_mask & DELETE_ACCESS) &&
+                        (access_granted == DELETE_ACCESS) &&
+                        can_delete_file_in_directory(handle->conn, smb_fname)) {
+                                DEBUG(10,("open_acl_xattr: "
+                                        "overrode "
+                                        "DELETE_ACCESS on "
+                                        "file %s\n",
+                                        smb_fname_str_dbg(smb_fname)));
+                                status = NT_STATUS_OK;
+                } else if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(10,("open_acl_xattr: %s open "
                                 "for access 0x%x (0x%x) "

vendor/current/source3/modules/vfs_aio_pthread.c

@@ -75 +75 @@
         int ret = 0;
         int num_threads;
+        int fd;
 
         if (pool) {
@@ -86 +87 @@
                 return false;
         }
+
+        fd = pthreadpool_signal_fd(pool);
+
+        set_blocking(fd, false);
+
         sock_event = tevent_add_fd(server_event_context(),
                                 NULL,
-                                pthreadpool_signal_fd(pool),
+                                fd,
                                 TEVENT_FD_READ,
                                 aio_pthread_handle_completion,
@@ -291 +297 @@
         }
 
-        ret = pthreadpool_finished_job(pool, &jobid);
-        if (ret) {
-                smb_panic("aio_pthread_handle_completion");
-                return;
-        }
-
-        pd = find_private_data_by_jobid(jobid);
-        if (pd == NULL) {
-                DEBUG(1, ("aio_pthread_handle_completion cannot find jobid %d\n",
-                          jobid));
-                return;
-        }
-
-        aio_ex = (struct aio_extra *)pd->aiocb->aio_sigevent.sigev_value.sival_ptr;
-        smbd_aio_complete_aio_ex(aio_ex);
-
-        DEBUG(10,("aio_pthread_handle_completion: jobid %d completed\n",
-                jobid ));
-        TALLOC_FREE(aio_ex);
+        while (true) {
+                ret = pthreadpool_finished_job(pool, &jobid);
+
+                if (ret == EINTR || ret == EAGAIN) {
+                        return;
+                }
+#ifdef EWOULDBLOCK
+                if (ret == EWOULDBLOCK) {
+                        return;
+                }
+#endif
+
+                if (ret == ECANCELED) {
+                        return;
+                }
+
+                if (ret) {
+                        smb_panic("aio_pthread_handle_completion");
+                        return;
+                }
+
+                pd = find_private_data_by_jobid(jobid);
+                if (pd == NULL) {
+                        DEBUG(1, ("aio_pthread_handle_completion cannot find "
+                                  "jobid %d\n", jobid));
+                        return;
+                }
+
+                aio_ex = (struct aio_extra *)
+                        pd->aiocb->aio_sigevent.sigev_value.sival_ptr;
+
+                smbd_aio_complete_aio_ex(aio_ex);
+
+                DEBUG(10,("aio_pthread_handle_completion: jobid %d "
+                          "completed\n", jobid ));
+                TALLOC_FREE(aio_ex);
+        }
 }
 

vendor/current/source3/modules/vfs_catia.c

@@ -11 +11 @@
  * Copyright (C) Volker Lendecke, 2005
  * Copyright (C) Aravind Srinivasan, 2009
+ * Copyright (C) Guenter Kukkukk, 2013
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29 +30 @@
 #include "includes.h"
 #include "smbd/smbd.h"
+
+static int vfs_catia_debug_level = DBGC_VFS;
+
+#undef DBGC_CLASS
+#define DBGC_CLASS vfs_catia_debug_level
 
 #define GLOBAL_SNUM     0xFFFFFFF
@@ -296 +302 @@
         char *name = NULL;
         char *mapped_name;
-        NTSTATUS ret;
+        NTSTATUS status, ret;
 
         /*
@@ -309 +315 @@
                 return NT_STATUS_NO_MEMORY;
         }
-        ret = catia_string_replace_allocate(handle->conn, name,
+        status = catia_string_replace_allocate(handle->conn, name,
                         &mapped_name, direction);
 
         TALLOC_FREE(name);
-        if (!NT_STATUS_IS_OK(ret)) {
-                return ret;
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
         }
 
@@ -322 +328 @@
         if (NT_STATUS_EQUAL(ret, NT_STATUS_NONE_MAPPED)) {
                 *pmapped_name = talloc_move(mem_ctx, &mapped_name);
+                /* we need to return the former translation result here */
+                ret = status;
         } else {
                 TALLOC_FREE(mapped_name);
@@ -1021 +1029 @@
 NTSTATUS vfs_catia_init(void)
 {
-        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
+        NTSTATUS ret;
+
+        ret = smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "catia",
                                 &vfs_catia_fns);
-}
+        if (!NT_STATUS_IS_OK(ret))
+                return ret;
+
+        vfs_catia_debug_level = debug_add_class("catia");
+        if (vfs_catia_debug_level == -1) {
+                vfs_catia_debug_level = DBGC_VFS;
+                DEBUG(0, ("vfs_catia: Couldn't register custom debugging "
+                          "class!\n"));
+        } else {
+                DEBUG(10, ("vfs_catia: Debug class number of "
+                           "'catia': %d\n", vfs_catia_debug_level));
+        }
+
+        return ret;
+
+}

vendor/current/source3/modules/vfs_dirsort.c

@@ -31 +31 @@
         long pos;
         SMB_STRUCT_DIRENT *directory_list;
-        long number_of_entries;
-        time_t mtime;
+        unsigned int number_of_entries;
+        struct timespec mtime;
         SMB_STRUCT_DIR *source_directory;
-        int fd;
+        files_struct *fsp; /* If open via FDOPENDIR. */
+        struct smb_filename *smb_fname; /* If open via OPENDIR */
 };
 
 static void free_dirsort_privates(void **datap) {
-        struct dirsort_privates *data = (struct dirsort_privates *) *datap;
-        SAFE_FREE(data->directory_list);
-        SAFE_FREE(data);
-        *datap = NULL;
-
-        return;
-}
-
-static bool open_and_sort_dir (vfs_handle_struct *handle)
-{
-        SMB_STRUCT_DIRENT *dp;
-        struct stat dir_stat;
-        long current_pos;
-        struct dirsort_privates *data = NULL;
-
-        SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
-                                return false);
+        TALLOC_FREE(*datap);
+}
+
+static bool get_sorted_dir_mtime(vfs_handle_struct *handle,
+                                struct dirsort_privates *data,
+                                struct timespec *ret_mtime)
+{
+        int ret;
+        struct timespec mtime;
+
+        if (data->fsp) {
+                ret = fsp_stat(data->fsp);
+                mtime = data->fsp->fsp_name->st.st_ex_mtime;
+        } else {
+                ret = SMB_VFS_STAT(handle->conn, data->smb_fname);
+                mtime = data->smb_fname->st.st_ex_mtime;
+        }
+
+        if (ret == -1) {
+                return false;
+        }
+
+        *ret_mtime = mtime;
+
+        return true;
+}
+
+static bool open_and_sort_dir(vfs_handle_struct *handle,
+                                struct dirsort_privates *data)
+{
+        unsigned int i = 0;
+        unsigned int total_count = 0;
 
         data->number_of_entries = 0;
 
-        if (fstat(data->fd, &dir_stat) == 0) {
-                data->mtime = dir_stat.st_mtime;
+        if (get_sorted_dir_mtime(handle, data, &data->mtime) == false) {
+                return false;
         }
 
         while (SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL)
                != NULL) {
-                data->number_of_entries++;
+                total_count++;
+        }
+
+        if (total_count == 0) {
+                return false;
         }
 
@@ -72 +92 @@
 
         /* Set up an array and read the directory entries into it */
-        SAFE_FREE(data->directory_list); /* destroy previous cache if needed */
-        data->directory_list = (SMB_STRUCT_DIRENT *)SMB_MALLOC(
-                data->number_of_entries * sizeof(SMB_STRUCT_DIRENT));
+        TALLOC_FREE(data->directory_list); /* destroy previous cache if needed */
+        data->directory_list = talloc_zero_array(data,
+                                                 SMB_STRUCT_DIRENT,
+                                                 total_count);
         if (!data->directory_list) {
                 return false;
         }
-        current_pos = data->pos;
-        data->pos = 0;
-        while ((dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory,
-                                          NULL)) != NULL) {
-                data->directory_list[data->pos++] = *dp;
-        }
+        for (i = 0; i < total_count; i++) {
+                SMB_STRUCT_DIRENT *dp = SMB_VFS_NEXT_READDIR(handle,
+                                                data->source_directory,
+                                                NULL);
+                if (dp == NULL) {
+                        break;
+                }
+                data->directory_list[i] = *dp;
+        }
+
+        data->number_of_entries = i;
 
         /* Sort the directory entries by name */
-        data->pos = current_pos;
         TYPESAFE_QSORT(data->directory_list, data->number_of_entries, compare_dirent);
         return true;
@@ -95 +120 @@
                                        uint32 attr)
 {
+        NTSTATUS status;
         struct dirsort_privates *data = NULL;
 
         /* set up our private data about this directory */
-        data = (struct dirsort_privates *)SMB_MALLOC(
-                sizeof(struct dirsort_privates));
-
+        data = talloc_zero(handle->conn, struct dirsort_privates);
         if (!data) {
                 return NULL;
         }
 
-        data->directory_list = NULL;
-        data->pos = 0;
+        status = create_synthetic_smb_fname(data,
+                                        fname,
+                                        NULL,
+                                        NULL,
+                                        &data->smb_fname);
+        if (!NT_STATUS_IS_OK(status)) {
+                TALLOC_FREE(data);
+                return NULL;
+        }
 
         /* Open the underlying directory and count the number of entries */
@@ -112 +143 @@
                                                       attr);
 
-        data->fd = dirfd(data->source_directory);
+        if (data->source_directory == NULL) {
+                TALLOC_FREE(data);
+                return NULL;
+        }
+
+        if (!open_and_sort_dir(handle, data)) {
+                SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
+                TALLOC_FREE(data);
+                return NULL;
+        }
 
         SMB_VFS_HANDLE_SET_DATA(handle, data, free_dirsort_privates,
                                 struct dirsort_privates, return NULL);
-
-        if (!open_and_sort_dir(handle)) {
-                SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
-                return NULL;
-        }
 
         return data->source_directory;
@@ -133 +168 @@
 
         /* set up our private data about this directory */
-        data = (struct dirsort_privates *)SMB_MALLOC(
-                sizeof(struct dirsort_privates));
-
+        data = talloc_zero(handle->conn, struct dirsort_privates);
         if (!data) {
                 return NULL;
         }
 
-        data->directory_list = NULL;
-        data->pos = 0;
+        data->fsp = fsp;
 
         /* Open the underlying directory and count the number of entries */
@@ -148 +180 @@
 
         if (data->source_directory == NULL) {
-                SAFE_FREE(data);
-                return NULL;
-        }
-
-        data->fd = dirfd(data->source_directory);
+                TALLOC_FREE(data);
+                return NULL;
+        }
+
+        if (!open_and_sort_dir(handle, data)) {
+                SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
+                TALLOC_FREE(data);
+                /* fd is now closed. */
+                fsp->fh->fd = -1;
+                return NULL;
+        }
 
         SMB_VFS_HANDLE_SET_DATA(handle, data, free_dirsort_privates,
                                 struct dirsort_privates, return NULL);
-
-        if (!open_and_sort_dir(handle)) {
-                SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory);
-                /* fd is now closed. */
-                fsp->fh->fd = -1;
-                return NULL;
-        }
 
         return data->source_directory;
@@ -172 +203 @@
 {
         struct dirsort_privates *data = NULL;
-        time_t current_mtime;
-        struct stat dir_stat;
+        struct timespec current_mtime;
 
         SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates,
                                 return NULL);
 
-        if (fstat(data->fd, &dir_stat) == -1) {
-                return NULL;
-        }
-
-        current_mtime = dir_stat.st_mtime;
+        if (get_sorted_dir_mtime(handle, data, &current_mtime) == false) {
+                return NULL;
+        }
 
         /* throw away cache and re-read the directory if we've changed */
-        if (current_mtime > data->mtime) {
-                open_and_sort_dir(handle);
+        if (timespec_compare(&current_mtime, &data->mtime) > 1) {
+                open_and_sort_dir(handle, data);
         }
 

vendor/current/source3/modules/vfs_fake_perms.c

@@ -30 +30 @@
 #define DBGC_CLASS DBGC_VFS
 
+extern struct current_user current_user;
+
 static int fake_perms_stat(vfs_handle_struct *handle,
                            struct smb_filename *smb_fname)
@@ -42 +44 @@
                         smb_fname->st.st_ex_mode = S_IRWXU;
                 }
-                smb_fname->st.st_ex_uid = handle->conn->session_info->utok.uid;
-                smb_fname->st.st_ex_gid = handle->conn->session_info->utok.gid;
+                if (handle->conn->session_info != NULL) {
+                        smb_fname->st.st_ex_uid =
+                                handle->conn->session_info->utok.uid;
+                        smb_fname->st.st_ex_gid =
+                                handle->conn->session_info->utok.gid;
+                } else {
+                        /*
+                         * Sucks, but current_user is the best we can do here.
+                         */
+                        smb_fname->st.st_ex_uid = current_user.ut.uid;
+                        smb_fname->st.st_ex_gid = current_user.ut.gid;
+                }
         }
 
@@ -60 +72 @@
                         sbuf->st_ex_mode = S_IRWXU;
                 }
-                sbuf->st_ex_uid = handle->conn->session_info->utok.uid;
-                sbuf->st_ex_gid = handle->conn->session_info->utok.gid;
+                if (handle->conn->session_info != NULL) {
+                        sbuf->st_ex_uid =
+                                handle->conn->session_info->utok.uid;
+                        sbuf->st_ex_gid =
+                                handle->conn->session_info->utok.gid;
+                } else {
+                        /*
+                         * Sucks, but current_user is the best we can do here.
+                         */
+                        sbuf->st_ex_uid = current_user.ut.uid;
+                        sbuf->st_ex_gid = current_user.ut.gid;
+                }
         }
         return ret;

vendor/current/source3/modules/vfs_gpfs.c

@@ -98 +98 @@
 
         if (config->leases) {
+                /*
+                 * Ensure the lease owner is root to allow
+                 * correct delivery of lease-break signals.
+                 */
+                become_root();
                 ret = set_gpfs_lease(fsp->fh->fd,leasetype);
+                unbecome_root();
         }