Changeset 221 for branches/samba-3.3.x/source/smbd

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/smbd

Files:

• close.c (modified) (1 diff)
• connection.c (modified) (1 diff)
• dnsregister.c (modified) (2 diffs)
• file_access.c (modified) (1 diff)
• filename.c (modified) (5 diffs)
• open.c (modified) (11 diffs)
• posix_acls.c (modified) (18 diffs)
• reply.c (modified) (5 diffs)
• server.c (modified) (2 diffs)
• sesssetup.c (modified) (1 diff)

branches/samba-3.3.x/source/smbd/close.c

@@ -168 +168 @@
 ****************************************************************************/
 
-static NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
+NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
 {
         struct stream_struct *stream_info;

branches/samba-3.3.x/source/smbd/connection.c

@@ -242 +242 @@
 
         snprintf( key_string, sizeof(key_string), "%s/%d/%d",
-                prec->name, procid_to_pid(&prec->pid), prec->pnum );
+                prec->name, (int)procid_to_pid(&prec->pid), prec->pnum );
 
         *kbuf = string_term_tdb_data(talloc_strdup(prec, key_string));

branches/samba-3.3.x/source/smbd/dnsregister.c

@@ -66 +66 @@
 static void dns_register_smbd_retry(struct event_context *ctx,
                                    struct timed_event *te,
-                                   const struct timeval *now,
+                                   struct timeval now,
                                    void *private_data)
 {
@@ -86 +86 @@
                         NULL,
                         timeval_current_ofs(DNS_REG_RETRY_INTERVAL, 0),
-                        "DNS registration handler",
                         dns_register_smbd_retry,
                         dns_state);

branches/samba-3.3.x/source/smbd/file_access.c

@@ -117 +117 @@
          * not help, by the DELETE_CHILD bit on the containing directory.
          *
-         * Here we check the other way round because with just posix
-         * permissions looking at the file itself will never grant DELETE, so
-         * by looking at the directory first we save one get_acl call.
+         * Here we only check the directory permissions, we will
+         * check the file DELETE permission separately.
          */
 
-        if (can_access_file_acl(conn, dname, FILE_DELETE_CHILD)) {
-                return true;
-        }
-
-        return can_access_file_acl(conn, fname, DELETE_ACCESS);
+        return can_access_file_acl(conn, dname, FILE_DELETE_CHILD);
 }
 

branches/samba-3.3.x/source/smbd/filename.c

@@ -127 +127 @@
         bool component_was_mangled = False;
         bool name_has_wildcard = False;
+        bool posix_pathnames = false;
         NTSTATUS result;
+        int ret = -1;
 
         SET_STAT_INVALID(*pst);
@@ -226 +228 @@
         }
 
