ldb:tools - always check if ldb connection has been estabilished

Otherwise return "LDB_ERR_OPERATIONS_ERROR".

diff --git a/source4/lib/ldb/tools/ldbadd.c b/source4/lib/ldb/tools/ldbadd.c
index 464b14393c5606bba252bddb034a767a11ba84a8..184fba5dd7da58024e336ce6609ec90b7af74d90 100644 (file)
--- a/source4/lib/ldb/tools/ldbadd.c
+++ b/source4/lib/ldb/tools/ldbadd.c
@@ -106,6 +106,9 @@ int main(int argc, const char **argv)
        TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
        ldb = ldb_init(mem_ctx, NULL);
+       if (ldb == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 

diff --git a/source4/lib/ldb/tools/ldbdel.c b/source4/lib/ldb/tools/ldbdel.c
index 5c344c67c70e44821a759b3a923c39eea97dc36f..274a41c6e973e9afc92bedd47f302a2c9d781473 100644 (file)
--- a/source4/lib/ldb/tools/ldbdel.c
+++ b/source4/lib/ldb/tools/ldbdel.c
@@ -90,6 +90,9 @@ int main(int argc, const char **argv)
        TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
        ldb = ldb_init(mem_ctx, NULL);
+       if (ldb == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 

diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c
index 09c59cf6cda37a710deb234da35183788e915dc2..a046b17d5d6cead8b6d94de701965f0f46ead9db 100644 (file)
--- a/source4/lib/ldb/tools/ldbedit.c
+++ b/source4/lib/ldb/tools/ldbedit.c
@@ -306,6 +306,9 @@ int main(int argc, const char **argv)
        struct ldb_control **req_ctrls;
 
        ldb = ldb_init(mem_ctx, NULL);
+       if (ldb == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 

diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 15f8b2f3f1b1113baa08d3fbeb9ee83983beeb46..8d5e04b81c590845737c735976fa948ae561a3eb 100644 (file)
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -97,6 +97,9 @@ int main(int argc, const char **argv)
        TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
        ldb = ldb_init(mem_ctx, NULL);
+       if (ldb == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 

diff --git a/source4/lib/ldb/tools/ldbrename.c b/source4/lib/ldb/tools/ldbrename.c
index e4087f42b8a790f5a93bf4ab45d73e09af88c9ea..518358c9a3f9eb0dc5615c61d73548cb76e2effa 100644 (file)
--- a/source4/lib/ldb/tools/ldbrename.c
+++ b/source4/lib/ldb/tools/ldbrename.c
@@ -54,6 +54,9 @@ int main(int argc, const char **argv)
        TALLOC_CTX *mem_ctx = talloc_new(NULL);
 
        ldb = ldb_init(mem_ctx, NULL);
+       if (ldb == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);
 

diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c
index 10fab25a6abbf89b58f9d793d82580525ee11ad7..cd746749d0b1401ae413f9d12b5e2b4b27f1ba2b 100644 (file)
--- a/source4/lib/ldb/tools/ldbsearch.c
+++ b/source4/lib/ldb/tools/ldbsearch.c
@@ -277,7 +277,7 @@ int main(int argc, const char **argv)
 
        ldb = ldb_init(mem_ctx, NULL);
        if (ldb == NULL) {
-               return -1;
+               return LDB_ERR_OPERATIONS_ERROR;
        }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);

diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index f8035630b965e62c18083ffc885447cfe9fe1f7c..45d16bad4a5e89be6a18594de3fdfdd8bd78aaef 100644 (file)
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -405,6 +405,9 @@ int main(int argc, const char **argv)
        struct ldb_context *ldb;
 
        ldb = ldb_init(mem_ctx, NULL);
+       if (ldb == NULL) {
+               return LDB_ERR_OPERATIONS_ERROR;
+       }
 
        options = ldb_cmdline_process(ldb, argc, argv, usage);