Changeset 454 for trunk/server/source3/smbd/vfs.c

Timestamp:

Jun 4, 2010, 3:11:43 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: merged changes from 3.3

File:

• trunk/server/source3/smbd/vfs.c (modified) (2 diffs)

trunk/server/source3/smbd/vfs.c

@@ -716 +716 @@
                 return(0);
 
+#ifdef __OS2__
+        if ((*path == '/' || *path == '\\' || (*path && path[1] == ':')) && strcsequal(LastDir,path))
+#else
         if (*path == '/' && strcsequal(LastDir,path))
+#endif
                 return(0);
 
@@ -938 +942 @@
                   resolved_name));
 
+#ifdef __OS2__
+        if (*resolved_name != '/' && *resolved_name != '\\' && (strlen(resolved_name) <= 1 || resolved_name[1] != ':')) {
+#else
         if (*resolved_name != '/') {
+#endif
                 DEBUG(0,("check_reduced_name: realpath doesn't return "
                          "absolute paths !\n"));