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

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

Simo.
(This used to be commit b9b6bb3e89d3b0e04ccce15156c1a128b6f20d88)

diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index a4816f13db7abab4723733dc9e02de4a19ba9a84..9d7c78487ab7ffc9ec94b2820deb54d9496683b8 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -617,6 +617,10 @@ static int password_hash_add(struct ldb_module *module, struct ldb_request *req)
                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 @@ static int password_hash_add(struct ldb_module *module, struct ldb_request *req)
                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;

diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 1022f422c07dabaa06df5b80145f69d8d3ec5cdb..5228eeb6b3b1c1ae6ed0c10aef004a2c718b200e 100644 (file)
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -294,7 +294,7 @@ int ldb_transaction_cancel(struct ldb_context *ldb)
        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 @@ int ldb_autotransaction_start(struct ldb_context *ldb)
        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 @@ int ldb_autotransaction_commit(struct ldb_context *ldb)
        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)