diff options
| author | Matthias Dieter Wallnöfer <mdw@samba.org> | 2011-02-01 20:34:44 +0100 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mdw@samba.org> | 2011-02-09 18:59:19 +0100 |
| commit | 8d80225afb764e937e41e0d52586e1f038871734 (patch) | |
| tree | c0b5baaec572fe09490f9b04bb5ce011d6f8475d /source4/lib/ldb/tools/ldbedit.c | |
| parent | 5e06b21cc1553606efaeae03504e91d811793085 (diff) | |
| download | samba-8d80225afb764e937e41e0d52586e1f038871734.tar.gz samba-8d80225afb764e937e41e0d52586e1f038871734.tar.bz2 samba-8d80225afb764e937e41e0d52586e1f038871734.zip | |
ldb:tools - return LDB_ERR_OPERATIONS_ERROR on generic errors
Use "return" when located in "main" for consistency ("exit" would do the
same).
The patchset has been discussed with Jelmer Vernooij and afterwards LDB
maintainer Simo Sorce.
Diffstat (limited to 'source4/lib/ldb/tools/ldbedit.c')
| -rw-r--r-- | source4/lib/ldb/tools/ldbedit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index a046b17d5d..6509263a58 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -291,7 +291,7 @@ static void usage(struct ldb_context *ldb) { printf("Usage: ldbedit <options> <expression> <attributes ...>\n"); ldb_cmdline_help(ldb, "ldbedit", stdout); - exit(1); + exit(LDB_ERR_OPERATIONS_ERROR); } int main(int argc, const char **argv) @@ -328,20 +328,20 @@ int main(int argc, const char **argv) basedn = ldb_dn_new(ldb, ldb, options->basedn); if ( ! ldb_dn_validate(basedn)) { printf("Invalid Base DN format\n"); - exit(1); + return LDB_ERR_OPERATIONS_ERROR; } } req_ctrls = ldb_parse_control_strings(ldb, ldb, (const char **)options->controls); if (options->controls != NULL && req_ctrls== NULL) { printf("parsing controls failed: %s\n", ldb_errstring(ldb)); - return -1; + return LDB_ERR_OPERATIONS_ERROR; } ret = ldb_search_ctrl(ldb, ldb, &result, basedn, options->scope, attrs, req_ctrls, "%s", expression); if (ret != LDB_SUCCESS) { printf("search failed - %s\n", ldb_errstring(ldb)); - exit(1); + return ret; } if (result->count == 0) { |