[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Document remaining configuration options; add a ccheck for ...
- To: or-cvs@freehaven.net
- Subject: [or-cvs] Document remaining configuration options; add a ccheck for ...
- From: nickm@seul.org (Nick Mathewson)
- Date: Sat, 13 Nov 2004 12:17:06 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Sat, 13 Nov 2004 12:17:36 -0500
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv1657/src/or
Modified Files:
config.c
Log Message:
Document remaining configuration options; add a ccheck for redundant authentication mechanisms in options_validate; add TODO items for post-009 hibernation features
Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -d -r1.247 -r1.248
--- config.c 13 Nov 2004 16:53:48 -0000 1.247
+++ config.c 13 Nov 2004 17:17:04 -0000 1.248
@@ -1317,6 +1317,11 @@
result = -1;
}
}
+ if (options->HashedControlPassword && options->CookieAuthentication) {
+ log_fn(LOG_WARN,"Cannot enable both HashedControlPassword and CookieAuthentication");
+ result = -1;
+ }
+
if (check_nickname_list(options->ExitNodes, "ExitNodes"))
result = -1;
if (check_nickname_list(options->EntryNodes, "EntryNodes"))