sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

Fix accidental overwrite of dnsHostName by the last netbios alias

Browse Source 
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>
This commit is contained in:
Isaac Boukris 2020-05-27 15:52:46 +02:00 committed by Andreas Schneider
parent b0b7325365
commit aa0985324a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/knownfail.d/nb_alias_dnshostname
View File

@ -1,2 +0,0 @@
^samba4.blackbox.net_ads.nb_alias check dNSHostName
^samba4.blackbox.net_ads.nb_alias check main SPN

5
source3/libnet/libnet_join.c
View File

@ -507,6 +507,7 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
ADS_STATUS status; ADS_STATUS status;
ADS_MODLIST mods; ADS_MODLIST mods;
fstring my_fqdn; fstring my_fqdn;
fstring my_alias;
const char **spn_array = NULL; const char **spn_array = NULL;
size_t num_spns = 0; size_t num_spns = 0;
char *spn = NULL; char *spn = NULL;
@ -587,11 +588,11 @@ static ADS_STATUS libnet_join_set_machine_spn(TALLOC_CTX *mem_ctx,
/* /*
* Add HOST/netbiosname.domainname * Add HOST/netbiosname.domainname
*/ */
fstr_sprintf(my_fqdn, "%s.%s", fstr_sprintf(my_alias, "%s.%s",
*netbios_aliases, *netbios_aliases,
lp_dnsdomain()); lp_dnsdomain());
spn = talloc_asprintf(frame, "HOST/%s", my_fqdn); spn = talloc_asprintf(frame, "HOST/%s", my_alias);
if (spn == NULL) { if (spn == NULL) {
status = ADS_ERROR_LDAP(LDAP_NO_MEMORY); status = ADS_ERROR_LDAP(LDAP_NO_MEMORY);
goto done; goto done;