dcerpc: remove ncacn_packet_header and related functions

ncacn_packet_header was an artifact and it is not necessary anymore

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/librpc/idl/dcerpc.idl b/librpc/idl/dcerpc.idl
index 68def36c5fc0252a1347f90b906cafaa05036108..d98d7bd76f9350edf77c0f42eaf1079a4039c528 100644 (file)
--- a/librpc/idl/dcerpc.idl
+++ b/librpc/idl/dcerpc.idl
@@ -317,18 +317,6 @@ interface dcerpc
        /* little-endian flag */
        const uint8 DCERPC_DREP_LE  = 0x10;
 
-       /* header only version of ncacn_packet */
-       typedef [public] struct {
-               uint8 rpc_vers;         /* RPC version */
-               uint8 rpc_vers_minor;   /* Minor version */
-               dcerpc_pkt_type ptype;  /* Packet type */
-               uint8 pfc_flags;        /* Fragmentation flags */
-               uint8 drep[4];          /* NDR data representation */
-               uint16 frag_length;     /* Total length of fragment */
-               uint16 auth_length;     /* authenticator length */
-               uint32 call_id;         /* Call identifier */
-       } ncacn_packet_header;
-
        typedef [public] struct {
                uint8 rpc_vers;         /* RPC version */
                uint8 rpc_vers_minor;   /* Minor version */

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 08c702085314f5b0f99c5b65bad1685dfbf6e286..04136a9a0d28c52c6f8230d2c8fadf01845b9449 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4859,19 +4859,9 @@ NTSTATUS dcerpc_push_ncacn_packet(TALLOC_CTX *mem_ctx,
                                  uint32_t call_id,
                                  union dcerpc_payload *u,
                                  DATA_BLOB *blob);
-NTSTATUS dcerpc_push_ncacn_packet_header(TALLOC_CTX *mem_ctx,
-                                        enum dcerpc_pkt_type ptype,
-                                        uint8_t pfc_flags,
-                                        uint16_t frag_length,
-                                        uint16_t auth_length,
-                                        uint32_t call_id,
-                                        DATA_BLOB *blob);
 NTSTATUS dcerpc_pull_ncacn_packet(TALLOC_CTX *mem_ctx,
                                  const DATA_BLOB *blob,
                                  struct ncacn_packet *r);
-NTSTATUS dcerpc_pull_ncacn_packet_header(TALLOC_CTX *mem_ctx,
-                                        const DATA_BLOB *blob,
-                                        struct ncacn_packet_header *r);
 NTSTATUS dcerpc_push_dcerpc_auth(TALLOC_CTX *mem_ctx,
                                 enum dcerpc_AuthType auth_type,
                                 enum dcerpc_AuthLevel auth_level,

diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
index 364b1e8898da523170fa2bf4f1c68755dd3a2d37..81bc0b308e080ec62b6a57364283d48f6c05aa9c 100644 (file)
--- a/source3/rpc_client/cli_pipe.c
+++ b/source3/rpc_client/cli_pipe.c
@@ -338,42 +338,6 @@ NTSTATUS dcerpc_push_ncacn_packet(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-NTSTATUS dcerpc_push_ncacn_packet_header(TALLOC_CTX *mem_ctx,
-                                        enum dcerpc_pkt_type ptype,
-                                        uint8_t pfc_flags,
-                                        uint16_t frag_length,
-                                        uint16_t auth_length,
-                                        uint32_t call_id,
-                                        DATA_BLOB *blob)
-{
-       struct ncacn_packet_header r;
-       enum ndr_err_code ndr_err;
-
-       r.rpc_vers              = 5;
-       r.rpc_vers_minor        = 0;
-       r.ptype                 = ptype;
-       r.pfc_flags             = pfc_flags;
-       r.drep[0]               = DCERPC_DREP_LE;
-       r.drep[1]               = 0;
-       r.drep[2]               = 0;
-       r.drep[3]               = 0;
-       r.frag_length           = frag_length;
-       r.auth_length           = auth_length;
-       r.call_id               = call_id;
-
-       ndr_err = ndr_push_struct_blob(blob, mem_ctx, &r,
-               (ndr_push_flags_fn_t)ndr_push_ncacn_packet_header);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return ndr_map_error2ntstatus(ndr_err);
-       }
-
-       if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_DEBUG(ncacn_packet_header, &r);
-       }
-
-       return NT_STATUS_OK;
-}
-
 /*******************************************************************
 *******************************************************************/
 
@@ -396,28 +360,6 @@ NTSTATUS dcerpc_pull_ncacn_packet(TALLOC_CTX *mem_ctx,
        return NT_STATUS_OK;
 }
 
-/*******************************************************************
-*******************************************************************/
-
-NTSTATUS dcerpc_pull_ncacn_packet_header(TALLOC_CTX *mem_ctx,
-                                        const DATA_BLOB *blob,
-                                        struct ncacn_packet_header *r)
-{
-       enum ndr_err_code ndr_err;
-
-       ndr_err = ndr_pull_struct_blob(blob, mem_ctx, r,
-               (ndr_pull_flags_fn_t)ndr_pull_ncacn_packet_header);
-       if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
-               return ndr_map_error2ntstatus(ndr_err);
-       }
-
-       if (DEBUGLEVEL >= 10) {
-               NDR_PRINT_DEBUG(ncacn_packet_header, r);
-       }
-
-       return NT_STATUS_OK;
-}
-
 /*******************************************************************
  ********************************************************************/