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

Timestamp:

May 27, 2009, 12:08:58 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.11

Location:

branches/samba-3.2.x/source/smbd

Files:

• ipc.c (modified) (2 diffs)
• notify.c (modified) (1 diff)
• open.c (modified) (2 diffs)

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

@@ -659 +659 @@
         }
 
+        talloc_steal(talloc_tos(), state);
+
         handle_trans(conn, req, state);
 
@@ -788 +790 @@
         SCVAL(req->inbuf,smb_com,SMBtrans);
 
+        talloc_steal(talloc_tos(), state);
+
         handle_trans(conn, req, state);
 

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

@@ -232 +232 @@
                      fsp->fsp_name) == -1) {
                 DEBUG(0, ("asprintf failed\n"));
+                TALLOC_FREE(fsp->notify);
                 return NT_STATUS_NO_MEMORY;
         }

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

@@ -3056 +3056 @@
                   ea_list, sd, fname));
 
+        /* MSDFS pathname processing must be done FIRST.
+           MSDFS pathnames containing IPv6 addresses can
+           be confused with NTFS stream names (they contain
+           ":" characters. JRA. */
+
+        if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
+                char *resolved_fname;
+
+                status = resolve_dfspath(talloc_tos(), conn, true, fname,
+                                         &resolved_fname);
+
+                if (!NT_STATUS_IS_OK(status)) {
+                        /*
+                         * For PATH_NOT_COVERED we had
+                         * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
+                         *                 ERRSRV, ERRbadpath);
+                         * Need to fix in callers
+                         */
+                        goto fail;
+                }
+                fname = resolved_fname;
+        }
+
         /*
          * Get the file name.
@@ -3183 +3206 @@
         }
 
-        if ((req != NULL) && (req->flags2 & FLAGS2_DFS_PATHNAMES)) {
-                char *resolved_fname;
-
-                status = resolve_dfspath(talloc_tos(), conn, true, fname,
-                                         &resolved_fname);
-
-                if (!NT_STATUS_IS_OK(status)) {
-                        /*
-                         * For PATH_NOT_COVERED we had
-                         * reply_botherror(req, NT_STATUS_PATH_NOT_COVERED,
-                         *                 ERRSRV, ERRbadpath);
-                         * Need to fix in callers
-                         */
-                        goto fail;
-                }
-                fname = resolved_fname;
-        }
-
         /*
          * Check if POSIX semantics are wanted.