From d7bc452a893a77eb21b547cd8cdf8b420c60ab5d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 17 Sep 2010 12:33:44 +1000 Subject: s3: Replace sid_binstring and sid_guidstring with PIDL-based alternatives MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reduces the manual marshalling of these structures by removing the duplication here. Andrew Bartlett Signed-off-by: Günther Deschner --- source3/winbindd/winbindd_ads.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source3/winbindd/winbindd_ads.c') diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 367d38ba15..fa498d63df 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -27,6 +27,7 @@ #include "../libds/common/flags.h" #include "ads.h" #include "secrets.h" +#include "../libcli/ldap/ldap_ndr.h" #ifdef HAVE_ADS @@ -542,7 +543,7 @@ static NTSTATUS query_user(struct winbindd_domain *domain, return NT_STATUS_SERVER_DISABLED; } - sidstr = sid_binstring(talloc_tos(), sid); + sidstr = ldap_encode_ndr_dom_sid(talloc_tos(), sid); ret = asprintf(&ldap_exp, "(objectSid=%s)", sidstr); TALLOC_FREE(sidstr); @@ -1044,7 +1045,7 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, goto done; } - if ((sidbinstr = sid_binstring(talloc_tos(), group_sid)) == NULL) { + if ((sidbinstr = ldap_encode_ndr_dom_sid(talloc_tos(), group_sid)) == NULL) { status = NT_STATUS_NO_MEMORY; goto done; } -- cgit