diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-10-25 23:14:56 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-10-25 23:14:56 +1100 |
| commit | 98a3725252aabeece2b31f87e1c6cfc543fc716d (patch) | |
| tree | 2365b53965e23fff5f703be80329799eec3b630a /source4/lib/ldb/ldb_tdb | |
| parent | 12c9af78179b71721e30b03ae9fc0edd7cda940b (diff) | |
| parent | 1ea460b0b0dc4ee8a14c764e81f368d4f7e9ff45 (diff) | |
| download | samba-98a3725252aabeece2b31f87e1c6cfc543fc716d.tar.gz samba-98a3725252aabeece2b31f87e1c6cfc543fc716d.tar.bz2 samba-98a3725252aabeece2b31f87e1c6cfc543fc716d.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4/lib/ldb/ldb_tdb')
| -rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_tdb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.c b/source4/lib/ldb/ldb_tdb/ldb_tdb.c index d6175863da..f1364d5875 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_tdb.c +++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.c @@ -1319,7 +1319,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, if (strncmp(url, "tdb://", 6) != 0) { ldb_debug(ldb, LDB_DEBUG_ERROR, "Invalid tdb URL '%s'", url); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } path = url+6; } else { @@ -1347,7 +1347,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, ltdb = talloc_zero(ldb, struct ltdb_private); if (!ltdb) { ldb_oom(ldb); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } /* note that we use quite a large default hash size */ @@ -1358,7 +1358,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, ldb_debug(ldb, LDB_DEBUG_ERROR, "Unable to open tdb '%s'", path); talloc_free(ltdb); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } ltdb->sequence_number = 0; @@ -1366,7 +1366,7 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, module = ldb_module_new(ldb, ldb, "ldb_tdb backend", <db_ops); if (!module) { talloc_free(ltdb); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } ldb_module_set_private(module, ltdb); talloc_steal(module, ltdb); @@ -1374,11 +1374,11 @@ static int ltdb_connect(struct ldb_context *ldb, const char *url, if (ltdb_cache_load(module) != 0) { talloc_free(module); talloc_free(ltdb); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } *_module = module; - return 0; + return LDB_SUCCESS; } const struct ldb_backend_ops ldb_tdb_backend_ops = { |