summaryrefslogtreecommitdiff
path: root/source3/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-14 17:17:55 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-14 17:17:55 +0100
commit573441ff9b63fed9ab0b7eaf52df337ccd5592be (patch)
tree77c354f48c04fd7d92aa02cd92125eca3d246eae /source3/librpc
parentcd25b6245f8185e36a365dcf4c28e7df13090d3e (diff)
parentdaeb3a190d16a5bc05be63b2b136ebe65d6f6cf7 (diff)
downloadsamba-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')
-rw-r--r--source3/librpc/gen_ndr/cli_netlogon.c9
-rw-r--r--source3/librpc/gen_ndr/cli_netlogon.h3
-rw-r--r--source3/librpc/gen_ndr/ndr_netlogon.c6
-rw-r--r--source3/librpc/gen_ndr/netlogon.h2
-rw-r--r--source3/librpc/gen_ndr/srv_netlogon.h2
-rw-r--r--source3/librpc/rpc/dcerpc.c6
6 files changed, 14 insertions, 14 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;
}
diff --git a/source3/librpc/gen_ndr/cli_netlogon.h b/source3/librpc/gen_ndr/cli_netlogon.h
index 7a2d43b3c1..3fbc00e9da 100644
--- a/source3/librpc/gen_ndr/cli_netlogon.h
+++ b/source3/librpc/gen_ndr/cli_netlogon.h
@@ -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__ */
diff --git a/source3/librpc/gen_ndr/ndr_netlogon.c b/source3/librpc/gen_ndr/ndr_netlogon.c
index af8228cd5a..81f8ddcab9 100644
--- a/source3/librpc/gen_ndr/ndr_netlogon.c
+++ b/source3/librpc/gen_ndr/ndr_netlogon.c
@@ -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--;
diff --git a/source3/librpc/gen_ndr/netlogon.h b/source3/librpc/gen_ndr/netlogon.h
index 02a4a447e0..7fb253446a 100644
--- a/source3/librpc/gen_ndr/netlogon.h
+++ b/source3/librpc/gen_ndr/netlogon.h
@@ -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;
};
diff --git a/source3/librpc/gen_ndr/srv_netlogon.h b/source3/librpc/gen_ndr/srv_netlogon.h
index 3bbe4d02fa..cd68d12f1e 100644
--- a/source3/librpc/gen_ndr/srv_netlogon.h
+++ b/source3/librpc/gen_ndr/srv_netlogon.h
@@ -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__ */
diff --git a/source3/librpc/rpc/dcerpc.c b/source3/librpc/rpc/dcerpc.c
index 77bb7b33a2..69bfc6f329 100644
--- a/source3/librpc/rpc/dcerpc.c
+++ b/source3/librpc/rpc/dcerpc.c
@@ -117,6 +117,10 @@ NTSTATUS dcerpc_ndr_request_recv(struct rpc_request *req)
return NT_STATUS_OK;
}
+#if 0
+
+Completely unfinished and unused -- vl :-)
+
/**
* Connect to a DCE/RPC interface.
*
@@ -178,3 +182,5 @@ _PUBLIC_ NTSTATUS dcerpc_pipe_connect(TALLOC_CTX *parent_ctx, struct dcerpc_pipe
return nt_status;
}
+
+#endif