Attachment 18582 Details for Bug 15815 – Patches for v4-22-test

[patch] Patches for v4-22-test

bfixes-tmp422.txt (text/plain), 4.20 KB, created by Stefan Metzmacher on 2025-02-24 14:16:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Metzmacher

Created: 2025-02-24 14:16:18 UTC

Size: 4.20 KB

patch

obsolete

>From d530c3c5f34d3eee4d17e3112e25996aefae3e89 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 22 Feb 2025 15:58:51 +0100
>Subject: [PATCH 1/3] docs-xml/smbdotconf: make it clear that 'client use krb5
> netlogon' is experimental
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15815
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 54514ad809ef2e70b772906a815b27a0950a5341)
>---
> docs-xml/smbdotconf/winbind/clientusekrb5netlogon.xml | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/docs-xml/smbdotconf/winbind/clientusekrb5netlogon.xml b/docs-xml/smbdotconf/winbind/clientusekrb5netlogon.xml
>index ad0fc907903b..e65941eb901c 100644
>--- a/docs-xml/smbdotconf/winbind/clientusekrb5netlogon.xml
>+++ b/docs-xml/smbdotconf/winbind/clientusekrb5netlogon.xml
>@@ -39,6 +39,11 @@
> 	is detected as active directory domain, e.g.
> 	with 'SECURITY = ADS' or on an active directory domain controller.
> 	</para>
>+
>+	<para><emphasis>
>+	WARNING: This option is experimental in this Samba version
>+	(see VERSION section below) and should not be used in production!
>+	</emphasis></para>
> </description>
> 
> <value type="default">default</value>
>-- 
>2.34.1
>
>
>From dd9764efa0401fe904bbbab5ae7fbbbd11215637 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 22 Feb 2025 15:58:51 +0100
>Subject: [PATCH 2/3] samba-tool/testparm: make it clear that 'client use krb5
> netlogon' is experimental
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15815
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>(cherry picked from commit 5fc5f90dee13ab5168c22fd53b89c582f3d582e9)
>---
> python/samba/netcmd/testparm.py | 10 ++++++++++
> 1 file changed, 10 insertions(+)
>
>diff --git a/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py
>index 6fbde635a7dd..cd854feee9ca 100644
>--- a/python/samba/netcmd/testparm.py
>+++ b/python/samba/netcmd/testparm.py
>@@ -191,6 +191,16 @@ class cmd_testparm(Command):
>                 "'allow_sasl_without_tls_channel_bindings' "
>                 "(if really needed).")
> 
>+        cli_krb5_netlogon = lp.get("client use krb5 netlogon")
>+        if cli_krb5_netlogon not in ["no", "default"]:
>+            logger.error(
>+                "You have configured "
>+                "'client use krb5 netlogon = %s'.\n"
>+                "This is experimental in Samba %s "
>+                "and should not be used in production!\n\n" %
>+                (cli_krb5_netlogon, samba.version))
>+            valid = False
>+
>         return valid
> 
>     def allow_access(self, deny_list, allow_list, cname, caddr):
>-- 
>2.34.1
>
>
>From 1626e614cc9e0914640695d8c51110ae437e614d Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Sat, 22 Feb 2025 15:58:51 +0100
>Subject: [PATCH 3/3] s3:testparm: make it clear that 'client use krb5
> netlogon' is experimental
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15815
>
>Signed-off-by: Stefan Metzmacher <metze@samba.org>
>Reviewed-by: Volker Lendecke <vl@samba.org>
>
>Autobuild-User(master): Volker Lendecke <vl@samba.org>
>Autobuild-Date(master): Mon Feb 24 08:43:55 UTC 2025 on atb-devel-224
>
>(cherry picked from commit 154875244c5a349e04605cad1f66cb26aeaf86d7)
>---
> source3/utils/testparm.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
>diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
>index 55c9bf1e076c..a93bc020607c 100644
>--- a/source3/utils/testparm.c
>+++ b/source3/utils/testparm.c
>@@ -359,6 +359,7 @@ static int do_global_checks(void)
> 	const char **lp_ptr = NULL;
> 	const struct loadparm_substitution *lp_sub =
> 		loadparm_s3_global_substitution();
>+	int ival;
> 
> 	fprintf(stderr, "\n");
> 
>@@ -784,6 +785,18 @@ static int do_global_checks(void)
> 			"options\n\n");
> 	}
> 
>+	ival = lp__client_use_krb5_netlogon();
>+	if (ival > 0) {
>+		fprintf(stderr,
>+			"ERROR: You have configured "
>+			"'client use krb5 netlogon = %s'.\n"
>+			"This is experimental in Samba %s "
>+			"and should not be used in production!\n\n",
>+			ival == Auto ? "auto" : "yes",
>+			samba_version_string());
>+		ret = 1;
>+	}
>+
> 	if (lp_kerberos_encryption_types() == KERBEROS_ETYPES_LEGACY) {
> 		fprintf(stderr,
> 			"WARNING: You have configured "
>-- 
>2.34.1
>

Flags:

vl: review+
slow: review+
janger: review+

Actions: View

Attachments on bug 15815: 18581 | 18582