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

krb5: move disabling dns-canon to lower level init calls

Browse Source 
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>

Signed-off-by: Isaac Boukris <iboukris@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Nov 27 12:24:16 UTC 2019 on sn-devel-184
This commit is contained in:
Isaac Boukris 2019-11-22 22:39:09 +01:00 committed by Stefan Metzmacher
parent d9d6ce6eca
commit 2b88890ada
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krb5_wrap/krb5_samba.c
View File

@ -3611,6 +3611,12 @@ krb5_error_code smb_krb5_init_context_common(krb5_context *_krb5_context)
error_message(ret));
}
#endif
#ifdef SAMBA4_USES_HEIMDAL
/* Set options in kerberos */
krb5_set_dns_canonicalize_hostname(krb5_ctx, false);
#endif
*_krb5_context = krb5_ctx;
return 0;
}

10
source4/auth/kerberos/krb5_init_context.c
View File

@ -511,6 +511,12 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
return ret;
}
/*
* This is already called in smb_krb5_init_context_common(),
* but krb5_set_config_files() may resets it.
*/
krb5_set_dns_canonicalize_hostname(krb5_ctx, false);
realm = lpcfg_realm(lp_ctx);
if (realm != NULL) {
ret = krb5_set_default_realm(krb5_ctx, realm);
@ -578,10 +584,6 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx,
return ret;
}
krb5_set_warn_dest(kctx, logf);
/* Set options in kerberos */
krb5_set_dns_canonicalize_hostname(kctx, false);
#endif
talloc_steal(parent_ctx, *smb_krb5_context);
talloc_free(tmp_ctx);