[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha3-1507-g018ee18

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  018ee187ffbfd77aa0d5f5da6c3512ea6b37a746 (commit)
       via  60d458e3195eef6baf655fee0da7c3f68517e8e6 (commit)
      from  33094329610097113c244ccd02606661a4c9e2e0 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 018ee187ffbfd77aa0d5f5da6c3512ea6b37a746
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 11 03:31:38 2008 +0200

    Fix dependency on loadparm.

commit 60d458e3195eef6baf655fee0da7c3f68517e8e6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 11 03:31:26 2008 +0200

    Use consistent function names with the standard Python uuid module that is available in >= 2.4.

-----------------------------------------------------------------------

Summary of changes:
 source/lib/events/config.mk                  |    2 +-
 source/scripting/python/samba/provision.py   |    4 ++--
 source/scripting/python/samba/tests/samdb.py |    8 ++++----
 source/scripting/python/uuidmodule.c         |    2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk
index e5a1316..058ce7f 100644
--- a/source/lib/events/config.mk
+++ b/source/lib/events/config.mk
@@ -44,6 +44,6 @@ PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
 
 [PYTHON::swig_events]
 SWIG_FILE = events.i
-PRIVATE_DEPENDENCIES = LIBEVENTS
+PRIVATE_DEPENDENCIES = LIBEVENTS LIBSAMBA-HOSTCONFIG
 
 swig_events_OBJ_FILES = lib/events/events_wrap.o
diff --git a/source/scripting/python/samba/provision.py b/source/scripting/python/samba/provision.py
index 0e88406..60fa22e 100644
--- a/source/scripting/python/samba/provision.py
+++ b/source/scripting/python/samba/provision.py
@@ -910,7 +910,7 @@ def provision(setup_dir, message, session_info,
         domainsid = security.Sid(domainsid)
 
     if policyguid is None:
-        policyguid = uuid.random()
+        policyguid = uuid.uuid4()
     if adminpass is None:
         adminpass = misc.random_password(12)
     if krbtgtpass is None:
@@ -960,7 +960,7 @@ def provision(setup_dir, message, session_info,
 
     assert serverrole in ("domain controller", "member server", "standalone")
     if invocationid is None and serverrole == "domain controller":
-        invocationid = uuid.random()
+        invocationid = uuid.uuid4()
 
     if not os.path.exists(paths.private_dir):
         os.mkdir(paths.private_dir)
diff --git a/source/scripting/python/samba/tests/samdb.py b/source/scripting/python/samba/tests/samdb.py
index 0e175bf..9da3358 100644
--- a/source/scripting/python/samba/tests/samdb.py
+++ b/source/scripting/python/samba/tests/samdb.py
@@ -29,18 +29,18 @@ import uuid
 class SamDBTestCase(TestCaseInTempDir):
     def setUp(self):
         super(SamDBTestCase, self).setUp()
-        invocationid = uuid.random()
+        invocationid = uuid.uuid4()
         domaindn = "DC=COM,DC=EXAMPLE"
         self.domaindn = domaindn
         configdn = "CN=Configuration," + domaindn
         schemadn = "CN=Schema," + configdn
-        domainguid = uuid.random()
-        policyguid = uuid.random()
+        domainguid = uuid.uuid4()
+        policyguid = uuid.uuid4()
         setup_path = lambda x: os.path.join("setup", x)
         creds = Credentials()
         creds.set_anonymous()
         domainsid = security.random_sid()
-        hostguid = uuid.random()
+        hostguid = uuid.uuid4()
         path = os.path.join(self.tempdir, "samdb.ldb")
         self.samdb = setup_samdb(path, setup_path, system_session(), creds, 
                                  cmdline_loadparm, schemadn, configdn, 
diff --git a/source/scripting/python/uuidmodule.c b/source/scripting/python/uuidmodule.c
index 18cfb6c..98ef9ad 100644
--- a/source/scripting/python/uuidmodule.c
+++ b/source/scripting/python/uuidmodule.c
@@ -46,7 +46,7 @@ static PyObject *uuid_random(PyObject *self, PyObject *args)
 }
 
 static PyMethodDef methods[] = {
-	{ "random", (PyCFunction)uuid_random, METH_VARARGS, NULL},
+	{ "uuid4", (PyCFunction)uuid_random, METH_VARARGS, NULL},
 	{ NULL, NULL }
 };
 


-- 
Samba Shared Repository