From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 4 Nov 2008 04:48:10 +0000 (+1100)
Subject: Use ldb_dn_from_ldb_val() to create a DN in the SAMR server
X-Git-Tag: samba-4.0.0alpha6~509
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=31158c02568c28507a8a405328c457d144ac6829;p=thirdparty%2Fsamba.git

Use ldb_dn_from_ldb_val() to create a DN in the SAMR server

The previous code incorrectly cast an ldb_val into a char *.

Andrew Bartlett
---

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index fc2d623160d..b3118d772dc 100644
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -2824,8 +2824,13 @@ static NTSTATUS dcesrv_samr_GetMembersInAlias(struct dcesrv_call_state *dce_call
 	ret = gendb_search_dn(d_state->sam_ctx, mem_ctx,
 			      a_state->account_dn, &msgs, attrs);
 
-	if (ret != 1)
+	if (ret == -1) {
 		return NT_STATUS_INTERNAL_DB_CORRUPTION;
+	} else if (ret == 0) {
+		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+	} else if (ret != 1) {
+		return NT_STATUS_INTERNAL_DB_CORRUPTION;
+	}
 
 	r->out.sids->num_sids = 0;
 	r->out.sids->sids = NULL;
@@ -2845,7 +2850,7 @@ static NTSTATUS dcesrv_samr_GetMembersInAlias(struct dcesrv_call_state *dce_call
 			struct ldb_message **msgs2;
 			const char * const attrs2[2] = { "objectSid", NULL };
 			ret = gendb_search_dn(a_state->sam_ctx, mem_ctx,
-					      ldb_dn_new(mem_ctx, a_state->sam_ctx, &el->values[i]),
+					      ldb_dn_from_ldb_val(mem_ctx, a_state->sam_ctx, &el->values[i]),
 					      &msgs2, attrs2);
 			if (ret != 1)
 				return NT_STATUS_INTERNAL_DB_CORRUPTION;