diff options
| author | Isaac Boukris <iboukris@gmail.com> | 2020-05-27 15:52:46 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2020-06-04 11:47:48 +0000 |
| commit | 533a4be557bd7923ff8bfaea9a82cd99d47b10f4 (patch) | |
| tree | 7c107dd43a9441c3970cd480bf6f223b5f046607 | |
| parent | e25e574ba042d83c7f7675b75139385d8cc9ffc8 (diff) | |
| download | samba-533a4be557bd7923ff8bfaea9a82cd99d47b10f4.tar.gz | |
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>
| -rw-r--r-- | selftest/knownfail.d/nb_alias_dnshostname | 2 | ||||
| -rw-r--r-- | source3/libnet/libnet_join.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/selftest/knownfail.d/nb_alias_dnshostname b/selftest/knownfail.d/nb_alias_dnshostname deleted file mode 100644 index 3c14e9931b9..00000000000 --- 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 eb8e0ea17f7..22162186f61 100644 --- 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; |