Synchronization with srvx--devo--1.3--patch-19. Fixes raw/dump bug (it was stripping...

diff --git a/ChangeLog b/ChangeLog
index 19744829f13c0f1b8eede7017ceaff468d892b68..3851c8db052f1a49d4e4e20cfd8451d818b211cf 100644 (file)
--- 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 <mdpoole@troilus.org>     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 <mdpoole@troilus.org>     patch-18
 
     Summary:

diff --git a/src/nickserv.help b/src/nickserv.help
index b6f6f640a887e908083e9b561a93b19b0cd55b85..9800b02a839115b1119b3405664e02250e7e7d27 100644 (file)
--- a/src/nickserv.help
+++ b/src/nickserv.help
@@ -413,19 +413,19 @@
 "REGISTER" {
         "0: /services/nickserv/email_required" (
         "/msg $N@$s REGISTER <account> <password> <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.",
         "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 <account> <password> [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 <account> <password>",
-        "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 e95c18cb3bef460787636ac9a70743f89c9b7e1e..08c180c8870a104bb482f1c720517eb7565402c8 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -1729,9 +1729,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)) {
@@ -1744,9 +1744,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. */