[X2serv-cvs] [CVS] Module x3: Change committed

[Reed L. <r3...@us...>]

Committer  : Reed Loden <r3...@us...>
CVSROOT    : /cvsroot/x2serv
Module     : x3
Commit time: 2005-03-15 23:31:12 UTC

Modified files:
     ChangeLog src/nickserv.help src/opserv.c

Log message:

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

---------------------- diff included ----------------------
Index: x3/ChangeLog
diff -u x3/ChangeLog:1.6 x3/ChangeLog:1.7
--- x3/ChangeLog:1.6	Mon Feb 21 05:54:37 2005
+++ x3/ChangeLog	Tue Mar 15 15:31:00 2005
@@ -2,6 +2,24 @@
 # arch-tag: aut...@sr...--2005-srvx/srvx--devo--1.3
 #
 
+2005-03-15 23:12:58 GMT	Michael Poole <md...@tr...>	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 <md...@tr...>	patch-18
 
     Summary:
Index: x3/src/nickserv.help
diff -u x3/src/nickserv.help:1.6 x3/src/nickserv.help:1.7
--- x3/src/nickserv.help:1.6	Sun Mar  6 20:12:33 2005
+++ x3/src/nickserv.help	Tue Mar 15 15:31:01 2005
@@ -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"
         );
 };
Index: x3/src/opserv.c
diff -u x3/src/opserv.c:1.12 x3/src/opserv.c:1.13
--- x3/src/opserv.c:1.12	Sat Mar 12 18:51:11 2005
+++ x3/src/opserv.c	Tue Mar 15 15:31:01 2005
@@ -1729,9 +1729,9 @@
 
 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_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. */
----------------------- End of diff -----------------------