[SCM] Samba Shared Repository - branch master updated
Amitay Isaacs
amitay at samba.org
Mon Jan 30 18:24:02 MST 2012
The branch, master has been updated
via bfa951d s4-s3-upgrade: Check if there are duplicate sids for users and groups
via 449ca75 s4-s3-upgrade: Use lowercase hostname as hostname for provision
from 1fdc96e Fix bug #8139 - smbclient fails if server does not support Echo request.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bfa951db975417facda3e92d9b1075616e6c7581
Author: Amitay Isaacs <amitay at gmail.com>
Date: Mon Jan 30 12:13:28 2012 +1100
s4-s3-upgrade: Check if there are duplicate sids for users and groups
Autobuild-User: Amitay Isaacs <amitay at samba.org>
Autobuild-Date: Tue Jan 31 02:23:17 CET 2012 on sn-devel-104
commit 449ca7575904e4ed78f2696bb16cef5143761bbc
Author: Amitay Isaacs <amitay at gmail.com>
Date: Tue Dec 6 14:43:45 2011 +1100
s4-s3-upgrade: Use lowercase hostname as hostname for provision
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/upgrade.py | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 3a42860..850035b 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -617,7 +617,11 @@ Please fix this account before attempting to upgrade again
# Check for same user sid/group sid
group_sids = set([str(g.sid) for g in grouplist])
+ if len(grouplist) != len(group_sids):
+ raise ProvisioningError("Please remove duplicate group sid entries before upgrade.")
user_sids = set(["%s-%u" % (domainsid, u['rid']) for u in userlist])
+ if len(userlist) != len(user_sids):
+ raise ProvisioningError("Please remove duplicate user sid entries before upgrade.")
common_sids = group_sids.intersection(user_sids)
if common_sids:
logger.error("Following sids are both user and group sids:")
@@ -636,7 +640,7 @@ Please fix this account before attempting to upgrade again
domainsid=str(domainsid), next_rid=next_rid,
dc_rid=machinerid,
dom_for_fun_level=dsdb.DS_DOMAIN_FUNCTION_2003,
- hostname=netbiosname, machinepass=machinepass,
+ hostname=netbiosname.lower(), machinepass=machinepass,
serverrole=serverrole, samdb_fill=FILL_FULL,
useeadb=useeadb, dns_backend=dns_backend)
--
Samba Shared Repository
More information about the samba-cvs
mailing list