From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 5 May 2022 09:08:06 +0000 (+1200)
Subject: samba-tool gpo: Fix unintended string concatenations
X-Git-Tag: talloc-2.3.4~221
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0eb3041bfa6a8ba345796511e6acaf8ac40c486f;p=thirdparty%2Fsamba.git

samba-tool gpo: Fix unintended string concatenations

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
---

diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py
index 5d936e0e646..71664e66212 100644
--- a/python/samba/netcmd/gpo.py
+++ b/python/samba/netcmd/gpo.py
@@ -3702,7 +3702,7 @@ samba-tool gpo manage access list {31B2F340-016D-11D2-945F-00C04FB984F9}
 
         realm = self.lp.get('realm')
         vgp_xml = '\\'.join([realm.lower(), 'Policies', gpo,
-                             'MACHINE\\VGP\\VTLA\\VAS'
+                             'MACHINE\\VGP\\VTLA\\VAS',
                              'HostAccessControl\\Allow\\manifest.xml'])
         try:
             allow = ET.fromstring(conn.loadfile(vgp_xml))
@@ -3727,7 +3727,7 @@ samba-tool gpo manage access list {31B2F340-016D-11D2-945F-00C04FB984F9}
                 self.outf.write('+:%s\\%s:ALL\n' % (domain.text, name.text))
 
         vgp_xml = '\\'.join([realm.lower(), 'Policies', gpo,
-                             'MACHINE\\VGP\\VTLA\\VAS'
+                             'MACHINE\\VGP\\VTLA\\VAS',
                              'HostAccessControl\\Deny\\manifest.xml'])
         try:
             deny = ET.fromstring(conn.loadfile(vgp_xml))
@@ -3798,11 +3798,11 @@ samba-tool gpo manage access add {31B2F340-016D-11D2-945F-00C04FB984F9} allow go
         realm = self.lp.get('realm')
         if etype == 'allow':
             vgp_dir = '\\'.join([realm.lower(), 'Policies', gpo,
-                                 'MACHINE\\VGP\\VTLA\\VAS'
+                                 'MACHINE\\VGP\\VTLA\\VAS',
                                  'HostAccessControl\\Allow'])
         elif etype == 'deny':
             vgp_dir = '\\'.join([realm.lower(), 'Policies', gpo,
-                                 'MACHINE\\VGP\\VTLA\\VAS'
+                                 'MACHINE\\VGP\\VTLA\\VAS',
                                  'HostAccessControl\\Deny'])
         else:
             raise CommandError("The entry type must be either 'allow' or "
@@ -3930,11 +3930,11 @@ samba-tool gpo manage access remove {31B2F340-016D-11D2-945F-00C04FB984F9} allow
         realm = self.lp.get('realm')
         if etype == 'allow':
             vgp_dir = '\\'.join([realm.lower(), 'Policies', gpo,
-                                 'MACHINE\\VGP\\VTLA\\VAS'
+                                 'MACHINE\\VGP\\VTLA\\VAS',
                                  'HostAccessControl\\Allow'])
         elif etype == 'deny':
             vgp_dir = '\\'.join([realm.lower(), 'Policies', gpo,
-                                 'MACHINE\\VGP\\VTLA\\VAS'
+                                 'MACHINE\\VGP\\VTLA\\VAS',
                                  'HostAccessControl\\Deny'])
         else:
             raise CommandError("The entry type must be either 'allow' or "
diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo
deleted file mode 100644
index 837f9c756f0..00000000000
--- a/selftest/knownfail.d/gpo
+++ /dev/null
@@ -1 +0,0 @@
-^samba.tests.samba_tool.gpo_exts.samba.tests.samba_tool.gpo_exts.GpoCmdTestCase.test_vgp_access_list