mirror of
https://github.com/samba-team/samba.git
synced 2025-01-13 13:18:06 +03:00
s3-libnetjoin: Fix Bug #10262: use upper-case realm when composing default upn.
In case we are about to generate a keytab during the join make sure the default upn we create is usable with kinit -k. BUG: https://bugzilla.samba.org/show_bug.cgi?id=10262 Guenther Signed-off-by: Günther Deschner <gd@samba.org> Reviewed-by: Andreas Schneider <asn@samba.org> Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org> Autobuild-Date(master): Tue Nov 12 16:39:03 CET 2013 on sn-devel-104
This commit is contained in:
parent
0dd512eead
commit
25be92b925
@ -449,10 +449,25 @@ static ADS_STATUS libnet_join_set_machine_upn(TALLOC_CTX *mem_ctx,
|
||||
}
|
||||
|
||||
if (!r->in.upn) {
|
||||
char *realm = r->out.dns_domain_name;
|
||||
|
||||
/* in case we are about to generate a keytab during the join
|
||||
* make sure the default upn we create is usable with kinit -k.
|
||||
* gd */
|
||||
|
||||
if (USE_KERBEROS_KEYTAB) {
|
||||
realm = talloc_strdup_upper(mem_ctx,
|
||||
r->out.dns_domain_name);
|
||||
}
|
||||
|
||||
if (!realm) {
|
||||
return ADS_ERROR(LDAP_NO_MEMORY);
|
||||
}
|
||||
|
||||
r->in.upn = talloc_asprintf(mem_ctx,
|
||||
"host/%s@%s",
|
||||
r->in.machine_name,
|
||||
r->out.dns_domain_name);
|
||||
realm);
|
||||
if (!r->in.upn) {
|
||||
return ADS_ERROR(LDAP_NO_MEMORY);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user