From: Roger Dingledine <arma@torproject.org>
Date: Wed, 4 Aug 2004 02:15:22 +0000 (+0000)
Subject: only pick a default nickname if you're a server
X-Git-Tag: tor-0.0.8pre2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0cfbcf87599ce258a24ee460a1cf33e26dc61e9;p=thirdparty%2Ftor.git

only pick a default nickname if you're a server


svn:r2134
---

diff --git a/src/or/config.c b/src/or/config.c
index 6ce47263bd..d9f9856ecf 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -680,9 +680,11 @@ int getconfig(int argc, char **argv, or_options_t *options) {
   }
 
   if (options->Nickname == NULL) {
-    if (!(options->Nickname = get_default_nickname()))
-      return -1;
-    log_fn(LOG_INFO, "Choosing default nickname %s", options->Nickname);
+    if(server_mode()) {
+      if (!(options->Nickname = get_default_nickname()))
+        return -1;
+      log_fn(LOG_NOTICE, "Choosing default nickname %s", options->Nickname);
+    }
   } else {
     if (strspn(options->Nickname, LEGAL_NICKNAME_CHARACTERS) !=
         strlen(options->Nickname)) {
@@ -696,7 +698,7 @@ int getconfig(int argc, char **argv, or_options_t *options) {
     }
   }
 
-  if(options->ORPort) { /* get an IP for ourselves */
+  if(server_mode()) { /* get an IP for ourselves */
     if(resolve_my_address(options) < 0)
       result = -1;
   }