diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-19 11:10:15 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:31 -0500 |
| commit | 7a17da2186c628f0d8e8a43ca34320b0f10d9d8f (patch) | |
| tree | 1a34d26ff6ae6797c3ccdfacb928513c135b00db /source4/ldap_server | |
| parent | 6720bd94b8506d652ddc273bdbe02944e5911e23 (diff) | |
| download | samba-7a17da2186c628f0d8e8a43ca34320b0f10d9d8f.tar.gz samba-7a17da2186c628f0d8e8a43ca34320b0f10d9d8f.tar.bz2 samba-7a17da2186c628f0d8e8a43ca34320b0f10d9d8f.zip | |
r7751: only enable tls on the ldaps port in ldap server, and reject non-tls
connections on that port
(This used to be commit 30da6a1cc41308a16a486111887f45bcf598f064)
Diffstat (limited to 'source4/ldap_server')
| -rw-r--r-- | source4/ldap_server/ldap_server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 5ac50bd514..88df0ed876 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -330,6 +330,7 @@ static void ldapsrv_accept(struct stream_connection *c) struct ldapsrv_service *ldapsrv_service = talloc_get_type(c->private, struct ldapsrv_service); struct ldapsrv_connection *conn; + int port; conn = talloc_zero(c, struct ldapsrv_connection); if (conn == NULL) goto failed; @@ -341,10 +342,12 @@ static void ldapsrv_accept(struct stream_connection *c) conn->service = talloc_get_type(c->private, struct ldapsrv_service); c->private = conn; + port = socket_get_my_port(c->socket); + /* note that '0' is a ASN1_SEQUENCE(0), which is the first byte on any ldap connection */ conn->tls = tls_init_server(ldapsrv_service->tls_params, c->socket, - c->event.fde, "0"); + c->event.fde, NULL, port != 389); if (conn->tls == NULL) goto failed; return; |