s3-libsmb: put namequery headers to nmblib.h

We might find a better name for it and merge other namequery related things as
well here...

Guenther

2 files changed, 0 insertions, 49 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1d3e02f813..8180cadbfc 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -539,7 +539,6 @@ typedef char fstring[FSTRING_LEN];
 #include "locking.h"
 #include "smb_perfcount.h"
 #include "smb.h"
-#include "nameserv.h"
 #include "../lib/util/byteorder.h"
 
 #include "auth.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 0473ddf54e..12d5a93920 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2325,30 +2325,6 @@ bool get_dc_name(const char *domain,
 		fstring srv_name,
 		struct sockaddr_storage *ss_out);
 
-/* The following definitions come from libsmb/nmblib.c  */
-
-void debug_nmb_packet(struct packet_struct *p);
-void put_name(char *dest, const char *name, int pad, unsigned int name_type);
-char *nmb_namestr(const struct nmb_name *n);
-struct packet_struct *copy_packet(struct packet_struct *packet);
-void free_packet(struct packet_struct *packet);
-int packet_trn_id(struct packet_struct *p);
-struct packet_struct *parse_packet(char *buf,int length,
-				   enum packet_type packet_type,
-				   struct in_addr ip,
-				   int port);
-struct packet_struct *read_packet(int fd,enum packet_type packet_type);
-void make_nmb_name( struct nmb_name *n, const char *name, int type);
-bool nmb_name_equal(struct nmb_name *n1, struct nmb_name *n2);
-int build_packet(char *buf, size_t buflen, struct packet_struct *p);
-bool send_packet(struct packet_struct *p);
-bool match_mailslot_name(struct packet_struct *p, const char *mailslot_name);
-int matching_len_bits(unsigned char *p1, unsigned char *p2, size_t len);
-void sort_query_replies(char *data, int n, struct in_addr ip);
-char *name_mangle(TALLOC_CTX *mem_ctx, const char *In, char name_type);
-int name_extract(unsigned char *buf,size_t buf_len, unsigned int ofs, fstring name);
-int name_len(unsigned char *s1, size_t buf_len);
-
 /* The following definitions come from libsmb/nterr.c  */
 
 const char *nt_errstr(NTSTATUS nt_code);
@@ -2464,30 +2440,6 @@ bool enumerate_domain_trusts( TALLOC_CTX *mem_ctx, const char *domain,
 				     struct dom_sid **sids );
 NTSTATUS change_trust_account_password( const char *domain, const char *remote_machine);
 
-/* The following definitions come from libsmb/unexpected.c  */
-
-struct nb_packet_server;
-struct nb_packet_reader;
-
-NTSTATUS nb_packet_server_create(TALLOC_CTX *mem_ctx,
-				 struct tevent_context *ev,
-				 int max_clients,
-				 struct nb_packet_server **presult);
-void nb_packet_dispatch(struct nb_packet_server *server,
-			struct packet_struct *p);
-struct tevent_req *nb_packet_reader_send(TALLOC_CTX *mem_ctx,
-					 struct tevent_context *ev,
-					 enum packet_type type,
-					 int trn_id,
-					 const char *mailslot_name);
-NTSTATUS nb_packet_reader_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
-			       struct nb_packet_reader **preader);
-struct tevent_req *nb_packet_read_send(TALLOC_CTX *mem_ctx,
-				       struct tevent_context *ev,
-				       struct nb_packet_reader *reader);
-NTSTATUS nb_packet_read_recv(struct tevent_req *req,
-			     struct packet_struct **ppacket);
-
 /* The following definitions come from modules/vfs_default.c  */
 
 ssize_t vfswrap_llistxattr(struct vfs_handle_struct *handle, const char *path, char *list, size_t size);