summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2006-04-08 21:59:15 +0000
committerRoger Dingledine <arma@torproject.org>2006-04-08 21:59:15 +0000
commitb7cadc0db511c6fccd237bdc9787687f55a3c5f2 (patch)
tree24566efcb53d5a681cf66a5de3f5d56b770b83bd
parent5dbdc3fc22023cd18584dcd78792dd174d963759 (diff)
downloadtor-b7cadc0db511c6fccd237bdc9787687f55a3c5f2.tar.gz
tor-b7cadc0db511c6fccd237bdc9787687f55a3c5f2.zip
If you're not a versioning dirserver, don't put the string
"client-versions \nserver-versions \n" in your network status. svn:r6329
-rw-r--r--src/or/dirserv.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 828507448b..a56582144d 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1348,8 +1348,8 @@ generate_v2_networkstatus(void)
"contact %s\n"
"published %s\n"
"dir-options%s%s\n"
- "client-versions %s\n"
- "server-versions %s\n"
+ "%s%s" /* client versions %s */
+ "%s%s%s" /* \nserver versions %s \n */
"dir-signing-key\n%s\n",
hostname, ipaddr, (int)options->DirPort,
fingerprint,
@@ -1357,8 +1357,11 @@ generate_v2_networkstatus(void)
published,
naming ? " Names" : "",
versioning ? " Versions" : "",
+ versioning ? "client-versions " : "",
client_versions,
+ versioning ? "\nserver-versions " : "",
server_versions,
+ versioning ? "\n" : "",
identity_pkey);
outp = status + strlen(status);
endp = status + len;