sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-26 23:33:15 +03:00
Code Activity

r15400: Move the TLS code behind the socket interface.

Browse Source 
This reduces caller complexity, because the TLS code is now called
just like any other socket.  (A new socket context is returned by the
tls_init_server and tls_init_client routines).

When TLS is not available, the original socket is returned.

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2006-05-02 20:15:47 +00:00
committed by Gerald (Jerry) Carter
parent 74bd8170fc
commit 09b2f30dfa
14 changed files with 217 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/ldap_server/ldap_server.c
View File

@@ -46,10 +46,6 @@
static void ldapsrv_terminate_connection(struct ldapsrv_connection *conn,
const char *reason)
{
if (conn->tls) {
talloc_free(conn->tls);
conn->tls = NULL;
}
stream_terminate_connection(conn->connection, reason);
}
@@ -430,13 +426,14 @@ static void ldapsrv_accept(struct stream_connection *c)
port = socket_address->port;
talloc_free(socket_address);
conn->tls = tls_init_server(ldapsrv_service->tls_params, c->socket,
c->event.fde, NULL, port != 389);
if (!conn->tls) {
ldapsrv_terminate_connection(conn, "ldapsrv_accept: tls_init_server() failed");
return;
if (port == 636) {
c->socket = tls_init_server(ldapsrv_service->tls_params, c->socket,
c->event.fde, NULL);
if (!c->socket) {
ldapsrv_terminate_connection(conn, "ldapsrv_accept: tls_init_server() failed");
return;
}
}
conn->packet = packet_init(conn);
if (conn->packet == NULL) {
ldapsrv_terminate_connection(conn, "out of memory");
@@ -444,7 +441,7 @@ static void ldapsrv_accept(struct stream_connection *c)
}
packet_set_private(conn->packet, conn);
packet_set_tls(conn->packet, conn->tls);
packet_set_socket(conn->packet, c->socket);
packet_set_callback(conn->packet, ldapsrv_decode);
packet_set_full_request(conn->packet, ldapsrv_complete_packet);
packet_set_error_handler(conn->packet, ldapsrv_error_handler);

1
source/ldap_server/ldap_server.h
View File

@@ -26,7 +26,6 @@ struct ldapsrv_connection {
struct gensec_security *gensec;
struct auth_session_info *session_info;
struct ldapsrv_service *service;
struct tls_context *tls;
struct cli_credentials *server_credentials;
struct ldb_context *ldb;