Changeset 736 for branches/samba-3.5.x/source3/smbd

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

Location:

branches/samba-3.5.x/source3/smbd

Files:

• notify.c (modified) (1 diff)
• nttrans.c (modified) (2 diffs)
• open.c (modified) (1 diff)
• oplock_linux.c (modified) (1 diff)
• server.c (modified) (1 diff)
• service.c (modified) (1 diff)
• trans2.c (modified) (2 diffs)

branches/samba-3.5.x/source3/smbd/notify.c

@@ -367 +367 @@
 }
 
+static void notify_parent_dir(connection_struct *conn,
+                                uint32 action, uint32 filter,
+                                const char *path)
+{
+        struct smb_filename smb_fname_parent;
+        char *parent;
+        const char *name;
+        char *oldwd;
+
+        if (!parent_dirname(talloc_tos(), path, &parent, &name)) {
+                DEBUG(1, ("Can't get parent dirname, giving up\n"));
+                return;
+        }
+
+        ZERO_STRUCT(smb_fname_parent);
+        smb_fname_parent.base_name = parent;
+
+        oldwd = vfs_GetWd(parent, conn);
+        if (oldwd == NULL) {
+                DEBUG(1, ("vfs_GetWd failed!\n"));
+                goto done;
+        }
+        if (vfs_ChDir(conn, conn->connectpath) == -1) {
+                DEBUG(1, ("Could not chdir to connect path!\n"));
+                goto done;
+        }
+
+        if (SMB_VFS_STAT(conn, &smb_fname_parent) == -1) {
+                goto chdir_done;
+        }
+
+        notify_onelevel(conn->notify_ctx, action, filter,
+                        SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent.st),
+                        name);
+chdir_done:
+        vfs_ChDir(conn, oldwd);
+done:
+        TALLOC_FREE(parent);
+}
+
 void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
                   const char *path)
 {
-        char *fullpath;
-        char *parent;
-        const char *name;
+        char *fullpath = NULL;
 
         if (path[0] == '.' && path[1] == '/') {
                 path += 2;
         }
-        if (parent_dirname(talloc_tos(), path, &parent, &name)) {
-                struct smb_filename smb_fname_parent;
-
-                ZERO_STRUCT(smb_fname_parent);
-                smb_fname_parent.base_name = parent;
-
-                if (SMB_VFS_STAT(conn, &smb_fname_parent) != -1) {
-                        notify_onelevel(conn->notify_ctx, action, filter,
-                            SMB_VFS_FILE_ID_CREATE(conn, &smb_fname_parent.st),
-                            name);
-                }
-        }
+        notify_parent_dir(conn, action, filter, path);
 
         fullpath = talloc_asprintf(talloc_tos(), "%s/%s", conn->connectpath,

branches/samba-3.5.x/source3/smbd/nttrans.c

@@ -133 +133 @@
                              total_sent_thistime + alignment_offset
                              + data_alignment_offset);
-
-                /*
-                 * We might have had SMBnttranss in req->inbuf, fix that.
-                 */
-                SCVAL(req->outbuf, smb_com, SMBnttrans);
 
                 /*
@@ -3069 +3064 @@
         show_msg((char *)req->inbuf);
 
+        /* Windows clients expect all replies to
+           an NT transact secondary (SMBnttranss 0xA1)
+           to have a command code of NT transact
+           (SMBnttrans 0xA0). See bug #8989 for details. */
+        req->cmd = SMBnttrans;
+
         if (req->wct < 18) {
                 reply_nterror(req, NT_STATUS_INVALID_PARAMETER);

branches/samba-3.5.x/source3/smbd/open.c

@@ -2297 +2297 @@
         SMB_ASSERT(!is_ntfs_stream_smb_fname(smb_dname));
 
-        /* Ensure we have a directory attribute. */
-        file_attributes |= FILE_ATTRIBUTE_DIRECTORY;
+        if (!(file_attributes & FILE_FLAG_POSIX_SEMANTICS)) {
+                /* Ensure we have a directory attribute. */
+                file_attributes |= FILE_ATTRIBUTE_DIRECTORY;
+        }
 
         DEBUG(5,("open_directory: opening directory %s, access_mask = 0x%x, "

branches/samba-3.5.x/source3/smbd/oplock_linux.c

@@ -75 +75 @@
         int ret;
 
+        /* First set the signal handler. */
+        if (linux_set_lease_sighandler(fd) == -1) {
+                return -1;
+        }
         ret = fcntl(fd, F_SETLEASE, leasetype);
         if (ret == -1 && errno == EACCES) {
                 set_effective_capability(LEASE_CAPABILITY);
+                /*
+                 * Bug 8974 - work around Linux kernel bug
+                 * https://bugzilla.kernel.org/show_bug.cgi?id=43336.
+                 * "fcntl(F_SETLEASE) resets signal number when
+                 *  called multiple times"
+                 */
+                if (linux_set_lease_sighandler(fd) == -1) {
+                        return -1;
+                }
                 ret = fcntl(fd, F_SETLEASE, leasetype);
         }

branches/samba-3.5.x/source3/smbd/server.c

@@ -804 +804 @@
                         test = False;
                 }
+                TALLOC_FREE(fname);
         }
 

branches/samba-3.5.x/source3/smbd/service.c

@@ -751 +751 @@
                         return NULL;
                 }
+
+                /* We don't want to replace the original sanitized_username
+                   as it is the original user given in the connect attempt.
+                   This is used in '%U' substitutions. */
+                TALLOC_FREE(forced_serverinfo->sanitized_username);
+                forced_serverinfo->sanitized_username =
+                        talloc_move(forced_serverinfo,
+                                        &conn->server_info->sanitized_username);
 
                 TALLOC_FREE(conn->server_info);

branches/samba-3.5.x/source3/smbd/trans2.c

@@ -862 +862 @@
                 reply_outbuf(req, 10, total_sent_thistime + alignment_offset
                              + data_alignment_offset);
-
-                /*
-                 * We might have SMBtrans2s in req which was transferred to
-                 * the outbuf, fix that.
-                 */
-                SCVAL(req->outbuf, smb_com, SMBtrans2);
 
                 /* Set total params and data to be sent */
@@ -8585 +8579 @@
         show_msg((char *)req->inbuf);
 
+        /* Windows clients expect all replies to
+           a transact secondary (SMBtranss2 0x33)
+           to have a command code of transact
+           (SMBtrans2 0x32). See bug #8989
+           and also [MS-CIFS] section 2.2.4.47.2
+           for details.
+        */
+        req->cmd = SMBtrans2;
+
         if (req->wct < 8) {
                 reply_nterror(req, NT_STATUS_INVALID_PARAMETER);