Message and documentation cleanups

* Update version number in INSTALL and mention where we do most of
srvx's testing.

* Move the message about using the authcookie to inside of
nickserv_make_cookie(), so that when another cookie exists, only the
"cookie already pending" message is sent.

* Fix various typos, extraneous sentences, and misplaced command
listings in nickserv.help.

* Remove (unused) fakehost options from srvx.conf.example and update
ChanServ's set_shows option.
git-archimport-id: srvx@srvx.net--2004-srvx/srvx--devo--1.3--patch-33

diff --git a/INSTALL b/INSTALL
index 0106b2363a5d2a2d0cf73777e0b89136756d9fb1..8081ff2a00dbf8caf123956bab15cc730081866c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -14,11 +14,12 @@ files.
 
 Requirements:
 ----------
-This release of srvx (1.2) only supports the Undernet P10 and Bahamut
+This release of srvx (1.3) only supports the Undernet P10 and Bahamut
 protocols and is known to link with ircu/Universal (u2.10.09),
 ircu/Undernet (u2.10.10, u2.10.11), ircu-lain, and Bahamut 1.4.32. It
 does not support hybrid, Unreal, or any other ircd not listed. Should
-you find other compatible ircds, please let us know.
+you find other compatible ircds, please let us know.  Most of the
+testing has been done on ircu2.10.11.06.
 
 srvx is known to compile on the following systems as long as you
 are using GNU make (make on Linux, gmake on many other systems):

diff --git a/src/nickserv.c b/src/nickserv.c
index a40f743b731d594ed2d304f2b2f0f5447b268c7c..98351a8cd7d0a4b7ecdce513aba1fd31361839a1 100644 (file)
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -1015,6 +1015,7 @@ nickserv_make_cookie(struct userNode *user, struct handle_info *hi, enum cookie_
         snprintf(subject, sizeof(subject), fmt, netname);
         fmt = user_find_message(user, "NSEMAIL_ALLOWAUTH_BODY");
         snprintf(body, sizeof(body), fmt, netname, cookie->cookie, nickserv->nick, self->name, hi->handle);
+        send_message(user, nickserv, "NSMSG_USE_COOKIE_AUTH");
         break;
     default:
         log_module(NS_LOG, LOG_ERROR, "Bad cookie type %d in nickserv_make_cookie.", cookie->type);
@@ -1663,7 +1664,6 @@ static NICKSERV_FUNC(cmd_authcookie)
         return 0;
     }
     nickserv_make_cookie(user, hi, ALLOWAUTH, NULL);
-    reply("NSMSG_USE_COOKIE_AUTH");
     return 1;
 }
 

