s3-libads: Use ldap_init_fd() to connect to AD server in socket_wrapper

This means that we control the connection setup, don't rely on signals
for timeouts and the connection uses socket_wrapper where that is
required in our test environment.

According to bug reports, this method is also used by curl and other
tools, so we are not the first to (ab)use the OpenLDAP libs in this
way.

It is ONLY enabled for socket_wrapper at this time, as this is the
best way to get 'make test' working for S3 winbind tests in an S4
domain.

Andrew Bartlett

1 files changed, 35 insertions, 1 deletions

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 793b689361..eff851047e 100644
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -59,14 +59,47 @@ static void gotalarm_sig(int signum)
 	gotalarm = 1;
 }
 
- LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to)
+ LDAP *ldap_open_with_timeout(const char *server,
+			      struct sockaddr_storage *ss,
+			      int port, unsigned int to)
 {
 	LDAP *ldp = NULL;
 
+	int fd, ldap_err;
+	NTSTATUS status;
+	char *uri;
 
 	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) {
+		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
+
 	/* Setup timeout */
 	gotalarm = 0;
 	CatchSignal(SIGALRM, gotalarm_sig);
@@ -655,6 +688,7 @@ got_connection:
 	/* Otherwise setup the TCP LDAP session */
 
 	ads->ldap.ld = ldap_open_with_timeout(ads->config.ldap_server_name,
+					      &ads->ldap.ss,
 					      ads->ldap.port, lp_ldap_timeout());
 	if (ads->ldap.ld == NULL) {
 		status = ADS_ERROR(LDAP_OPERATIONS_ERROR);