summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-04-30 11:25:41 -0400
committerNick Mathewson <nickm@torproject.org>2019-04-30 15:00:07 -0400
commit853942b71e1a397cbe025dd9c101ccbab4bdaa11 (patch)
tree7cb7e34056fdb92b7903b1e6f89068991b58ddf9
parent847fc3280d4a77859c28f4c6c91c2cdf863c5c43 (diff)
downloadtor-853942b71e1a397cbe025dd9c101ccbab4bdaa11.tar.gz
tor-853942b71e1a397cbe025dd9c101ccbab4bdaa11.zip
Make the recommend_pkg file dirauth-only.
-rw-r--r--src/core/include.am2
-rw-r--r--src/feature/dirauth/recommend_pkg.h12
2 files changed, 13 insertions, 1 deletions
diff --git a/src/core/include.am b/src/core/include.am
index 4ec42182a6..dba957b6b5 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 8200d78f72..1f97d50177 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