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/dsdb/samdb/ldb_modules/proxy.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/dsdb/samdb/ldb_modules/proxy.c')
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/proxy.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/proxy.c b/source4/dsdb/samdb/ldb_modules/proxy.c index 7aa78e98a9..d0a315e45a 100644 --- a/source4/dsdb/samdb/ldb_modules/proxy.c +++ b/source4/dsdb/samdb/ldb_modules/proxy.c @@ -66,7 +66,7 @@ static int load_proxy_info(struct ldb_module *module) /* see if we have already loaded it */ if (proxy->upstream != NULL) { - return LDB_SUCCESS; + return 0; } dn = ldb_dn_new(proxy, module->ldb, "@PROXYINFO"); @@ -145,7 +145,7 @@ static int load_proxy_info(struct ldb_module *module) talloc_free(res); - return LDB_SUCCESS; + return 0; failed: talloc_free(res); @@ -153,7 +153,7 @@ failed: talloc_free(proxy->newdn); talloc_free(proxy->upstream); proxy->upstream = NULL; - return LDB_ERR_OPERATIONS_ERROR; + return -1; } @@ -259,7 +259,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re } if (load_proxy_info(module) != 0) { - return LDB_ERR_OPERATIONS_ERROR; + return -1; } /* see if the dn is within olddn */ @@ -269,7 +269,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re newreq = talloc(module, struct ldb_request); if (newreq == NULL) { - return LDB_ERR_OPERATIONS_ERROR; + return -1; } newreq->op.search.tree = proxy_convert_tree(module, req->op.search.tree); @@ -298,7 +298,7 @@ static int proxy_search_bytree(struct ldb_module *module, struct ldb_request *re if (ret != LDB_SUCCESS) { ldb_set_errstring(module->ldb, ldb_errstring(proxy->upstream)); talloc_free(newreq); - return LDB_ERR_OPERATIONS_ERROR; + return -1; } for (i = 0; i < newreq->op.search.res->count; i++) { |