-        if (!lp_posix_pathnames()) {
+        posix_pathnames = lp_posix_pathnames();
+
+        if (!posix_pathnames) {
                 stream = strchr_m(name, ':');
 
@@ -269 +273 @@
          */
 
-        if (SMB_VFS_STAT(conn,name,&st) == 0) {
+        if (posix_pathnames) {
+                ret = SMB_VFS_LSTAT(conn,name,&st);
+        } else {
+                ret = SMB_VFS_STAT(conn,name,&st);
+        }
+
+        if (ret == 0) {
                 /* Ensure we catch all names with in "/."
                    this is disallowed under Windows. */
@@ -381 +391 @@
                  */
 
-                if (SMB_VFS_STAT(conn,name, &st) == 0) {
+                if (posix_pathnames) {
+                        ret = SMB_VFS_LSTAT(conn,name, &st);
+                } else {
+                        ret = SMB_VFS_STAT(conn,name, &st);
+                }
+
+                if (ret == 0) {
                         /*
                          * It exists. it must either be a directory or this must
@@ -599 +615 @@
                                  */
 
-                                if (SMB_VFS_STAT(conn,name, &st) == 0) {
+                                if (posix_pathnames) {
+                                        ret = SMB_VFS_LSTAT(conn,name, &st);
+                                } else {
+                                        ret = SMB_VFS_STAT(conn,name, &st);
+                                }
+
+                                if (ret == 0) {
                                         *pst = st;
                                 } else {

branches/samba-3.3.x/source/smbd/open.c

@@ -51 +51 @@
 static NTSTATUS check_open_rights(struct connection_struct *conn,
                                 const char *fname,
-                                uint32_t access_mask)
+                                uint32_t access_mask,
+                                uint32_t *access_granted)
 {
         /* Check if we have rights to open. */
         NTSTATUS status;
-        uint32_t access_granted = 0;
         struct security_descriptor *sd;
+
+        *access_granted = 0;
 
         status = SMB_VFS_GET_NT_ACL(conn, fname,
@@ -74 +76 @@
                                 conn->server_info->ptok,
                                 access_mask,
-                                &access_granted);
+                                access_granted);
 
         TALLOC_FREE(sd);
+
+        DEBUG(10,("check_open_rights: file %s requesting "
+                "0x%x returning 0x%x (%s)\n",
+                fname,
+                (unsigned int)access_mask,
+                (unsigned int)*access_granted,
+                nt_errstr(status) ));
+
         return status;
 }
@@ -399 +409 @@
                 fsp->fh->fd = -1; /* What we used to call a stat open. */
                 if (file_existed) {
+                        uint32_t access_granted = 0;
+
                         status = check_open_rights(conn,
                                         path,
-                                        access_mask);
+                                        access_mask,
+                                        &access_granted);
                         if (!NT_STATUS_IS_OK(status)) {
-                                DEBUG(10, ("open_file: Access denied on "
-                                        "file %s\n",
-                                        path));
-                                return status;
+                                if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED)) {
+                                        if ((access_mask & DELETE_ACCESS) &&
+                                                        (access_granted == DELETE_ACCESS) &&
+                                                        can_delete_file_in_directory(conn, path)) {
+                                                /* Were we trying to do a stat open
+                                                 * for delete and didn't get DELETE
+                                                 * access (only) ? Check if the
+                                                 * directory allows DELETE_CHILD.
+                                                 * See here:
+                                                 * http://blogs.msdn.com/oldnewthing/archive/2004/06/04/148426.aspx
+                                                 * for details. */
+
+                                                DEBUG(10,("open_file: overrode ACCESS_DENIED "
+                                                        "on file %s\n",
+                                                        path ));
+                                        } else {
+                                                DEBUG(10, ("open_file: Access denied on "
+                                                        "file %s\n",
+                                                        path));
+                                                return status;
+                                        }
+                                } else if (NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_NOT_FOUND) &&
+                                                        fsp->posix_open &&
+                                                        S_ISLNK(psbuf->st_mode)) {
+                                        /* This is a POSIX stat open for delete
+                                         * or rename on a symlink that points
+                                         * nowhere. Allow. */
+                                        DEBUG(10, ("open_file: allowing POSIX open "
+                                                "on bad symlink %s\n",
+                                                path ));
+                                } else {
+                                        DEBUG(10, ("open_file: check_open_rights "
+                                                "on file %s returned %s\n",
+                                                path, nt_errstr(status) ));
+                                        return status;
+                                }
                         }
                 }
@@ -1314 +1359 @@
         bool posix_open = False;
         bool new_file_created = False;
+        bool clear_ads = false;
         struct file_id id;
         NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
@@ -1367 +1413 @@
                    "unix mode=0%o oplock_request=%d\n",
                    fname, new_dos_attributes, access_mask, share_access,
-                   create_disposition, create_options, unx_mode,
+                   create_disposition, create_options, (unsigned int)unx_mode,
                    oplock_request));
 
@@ -1446 +1492 @@
                          * exist create. */
                         flags2 |= (O_CREAT | O_TRUNC);
+                        clear_ads = true;
                         break;
 
@@ -1452 +1499 @@
                          * exist create. */
                         flags2 |= (O_CREAT | O_TRUNC);
+                        clear_ads = true;
                         break;
 
@@ -1476 +1524 @@
                         }
                         flags2 |= O_TRUNC;
+                        clear_ads = true;
                         break;
 
@@ -1908 +1957 @@
 
         SMB_ASSERT(lck != NULL);
