diff options
| author | Günther Deschner <gd@samba.org> | 2011-01-12 11:55:34 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2011-01-13 14:08:09 +0100 |
| commit | c9b3404c68b0b5b1f2f3008736d77c476cc0e398 (patch) | |
| tree | 657151a9c86c91bdd79eb2bcbaac99f83a4619ad /source3/winbindd/winbindd_ads.c | |
| parent | 232378c6e5b1db9facd3c74b7fa82ed9a3b4ef67 (diff) | |
| download | samba-c9b3404c68b0b5b1f2f3008736d77c476cc0e398.tar.gz samba-c9b3404c68b0b5b1f2f3008736d77c476cc0e398.tar.bz2 samba-c9b3404c68b0b5b1f2f3008736d77c476cc0e398.zip | |
s3-winbind: prefer dcerpc_netr_X functions.
Guenther
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/winbindd/winbindd_ads.c')
| -rw-r--r-- | source3/winbindd/winbindd_ads.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c index 6acdc0ba9e..a392305b55 100644 --- a/source3/winbindd/winbindd_ads.c +++ b/source3/winbindd/winbindd_ads.c @@ -23,7 +23,7 @@ #include "includes.h" #include "winbindd.h" -#include "../librpc/gen_ndr/cli_netlogon.h" +#include "../librpc/gen_ndr/ndr_netlogon_c.h" #include "../libds/common/flags.h" #include "ads.h" #include "secrets.h" @@ -1292,10 +1292,12 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, struct netr_DomainTrustList *trusts) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; + WERROR werr; int i; uint32 flags; struct rpc_pipe_client *cli; int ret_count; + struct dcerpc_binding_handle *b; DEBUG(3,("ads: trusted_domains\n")); @@ -1322,14 +1324,20 @@ static NTSTATUS trusted_domains(struct winbindd_domain *domain, return NT_STATUS_UNSUCCESSFUL; } - result = rpccli_netr_DsrEnumerateDomainTrusts(cli, mem_ctx, + b = cli->binding_handle; + + result = dcerpc_netr_DsrEnumerateDomainTrusts(b, mem_ctx, cli->desthost, flags, trusts, - NULL); + &werr); if (!NT_STATUS_IS_OK(result)) { return result; } + + if (!W_ERROR_IS_OK(werr)) { + return werror_to_ntstatus(werr); + } if (trusts->count == 0) { return NT_STATUS_OK; } |