Changeset 454 for trunk/server/source3/lib/util_sock.c

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/lib/util_sock.c (modified) (3 diffs)

trunk/server/source3/lib/util_sock.c

@@ -1679 +1679 @@
         /* Create the socket directory or reuse the existing one */
 
+#ifndef __OS2__
         if (lstat(socket_dir, &st) == -1) {
                 if (errno == ENOENT) {
@@ -1707 +1708 @@
                 }
         }
+#endif
 
         /* Create the socket file */
@@ -1718 +1720 @@
         }
 
+#ifdef __OS2__
+        if (asprintf(&path, "\\socket\\samba\\%s\\%s", socket_dir, socket_name) == -1) {
+#else       
         if (asprintf(&path, "%s/%s", socket_dir, socket_name) == -1) {
+#endif
                 goto out_close;
         }