From: Volker Lendecke <vl@samba.org>
Date: Sat, 3 Mar 2012 20:37:13 +0000 (+0100)
Subject: s3: Fix some format string warnings
X-Git-Tag: tdb-1.2.10~351
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b709589445820ae8b30e9554c08ca205c3b946f1;p=thirdparty%2Fsamba.git

s3: Fix some format string warnings

We were printing nmb->header.name_trn_id with %hu, which denotes a
short. However, header.name_trn_id is an int for the better or
worse.
---

diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 81e2f7f6732..f8bfe45c859 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -963,9 +963,10 @@ void reply_netbios_packet(struct packet_struct *orig_packet,
 			return;
 	}
 
-	DEBUG(4,("reply_netbios_packet: sending a reply of packet type: %s %s to ip %s \
-for id %hu\n", packet_type, nmb_namestr(&orig_nmb->question.question_name),
-			inet_ntoa(packet.ip), orig_nmb->header.name_trn_id));
+	DEBUG(4, ("reply_netbios_packet: sending a reply of packet type: %s "
+		  "%s to ip %s for id %d\n", packet_type,
+		  nmb_namestr(&orig_nmb->question.question_name),
+		  inet_ntoa(packet.ip), orig_nmb->header.name_trn_id));
 
 	nmb->header.name_trn_id = orig_nmb->header.name_trn_id;
 	nmb->header.opcode = opcode;
@@ -1435,15 +1436,17 @@ static struct subnet_record *find_subnet_for_nmb_packet( struct packet_struct *p
 
 		rrec = find_response_record( &subrec, nmb->header.name_trn_id);
 		if(rrec == NULL) {
-			DEBUG(3,("find_subnet_for_nmb_packet: response record not found for response id %hu\n",
-				nmb->header.name_trn_id));
+			DEBUG(3, ("find_subnet_for_nmb_packet: response "
+				  "record not found for response id %d\n",
+				  nmb->header.name_trn_id));
 			nb_packet_dispatch(packet_server, p);
 			return NULL;
 		}
 
 		if(subrec == NULL) {
-			DEBUG(0,("find_subnet_for_nmb_packet: subnet record not found for response id %hu\n",
-				nmb->header.name_trn_id));
+			DEBUG(0, ("find_subnet_for_nmb_packet: subnet record "
+				  "not found for response id %d\n",
+				  nmb->header.name_trn_id));
 			return NULL;
 		}
 
@@ -1565,8 +1568,9 @@ static void process_nmb_response(struct packet_struct *p)
 		return;
 
 	if(rrec == NULL) {
-		DEBUG(0,("process_nmb_response: response packet received but no response record \
-found for id = %hu. Ignoring packet.\n", nmb->header.name_trn_id));
+		DEBUG(0, ("process_nmb_response: response packet received but "
+			  "no response record found for id = %d. Ignoring "
+			  "packet.\n", nmb->header.name_trn_id));
 		return;
 	}