From 710988c69c98736aeab1174dbf46b5ab3d053d33 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 26 Feb 2011 17:53:16 +0100 Subject: [PATCH] s3: Retry the join with the short name MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Günther Deschner (cherry picked from commit feb3cdee366a439e8526f439714c9068068cdaa4) --- source3/utils/net_ads.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c index e6ac1c9f86e..ca5c1bffd78 100644 --- a/source3/utils/net_ads.c +++ b/source3/utils/net_ads.c @@ -1412,6 +1412,11 @@ int net_ads_join(struct net_context *c, int argc, const char **argv) r->in.msg_ctx = c->msg_ctx; werr = libnet_Join(ctx, r); + if (W_ERROR_EQUAL(werr, WERR_DCNOTFOUND) && + strequal(domain, lp_realm())) { + r->in.domain_name = lp_workgroup(); + werr = libnet_Join(ctx, r); + } if (!W_ERROR_IS_OK(werr)) { goto fail; } -- 2.11.4.GIT