summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-06-18 13:18:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:18:27 -0500
commitbf75ae41556a67739cd089a7e3182cf2a994448c (patch)
tree7782f538f0d6c83ccb037add1d907d4a0de2f5df
parente2bb0d0ba75265101cefd7325d705a7bf63ec585 (diff)
downloadsamba-bf75ae41556a67739cd089a7e3182cf2a994448c.tar.gz
samba-bf75ae41556a67739cd089a7e3182cf2a994448c.tar.bz2
samba-bf75ae41556a67739cd089a7e3182cf2a994448c.zip
r7726: - removed some unused variables
- handle ldb_errstring() calls on failed connect (This used to be commit 8698a20fcc6a04ccbe533afd742e7a5df94423ee)
-rw-r--r--source4/ldap_server/ldap_rootdse.c2
-rw-r--r--source4/lib/ldb/ldb_ildap/ldb_ildap.c9
-rw-r--r--source4/lib/ldb/tools/ldbmodify.c2
-rw-r--r--source4/lib/ldb/tools/ldbtest.c1
4 files changed, 10 insertions, 4 deletions
diff --git a/source4/ldap_server/ldap_rootdse.c b/source4/ldap_server/ldap_rootdse.c
index d4e11e429a..e5c74be78d 100644
--- a/source4/ldap_server/ldap_rootdse.c
+++ b/source4/ldap_server/ldap_rootdse.c
@@ -270,7 +270,7 @@ static NTSTATUS rootdse_Search(struct ldapsrv_partition *partition, struct ldaps
struct ldapsrv_reply *ent_r, *done_r;
struct ldb_context *ldb;
const char *errstr = NULL;
- int count, j, y;
+ int count, j;
const char **attrs = NULL;
if (r->scope != LDAP_SEARCH_SCOPE_BASE) {
diff --git a/source4/lib/ldb/ldb_ildap/ldb_ildap.c b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
index 3f63af482f..6560485be5 100644
--- a/source4/lib/ldb/ldb_ildap/ldb_ildap.c
+++ b/source4/lib/ldb/ldb_ildap/ldb_ildap.c
@@ -340,7 +340,11 @@ static int ildb_unlock(struct ldb_module *module, const char *lockname)
*/
static const char *ildb_errstring(struct ldb_module *module)
{
- struct ildb_private *ildb = module->private_data;
+ struct ildb_private *ildb = talloc_get_type(module->private_data,
+ struct ildb_private);
+ if (ildb == NULL) {
+ return "ildap not connected";
+ }
return ldap_errstr(ildb->ldap, ildb->last_rc);
}
@@ -427,6 +431,9 @@ int ildb_connect(struct ldb_context *ldb, const char *url,
return 0;
failed:
+ if (ldb->modules) {
+ ldb->modules->private_data = NULL;
+ }
talloc_free(ildb);
return -1;
}
diff --git a/source4/lib/ldb/tools/ldbmodify.c b/source4/lib/ldb/tools/ldbmodify.c
index 39725b195d..8fa0dcf0b6 100644
--- a/source4/lib/ldb/tools/ldbmodify.c
+++ b/source4/lib/ldb/tools/ldbmodify.c
@@ -93,7 +93,7 @@ static int process_file(struct ldb_context *ldb, FILE *f)
{
struct ldb_context *ldb;
int count=0;
- int i, ret;
+ int i;
struct ldb_cmdline *options;
ldb = ldb_init(NULL);
diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c
index 28ac7545a4..7c7164c785 100644
--- a/source4/lib/ldb/tools/ldbtest.c
+++ b/source4/lib/ldb/tools/ldbtest.c
@@ -353,7 +353,6 @@ static void usage(void)
{
TALLOC_CTX *mem_ctx = talloc_new(NULL);
struct ldb_context *ldb;
- int ret;
ldb = ldb_init(mem_ctx);