From 74447bc4656959eb3e3b55eeb9dfe66bffb104b5 Mon Sep 17 00:00:00 2001
From: Jakub Hrozek <jhrozek@redhat.com>
Date: Mon, 7 Dec 2009 19:28:33 +0100
Subject: Don't build the SRV and TXT parsing code except for tests

---
 server/Makefile.am           | 20 ++++++++++++--------
 server/resolv/async_resolv.c |  6 ++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/server/Makefile.am b/server/Makefile.am
index 9814d4f64..e511f72aa 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -211,12 +211,6 @@ SSSD_TOOLS_OBJ = \
 
 SSSD_RESOLV_OBJ = \
     resolv/async_resolv.c
-if BUILD_ARES_DATA
-    SSSD_RESOLV_OBJ += \
-	resolv/ares/ares_parse_srv_reply.c \
-	resolv/ares/ares_parse_txt_reply.c \
-	resolv/ares/ares_data.c
-endif
 
 SSSD_FAILOVER_OBJ = \
     providers/fail_over.c \
@@ -480,14 +474,24 @@ files_tests_CFLAGS = \
 files_tests_LDADD = \
     $(FILES_TESTS_LIBS)
 
+SSSD_RESOLV_TESTS_OBJ = \
+    $(SSSD_RESOLV_OBJ)
+if BUILD_ARES_DATA
+    SSSD_RESOLV_TESTS_OBJ += \
+	resolv/ares/ares_parse_srv_reply.c \
+	resolv/ares/ares_parse_txt_reply.c \
+	resolv/ares/ares_data.c
+endif
+
 resolv_tests_SOURCES = \
     tests/resolv-tests.c \
     tests/common.c \
     $(SSSD_UTIL_OBJ) \
-    $(SSSD_RESOLV_OBJ)
+    $(SSSD_RESOLV_TESTS_OBJ)
 resolv_tests_CFLAGS = \
     $(AM_CFLAGS) \
-    $(CHECK_CFLAGS)
+    $(CHECK_CFLAGS) \
+    -DBUILD_TXT_SRV
 resolv_tests_LDADD = \
     $(SSSD_LIBS) \
     $(CHECK_LIBS) \
diff --git a/server/resolv/async_resolv.c b/server/resolv/async_resolv.c
index afad4107b..f778d1f41 100644
--- a/server/resolv/async_resolv.c
+++ b/server/resolv/async_resolv.c
@@ -442,6 +442,11 @@ ares_gethostbyname_wakeup(struct tevent_req *subreq)
                        state->family, resolv_gethostbyname_done, req);
 }
 
+/* SRV and TXT parsing is not used anywhere in the code yet, so we disable it
+ * for now
+ */
+#ifdef BUILD_TXT_SRV
+
 /*
  * A simple helper function that will take an array of struct ares_srv_reply that
  * was allocated by malloc() in c-ares and copies it using talloc. The old one
@@ -820,3 +825,4 @@ ares_gettxt_wakeup(struct tevent_req *subreq)
                ns_c_in, ns_t_txt, resolv_gettxt_done, req);
 }
 
+#endif
-- 
cgit