Changeset 599 for trunk/server/source3/libsmb/clidfs.c

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

File:

• trunk/server/source3/libsmb/clidfs.c (modified) (1 diff)

trunk/server/source3/libsmb/clidfs.c

@@ -897 +897 @@
 
         if (extrapath && strlen(extrapath) > 0) {
-                *pp_targetpath = talloc_asprintf(ctx,
-                                                "%s%s",
-                                                extrapath,
-                                                *pp_targetpath);
+                /* EMC Celerra NAS version 5.6.50 (at least) doesn't appear to */
+                /* put the trailing \ on the path, so to be save we put one in if needed */
+                if (extrapath[strlen(extrapath)-1] != '\\' && **pp_targetpath != '\\') {
+                        *pp_targetpath = talloc_asprintf(ctx,
+                                                  "%s\\%s",
+                                                  extrapath,
+                                                  *pp_targetpath);
+                } else {
+                        *pp_targetpath = talloc_asprintf(ctx,
+                                                  "%s%s",
+                                                  extrapath,
+                                                  *pp_targetpath);
+                }
                 if (!*pp_targetpath) {
                         return false;