diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | conf/portability.h | 26 | ||||
| -rw-r--r-- | resolv/arpa/nameser.h | 6 | ||||
| -rw-r--r-- | resolv/gethnamaddr.c | 55 |
4 files changed, 10 insertions, 84 deletions
diff --git a/ChangeLog b/ChangeLog index 61c16b3911..f61df618a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/arpa/nameser.h: Include <sys/types.h> unconditionally. + * resolv/gethnamaddr.c: Use include files from conf/portability.h. + Remove BSD-related preprocessor conditionals. + * conf/portability.h: Remove. + +2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/resolv.h: Remove __BIND_NOSTATIC conditional. * resolv/res_data.c: Likewise. diff --git a/conf/portability.h b/conf/portability.h deleted file mode 100644 index 54a25d8507..0000000000 --- a/conf/portability.h +++ /dev/null @@ -1,26 +0,0 @@ -/* This file is used by some of the resolver code in inet/ that - comes from BIND 4.9. I have written this file instead of modifying - those things not to use it so that I can later drop in replacement - files from future BIND distributions without change. */ - -#include <unistd.h> -#include <string.h> -#include <stdlib.h> - -/* Some BIND code decides it can omit the definitions of some functions - if BSD is defined to some value. That might make sense when the BIND - code is augmenting or replacing an existing system library, but we can - never omit a function here, since we are defining the system library. */ - -#undef BSD - -/* Some code does stupid compatibility kludges for SunOS braindeath - #ifdef sun. */ - -#undef sun - -/* The source code copied from BIND for inet_addr/inet_aton - doesn't actually define the functions without these macros. */ - -#define NEED_INETADDR 1 -#define NEED_INETATON 1 diff --git a/resolv/arpa/nameser.h b/resolv/arpa/nameser.h index fb8513ba9b..04f884441b 100644 --- a/resolv/arpa/nameser.h +++ b/resolv/arpa/nameser.h @@ -57,11 +57,7 @@ #define BIND_4_COMPAT #include <sys/param.h> -#if (!defined(BSD)) || (BSD < 199306) -# include <sys/bitypes.h> -#else -# include <sys/types.h> -#endif +#include <sys/types.h> #include <sys/cdefs.h> /*% diff --git a/resolv/gethnamaddr.c b/resolv/gethnamaddr.c index 2c7131392e..1b55ba1ac4 100644 --- a/resolv/gethnamaddr.c +++ b/resolv/gethnamaddr.c @@ -66,6 +66,8 @@ #include <resolv.h> #include <ctype.h> #include <errno.h> +#include <stdlib.h> +#include <string.h> #ifndef LOG_AUTH # define LOG_AUTH 0 @@ -73,13 +75,6 @@ #define MULTI_PTRS_ARE_ALIASES 1 /* XXX - experimental */ -#if defined(BSD) && (BSD >= 199103) && defined(AF_INET6) -# include <stdlib.h> -# include <string.h> -#else -# include "../conf/portability.h" -#endif - #if defined(USE_OPTIONS_H) # include <../conf/options.h> #endif @@ -963,49 +958,3 @@ addrsort (char **ap, int num) needsort++; } } - -#if defined(BSD43_BSD43_NFS) || defined(sun) -/* some libc's out there are bound internally to these names (UMIPS) */ -void -ht_sethostent (int stayopen) -{ - _sethtent(stayopen); -} - -void -ht_endhostent (void) -{ - _endhtent(); -} - -struct hostent * -ht_gethostbyname (char *name) -{ - return (_gethtbyname(name)); -} - -struct hostent * -ht_gethostbyaddr (const char *addr, size_t len, int af) -{ - return (_gethtbyaddr(addr, len, af)); -} - -struct hostent * -gethostent (void) -{ - return (_gethtent()); -} - -void -dns_service (void) -{ - return; -} - -#undef dn_skipname -dn_skipname(comp_dn, eom) - const u_char *comp_dn, *eom; -{ - return (__dn_skipname(comp_dn, eom)); -} -#endif /*old-style libc with yp junk in it*/ |