diff options
Diffstat (limited to 'bin/dig')
| -rw-r--r-- | bin/dig/Makefile.in | 4 | ||||
| -rw-r--r-- | bin/dig/dig.c | 4 | ||||
| -rw-r--r-- | bin/dig/dighost.c | 8 | ||||
| -rw-r--r-- | bin/dig/host.c | 4 | ||||
| -rw-r--r-- | bin/dig/include/dig/dig.h | 4 | ||||
| -rw-r--r-- | bin/dig/nslookup.c | 4 |
6 files changed, 15 insertions, 13 deletions
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in index d8829265..d026509e 100644 --- a/bin/dig/Makefile.in +++ b/bin/dig/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2000 Internet Software Consortium. +# Copyright (C) 2000, 2001 Internet Software Consortium. # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -13,7 +13,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# $Id: Makefile.in,v 1.17 2000/09/29 23:42:11 mws Exp $ +# $Id: Makefile.in,v 1.17.4.1 2001/01/09 22:31:19 bwelling Exp $ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/bin/dig/dig.c b/bin/dig/dig.c index 39b0dd25..6bbfbf1d 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.c,v 1.131 2000/12/11 19:15:44 bwelling Exp $ */ +/* $Id: dig.c,v 1.131.2.1 2001/01/09 22:31:20 bwelling Exp $ */ #include <config.h> #include <stdlib.h> diff --git a/bin/dig/dighost.c b/bin/dig/dighost.c index afa76a2b..6f313868 100644 --- a/bin/dig/dighost.c +++ b/bin/dig/dighost.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dighost.c,v 1.174.2.1 2001/01/08 20:59:55 gson Exp $ */ +/* $Id: dighost.c,v 1.174.2.4 2001/01/12 20:39:06 bwelling Exp $ */ /* * Notice to programmers: Do not use this code as an example of how to @@ -433,6 +433,7 @@ clone_lookup(dig_lookup_t *lookold, isc_boolean_t servers) { looknew->section_authority = lookold->section_authority; looknew->section_additional = lookold->section_additional; looknew->retries = lookold->retries; + looknew->origin = lookold->origin; if (servers) clone_server_list(lookold->my_server_list, @@ -1256,7 +1257,8 @@ setup_lookup(dig_lookup_t *lookup) { * is TRUE or we got a domain line in the resolv.conf file. */ /* XXX New search here? */ - if ((count_dots(lookup->textname) >= ndots) || lookup->defname) + if ((count_dots(lookup->textname) >= ndots) || + (!lookup->defname && !usesearch)) lookup->origin = NULL; /* Force abs lookup */ else if (lookup->origin == NULL && lookup->new_search && (usesearch || have_domain)) { diff --git a/bin/dig/host.c b/bin/dig/host.c index 1023fbcc..738613d9 100644 --- a/bin/dig/host.c +++ b/bin/dig/host.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: host.c,v 1.60 2000/12/08 17:06:49 mws Exp $ */ +/* $Id: host.c,v 1.60.4.1 2001/01/09 22:31:24 bwelling Exp $ */ #include <config.h> #include <stdlib.h> diff --git a/bin/dig/include/dig/dig.h b/bin/dig/include/dig/dig.h index e78e8ccf..eda9e48f 100644 --- a/bin/dig/include/dig/dig.h +++ b/bin/dig/include/dig/dig.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: dig.h,v 1.60 2000/12/08 17:06:52 mws Exp $ */ +/* $Id: dig.h,v 1.60.4.1 2001/01/09 22:31:26 bwelling Exp $ */ #ifndef DIG_H #define DIG_H diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index b0b78908..af9991b2 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000 Internet Software Consortium. + * Copyright (C) 2000, 2001 Internet Software Consortium. * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -15,7 +15,7 @@ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: nslookup.c,v 1.69 2000/12/11 19:15:46 bwelling Exp $ */ +/* $Id: nslookup.c,v 1.69.2.1 2001/01/09 22:31:25 bwelling Exp $ */ #include <config.h> |