summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-07-05 10:13:03 +0200
committerVolker Lendecke <vl@samba.org>2009-07-05 23:50:12 +0200
commit58fbf7420c184c95f8b9761a32392227848794cd (patch)
tree6499787827b5927e84c4417667320bc98cc52ba3 /source3/include
parentf8cfe19d85534d30f97a4992179633ca68bc838b (diff)
downloadsamba-58fbf7420c184c95f8b9761a32392227848794cd.tar.gz
samba-58fbf7420c184c95f8b9761a32392227848794cd.tar.bz2
samba-58fbf7420c184c95f8b9761a32392227848794cd.zip
Remove "typedef struct ndr_syntax_id RPC_IFACE;"
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/proto.h5
-rw-r--r--source3/include/rpc_dce.h9
2 files changed, 6 insertions, 8 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 73ecbfa2bd..40f0a1bbdc 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5693,7 +5693,8 @@ void init_rpc_hdr(RPC_HDR *hdr, enum RPC_PKT_TYPE pkt_type, uint8 flags,
uint32 call_id, int data_len, int auth_len);
bool smb_io_rpc_hdr(const char *desc, RPC_HDR *rpc, prs_struct *ps, int depth);
void init_rpc_context(RPC_CONTEXT *rpc_ctx, uint16 context_id,
- const RPC_IFACE *abstract, const RPC_IFACE *transfer);
+ const struct ndr_syntax_id *abstract,
+ const struct ndr_syntax_id *transfer);
void init_rpc_hdr_rb(RPC_HDR_RB *rpc,
uint16 max_tsize, uint16 max_rsize, uint32 assoc_gid,
RPC_CONTEXT *context);
@@ -5703,7 +5704,7 @@ void init_rpc_hdr_ba(RPC_HDR_BA *rpc,
uint16 max_tsize, uint16 max_rsize, uint32 assoc_gid,
const char *pipe_addr,
uint8 num_results, uint16 result, uint16 reason,
- RPC_IFACE *transfer);
+ struct ndr_syntax_id *transfer);
bool smb_io_rpc_hdr_ba(const char *desc, RPC_HDR_BA *rpc, prs_struct *ps, int depth);
void init_rpc_hdr_req(RPC_HDR_REQ *hdr, uint32 alloc_hint, uint16 opnum);
bool smb_io_rpc_hdr_req(const char *desc, RPC_HDR_REQ *rpc, prs_struct *ps, int depth);
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 8780169c75..50ca9800d1 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -101,9 +101,6 @@ enum schannel_direction {
/* #define MAX_PDU_FRAG_LEN 0x1630 this is what wnt sets */
#define RPC_MAX_PDU_FRAG_LEN 0x10b8 /* this is what w2k sets */
-/* RPC_IFACE */
-typedef struct ndr_syntax_id RPC_IFACE;
-
#define RPC_IFACE_LEN (UUID_SIZE + 4)
/* RPC_HDR - dce rpc header */
@@ -202,8 +199,8 @@ typedef struct rpc_auth_schannel_chk_info {
typedef struct rpc_context {
uint16 context_id; /* presentation context identifier. */
uint8 num_transfer_syntaxes; /* the number of syntaxes */
- RPC_IFACE abstract; /* num and vers. of interface client is using */
- RPC_IFACE *transfer; /* Array of transfer interfaces. */
+ struct ndr_syntax_id abstract; /* num and vers. of interface client is using */
+ struct ndr_syntax_id *transfer; /* Array of transfer interfaces. */
} RPC_CONTEXT;
/* RPC_BIND_REQ - ms req bind */
@@ -241,7 +238,7 @@ typedef struct rpc_hdr_ba_info {
RPC_ADDR_STR addr ; /* the secondary address string, as described earlier */
RPC_RESULTS res ; /* results and reasons */
- RPC_IFACE transfer; /* the transfer syntax from the request */
+ struct ndr_syntax_id transfer; /* the transfer syntax from the request */
} RPC_HDR_BA;
/* RPC_AUTH_VERIFIER */