mirror of
https://github.com/samba-team/samba.git
synced 2025-03-01 04:58:35 +03:00
CVE-2022-37966 param: don't explicitly initialize "kdc force enable rc4 weak session keys" to false/"no"
This is not squashed in order to allow easier backports... BUG: https://bugzilla.samba.org/show_bug.cgi?id=15237 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
parent
fde745ec34
commit
7504a4d6fe
@ -3091,10 +3091,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
|
|||||||
"kdc default domain supported enctypes",
|
"kdc default domain supported enctypes",
|
||||||
"rc4-hmac aes256-cts-hmac-sha1-96-sk");
|
"rc4-hmac aes256-cts-hmac-sha1-96-sk");
|
||||||
|
|
||||||
lpcfg_do_global_parameter(lp_ctx,
|
|
||||||
"kdc force enable rc4 weak session keys",
|
|
||||||
"no");
|
|
||||||
|
|
||||||
for (i = 0; parm_table[i].label; i++) {
|
for (i = 0; parm_table[i].label; i++) {
|
||||||
if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
|
if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
|
||||||
lp_ctx->flags[i] |= FLAG_DEFAULT;
|
lp_ctx->flags[i] |= FLAG_DEFAULT;
|
||||||
|
@ -995,7 +995,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals)
|
|||||||
|
|
||||||
Globals.kdc_default_domain_supported_enctypes =
|
Globals.kdc_default_domain_supported_enctypes =
|
||||||
KERB_ENCTYPE_RC4_HMAC_MD5 | KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK;
|
KERB_ENCTYPE_RC4_HMAC_MD5 | KERB_ENCTYPE_AES256_CTS_HMAC_SHA1_96_SK;
|
||||||
Globals.kdc_force_enable_rc4_weak_session_keys = false;
|
|
||||||
|
|
||||||
/* Now put back the settings that were set with lp_set_cmdline() */
|
/* Now put back the settings that were set with lp_set_cmdline() */
|
||||||
apply_lp_set_cmdline();
|
apply_lp_set_cmdline();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user