summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>2001-07-10 16:10:04 +0000
committerChristopher R. Hertel <crh@samba.org>2001-07-10 16:10:04 +0000
commit973a78c2db1e15fc0a88b15d8857a8d7cf46a140 (patch)
tree98cb07643bb4bba6f6d1e4bbaafd314fba13478e
parent809e32e8df49d97c326068860b672ddebfbe8ff7 (diff)
downloadsamba-973a78c2db1e15fc0a88b15d8857a8d7cf46a140.tar.gz
samba-973a78c2db1e15fc0a88b15d8857a8d7cf46a140.tar.bz2
samba-973a78c2db1e15fc0a88b15d8857a8d7cf46a140.zip
Fix from John Malmberg. When I added the additional information to the
debug block that reports multiple query responses I did not notice that the local answer_ip variable was only selectively set. Chris -)----- (This used to be commit 22ea0770d87b2faece2e5dfc098ccf27f4da155f)
-rw-r--r--source3/nmbd/nmbd_namequery.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/nmbd/nmbd_namequery.c b/source3/nmbd/nmbd_namequery.c
index 61435c14f5..67421103dd 100644
--- a/source3/nmbd/nmbd_namequery.c
+++ b/source3/nmbd/nmbd_namequery.c
@@ -40,6 +40,8 @@ static void query_name_response( struct subnet_record *subrec,
&rrec->packet->packet.nmb.question.question_name;
struct in_addr answer_ip;
+ answer_ip.S_un.S_addr = 0; /* Fix from JEM...should always initialize. */
+
/* 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
we should mark the name in conflict.. */
@@ -103,6 +105,7 @@ static void query_name_response( struct subnet_record *subrec,
{
if( DEBUGLVL( 0 ) )
{
+ putip( (char *)&answer_ip, &nmb->answers->rdata[2] );
dbgtext( "query_name_response: " );
dbgtext( "Multiple (%d) responses ", rrec->num_msgs );
dbgtext( "received for a query on subnet %s ", subrec->subnet_name );