[tor-commits] [tor/master] Make the recommend_pkg file dirauth-only.

[asn@xxxxxxxxxxxxxx]

commit 853942b71e1a397cbe025dd9c101ccbab4bdaa11
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Apr 30 11:25:41 2019 -0400

    Make the recommend_pkg file dirauth-only.
---
 src/core/include.am                 |  2 +-
 src/feature/dirauth/recommend_pkg.h | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/core/include.am b/src/core/include.am
index 4ec42182a..dba957b6b 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -157,7 +157,6 @@ LIBTOR_APP_A_SOURCES += 			\
 	src/feature/dirauth/dsigs_parse.c	\
 	src/feature/dirauth/guardfraction.c	\
 	src/feature/dirauth/reachability.c	\
-	src/feature/dirauth/recommend_pkg.c	\
 	src/feature/dirauth/process_descs.c	\
 	src/feature/dirauth/voteflags.c
 
@@ -180,6 +179,7 @@ MODULE_DIRAUTH_SOURCES = 					\
 	src/feature/dirauth/dirauth_sys.c			\
 	src/feature/dirauth/dircollate.c			\
 	src/feature/dirauth/dirvote.c				\
+	src/feature/dirauth/recommend_pkg.c			\
 	src/feature/dirauth/shared_random.c			\
 	src/feature/dirauth/shared_random_state.c
 
diff --git a/src/feature/dirauth/recommend_pkg.h b/src/feature/dirauth/recommend_pkg.h
index 8200d78f7..1f97d5017 100644
--- a/src/feature/dirauth/recommend_pkg.h
+++ b/src/feature/dirauth/recommend_pkg.h
@@ -12,6 +12,18 @@
 #ifndef TOR_RECOMMEND_PKG_H
 #define TOR_RECOMMEND_PKG_H
 
+#ifdef HAVE_MODULE_DIRAUTH
 int validate_recommended_package_line(const char *line);
 
+#else
+
+static inline int
+validate_recommended_package_line(const char *line)
+{
+  (void) line;
+  return 0;
+}
+
+#endif
+
 #endif



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits