diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-24 23:59:59 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-25 00:01:05 +0200 |
commit | b0a95ad2f68cfc87822420c22216d83c0abf0690 (patch) | |
tree | 8ac863eafe2c9bc1109404b975ad0f5be8b22154 /source4/lib/ldb/ldb_tdb/ldb_cache.c | |
parent | 31e10643c998e64c0ec432553ac9193d978e43f4 (diff) | |
download | samba-b0a95ad2f68cfc87822420c22216d83c0abf0690.tar.gz samba-b0a95ad2f68cfc87822420c22216d83c0abf0690.tar.bz2 samba-b0a95ad2f68cfc87822420c22216d83c0abf0690.zip |
Revert LDB return code patches from Matthias.
Diffstat (limited to 'source4/lib/ldb/ldb_tdb/ldb_cache.c')
-rw-r--r-- | source4/lib/ldb/ldb_tdb/ldb_cache.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/lib/ldb/ldb_tdb/ldb_cache.c b/source4/lib/ldb/ldb_tdb/ldb_cache.c index e502f1e642..2576e2c7bd 100644 --- a/source4/lib/ldb/ldb_tdb/ldb_cache.c +++ b/source4/lib/ldb/ldb_tdb/ldb_cache.c @@ -92,11 +92,11 @@ static int ltdb_attributes_flags(struct ldb_message_element *el, unsigned *v) } } if (ltdb_valid_attr_flags[j].name == NULL) { - return LDB_ERR_OPERATIONS_ERROR; + return -1; } } *v = value; - return LDB_SUCCESS; + return 0; } /* @@ -118,7 +118,7 @@ static int ltdb_attributes_load(struct ldb_module *module) goto failed; } if (r == LDB_ERR_NO_SUCH_OBJECT) { - return LDB_SUCCESS; + return 0; } /* mapping these flags onto ldap 'syntaxes' isn't strictly correct, but its close enough for now */ @@ -162,9 +162,9 @@ static int ltdb_attributes_load(struct ldb_module *module) } } - return LDB_SUCCESS; + return 0; failed: - return LDB_ERR_OPERATIONS_ERROR; + return -1; } @@ -258,7 +258,7 @@ int ltdb_cache_load(struct ldb_module *module) /* a very fast check to avoid extra database reads */ if (ltdb->cache != NULL && tdb_get_seqnum(ltdb->tdb) == ltdb->tdb_seqnum) { - return LDB_SUCCESS; + return 0; } if (ltdb->cache == NULL) { @@ -344,7 +344,7 @@ int ltdb_cache_load(struct ldb_module *module) goto failed; } - if (ltdb_attributes_load(module) != LDB_SUCCESS) { + if (ltdb_attributes_load(module) == -1) { goto failed; } @@ -353,14 +353,14 @@ done: talloc_free(baseinfo); talloc_free(baseinfo_dn); talloc_free(indexlist_dn); - return LDB_SUCCESS; + return 0; failed: talloc_free(options); talloc_free(baseinfo); talloc_free(baseinfo_dn); talloc_free(indexlist_dn); - return LDB_ERR_OPERATIONS_ERROR; + return -1; } @@ -449,10 +449,10 @@ int ltdb_check_at_attributes_values(const struct ldb_val *value) for (i = 0; ltdb_valid_attr_flags[i].name != NULL; i++) { if ((strcmp(ltdb_valid_attr_flags[i].name, (char *)value->data) == 0)) { - return LDB_SUCCESS; + return 0; } } - return LDB_ERR_OPERATIONS_ERROR; + return -1; } |