From: Volker Lendecke <vl@samba.org>
Date: Sat, 8 Dec 2018 14:27:24 +0000 (+0100)
Subject: rpc_server3: Use dom_sid_str_buf
X-Git-Tag: tdb-1.3.17~381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0077bb05928a3ff0526043537abca5f9f36ef73;p=thirdparty%2Fsamba.git

rpc_server3: Use dom_sid_str_buf

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

diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index a3254a61667..f61efbb9fc8 100644
--- a/source3/rpc_server/lsa/srv_lsa_nt.c
+++ b/source3/rpc_server/lsa/srv_lsa_nt.c
@@ -1959,8 +1959,9 @@ NTSTATUS _lsa_DeleteTrustedDomain(struct pipes_struct *p,
 	}
 
 	if (td->netbios_name == NULL || *td->netbios_name == '\0') {
+		struct dom_sid_buf buf;
 		DEBUG(10, ("Missing netbios name for for trusted domain %s.\n",
-			   sid_string_tos(r->in.dom_sid)));
+			   dom_sid_str_buf(r->in.dom_sid, &buf)));
 		return NT_STATUS_UNSUCCESSFUL;
 	}
 
diff --git a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
index c2770a2ec6c..ab64423d0df 100644
--- a/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
+++ b/source3/rpc_server/mdssvc/srv_mdssvc_nt.c
@@ -25,6 +25,7 @@
 #include "rpc_server/mdssvc/srv_mdssvc_nt.h"
 #include "../librpc/gen_ndr/srv_mdssvc.h"
 #include "libcli/security/security_token.h"
+#include "libcli/security/dom_sid.h"
 #include "gen_ndr/auth.h"
 #include "mdssvc.h"
 
@@ -208,8 +209,9 @@ void _mdssvc_cmd(struct pipes_struct *p, struct mdssvc_cmd *r)
 	ok = security_token_is_sid(p->session_info->security_token,
 				   &mds_ctx->sid);
 	if (!ok) {
-		DEBUG(1,("%s: not the same sid: %s\n", __func__,
-			 sid_string_tos(&mds_ctx->sid)));
+		struct dom_sid_buf buf;
+		DBG_WARNING("not the same sid: %s\n",
+			    dom_sid_str_buf(&mds_ctx->sid, &buf));
 		p->fault_state = DCERPC_FAULT_ACCESS_DENIED;
 		return;
 	}