diff --git a/src/nickserv.help b/src/nickserv.help
index b4b8a316717449183f5a24467224325c9aead1ea..8fe3468ef83eafc8be805ca9c02f5f69f96faaff 100644 (file)
--- a/src/nickserv.help
+++ b/src/nickserv.help
@@ -2,17 +2,17 @@
         "/services/nickserv/disable_nicks" {
         "/services/nickserv/email_enabled" (
                 "$b$N Help$b",
-                "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. The other component allows for ownership of a nickname, but is not necessarily enabled.",
+                "$b$N$b is an authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid.",
                "$b$N$b command categories:",
                "  ACCOUNT    Account management.",
                 "  NOT NICKSERV   A note on what this service does and does not do.",
-                "  EMAIL      Email maintenance commands",
+                "  EMAIL      Email maintenance commands.",
                "  OTHERS     Other functions.",
                 "  COMMANDS   A list of all available commands."
         );
         "!/services/nickserv/email_enabled" (
                 "$b$N Help$b",
-                "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. The other component allows for ownership of a nickname, but is not necessarily enabled.",
+                "$b$N$b is an authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid.",
                "$b$N$b command categories:",
                "  ACCOUNT    Account management.",
                 "  NOT NICKSERV   A note on what this service does and does not do.",
@@ -23,17 +23,17 @@
         "!/services/nickserv/disable_nicks" {
         "/services/nickserv/email_enabled" (
                 "$b$N Help$b",
-                "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. The other component allows for ownership of a nickname, but is not necessarily enabled.",
+                "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid.  It also manages nickname ownership.",
                "$b$N$b command categories:",
                "  ACCOUNT    Account management.",
                 "  NICK       Nick management.",
-                "  EMAIL      Email maintenance commands",
+                "  EMAIL      Email maintenance commands.",
                "  OTHERS     Other functions.",
                 "  COMMANDS   A list of all available commands."
         );
         "!/services/nickserv/email_enabled" (
                 "$b$N Help$b",
-                "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. The other component allows for ownership of a nickname, but is not necessarily enabled.",
+                "$b$N$b is a nickname and authentication service, intended to serve as a central authentication point for all other network services. $b$C$b, $b$O$b, and $b$G$b all depend on $b$N$b to verify that users are valid. It also manages nickname ownership.",
                "$b$N$b command categories:",
                "  ACCOUNT    Account management.",
                 "  NICK       Nick management.",
@@ -56,7 +56,6 @@
                 "  DELMASK    Remove a hostmask from your account.",
                 "  SET        Set per-account options.",
                 "  UNREGISTER Unregister an account.",
-                "  RENAME     Renames an account",
                 "  GHOST      Disconnects your old clients",
                 "  ACCOUNT FLAGS Definition for each account flag"
         );
@@ -228,14 +227,16 @@
 };
 
 "OTHERS" ("Other commands are:",
-        "  USERINFO    Displays the account a user is authenticated to.",
         "  ACCOUNTINFO Displays information about an account.",
-        "  VERSION     $b$N$b version information.",
-        "  STATUS      $b$N$b status.",
-        "  SEARCH      Search for accounts by various criteria.",
+        "  HELP        Get help on $b$N$b.",
         "  MERGE       Merge one account into another.",
         "  MERGEDB     Load a database into memory.",
-        "  HELP        Get help on $b$N$b.");
+        "  RENAME      Rename an account.",
+        "  STATUS      $b$N$b status.",
+        "  SEARCH      Search for accounts by various criteria.",
+        "  USERINFO    Display the account a user is authenticated to.",
+        "  VERSION     $b$N$b version information."
+        );
 
 "ADDMASK" ("/msg $N ADDMASK [user@host]",
         "Adds the specified user@host to the account you are authenticated to with $b$N$b.  If no mask is given, it uses your current mask.",
@@ -266,13 +267,13 @@
 "ACCOUNTINFO" {
         "/services/nickserv/disable_nicks" (
         "/msg $N ACCOUNTINFO <nick|*account>",
-        "Displays infomation on the specified account, including the date the account was registered, the last time that person was seen, the account's $b$N$b info, its flags, its hostmask(s), its channels, and the account's current nickname.",
+        "Displays infomation on the specified account, including the date the account was registered, the last time it was used, its infoline, its flags, its hostmask(s), its channels, and nicknames of users currently using the account.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
         "$uSee Also:$u userinfo, account flags"
         );
         "! /services/nickserv/disable_nicks" (
         "/msg $N ACCOUNTINFO <nick|*account>",
-        "Displays infomation on the specified account, including the date the account was registered, the last time that person was seen, the account's $b$N$b info, its flags, its hostmask(s), its channels, and the account's current nickname.",
+        "Displays infomation on the specified account, including the date the account was registered, the last time it was used, its infoline, its flags, its hostmask(s), its channels, and nicknames of users currently using the account.",
         "You may use *Account instead of Nick as the name argument; the * makes $N use the name of an account directly (useful if the user is not online).",
         "$uSee Also:$u nickinfo, userinfo, account flags"
         );
@@ -301,12 +302,12 @@
 "OREGISTER" {
         "/services/nickserv/disable_nicks" (
         "/msg $N@$s OREGISTER <account> <password> <user@host|nick>",
-        "Registers an account with $b$N$b using the specified account, password, and user@host. If then nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
+        "Registers an account with $b$N$b using the specified account, password, and user@host. If the nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
         "$uSee Also:$u ounregister"
         );
         "!/services/nickserv/disable_nicks" (
         "/msg $N@$s OREGISTER <account> <password> <user@host|nick>",
-        "Registers an account with $b$N$b using the specified account, password, and user@host. If then nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
+        "Registers an account with $b$N$b using the specified account, password, and user@host. If the nick of an online user is specified, then that user's user@host is used.  If no nickname or hostmask is used, it uses a default hostmask the first time the user authenticates.",
         "$uSee Also:$u oregnick, ounregister, ounregnick"
         );
 };
@@ -489,11 +490,19 @@
         "$uSee Also:$u search, search action"
         );
 };
-"MERGE" ("/msg $N MERGE <from-nick|*from-account> <to-nick|*to-account>",
-        "Merge access from $bfrom-account$b into $bto-account$b.  This includes hostmasks, registered nicks, authed users, access in channels, and OpServ access (if any).  If $bto-account$b has equal  or greater access than $bfrom-account$b (or more a general hostmask, etc), $bto-account$b keeps that information.",
+"MERGE" {
+        "!services/nickserv/disable_nicks" ("/msg $N MERGE <from-nick|*from-account> <to-nick|*to-account>",
+        "Merge access from $bfrom-account$b into $bto-account$b.  This includes hostmasks, registered nicks, authed users, access in channels, and $O access (if any).  If $bto-account$b has equal  or greater access than $bfrom-account$b (or more a general hostmask, etc), $bto-account$b keeps that information.",
+        "This command is only accessible to helpers and IRC operators.",
+        "$uSee Also:$u rename"
+        );
+        "services/nickserv/disable_nicks" ("/msg $N MERGE <from-nick|*from-account> <to-nick|*to-account>",
+        "Merge access from $bfrom-account$b into $bto-account$b.  This includes hostmasks, authed users, access in channels, and $O access (if any).  If $bto-account$b has equal  or greater access than $bfrom-account$b (or more a general hostmask, etc), $bto-account$b keeps that information.",
         "This command is only accessible to helpers and IRC operators.",
-        "$uSee Also:$u rename");
-"MERGEDB" ("/msg $N MERGE <dbfilename>",
+        "$uSee Also:$u rename"
+        );
+};
+"MERGEDB" ("/msg $N MERGEDB <dbfilename>",
         "Merge contents of $bdbfilename$b into in-memory database.  Any accounts in both will be $bOVERWRITTEN$b with the information from $bdbfilename$b, although authed users will be authed to the new account.",
         "This command is only accessible to IRC operators.",
         "$uSee Also:$u write");

diff --git a/srvx.conf.example b/srvx.conf.example
index 8b76a07e96738a750f4daaf1c173f58881ccc15c..32e53612391f5c2837eb1d2a41a870bcdec04646 100644 (file)
--- a/srvx.conf.example
+++ b/srvx.conf.example
@@ -127,10 +127,6 @@
         "accounts_per_email" "1"; // you may want to increase this; or not
         "email_search_level" "600"; // minimum OpServ level to search based on email address
         "email_visible_level" "800"; // minimum OpServ level to see somebody's email address
-
-        "set_title_level" "900"; // minimum OpServ level to set a title on an account
-        "set_fakehost_level" "1000"; // minimum OpServ level to set a freeform fakehost on an account
-        "titlehost_suffix" "example.net"; // suffix to use with automatically generated fakehosts
     };
 
     "opserv" {
@@ -199,8 +195,7 @@
         // character to make ChanServ pay attention to you
         "trigger" "!";
         // what !set options should we show when user calls "!set" with no arguments?
-        "set_shows" ("DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes", "PubCmd", "StrictOp", "AutoOp", "EnfModes", "EnfTopic", "Protect", "Toys", "Setters", "TopicRefresh", "CtcpUsers", "CtcpReaction",
-                "Voice", "UserInfo", "DynLimit", "TopicSnarf", "NoDelete");
+        "set_shows" ("DefaultTopic", "TopicMask", "Greeting", "UserGreeting", "Modes", "PubCmd", "InviteMe", "UserInfo", "GiveVoice", "GiveOps", "EnfOps", "EnfModes", "EnfTopic", "TopicSnarf", "Setters", "CtcpUser", "CtcpReaction", "Protect", "Toys", "DynLimit", "NoDelete");
 
         // A list of !8ball responses
         "8ball" ("Not a chance.",