Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15:09 -0800)
committerJeremy Allison <jra@samba.org>
Tue, 15 Jan 2008 23:09:35 +0000 (15:09 -0800)
source/groupdb/mapping_ldb.c
source/groupdb/mapping_tdb.c

index 05056eabd20e16faec7af5ce83a8ff34ab801010..454fe467a97a39a5336600e1fbdf9b70a49aa824 100644 (file)
@@ -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;
index 21a4f95383bc2f1fe7330ce86a2ee78b55cea96d..67e377c338c12b4e3e8f7fbc6101d38dff1b8893 100644 (file)
@@ -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,