svn commit: samba r16784 - in branches/SAMBA_4_0/source: dsdb/samdb/ldb_modules lib/ldb/common

[idra at samba.org]

Author: idra
Date: 2006-07-03 15:49:23 +0000 (Mon, 03 Jul 2006)
New Revision: 16784

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16784

Log:

- make some function in ldb static, they not need to be exported anywhere

- fix a bad segfault
  Andrew please make test before committing.

Simo.


Modified:
   branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb.c


Changeset:
Modified: branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c
===================================================================
--- branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-07-03 14:07:35 UTC (rev 16783)
+++ branches/SAMBA_4_0/source/dsdb/samdb/ldb_modules/password_hash.c	2006-07-03 15:49:23 UTC (rev 16784)
@@ -617,6 +617,10 @@
 		return LDB_ERR_CONSTRAINT_VIOLATION;
 	}
 
+	h = ph_init_handle(req, module, PH_ADD);
+	if (!h) {
+		return LDB_ERR_OPERATIONS_ERROR;
+	}
 	ac = talloc_get_type(h->private_data, struct ph_async_context);
 
 	/* get user domain data */
@@ -626,10 +630,6 @@
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 
-	h = ph_init_handle(req, module, PH_ADD);
-	if (!h) {
-		return LDB_ERR_OPERATIONS_ERROR;
-	}
 	ret = build_domain_data_request(ac);
 	if (ret != LDB_SUCCESS) {
 		return ret;

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb.c	2006-07-03 14:07:35 UTC (rev 16783)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb.c	2006-07-03 15:49:23 UTC (rev 16784)
@@ -294,7 +294,7 @@
 	return ldb_transaction_cancel_internal(ldb);
 }
 
-int ldb_autotransaction_start(struct ldb_context *ldb)
+static int ldb_autotransaction_start(struct ldb_context *ldb)
 {
 	/* explicit transaction active, ignore autotransaction request */
 	if (ldb->transaction_active)
@@ -303,7 +303,7 @@
 	return ldb_transaction_start_internal(ldb);
 }
 
-int ldb_autotransaction_commit(struct ldb_context *ldb)
+static int ldb_autotransaction_commit(struct ldb_context *ldb)
 {
 	/* explicit transaction active, ignore autotransaction request */
 	if (ldb->transaction_active)
@@ -312,7 +312,7 @@
 	return ldb_transaction_commit_internal(ldb);
 }
 
-int ldb_autotransaction_cancel(struct ldb_context *ldb)
+static int ldb_autotransaction_cancel(struct ldb_context *ldb)
 {
 	/* explicit transaction active, ignore autotransaction request */
 	if (ldb->transaction_active)