summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-05-30 14:20:30 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-05-30 14:20:30 +0000
commitfc340e5cdf5a38d592368f5d9cd5c22449ec8902 (patch)
tree88370d9d75cb01138341690d0d53a62699bd7dcf /lib
parent7a68cef46506bade41798091205ab800203ec194 (diff)
Revertion of last change, which was due to emacs' stupid idea
of keeping the "*Shell Command Output*" buffer's wd from its creation instead of using the last command's wd!!!!
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/net/gethostnamadr.c10
-rw-r--r--lib/libc/net/getnetnamadr.c8
2 files changed, 3 insertions, 15 deletions
diff --git a/lib/libc/net/gethostnamadr.c b/lib/libc/net/gethostnamadr.c
index efd1ddece7c..495ca490893 100644
--- a/lib/libc/net/gethostnamadr.c
+++ b/lib/libc/net/gethostnamadr.c
@@ -52,7 +52,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.33 1999/05/30 14:06:07 niklas Exp $";
+static char rcsid[] = "$OpenBSD: gethostnamadr.c,v 1.34 1999/05/30 14:20:29 niklas Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/param.h>
@@ -282,11 +282,7 @@ getanswer(answer, anslen, qname, qtype)
}
if (qtype == T_PTR && type == T_CNAME) {
n = dn_expand(answer->buf, eom, cp, tbuf, sizeof tbuf);
-#ifdef USE_RESOLV_NAME_OK
if ((n < 0) || !res_hnok(tbuf)) {
-#else
- if ((n < 0) || !_hokchar(tbuf)) {
-#endif
had_error++;
continue;
}
@@ -320,11 +316,7 @@ getanswer(answer, anslen, qname, qtype)
continue; /* XXX - had_error++ ? */
}
n = dn_expand(answer->buf, eom, cp, bp, buflen);
-#ifdef USE_RESOLV_NAME_OK
if ((n < 0) || !res_hnok(bp)) {
-#else
- if ((n < 0) || !_hokchar(bp)) {
-#endif
had_error++;
break;
}
diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c
index 0f8ef449bb0..65a6bda9008 100644
--- a/lib/libc/net/getnetnamadr.c
+++ b/lib/libc/net/getnetnamadr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getnetnamadr.c,v 1.11 1999/05/30 14:06:08 niklas Exp $ */
+/* $OpenBSD: getnetnamadr.c,v 1.12 1999/05/30 14:20:29 niklas Exp $ */
/*
* Copyright (c) 1997, Jason Downs. All rights reserved.
@@ -77,7 +77,7 @@ static char sccsid[] = "@(#)getnetbyaddr.c 8.1 (Berkeley) 6/4/93";
static char sccsid_[] = "from getnetnamadr.c 1.4 (Coimbra) 93/06/03";
static char rcsid[] = "$From: getnetnamadr.c,v 8.7 1996/08/05 08:31:35 vixie Exp $";
#else
-static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.11 1999/05/30 14:06:08 niklas Exp $";
+static char rcsid[] = "$OpenBSD: getnetnamadr.c,v 1.12 1999/05/30 14:20:29 niklas Exp $";
#endif
#endif /* LIBC_SCCS and not lint */
@@ -192,11 +192,7 @@ getnetanswer(answer, anslen, net_i)
GETSHORT(n, cp);
if (class == C_IN && type == T_PTR) {
n = dn_expand(answer->buf, eom, cp, bp, buflen);
-#ifdef USE_RESOLV_NAME_OK
if ((n < 0) || !res_hnok(bp)) {
-#else
- if ((n < 0) || !_hokchar(bp)) {
-#endif
cp += n;
return (NULL);
}