From: Volker Lendecke <vl@samba.org>
Date: Sat, 18 Sep 2021 06:51:59 +0000 (+0200)
Subject: lib: Simplify sid_linearize()
X-Git-Tag: ldb-2.5.0~633
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86cf8f462f0837f385001c0c1671c4e480ceb4bf;p=thirdparty%2Fsamba.git

lib: Simplify sid_linearize()

We have ndr_push_dom_sid() for this

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/lib/util_sid.c b/source3/lib/util_sid.c
index 806f860136b..602451068e2 100644
--- a/source3/lib/util_sid.c
+++ b/source3/lib/util_sid.c
@@ -46,18 +46,13 @@ char *sid_to_fstring(fstring sidstr_out, const struct dom_sid *sid)
 
 bool sid_linearize(uint8_t *outbuf, size_t len, const struct dom_sid *sid)
 {
-	int8_t i;
+	struct ndr_push ndr = {
+		.data = outbuf, .alloc_size = len, .fixed_buf_size = true,
+	};
+	enum ndr_err_code ndr_err;
 
-	if (len < ndr_size_dom_sid(sid, 0))
-		return False;
-
-	SCVAL(outbuf,0,sid->sid_rev_num);
-	SCVAL(outbuf,1,sid->num_auths);
-	memcpy(&outbuf[2], sid->id_auth, 6);
-	for(i = 0; i < sid->num_auths; i++)
-		SIVAL(outbuf, 8 + (i*4), sid->sub_auths[i]);
-
-	return True;
+	ndr_err = ndr_push_dom_sid(&ndr, NDR_SCALARS|NDR_BUFFERS, sid);
+	return NDR_ERR_CODE_IS_SUCCESS(ndr_err);
 }
 
 /*****************************************************************