summaryrefslogtreecommitdiff
path: root/source3/groupdb
diff options
context:
space:
mode:
authorGerald W. Carter <jerry@samba.org>2008-01-16 10:35:36 -0600
committerGerald W. Carter <jerry@samba.org>2008-01-16 10:35:36 -0600
commit1a6415fc77c708b87c8e2ce6e7828f486ffc87ac (patch)
treefe0dbff696381e5af80342dc7e633297617f3e9e /source3/groupdb
parent019c245ae15c7fdc414d41f64dad994337f26cf4 (diff)
parent6e94cbdc30afc3c9b5d2504aa8649fa9c87af7aa (diff)
downloadsamba-1a6415fc77c708b87c8e2ce6e7828f486ffc87ac.tar.gz
samba-1a6415fc77c708b87c8e2ce6e7828f486ffc87ac.tar.bz2
samba-1a6415fc77c708b87c8e2ce6e7828f486ffc87ac.zip
Merge branch 'v3-2-test-merge' into v3-2-stable
(This used to be commit 6993b6139419761c649f3ad54467a2c34f29382d)
Diffstat (limited to 'source3/groupdb')
-rw-r--r--source3/groupdb/mapping_ldb.c2
-rw-r--r--source3/groupdb/mapping_tdb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/source3/groupdb/mapping_ldb.c b/source3/groupdb/mapping_ldb.c
index 05056eabd2..454fe467a9 100644
--- a/source3/groupdb/mapping_ldb.c
+++ b/source3/groupdb/mapping_ldb.c
@@ -492,7 +492,7 @@ static NTSTATUS enum_aliasmem(const DOM_SID *alias, DOM_SID **sids, size_t *num)
NULL
};
int ret, i;
- NTSTATUS status;
+ NTSTATUS status = NT_STATUS_OK;
struct ldb_result *res=NULL;
struct ldb_dn *dn;
struct ldb_message_element *el;
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 21a4f95383..67e377c338 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -394,7 +394,7 @@ static NTSTATUS one_alias_membership(const DOM_SID *member,
char *string_sid;
TDB_DATA dbuf;
const char *p;
- NTSTATUS status;
+ NTSTATUS status = NT_STATUS_OK;
TALLOC_CTX *frame;
slprintf(key, sizeof(key), "%s%s", MEMBEROF_PREFIX,