summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-15 20:26:52 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-15 20:26:52 +0200
commit28fd4f6fcb101fc0274c43611a59d22072fb7891 (patch)
tree80e13cb31e126191ec4e6b374178746145114d5d
parentc05c5dba8a3ae832df4d2b1c58761089147288f1 (diff)
downloadsamba-28fd4f6fcb101fc0274c43611a59d22072fb7891.tar.gz
samba-28fd4f6fcb101fc0274c43611a59d22072fb7891.tar.bz2
samba-28fd4f6fcb101fc0274c43611a59d22072fb7891.zip
Reconcile ndr_syntax_id used by pidl-generated code and Samba3's RFC_IFACE.
(This used to be commit 7bea00dca1ee08ef731dfa73110ef9c190a29919)
-rw-r--r--source3/include/rpc_dce.h5
-rw-r--r--source3/rpc_client/cli_pipe.c2
-rw-r--r--source3/rpc_parse/parse_rpc.c2
-rw-r--r--source3/rpc_server/srv_pipe.c4
4 files changed, 5 insertions, 8 deletions
diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 33ab365160..2793421734 100644
--- a/source3/include/rpc_dce.h
+++ b/source3/include/rpc_dce.h
@@ -157,10 +157,7 @@ enum schannel_direction {
#define RPC_MAX_PDU_FRAG_LEN 0x10b8 /* this is what w2k sets */
/* RPC_IFACE */
-typedef struct rpc_iface_info {
- struct GUID uuid; /* 16 bytes of rpc interface identification */
- uint32 version; /* the interface version number */
-} RPC_IFACE;
+typedef struct ndr_syntax_id RPC_IFACE;
#define RPC_IFACE_LEN (UUID_SIZE + 4)
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 71422cd9ad..ba59a41793 100644
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -1690,7 +1690,7 @@ static bool check_bind_response(RPC_HDR_BA *hdr_ba, const int pipe_idx, RPC_IFAC
#endif /* JERRY */
/* check the transfer syntax */
- if ((hdr_ba->transfer.version != transfer->version) ||
+ if ((hdr_ba->transfer.if_version != transfer->if_version) ||
(memcmp(&hdr_ba->transfer.uuid, &transfer->uuid, sizeof(transfer->uuid)) !=0)) {
DEBUG(2,("bind_rpc_pipe: transfer syntax differs\n"));
return False;
diff --git a/source3/rpc_parse/parse_rpc.c b/source3/rpc_parse/parse_rpc.c
index b696080aef..268bee7e51 100644
--- a/source3/rpc_parse/parse_rpc.c
+++ b/source3/rpc_parse/parse_rpc.c
@@ -326,7 +326,7 @@ static bool smb_io_rpc_iface(const char *desc, RPC_IFACE *ifc, prs_struct *ps, i
if (!smb_io_uuid( "uuid", &ifc->uuid, ps, depth))
return False;
- if(!prs_uint32 ("version", ps, depth, &ifc->version))
+ if(!prs_uint32 ("version", ps, depth, &ifc->if_version))
return False;
return True;
diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
index 4ac9f7a6f4..3fe9c7f2ec 100644
--- a/source3/rpc_server/srv_pipe.c
+++ b/source3/rpc_server/srv_pipe.c
@@ -986,9 +986,9 @@ bool check_bind_req(struct pipes_struct *p, RPC_IFACE* abstract,
for ( i=0; pipe_names[i].client_pipe; i++ ) {
DEBUGADD(10,("checking %s\n", pipe_names[i].client_pipe));
if ( strequal(pipe_names[i].client_pipe, pname)
- && (abstract->version == pipe_names[i].abstr_syntax.version)
+ && (abstract->if_version == pipe_names[i].abstr_syntax.if_version)
&& (memcmp(&abstract->uuid, &pipe_names[i].abstr_syntax.uuid, sizeof(struct GUID)) == 0)
- && (transfer->version == pipe_names[i].trans_syntax.version)
+ && (transfer->if_version == pipe_names[i].trans_syntax.if_version)
&& (memcmp(&transfer->uuid, &pipe_names[i].trans_syntax.uuid, sizeof(struct GUID)) == 0) ) {
struct api_struct *fns = NULL;
int n_fns = 0;