summaryrefslogtreecommitdiffstats
path: root/src/confdb
diff options
context:
space:
mode:
authorJan Zeleny <jzeleny@redhat.com>2010-09-02 14:35:58 +0200
committerStephen Gallagher <sgallagh@redhat.com>2010-09-08 09:36:22 -0400
commit4f6a396fcf16f97b2abc3d0cba10e9aa9bc38619 (patch)
treeb75a38b0012a84fc89419095c0ab2d392a2ed490 /src/confdb
parent039d997b19cffa2f5428bb3d85669ebc5888307a (diff)
Dead assignments cleanup in various places in SSSD
Three assignments deleted, two return code inspection added. Also found and fixed one critical bug caused by dead assignment. Ticket: #590
Diffstat (limited to 'src/confdb')
-rw-r--r--src/confdb/confdb.c1
-rw-r--r--src/confdb/confdb_setup.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/src/confdb/confdb.c b/src/confdb/confdb.c
index 877b80ac..eebc2cd3 100644
--- a/src/confdb/confdb.c
+++ b/src/confdb/confdb.c
@@ -862,7 +862,6 @@ int confdb_get_domains(struct confdb_ctx *cdb,
if (ret) {
DEBUG(0, ("Error (%d [%s]) retrieving domain [%s], skipping!\n",
ret, strerror(ret), domlist[i]));
- ret = EOK;
continue;
}
diff --git a/src/confdb/confdb_setup.c b/src/confdb/confdb_setup.c
index b2ac7e16..f98a6977 100644
--- a/src/confdb/confdb_setup.c
+++ b/src/confdb/confdb_setup.c
@@ -133,7 +133,6 @@ static int confdb_create_ldif(TALLOC_CTX *mem_ctx,
int ret, i, j;
char *ldif;
char *tmp_ldif;
- char *writer;
char **sections;
int section_count;
char *dn;
@@ -159,7 +158,6 @@ static int confdb_create_ldif(TALLOC_CTX *mem_ctx,
}
memcpy(ldif, CONFDB_INTERNAL_LDIF, ldif_len);
- writer = ldif+ldif_len;
/* Read in the collection and convert it to an LDIF */
/* Get the list of sections */
@@ -273,7 +271,7 @@ error:
int confdb_init_db(const char *config_file, struct confdb_ctx *cdb)
{
- int ret, i;
+ int ret;
int fd = -1;
struct collection_item *sssd_config = NULL;
struct collection_item *error_list = NULL;
@@ -397,7 +395,6 @@ int confdb_init_db(const char *config_file, struct confdb_ctx *cdb)
DEBUG(7, ("LDIF file to import: \n%s", config_ldif));
- i=0;
while ((ldif = ldb_ldif_read_string(cdb->ldb, (const char **)&config_ldif))) {
ret = ldb_add(cdb->ldb, ldif->msg);
if (ret != LDB_SUCCESS) {