From 329ec81288451a0110a755aeb61d4f910c393b09 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 4 Sep 2011 11:58:34 +1000 Subject: [PATCH] s4-provision cope with SID_NAME_WKN_GRP mappings in upgrade.py Some incorrect LDAP backends have entries with this group type, but due to the pdb_ldap code, we cannot read the group members, and we already skip them in add_group_from_mapping_entry(). Andrew Bartlett --- source4/scripting/python/samba/upgrade.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 7386d0b4b159..1ac1ef9054b7 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -491,13 +491,17 @@ def upgrade_from_samba3(samba3, logger, targetdir, session_info=None): next_rid = rid + 1 # Get members for each group/alias - if group.sid_name_use == lsa.SID_NAME_ALIAS or group.sid_name_use == lsa.SID_NAME_WKN_GRP: + if group.sid_name_use == lsa.SID_NAME_ALIAS: members = s3db.enum_aliasmem(group.sid) elif group.sid_name_use == lsa.SID_NAME_DOM_GRP: try: members = s3db.enum_group_members(group.sid) except: continue + elif group.sid_name_use == lsa.SID_NAME_WKN_GRP: + logger.warn("Ignoring 'well known' group '%s' (should already be in AD, and have no members)", + group.nt_name, group.sid_name_use) + continue else: logger.warn("Ignoring group '%s' with sid_name_use=%d", group.nt_name, group.sid_name_use) -- 2.34.1