From 20b5dea237916902437ce3dcdb7c253fd1ad3585 Mon Sep 17 00:00:00 2001 From: Samba Release Account Date: Wed, 9 Apr 1997 01:19:25 +0000 Subject: Large changes from jra@cygnus.com. Mainly browser updates. access.c: Fixed crash if yp domain unavailable. includes.h: Moved ifdefs for minor platform. interface.c: Changed name of ipgrp to wins_ip to make it clearer. loadparm.c: Changed default of wins support to 'no'. nameannounce.c: Many changes to fix cross subnet browsing. namebrowse.c: Many changes to fix cross subnet browsing. namedbname.c: Many changes to fix cross subnet browsing. namedbresp.c: Many changes to fix cross subnet browsing. namedbsubnet.c: Many changes to fix cross subnet browsing. namedbwork.c: Many changes to fix cross subnet browsing. nameelect.c: Many changes to fix cross subnet browsing. namelogon.c: Many changes to fix cross subnet browsing. namepacket.c: Many changes to fix cross subnet browsing. nameresp.c: Many changes to fix cross subnet browsing. nameserv.c: Many changes to fix cross subnet browsing. nameserv.h: Many changes to fix cross subnet browsing. nameservreply.c: Many changes to fix cross subnet browsing. nameservresp.c: Many changes to fix cross subnet browsing. namework.c: Many changes to fix cross subnet browsing. nmbd.c: Change to search wins subnet. nmbsync.c: Change to check if we are any master before proceeding. proto.h: Added find_subnet_all() and check_work_servertype(). util.c: Moved 'done' settings on name resolution. (This used to be commit a82476eee2c521e5eed092bc367da0a7cef23de1) --- source3/namedbresp.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'source3/namedbresp.c') diff --git a/source3/namedbresp.c b/source3/namedbresp.c index d89bfe8ae8..6755de6534 100644 --- a/source3/namedbresp.c +++ b/source3/namedbresp.c @@ -34,7 +34,6 @@ extern int DEBUGLEVEL; extern pstring scope; extern pstring myname; extern struct in_addr ipzero; -extern struct in_addr ipgrp; int num_response_packets = 0; @@ -117,9 +116,14 @@ struct response_record *make_response_queue_record(enum state_type state, n->recurse = recurse; n->send_ip = send_ip; n->reply_to_ip = reply_to_ip; - StrnCpy(my_name , n->my_name , sizeof(n->my_name )-1); - StrnCpy(my_comment, n->my_comment, sizeof(n->my_comment)-1); - + if(my_name) + StrnCpy(n->my_name, my_name, sizeof(n->my_name)-1); + else + *n->my_name = 0; + if(my_comment) + StrnCpy(n->my_comment, my_comment, sizeof(n->my_comment)-1); + else + *n->my_comment = 0; n->repeat_interval = 1; /* XXXX should be in ms */ n->repeat_count = 3; /* 3 retries */ n->repeat_time = time(NULL) + n->repeat_interval; /* initial retry time */ -- cgit