[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  ea365af... Added freeing a successful req so it doesnt croud the ldb context
      from  39616c0... Added oid for AS_SYSTEM control, used to bypass access checks for system operations.

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


- Log -----------------------------------------------------------------
commit ea365af4f597fd1fb596018920040a6af49144ec
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Fri Dec 18 17:57:08 2009 +0200

    Added freeing a successful req so it doesnt croud the ldb context

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

Summary of changes:
 source4/ldap_server/ldap_backend.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/ldap_server/ldap_backend.c b/source4/ldap_server/ldap_backend.c
index d983a54..689fd31 100644
--- a/source4/ldap_server/ldap_backend.c
+++ b/source4/ldap_server/ldap_backend.c
@@ -206,9 +206,11 @@ static int ldb_mod_req_with_controls(struct ldb_context *ldb,
 	}
 
 	if (ret == LDB_SUCCESS) {
-		return ldb_transaction_commit(ldb);
+		ret = ldb_transaction_commit(ldb);
+	}
+	else {
+		ldb_transaction_cancel(ldb);
 	}
-	ldb_transaction_cancel(ldb);
 
 	talloc_free(req);
 	return ret;


-- 
Samba Shared Repository