The branch, master has been updated
via 8011375 s3-s4-upgrade: do not add description if it is empty string
or none
from 05e841c Final part of patchset to fix bug #8556 - ACL permissions
ignored when SMBsetatr is requested.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 80113755c40b2ca04ce8a325463160483ec660b9
Author: Amitay Isaacs <[email protected]>
Date: Wed Nov 16 10:17:50 2011 +1100
s3-s4-upgrade: do not add description if it is empty string or none
Autobuild-User: Amitay Isaacs <[email protected]>
Autobuild-Date: Wed Nov 16 05:53:41 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/upgrade.py | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/upgrade.py
b/source4/scripting/python/samba/upgrade.py
index 3acb1fa..5be2eab 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"])
--
Samba Shared Repository
