diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2022-05-05 21:08:06 +1200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2022-05-10 05:19:34 +0000 |
| commit | 0eb3041bfa6a8ba345796511e6acaf8ac40c486f (patch) | |
| tree | add8a4707bbf017f0e92e399f90c06b165e7862a /python | |
| parent | 5104a791249ee2311828e4483e3e9ddabb05d45a (diff) | |
| download | samba-0eb3041bfa6a8ba345796511e6acaf8ac40c486f.tar.gz samba-0eb3041bfa6a8ba345796511e6acaf8ac40c486f.tar.bz2 samba-0eb3041bfa6a8ba345796511e6acaf8ac40c486f.zip | |
samba-tool gpo: Fix unintended string concatenations
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/netcmd/gpo.py | 12 |
1 files changed, 6 insertions, 6 deletions
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 " |