From: Michael Adam <obnox@samba.org>
Date: Wed, 15 Jun 2016 22:15:00 +0000 (+0200)
Subject: libnet: only create local private krb5.conf if joining an AD domain
X-Git-Tag: tdb-1.3.10~829
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=d2ebe2d17d9606dc1f06bd5206ee09711ae0f3da

libnet: only create local private krb5.conf if joining an AD domain

This prevents irritating warning messages.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Jun 17 08:13:55 CEST 2016 on sn-devel-144
---

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index abb9cff1a5b..0a23e0d9fcf 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -2515,9 +2515,11 @@ static WERROR libnet_DomainJoin(TALLOC_CTX *mem_ctx,
 
 #ifdef HAVE_ADS
 
-	create_local_private_krb5_conf_for_domain(
-		r->out.dns_domain_name, r->out.netbios_domain_name,
-		sitename, smbXcli_conn_remote_sockaddr(cli->conn));
+	if (r->out.domain_is_ad) {
+		create_local_private_krb5_conf_for_domain(
+			r->out.dns_domain_name, r->out.netbios_domain_name,
+			sitename, smbXcli_conn_remote_sockaddr(cli->conn));
+	}
 
 	if (r->out.domain_is_ad &&
 	    !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {