[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  3a759e0 ldb:pyldb.c - "py_ldb_rename" remove superflous "ldb" pointer
      from  c6cf070 s4-s3-upgrade Improve samba-tool domain samba3upgrade behaviour

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


- Log -----------------------------------------------------------------
commit 3a759e0375baf52694d004cab72c34f372528286
Author: Matthias Dieter Wallnöfer <mdw at samba.org>
Date:   Tue Sep 13 15:01:51 2011 +0200

    ldb:pyldb.c - "py_ldb_rename" remove superflous "ldb" pointer
    
    Reviewed-by: Jelmer
    
    Autobuild-User: Matthias Dieter Wallnöfer <mdw at samba.org>
    Autobuild-Date: Tue Sep 13 18:11:18 CEST 2011 on sn-devel-104

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

Summary of changes:
 lib/ldb/pyldb.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index 7991296..cb13fe9 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -1245,7 +1245,6 @@ static PyObject *py_ldb_rename(PyLdbObject *self, PyObject *args, PyObject *kwar
 	PyObject *py_dn1, *py_dn2;
 	struct ldb_dn *dn1, *dn2;
 	int ret;
-	struct ldb_context *ldb;
 	TALLOC_CTX *mem_ctx;
 	PyObject *py_controls = Py_None;
 	struct ldb_control **parsed_controls;
@@ -1266,7 +1265,6 @@ static PyObject *py_ldb_rename(PyLdbObject *self, PyObject *args, PyObject *kwar
 		PyErr_NoMemory();
 		return NULL;
 	}
-	ldb = pyldb_Ldb_AsLdbContext(self);
 
 	if (py_controls == Py_None) {
 		parsed_controls = NULL;
@@ -1277,12 +1275,12 @@ static PyObject *py_ldb_rename(PyLdbObject *self, PyObject *args, PyObject *kwar
 	}
 
 
-	if (!pyldb_Object_AsDn(mem_ctx, py_dn1, ldb, &dn1)) {
+	if (!pyldb_Object_AsDn(mem_ctx, py_dn1, ldb_ctx, &dn1)) {
 		talloc_free(mem_ctx);
 		return NULL;
 	}
 
-	if (!pyldb_Object_AsDn(mem_ctx, py_dn2, ldb, &dn2)) {
+	if (!pyldb_Object_AsDn(mem_ctx, py_dn2, ldb_ctx, &dn2)) {
 		talloc_free(mem_ctx);
 		return NULL;
 	}


-- 
Samba Shared Repository