rewrite FORCED_USERNAME message since if we're returning it from SWRD,

(1) we won't have the user's full name and account class available, and
(2) the user will already have seen FOUND, so it's weird to say "I've
found you in the database" a second time.

diff --git a/reg_svr/errors b/reg_svr/errors
index ddb2a47088078b4d22b23fe5d6f2b040029387c4..b2869371fbfc7b4ca006eac92c8b2a8cf20137d2 100644 (file)
--- a/reg_svr/errors
+++ b/reg_svr/errors
@@ -48,7 +48,7 @@ Office in N42-105A, x3-1325.
 # 9 FOUND
 OK. I've found you in the database: %s, account class %s.
 # 10 FORCED_USERNAME
-OK. I've found you in the database: %s, account class %s.
+OK. I've verified your identity.
 
 The username "%s" has previously been reserved for this account.
 # 11 BAD_SIX_WORDS

diff --git a/reg_svr/reg_svr.pc b/reg_svr/reg_svr.pc
index bbfcdad1bb435bbe24928cf27e496e0c6dad73f5..b53aef17f5cbfc1f369536a0b65cc8d122f989af 100644 (file)
--- a/reg_svr/reg_svr.pc
+++ b/reg_svr/reg_svr.pc
@@ -420,8 +420,7 @@ void RIFO(reg_client *rc, int argc, char **argv)
   else if (!rc->username)
     reply(rc, FOUND, "GETL", "c", rc->suggestions, fullname, class);
   else
-    reply(rc, FORCED_USERNAME, "GETP", "c", NULL, fullname, class,
-         rc->username);
+    reply(rc, FORCED_USERNAME, "GETP", "c", NULL, rc->username);
 }
 
 void SWRD(reg_client *rc, int argc, char **argv)