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 abc044d54aca1a00296d9fce2f4aa46bc3c58f7c..b350bf0c565a7b45c5d64d5ab66884c0bb4dc4d7 100644 (file)
--- 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 291e32f79960729c25b176b3d638e2da0ea1eab0..7eb42afb305b56f28a1a730ad175b14f40ff8112 100644 (file)
--- 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 df90a87c7a2196f6789f29676d23a5791ff6ab96..1f154b679117bf9509ecb01af6a9575ae2d6b4a0 100644 (file)
--- 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 4a1b83fd34a2f1ff9dc6447c3bd54b6e791f85d5..d28b5fa9f0145b432ee3faad9fc7c0db72b76429 100644 (file)
--- 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;