+
+        /* Delete streams if create_disposition requires it */
+        if (file_existed && clear_ads && !is_ntfs_stream_name(fname)) {
+                status = delete_all_streams(conn, fname);
+                if (!NT_STATUS_IS_OK(status)) {
+                        TALLOC_FREE(lck);
+                        fd_close(fsp);
+                        return status;
+                }
+        }
 
         /* note that we ignore failure for the following. It is
@@ -2399 +2458 @@
 
         if (info == FILE_WAS_OPENED) {
+                uint32_t access_granted = 0;
                 status = check_open_rights(conn,
                                         fname,
-                                        access_mask);
+                                        access_mask,
+                                        &access_granted);
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(10, ("open_directory: check_open_rights on "
@@ -2820 +2881 @@
             && (share_access & FILE_SHARE_DELETE)
             && (access_mask & DELETE_ACCESS)
-            && (!can_delete_file_in_directory(conn, fname))) {
+            && (!(can_delete_file_in_directory(conn, fname) ||
+                 can_access_file_acl(conn, fname, DELETE_ACCESS)))) {
                 status = NT_STATUS_ACCESS_DENIED;
+                DEBUG(10,("create_file_unixpath: open file %s "
+                        "for delete ACCESS_DENIED\n", fname ));
                 goto fail;
         }

branches/samba-3.3.x/source/smbd/posix_acls.c

@@ -564 +564 @@
 ****************************************************************************/
 
