mirror of
https://github.com/samba-team/samba.git
synced 2025-01-11 05:18:09 +03:00
s3: re-run make samba3-idl.
Guenther
This commit is contained in:
parent
fb6803119c
commit
a1aef939cf
@ -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;
|
||||
}
|
||||
|
||||
|
@ -366,6 +366,5 @@ 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] */);
|
||||
#endif /* __CLI_NETLOGON__ */
|
||||
|
@ -15613,7 +15613,7 @@ static enum ndr_err_code ndr_push_netr_ServerGetTrustInfo(struct ndr_push *ndr,
|
||||
if (*r->out.trust_info) {
|
||||
NDR_CHECK(ndr_push_netr_TrustInfo(ndr, NDR_SCALARS|NDR_BUFFERS, *r->out.trust_info));
|
||||
}
|
||||
NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
|
||||
NDR_CHECK(ndr_push_NTSTATUS(ndr, NDR_SCALARS, r->out.result));
|
||||
}
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
@ -15721,7 +15721,7 @@ static enum ndr_err_code ndr_pull_netr_ServerGetTrustInfo(struct ndr_pull *ndr,
|
||||
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_trust_info_1, 0);
|
||||
}
|
||||
NDR_PULL_SET_MEM_CTX(ndr, _mem_save_trust_info_0, LIBNDR_FLAG_REF_ALLOC);
|
||||
NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
|
||||
NDR_CHECK(ndr_pull_NTSTATUS(ndr, NDR_SCALARS, &r->out.result));
|
||||
}
|
||||
return NDR_ERR_SUCCESS;
|
||||
}
|
||||
@ -15781,7 +15781,7 @@ _PUBLIC_ void ndr_print_netr_ServerGetTrustInfo(struct ndr_print *ndr, const cha
|
||||
}
|
||||
ndr->depth--;
|
||||
ndr->depth--;
|
||||
ndr_print_WERROR(ndr, "result", r->out.result);
|
||||
ndr_print_NTSTATUS(ndr, "result", r->out.result);
|
||||
ndr->depth--;
|
||||
}
|
||||
ndr->depth--;
|
||||
|
@ -1727,7 +1727,7 @@ struct netr_ServerGetTrustInfo {
|
||||
struct samr_Password *new_owf_password;/* [ref] */
|
||||
struct samr_Password *old_owf_password;/* [ref] */
|
||||
struct netr_TrustInfo **trust_info;/* [ref] */
|
||||
WERROR result;
|
||||
NTSTATUS result;
|
||||
} out;
|
||||
|
||||
};
|
||||
|
@ -47,7 +47,7 @@ NTSTATUS _netr_ServerTrustPasswordsGet(pipes_struct *p, struct netr_ServerTrustP
|
||||
WERROR _netr_DsRGetForestTrustInformation(pipes_struct *p, struct netr_DsRGetForestTrustInformation *r);
|
||||
WERROR _netr_GetForestTrustInformation(pipes_struct *p, struct netr_GetForestTrustInformation *r);
|
||||
NTSTATUS _netr_LogonSamLogonWithFlags(pipes_struct *p, struct netr_LogonSamLogonWithFlags *r);
|
||||
WERROR _netr_ServerGetTrustInfo(pipes_struct *p, struct netr_ServerGetTrustInfo *r);
|
||||
NTSTATUS _netr_ServerGetTrustInfo(pipes_struct *p, struct netr_ServerGetTrustInfo *r);
|
||||
void netlogon_get_pipe_fns(struct api_struct **fns, int *n_fns);
|
||||
NTSTATUS rpc_netlogon_init(void);
|
||||
#endif /* __SRV_NETLOGON__ */
|
||||
|
Loading…
Reference in New Issue
Block a user