r7770: added ldaps support to our ldap client library

(This used to be commit 8f5c2e8682795258a6361b9516a38a8fabdef150)

3 files changed, 19 insertions, 9 deletions

diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index 93665c5152..a92e733493 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -7,6 +7,6 @@ ADD_OBJ_FILES = libcli/ldap/ldap.o \
 		libcli/ldap/ldap_msg.o \
 		libcli/ldap/ldap_ndr.o \
 		libcli/ldap/ldap_ildap.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET RPC_NDR_SAMR
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBEVENTS GENSEC SOCKET RPC_NDR_SAMR LIBTLS
 # End SUBSYSTEM LIBCLI_LDAP
 #################################
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c
index c9915ae140..32bd6656d6 100644
--- a/source4/libcli/ldap/ldap_client.c
+++ b/source4/libcli/ldap/ldap_client.c
@@ -28,6 +28,7 @@
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "lib/socket/socket.h"
+#include "lib/tls/tls.h"
 #include "libcli/ldap/ldap.h"
 #include "libcli/ldap/ldap_client.h"
 
@@ -90,8 +91,8 @@ static void ldap_connection_dead(struct ldap_connection *conn)
 		}
 	}
 
-	talloc_free(conn->sock);
-	conn->sock = NULL;
+	talloc_free(conn->tls);
+	conn->tls = NULL;
 }
 
 
@@ -244,7 +245,7 @@ static void ldap_recv_handler(struct ldap_connection *conn)
 	size_t npending=0, nread;
 
 	/* work out how much data is pending */
-	status = socket_pending(conn->sock, &npending);
+	status = tls_socket_pending(conn->tls, &npending);
 	if (!NT_STATUS_IS_OK(status) || npending == 0) {
 		ldap_connection_dead(conn);
 		return;
@@ -258,8 +259,8 @@ static void ldap_recv_handler(struct ldap_connection *conn)
 	}
 
 	/* receive the pending data */
-	status = socket_recv(conn->sock, conn->partial.data + conn->partial.length,
-			     npending, &nread, 0);
+	status = tls_socket_recv(conn->tls, conn->partial.data + conn->partial.length,
+				 npending, &nread);
 	if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
 		return;
 	}
@@ -288,7 +289,7 @@ static void ldap_send_handler(struct ldap_connection *conn)
 		size_t nsent;
 		NTSTATUS status;
 
-		status = socket_send(conn->sock, &req->data, &nsent, 0);
+		status = tls_socket_send(conn->tls, &req->data, &nsent);
 		if (NT_STATUS_EQUAL(status, STATUS_MORE_ENTRIES)) {
 			break;
 		}
@@ -331,7 +332,7 @@ static void ldap_io_handler(struct event_context *ev, struct fd_event *fde,
 	struct ldap_connection *conn = talloc_get_type(private, struct ldap_connection);
 	if (flags & EVENT_FD_WRITE) {
 		ldap_send_handler(conn);
-		if (conn->sock == NULL) return;
+		if (conn->tls == NULL) return;
 	}
 	if (flags & EVENT_FD_READ) {
 		ldap_recv_handler(conn);
@@ -416,6 +417,14 @@ NTSTATUS ldap_connect(struct ldap_connection *conn, const char *url)
 		return NT_STATUS_INTERNAL_ERROR;
 	}
 
+	conn->tls = tls_init_client(conn->sock, conn->event.fde, conn->ldaps);
+	if (conn->tls == NULL) {
+		talloc_free(conn->sock);
+		return NT_STATUS_INTERNAL_ERROR;
+	}
+	talloc_steal(conn, conn->tls);
+	talloc_steal(conn->tls, conn->sock);
+
 	return NT_STATUS_OK;
 }
 
@@ -460,7 +469,7 @@ struct ldap_request *ldap_request_send(struct ldap_connection *conn,
 {
 	struct ldap_request *req;
 
-	if (conn->sock == NULL) {
+	if (conn->tls == NULL) {
 		return NULL;
 	}
 
diff --git a/source4/libcli/ldap/ldap_client.h b/source4/libcli/ldap/ldap_client.h
index 719c3639c1..b61f765b40 100644
--- a/source4/libcli/ldap/ldap_client.h
+++ b/source4/libcli/ldap/ldap_client.h
@@ -47,6 +47,7 @@ struct ldap_request {
 
 /* main context for a ldap client connection */
 struct ldap_connection {
+	struct tls_context *tls;
 	struct socket_context *sock;
 	char *host;
 	uint16_t port;