-static size_t count_canon_ace_list( canon_ace *list_head )
+static size_t count_canon_ace_list( canon_ace *l_head )
 {
         size_t count = 0;
         canon_ace *ace;
 
-        for (ace = list_head; ace; ace = ace->next)
+        for (ace = l_head; ace; ace = ace->next)
                 count++;
 
@@ -579 +579 @@
 ****************************************************************************/
 
-static void free_canon_ace_list( canon_ace *list_head )
+static void free_canon_ace_list( canon_ace *l_head )
 {
         canon_ace *list, *next;
 
-        for (list = list_head; list; list = next) {
+        for (list = l_head; list; list = next) {
                 next = list->next;
-                DLIST_REMOVE(list_head, list);
+                DLIST_REMOVE(l_head, list);
                 SAFE_FREE(list);
         }
@@ -761 +761 @@
 static void merge_aces( canon_ace **pp_list_head )
 {
-        canon_ace *list_head = *pp_list_head;
+        canon_ace *l_head = *pp_list_head;
         canon_ace *curr_ace_outer;
         canon_ace *curr_ace_outer_next;
@@ -770 +770 @@
          */
 
-        for (curr_ace_outer = list_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
+        for (curr_ace_outer = l_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
                 canon_ace *curr_ace;
                 canon_ace *curr_ace_next;
@@ -792 +792 @@
 
                                 curr_ace_outer->perms |= curr_ace->perms;
-                                DLIST_REMOVE(list_head, curr_ace);
+                                DLIST_REMOVE(l_head, curr_ace);
                                 SAFE_FREE(curr_ace);
                                 curr_ace_outer_next = curr_ace_outer->next; /* We may have deleted the link. */
@@ -805 +805 @@
          */
 
-        for (curr_ace_outer = list_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
+        for (curr_ace_outer = l_head; curr_ace_outer; curr_ace_outer = curr_ace_outer_next) {
                 canon_ace *curr_ace;
                 canon_ace *curr_ace_next;
@@ -837 +837 @@
                                          */
 
-                                        DLIST_REMOVE(list_head, curr_ace);
+                                        DLIST_REMOVE(l_head, curr_ace);
                                         SAFE_FREE(curr_ace);
                                         curr_ace_outer_next = curr_ace_outer->next; /* We may have deleted the link. */
@@ -853 +853 @@
                                          */
 
-                                        DLIST_REMOVE(list_head, curr_ace_outer);
+                                        DLIST_REMOVE(l_head, curr_ace_outer);
                                         SAFE_FREE(curr_ace_outer);
                                         break;
@@ -864 +864 @@
         /* We may have modified the list. */
 
-        *pp_list_head = list_head;
+        *pp_list_head = l_head;
 }
 
@@ -2148 +2148 @@
 static void arrange_posix_perms(const char *filename, canon_ace **pp_list_head)
 {
-        canon_ace *list_head = *pp_list_head;
+        canon_ace *l_head = *pp_list_head;
         canon_ace *owner_ace = NULL;
         canon_ace *other_ace = NULL;
         canon_ace *ace = NULL;
 
-        for (ace = list_head; ace; ace = ace->next) {
+        for (ace = l_head; ace; ace = ace->next) {
                 if (ace->type == SMB_ACL_USER_OBJ)
                         owner_ace = ace;
@@ -2174 +2174 @@
 
         if (owner_ace) {
-                DLIST_PROMOTE(list_head, owner_ace);
+                DLIST_PROMOTE(l_head, owner_ace);
         }
 
         if (other_ace) {
-                DLIST_DEMOTE(list_head, other_ace, canon_ace *);
+                DLIST_DEMOTE(l_head, other_ace, canon_ace *);
         }
 
         /* We have probably changed the head of the list. */
 
-        *pp_list_head = list_head;
+        *pp_list_head = l_head;
 }
                 
@@ -2196 +2196 @@
 {
         mode_t acl_mask = (S_IRUSR|S_IWUSR|S_IXUSR);
-        canon_ace *list_head = NULL;
+        canon_ace *l_head = NULL;
         canon_ace *ace = NULL;
         canon_ace *next_ace = NULL;
@@ -2300 +2300 @@
                 ace->inherited = get_inherited_flag(pal, ace, (the_acl_type == SMB_ACL_TYPE_DEFAULT));
 
-                DLIST_ADD(list_head, ace);
+                DLIST_ADD(l_head, ace);
         }
 
@@ -2307 +2307 @@
          */
 
-        if (!ensure_canon_entry_valid(&list_head, conn->params,
+        if (!ensure_canon_entry_valid(&l_head, conn->params,
                                       S_ISDIR(psbuf->st_mode), powner, pgroup,
                                       psbuf, False))
@@ -2319 +2319 @@
         DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", the_acl_type == SMB_ACL_TYPE_ACCESS ? "Access" : "Default" ));
 
-        for ( ace_count = 0, ace = list_head; ace; ace = next_ace, ace_count++) {
+        for ( ace_count = 0, ace = l_head; ace; ace = next_ace, ace_count++) {
                 next_ace = ace->next;
 
@@ -2327 +2327 @@
 
                 if (ace->perms == 0) {
-                        DLIST_PROMOTE(list_head, ace);
+                        DLIST_PROMOTE(l_head, ace);
                 }
 
@@ -2335 +2335 @@
         }
 
-        arrange_posix_perms(fname,&list_head );
-
-        print_canon_ace_list( "canonicalise_acl: ace entries after arrange", list_head );
-
-        return list_head;
+        arrange_posix_perms(fname,&l_head );
+
+        print_canon_ace_list( "canonicalise_acl: ace entries after arrange", l_head );
+
+        return l_head;
 
   fail:
 
-        free_canon_ace_list(list_head);
+        free_canon_ace_list(l_head);
         return NULL;
 }
@@ -4046 +4046 @@
         SMB_ACL_T def_acl = NULL;
 
-        if (num_def_acls && !S_ISDIR(psbuf->st_mode)) {
-                DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
-                errno = EISDIR;
-                return False;
+        if (!S_ISDIR(psbuf->st_mode)) {
+                if (num_def_acls) {
+                        DEBUG(5,("set_unix_posix_default_acl: Can't set default ACL on non-directory file %s\n", fname ));
+                        errno = EISDIR;
+                        return False;
+                } else {
+                        return True;
+                }
         }
 

branches/samba-3.3.x/source/smbd/reply.c

@@ -5615 +5615 @@
                 }
         } else {
-                if (SMB_VFS_STAT(conn,fsp->fsp_name,&sbuf) == -1) {
+                int ret = -1;
+                if (fsp->posix_open) {
+                        ret = SMB_VFS_LSTAT(conn,fsp->fsp_name,&sbuf);
+                } else {
+                        ret = SMB_VFS_STAT(conn,fsp->fsp_name,&sbuf);
+                }
+                if (ret == -1) {
                         return map_nt_error_from_unix(errno);
                 }
@@ -5719 +5725 @@
         const char *dname;
         long offset = 0;
+        bool posix_pathnames = lp_posix_pathnames();
 
         ZERO_STRUCT(sbuf1);
@@ -5830 +5837 @@
 
                 ZERO_STRUCT(sbuf1);
-                SMB_VFS_STAT(conn, directory, &sbuf1);
+                if (posix_pathnames) {
+                        SMB_VFS_LSTAT(conn, directory, &sbuf1);
+                } else {
+                        SMB_VFS_STAT(conn, directory, &sbuf1);
+                }
 
                 status = S_ISDIR(sbuf1.st_mode) ?
                         open_directory(conn, req, directory, &sbuf1,
-                                       access_mask,
-                                       FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                       FILE_OPEN, 0, 0, NULL,
-                                       &fsp)
+                                        access_mask,
+                                        FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                        FILE_OPEN,
+                                        0,
+                                        posix_pathnames ? FILE_FLAG_POSIX_SEMANTICS|0777 : 0,
+                                        NULL,
+                                        &fsp)
                         : open_file_ntcreate(conn, req, directory, &sbuf1,
-                                             access_mask,
-                                             FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                             FILE_OPEN, 0, 0, 0, NULL,
-                                             &fsp);
+                                        access_mask,
+                                        FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                        FILE_OPEN,
+                                        0,
+                                        posix_pathnames ? FILE_FLAG_POSIX_SEMANTICS|0777 : 0,
+                                        0,
+                                        NULL,
+                                        &fsp);
 
                 if (!NT_STATUS_IS_OK(status)) {
@@ -5934 +5952 @@
 
                 ZERO_STRUCT(sbuf1);
-                SMB_VFS_STAT(conn, fname, &sbuf1);
+                if (posix_pathnames) {
+                        SMB_VFS_LSTAT(conn, fname, &sbuf1);
+                } else {
+                        SMB_VFS_STAT(conn, fname, &sbuf1);
+                }
 
                 status = S_ISDIR(sbuf1.st_mode) ?
                         open_directory(conn, req, fname, &sbuf1,
-                                       access_mask,
-                                       FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                       FILE_OPEN, 0, 0, NULL,
-                                       &fsp)
+                                        access_mask,
+                                        FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                        FILE_OPEN,
+                                        0,
+                                        posix_pathnames ? FILE_FLAG_POSIX_SEMANTICS|0777 : 0,
+                                        NULL,
+                                        &fsp)
                         : open_file_ntcreate(conn, req, fname, &sbuf1,
-                                             access_mask,
-                                             FILE_SHARE_READ|FILE_SHARE_WRITE,
-                                             FILE_OPEN, 0, 0, 0, NULL,
-                                             &fsp);
+                                        access_mask,
+                                        FILE_SHARE_READ|FILE_SHARE_WRITE,
+                                        FILE_OPEN,
+                                        0,
+                                        posix_pathnames ? FILE_FLAG_POSIX_SEMANTICS|0777 : 0,
+                                        0,
+                                        NULL,
+                                        &fsp);
 
                 if (!NT_STATUS_IS_OK(status)) {
@@ -7124 +7153 @@
                 }
         } else {
-                if (SMB_VFS_STAT(conn, fsp->fsp_name, &sbuf) == -1) {
+                int ret = -1;
+
+                if (fsp->posix_open) {
+                        ret = SMB_VFS_LSTAT(conn, fsp->fsp_name, &sbuf);
+                } else {
+                        ret = SMB_VFS_STAT(conn, fsp->fsp_name, &sbuf);
+                }
+                if (ret == -1) {
                         status = map_nt_error_from_unix(errno);
                         reply_nterror(req, status);

branches/samba-3.3.x/source/smbd/server.c

@@ -300 +300 @@
                    if they can grab any of the pending locks
                 */
-                DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", pid));
+                DEBUG(3,(__location__ " Unclean shutdown of pid %u\n", (unsigned int)pid));
                 messaging_send_buf(smbd_messaging_context(), procid_self(), 
                                    MSG_SMB_BRL_VALIDATE, NULL, 0);
@@ -1439 +1439 @@
 
         if (*lp_rootdir()) {
-                if (sys_chroot(lp_rootdir()) == 0)
-                        DEBUG(2,("Changed root to %s\n", lp_rootdir()));
+                if (sys_chroot(lp_rootdir()) != 0) {
+                        DEBUG(0,("Failed to change root to %s\n", lp_rootdir()));
+                        exit(1);
+                }
+                if (chdir("/") == -1) {
+                        DEBUG(0,("Failed to chdir to / on chroot to %s\n", lp_rootdir()));
+                        exit(1);
+                }
+                DEBUG(0,("Changed root to %s\n", lp_rootdir()));
         }
 

branches/samba-3.3.x/source/smbd/sesssetup.c

@@ -1357 +1357 @@
         }
 
-        DEBUG(0,("shutdown_other_smbds: shutting down pid %d "
-                 "(IP %s)\n", procid_to_pid(&crec->pid), ip));
+        DEBUG(0,("shutdown_other_smbds: shutting down pid %u "
+                 "(IP %s)\n", (unsigned int)procid_to_pid(&crec->pid), ip));
 
         messaging_send(smbd_messaging_context(), crec->pid, MSG_SHUTDOWN,