From 053a87c6c496665a6dacab3efdecd4d7ebc2234d Mon Sep 17 00:00:00 2001 From: Richard Connon Date: Sun, 5 Jan 2014 19:51:19 +0000 Subject: Fixed group blacklist issue #150 --- src/lib/Bcfg2/Client/Tools/POSIXUsers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py index bf23aca6b..161145a14 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py +++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py @@ -147,6 +147,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool): given entry is a member of """ return [g for g in self.existing['POSIXGroup'].values() if entry.get("name") in g[3] and g[0] != entry.get("group")] + and self._in_managed_range('POSIXGroup', g[2] def VerifyPOSIXUser(self, entry, _): """ Verify a POSIXUser entry """ -- cgit v1.2.3-1-g7c22 From 293fcb0b601fd8ce46c34b49b4b1b661f34a968f Mon Sep 17 00:00:00 2001 From: Richard Connon Date: Sun, 5 Jan 2014 20:05:04 +0000 Subject: Fixed syntatical error in previous --- src/lib/Bcfg2/Client/Tools/POSIXUsers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py index 161145a14..1bae94d28 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py +++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py @@ -146,8 +146,8 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool): """ Get a list of supplmentary groups that the user in the given entry is a member of """ return [g for g in self.existing['POSIXGroup'].values() - if entry.get("name") in g[3] and g[0] != entry.get("group")] - and self._in_managed_range('POSIXGroup', g[2] + if entry.get("name") in g[3] and g[0] != entry.get("group") + and self._in_managed_range('POSIXGroup', g[2])] def VerifyPOSIXUser(self, entry, _): """ Verify a POSIXUser entry """ -- cgit v1.2.3-1-g7c22 From f3154b9f0471faaef0e64f89b669cd01614fef20 Mon Sep 17 00:00:00 2001 From: Richard Connon Date: Sun, 5 Jan 2014 20:33:38 +0000 Subject: fixed indentation in previous --- src/lib/Bcfg2/Client/Tools/POSIXUsers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py index 1bae94d28..6d18cd176 100644 --- a/src/lib/Bcfg2/Client/Tools/POSIXUsers.py +++ b/src/lib/Bcfg2/Client/Tools/POSIXUsers.py @@ -147,7 +147,7 @@ class POSIXUsers(Bcfg2.Client.Tools.Tool): given entry is a member of """ return [g for g in self.existing['POSIXGroup'].values() if entry.get("name") in g[3] and g[0] != entry.get("group") - and self._in_managed_range('POSIXGroup', g[2])] + and self._in_managed_range('POSIXGroup', g[2])] def VerifyPOSIXUser(self, entry, _): """ Verify a POSIXUser entry """ -- cgit v1.2.3-1-g7c22