Changeset 464 for trunk/server/source3

Timestamp:

Jun 10, 2010, 12:38:39 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changed pipe() to socketpair()

Location:

trunk/server/source3

Files:

• lib/recvfile.c (modified) (1 diff)
• printing/print_cups.c (modified) (1 diff)

trunk/server/source3/lib/recvfile.c

@@ -174 +174 @@
         }
 
+#ifndef __OS2__
         if ((pipefd[0] == -1) && (pipe(pipefd) == -1)) {
+#else
+        if ((pipefd[0] == -1) && (socketpair(AF_UNIX, SOCK_STREAM,0, pipefd) == -1)) {
+#endif
                 try_splice_call = false;
                 return default_sys_recvfile(fromfd, tofd, offset, count);

trunk/server/source3/printing/print_cups.c

@@ -408 +408 @@
         DEBUG(5,("cups_pcap_load_async: asynchronously loading cups printers\n"));
 
+#ifndef __OS2__
         if (pipe(fds) == -1) {
+#else   // on OS2 we have no select() on pipes, so we use socketpair() instead
+        if (socketpair(AF_UNIX, SOCK_STREAM,0, fds) == -1) {
+#endif
                 return false;
         }