Changeset 659

Timestamp:

Nov 9, 2011, 6:32:33 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: more high mem work

Location:

trunk/server/source3

Files:

• nmbd/asyncdns.c (modified) (2 diffs)
• printing/print_cups.c (modified) (2 diffs)
• printing/printing.c (modified) (2 diffs)

trunk/server/source3/nmbd/asyncdns.c

@@ -20 +20 @@
 #include "includes.h"
 
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
+
 /***************************************************************************
   Add a DNS result to the name cache.
@@ -141 +145 @@
         CatchChild();
 
-#ifdef __OS2__ // cant use pipes here, because select() from innotek lib does work only for sockets.
-        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd1) < 0)
-        {
-                DEBUG(0,("can't create asyncdns socketpair1 %d\n", errno));
-                return;         
-        }
-        if (socketpair(AF_UNIX, SOCK_STREAM, 0, fd2) < 0)
-        {
-                DEBUG(0,("can't create asyncdns socketpair2 %d\n", errno));
-                close(fd1[0]);
-                close(fd1[1]);
-                return;         
-        }
-        DEBUG(9,("!!!!!!PIPES %d %d %d %d\n", fd1[0], fd1[1], fd2[0], fd2[1]));
-#else
         if (pipe(fd1) || pipe(fd2)) {
                 DEBUG(0,("can't create asyncdns pipes\n"));
                 return;
         }
-#endif
 
         child_pid = sys_fork();

trunk/server/source3/printing/print_cups.c

@@ -31 +31 @@
 #include <cups/language.h>
 
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
+
 static SIG_ATOMIC_T gotalarm;
 
@@ -392 +396 @@
         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;
         }

trunk/server/source3/printing/printing.c

@@ -22 +22 @@
 #include "includes.h"
 #include "printing.h"
+
+#ifdef __OS2__
+#define pipe(A) os2_socketpair(A)
+#endif
 
 extern struct current_user current_user;
@@ -1412 +1416 @@
         DEBUG(3,("start_background_queue: Starting background LPQ thread\n"));
 
-#ifndef __OS2__
         if (pipe(pause_pipe) == -1) {
-#else   // on OS2 we have no select() on pipes, so we use socketpair() instead
-        if (socketpair(AF_UNIX, SOCK_STREAM,0, pause_pipe) < 0) {
-#endif
                 DEBUG(5,("start_background_queue: cannot create pipe. %s\n", strerror(errno) ));
                 exit(1);