diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-02-18 17:47:43 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-02-18 17:47:43 +1100 |
| commit | 48ba64010046bece3b54009131f88c851ec82047 (patch) | |
| tree | 0430d009052247af062a3f0f301f2eab33c4d969 /source4/ldap_server | |
| parent | 6b8b7665bdbf47e70e0d6d904c1234c03321182d (diff) | |
| parent | bb7e6f0f51a91e461c18efd392af3e4fc6174c34 (diff) | |
| download | samba-48ba64010046bece3b54009131f88c851ec82047.tar.gz samba-48ba64010046bece3b54009131f88c851ec82047.tar.bz2 samba-48ba64010046bece3b54009131f88c851ec82047.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_extended.c | 1 | ||||
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source4/ldap_server/ldap_extended.c b/source4/ldap_server/ldap_extended.c index 4479eab560..66ab4eea32 100644 --- a/source4/ldap_server/ldap_extended.c +++ b/source4/ldap_server/ldap_extended.c @@ -38,6 +38,7 @@ static void ldapsrv_start_tls(void *private_data) ctx->conn->sockets.tls = ctx->tls_socket; ctx->conn->connection->socket = ctx->tls_socket; packet_set_socket(ctx->conn->packet, ctx->conn->connection->socket); + packet_set_unreliable_select(ctx->conn->packet); } static NTSTATUS ldapsrv_StartTLS(struct ldapsrv_call *call, diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 61ff387152..da44c02aa8 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -386,6 +386,10 @@ static void ldapsrv_accept(struct stream_connection *c) packet_set_event_context(conn->packet, c->event.ctx); packet_set_fde(conn->packet, c->event.fde); packet_set_serialise(conn->packet); + + if (conn->sockets.tls) { + packet_set_unreliable_select(conn->packet); + } /* Ensure we don't get packets until the database is ready below */ packet_recv_disable(conn->packet); |