summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/samba/samdb.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index b1d5acb8399..4606b607323 100644
--- a/python/samba/samdb.py
+++ b/python/samba/samdb.py
@@ -254,6 +254,16 @@ pwdLastSet: 0
def group_member_filter(self, member, member_types):
filter = ""
+ all_member_types = [ 'user',
+ 'group',
+ 'computer',
+ 'serviceaccount',
+ 'contact',
+ ]
+
+ if 'all' in member_types:
+ member_types = all_member_types
+
if 'user' in member_types:
filter += ('(&(sAMAccountName=%s)(samAccountType=%d))' %
(ldb.binary_encode(member), dsdb.ATYPE_NORMAL_ACCOUNT))