From 35d8b808005638e9fa33bf7983d449db34dfb761 Mon Sep 17 00:00:00 2001 From: Nadezhda Ivanova Date: Mon, 17 Jan 2011 17:44:10 +0200 Subject: s4-tools: Fixed a bug in ldapcmp - DACL was not retrieved correctly if the object had no SACL. --Pair-Programmed-With: Zahari Zahariev --- source4/scripting/python/samba/netcmd/ldapcmp.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source4/scripting/python') 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) -- cgit