From: Douglas Bagnall Date: Thu, 4 Aug 2022 03:44:45 +0000 (+1200) Subject: samba-tool: allow testparm to dump global section only X-Git-Tag: samba-4.17.0rc1~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5750d7a1d05bccf61b3ae0ea4dcb36e0c103cb26;p=thirdparty%2Fsamba.git samba-tool: allow testparm to dump global section only BUG: https://bugzilla.samba.org/show_bug.cgi?id=15070 Signed-off-by: Douglas Bagnall Reviewed-by: David Mulder --- diff --git a/python/samba/netcmd/testparm.py b/python/samba/netcmd/testparm.py index b44dea1f141..41dbb4bd623 100644 --- a/python/samba/netcmd/testparm.py +++ b/python/samba/netcmd/testparm.py @@ -106,7 +106,10 @@ class cmd_testparm(Command): try: section = lp[section_name] except KeyError: - raise CommandError("Unknown section %s" % section_name) + if section_name in ['global', 'globals']: + lp.dump_globals() + else: + raise CommandError(f"Unknown section {section_name}") else: section.dump(lp.default_service, verbose) else: diff --git a/selftest/knownfail.d/samba-tool-testparm b/selftest/knownfail.d/samba-tool-testparm deleted file mode 100644 index e2252dd86fc..00000000000 --- a/selftest/knownfail.d/samba-tool-testparm +++ /dev/null @@ -1 +0,0 @@ -^samba.tests.netcmd.samba.tests.netcmd.TestParmTests.test_section_globals