From: Andreas Schneider <asn@samba.org>
Date: Mon, 7 Apr 2014 14:09:00 +0000 (+0200)
Subject: Remove special socket_wrapper code.
X-Git-Tag: ldb-1.1.17~111
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=d407446ddc3dfa02c56e517d87238444f1c9b51b;p=samba.git

Remove special socket_wrapper code.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
---

diff --git a/lib/replace/getifaddrs.c b/lib/replace/getifaddrs.c
index f07d7005e4b..c2d20f80b89 100644
--- a/lib/replace/getifaddrs.c
+++ b/lib/replace/getifaddrs.c
@@ -23,8 +23,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#define SOCKET_WRAPPER_NOT_REPLACE
-
 #include "replace.h"
 #include "system/network.h"
 
diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h
index 5159fc8c38e..273cb716cf4 100644
--- a/lib/replace/system/network.h
+++ b/lib/replace/system/network.h
@@ -367,13 +367,4 @@ struct addrinfo {
 #endif /* HAVE_LINUX_IPV6_V6ONLY_26 */
 #endif /* HAVE_IPV6 */
 
-#ifdef SOCKET_WRAPPER
-#ifndef SOCKET_WRAPPER_DISABLE
-#ifndef SOCKET_WRAPPER_NOT_REPLACE
-#define SOCKET_WRAPPER_REPLACE
-#endif /* SOCKET_WRAPPER_NOT_REPLACE */
-#include "../socket_wrapper/socket_wrapper.h"
-#endif /* SOCKET_WRAPPER_DISABLE */
-#endif /* SOCKET_WRAPPER */
-
 #endif
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 680eb4ca1fb..fd5b386e4e3 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -561,7 +561,6 @@ removeea setea
                            #define %s 1
                            #define NO_CONFIG_H 1
                            #define AUTOCONF_TEST 1
-                           #define SOCKET_WRAPPER_NOT_REPLACE
                            #include "replace.c"
                            #include "inet_ntop.c"
                            #include "snprintf.c"
@@ -617,7 +616,7 @@ def build(bld):
         REPLACE_HOSTCC_SOURCE,
         use_hostcc=True,
         use_global_deps=False,
-        cflags='-DSOCKET_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+        cflags='-D_SAMBA_HOSTCC_',
         group='compiler_libraries',
         deps = extra_libs
     )
diff --git a/nsswitch/winbind_nss_config.h b/nsswitch/winbind_nss_config.h
index facde349dac..fb3299d58a4 100644
--- a/nsswitch/winbind_nss_config.h
+++ b/nsswitch/winbind_nss_config.h
@@ -27,14 +27,6 @@
 #undef SIZEOF_LONG
 #endif
 
-/*
- * we don't need socket wrapper
- * nor nss wrapper here and we don't
- * want to depend on swrap_close()
- * so we better disable both
- */
-#define SOCKET_WRAPPER_NOT_REPLACE
-
 /* Include header files from data in config.h file */
 
 #ifndef NO_CONFIG_H
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 55ba776e5d7..cc17a2ef594 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -6,7 +6,7 @@ host_os = sys.platform
 bld.SAMBA_LIBRARY('winbind-client',
 	source='wb_common.c',
 	deps='replace',
-	cflags='-DSOCKET_WRAPPER_DISABLE=1 -DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
+	cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
 	private_library=True
 	)
 
diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index c59eda2b499..d9bb8e2bb1a 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -71,38 +71,6 @@ static void gotalarm_sig(int signum)
 	DEBUG(10, ("Opening connection to LDAP server '%s:%d', timeout "
 		   "%u seconds\n", server, port, to));
 
-#if defined(HAVE_LDAP_INIT_FD) && defined(SOCKET_WRAPPER)
-	/* Only use this private LDAP function if we are in make test,
-	 * as this is the best way to get the emulated TCP socket into
-	 * OpenLDAP */
-	if (socket_wrapper_dir() != NULL) {
-		int fd, ldap_err;
-		NTSTATUS status;
-		char *uri;
-
-		status = open_socket_out(ss, port, to, &fd);
-
-		if (!NT_STATUS_IS_OK(status)) {
-			return NULL;
-		}
-
-#ifndef LDAP_PROTO_TCP
-#define LDAP_PROTO_TCP 1
-#endif
-		uri = talloc_asprintf(talloc_tos(), "ldap://%s:%u", server, port);
-		if (uri == NULL) {
-			return NULL;
-		}
-		ldap_err = ldap_init_fd(fd, LDAP_PROTO_TCP, uri, &ldp);
-		talloc_free(uri);
-
-		if (ldap_err != LDAP_SUCCESS) {
-			return NULL;
-		}
-		return ldp;
-	}
-#endif
-
 	if (to) {
 		/* Setup timeout */
 		gotalarm = 0;