summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2013-11-07 11:21:10 +0100
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2013-11-08 04:18:37 +0100
commit739a052909ccc8154088660519c346f4a3d61808 (patch)
treec89e7d66f2df0d7a620ee39fb30dae82781f5aff
parent2d972cda69cfdcd80b550816c518393cd75268c7 (diff)
downloadsamba-netlogon-8.tar.gz
samba-netlogon-8.tar.bz2
samba-netlogon-8.zip
s4:cldap_server: Set remoteAddressnetlogon-8
To be squashed into: "cldap_server: Do not handle netlogon ourself anymore"
-rw-r--r--source4/cldap_server/cldap_server.c2
-rw-r--r--source4/cldap_server/rootdse.c5
2 files changed, 5 insertions, 2 deletions
diff --git a/source4/cldap_server/cldap_server.c b/source4/cldap_server/cldap_server.c
index 53b7570c6a..774142e2ea 100644
--- a/source4/cldap_server/cldap_server.c
+++ b/source4/cldap_server/cldap_server.c
@@ -213,8 +213,6 @@ static void cldapd_task_init(struct task_server *task)
return;
}
- /* FIXME: set ldb opaque remoteAddress here */
-
/* start listening on the configured network interfaces */
status = cldapd_startup_interfaces(cldapd, task->lp_ctx, ifaces);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index b8956169d2..3f389ce822 100644
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -158,6 +158,11 @@ void cldapd_rootdse_request(struct cldap_socket *cldap,
reply.response = NULL;
reply.result = &result;
+ /* Note: The remoteAddress should rather be set on a ldb request.
+ * We can set this savely on the context here,
+ * since cldapd_rootdse_fill operates synchronously. */
+ ldb_set_opaque(cldapd->samctx, "remoteAddress", src);
+
cldapd_rootdse_fill(cldapd, tmp_ctx, search, &reply.response,
reply.result);