Commit eaff4735 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

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

parent e420154c

src/lib/net/resolve.c

+9 −0
Original line number Diff line number Diff line
@@ -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

src/lib/net/resolve.h

+1 −1
Original line number Diff line number Diff line
@@ -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

src/lib/sandbox/sandbox.c

+0 −5
Original line number Diff line number Diff line
@@ -1798,9 +1798,4 @@ sandbox_is_active(void) 
  return 0;

}



void

sandbox_disable_getaddrinfo_cache(void)

{

}



#endif /* !defined(USE_LIBSECCOMP) */