s3: Retry the join with the short name

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index e6ac1c9f86ef2feab111312ba538b20c10e4a452..ca5c1bffd78daab8d12e2c441d6dea7ba67e1cd4 100644 (file)
--- 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;
        }