Changeset 233 for branches/samba-3.2.x/source/smbd

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/smbd

Files:

• close.c (modified) (4 diffs)
• dnsregister.c (modified) (1 diff)
• dosmode.c (modified) (2 diffs)
• open.c (modified) (5 diffs)
• posix_acls.c (modified) (1 diff)
• process.c (modified) (1 diff)
• reply.c (modified) (1 diff)
• server.c (modified) (1 diff)
• trans2.c (modified) (3 diffs)

branches/samba-3.2.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;
@@ -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.2.x/source/smbd/dnsregister.c

@@ -110 +110 @@
 
         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.2.x/source/smbd/dosmode.c

@@ -335 +335 @@
                         p = path;
                 }
-                
-                if (p[0] == '.' && p[1] != '.' && p[1] != 0) {
+
+                /* Only . and .. are not hidden. */
+                if (p[0] == '.' && !((p[1] == '\0') ||
+                                (p[1] == '.' && p[2] == '\0'))) {
                         result |= aHIDDEN;
                 }
@@ -387 +389 @@
                         p = path;
                 }
-                
-                if (p[0] == '.' && p[1] != '.' && p[1] != 0) {
+
+                /* Only . and .. are not hidden. */
+                if (p[0] == '.' && !((p[1] == '\0') ||
+                                (p[1] == '.' && p[2] == '\0'))) {
                         result |= aHIDDEN;
                 }

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

@@ -1194 +1194 @@
         bool posix_open = False;
         bool new_file_created = False;
+        bool clear_ads = false;
         struct file_id id;
         NTSTATUS fsp_open = NT_STATUS_ACCESS_DENIED;
@@ -1326 +1327 @@
                          * exist create. */
                         flags2 |= (O_CREAT | O_TRUNC);
+                        clear_ads = true;
                         break;
 
@@ -1332 +1334 @@
                          * exist create. */
                         flags2 |= (O_CREAT | O_TRUNC);
+                        clear_ads = true;
                         break;
 
@@ -1356 +1359 @@
                         }
                         flags2 |= O_TRUNC;
+                        clear_ads = true;
                         break;
 
@@ -1787 +1791 @@
 
         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

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

@@ -4064 +4064 @@
         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.2.x/source/smbd/process.c

@@ -1034 +1034 @@
 /* 0x31 */ { NULL, NULL, 0 },
 /* 0x32 */ { "SMBtrans2",reply_trans2, AS_USER | CAN_IPC },
-/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER},
+/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER | CAN_IPC},
 /* 0x34 */ { "SMBfindclose",reply_findclose,AS_USER},
 /* 0x35 */ { "SMBfindnclose",reply_findnclose,AS_USER},

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

@@ -79 +79 @@
                 }
 
-                if (!stream_started && *s == ':') {
+                if (!posix_path && !stream_started && *s == ':') {
                         if (*p_last_component_contains_wcard) {
                                 return NT_STATUS_OBJECT_NAME_INVALID;
                         }
-                        /* stream names allow more characters than file names */
+                        /* Stream names allow more characters than file names.
+                           We're overloading posix_path here to allow a wider
+                           range of characters. If stream_started is true this
+                           is still a Windows path even if posix_path is true.
+                           JRA.
+                        */
                         stream_started = true;
                         start_of_name_component = false;

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

@@ -1402 +1402 @@
 
         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.2.x/source/smbd/trans2.c

@@ -4972 +4972 @@
 
 static NTSTATUS smb_set_file_dosmode(connection_struct *conn,
+                                files_struct *fsp,
                                 const char *fname,
                                 SMB_STRUCT_STAT *psbuf,
@@ -4980 +4981 @@
         }
 
+        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)) {
@@ -5704 +5713 @@
         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;