[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r8395: Patch from steve hildrey: Generate network status correctly  (in tor/trunk: . src/or)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r8395: Patch from steve hildrey: Generate network status correctly  (in tor/trunk: . src/or)
- From: nickm@xxxxxxxx
- Date: Thu, 14 Sep 2006 18:34:58 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Thu, 14 Sep 2006 18:35:05 -0400
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: nickm
Date: 2006-09-14 18:34:57 -0400 (Thu, 14 Sep 2006)
New Revision: 8395
Modified:
   tor/trunk/
   tor/trunk/src/or/dirserv.c
Log:
 r8817@Kushana:  nickm | 2006-09-14 18:31:29 -0400
 Patch from steve hildrey: Generate network status correctly on non-versioning dirservers
Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r8817] on c95137ef-5f19-0410-b913-86e773d04f59
Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2006-09-14 16:43:38 UTC (rev 8394)
+++ tor/trunk/src/or/dirserv.c	2006-09-14 22:34:57 UTC (rev 8395)
@@ -1404,9 +1404,9 @@
                naming ? " Names" : "",
                versioning ? " Versions" : "",
                versioning ? "client-versions " : "",
-               client_versions,
+               versioning ? client_versions : "",
                versioning ? "\nserver-versions " : "",
-               server_versions,
+               versioning ? server_versions : "",
                versioning ? "\n" : "",
                identity_pkey);
   outp = status + strlen(status);