summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2012-03-22 12:50:44 +0100
committerSebastian Hahn <sebastian@torproject.org>2012-03-22 12:50:44 +0100
commitfe2b177cfbcdbc2ad851402a9804f9b5f58d93b0 (patch)
tree00ca75cf73164d3c19e33b9ec500e4102c1ed391 /src
parentd95efdd8607a194dad00648bc29f9a8c44219b09 (diff)
downloadtor-fe2b177cfbcdbc2ad851402a9804f9b5f58d93b0.tar.gz
tor-fe2b177cfbcdbc2ad851402a9804f9b5f58d93b0.zip
Never disable debugger attachment for the unit tests
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 0c699b021d..3de8426460 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1338,7 +1338,9 @@ options_act(const or_options_t *old_options)
/* Remember if we already warned about being configured not to disable
* debugger attachment */
static int warned_debugger_attach = 0;
- if (options->DisableDebuggerAttachment && !disabled_debugger_attach) {
+ /* Don't disable debugger attachment when we're running the unit tests. */
+ if (options->DisableDebuggerAttachment && !disabled_debugger_attach &&
+ running_tor) {
int ok = tor_disable_debugger_attach();
if (warned_debugger_attach && ok == 1) {
log_notice(LD_CONFIG, "Disabled attaching debuggers for unprivileged "