Changeset 228 for branches/samba-3.2.x/source/smbd/filename.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

• branches/samba-3.2.x/source/smbd/filename.c (modified) (3 diffs)

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

@@ -102 +102 @@
 
 If the saved_last_component != 0, then the unmodified last component
-of the pathname is returned there. This is used in an exceptional
-case in reply_mv (so far). If saved_last_component == 0 then nothing
+of the pathname is returned there. If saved_last_component == 0 then nothing
 is returned there.
 
@@ -196 +195 @@
         }
 
-        /*
-         * Ensure saved_last_component is valid even if file exists.
-         */
-
-        if(pp_saved_last_component) {
-                end = strrchr_m(orig_path, '/');
-                if (end) {
-                        *pp_saved_last_component = talloc_strdup(ctx, end + 1);
-                } else {
-                        *pp_saved_last_component = talloc_strdup(ctx,
-                                                        orig_path);
-                }
-        }
-
         if (!(name = talloc_strdup(ctx, orig_path))) {
                 DEBUG(0, ("talloc_strdup failed\n"));
                 return NT_STATUS_NO_MEMORY;
-        }
-
-        if (!lp_posix_pathnames()) {
-                stream = strchr_m(name, ':');
-
-                if (stream != NULL) {
-                        char *tmp = talloc_strdup(ctx, stream);
-                        if (tmp == NULL) {
-                                TALLOC_FREE(name);
-                                return NT_STATUS_NO_MEMORY;
-                        }
-                        *stream = '\0';
-                        stream = tmp;
-                }
         }
 
@@ -241 +212 @@
                         !conn->short_case_preserve) {
                 strnorm(name, lp_defaultcase(SNUM(conn)));
+        }
+
+        /*
+         * Ensure saved_last_component is valid even if file exists.
+         */
+
+        if(pp_saved_last_component) {
+                end = strrchr_m(name, '/');
+                if (end) {
+                        *pp_saved_last_component = talloc_strdup(ctx, end + 1);
+                } else {
+                        *pp_saved_last_component = talloc_strdup(ctx,
+                                                        name);
+                }
+        }
+
+        if (!lp_posix_pathnames()) {
+                stream = strchr_m(name, ':');
+
+                if (stream != NULL) {
+                        char *tmp = talloc_strdup(ctx, stream);
+                        if (tmp == NULL) {
+                                TALLOC_FREE(name);
+                                return NT_STATUS_NO_MEMORY;
+                        }
+                        *stream = '\0';
+                        stream = tmp;
+                }
         }