sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

python/samba: PY3 port samba4.blackbox.functionalprep

Browse Source 
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Noel Power
2018-10-08 15:21:45 +01:00
committed by Andrew Bartlett
parent 7562a5518f
commit 09f6b86403
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/samba/forest_update.py
View File

@ -346,7 +346,7 @@ objectClass: container
controls=["search_options:1:2"])
assert len(msg) == 1
existing_sddl = msg[0][attr][0]
existing_sddl = str(msg[0][attr][0])
index = existing_sddl.rfind("S:")
if index != -1:
new_sddl = existing_sddl[:index] + ace + existing_sddl[index:]

3
python/samba/ms_forest_updates_markdown.py
View File

@ -27,6 +27,7 @@ import re
import os
import markdown
import xml.etree.ElementTree as ET
from samba.compat import get_string
# Display specifier updates or otherwise (ignored in forest_update.py)
@ -217,7 +218,7 @@ def read_ms_markdown(in_file, out_folder=None, out_dict={}):
if node.text and node.text.startswith('|Operation'):
# Strip first and last |
updates = [x[1:len(x) - 1].split('|') for x in
ET.tostring(node, method='text').splitlines()]
get_string(ET.tostring(node, method='text')).splitlines()]
for update in updates[2:]:
output = re.match('Operation (\d+): {(.*)}', update[0])
if output: