Changeset 65

Timestamp:

Aug 22, 2007, 12:25:01 AM (18 years ago)

Author:

Yuri Dario

Message:

Do not add C: to share path if drive letter already exists. Fixes ticket:24.
Do not strip drive letter from path when adding/changing a share.

File:

• trunk/samba/source/rpc_server/srv_srvsvc_nt.c (modified) (6 diffs)

trunk/samba/source/rpc_server/srv_srvsvc_nt.c

@@ -157 +157 @@
                 
                 if ( strcmp( fname, "." ) == 0 ) {
-                        pstr_sprintf( fullpath, "C:%s", sharepath );
+                        pstr_sprintf( fullpath, "%s%s", 
+                                (strchr( sharepath,':')) ? "" : "C:", sharepath );
                 } else {
-                        pstr_sprintf( fullpath, "C:%s/%s", sharepath, fname );
+                        pstr_sprintf( fullpath, "%s%s/%s", 
+                                (strchr( sharepath,':')) ? "" : "C:", sharepath, fname );
                 }
                 string_replace( fullpath, '/', '\\' );
@@ -266 +268 @@
         pstrcpy(remark, lp_comment(snum));
         standard_sub_conn(p->conn, remark,sizeof(remark));
-        pstrcpy(path, "C:");
+        if (strchr( lp_pathname(snum), ':'))
+                pstrcpy(path, "");
+        else
+                pstrcpy(path, "C:");
         pstrcat(path, lp_pathname(snum));
 
@@ -346 +351 @@
         pstrcpy(remark, lp_comment(snum));
         standard_sub_conn(p->conn, remark,sizeof(remark));
-        pstrcpy(path, "C:");
+        if (strchr( lp_pathname(snum), ':'))
+                pstrcpy(path, "");
+        else
+                pstrcpy(path, "C:");
         pstrcat(path, lp_pathname(snum));
 
@@ -1447 +1455 @@
         /* NT is braindead - it wants a C: prefix to a pathname ! So strip it. */
         ptr = dos_pathname;
+
+#ifdef __OS2__
+
+        /* Only absolute paths allowed. */
+        if (strlen(dos_pathname) < 2 || ptr[1] != ':')
+                return NULL;
+#else
+
         if (strlen(dos_pathname) > 2 && ptr[1] == ':' && ptr[0] != '/')
                 ptr += 2;
@@ -1453 +1469 @@
         if (*ptr != '/')
                 return NULL;
+#endif
 
         return ptr;
@@ -2175 +2192 @@
 ***********************************************************************************/
 
-static const char *server_disks[] = {"C:"};
+static const char *server_disks[] = {"C:"
+#ifdef __OS2__
+        // YD we can use a better implementation (real time scan or above idea)
+        ,"D:","E:","F:","G:","H:","I:","J:","K:","L:","M:","N:","O:"
+        ,"P:","Q:","R:","S:","T:","U:","V:","W:","X:","Y:","Z:"
+#endif
+};
 
 static uint32 get_server_disk_count(void)