From 995205fc60f87e1a02aa1c6f309db55ae18e908a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 6 Sep 2006 18:32:20 +0000 Subject: r18188: merge 3.0-libndr branch (This used to be commit 1115745caed3093c25d6be01ffee21819fb0a675) --- source3/rpc_client/cli_netlogon.c | 2 +- source3/rpc_client/cli_reg.c | 2 +- source3/rpc_client/cli_unixinfo.c | 287 +++++++++++--------------------------- source3/rpc_client/cli_unixinfo.h | 9 ++ 4 files changed, 94 insertions(+), 206 deletions(-) create mode 100644 source3/rpc_client/cli_unixinfo.h (limited to 'source3/rpc_client') diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 33f1d1d25b..85e56465b4 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -638,7 +638,7 @@ NTSTATUS rpccli_netlogon_sam_sync(struct rpc_pipe_client *cli, TALLOC_CTX *mem_c /* Sam synchronisation */ NTSTATUS rpccli_netlogon_sam_deltas(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, - uint32 database_id, UINT64_S seqnum, + uint32 database_id, uint64 seqnum, uint32 *num_deltas, SAM_DELTA_HDR **hdr_deltas, SAM_DELTA_CTR **deltas) diff --git a/source3/rpc_client/cli_reg.c b/source3/rpc_client/cli_reg.c index 87ab5dc9da..e136df753a 100644 --- a/source3/rpc_client/cli_reg.c +++ b/source3/rpc_client/cli_reg.c @@ -521,7 +521,7 @@ WERROR rpccli_reg_enum_key(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, else fstrcpy( class_name, "" ); - *mod_time = nt_time_to_unix(out.time); + *mod_time = nt_time_to_unix(*out.time); return out.status; } diff --git a/source3/rpc_client/cli_unixinfo.c b/source3/rpc_client/cli_unixinfo.c index b9a960dfd1..f2629bfde2 100644 --- a/source3/rpc_client/cli_unixinfo.c +++ b/source3/rpc_client/cli_unixinfo.c @@ -1,226 +1,105 @@ -/* - Unix SMB/CIFS implementation. - - RPC pipe client - - Copyright (C) Volker Lendecke 2005 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* + * Unix SMB/CIFS implementation. + * client auto-generated by pidl. DO NOT MODIFY! + */ #include "includes.h" +#include "./cli_unixinfo.h" -NTSTATUS rpccli_unixinfo_uid2sid(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, uid_t uid, DOM_SID *sid) +NTSTATUS rpccli_unixinfo_SidToUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct dom_sid sid, uint64_t *uid) { - prs_struct qbuf, rbuf; - UNIXINFO_Q_UID_TO_SID q; - UNIXINFO_R_UID_TO_SID r; - NTSTATUS result = NT_STATUS_NET_WRITE_FAULT; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - { - UINT64_S uid64; - uid64.high = 0; - uid64.low = uid; - init_q_unixinfo_uid_to_sid(&q, uid64); + struct unixinfo_SidToUid r; + NTSTATUS status; + + /* In parameters */ + r.in.sid = sid; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, DCERPC_UNIXINFO_SIDTOUID, &r, (ndr_pull_flags_fn_t)ndr_pull_unixinfo_SidToUid, (ndr_push_flags_fn_t)ndr_push_unixinfo_SidToUid); + if (NT_STATUS_IS_ERR(status)) { + return status; } - - CLI_DO_RPC(cli, mem_ctx, PI_UNIXINFO, UNIXINFO_UID_TO_SID, - q, r, - qbuf, rbuf, - unixinfo_io_q_unixinfo_uid_to_sid, - unixinfo_io_r_unixinfo_uid_to_sid, - NT_STATUS_NET_WRITE_FAULT); - - if (NT_STATUS_IS_OK(r.status) && (sid != NULL)) { - sid_copy(sid, &r.sid); - } - - result = r.status; - return result; + + /* Return variables */ + *uid = *r.out.uid; + + /* Return result */ + return r.out.result; } -NTSTATUS rpccli_unixinfo_sid2uid(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const DOM_SID *sid, uid_t *uid) +NTSTATUS rpccli_unixinfo_UidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint64_t uid, struct dom_sid *sid) { - prs_struct qbuf, rbuf; - UNIXINFO_Q_SID_TO_UID q; - UNIXINFO_R_SID_TO_UID r; - NTSTATUS result = NT_STATUS_NET_WRITE_FAULT; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - init_q_unixinfo_sid_to_uid(&q, sid); - - CLI_DO_RPC(cli, mem_ctx, PI_UNIXINFO, UNIXINFO_SID_TO_UID, - q, r, - qbuf, rbuf, - unixinfo_io_q_unixinfo_sid_to_uid, - unixinfo_io_r_unixinfo_sid_to_uid, - NT_STATUS_NET_WRITE_FAULT); - - if (NT_STATUS_IS_OK(r.status)) { - if (r.uid.high != 0) { - /* 64-Bit uid's not yet handled */ - return NT_STATUS_INVALID_PARAMETER; - } - if (uid != NULL) { - *uid = r.uid.low; - } + struct unixinfo_UidToSid r; + NTSTATUS status; + + /* In parameters */ + r.in.uid = uid; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, DCERPC_UNIXINFO_UIDTOSID, &r, (ndr_pull_flags_fn_t)ndr_pull_unixinfo_UidToSid, (ndr_push_flags_fn_t)ndr_push_unixinfo_UidToSid); + if (NT_STATUS_IS_ERR(status)) { + return status; } - - result = r.status; - return result; + + /* Return variables */ + *sid = *r.out.sid; + + /* Return result */ + return r.out.result; } -NTSTATUS rpccli_unixinfo_gid2sid(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, gid_t gid, DOM_SID *sid) +NTSTATUS rpccli_unixinfo_SidToGid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct dom_sid sid, uint64_t *gid) { - prs_struct qbuf, rbuf; - UNIXINFO_Q_GID_TO_SID q; - UNIXINFO_R_GID_TO_SID r; - NTSTATUS result = NT_STATUS_NET_WRITE_FAULT; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - { - UINT64_S gid64; - gid64.high = 0; - gid64.low = gid; - init_q_unixinfo_gid_to_sid(&q, gid64); - } - - CLI_DO_RPC(cli, mem_ctx, PI_UNIXINFO, UNIXINFO_GID_TO_SID, - q, r, - qbuf, rbuf, - unixinfo_io_q_unixinfo_gid_to_sid, - unixinfo_io_r_unixinfo_gid_to_sid, - NT_STATUS_NET_WRITE_FAULT); - - if (NT_STATUS_IS_OK(r.status) && (sid != NULL)) { - sid_copy(sid, &r.sid); + struct unixinfo_SidToGid r; + NTSTATUS status; + + /* In parameters */ + r.in.sid = sid; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, DCERPC_UNIXINFO_SIDTOGID, &r, (ndr_pull_flags_fn_t)ndr_pull_unixinfo_SidToGid, (ndr_push_flags_fn_t)ndr_push_unixinfo_SidToGid); + if (NT_STATUS_IS_ERR(status)) { + return status; } - - result = r.status; - return result; + + /* Return variables */ + *gid = *r.out.gid; + + /* Return result */ + return r.out.result; } -NTSTATUS rpccli_unixinfo_sid2gid(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const DOM_SID *sid, gid_t *gid) +NTSTATUS rpccli_unixinfo_GidToSid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint64_t gid, struct dom_sid *sid) { - prs_struct qbuf, rbuf; - UNIXINFO_Q_SID_TO_GID q; - UNIXINFO_R_SID_TO_GID r; - NTSTATUS result = NT_STATUS_NET_WRITE_FAULT; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - init_q_unixinfo_sid_to_gid(&q, sid); - - CLI_DO_RPC(cli, mem_ctx, PI_UNIXINFO, UNIXINFO_SID_TO_GID, - q, r, - qbuf, rbuf, - unixinfo_io_q_unixinfo_sid_to_gid, - unixinfo_io_r_unixinfo_sid_to_gid, - NT_STATUS_NET_WRITE_FAULT); - - if (NT_STATUS_IS_OK(r.status)) { - if (r.gid.high != 0) { - /* 64-Bit gid's not yet handled */ - return NT_STATUS_INVALID_PARAMETER; - } - if (gid != NULL) { - *gid = r.gid.low; - } + struct unixinfo_GidToSid r; + NTSTATUS status; + + /* In parameters */ + r.in.gid = gid; + status = cli_do_rpc_ndr(cli, mem_ctx, PI_UNIXINFO, DCERPC_UNIXINFO_GIDTOSID, &r, (ndr_pull_flags_fn_t)ndr_pull_unixinfo_GidToSid, (ndr_push_flags_fn_t)ndr_push_unixinfo_GidToSid); + if (NT_STATUS_IS_ERR(status)) { + return status; } - - result = r.status; - return result; + + /* Return variables */ + *sid = *r.out.sid; + + /* Return result */ + return r.out.result; } -NTSTATUS rpccli_unixinfo_getpwuid(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - int count, uid_t *uids, - struct unixinfo_getpwuid **info) +NTSTATUS rpccli_unixinfo_GetPWUid(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, uint32_t *count, uint64_t *uids, struct unixinfo_GetPWUidInfo *infos) { - prs_struct qbuf, rbuf; - UNIXINFO_Q_GETPWUID q; - UNIXINFO_R_GETPWUID r; - NTSTATUS result = NT_STATUS_NET_WRITE_FAULT; - int i; - UINT64_S *uids64; - - ZERO_STRUCT(q); - ZERO_STRUCT(r); - - /* Marshall data and send request */ - - uids64 = TALLOC_ARRAY(mem_ctx, UINT64_S, count); - if (uids64 == NULL) { - return NT_STATUS_NO_MEMORY; - } - - for (i=0; i