[SCM] Samba Shared Repository - branch master updated

[Anatoliy Atanasov]

The branch, master has been updated
       via  7200c25... Revert "s4-rodc: Fix provision warnings by creating ntds objectGUID in provision"
      from  8489934... Revert "s4:password_hash LDB module - don't break the provision"

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7200c25646d1c34dd1ce723ab4fba3c40c89b6b0
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Tue May 11 11:35:54 2010 +0300

    Revert "s4-rodc: Fix provision warnings by creating ntds objectGUID in provision"
    
    This reverts commit c3cbb846d0bfbaa11fd255bada7fa5fe502d4d96.
    The fix is not correct, we should cache a bool to answer amIRODC

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

Summary of changes:
 source4/dsdb/pydsdb.c                       |   23 -----------------------
 source4/scripting/python/samba/provision.py |    6 +-----
 source4/scripting/python/samba/samdb.py     |    4 ----
 3 files changed, 1 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index c92eec2..45f8b6e 100644
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -309,26 +309,6 @@ static PyObject *py_samdb_ntds_objectGUID(PyObject *self, PyObject *args)
 	return result;
 }
 
-static PyObject *py_dsdb_set_ntds_objectGUID(PyObject *self, PyObject *args)
-{
-	PyObject *py_ldb, *py_guid;
-	bool ret;
-	struct GUID guid;
-	struct ldb_context *ldb;
-	if (!PyArg_ParseTuple(args, "OO", &py_ldb, &py_guid))
-		return NULL;
-
-	PyErr_LDB_OR_RAISE(py_ldb, ldb);
-	GUID_from_string(PyString_AsString(py_guid), &guid);
-
-	ret = samdb_set_ntds_objectGUID(ldb, &guid);
-	if (!ret) {
-		PyErr_SetString(PyExc_RuntimeError, "set_ntds_objectGUID failed");
-		return NULL;
-	}
-	Py_RETURN_NONE;
-}
-
 static PyObject *py_dsdb_set_global_schema(PyObject *self, PyObject *args)
 {
 	PyObject *py_ldb;
@@ -419,9 +399,6 @@ static PyMethodDef py_dsdb_methods[] = {
 		NULL },
 	{ "samdb_ntds_objectGUID", (PyCFunction)py_samdb_ntds_objectGUID,
 		METH_VARARGS, "get the NTDS objectGUID as a string"},
-	{ "dsdb_set_ntds_objectGUID",
-		(PyCFunction)py_dsdb_set_ntds_objectGUID, METH_VARARGS,
-		NULL },
 	{ "dsdb_set_global_schema", (PyCFunction)py_dsdb_set_global_schema,
 		METH_VARARGS, NULL },
 	{ "dsdb_load_partition_usn", (PyCFunction)py_dsdb_load_partition_usn,
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index b9b59b4..fa2dabe 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -840,7 +840,7 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp,
                 names, message, 
                 domainsid, domainguid, policyguid, policyguid_dc,
                 fill, adminpass, krbtgtpass, 
-                machinepass, invocationid, ntds_guid, dnspass, ntdsguid,
+                machinepass, invocationid, dnspass, ntdsguid,
                 serverrole, dom_for_fun_level=None,
                 schema=None):
     """Setup a complete SAM Database.
@@ -901,7 +901,6 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp,
 
         samdb.set_domain_sid(str(domainsid))
         samdb.set_invocation_id(invocationid)
-        samdb.set_ntds_GUID(ntds_guid)
         samdb.set_ntds_settings_dn("CN=NTDS Settings,%s" % names.serverdn)
 
         message("Adding DomainDN: %s" % names.domaindn)
@@ -1229,8 +1228,6 @@ def provision(setup_dir, message, session_info,
     if invocationid is None:
         invocationid = str(uuid.uuid4())
 
-    ntds_guid = str(uuid.uuid4())
-
     if not os.path.exists(paths.private_dir):
         os.mkdir(paths.private_dir)
     if not os.path.exists(os.path.join(paths.private_dir,"tls")):
@@ -1324,7 +1321,6 @@ def provision(setup_dir, message, session_info,
                         fill=samdb_fill, 
                         adminpass=adminpass, krbtgtpass=krbtgtpass,
                         invocationid=invocationid, 
-                        ntds_guid=ntds_guid,
                         machinepass=machinepass, dnspass=dnspass, 
                         ntdsguid=ntdsguid, serverrole=serverrole,
                         dom_for_fun_level=dom_for_fun_level)
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index d7b7d82..991c678 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -262,10 +262,6 @@ accountExpires: %u
         "Get the NTDS objectGUID"
         return dsdb.samdb_ntds_objectGUID(self)
 
-    def set_ntds_GUID(self, object_guid):
-        "Set the NTDS objectGUID"
-        return dsdb.dsdb_set_ntds_objectGUID(self, object_guid)
-
     def server_site_name(self):
         "Get the server site name"
         return dsdb.samdb_server_site_name(self)


-- 
Samba Shared Repository