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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

Location:

branches/samba-3.3.x/source/smbd

Files:

• aio.c (modified) (4 diffs)
• close.c (modified) (3 diffs)
• conn.c (modified) (1 diff)
• dnsregister.c (modified) (1 diff)
• file_access.c (modified) (1 diff)
• files.c (modified) (1 diff)
• nttrans.c (modified) (1 diff)
• open.c (modified) (4 diffs)
• reply.c (modified) (2 diffs)
• service.c (modified) (1 diff)
• trans2.c (modified) (4 diffs)
• uid.c (modified) (3 diffs)

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

@@ -444 +444 @@
                  * client. */
                 if (errno == ECANCELED) {
-                        srv_cancel_sign_response(aio_ex->mid);
+                        srv_cancel_sign_response(aio_ex->mid, false);
                         return 0;
                 }
@@ -538 +538 @@
                  * client. */
                 if (errno == ECANCELED) {
-                        srv_cancel_sign_response(aio_ex->mid);
+                        srv_cancel_sign_response(aio_ex->mid, false);
                         return 0;
                 }
@@ -650 +650 @@
                         DEBUG(3,("process_aio_queue: Can't find record to "
                                  "match mid %u.\n", (unsigned int)mid));
-                        srv_cancel_sign_response(mid);
+                        srv_cancel_sign_response(mid, false);
                         continue;
                 }
@@ -660 +660 @@
                         DEBUG( 3,( "process_aio_queue: file closed whilst "
                                    "aio outstanding.\n"));
-                        srv_cancel_sign_response(mid);
+                        srv_cancel_sign_response(mid, false);
                         continue;
                 }

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

@@ -468 +468 @@
         struct timespec ts[2];
         NTSTATUS status;
+        int ret = -1;
 
         ZERO_STRUCT(sbuf);
@@ -482 +483 @@
         /* Ensure we have a valid stat struct for the source. */
         if (fsp->fh->fd != -1) {
-                if (SMB_VFS_FSTAT(fsp, &sbuf) == -1) {
-                        return map_nt_error_from_unix(errno);
-                }
+                ret = SMB_VFS_FSTAT(fsp, &sbuf);
         } else {
-                if (SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf) == -1) {
-                        return map_nt_error_from_unix(errno);
-                }
+                if (fsp->posix_open) {
+                        ret = SMB_VFS_LSTAT(fsp->conn,fsp->fsp_name,&sbuf);
+                } else {
+                        ret = SMB_VFS_STAT(fsp->conn,fsp->fsp_name,&sbuf);
+                }
+        }
+
+        if (ret == -1) {
+                return map_nt_error_from_unix(errno);
         }
 
@@ -576 +581 @@
 
         saved_status4 = update_write_time_on_close(fsp);
+        if (NT_STATUS_EQUAL(saved_status4, NT_STATUS_OBJECT_NAME_NOT_FOUND)) {
+                /* Someone renamed the file or a parent directory containing
+                 * this file. We can't do anything about this, we don't have
+                 * an "update timestamp by fd" call in POSIX. Eat the error. */
+
+                saved_status4 = NT_STATUS_OK;
+        }
 
         if (NT_STATUS_IS_OK(status)) {

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

@@ -146 +146 @@
         }
         conn->cnum = i;
+        conn->force_group_gid = (gid_t)-1;
 
         bitmap_set(bmap, i);

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

