diff options
| author | Florian Weimer <fweimer@redhat.com> | 2016-04-28 11:23:52 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2016-04-28 12:53:50 +0200 |
| commit | 561905e1374443ee2a2a2848fd31bc062e4bbcbf (patch) | |
| tree | 51e1fe0ec8eda6953ff5099fbb28a9f994541129 | |
| parent | 283952c4a82b5a9d20932dff1f21148672d33bf4 (diff) | |
| download | glibc-561905e1374443ee2a2a2848fd31bc062e4bbcbf.tar.gz glibc-561905e1374443ee2a2a2848fd31bc062e4bbcbf.tar.xz glibc-561905e1374443ee2a2a2848fd31bc062e4bbcbf.zip | |
resolv: Remove BIND_UPDATE preprocessor conditionals
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | resolv/res_data.c | 36 |
2 files changed, 5 insertions, 36 deletions
diff --git a/ChangeLog b/ChangeLog index 4a3a52826c..55ed914518 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2016-04-28 Florian Weimer <fweimer@redhat.com> + * resolv/res_data.c: Remove code conditional on BIND_UPDATE. It + is never defined. + +2016-04-28 Florian Weimer <fweimer@redhat.com> + * inet/inet_lnaof.c: Remove SCSS keyword. * inet/inet_mkadr.c: Likewise. * inet/inet_net.c: Likewise. diff --git a/resolv/res_data.c b/resolv/res_data.c index 986fc375e7..3c196dee66 100644 --- a/resolv/res_data.c +++ b/resolv/res_data.c @@ -27,9 +27,6 @@ #include <ctype.h> #include <netdb.h> #include <resolv.h> -#ifdef BIND_UPDATE -#include <res_update.h> -#endif #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -55,15 +52,6 @@ const char *_res_opcodes[] = { }; libresolv_hidden_data_def (_res_opcodes) -#ifdef BIND_UPDATE -const char *_res_sectioncodes[] attribute_hidden = { - "ZONE", - "PREREQUISITES", - "UPDATE", - "ADDITIONAL", -}; -#endif - #ifndef __BIND_NOSTATIC void p_query(const u_char *msg) { @@ -104,18 +92,6 @@ res_mkquery(int op, /* opcode of query */ newrr_in, buf, buflen)); } -#ifdef BIND_UPDATE -int -res_mkupdate(ns_updrec *rrecp_in, u_char *buf, int buflen) { - if (__res_maybe_init (&_res, 1) == -1) { - RES_SET_H_ERRNO(&_res, NETDB_INTERNAL); - return (-1); - } - - return (res_nmkupdate(&_res, rrecp_in, buf, buflen)); -} -#endif - int res_query(const char *name, /* domain name */ int class, int type, /* class and type of query */ @@ -171,18 +147,6 @@ res_close(void) { __res_iclose(&_res, false); } -#ifdef BIND_UPDATE -int -res_update(ns_updrec *rrecp_in) { - if (__res_maybe_init (&_res, 1) == -1) { - RES_SET_H_ERRNO(&_res, NETDB_INTERNAL); - return (-1); - } - - return (res_nupdate(&_res, rrecp_in, NULL)); -} -#endif - int res_search(const char *name, /* domain name */ int class, int type, /* class and type of query */ |