resolv: Remove BIND_UPDATE preprocessor conditionals

diff --git a/ChangeLog b/ChangeLog
index 4a3a52826cf743bf076772276ed628bcc0ad4f84..55ed91451896a7a005a511f542c5ed9a7091c3f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/resolv/res_data.c b/resolv/res_data.c
index 986fc375e7dfde9b1c2bf835c8d4c5765aafc8af..3c196dee662ea015fa1e6f6db0d7cb890e8d62a3 100644 (file)
--- 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 */