[or-cvs] If you"re not a versioning dirserver, don"t put the string

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	dirserv.c 
Log Message:
If you're not a versioning dirserver, don't put the string
"client-versions \nserver-versions \n" in your network status.


Index: dirserv.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/dirserv.c,v
retrieving revision 1.325
retrieving revision 1.326
diff -u -p -d -r1.325 -r1.326
--- dirserv.c	8 Apr 2006 21:12:07 -0000	1.325
+++ dirserv.c	8 Apr 2006 21:59:15 -0000	1.326
@@ -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;