Andrew B and I were commiting the same fix at the same time in different

trees.  This change simply brings HEAD and 2.2 in line with one another.
Otherwise the code would be differnt but the meaning would be the same,
which is awkward.
Chris 'fifty-seven commits per line changed' Hertel -)-----

diff --git a/source/nmbd/nmbd_namequery.c b/source/nmbd/nmbd_namequery.c
index 662d3895dda65fba7819ebb59a26855b28c45cd1..66af796b6f602d4d6204aeb6fe2b8f71ac2b2c55 100644 (file)
--- a/source/nmbd/nmbd_namequery.c
+++ b/source/nmbd/nmbd_namequery.c
@@ -25,7 +25,6 @@
 #include "includes.h"
 
 extern int DEBUGLEVEL;
-
 extern struct in_addr ipzero;
 
 /****************************************************************************
@@ -40,9 +39,7 @@ static void query_name_response( struct subnet_record   *subrec,
   BOOL success = False;
   struct nmb_name *question_name = 
                            &rrec->packet->packet.nmb.question.question_name;
-  struct in_addr answer_ip;
-
-  answer_ip = ipzero; /* Fix from JEM...should always initialize. */
+  struct in_addr answer_ip = ipzero;
 
   /* Ensure we don't retry the query but leave the response record cleanup
      to the timeout code. We may get more answer responses in which case