net: Use dom_sid_str_buf

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index a3b3727b484b4dd23e5d02a9da07cbae68baca87..6d5a10437928f14929c3e2cef16e9aa70e5245a3 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -6828,9 +6828,14 @@ static NTSTATUS vampire_trusted_domain(struct rpc_pipe_client *pipe_hnd,
        }
 
 #ifdef DEBUG_PASSWORD
-       DEBUG(100,("successfully vampired trusted domain [%s], sid: [%s], "
-                  "password: [%s]\n", trusted_dom_name,
-                  sid_string_dbg(&dom_sid), cleartextpwd));
+       {
+               struct dom_sid_buf buf;
+               DEBUG(100,("successfully vampired trusted domain [%s], "
+                          "sid: [%s], password: [%s]\n",
+                          trusted_dom_name,
+                          dom_sid_str_buf(&dom_sid, &buf),
+                          cleartextpwd));
+       }
 #endif
 
 done:

diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index be2b085d55b842333c5e8d713c7bb552dc3f8e46..e295d6ab9d62260980ac455b44a13a0a25c2d798 100644 (file)
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -68,6 +68,7 @@ static NTSTATUS rpc_vampire_ds_internals(struct net_context *c,
        struct dssync_context *ctx = NULL;
 
        if (!dom_sid_equal(domain_sid, get_global_sam_sid())) {
+               struct dom_sid_buf buf1, buf2;
                d_printf(_("Cannot import users from %s at this time, "
                           "as the current domain:\n\t%s: %s\nconflicts "
                           "with the remote domain\n\t%s: %s\n"
@@ -75,9 +76,9 @@ static NTSTATUS rpc_vampire_ds_internals(struct net_context *c,
                           "workgroup=%s\n\n in your smb.conf?\n"),
                         domain_name,
                         get_global_sam_name(),
-                        sid_string_dbg(get_global_sam_sid()),
+                        dom_sid_str_buf(get_global_sam_sid(), &buf1),
                         domain_name,
-                        sid_string_dbg(domain_sid),
+                        dom_sid_str_buf(domain_sid, &buf2),
                         domain_name);
                return NT_STATUS_UNSUCCESSFUL;
        }