From 4ae9aec17cc75685381fff86e1b90f99b4ae51c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Dieter=20Walln=C3=B6fer?= Date: Fri, 3 Dec 2010 09:19:42 +0100 Subject: [PATCH] s4:auth/sam.c - the check for the SAMDB needs to be on the top of the call Otherwise it's really useless. --- source4/auth/sam.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source4/auth/sam.c b/source4/auth/sam.c index bd9278036e4..675c37682db 100644 --- a/source4/auth/sam.c +++ b/source4/auth/sam.c @@ -314,6 +314,11 @@ NTSTATUS authsam_expand_nested_groups(struct ldb_context *sam_ctx, *num_res_sids = 0; } + if (!sam_ctx) { + DEBUG(0, ("No SAM available, cannot determine local groups\n")); + return NT_STATUS_INVALID_SYSTEM_SERVICE; + } + tmp_ctx = talloc_new(res_sids_ctx); dn = ldb_dn_from_ldb_val(tmp_ctx, sam_ctx, dn_val); @@ -339,12 +344,6 @@ NTSTATUS authsam_expand_nested_groups(struct ldb_context *sam_ctx, return status; } - if (!sam_ctx) { - DEBUG(0, ("No SAM available, cannot determine local groups\n")); - talloc_free(tmp_ctx); - return NT_STATUS_INVALID_SYSTEM_SERVICE; - } - if (only_childs) { ret = dsdb_search_dn(sam_ctx, tmp_ctx, &res, dn, attrs, DSDB_SEARCH_SHOW_EXTENDED_DN); -- 2.11.4.GIT