summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-10-09 08:25:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:21 -0500
commit85281ec52619180ebde44c6a48616292e341be3b (patch)
tree3d7e7b7c4f3026a5514af605ed7952f5613facf6
parent25e233db5768f3dd90a87c5986dedbd75c2e439d (diff)
downloadsamba-85281ec52619180ebde44c6a48616292e341be3b.tar.gz
samba-85281ec52619180ebde44c6a48616292e341be3b.tar.bz2
samba-85281ec52619180ebde44c6a48616292e341be3b.zip
r19191: merge from samba4:
fix checker warnings metze (This used to be commit 93a0fe093b4614a18e99d0c3a71c5c8af2e57e4f)
-rw-r--r--source3/lib/ldb/common/ldb_dn.c1
-rw-r--r--source3/lib/ldb/common/ldb_modules.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/lib/ldb/common/ldb_dn.c b/source3/lib/ldb/common/ldb_dn.c
index a63ff9c8e3..d035b0d3c2 100644
--- a/source3/lib/ldb/common/ldb_dn.c
+++ b/source3/lib/ldb/common/ldb_dn.c
@@ -598,6 +598,7 @@ struct ldb_dn *ldb_dn_casefold(struct ldb_context *ldb, void *mem_ctx, const str
struct ldb_dn_component dc;
const struct ldb_attrib_handler *h;
+ memset(&dc, 0, sizeof(dc));
dc.name = ldb_attr_casefold(cedn->components, edn->components[i].name);
if (!dc.name) {
talloc_free(cedn);
diff --git a/source3/lib/ldb/common/ldb_modules.c b/source3/lib/ldb/common/ldb_modules.c
index 2a6bc5abae..d627f3b9fa 100644
--- a/source3/lib/ldb/common/ldb_modules.c
+++ b/source3/lib/ldb/common/ldb_modules.c
@@ -324,7 +324,7 @@ int ldb_load_modules(struct ldb_context *ldb, const char *options[])
}
ret = ldb_search(ldb, mods_dn, LDB_SCOPE_BASE, "", attrs, &res);
- if (res) talloc_steal(mods_dn, res);
+ talloc_steal(mods_dn, res);
if (ret == LDB_SUCCESS && (res->count == 0 || res->msgs[0]->num_elements == 0)) {
ldb_debug(ldb, LDB_DEBUG_TRACE, "no modules required by the db\n");
} else {