Fix accidental overwrite of dnsHostName by the last netbios alias

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

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/selftest/knownfail.d/nb_alias_dnshostname b/selftest/knownfail.d/nb_alias_dnshostname
deleted file mode 100644 (file)
index 3c14e99..0000000
--- a/selftest/knownfail.d/nb_alias_dnshostname
+++ /dev/null
@@ -1,2 +0,0 @@
-^samba4.blackbox.net_ads.nb_alias check dNSHostName
-^samba4.blackbox.net_ads.nb_alias check main SPN

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 9fdc18c4994fc73dd39c5d494adaad2c3db5f92c..78e0612eb0fb8e12cb6f93be71c7d4284ecbd9eb 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -507,6 +507,7 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
        ADS_STATUS status;
        ADS_MODLIST mods;
        fstring my_fqdn;
+       fstring my_alias;
        const char **spn_array = NULL;
        size_t num_spns = 0;
        char *spn = NULL;
@@ -587,11 +588,11 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
                /*
                 * Add HOST/netbiosname.domainname
                 */
-               fstr_sprintf(my_fqdn, "%s.%s",
+               fstr_sprintf(my_alias, "%s.%s",
                             *netbios_aliases,
                             lp_dnsdomain());
 
-               spn = talloc_asprintf(frame, "HOST/%s", my_fqdn);
+               spn = talloc_asprintf(frame, "HOST/%s", my_alias);
                if (spn == NULL) {
                        status = ADS_ERROR_LDAP(LDAP_NO_MEMORY);
                        goto done;