Reconcile ndr_syntax_id used by pidl-generated code and Samba3's RFC_IFACE.

(This used to be commit 7bea00dca1ee08ef731dfa73110ef9c190a29919)

diff --git a/source3/include/rpc_dce.h b/source3/include/rpc_dce.h
index 33ab365160430eafccfa732c18c8e7abb1cc4aa8..2793421734cd7fecfc9c71850a1d808bc8f2df51 100644 (file)
--- 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 71422cd9adbfd31df244fb0883e58add901220a6..ba59a41793b971c3d6bcac69ef61f216970b3691 100644 (file)
--- 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 b696080aefd005a78d2da71b34a7530b7ca876a3..268bee7e516b3a921a714634ed84ec292b71bd95 100644 (file)
--- 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 4ac9f7a6f4362ac9d23319170818b4e4b90c6f9f..3fe9c7f2ec27a8cc57185d123c63d358bfbdcf13 100644 (file)
--- 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;