[SCM] Samba Shared Repository - branch master updated -
1a399db01c90753f0f1c70b2987b925c828b1c53
Andrew Bartlett
abartlet at samba.org
Thu Dec 18 03:37:09 GMT 2008
The branch, master has been updated
via 1a399db01c90753f0f1c70b2987b925c828b1c53 (commit)
via a9cf61dbdd4cf914215723b17912f584fff151c0 (commit)
via 8deded43ba0ab6a31739df5ca927eed48b81393a (commit)
from 28894f9b82032ef18f626428510a633a5c884d06 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 1a399db01c90753f0f1c70b2987b925c828b1c53
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Dec 18 14:31:52 2008 +1100
Parse options (and open the database) before starting transactions
commit a9cf61dbdd4cf914215723b17912f584fff151c0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Dec 18 14:30:11 2008 +1100
Print error strings when transactions fail in ldb tools
commit 8deded43ba0ab6a31739df5ca927eed48b81393a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Dec 18 14:12:19 2008 +1100
Rename ldb index pointer wrapper function
This also asserts that it is used only for index records.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source4/lib/ldb/ldb_tdb/ldb_index.c | 16 ++++++++--------
source4/lib/ldb/tools/ldbadd.c | 4 ++--
source4/lib/ldb/tools/ldbedit.c | 4 ++--
source4/lib/ldb/tools/ldbmodify.c | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/ldb_tdb/ldb_index.c b/source4/lib/ldb/ldb_tdb/ldb_index.c
index d0b9fa2..0a10307 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_index.c
+++ b/source4/lib/ldb/ldb_tdb/ldb_index.c
@@ -226,7 +226,7 @@ int ltdb_index_transaction_start(struct ldb_module *module)
a wrapper around ltdb_search_dn1() which translates pointer based index records
and maps them into normal ldb message structures
*/
-static int ltdb_search_dn1_wrap(struct ldb_module *module,
+static int ltdb_search_dn1_index(struct ldb_module *module,
struct ldb_dn *dn, struct ldb_message *msg)
{
int ret, i;
@@ -237,7 +237,7 @@ static int ltdb_search_dn1_wrap(struct ldb_module *module,
/* if this isn't a @INDEX record then don't munge it */
if (strncmp(ldb_dn_get_linearized(msg->dn), LTDB_INDEX ":", strlen(LTDB_INDEX) + 1) != 0) {
- return ret;
+ return LDB_ERR_OPERATIONS_ERROR;
}
for (i=0;i<msg->num_elements;i++) {
@@ -265,7 +265,7 @@ static int ltdb_idxptr_fix_dn(struct ldb_module *module, const char *strdn)
int ret;
dn = ldb_dn_new(msg, module->ldb, strdn);
- if (ltdb_search_dn1_wrap(module, dn, msg) == LDB_SUCCESS) {
+ if (ltdb_search_dn1_index(module, dn, msg) == LDB_SUCCESS) {
ret = ltdb_store(module, msg, TDB_REPLACE);
}
talloc_free(msg);
@@ -535,7 +535,7 @@ static int ltdb_index_dn_simple(struct ldb_module *module,
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = ltdb_search_dn1_wrap(module, dn, msg);
+ ret = ltdb_search_dn1_index(module, dn, msg);
talloc_free(dn);
if (ret != LDB_SUCCESS) {
return ret;
@@ -881,7 +881,7 @@ static int ltdb_index_dn_one(struct ldb_module *module,
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = ltdb_search_dn1_wrap(module, key, msg);
+ ret = ltdb_search_dn1_index(module, key, msg);
talloc_free(key);
if (ret != LDB_SUCCESS) {
return ret;
@@ -1009,7 +1009,7 @@ static int ltdb_index_filter(const struct dn_list *dn_list,
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = ltdb_search_dn1_wrap(ac->module, dn, msg);
+ ret = ltdb_search_dn1(ac->module, dn, msg);
talloc_free(dn);
if (ret == LDB_ERR_NO_SUCH_OBJECT) {
/* the record has disappeared? yes, this can happen */
@@ -1217,7 +1217,7 @@ static int ltdb_index_add1(struct ldb_module *module, const char *dn,
}
talloc_steal(msg, dn_key);
- ret = ltdb_search_dn1_wrap(module, dn_key, msg);
+ ret = ltdb_search_dn1_index(module, dn_key, msg);
if (ret != LDB_SUCCESS && ret != LDB_ERR_NO_SUCH_OBJECT) {
talloc_free(msg);
return ret;
@@ -1329,7 +1329,7 @@ int ltdb_index_del_value(struct ldb_module *module, const char *dn,
return LDB_ERR_OPERATIONS_ERROR;
}
- ret = ltdb_search_dn1_wrap(module, dn_key, msg);
+ ret = ltdb_search_dn1_index(module, dn_key, msg);
if (ret != LDB_SUCCESS && ret != LDB_ERR_NO_SUCH_OBJECT) {
talloc_free(dn_key);
return ret;
diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 3749aec..f32a4fa 100644
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -93,7 +93,7 @@ int main(int argc, const char **argv)
options = ldb_cmdline_process(ldb, argc, argv, usage);
if (ldb_transaction_start(ldb) != 0) {
- printf("Failed to start transaction\n");
+ printf("Failed to start transaction: %s\n", ldb_errstring(ldb));
exit(1);
}
@@ -114,7 +114,7 @@ int main(int argc, const char **argv)
}
if (count != 0 && ldb_transaction_commit(ldb) != 0) {
- printf("Failed to commit transaction\n");
+ printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
exit(1);
}
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index b18aea1..1a684c5 100644
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -113,7 +113,7 @@ static int merge_edits(struct ldb_context *ldb,
int adds=0, modifies=0, deletes=0;
if (ldb_transaction_start(ldb) != 0) {
- fprintf(stderr, "Failed to start transaction\n");
+ fprintf(stderr, "Failed to start transaction: %s\n", ldb_errstring(ldb));
return -1;
}
@@ -156,7 +156,7 @@ static int merge_edits(struct ldb_context *ldb,
}
if (ldb_transaction_commit(ldb) != 0) {
- fprintf(stderr, "Failed to commit transaction\n");
+ fprintf(stderr, "Failed to commit transaction: %s\n", ldb_errstring(ldb));
return -1;
}
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 8b6309e..d73937c 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -91,13 +91,13 @@ int main(int argc, const char **argv)
ldb = ldb_init(NULL, NULL);
+ options = ldb_cmdline_process(ldb, argc, argv, usage);
+
if (ldb_transaction_start(ldb) != 0) {
- printf("Failed to start transaction\n");
+ printf("Failed to start transaction: %s\n", ldb_errstring(ldb));
exit(1);
}
- options = ldb_cmdline_process(ldb, argc, argv, usage);
-
if (options->argc == 0) {
ret = process_file(ldb, stdin, &count);
} else {
@@ -114,7 +114,7 @@ int main(int argc, const char **argv)
}
if (count != 0 && ldb_transaction_commit(ldb) != 0) {
- printf("Failed to commit transaction\n");
+ printf("Failed to commit transaction: %s\n", ldb_errstring(ldb));
exit(1);
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list