Changeset 454 for trunk/server/source3/rpc_server

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/rpc_server/srv_srvsvc_nt.c (modified) (6 diffs)

trunk/server/source3/rpc_server/srv_srvsvc_nt.c

@@ -179 +179 @@
 
         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) {
@@ -294 +304 @@
                         "", remark);
         }
+#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));
@@ -386 +402 @@
                         "", remark);
         }
+#ifdef __OS2__
+        if (strchr( lp_pathname(snum), ':')) 
+                path = talloc_asprintf(ctx, "%s", lp_pathname(snum));
+        else 
+#endif  
         path = talloc_asprintf(ctx, "C:%s", lp_pathname(snum));
         if (path) {
@@ -1489 +1510 @@
         }
 
+#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] != '/')
@@ -1496 +1522 @@
         if (*ptr != '/')
                 return NULL;
+#endif
 
         return ptr;
@@ -2338 +2365 @@
 ***********************************************************************************/
 
+#ifndef __OS2__ 
 static const char *server_disks[] = {"C:"};
+#else // YD we can use a better implementation (real time scan or above idea) 
+static const char *server_disks[] = {"C:","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)