sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

r4897: Unbreak the LDAP server. Somehow the generic service structures

Browse Source 
(which seem just a little too complex) changed, but this code was not
updated or tested.

Also clarify the existing code, by not reusing variables.

Andrew Bartlett
(This used to be commit eb46adade4)
This commit is contained in:
Andrew Bartlett
2005-01-21 12:45:11 +00:00
committed by Gerald (Jerry) Carter
parent c0e21a4d3e
commit 757a063a13
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source4/ldap_server/ldap_server.c
View File

@ -60,6 +60,7 @@ static void add_socket(struct server_service *service,
static void ldapsrv_init(struct server_service *service) static void ldapsrv_init(struct server_service *service)
{ {
struct ldapsrv_service *ldap_service; struct ldapsrv_service *ldap_service;
struct ldapsrv_partition *rootDSE_part;
struct ldapsrv_partition *part; struct ldapsrv_partition *part;
DEBUG(10,("ldapsrv_init\n")); DEBUG(10,("ldapsrv_init\n"));
@ -71,16 +72,16 @@ static void ldapsrv_init(struct server_service *service)
} }
ZERO_STRUCTP(ldap_service); ZERO_STRUCTP(ldap_service);
part = talloc_p(ldap_service, struct ldapsrv_partition); rootDSE_part = talloc_p(ldap_service, struct ldapsrv_partition);
if (!ldap_service) { if (!rootDSE_part) {
DEBUG(0,("talloc_p(ldap_service, struct ldapsrv_partition) failed\n")); DEBUG(0,("talloc_p(ldap_service, struct ldapsrv_partition) failed\n"));
return; return;
} }
part->base_dn = ""; /* RootDSE */ rootDSE_part->base_dn = ""; /* RootDSE */
part->ops = ldapsrv_get_rootdse_partition_ops(); rootDSE_part->ops = ldapsrv_get_rootdse_partition_ops();
ldap_service->rootDSE = part; ldap_service->rootDSE = rootDSE_part;
DLIST_ADD_END(ldap_service->partitions, part, struct ldapsrv_partition *); DLIST_ADD_END(ldap_service->partitions, rootDSE_part, struct ldapsrv_partition *);
part = talloc_p(ldap_service, struct ldapsrv_partition); part = talloc_p(ldap_service, struct ldapsrv_partition);
if (!ldap_service) { if (!ldap_service) {
@ -552,7 +553,7 @@ static void ldapsrv_accept(struct server_connection *conn)
ZERO_STRUCTP(ldap_conn); ZERO_STRUCTP(ldap_conn);
ldap_conn->connection = conn; ldap_conn->connection = conn;
ldap_conn->service = talloc_reference(ldap_conn, conn->stream_socket->service); ldap_conn->service = talloc_reference(ldap_conn, conn->stream_socket->service->service.private_data);
conn->connection.private_data = ldap_conn; conn->connection.private_data = ldap_conn;