python/samdb: add type "all" to search for all common types of group members

Signed-off-by: Björn Baumbach <bb@sernet.de>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/python/samba/samdb.py b/python/samba/samdb.py
index b1d5acb83991c397c9e47a6dbb8cf3191132660e..4606b607323a3457e4cf12a1f42cbd8cdca1b166 100644 (file)
--- 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))