From 79e3f5600a9f44f4c228fac173299882076a19a8 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 15 Aug 2005 08:51:20 +0000
Subject: hey, we have a function for that

svn:r4781
---
 src/or/config.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/or')

diff --git a/src/or/config.c b/src/or/config.c
index 24d9f8f1c..f50133ba6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1533,18 +1533,8 @@ options_validate(or_options_t *options)
       log_fn(LOG_NOTICE, "Choosing default nickname %s", options->Nickname);
     }
   } else {
-    if (strspn(options->Nickname, LEGAL_NICKNAME_CHARACTERS) !=
-        strlen(options->Nickname)) {
-      log_fn(LOG_WARN, "Nickname '%s' contains illegal characters.", options->Nickname);
-      result = -1;
-    }
-    if (strlen(options->Nickname) == 0) {
-      log_fn(LOG_WARN, "Nickname must have at least one character");
-      result = -1;
-    }
-    if (strlen(options->Nickname) > MAX_NICKNAME_LEN) {
-      log_fn(LOG_WARN, "Nickname '%s' has more than %d characters.",
-             options->Nickname, MAX_NICKNAME_LEN);
+    if (!is_legal_nickname(options->Nickname)) {
+      log_fn(LOG_WARN, "Nickname '%s' is wrong length or contains illegal characters.", options->Nickname);
       result = -1;
     }
   }
-- 
cgit v1.2.3