From: Isaac Boukris Date: Thu, 21 Nov 2019 18:44:05 +0000 (+0100) Subject: krb5: remove "set_dns_canonicalize" conf option X-Git-Tag: ldb-2.1.0~502 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9d6ce6eca6ca79fec95e93ce55d6e40da993de5;p=thirdparty%2Fsamba.git krb5: remove "set_dns_canonicalize" conf option Pair-Programmed-With: Stefan Metzmacher Signed-off-by: Isaac Boukris Signed-off-by: Stefan Metzmacher --- diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index 3f541885dfd..d66abf32a7f 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -242,7 +242,7 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security) } /* don't do DNS lookups of any kind, it might/will fail for a netbios name */ - ret = gsskrb5_set_dns_canonicalize(gensec_setting_bool(gensec_security->settings, "krb5", "set_dns_canonicalize", false)); + ret = gsskrb5_set_dns_canonicalize(false); if (ret) { DEBUG(1,("gensec_gssapi_start: gsskrb5_set_dns_canonicalize failed\n")); talloc_free(gensec_gssapi_state); diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index fff261daa8e..09e833632a3 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -581,9 +581,7 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx, /* Set options in kerberos */ - krb5_set_dns_canonicalize_hostname(kctx, - lpcfg_parm_bool(lp_ctx, NULL, "krb5", - "set_dns_canonicalize", false)); + krb5_set_dns_canonicalize_hostname(kctx, false); #endif talloc_steal(parent_ctx, *smb_krb5_context); talloc_free(tmp_ctx);