From 59d415f43f72146b15a721e928cf346777239bfc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 14 Sep 2010 20:10:51 +1000 Subject: s4-finddc: use NBT lookup for a 1C name if joining a short domain name once we get the 1C lookup reply, use a CLDAP query to find the details for the server Pair-Programmed-With: Andrew Bartlett --- source4/libnet/libnet_lookup.c | 5 ++++- source4/libnet/py_net.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'source4/libnet') diff --git a/source4/libnet/libnet_lookup.c b/source4/libnet/libnet_lookup.c index c6af75b4e3..3677c2a31e 100644 --- a/source4/libnet/libnet_lookup.c +++ b/source4/libnet/libnet_lookup.c @@ -195,7 +195,10 @@ struct tevent_req *libnet_LookupDCs_send(struct libnet_context *ctx, struct finddcs finddcs_io; ZERO_STRUCT(finddcs_io); - finddcs_io.in.dns_domain_name = lpcfg_realm(ctx->lp_ctx); + finddcs_io.in.domain_name = lpcfg_realm(ctx->lp_ctx); + if (strcmp(finddcs_io.in.domain_name, "") == 0) { + finddcs_io.in.domain_name = lpcfg_workgroup(ctx->lp_ctx); + } finddcs_io.in.minimum_dc_flags = NBT_SERVER_LDAP | NBT_SERVER_DS | NBT_SERVER_WRITABLE; diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c index b019d7c2fc..8ff383036e 100644 --- a/source4/libnet/py_net.c +++ b/source4/libnet/py_net.c @@ -479,7 +479,7 @@ static PyObject *py_net_finddc(py_net_Object *self, PyObject *args) mem_ctx = talloc_new(self->mem_ctx); ZERO_STRUCT(io); - io.in.dns_domain_name = domain_name; + io.in.domain_name = domain_name; io.in.minimum_dc_flags = server_type; status = finddcs_cldap(mem_ctx, &io, -- cgit