s3-libnet_join: always pass down admin domain to ads layer

Otherwise we could loose the information that a non-default domain name
has been used for admin creds.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=13861

Guenther

Signed-off-by: Guenther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit ea29aa27cbac4253ee1701fed99a3e0811f7475d)

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index e052306523d48b61eaa9c3f3ab4b51085b71a114..fc7429e6a234a5dcb98d71d3101a06dc154f9a58 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -205,7 +205,19 @@ static ADS_STATUS libnet_join_connect_ads(TALLOC_CTX *mem_ctx,
                password = r->in.machine_password;
                ccname = "MEMORY:libnet_join_machine_creds";
        } else {
+               char *p = NULL;
+
                username = r->in.admin_account;
+
+               p = strchr(r->in.admin_account, '@');
+               if (p == NULL) {
+                       username = talloc_asprintf(mem_ctx, "%s@%s",
+                                                  r->in.admin_account,
+                                                  r->in.admin_domain);
+               }
+               if (username == NULL) {
+                       return ADS_ERROR(LDAP_NO_MEMORY);
+               }
                password = r->in.admin_password;
 
                /*