sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-19 12:23:49 +03:00
Code Activity

samba-tool gpo: Fix unintended string concatenations

Browse Source 
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Joseph Sutton
2022-05-05 21:08:06 +12:00
committed by Andreas Schneider
parent 5104a79124
commit 0eb3041bfa
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/netcmd/gpo.py
View File

@@ -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 "