Remap oplevel numeric range.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1395 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index bc0ba26ddba521211df8187aa8c22f7105a982c2..7c31559747f67bdfc263c154450a1b7a8ceecffc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+2005-05-04  Michael Poole <mdpoole@troilus.org>
+
+       * include/numeric.h: Remap oplevel numerics to new range.
+
+       * ircd/s_err.c: Likewise.
+
 2005-05-03  Michael Poole <mdpoole@troilus.org>
 
        * ircd/s_stats.c (stats_access): Update to use new CONF_CLIENT
        fields, fixing crash found by nighty.
-       
 
 2005-05-02  Michael Poole <mdpoole@troilus.org>
 

diff --git a/include/numeric.h b/include/numeric.h
index c3bbfabc95bf89f3b283b8d84ffda76b1780cc6e..094349c922efeaafebff68d9a4e5cdfe6f14e963 100644 (file)
--- a/include/numeric.h
+++ b/include/numeric.h
@@ -456,15 +456,15 @@ extern const struct Numeric* get_error_numeric(int err);
        ERR_WHOLIMEXCEED     523        dalnet */
 #define ERR_QUARANTINED      524       /* Undernet extension -Vampire */
 
-#define ERR_NOTLOWEROPLEVEL  550       /* Undernet extension */
-#define ERR_NOTMANAGER       551       /* Undernet extension */
-#define ERR_CHANSECURED      552       /* Undernet extension */
-#define ERR_UPASSSET         553       /* Undernet extension */
-#define ERR_UPASSNOTSET      554       /* Undernet extension */
-#define ERR_NOMANAGER_LONG   555       /* Undernet extension */
-#define ERR_NOMANAGER_SHORT  556       /* Undernet extension */
-#define ERR_UPASS_SAME_APASS 557        /* Undernet extension */
-#define ERR_LASTERROR        558
+#define ERR_NOTLOWEROPLEVEL  560       /* Undernet extension */
+#define ERR_NOTMANAGER       561       /* Undernet extension */
+#define ERR_CHANSECURED      562       /* Undernet extension */
+#define ERR_UPASSSET         563       /* Undernet extension */
+#define ERR_UPASSNOTSET      564       /* Undernet extension */
+#define ERR_NOMANAGER_LONG   565       /* Undernet extension */
+#define ERR_NOMANAGER_SHORT  566       /* Undernet extension */
+#define ERR_UPASS_SAME_APASS 567        /* Undernet extension */
+#define ERR_LASTERROR        568
 
 /*     RPL_LOGON            600        dalnet,unreal
        RPL_LOGOFF           601        dalnet,unreal

diff --git a/ircd/s_err.c b/ircd/s_err.c
index d834944f0f94526d57e268ae5f1c12abcfc2b1c3..67af1bba4b3fb3948d471c7ae47c672954734b72 100644 (file)
--- a/ircd/s_err.c
+++ b/ircd/s_err.c
@@ -1132,41 +1132,41 @@ static Numeric replyTable[] = {
 /* 549 */
   { 0 },
 /* 550 */
-  { ERR_NOTLOWEROPLEVEL, "%s %s %hu %hu :Cannot %s someone with %s op-level", "550" },
+  { 0 },
 /* 551 */
-  { ERR_NOTMANAGER, "%s :You must be channel Admin to add or remove a password. Use /JOIN %s <AdminPass>.", "551" },
+  { 0 },
 /* 552 */
-  { ERR_CHANSECURED, "%s :Channel is older than 48 hours and secured. Cannot change Admin pass anymore", "552" },
+  { 0 },
 /* 553 */
-  { ERR_UPASSSET, "%s :Cannot remove Admin pass (+A) while User pass (+U) is still set.  First use /MODE %s -U <userpass>", "553" },
+  { 0 },
 /* 554 */
-  { ERR_UPASSNOTSET, "%s :Cannot set user pass (+U) until Admin pass (+A) is set.  First use /MODE %s +A <adminpass>", "554" },
+  { 0 },
 /* 555 */
-  { ERR_NOMANAGER_LONG, "%s :Re-create the channel.  The channel must be *empty* for 48 continuous hours before it can be recreated.", "555" },
+  { 0 },
 /* 556 */
-  { ERR_NOMANAGER_SHORT, "%s :Re-create the channel.  The channel must be *empty* for a minute or two before it can be recreated.", "556" },
+  { 0 },
 /* 557 */
-  { ERR_UPASS_SAME_APASS, "%s :Cannot use the same pass for both admin (+A) and user (+U) pass.", "557" },
+  { 0 },
 /* 558 */
   { 0 },
 /* 559 */
   { 0 },
 /* 560 */
-  { 0 },
+  { ERR_NOTLOWEROPLEVEL, "%s %s %hu %hu :Cannot %s someone with %s op-level", "560" },
 /* 561 */
-  { 0 },
+  { ERR_NOTMANAGER, "%s :You must be channel Admin to add or remove a password. Use /JOIN %s <AdminPass>.", "561" },
 /* 562 */
-  { 0 },
+  { ERR_CHANSECURED, "%s :Channel is older than 48 hours and secured. Cannot change Admin pass anymore", "562" },
 /* 563 */
-  { 0 },
+  { ERR_UPASSSET, "%s :Cannot remove Admin pass (+A) while User pass (+U) is still set.  First use /MODE %s -U <userpass>", "563" },
 /* 564 */
-  { 0 },
+  { ERR_UPASSNOTSET, "%s :Cannot set user pass (+U) until Admin pass (+A) is set.  First use /MODE %s +A <adminpass>", "564" },
 /* 565 */
-  { 0 },
+  { ERR_NOMANAGER_LONG, "%s :Re-create the channel.  The channel must be *empty* for 48 continuous hours before it can be recreated.", "565" },
 /* 566 */
-  { 0 },
+  { ERR_NOMANAGER_SHORT, "%s :Re-create the channel.  The channel must be *empty* for a minute or two before it can be recreated.", "566" },
 /* 567 */
-  { 0 },
+  { ERR_UPASS_SAME_APASS, "%s :Cannot use the same pass for both admin (+A) and user (+U) pass.", "567" },
 /* 568 */
   { 0 },
 /* 569 */