From 7c60a4347c7c992c0059dd04bad99a1f4bf79ca0 Mon Sep 17 00:00:00 2001 From: wollman Date: Mon, 26 Sep 1994 22:45:10 +0000 Subject: Use same configuration file, /etc/host.conf, for both gethost* and getnet* configuration. (It's highly unlikely that you'd want to do something different, and network lookups aren't common enough to justify their own configuration file.) --- lib/libc/net/getnetnamadr.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'lib/libc') diff --git a/lib/libc/net/getnetnamadr.c b/lib/libc/net/getnetnamadr.c index c85af02..ff44ede 100644 --- a/lib/libc/net/getnetnamadr.c +++ b/lib/libc/net/getnetnamadr.c @@ -24,8 +24,8 @@ */ #if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)$Id$"; -static char rcsid[] = "$Id$"; +static char sccsid[] = "@(#)$Id: getnetnamadr.c,v 1.1 1994/09/25 02:12:29 pst Exp $"; +static char rcsid[] = "$Id: getnetnamadr.c,v 1.1 1994/09/25 02:12:29 pst Exp $"; #endif /* LIBC_SCCS and not lint */ #include @@ -45,7 +45,9 @@ extern struct netent * _getnetbyhtaddr __P((long, int)); extern struct netent * _getnetbydnsaddr __P((long, int)); extern struct netent * _getnetbynisaddr __P((long, int)); -#define _PATH_NETCONF "/etc/net.conf" +#ifndef _PATH_NETCONF +#define _PATH_NETCONF "/etc/host.conf" +#endif enum service_type { SERVICE_NONE = 0, @@ -58,10 +60,10 @@ static struct { const char *name; enum service_type type; } service_names[] = { - { "nets", SERVICE_TABLE }, - { "/etc/nets", SERVICE_TABLE }, - { "nettable", SERVICE_TABLE }, - { "ntable", SERVICE_TABLE }, + { "hosts", SERVICE_TABLE }, + { "/etc/hosts", SERVICE_TABLE }, + { "hosttable", SERVICE_TABLE }, + { "htable", SERVICE_TABLE }, { "bind", SERVICE_BIND }, { "dns", SERVICE_BIND }, { "domain", SERVICE_BIND }, -- cgit v1.1