mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-03 08:05:21 +00:00
Code Issues Releases Wiki Activity

Missed a conflict

Browse Source
This commit is contained in:
Michael Sawyer
2000-10-17 00:36:09 +00:00
parent 88aa63f566
commit 92b35cdef8
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/dig/dighost.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: dighost.c,v 1.148 2000/10/17 00:35:18 mws Exp $ */ /* $Id: dighost.c,v 1.149 2000/10/17 00:36:09 mws Exp $ */
/* /*
* Notice to programmers: Do not use this code as an example of how to * Notice to programmers: Do not use this code as an example of how to
@@ -2181,11 +2181,6 @@ recv_done(isc_task_t *task, isc_event_t *event) {
UNUSED(task); UNUSED(task);
INSIST(!free_now); INSIST(!free_now);
<<<<<<< dighost.c
=======
if (show_packets)
puts(";; beginning of DNS packet");
>>>>>>> 1.147
debug("recv_done()"); debug("recv_done()");
LOCK_LOOKUP; LOCK_LOOKUP;