diff options
| author | Günther Deschner <gd@samba.org> | 2011-02-12 02:23:57 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-02-14 11:47:19 +0100 |
| commit | 9d9659896bd8d765a77b967d3c98806acc327bde (patch) | |
| tree | 72fc73c80e740337afced4959d513c6c7247b7ef | |
| parent | e9f552925d0c007379d81af6ea9b0973011aed80 (diff) | |
| download | samba-9d9659896bd8d765a77b967d3c98806acc327bde.tar.gz samba-9d9659896bd8d765a77b967d3c98806acc327bde.tar.bz2 samba-9d9659896bd8d765a77b967d3c98806acc327bde.zip | |
s3-librpc: remove duplicate prototypes.
Guenther
| -rw-r--r-- | source3/include/proto.h | 18 | ||||
| -rw-r--r-- | source3/librpc/rpc/dcerpc.h | 15 |
2 files changed, 14 insertions, 19 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h index a4e8ad58f7..08787487fb 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2597,24 +2597,6 @@ NTSTATUS check_negative_conn_cache( const char *domain, const char *server); void add_failed_connection_entry(const char *domain, const char *server, NTSTATUS result) ; void flush_negative_conn_cache_for_domain(const char *domain); -/* The following definitions come from ../librpc/rpc/dcerpc_error.c */ - -const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code); -NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code); - -/* The following definitions come from ../librpc/rpc/dcerpc_util.c */ - -void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v); -uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob); -void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v); -uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob); -NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, - TALLOC_CTX *mem_ctx, - DATA_BLOB *pkt_trailer, - struct dcerpc_auth *auth, - uint32_t *auth_length, - bool auth_data_only); - /* The following definitions come from libsmb/dsgetdcname.c */ struct netr_DsRGetDCNameInfo; diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h index ea6aea72a2..4748f00e50 100644 --- a/source3/librpc/rpc/dcerpc.h +++ b/source3/librpc/rpc/dcerpc.h @@ -168,7 +168,8 @@ struct ndr_pull; struct tevent_context; struct tstream_context; -/* from ../librpc/rpc/dcerpc_util.c */ +/* The following definitions come from ../librpc/rpc/dcerpc_util.c */ + void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v); uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob); void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v); @@ -179,6 +180,18 @@ NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, struct ncacn_packet **pkt, DATA_BLOB *buffer); +uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob); +NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt, + TALLOC_CTX *mem_ctx, + DATA_BLOB *pkt_trailer, + struct dcerpc_auth *auth, + uint32_t *auth_length, + bool auth_data_only); + +/* The following definitions come from ../librpc/rpc/dcerpc_error.c */ + +const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code); +NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code); /* * This is just a hack this should never be used in code, |