diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-16 15:42:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:11 -0500 |
| commit | 62e11c4f1748d98f479110c8c0e656a8f65dca4d (patch) | |
| tree | 24dcb7a044c18fe88f7db18540a0062a3da00200 /source3/librpc/gen_ndr/cli_wkssvc.c | |
| parent | 58efeafa7d0e56766a06e75f473cebb420fe18c3 (diff) | |
| download | samba-62e11c4f1748d98f479110c8c0e656a8f65dca4d.tar.gz samba-62e11c4f1748d98f479110c8c0e656a8f65dca4d.tar.bz2 samba-62e11c4f1748d98f479110c8c0e656a8f65dca4d.zip | |
r20832: Remove extra pointers previously added to unique [out] pointers. Instead,
add [ref] pointers where necessary (top-level [ref] pointers,
by spec, don't appear on the wire).
This brings us closer to the DCE/RPC standard again.
(This used to be commit 580f2a7197b1bc9db14a643fdd112b40ef37aaef)
Diffstat (limited to 'source3/librpc/gen_ndr/cli_wkssvc.c')
| -rw-r--r-- | source3/librpc/gen_ndr/cli_wkssvc.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/source3/librpc/gen_ndr/cli_wkssvc.c b/source3/librpc/gen_ndr/cli_wkssvc.c index 04550efbe5..918851a15e 100644 --- a/source3/librpc/gen_ndr/cli_wkssvc.c +++ b/source3/librpc/gen_ndr/cli_wkssvc.c @@ -72,7 +72,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli, TALLOC_CTX * return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t level, union WKS_USER_ENUM_UNION *users, uint32_t prefmaxlen, uint32_t **entriesread, uint32_t **totalentries, uint32_t *resumehandle) +NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t level, union WKS_USER_ENUM_UNION *users, uint32_t prefmaxlen, uint32_t *entriesread, uint32_t *totalentries, uint32_t *resumehandle) { struct wkssvc_NetWkstaEnumUsers r; NTSTATUS status; @@ -102,8 +102,12 @@ NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli, TALLOC_CTX /* Return variables */ *users = *r.out.users; - *entriesread = r.out.entriesread; - *totalentries = r.out.totalentries; + if ( entriesread ) { + *entriesread = *r.out.entriesread; + } + if ( totalentries ) { + *totalentries = *r.out.totalentries; + } *resumehandle = *r.out.resumehandle; /* Return result */ @@ -168,7 +172,7 @@ NTSTATUS rpccli_WKSSVC_NETRWKSTAUSERSETINFO(struct rpc_pipe_client *cli, TALLOC_ return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t *level, union wkssvc_NetWkstaTransportCtr *ctr, uint32_t max_buffer, uint32_t **totalentries, uint32_t *resume_handle) +NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t *level, union wkssvc_NetWkstaTransportCtr *ctr, uint32_t max_buffer, uint32_t *totalentries, uint32_t *resume_handle) { struct wkssvc_NetWkstaTransportEnum r; NTSTATUS status; @@ -199,7 +203,9 @@ NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli, TALLOC /* Return variables */ *level = *r.out.level; *ctr = *r.out.ctr; - *totalentries = r.out.totalentries; + if ( totalentries ) { + *totalentries = *r.out.totalentries; + } *resume_handle = *r.out.resume_handle; /* Return result */ |