[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Sat Jul 10 06:10:16 MDT 2010
The branch, master has been updated
via 23f8100... s4:provision: remove --policy-guid and --policy-guid-dc cmdline options
via 800c7af... s4:provision: also use fixed GUID names of the default group policies for domain and domain controllers in tests
via f160074... s4 provision: use correct GUID for default policies
via e962e7e... s4 unittests: remove the provision directory before (re)generating
from cad04da... s4 net: Add spn module to list/add/remove spn on objects
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 23f810041bdd990a2dfabb5fcb076a269809ce7a
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jul 9 13:08:07 2010 +0200
s4:provision: remove --policy-guid and --policy-guid-dc cmdline options
metze
commit 800c7af0c9f78ce81d40270bf9a385235869e0d7
Author: Stefan Metzmacher <metze at samba.org>
Date: Fri Jun 25 13:26:06 2010 +0200
s4:provision: also use fixed GUID names of the default group policies for domain and domain controllers in tests
metze
commit f16007430a683c0e43e1aca13f59c55dde70dfac
Author: Matthieu Patou <mat at matws.net>
Date: Fri Jul 9 00:09:49 2010 +0400
s4 provision: use correct GUID for default policies
The value of GUID for policy is not random for default policies, it is
described here ("How Core Group Policy Works"):
http://technet.microsoft.com/en-us/library/cc784268%28WS.10%29.aspx
at paragraph System\Policies Container.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit e962e7e9562f26b1ea6854b1a34f0237c3abf222
Author: Matthieu Patou <mat at matws.net>
Date: Fri Jul 9 20:29:27 2010 +0400
s4 unittests: remove the provision directory before (re)generating
-----------------------------------------------------------------------
Summary of changes:
source4/scripting/python/samba/provision.py | 9 +++++++--
source4/scripting/python/samba/tests/samdb.py | 5 +++--
source4/setup/provision | 5 -----
source4/setup/tests/blackbox_group.sh | 1 +
source4/setup/tests/blackbox_newuser.sh | 1 +
source4/setup/tests/blackbox_setpassword.sh | 1 +
6 files changed, 13 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 131d4ff..5ede869 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -62,6 +62,8 @@ from samba.schema import Schema
from samba.samdb import SamDB
__docformat__ = "restructuredText"
+DEFAULT_POLICY_GUID = "31B2F340-016D-11D2-945F-00C04FB984F9"
+DEFAULT_DC_POLICY_GUID = "6AC1786C-016F-11D2-945F-00C04fB984F9"
def find_setup_dir():
"""Find the setup directory used by provision."""
@@ -1259,11 +1261,14 @@ def provision(setup_dir, logger, session_info,
domainsid = security.dom_sid(domainsid)
# create/adapt the group policy GUIDs
+ # Default GUID for default policy are described at
+ # "How Core Group Policy Works"
+ # http://technet.microsoft.com/en-us/library/cc784268%28WS.10%29.aspx
if policyguid is None:
- policyguid = str(uuid.uuid4())
+ policyguid = DEFAULT_POLICY_GUID
policyguid = policyguid.upper()
if policyguid_dc is None:
- policyguid_dc = str(uuid.uuid4())
+ policyguid_dc = DEFAULT_DC_POLICY_GUID
policyguid_dc = policyguid_dc.upper()
if adminpass is None:
diff --git a/source4/scripting/python/samba/tests/samdb.py b/source4/scripting/python/samba/tests/samdb.py
index 28745a2..34c5c1a 100644
--- a/source4/scripting/python/samba/tests/samdb.py
+++ b/source4/scripting/python/samba/tests/samdb.py
@@ -22,6 +22,7 @@ import uuid
from samba.auth import system_session
from samba.provision import setup_samdb, guess_names, make_smbconf, find_setup_dir, provision_paths_from_lp
+from samba.provision import DEFAULT_POLICY_GUID, DEFAULT_DC_POLICY_GUID
from samba.provisionbackend import ProvisionBackend
from samba.tests import TestCaseInTempDir
from samba.dcerpc import security
@@ -47,7 +48,7 @@ class SamDBTestCase(TestCaseInTempDir):
configdn = "CN=Configuration," + domaindn
schemadn = "CN=Schema," + configdn
domainguid = str(uuid.uuid4())
- policyguid = str(uuid.uuid4())
+ policyguid = DEFAULT_POLICY_GUID
domainsid = security.random_sid()
path = os.path.join(self.tempdir, "samdb.ldb")
session_info = system_session()
@@ -56,7 +57,7 @@ class SamDBTestCase(TestCaseInTempDir):
domain="EXAMPLE"
dnsdomain="example.com"
serverrole="domain controller"
- policyguid_dc = str(uuid.uuid4()).upper()
+ policyguid_dc = DEFAULT_DC_POLICY_GUID
smbconf = os.path.join(self.tempdir, "smb.conf")
make_smbconf(smbconf, self.setup_path, hostname, domain, dnsdomain,
diff --git a/source4/setup/provision b/source4/setup/provision
index e127ac8..035fa2a 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -60,10 +60,6 @@ parser.add_option("--domain-guid", type="string", metavar="GUID",
help="set domainguid (otherwise random)")
parser.add_option("--domain-sid", type="string", metavar="SID",
help="set domainsid (otherwise random)")
-parser.add_option("--policy-guid", type="string", metavar="GUID",
- help="set guid for domain policy")
-parser.add_option("--policy-guid-dc", type="string", metavar="GUID",
- help="set guid for domain controller policy")
parser.add_option("--ntds-guid", type="string", metavar="GUID",
help="set NTDS object GUID (otherwise random)")
parser.add_option("--invocationid", type="string", metavar="GUID",
@@ -241,7 +237,6 @@ try:
session, creds, smbconf=smbconf, targetdir=opts.targetdir,
samdb_fill=samdb_fill, realm=opts.realm, domain=opts.domain,
domainguid=opts.domain_guid, domainsid=opts.domain_sid,
- policyguid=opts.policy_guid, policyguid_dc=opts.policy_guid_dc,
hostname=opts.host_name,
hostip=opts.host_ip, hostip6=opts.host_ip6,
ntdsguid=opts.ntds_guid,
diff --git a/source4/setup/tests/blackbox_group.sh b/source4/setup/tests/blackbox_group.sh
index f1d37b7..adffad1 100755
--- a/source4/setup/tests/blackbox_group.sh
+++ b/source4/setup/tests/blackbox_group.sh
@@ -13,6 +13,7 @@ shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+rm -rf $PREFIX/simple-dc
testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
net="./bin/net"
diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh
index a295522..612dedf 100755
--- a/source4/setup/tests/blackbox_newuser.sh
+++ b/source4/setup/tests/blackbox_newuser.sh
@@ -13,6 +13,7 @@ shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+rm -rf $PREFIX/simple-dc
testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
net="./bin/net"
diff --git a/source4/setup/tests/blackbox_setpassword.sh b/source4/setup/tests/blackbox_setpassword.sh
index 039278f..da81553 100755
--- a/source4/setup/tests/blackbox_setpassword.sh
+++ b/source4/setup/tests/blackbox_setpassword.sh
@@ -14,6 +14,7 @@ shift 1
net="./bin/net"
+rm -rf $PREFIX/simple-dc
testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
testit "newuser" $net newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp at ssw0Rd
--
Samba Shared Repository
More information about the samba-cvs
mailing list