summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNadezhda Ivanova <nivanova@samba.org>2011-01-17 17:44:10 +0200
committerNadezhda Ivanova <nivanova@samba.org>2011-01-17 17:38:04 +0100
commit35d8b808005638e9fa33bf7983d449db34dfb761 (patch)
tree6295826e34b798c0e537794523d7051b283fe046
parent93da0aab9716d3f8154b6f4d39bfdf47634a96e0 (diff)
downloadsamba-35d8b808005638e9fa33bf7983d449db34dfb761.tar.gz
samba-35d8b808005638e9fa33bf7983d449db34dfb761.tar.bz2
samba-35d8b808005638e9fa33bf7983d449db34dfb761.zip
s4-tools: Fixed a bug in ldapcmp - DACL was not retrieved correctly if the object had no SACL.
--Pair-Programmed-With: Zahari Zahariev
-rwxr-xr-xsource4/scripting/python/samba/netcmd/ldapcmp.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/source4/scripting/python/samba/netcmd/ldapcmp.py
index d62b554424..1cde860fb1 100755
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/source4/scripting/python/samba/netcmd/ldapcmp.py
@@ -216,7 +216,10 @@ class Descriptor(object):
""" Extracts the DACL as a list of ACE string (with the brakets).
"""
try:
- res = re.search("D:(.*?)(\(.*?\))S:", self.sddl).group(2)
+ if "S:" in self.sddl:
+ res = re.search("D:(.*?)(\(.*?\))S:", self.sddl).group(2)
+ else:
+ res = re.search("D:(.*?)(\(.*\))", self.sddl).group(2)
except AttributeError:
return []
return re.findall("(\(.*?\))", res)