Changeset 249

Timestamp:

Jun 3, 2009, 8:58:02 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fixes for Tickets #24 and #78 in 3.2 branch

File:

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

branches/samba-3.2.x/source/rpc_server/srv_srvsvc_nt.c

@@ -177 +177 @@
 
         if ( strcmp( fname, "." ) == 0 ) {
+#ifndef __OS2__
                 fullpath = talloc_asprintf(fenum->ctx, "C:%s", sharepath );
+#else
+                fullpath = talloc_asprintf(fenum->ctx, "%s%s",
+                                                                (strchr( sharepath,':')) ? "" : "C:", sharepath ); 
+#endif
         } else {
+#ifndef __OS2__
                 fullpath = talloc_asprintf(fenum->ctx, "C:%s/%s",
                                 sharepath, fname );
+#else
+                fullpath = talloc_asprintf(fenum->ctx, "%s%s%s",
+                                (strchr( sharepath,':')) ? "" : "C:", sharepath, fname );
+#endif
         }
         if (!fullpath) {
@@ -289 +299 @@
                                 remark);
         }
-        path = talloc_asprintf(p->mem_ctx,
-                        "C:%s", lp_pathname(snum));
+#ifdef __OS2__
+        if (strchr( lp_pathname(snum), ':')) 
+                path = talloc_asprintf(p->mem_ctx,"%s", lp_pathname(snum));
+        else 
+#endif  
+        path = talloc_asprintf(p->mem_ctx,"C:%s", lp_pathname(snum));
+
 
         if (path) {
@@ -375 +390 @@
                 remark = standard_sub_conn(ctx, p->conn, remark);
         }
+#ifdef __OS2__
+        if (strchr( lp_pathname(snum), ':')) 
+                path = talloc_asprintf(p->mem_ctx,"%s", lp_pathname(snum));
+        else 
+#endif  
         path = talloc_asprintf(ctx, "C:%s", lp_pathname(snum));
         if (path) {
@@ -1432 +1452 @@
                 return NULL;
         }
-
-#ifndef __OS2__
+#ifdef __OS2__
+        /* Only absolute paths allowed. */ 
+        if (strlen(ptr) < 2 || ptr[1] != ':') 
+                return NULL; 
+#else
         /* NT is braindead - it wants a C: prefix to a pathname ! So strip it. */
         if (strlen(ptr) > 2 && ptr[1] == ':' && ptr[0] != '/')
@@ -1440 +1463 @@
         /* Only absolute paths allowed. */
         if (*ptr != '/')
-                return NULL;
-#else
-        /* Only absolute paths allowed. */
-        if (strlen(ptr) < 2 || ptr[1] != ':')
                 return NULL;
 #endif
@@ -2261 +2280 @@
 ***********************************************************************************/
 
-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:" 
+#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)