diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-12-14 17:17:55 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-12-14 17:17:55 +0100 |
| commit | 573441ff9b63fed9ab0b7eaf52df337ccd5592be (patch) | |
| tree | 77c354f48c04fd7d92aa02cd92125eca3d246eae /source3/librpc/gen_ndr/cli_netlogon.c | |
| parent | cd25b6245f8185e36a365dcf4c28e7df13090d3e (diff) | |
| parent | daeb3a190d16a5bc05be63b2b136ebe65d6f6cf7 (diff) | |
| download | samba-573441ff9b63fed9ab0b7eaf52df337ccd5592be.tar.gz samba-573441ff9b63fed9ab0b7eaf52df337ccd5592be.tar.bz2 samba-573441ff9b63fed9ab0b7eaf52df337ccd5592be.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/librpc/gen_ndr/cli_netlogon.c')
| -rw-r--r-- | source3/librpc/gen_ndr/cli_netlogon.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source3/librpc/gen_ndr/cli_netlogon.c b/source3/librpc/gen_ndr/cli_netlogon.c index a1bcb2cb38..1ce4e67c56 100644 --- a/source3/librpc/gen_ndr/cli_netlogon.c +++ b/source3/librpc/gen_ndr/cli_netlogon.c @@ -2306,8 +2306,7 @@ NTSTATUS rpccli_netr_ServerGetTrustInfo(struct rpc_pipe_client *cli, struct netr_Authenticator *return_authenticator /* [out] [ref] */, struct samr_Password *new_owf_password /* [out] [ref] */, struct samr_Password *old_owf_password /* [out] [ref] */, - struct netr_TrustInfo **trust_info /* [out] [ref] */, - WERROR *werror) + struct netr_TrustInfo **trust_info /* [out] [ref] */) { struct netr_ServerGetTrustInfo r; NTSTATUS status; @@ -2348,10 +2347,6 @@ NTSTATUS rpccli_netr_ServerGetTrustInfo(struct rpc_pipe_client *cli, *trust_info = *r.out.trust_info; /* Return result */ - if (werror) { - *werror = r.out.result; - } - - return werror_to_ntstatus(r.out.result); + return r.out.result; } |