@@ -109 +109 @@
 
         if (dns_state == NULL) {
-                *dns_state_ptr = dns_state = talloc(NULL, struct dns_reg_state);
+                dns_state = talloc_zero(NULL, struct dns_reg_state);
+                *dns_state_ptr = dns_state;
                 if (dns_state == NULL) {
                         return;

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

@@ -34 +34 @@
         uint32_t access_granted;
         struct security_descriptor *secdesc = NULL;
+
+        if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+                /* I'm sorry sir, I didn't know you were root... */
+                return true;
+        }
 
         status = SMB_VFS_GET_NT_ACL(conn, fname,

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

@@ -378 +378 @@
 
 /****************************************************************************
+ Find any fsp open with a pathname below that of an already open path.
+****************************************************************************/
+
+bool file_find_subpath(files_struct *dir_fsp)
+{
+        files_struct *fsp;
+        size_t dlen;
+        char *d_fullname = talloc_asprintf(talloc_tos(),
+                                        "%s/%s",
+                                        dir_fsp->conn->connectpath,
+                                        dir_fsp->fsp_name);
+
+        if (!d_fullname) {
+                return false;
+        }
+
+        dlen = strlen(d_fullname);
+
+        for (fsp=Files;fsp;fsp=fsp->next) {
+                char *d1_fullname;
+
+                if (fsp == dir_fsp) {
+                        continue;
+                }
+
+                d1_fullname = talloc_asprintf(talloc_tos(),
+                                        "%s/%s",
+                                        fsp->conn->connectpath,
+                                        fsp->fsp_name);
+
+                if (strnequal(d_fullname, d1_fullname, dlen)) {
+                        TALLOC_FREE(d_fullname);
+                        TALLOC_FREE(d1_fullname);
+                        return true;
+                }
+                TALLOC_FREE(d1_fullname);
+        } 
+
+        TALLOC_FREE(d_fullname);
+        return false;
+}
+
+/****************************************************************************
  Sync open files on a connection.
 ****************************************************************************/

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

@@ -1077 +1077 @@
         remove_pending_change_notify_requests_by_mid(req->mid);
         remove_pending_lock_requests_by_mid(req->mid);
-        srv_cancel_sign_response(req->mid);
+        srv_cancel_sign_response(req->mid, true);
 
         DEBUG(3,("reply_ntcancel: cancel called on mid = %d.\n", req->mid));

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

@@ -59 +59 @@
 
         *access_granted = 0;
+
+        if (conn->server_info->utok.uid == 0 || conn->admin_user) {
+                /* I'm sorry sir, I didn't know you were root... */
+                *access_granted = access_mask;
+                if (access_mask & SEC_FLAG_MAXIMUM_ALLOWED) {
+                        *access_granted |= FILE_GENERIC_ALL;
+                }
+                return NT_STATUS_OK;
+        }
 
         status = SMB_VFS_GET_NT_ACL(conn, fname,
@@ -2383 +2392 @@
         }
 
+        /* We need to support SeSecurityPrivilege for this. */
+        if (access_mask & SEC_RIGHT_SYSTEM_SECURITY) {
+                DEBUG(10, ("open_directory: open on %s "
+                        "failed - SEC_RIGHT_SYSTEM_SECURITY denied.\n",
+                        fname));
+                return NT_STATUS_PRIVILEGE_NOT_HELD;
+        }
+
         switch( create_disposition ) {
                 case FILE_OPEN:
@@ -2463 +2480 @@
                                         access_mask,
                                         &access_granted);
+
+                /* Were we trying to do a directory 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. */
+
+                if ((NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
+                                (access_mask & DELETE_ACCESS) &&
+                                (access_granted == DELETE_ACCESS) &&
+                                can_delete_file_in_directory(conn, fname))) {
+                        DEBUG(10,("open_directory: overrode ACCESS_DENIED "
+                                "on directory %s\n",
+                                fname ));
+                        status = NT_STATUS_OK;
+                }
+
                 if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(10, ("open_directory: check_open_rights on "
@@ -2897 +2933 @@
                 goto fail;
         }
+#else
+        /* We need to support SeSecurityPrivilege for this. */
+        if (access_mask & SEC_RIGHT_SYSTEM_SECURITY) {
+                status = NT_STATUS_PRIVILEGE_NOT_HELD;
+                goto fail;
+        }
+        /* Don't allow a SACL set from an NTtrans create until we
+         * support SeSecurityPrivilege. */
+        if (!VALID_STAT(sbuf) &&
+                        lp_nt_acl_support(SNUM(conn)) &&
+                        sd && (sd->sacl != NULL)) {
+                status = NT_STATUS_PRIVILEGE_NOT_HELD;
+                goto fail;
+        }
 #endif
 

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

@@ -2264 +2264 @@
 
         if (S_ISDIR(pst->st_mode)) {
+                if (fsp->posix_open) {
+                        return NT_STATUS_OK;
+                }
+
+                /* If no pathnames are open below this
+                   directory, allow the rename. */
+
+                if (file_find_subpath(fsp)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
                 return NT_STATUS_OK;
         }
@@ -2780 +2790 @@
                 return;
         }
+
+normal_readbraw:
 #endif
-
-normal_readbraw:
 
         outbuf = TALLOC_ARRAY(NULL, char, nread+4);

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

@@ -839 +839 @@
                         return NULL;
                 }
+
+                /*
+                 * We need to cache this gid, to use within
+                 * change_to_user() separately from the conn->server_info
+                 * struct. We only use conn->server_info directly if
+                 * "force_user" was set.
+                 */
+                conn->force_group_gid = conn->server_info->utok.gid;
         }
 

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

@@ -4990 +4990 @@
 
 static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
+                                files_struct *fsp,
                                 const char *fname,
                                 SMB_STRUCT_STAT *psbuf,
@@ -4998 +4999 @@
         }
 
+        if (fsp) {
+                if (fsp->base_fsp) {
+                        fname = fsp->base_fsp->fsp_name;
+                } else {
+                        fname = fsp->fsp_name;
+                }
+        }
+                
         if (dosmode) {
                 if (S_ISDIR(psbuf->st_mode)) {
@@ -5723 +5732 @@
         dosmode = IVAL(pdata,32);
         status = smb_set_file_dosmode(conn,
-                                        fname,
-                                        psbuf,
-                                        dosmode);
+                                fsp,
+                                fname,
+                                psbuf,
+                                dosmode);
+
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -6390 +6401 @@
         } else if((wire_open_mode & SMB_O_CREAT) == SMB_O_CREAT) {
                 create_disp = FILE_OPEN_IF;
+        } else if ((wire_open_mode & (SMB_O_CREAT | SMB_O_EXCL | SMB_O_TRUNC)) == 0) {
+                create_disp = FILE_OPEN;
         } else {
                 DEBUG(5,("smb_posix_open: invalid create mode 0x%x\n",

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

@@ -257 +257 @@
         if((group_c = *lp_force_group(snum))) {
 
+                SMB_ASSERT(conn->force_group_gid != (gid_t)-1);
+
                 if(group_c == '+') {
 
@@ -269 +271 @@
                         for (i = 0; i < num_groups; i++) {
                                 if (group_list[i]
-                                    == conn->server_info->utok.gid) {
-                                        gid = conn->server_info->utok.gid;
+                                    == conn->force_group_gid) {
+                                        conn->server_info->utok.gid =
+                                                conn->force_group_gid;
+                                        gid = conn->force_group_gid;
                                         gid_to_sid(&conn->server_info->ptok
                                                    ->user_sids[1], gid);
@@ -277 +281 @@
                         }
                 } else {
-                        gid = conn->server_info->utok.gid;
+                        conn->server_info->utok.gid = conn->force_group_gid;
+                        gid = conn->force_group_gid;
                         gid_to_sid(&conn->server_info->ptok->user_sids[1],
                                    gid);