From: Volker Lendecke <vl@samba.org>
Date: Fri, 2 Nov 2018 19:58:59 +0000 (+0100)
Subject: passdb: Use dom_sid_str_buf
X-Git-Tag: tdb-1.3.17~820
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9060b26caca327c7dc1f3b69b28a7acfcf2f7d3d;p=thirdparty%2Fsamba.git

passdb: Use dom_sid_str_buf

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

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index b5b11767f27..6bb8c3269b2 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -732,7 +732,7 @@ static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *
 	bool found = False;
 	char *member_string;
 	char *key;
-	fstring sid_string;
+	struct dom_sid_buf sid_string;
 
 	if (dbwrap_transaction_start(db) != 0) {
 		DEBUG(0, ("transaction_start failed\n"));
@@ -763,9 +763,11 @@ static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *
 
 	num -= 1;
 
-	sid_to_fstring(sid_string, member);
-
-	key = talloc_asprintf(sids, "%s%s", MEMBEROF_PREFIX, sid_string);
+	key = talloc_asprintf(
+		sids,
+		"%s%s",
+		MEMBEROF_PREFIX,
+		dom_sid_str_buf(member, &sid_string));
 	if (key == NULL) {
 		TALLOC_FREE(sids);
 		status = NT_STATUS_NO_MEMORY;
@@ -786,10 +788,10 @@ static NTSTATUS del_aliasmem(const struct dom_sid *alias, const struct dom_sid *
 
 	for (i=0; i<num; i++) {
 
-		sid_to_fstring(sid_string, &sids[i]);
-
 		member_string = talloc_asprintf_append_buffer(
-			member_string, " %s", sid_string);
+			member_string,
+			" %s",
+			dom_sid_str_buf(&sids[i], &sid_string));
 
 		if (member_string == NULL) {
 			TALLOC_FREE(sids);