From: Volker Lendecke <vl@samba.org>
Date: Thu, 6 Dec 2018 18:14:20 +0000 (+0100)
Subject: winbindd: Use dom_sid_str_buf
X-Git-Tag: tdb-1.3.17~475
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=166b40b2ef30aee075f609f7862f9e32f7243c80;p=thirdparty%2Fsamba.git

winbindd: Use dom_sid_str_buf

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

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index abc044d54ac..b350bf0c565 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -381,10 +381,10 @@ static NTSTATUS query_user_list(struct winbindd_domain *domain,
 		}
 
 		if (!dom_sid_in_domain(&domain->sid, &user_sid)) {
-			fstring sidstr, domstr;
+			struct dom_sid_buf sidstr, domstr;
 			DBG_WARNING("Got sid %s in domain %s\n",
-				    sid_to_fstring(sidstr, &user_sid),
-				    sid_to_fstring(domstr, &domain->sid));
+				    dom_sid_str_buf(&user_sid, &sidstr),
+				    dom_sid_str_buf(&domain->sid, &domstr));
 			continue;
 		}
 
diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c
index 291e32f7996..7eb42afb305 100644
--- a/source3/winbindd/winbindd_getsidaliases.c
+++ b/source3/winbindd/winbindd_getsidaliases.c
@@ -90,9 +90,8 @@ struct tevent_req *winbindd_getsidaliases_send(TALLOC_CTX *mem_ctx,
 	if (DEBUGLEVEL >= 10) {
 		size_t i;
 		for (i=0; i<num_sids; i++) {
-			fstring sidstr;
-			sid_to_fstring(sidstr, &sids[i]);
-			DEBUGADD(10, ("%s\n", sidstr));
+			struct dom_sid_buf sidstr;
+			DBG_DEBUG("%s\n", dom_sid_str_buf(&sids[i], &sidstr));
 		}
 	}
 
@@ -140,11 +139,11 @@ NTSTATUS winbindd_getsidaliases_recv(struct tevent_req *req,
 	}
 	for (i=0; i<state->num_aliases; i++) {
 		struct dom_sid sid;
-		fstring tmp;
+		struct dom_sid_buf tmp;
 		sid_compose(&sid, &state->sid, state->aliases[i]);
 
 		sidlist = talloc_asprintf_append_buffer(
-			sidlist, "%s\n", sid_to_fstring(tmp, &sid));
+			sidlist, "%s\n", dom_sid_str_buf(&sid, &tmp));
 		if (sidlist == NULL) {
 			return NT_STATUS_NO_MEMORY;
 		}
diff --git a/source3/winbindd/winbindd_getuserdomgroups.c b/source3/winbindd/winbindd_getuserdomgroups.c
index df90a87c7a2..1f154b67911 100644
--- a/source3/winbindd/winbindd_getuserdomgroups.c
+++ b/source3/winbindd/winbindd_getuserdomgroups.c
@@ -101,10 +101,10 @@ NTSTATUS winbindd_getuserdomgroups_recv(struct tevent_req *req,
 		return NT_STATUS_NO_MEMORY;
 	}
 	for (i=0; i<state->num_sids; i++) {
-		fstring tmp;
+		struct dom_sid_buf tmp;
 		sidlist = talloc_asprintf_append_buffer(
 			sidlist, "%s\n",
-			sid_to_fstring(tmp, &state->sids[i]));
+			dom_sid_str_buf(&state->sids[i], &tmp));
 		if (sidlist == NULL) {
 			return NT_STATUS_NO_MEMORY;
 		}
diff --git a/source3/winbindd/winbindd_lookupsids.c b/source3/winbindd/winbindd_lookupsids.c
index 4a1b83fd34a..d28b5fa9f01 100644
--- a/source3/winbindd/winbindd_lookupsids.c
+++ b/source3/winbindd/winbindd_lookupsids.c
@@ -106,12 +106,12 @@ NTSTATUS winbindd_lookupsids_recv(struct tevent_req *req,
 	}
 
 	for (i=0; i<state->domains->count; i++) {
-		fstring sid_str;
+		struct dom_sid_buf sid_str;
 
 		result = talloc_asprintf_append_buffer(
 			result, "%s %s\n",
-			sid_to_fstring(sid_str,
-				       state->domains->domains[i].sid),
+			dom_sid_str_buf(state->domains->domains[i].sid,
+					&sid_str),
 			state->domains->domains[i].name.string);
 		if (result == NULL) {
 			return NT_STATUS_NO_MEMORY;