Changeset 165 for branches/samba-3.0/source/rpc_server

Timestamp:

Mar 11, 2009, 9:14:55 AM (17 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/rpc_server/srv_srvsvc_nt.c (modified) (6 diffs)

branches/samba-3.0/source/rpc_server/srv_srvsvc_nt.c

@@ -157 +157 @@
                 
                 if ( strcmp( fname, "." ) == 0 ) {
-                        pstr_sprintf( fullpath, "%s%s", 
-                                (strchr( sharepath,':')) ? "" : "C:", sharepath );
+                        pstr_sprintf( fullpath, "C:%s", sharepath );
                 } else {
-                        pstr_sprintf( fullpath, "%s%s/%s", 
-                                (strchr( sharepath,':')) ? "" : "C:", sharepath, fname );
+                        pstr_sprintf( fullpath, "C:%s/%s", sharepath, fname );
                 }
                 string_replace( fullpath, '/', '\\' );
@@ -265 +263 @@
         pstrcpy(remark, lp_comment(snum));
         standard_sub_conn(p->conn, remark,sizeof(remark));
-        if (strchr( lp_pathname(snum), ':'))
-                pstrcpy(path, "");
-        else
-                pstrcpy(path, "C:");
+        pstrcpy(path, "C:");
         pstrcat(path, lp_pathname(snum));
 
@@ -348 +343 @@
         pstrcpy(remark, lp_comment(snum));
         standard_sub_conn(p->conn, remark,sizeof(remark));
-        if (strchr( lp_pathname(snum), ':'))
-                pstrcpy(path, "");
-        else
-                pstrcpy(path, "C:");
+        pstrcpy(path, "C:");
         pstrcat(path, lp_pathname(snum));
 
@@ -1452 +1444 @@
         /* 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;
@@ -1466 +1450 @@
         if (*ptr != '/')
                 return NULL;
-#endif
 
         return ptr;
@@ -2189 +2172 @@
 ***********************************************************************************/
 
-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 const char *server_disks[] = {"C:"};
 
 static uint32 get_server_disk_count(void)