aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-02-19 05:08:27 +0000
committerNick Mathewson <nickm@torproject.org>2008-02-19 05:08:27 +0000
commit8c6b5d664093037bda36e023bf54c001c25f27f1 (patch)
treea980011038e4791fdde1f5a38d7a4e1390760298
parent3277e2a8ca7914e3437f139fa6d4107f61f26a4e (diff)
downloadtor-8c6b5d664093037bda36e023bf54c001c25f27f1.tar
tor-8c6b5d664093037bda36e023bf54c001c25f27f1.tar.gz
r14246@tombo: nickm | 2008-02-17 19:33:02 -0500
Fix a wide line in control.c; make the check-spaces target ignore the openbsd malloc file. svn:r13566
-rw-r--r--Makefile.am2
-rw-r--r--src/or/control.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 5e324a4c0..697a4c30e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ test:
check-spaces:
./contrib/checkSpace.pl -C \
src/common/*.h \
- src/common/[^as]*.c \
+ src/common/[^asO]*.c \
src/or/[^et]*.[ch] src/or/t*.c src/or/eventdns_tor.h
check-docs:
diff --git a/src/or/control.c b/src/or/control.c
index 106327cc7..3650170bd 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1064,7 +1064,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
}
}
- if (options->HashedControlPassword || options->HashedControlSessionPassword) {
+ if (options->HashedControlPassword ||
+ options->HashedControlSessionPassword) {
int bad = 0;
smartlist_t *sl_tmp;
char received[DIGEST_LEN];