summaryrefslogtreecommitdiff
path: root/source4/scripting
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-09-04 11:58:34 +1000
committerAndrew Bartlett <abartlet@samba.org>2011-09-04 13:00:10 +1000
commit329ec81288451a0110a755aeb61d4f910c393b09 (patch)
tree2ee7200c6924c48d3f0bbb7a6c49aa5e910fb937 /source4/scripting
parent3167a2b8b90107b763f4dcb4987df46856b297f4 (diff)
downloadsamba-329ec81288451a0110a755aeb61d4f910c393b09.tar.gz
samba-329ec81288451a0110a755aeb61d4f910c393b09.tar.bz2
samba-329ec81288451a0110a755aeb61d4f910c393b09.zip
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
Diffstat (limited to 'source4/scripting')
-rw-r--r--source4/scripting/python/samba/upgrade.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 7386d0b4b1..1ac1ef9054 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)