[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-927-g9028f9e
Jelmer Vernooij
jelmer at samba.org
Tue Apr 15 18:52:47 GMT 2008
The branch, v3-2-test has been updated
via 9028f9e065536594df901ae4aac900102f2d85f6 (commit)
via 7bea00dca1ee08ef731dfa73110ef9c190a29919 (commit)
from 6bb107b17d557c27d035ca518ab61296814a3cea (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 9028f9e065536594df901ae4aac900102f2d85f6
Merge: 7bea00dca1ee08ef731dfa73110ef9c190a29919 6bb107b17d557c27d035ca518ab61296814a3cea
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Apr 15 20:52:17 2008 +0200
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into 3-2-nopipeindex
commit 7bea00dca1ee08ef731dfa73110ef9c190a29919
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Tue Apr 15 20:26:52 2008 +0200
Reconcile ndr_syntax_id used by pidl-generated code and Samba3's RFC_IFACE.
-----------------------------------------------------------------------
Summary of changes:
source/include/rpc_dce.h | 5 +----
source/rpc_client/cli_pipe.c | 2 +-
source/rpc_parse/parse_rpc.c | 2 +-
source/rpc_server/srv_pipe.c | 4 ++--
4 files changed, 5 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_dce.h b/source/include/rpc_dce.h
index 33ab365..2793421 100644
--- a/source/include/rpc_dce.h
+++ b/source/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/source/rpc_client/cli_pipe.c b/source/rpc_client/cli_pipe.c
index 71422cd..ba59a41 100644
--- a/source/rpc_client/cli_pipe.c
+++ b/source/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/source/rpc_parse/parse_rpc.c b/source/rpc_parse/parse_rpc.c
index b696080..268bee7 100644
--- a/source/rpc_parse/parse_rpc.c
+++ b/source/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/source/rpc_server/srv_pipe.c b/source/rpc_server/srv_pipe.c
index 4ac9f7a..3fe9c7f 100644
--- a/source/rpc_server/srv_pipe.c
+++ b/source/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;
--
Samba Shared Repository
More information about the samba-cvs
mailing list