Changeset 224 for branches/samba-3.3.x/source/smbd/open.c

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

File:

• branches/samba-3.3.x/source/smbd/open.c (modified) (2 diffs)

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

@@ -3283 +3283 @@
                   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.
@@ -3410 +3433 @@
         }
 
-        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.