Changeset 658 for trunk/server/source3/lib

Timestamp:

Nov 9, 2011, 3:53:47 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: more high mem work

Location:

trunk/server/source3/lib

Files:

• os2helper.c (modified) (1 diff)
• select.c (modified) (1 diff)

trunk/server/source3/lib/os2helper.c

@@ -192 +192 @@
 }
 
+// OS/2 specific connect() implementation, as it only works in low mem
+int os2_connect(int fd, const struct sockaddr *address, int address_len)
+{
+        struct sockaddr *addresslow;
+        int rc;
+        addresslow = (struct sockaddr*) _lmalloc(address_len);
+        if (!addresslow)
+                return -1;
+
+        memcpy(addresslow, address, address_len);
+        rc = connect(fd, addresslow, address_len);
+
+        free(addresslow);
+
+        return rc;
+}
+
 /* OS/2-specific random functions. these functions used to be based on APR 
    random code, but we discovered some nasty problems with it on fast hardware

trunk/server/source3/lib/select.c

@@ -66 +66 @@
 
         if (initialised != sys_getpid()) {
-#ifndef __OS2__
                 if (pipe(select_pipe) == -1)
-#else
-                if (socketpair(AF_UNIX, SOCK_STREAM,0, select_pipe) == -1)
-#endif
                 {
                         DEBUG(0, ("sys_select: pipe failed (%s)\n",