diff options
| author | Stefan Metzmacher <metze@samba.org> | 2022-11-30 09:02:41 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2022-12-14 00:48:49 +0100 |
| commit | 693a247d3b270677ec6f42189002c647a1e20e19 (patch) | |
| tree | 4027e1481a3a28223673dd80b9beef068e874a24 | |
| parent | ee9ffe50e99d2778d0d17fb65d6b27911d211f91 (diff) | |
| download | samba-693a247d3b270677ec6f42189002c647a1e20e19.tar.gz | |
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>
(cherry picked from commit 7504a4d6fee7805aac7657b9dab88c48353d6db4)
| -rw-r--r-- | lib/param/loadparm.c | 4 | ||||
| -rw-r--r-- | source3/param/loadparm.c | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c index 3a62d882a81..b712609e3a7 100644 --- a/lib/param/loadparm.c +++ b/lib/param/loadparm.c @@ -3080,10 +3080,6 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx) "kdc default domain supported enctypes", "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++) { if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) { lp_ctx->flags[i] |= FLAG_DEFAULT; diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index f0b82d7dea1..ea1686e8aa0 100644 --- a/source3/param/loadparm.c +++ b/source3/param/loadparm.c @@ -984,7 +984,6 @@ static void init_globals(struct loadparm_context *lp_ctx, bool reinit_globals) Globals.kdc_default_domain_supported_enctypes = 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() */ apply_lp_set_cmdline(); |