diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_comp.c | 2 | ||||
| -rw-r--r-- | resolv/res_data.c | 17 |
3 files changed, 5 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index 26147f54e3..e5cf1d0df6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/res_comp.c: Remove code conditional on __ultrix__. + * resolv/res_data.c: Remove code conditional on ultrix. + +2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/res_init.c (RFC1535): Do not define. Remove RFC1535 preprocessor conditionals. * resolv/README: Update. Do not claim strict RFC 1535 compliance diff --git a/resolv/res_comp.c b/resolv/res_comp.c index 3c50774d64..d2be5e4560 100644 --- a/resolv/res_comp.c +++ b/resolv/res_comp.c @@ -241,10 +241,8 @@ void __putlong(u_int32_t src, u_char *dst) { ns_put32(src, dst); } libresolv_hidden_def (__putlong) void __putshort(u_int16_t src, u_char *dst) { ns_put16(src, dst); } libresolv_hidden_def (__putshort) -#ifndef __ultrix__ u_int32_t _getlong(const u_char *src) { return (ns_get32(src)); } u_int16_t _getshort(const u_char *src) { return (ns_get16(src)); } -#endif /*__ultrix__*/ #endif /*BIND_4_COMPAT*/ diff --git a/resolv/res_data.c b/resolv/res_data.c index 3c196dee66..7e848e0945 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -186,23 +186,6 @@ hostalias(const char *name) { } libresolv_hidden_def (hostalias) -#ifdef ultrix -int -local_hostname_length(const char *hostname) { - int len_host, len_domain; - - if (!*_res.defdname) - res_init(); - len_host = strlen(hostname); - len_domain = strlen(_res.defdname); - if (len_host > len_domain && - !strcasecmp(hostname + len_host - len_domain, _res.defdname) && - hostname[len_host - len_domain - 1] == '.') - return (len_host - len_domain - 1); - return (0); -} -#endif /*ultrix*/ - #endif |