diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-11-16 15:30:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-11-16 15:30:00 -0500 |
| commit | 183f89ccacdf7ca140f6d83345a9389e94119f5e (patch) | |
| tree | a3e4e03ee5bf587752320439d4a7f2744ba496b9 /src | |
| parent | b0c1634ce93b394ad398ccd37e465cc8f1a356ff (diff) | |
| parent | c8859eb7548f7173dfe98159abd6fd119d60ce94 (diff) | |
| download | tor-183f89ccacdf7ca140f6d83345a9389e94119f5e.tar.gz tor-183f89ccacdf7ca140f6d83345a9389e94119f5e.zip | |
Merge remote-tracking branch 'tor-github/pr/1545'
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/config/config.c | 4 | ||||
| -rw-r--r-- | src/test/test_options.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index c121775c04..3605cbd9f3 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -3228,13 +3228,13 @@ options_validate_cb(const void *old_options_, void *options_, char **msg) if (!strcasecmp(options->TransProxyType, "default")) { options->TransProxyType_parsed = TPT_DEFAULT; } else if (!strcasecmp(options->TransProxyType, "pf-divert")) { -#if !defined(OpenBSD) && !defined( DARWIN ) +#if !defined(OpenBSD) && !defined(DARWIN) /* Later versions of OS X have pf */ REJECT("pf-divert is a OpenBSD-specific " "and OS X/Darwin-specific feature."); #else options->TransProxyType_parsed = TPT_PF_DIVERT; -#endif /* !defined(OpenBSD) && !defined( DARWIN ) */ +#endif /* !defined(OpenBSD) && !defined(DARWIN) */ } else if (!strcasecmp(options->TransProxyType, "tproxy")) { #if !defined(__linux__) REJECT("TPROXY is a Linux-specific feature."); diff --git a/src/test/test_options.c b/src/test/test_options.c index 8aa4bf0906..e3b86c81ad 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -1071,14 +1071,14 @@ test_options_validate__transproxy(void *ignored) ret = options_validate(NULL, tdata->opt, &msg); tt_int_op(ret, OP_EQ, -1); -#if !defined(OpenBSD) && !defined( DARWIN ) +#if !defined(OpenBSD) && !defined(DARWIN) tt_str_op(msg, OP_EQ, "pf-divert is a OpenBSD-specific and OS X/Darwin-specific feature."); #else tt_int_op(tdata->opt->TransProxyType_parsed, OP_EQ, TPT_PF_DIVERT); tt_str_op(msg, OP_EQ, "Cannot use TransProxyType without " "any valid TransPort."); -#endif /* !defined(OpenBSD) && !defined( DARWIN ) */ +#endif /* !defined(OpenBSD) && !defined(DARWIN) */ tor_free(msg); // Test tproxy trans proxy |