13523 libsmbns: symbol 'smb_node_type' is multiply-defined

Reviewed by: Andy Fiddaman <andy@omniosce.org>
Reviewed by: Yuri Pankov <yuripv@yuripv.dev>
Approved by: Gordon Ross <gordon.w.ross@gmail.com>

2 files changed, 49 insertions, 48 deletions

diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.h b/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.h
index 9ab53e1ac0..efd5573e9b 100644
--- a/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.h
+++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios.h
@@ -89,7 +89,7 @@ typedef struct {
 	char		*nbs_last_event;
 } netbios_service_t;
 
-char smb_node_type;
+extern char smb_node_type;
 
 #define	SMB_NODETYPE_B	'B'
 #define	SMB_NODETYPE_P	'P'
@@ -103,15 +103,15 @@ char smb_node_type;
 #define	ADDR_FLAG_VALID		0x0001
 
 typedef struct addr_entry {
-	struct addr_entry 	*forw;
-	struct addr_entry 	*back;
+	struct addr_entry	*forw;
+	struct addr_entry	*back;
 	uint32_t		attributes;
 	uint32_t		conflict_timer;
 	uint32_t		refresh_ttl;
 	uint32_t		ttl;
 	struct sockaddr_in	sin;
 	int			sinlen;
-	uint32_t 		flags;
+	uint32_t		flags;
 } addr_entry_t;
 
 /*
@@ -170,8 +170,8 @@ typedef struct addr_entry {
  */
 
 typedef struct name_entry {
-	struct name_entry 	*forw;
-	struct name_entry 	*back;
+	struct name_entry	*forw;
+	struct name_entry	*back;
 	unsigned char		name[NETBIOS_NAME_SZ];
 	unsigned char		scope[NETBIOS_DOMAIN_NAME_MAX];
 	unsigned short		attributes;
@@ -180,7 +180,7 @@ typedef struct name_entry {
 } name_entry_t;
 
 struct name_question {
-	struct name_entry 	*name;
+	struct name_entry	*name;
 	unsigned		question_type;
 	unsigned		question_class;
 };
@@ -209,10 +209,10 @@ struct name_packet {
 	unsigned		nscount;	/* authority recs */
 	unsigned		arcount;	/* additional recs */
 
-	struct name_question 	*question;
-	struct resource_record 	*answer;
-	struct resource_record 	*authority;
-	struct resource_record 	*additional;
+	struct name_question	*question;
+	struct resource_record	*answer;
+	struct resource_record	*authority;
+	struct resource_record	*additional;
 
 	unsigned char			block_data[4];	/* begining of space */
 };
@@ -592,8 +592,8 @@ typedef struct datagram_query_packet {
 
 
 typedef struct datagram {
-	struct datagram 	*forw;
-	struct datagram 	*back;
+	struct datagram		*forw;
+	struct datagram		*back;
 	struct addr_entry	inaddr;
 	int			discard_timer;
 	unsigned char		packet_type;
@@ -603,14 +603,14 @@ typedef struct datagram {
 	struct name_entry	dest;
 	unsigned short		offset;
 	unsigned short		data_length;
-	unsigned char 		*data;
+	unsigned char		*data;
 	unsigned int		rawbytes;
 	unsigned char		rawbuf[MAX_DATAGRAM_LENGTH];
 } datagram;
 
 typedef struct datagram_queue {
-	struct datagram 	*forw;
-	struct datagram 	*back;
+	struct datagram		*forw;
+	struct datagram		*back;
 } datagram_queue;
 
 typedef struct name_queue {
diff --git a/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios_name.c b/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios_name.c
index 024fda6e86..e46299c979 100644
--- a/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios_name.c
+++ b/usr/src/lib/smbsrv/libsmbns/common/smbns_netbios_name.c
@@ -134,6 +134,7 @@ typedef struct nbt_name_reply {
 	boolean_t		reply_ready;
 } nbt_name_reply_t;
 
+char smb_node_type;
 static nbt_name_reply_t reply_queue;
 static mutex_t rq_mtx;
 static cond_t rq_cv;
@@ -184,9 +185,9 @@ smb_end_node_challenge(nbt_name_reply_t *reply_info)
 	struct resource_record	*answer;
 	struct name_question	question;
 	addr_entry_t		*addr;
-	struct name_entry 	*destination;
+	struct name_entry	*destination;
 	struct name_packet	packet;
-	struct timespec 	st;
+	struct timespec		st;
 
 	/*
 	 * The response packet has in it the address of the presumed owner
@@ -233,10 +234,10 @@ smb_name_get_reply(uint16_t tid, uint32_t timeout)
 {
 	uint16_t		info;
 	struct resource_record	*answer;
-	nbt_name_reply_t 	*reply;
-	uint32_t 		wait_time, to_save; /* in millisecond */
-	struct timeval 		wt;
-	timestruc_t 		to;
+	nbt_name_reply_t	*reply;
+	uint32_t		wait_time, to_save; /* in millisecond */
+	struct timeval		wt;
+	timestruc_t		to;
 
 	to_save = timeout;
 	reply = malloc(sizeof (nbt_name_reply_t));
@@ -329,12 +330,12 @@ smb_netbios_process_response(uint16_t tid, addr_entry_t *addr,
 {
 	int			rc = 0;
 	uint16_t		info;
-	nbt_name_reply_t 	*reply;
+	nbt_name_reply_t	*reply;
 	struct resource_record	*answer;
-	struct name_entry 	*name;
-	struct name_entry 	*entry;
-	struct name_question 	*question;
-	uint32_t 		ttl;
+	struct name_entry	*name;
+	struct name_entry	*entry;
+	struct name_question	*question;
+	uint32_t		ttl;
 
 	if ((reply = smb_name_get_reply(tid, timeout)) == 0) {
 		return (0); /* No reply: retry */
@@ -482,8 +483,8 @@ smb_name_buf_from_packet(unsigned char *buf, int n_buf,
     struct name_packet *npb)
 {
 	addr_entry_t		*raddr;
-	unsigned char 		*heap = buf;
-	unsigned char 		*end_heap = heap + n_buf;
+	unsigned char		*heap = buf;
+	unsigned char		*end_heap = heap + n_buf;
 	unsigned char		comp_name_buf[MAX_NAME_LENGTH];
 	unsigned int		tmp;
 	int			i, step;
@@ -1260,8 +1261,8 @@ smb_send_name_query_request(int bcast, struct name_question *question)
 	uint16_t		tid;
 	addr_entry_t		*destination;
 	struct name_packet	packet;
-	int 			i, addr_num;
-	struct timespec 	st;
+	int			i, addr_num;
+	struct timespec		st;
 
 	if (bcast == BROADCAST) {
 		if (bcast_num == 0)
@@ -1325,8 +1326,8 @@ smb_send_name_query_response(addr_entry_t *addr,
 	struct name_packet	packet;
 	struct resource_record	answer;
 	uint16_t		attr;
-	unsigned char 		data[MAX_DATAGRAM_LENGTH];
-	unsigned char 		*scan = data;
+	unsigned char		data[MAX_DATAGRAM_LENGTH];
+	unsigned char		*scan = data;
 	uint32_t		ret_addr;
 
 	packet.name_trn_id = original_packet->name_trn_id;
@@ -1381,11 +1382,11 @@ smb_send_node_status_response(addr_entry_t *addr,
 {
 	uint32_t		net_ipaddr;
 	int64_t			max_connections;
-	struct arpreq 		arpreq;
+	struct arpreq		arpreq;
 	struct name_packet	packet;
 	struct resource_record	answer;
-	unsigned char 		*scan;
-	unsigned char 		*scan_end;
+	unsigned char		*scan;
+	unsigned char		*scan_end;
 	unsigned char		data[MAX_NETBIOS_REPLY_DATA_SIZE];
 	boolean_t scan_done = B_FALSE;
 	smb_inaddr_t ipaddr;
@@ -1523,7 +1524,7 @@ smb_name_Bnode_add_name(struct name_entry *name)
 {
 	struct name_question		question;
 	struct resource_record		additional;
-	unsigned char 			data[8];
+	unsigned char			data[8];
 	uint16_t			attr;
 	addr_entry_t			*addr;
 	int rc = 0;
@@ -1621,7 +1622,7 @@ smb_name_Pnode_add_name(struct name_entry *name)
 {
 	struct name_question		question;
 	struct resource_record		additional;
-	unsigned char 			data[8];
+	unsigned char			data[8];
 	uint16_t			attr;
 	addr_entry_t			*addr;
 	int rc = 0;
@@ -1661,7 +1662,7 @@ smb_name_Pnode_refresh_name(struct name_entry *name)
 {
 	struct name_question		question;
 	struct resource_record		additional;
-	unsigned char 			data[8];
+	unsigned char			data[8];
 	uint16_t			attr;
 	addr_entry_t			*addr;
 	int rc = 0;
@@ -1828,10 +1829,10 @@ smb_name_Hnode_delete_name(struct name_entry *name)
 static void
 smb_name_process_Bnode_packet(struct name_packet *packet, addr_entry_t *addr)
 {
-	struct name_entry 	*name;
-	struct name_entry 	*entry;
-	struct name_question 	*question;
-	struct resource_record 	*additional;
+	struct name_entry	*name;
+	struct name_entry	*entry;
+	struct name_question	*question;
+	struct resource_record	*additional;
 
 	question = packet->question;
 	additional = packet->additional;
@@ -1908,10 +1909,10 @@ smb_name_process_Bnode_packet(struct name_packet *packet, addr_entry_t *addr)
 static void
 smb_name_process_Pnode_packet(struct name_packet *packet, addr_entry_t *addr)
 {
-	struct name_entry 	*name;
-	struct name_entry 	*entry;
-	struct name_question 	*question;
-	struct resource_record 	*additional;
+	struct name_entry	*name;
+	struct name_entry	*entry;
+	struct name_question	*question;
+	struct resource_record	*additional;
 
 	question = packet->question;
 	additional = packet->additional;
@@ -2382,7 +2383,7 @@ smb_netbios_name_service(void *arg)
 	int			len;
 	int			flag = 1;
 	char			*buf;
-	worker_param_t 		*worker_param;
+	worker_param_t		*worker_param;
 	smb_inaddr_t		ipaddr;
 
 	/*