Skip to content

Commit

Permalink
Update.
Browse files Browse the repository at this point in the history
	* 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.
  • Loading branch information
Andreas Jaeger committed Aug 1, 2000
1 parent 4df4f8b commit eba8c0e
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 23 deletions.
15 changes: 15 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 0 additions & 2 deletions conform/data/netdb.h-data
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 0 additions & 14 deletions include/netdb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
3 changes: 1 addition & 2 deletions inet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 4 additions & 0 deletions linuxthreads_db/ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion linuxthreads_db/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
Expand Down
5 changes: 1 addition & 4 deletions nis/Versions
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand Down Expand Up @@ -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;
}
}
2 changes: 2 additions & 0 deletions nis/nss_nis/nis-hosts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
2 changes: 2 additions & 0 deletions nis/nss_nisplus/nisplus-hosts.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down

0 comments on commit eba8c0e

Please sign in to comment.