summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/db/sysdb.c3
-rw-r--r--src/ldb_modules/memberof.c7
-rw-r--r--src/tests/stress-tests.c2
3 files changed, 4 insertions, 8 deletions
diff --git a/src/db/sysdb.c b/src/db/sysdb.c
index b7624af78..1409149cc 100644
--- a/src/db/sysdb.c
+++ b/src/db/sysdb.c
@@ -388,6 +388,9 @@ int sysdb_attrs_steal_string(struct sysdb_attrs *attrs,
int ret;
ret = sysdb_attrs_get_el(attrs, name, &el);
+ if (ret != EOK) {
+ return ret;
+ }
vals = talloc_realloc(attrs->a, el->values,
struct ldb_val, el->num_values+1);
diff --git a/src/ldb_modules/memberof.c b/src/ldb_modules/memberof.c
index 372aa544f..311e7e516 100644
--- a/src/ldb_modules/memberof.c
+++ b/src/ldb_modules/memberof.c
@@ -1727,16 +1727,9 @@ static int mbof_del_exop_search_callback(struct ldb_request *req,
static int mbof_del_execute_cont(struct mbof_del_operation *delop)
{
struct mbof_del_ancestors_ctx *anc_ctx;
- struct mbof_del_operation *parent;
- struct mbof_del_ctx *del_ctx;
- struct mbof_ctx *ctx;
struct mbof_dn_array *new_list;
int i;
- del_ctx = delop->del_ctx;
- parent = delop->parent;
- ctx = del_ctx->ctx;
-
anc_ctx = talloc_zero(delop, struct mbof_del_ancestors_ctx);
if (!anc_ctx) {
return LDB_ERR_OPERATIONS_ERROR;
diff --git a/src/tests/stress-tests.c b/src/tests/stress-tests.c
index 5075348e1..e34f910ad 100644
--- a/src/tests/stress-tests.c
+++ b/src/tests/stress-tests.c
@@ -59,7 +59,7 @@ int test_lookup_user(const char *name, int enoent_fail)
pwd = getpwnam(name);
error = errno;
if (pwd == NULL) {
- if (errno == 0 || errno == ENOENT) {
+ if (error == 0 || error == ENOENT) {
ret = (enoent_fail == 1) ? ENOENT : 0;
}
}