diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | conform/data/netdb.h-data | 2 | ||||
| -rw-r--r-- | include/netdb.h | 14 | ||||
| -rw-r--r-- | inet/Makefile | 3 | ||||
| -rw-r--r-- | linuxthreads_db/ChangeLog | 4 | ||||
| -rw-r--r-- | linuxthreads_db/Makefile | 3 | ||||
| -rw-r--r-- | nis/Versions | 5 | ||||
| -rw-r--r-- | nis/nss_nis/nis-hosts.c | 2 | ||||
| -rw-r--r-- | nis/nss_nisplus/nisplus-hosts.c | 2 |
9 files changed, 27 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog index 12083452b3..4d788da50a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2000-08-01 Andreas Jaeger <aj@suse.de> + * conform/data/netdb.h-data: Remove getipnodebyaddr and friends. + + * include/netdb.h: Remove getipnodebyaddr and friends, leave + constants in. + + * nis/Versions: Remove _nss_nis_getipnodebyname_r and + _nss_nisplus_getipnodebyname_r. + + * nis/nss_nis/nis-hosts.c (_nss_nis_getipnodebyname_r): #if 0 for + now, getipnodebyname is deprecated. + * nis/nss_nisplus/nisplus-hosts.c (_nss_nisplus_getipnodebyname_r): Likewise. + + * inet/Makefile (routines): Don't build getipnodebyaddr and + friends. + * intl/Makefile (distribute): Add tst-translit.sh and translit.po. * hesiod/Makefile (distribute): Add nss_hesiod/nss_hesiod.h. diff --git a/conform/data/netdb.h-data b/conform/data/netdb.h-data index 99773b8dc7..76475ad3af 100644 --- a/conform/data/netdb.h-data +++ b/conform/data/netdb.h-data @@ -51,10 +51,8 @@ function void endhostent (void) function void endnetent (void) function void endprotoent (void) function void endservent (void) -function void freehostent (struct hostent*) function {struct hostent*} gethostbyaddr (const void*, socklen_t, int) function {struct hostent*} gethostbyname (const char*) function {struct hostent*} gethostent (void) -function {struct hostent*} getipnodebyaddr (const void*, socklen_t, int, int*) #endif diff --git a/include/netdb.h b/include/netdb.h index 8994056bb7..f30d46f222 100644 --- a/include/netdb.h +++ b/include/netdb.h @@ -85,24 +85,10 @@ extern int ruserpass (const char *host, const char **aname, /* The following declarations and definitions have been removed from the public header since we don't want people to use them. */ -/* Return entry from host data base which address match ADDR with - length LEN and type TYPE in newly allocated buffer. */ -extern struct hostent *getipnodebyaddr (__const void *__addr, socklen_t __len, - int __type, int *__error_num) __THROW; - -/* Return entry from host data base for host with NAME and newly allocated - buffer. FLAGS is some combination of the following AI_* values. */ -extern struct hostent *getipnodebyname (__const char *__name, int __type, - int __flags, int *__error_num) __THROW; - #define AI_V4MAPPED 0x0008 /* IPv4-mapped addresses are acceptable. */ #define AI_ALL 0x0010 /* Return both IPv4 and IPv6 addresses. */ #define AI_ADDRCONFIG 0x0020 /* Use configuration of this host to choose returned address type. */ #define AI_DEFAULT (AI_V4MAPPED | AI_ADDRCONFIG) -/* Free structure returned by previous `getipnodebyaddr' or `getipnodebyname' - call. */ -extern void freehostent (struct hostent *__ptr) __THROW; - #endif /* !_NETDB_H */ diff --git a/inet/Makefile b/inet/Makefile index 93f90985e9..c5874d4236 100644 --- a/inet/Makefile +++ b/inet/Makefile @@ -45,8 +45,7 @@ routines := htonl htons \ rcmd rexec ruserpass \ getnetgrent_r getnetgrent \ getaliasent_r getaliasent getaliasname getaliasname_r \ - in6_addr getnameinfo if_index getipnodebyad freehostent \ - getipnodebynm + in6_addr getnameinfo if_index tests := htontest test_ifindex tst-ntoa tst-ether_aton tst-network # tst-ipnode diff --git a/linuxthreads_db/ChangeLog b/linuxthreads_db/ChangeLog index 3fc5b6ebd9..1d4f469fc3 100644 --- a/linuxthreads_db/ChangeLog +++ b/linuxthreads_db/ChangeLog @@ -1,3 +1,7 @@ +2000-08-01 Andreas Jaeger <aj@suse.de> + + * Makefile (distribute): Add missing files. + 2000-04-24 Mark Kettenis <kettenis@gnu.org> * td_thr_get_info.c (td_thr_get_info): Set ti_state to diff --git a/linuxthreads_db/Makefile b/linuxthreads_db/Makefile index d7446d94ad..bf28bb4e36 100644 --- a/linuxthreads_db/Makefile +++ b/linuxthreads_db/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1999 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -43,6 +43,7 @@ libthread_db-routines = td_init td_log td_ta_delete td_ta_get_nthreads \ libthread_db-inhibit-o = $(filter-out .os,$(object-suffixes)) +distribute = thread_dbP.h shlib-versions proc_service.h include ../Rules # Depend on libc.so so a DT_NEEDED is generated in the shared objects. diff --git a/nis/Versions b/nis/Versions index 8bcf9a8f0e..427fd6bba0 100644 --- a/nis/Versions +++ b/nis/Versions @@ -95,7 +95,7 @@ libnss_nis { _nss_nis_setrpcent; _nss_nis_setservent; _nss_nis_setspent; } GLIBC_2.2 { - _nss_nis_getipnodebyname_r; _nss_nis_initgroups_dyn; + _nss_nis_initgroups_dyn; } } @@ -128,7 +128,4 @@ libnss_nisplus { _nss_nisplus_setpwent; _nss_nisplus_setrpcent; _nss_nisplus_setservent; _nss_nisplus_setspent; } - GLIBC_2.2 { - _nss_nisplus_getipnodebyname_r; - } } diff --git a/nis/nss_nis/nis-hosts.c b/nis/nss_nis/nis-hosts.c index ecb6987e3a..58136f2b26 100644 --- a/nis/nss_nis/nis-hosts.c +++ b/nis/nss_nis/nis-hosts.c @@ -434,6 +434,7 @@ _nss_nis_gethostbyaddr_r (const void *addr, socklen_t addrlen, int af, return NSS_STATUS_SUCCESS; } +#if 0 enum nss_status _nss_nis_getipnodebyname_r (const char *name, int af, int flags, struct hostent *result, char *buffer, @@ -442,3 +443,4 @@ _nss_nis_getipnodebyname_r (const char *name, int af, int flags, return internal_gethostbyname2_r (name, af, result, buffer, buflen, errnop, herrnop, flags); } +#endif diff --git a/nis/nss_nisplus/nisplus-hosts.c b/nis/nss_nisplus/nisplus-hosts.c index cad8c73051..8f723f3d52 100644 --- a/nis/nss_nisplus/nisplus-hosts.c +++ b/nis/nss_nisplus/nisplus-hosts.c @@ -416,6 +416,7 @@ _nss_nisplus_gethostbyname2_r (const char *name, int af, struct hostent *host, ((_res.options & RES_USE_INET6) ? AI_V4MAPPED : 0)); } +#if 0 enum nss_status _nss_nisplus_getipnodebyname_r (const char *name, int af, int flags, struct hostent *result, char *buffer, @@ -424,6 +425,7 @@ _nss_nisplus_getipnodebyname_r (const char *name, int af, int flags, return internal_gethostbyname2_r (name, af, result, buffer, buflen, errnop, herrnop, flags); } +#endif enum nss_status _nss_nisplus_gethostbyname_r (const char *name, struct hostent *host, |