Changeset 927 for trunk/server

Timestamp:

Jul 14, 2016, 9:26:23 AM (9 years ago)

Author:

Silvan Scherrer

Message:

samba server: fix a path issue after the security update

File:

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

trunk/server/source3/smbd/vfs.c

@@ -974 +974 @@
 
 #ifdef __OS2__
-        if (*resolved_name != '/' && *resolved_name != '\\' && (strlen(resolved_name) <= 1 || resolved_name[1] != ':')) {
+        if (*resolved_name != '/' && *resolved_name != '\\' &&
+           (strlen(resolved_name) <= 1 || resolved_name[1] != ':')) {
 #else
         if (*resolved_name != '/') {
@@ -1005 +1006 @@
                                 rootdir_len) == 0);
                 if (!matched || (resolved_name[rootdir_len] != '/' &&
+#ifdef __OS2__
+                               (rootdir_len <= 1 || resolved_name[1] != ':') &&
+#endif
                                  resolved_name[rootdir_len] != '\0')) {
                         DEBUG(2, ("check_reduced_name: Bad access "