Make sure sandbox-related getaddrinfo() functions always exist.

diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c
index 01f78829647872f3e8b7ea32ae4d7e4f8913e19d..95c1b171b53181406b3741bac18b95aa2f6a1f4a 100644 (file)
--- a/src/lib/net/resolve.c
+++ b/src/lib/net/resolve.c
@@ -421,4 +421,13 @@ tor_make_getaddrinfo_cache_active(void)
 {
   sandbox_getaddrinfo_is_active = 1;
 }
+#else
+void
+sandbox_disable_getaddrinfo_cache(void)
+{
+}
+void
+tor_make_getaddrinfo_cache_active(void)
+{
+}
 #endif

diff --git a/src/lib/net/resolve.h b/src/lib/net/resolve.h
index bf870c44c488d2acda3fd837a9ec97885ceef842..39157aaa679ccb4f48d5a297991316bec57d2443 100644 (file)
--- a/src/lib/net/resolve.h
+++ b/src/lib/net/resolve.h
@@ -42,7 +42,6 @@ int tor_getaddrinfo(const char *name, const char *servname,
                         struct addrinfo **res);
 void tor_freeaddrinfo(struct addrinfo *addrinfo);
 void tor_free_getaddrinfo_cache(void);
-void tor_make_getaddrinfo_cache_active(void);
 #else /* !(defined(USE_SANDBOX_GETADDRINFO)) */
 #define tor_getaddrinfo(name, servname, hints, res)  \
   getaddrinfo((name),(servname), (hints),(res))
@@ -54,5 +53,6 @@ void tor_make_getaddrinfo_cache_active(void);
 #endif /* defined(USE_SANDBOX_GETADDRINFO) */
 
 void sandbox_disable_getaddrinfo_cache(void);
+void tor_make_getaddrinfo_cache_active(void);
 
 #endif

diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 9477818553f912c1c72edbcb936bd64bc565e543..ea738b273ea05c47e4bc32e33b5276b122920997 100644 (file)
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -1798,9 +1798,4 @@ sandbox_is_active(void)
   return 0;
 }
 
-void
-sandbox_disable_getaddrinfo_cache(void)
-{
-}
-
 #endif /* !defined(USE_LIBSECCOMP) */