diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-23 13:48:01 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:28:26 -0500 |
commit | 128fe5324b803e0989273c7033ec0b5c8bd3dbae (patch) | |
tree | b7bde249d06cb815dd296e5710128b76d981e9c3 /source4/librpc | |
parent | 6166693a8c17639b60e046be3acdc38f4bea4aa6 (diff) | |
download | samba-128fe5324b803e0989273c7033ec0b5c8bd3dbae.tar.gz samba-128fe5324b803e0989273c7033ec0b5c8bd3dbae.tar.bz2 samba-128fe5324b803e0989273c7033ec0b5c8bd3dbae.zip |
r19856: Use sptr as basis for full ptr implementation. Will add checks for duplicates later.
(This used to be commit 006ab1d4a449c81680add57e0116a86b8317fbfb)
Diffstat (limited to 'source4/librpc')
-rw-r--r-- | source4/librpc/idl/epmapper.idl | 12 | ||||
-rw-r--r-- | source4/librpc/ndr/ndr_basic.c | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source4/librpc/idl/epmapper.idl b/source4/librpc/idl/epmapper.idl index 12b9e99c21..8920869c87 100644 --- a/source4/librpc/idl/epmapper.idl +++ b/source4/librpc/idl/epmapper.idl @@ -248,8 +248,8 @@ interface epmapper /* Function 0x02 */ error_status_t epm_Lookup( [in] uint32 inquiry_type, - [in,sptr] GUID *object, - [in,sptr] rpc_if_id_t *interface_id, + [in,ptr] GUID *object, + [in,ptr] rpc_if_id_t *interface_id, [in] uint32 vers_option, [in,out] policy_handle *entry_handle, [in] uint32 max_ents, @@ -266,8 +266,8 @@ interface epmapper } epm_twr_p_t; error_status_t epm_Map( - [in,sptr] GUID *object, - [in,sptr] epm_twr_t *map_tower, + [in,ptr] GUID *object, + [in,ptr] epm_twr_t *map_tower, [in,out] policy_handle *entry_handle, [in] uint32 max_towers, [out] uint32 *num_towers, @@ -292,8 +292,8 @@ interface epmapper /* Function 0x06 */ error_status_t epm_MgmtDelete( [in] uint32 object_speced, - [in,sptr] GUID *object, - [in,sptr] epm_twr_t *tower + [in,ptr] GUID *object, + [in,ptr] epm_twr_t *tower ); /**********************/ diff --git a/source4/librpc/ndr/ndr_basic.c b/source4/librpc/ndr/ndr_basic.c index ed79f354fa..b8f2a8115f 100644 --- a/source4/librpc/ndr/ndr_basic.c +++ b/source4/librpc/ndr/ndr_basic.c @@ -481,7 +481,7 @@ _PUBLIC_ NTSTATUS ndr_push_unique_ptr(struct ndr_push *ndr, const void *p) /* push a 'simple' full non-zero value if a pointer is non-NULL, otherwise 0 */ -_PUBLIC_ NTSTATUS ndr_push_sptr_ptr(struct ndr_push *ndr, const void *p) +_PUBLIC_ NTSTATUS ndr_push_full_ptr(struct ndr_push *ndr, const void *p) { uint32_t ptr = 0; if (p) { |