diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2011-11-16 10:17:50 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2011-11-16 05:53:41 +0100 |
| commit | 80113755c40b2ca04ce8a325463160483ec660b9 (patch) | |
| tree | 46097065c4f351523f8dabe98ef5ced6b29b8464 /source4 | |
| parent | 05e841c82ce7f0f252b5eb565e457f406b3a1b39 (diff) | |
| download | samba-80113755c40b2ca04ce8a325463160483ec660b9.tar.gz samba-80113755c40b2ca04ce8a325463160483ec660b9.tar.bz2 samba-80113755c40b2ca04ce8a325463160483ec660b9.zip | |
s3-s4-upgrade: do not add description if it is empty string or none
Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed Nov 16 05:53:41 CET 2011 on sn-devel-104
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/python/samba/upgrade.py | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py index 3acb1fa785..5be2eab02b 100644 --- a/source4/scripting/python/samba/upgrade.py +++ b/source4/scripting/python/samba/upgrade.py @@ -198,15 +198,21 @@ def add_group_from_mapping_entry(samdb, groupmap, logger): m = ldb.Message() m.dn = ldb.Dn(samdb, "CN=%s,CN=Users,%s" % (groupmap.nt_name, samdb.get_default_basedn())) - m['a01'] = ldb.MessageElement(groupmap.nt_name, ldb.FLAG_MOD_ADD, 'cn') - m['a02'] = ldb.MessageElement('group', ldb.FLAG_MOD_ADD, 'objectClass') - m['a03'] = ldb.MessageElement(ndr_pack(groupmap.sid), ldb.FLAG_MOD_ADD, 'objectSid') - m['a04'] = ldb.MessageElement(groupmap.comment, ldb.FLAG_MOD_ADD, 'description') - m['a05'] = ldb.MessageElement(groupmap.nt_name, ldb.FLAG_MOD_ADD, 'sAMAccountName') + m['cn'] = ldb.MessageElement(groupmap.nt_name, ldb.FLAG_MOD_ADD, 'cn') + m['objectClass'] = ldb.MessageElement('group', ldb.FLAG_MOD_ADD, 'objectClass') + m['objectSid'] = ldb.MessageElement(ndr_pack(groupmap.sid), ldb.FLAG_MOD_ADD, + 'objectSid') + m['sAMAccountName'] = ldb.MessageElement(groupmap.nt_name, ldb.FLAG_MOD_ADD, + 'sAMAccountName') + + if groupmap.comment: + m['description'] = ldb.MessageElement(groupmap.comment, ldb.FLAG_MOD_ADD, + 'description') # Fix up incorrect 'well known' groups that are actually builtin (per test above) to be aliases if groupmap.sid_name_use == lsa.SID_NAME_ALIAS or groupmap.sid_name_use == lsa.SID_NAME_WKN_GRP: - m['a06'] = ldb.MessageElement(str(dsdb.GTYPE_SECURITY_DOMAIN_LOCAL_GROUP), ldb.FLAG_MOD_ADD, 'groupType') + m['groupType'] = ldb.MessageElement(str(dsdb.GTYPE_SECURITY_DOMAIN_LOCAL_GROUP), + ldb.FLAG_MOD_ADD, 'groupType') try: samdb.add(m, controls=["relax:0"]) |