[or-cvs] backport: don"t tell people you"re publishing the server de...

[arma at seul.org]

Update of /home/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/tor-010x/tor/src/or

Modified Files:
      Tag: tor-0_1_0-patches
	router.c 
Log Message:
backport: don't tell people you're publishing the server descriptor if
you're actually not.


Index: router.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.176.2.1
retrieving revision 1.176.2.2
diff -u -d -r1.176.2.1 -r1.176.2.2
--- router.c	9 Jun 2005 09:16:12 -0000	1.176.2.1
+++ router.c	9 Jun 2005 21:26:46 -0000	1.176.2.2
@@ -414,7 +414,8 @@
 void router_orport_found_reachable(void) {
   if (!can_reach_or_port) {
     if (!clique_mode(get_options()))
-      log(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent. Publishing server descriptor.");
+      log(LOG_NOTICE,"Your ORPort is reachable from the outside. Excellent.%s",
+          get_options()->NoPublish ? "" : " Publishing server descriptor.");
     can_reach_or_port = 1;
     consider_publishable_server(time(NULL), 1);
   }