From 84cd7ed43a9dec662b1e3fed5850fe85a7f8a452 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Tue, 15 Mar 2005 23:12:58 +0000 Subject: [PATCH] Clarify NickServ REGISTER help messages; fix ?raw and ?dump errors. src/nickserv.help (REGISTER): Rephrase the message about using the same password to hopefully make it clearer. src/opserv.c (cmd_dump, cmd_raw): Use local buffers to hold the original message, so that parse_line() will not unsplit the line into the "original" buffer and strip out the sentinel :. git-archimport-id: srvx@srvx.net--2005-srvx/srvx--devo--1.3--patch-19 --- ChangeLog | 18 ++++++++++++++++++ src/nickserv.help | 6 +++--- src/opserv.c | 8 ++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 77557e8..570c42a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,24 @@ # arch-tag: automatic-ChangeLog--srvx@srvx.net--2005-srvx/srvx--devo--1.3 # +2005-03-15 23:12:58 GMT Michael Poole patch-19 + + Summary: + Clarify NickServ REGISTER help messages; fix ?raw and ?dump errors. + Revision: + srvx--devo--1.3--patch-19 + + src/nickserv.help (REGISTER): Rephrase the message about using the + same password to hopefully make it clearer. + + src/opserv.c (cmd_dump, cmd_raw): Use local buffers to hold the + original message, so that parse_line() will not unsplit the line into + the "original" buffer and strip out the sentinel :. + + modified files: + ChangeLog src/nickserv.help src/opserv.c + + 2005-02-17 21:42:43 GMT Michael Poole patch-18 Summary: diff --git a/src/nickserv.help b/src/nickserv.help index 82a3309..7de7c13 100644 --- a/src/nickserv.help +++ b/src/nickserv.help @@ -340,19 +340,19 @@ "REGISTER" { "0: /services/nickserv/email_required" ( "/msg $N@$s REGISTER ", - "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must the password you specify with $bregister$b to use $bauth$b to authenticate to your account.", + "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must use the same password with $bauth$b to authenticate to your account.", "An email will be sent to the email address you give containing a cookie that will let you activate your account. Once you have that cookie, you must use the $bcookie$b command to be able to use your account.", "$uSee Also:$u auth, unregister" ); "1: /services/nickserv/email_enabled" ( "/msg $N@$s REGISTER [email]", - "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must the password you specify with $bregister$b to use $bauth$b to authenticate to your account.", + "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must use the same password with $bauth$b to authenticate to your account.", "If you specify an email address, an email will be sent to it containing a cookie that will let you activate your account. Once you have that cookie, you must use the $bcookie$b command to be able to use your account.", "$uSee Also:$u auth, unregister" ); "2: !/services/nickserv/email_enabled" ( "/msg $N@$s REGISTER ", - "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must the password you specify with $bregister$b to use $bauth$b to authenticate to your account.", + "Registers a specified account with $b$N$b, adding your current user@host to your new account. You must use the same password with $bauth$b to authenticate to your account.", "$uSee Also:$u auth, unregister" ); }; diff --git a/src/opserv.c b/src/opserv.c index ddc9828..a5d8c4e 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -1604,9 +1604,9 @@ static MODCMD_FUNC(cmd_stats_memory) { static MODCMD_FUNC(cmd_dump) { - char linedup[MAXLEN], *original; + char linedup[MAXLEN], original[MAXLEN]; - original = unsplit_string(argv+1, argc-1, NULL); + unsplit_string(argv+1, argc-1, original); safestrncpy(linedup, original, sizeof(linedup)); /* assume it's only valid IRC if we can parse it */ if (parse_line(linedup, 1)) { @@ -1619,9 +1619,9 @@ static MODCMD_FUNC(cmd_dump) static MODCMD_FUNC(cmd_raw) { - char linedup[MAXLEN], *original; + char linedup[MAXLEN], original[MAXLEN]; - original = unsplit_string(argv+1, argc-1, NULL); + unsplit_string(argv+1, argc-1, original); safestrncpy(linedup, original, sizeof(linedup)); /* Try to parse the line before sending it; if it's too wrong, * maybe it will core us instead of our uplink. */ -- 2.20.1