summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoritojun <itojun@NetBSD.org>2001-02-28 02:30:31 +0000
committeritojun <itojun@NetBSD.org>2001-02-28 02:30:31 +0000
commitdea3f7103b088cbfc100c77d00a6a424bc25c652 (patch)
treeee4b30f024a2ebbd2c4ec65265f6d742dca7a9c9
parent163eba47d828ab8fe156da114e7da4e71c2d0453 (diff)
it seems that gethostent(3) is no longer supplied in libc.
couple of wording corrections. From: Hubert Feyrer <hubert.feyrer@informatik.fh-regensburg.de>
-rw-r--r--distrib/sets/lists/comp/mi4
-rw-r--r--distrib/sets/lists/comp/obsolete.mi56
-rw-r--r--lib/libc/net/Makefile.inc4
-rw-r--r--lib/libc/net/gethostbyname.337
4 files changed, 43 insertions, 58 deletions
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index a426f848bc9..5db5a7bfdad 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.315 2001/02/27 14:41:52 wiz Exp $
+# $NetBSD: mi,v 1.316 2001/02/28 02:30:31 itojun Exp $
./sys comp-sysutil-root
./usr/bin/addr2line comp-debug-bin
./usr/bin/ar comp-util-bin
@@ -2164,7 +2164,6 @@
./usr/share/man/cat3/gethostbyaddr.0 comp-c-catman
./usr/share/man/cat3/gethostbyname.0 comp-c-catman
./usr/share/man/cat3/gethostbyname2.0 comp-c-catman
-./usr/share/man/cat3/gethostent.0 comp-c-catman
./usr/share/man/cat3/gethostid.0 comp-c-catman
./usr/share/man/cat3/gethostname.0 comp-c-catman
./usr/share/man/cat3/getifaddrs.0 comp-c-catman
@@ -4011,7 +4010,6 @@
./usr/share/man/man3/gethostbyaddr.3 comp-c-man
./usr/share/man/man3/gethostbyname.3 comp-c-man
./usr/share/man/man3/gethostbyname2.3 comp-c-man
-./usr/share/man/man3/gethostent.3 comp-c-man
./usr/share/man/man3/gethostid.3 comp-c-man
./usr/share/man/man3/gethostname.3 comp-c-man
./usr/share/man/man3/getifaddrs.3 comp-c-man
diff --git a/distrib/sets/lists/comp/obsolete.mi b/distrib/sets/lists/comp/obsolete.mi
index 5ede1649bb4..7278d7af281 100644
--- a/distrib/sets/lists/comp/obsolete.mi
+++ b/distrib/sets/lists/comp/obsolete.mi
@@ -1,4 +1,4 @@
-# $NetBSD: obsolete.mi,v 1.36 2001/02/25 16:15:09 ad Exp $
+# $NetBSD: obsolete.mi,v 1.37 2001/02/28 02:30:32 itojun Exp $
/usr/bin/genclass
/usr/bin/gettextize
/usr/include/bfd
@@ -348,10 +348,37 @@
/usr/share/ldscripts/m68kelf.xr
/usr/share/ldscripts/m68kelf.xs
/usr/share/ldscripts/m68kelf.xu
+/usr/share/lkm
+/usr/share/lkm/README
+/usr/share/lkm/misc
+/usr/share/lkm/misc/Makefile
+/usr/share/lkm/misc/README
+/usr/share/lkm/misc/module/Makefile
+/usr/share/lkm/misc/module/misccall.c
+/usr/share/lkm/misc/module/miscmod.c
+/usr/share/lkm/misc/test/Makefile
+/usr/share/lkm/misc/test/testmisc.c
+/usr/share/lkm/syscall
+/usr/share/lkm/syscall/Makefile
+/usr/share/lkm/syscall/README
+/usr/share/lkm/syscall/module
+/usr/share/lkm/syscall/module/Makefile
+/usr/share/lkm/syscall/module/mycall.c
+/usr/share/lkm/syscall/module/newsyscall.c
+/usr/share/lkm/syscall/test
+/usr/share/lkm/syscall/test/Makefile
+/usr/share/lkm/syscall/test/testsyscall.c
+/usr/share/lkm/vfs
+/usr/share/lkm/vfs/Makefile
+/usr/share/lkm/vfs/README
+/usr/share/lkm/vfs/module
+/usr/share/lkm/vfs/module/Makefile
+/usr/share/lkm/vfs/module/kernfsmod.c
/usr/share/man/cat1/flexdoc.0
/usr/share/man/cat1/lexdoc.0
/usr/share/man/cat2/getdirentries.0
/usr/share/man/cat2/swapon.0
+/usr/share/man/cat3/gethostent.0
/usr/share/man/cat3/getpw.0
/usr/share/man/cat3/regsterrpc.0
/usr/share/man/cat3/securepath.0
@@ -366,6 +393,7 @@
/usr/share/man/cat8/config.new.0
/usr/share/man/cat9/vslock.0
/usr/share/man/cat9/vsunlock.0
+/usr/share/man/man3/gethostent.3
/usr/share/man/man3/getpw.3
/usr/share/man/man3/regsterrpc.3
/usr/share/man/man3/securepath.3
@@ -380,29 +408,3 @@
/usr/share/mk/bsd.crypto.mk
/usr/share/mk/bsd.port.mk
/usr/share/mk/bsd.port.subdir.mk
-/usr/share/lkm
-/usr/share/lkm/README
-/usr/share/lkm/misc
-/usr/share/lkm/misc/Makefile
-/usr/share/lkm/misc/README
-/usr/share/lkm/misc/module/Makefile
-/usr/share/lkm/misc/module/misccall.c
-/usr/share/lkm/misc/module/miscmod.c
-/usr/share/lkm/misc/test/Makefile
-/usr/share/lkm/misc/test/testmisc.c
-/usr/share/lkm/syscall
-/usr/share/lkm/syscall/Makefile
-/usr/share/lkm/syscall/README
-/usr/share/lkm/syscall/module
-/usr/share/lkm/syscall/module/Makefile
-/usr/share/lkm/syscall/module/mycall.c
-/usr/share/lkm/syscall/module/newsyscall.c
-/usr/share/lkm/syscall/test
-/usr/share/lkm/syscall/test/Makefile
-/usr/share/lkm/syscall/test/testsyscall.c
-/usr/share/lkm/vfs
-/usr/share/lkm/vfs/Makefile
-/usr/share/lkm/vfs/README
-/usr/share/lkm/vfs/module
-/usr/share/lkm/vfs/module/Makefile
-/usr/share/lkm/vfs/module/kernfsmod.c
diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc
index 3c180b2da50..cec0b67f980 100644
--- a/lib/libc/net/Makefile.inc
+++ b/lib/libc/net/Makefile.inc
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.55 2000/07/07 05:30:58 cgd Exp $
+# $NetBSD: Makefile.inc,v 1.56 2001/02/28 02:30:31 itojun Exp $
# @(#)Makefile.inc 8.2 (Berkeley) 9/5/93
# net sources
@@ -46,7 +46,7 @@ MLINKS+=byteorder.3 htonl.3 byteorder.3 htons.3 byteorder.3 ntohl.3 \
MLINKS+=ethers.3 ether_aton.3 ethers.3 ether_hostton.3 ethers.3 ether_line.3 \
ethers.3 ether_ntoa.3 ethers.3 ether_ntohost.3
MLINKS+=gethostbyname.3 endhostent.3 gethostbyname.3 gethostbyaddr.3 \
- gethostbyname.3 sethostent.3 gethostbyname.3 gethostent.3 \
+ gethostbyname.3 sethostent.3 \
gethostbyname.3 herror.3 gethostbyname.3 hstrerror.3 \
gethostbyname.3 gethostbyname2.3
MLINKS+=getnetent.3 endnetent.3 getnetent.3 getnetbyaddr.3 \
diff --git a/lib/libc/net/gethostbyname.3 b/lib/libc/net/gethostbyname.3
index 2ae3cd6a996..a2c7ee2d07f 100644
--- a/lib/libc/net/gethostbyname.3
+++ b/lib/libc/net/gethostbyname.3
@@ -1,4 +1,4 @@
-.\" $NetBSD: gethostbyname.3,v 1.17 2000/04/24 16:17:07 itojun Exp $
+.\" $NetBSD: gethostbyname.3,v 1.18 2001/02/28 02:30:31 itojun Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -40,7 +40,6 @@
.Nm gethostbyname ,
.Nm gethostbyname2 ,
.Nm gethostbyaddr ,
-.Nm gethostent ,
.Nm sethostent ,
.Nm endhostent ,
.Nm herror ,
@@ -57,8 +56,6 @@
.Fn gethostbyname2 "const char *name" "int af"
.Ft struct hostent *
.Fn gethostbyaddr "const char *addr" "int len" "int type"
-.Ft struct hostent *
-.Fn gethostent void
.Ft void
.Fn sethostent "int stayopen"
.Ft void
@@ -83,7 +80,7 @@ broken-out fields from a line in
.Pa /etc/hosts ,
or database entries supplied by the
.Xr yp 8
-system .
+system.
The order of the lookups is controlled by the
.Sq hosts
entry in
@@ -250,25 +247,15 @@ for example, a mail-forwarder may be registered for this domain.
.Xr hostname 7 ,
.Xr named 8
.Sh CAVEAT
-The
-.Fn gethostent
-function is defined, and
-.Fn sethostent
-and
-.Fn endhostent
-are redefined,
-when
-.Xr libc 3
-is built to use only the routines to lookup in
+If the search routines specified in
+.Xr nsswitch.conf 5
+decide to read the
.Pa /etc/hosts
-and not the name server.
-.Pp
-The
-.Fn gethostent
-function
-reads the next line of
-.Pa /etc/hosts ,
-opening the file if necessary.
+file,
+.Fn gethostbyname
+and other functions will
+read the next line of the file,
+re-opening the file if necessary.
.Pp
The
.Fn sethostent
@@ -286,8 +273,7 @@ or
.Pp
The
.Fn endhostent
-function
-closes the file.
+function closes the file.
.Sh HISTORY
The
.Fn herror
@@ -297,7 +283,6 @@ The
.Fn endhostent ,
.Fn gethostbyaddr ,
.Fn gethostbyname ,
-.Fn gethostent ,
and
.Fn sethostent
functions appeared in