sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

Added SSL global catalog

Browse Source 
Reviewed-by: Andrew Bartlett
Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Tue Feb  1 20:05:39 CET 2011 on sn-devel-104
This commit is contained in:
William Brown 2011-01-20 11:41:01 +10:30 committed by Matthias Dieter Wallnöfer
parent ff0f63329a
commit 3b948008ce
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source4/ldap_server/ldap_server.c
View File

@ -314,7 +314,7 @@ static void ldapsrv_accept(struct stream_connection *c,
}
port = socket_address->port;
talloc_free(socket_address);
if (port == 3268) /* Global catalog */ {
if (port == 3268 || port == 3269) /* Global catalog */ {
conn->global_catalog = true;
}
@ -347,7 +347,7 @@ static void ldapsrv_accept(struct stream_connection *c,
conn->sockets.active = conn->sockets.raw;
if (port != 636) {
if (port != 636 && port != 3269) {
ldapsrv_call_read_next(conn);
return;
}
@ -860,9 +860,24 @@ static NTSTATUS add_socket(struct task_server *task,
address, port, nt_errstr(status)));
return status;
}
if (tstream_tls_params_enabled(ldap_service->tls_params)) {
/* add ldaps server for the global catalog */
port = 3269;
status = stream_setup_socket(task, task->event_ctx, lp_ctx,
model_ops,
&ldap_stream_nonpriv_ops,
"ipv4", address, &port,
lpcfg_socket_options(lp_ctx),
ldap_service);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("ldapsrv failed to bind to %s:%u - %s\n",
address, port, nt_errstr(status)));
return status;
}
}
}
/* And once we are bound, free the tempoary ldb, it will
/* And once we are bound, free the temporary ldb, it will
* connect again on each incoming LDAP connection */
talloc_unlink(ldap_service, ldb);