44 lines
1.3 KiB
Diff
44 lines
1.3 KiB
Diff
|
From f97d7a6d2c2d26fce15aeacfcf69b416ca54550d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Andreas Schneider <asn@samba.org>
|
||
|
|
Date: Thu, 27 Oct 2022 08:44:58 +0200
|
||
|
|
Subject: [PATCH 01/54] CVE-2022-37966 s3:param: Fix old-style function
|
||
|
|
definition
|
||
|
|
|
||
|
|
Signed-off-by: Andreas Schneider <asn@samba.org>
|
||
|
|
Reviewed-by: Jeremy Allison <jra@samba.org>
|
||
|
|
(cherry picked from commit 80dc3bc2b80634ab7c6c71fa1f9b94f0216322b2)
|
||
|
|
|
||
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15237
|
||
|
|
Signed-off-by: Stefan Metzmacher <metze@samba.org>
|
||
|
|
|
||
|
|
Conflict: NA
|
||
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17695
|
||
|
|
---
|
||
|
|
source3/param/loadparm.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
|
||
|
|
index 9bb5f4cf8cb3..7e20acbf8b96 100644
|
||
|
|
--- a/source3/param/loadparm.c
|
||
|
|
+++ b/source3/param/loadparm.c
|
||
|
|
@@ -2148,7 +2148,7 @@ struct loadparm_service *lp_servicebynum(int snum)
|
||
|
|
return ServicePtrs[snum];
|
||
|
|
}
|
||
|
|
|
||
|
|
-struct loadparm_service *lp_default_loadparm_service()
|
||
|
|
+struct loadparm_service *lp_default_loadparm_service(void)
|
||
|
|
{
|
||
|
|
return &sDefault;
|
||
|
|
}
|
||
|
|
@@ -4808,7 +4808,7 @@ unsigned int * get_flags(void)
|
||
|
|
return flags_list;
|
||
|
|
}
|
||
|
|
|
||
|
|
-enum samba_weak_crypto lp_weak_crypto()
|
||
|
|
+enum samba_weak_crypto lp_weak_crypto(void)
|
||
|
|
{
|
||
|
|
if (Globals.weak_crypto == SAMBA_WEAK_CRYPTO_UNKNOWN) {
|
||
|
|
Globals.weak_crypto = SAMBA_WEAK_CRYPTO_DISALLOWED;
|
||
|
|
--
|
||
|
|
2.34.1
|