# BUILD : 1.7.13 (1010) # BUGS : 471 # NOTES : fixed charybdis umodes.

git-svn-id: svn://svn.anope.org/anope/trunk@1010 31f1291d-b8d6-0310-a050-a5561fc1590b


git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@735 5417fbe8-f217-4b02-8779-1006273d7864

4 files changed, 27 insertions, 30 deletions

diff --git a/Changes b/Changes
index 12677be6e..080bd8644 100644
--- a/Changes
+++ b/Changes
@@ -37,6 +37,7 @@ Provided by Anope Dev. <dev@anope.org> - 2006
 03/03 F Rage, Bahamut and Viagra will now use the correct server desc.    [#467]
 03/03 F Fixed botserv's mode behaviour with protect umode.                [#333]
 03/18 F Fixed sstrdup() with NULL argument in cs_akick.c.                 [#460]
+03/18 F Fixed charybdis umodes.                                           [#471]
 
 Provided by nenolod. <nenolod@nenolod.net> - 2006
 02/03 A Support for Charybdis IRCd.                                       [ #00]
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index 6ebe3ff85..074ff3b4d 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -216,23 +216,23 @@ unsigned long umodes[128] = {
     0, 0, 0,                    /* G H I */
     0, 0, 0,                    /* J K L */
     0, 0, 0,                    /* M N O */
-    0, 0, 0,                    /* P Q R */
-    0, 0, 0,                    /* S T U */
+    0, UMODE_Q, UMODE_R,        /* P Q R */
+    UMODE_S, 0, 0,              /* S T U */
     0, 0, 0,                    /* V W X */
     0,                          /* Y */
     0,                          /* Z */
     0, 0, 0,                    /* [ \ ] */
     0, 0, 0,                    /* ^ _ ` */
-    UMODE_a, UMODE_b, 0,        /* a b c */
-    UMODE_d, 0, 0,              /* d e f */
-    0, 0, UMODE_i,              /* g h i */
+    UMODE_a, 0, 0,              /* a b c */
+    0, 0, 0,                    /* d e f */
+    UMODE_g, 0, UMODE_i,        /* g h i */
     0, 0, UMODE_l,              /* j k l */
-    UMODE_g, UMODE_n, UMODE_o,  /* m n o */
+    0, 0, UMODE_o,              /* m n o */
     0, 0, 0,                    /* p q r */
-    0, 0, UMODE_u,              /* s t u */
-    0, UMODE_w, UMODE_x,        /* v w x */
+    UMODE_s, 0, 0,              /* s t u */
+    0, UMODE_w, 0,              /* v w x */
     0,                          /* y */
-    0,                          /* z */
+    UMODE_z,                    /* z */
     0, 0, 0,                    /* { | } */
     0, 0                        /* ~ ‚ */
 };
diff --git a/src/protocol/charybdis.h b/src/protocol/charybdis.h
index f452eae69..64107012a 100644
--- a/src/protocol/charybdis.h
+++ b/src/protocol/charybdis.h
@@ -11,26 +11,18 @@
  *
  */
 
-#define UMODE_a 0x00000001
-#define UMODE_C 0x00000002
-#define UMODE_i 0x00000004
-#define UMODE_o 0x00000008
-#define UMODE_z 0x00000010
-#define UMODE_w 0x00000020
-#define UMODE_s 0x00000040
-#define UMODE_c 0x00000080
-#define UMODE_r 0x00000100
-#define UMODE_k 0x00000200
-#define UMODE_f 0x00000400
-#define UMODE_y 0x00000800
-#define UMODE_d 0x00001000
-#define UMODE_n 0x00002000
-#define UMODE_x 0x00004000
-#define UMODE_u 0x00008000
-#define UMODE_b 0x00010000
-#define UMODE_l 0x00020000
-#define UMODE_g 0x00040000
-#define UMODE_Z 0x00080000
+#define UMODE_a 0x00000001 /* umode a - admin */
+#define UMODE_g 0x00000002 /* umode g - caller ID */
+#define UMODE_i 0x00000004 /* umode i - invisible */
+#define UMODE_o 0x00000008 /* umode o - operator */
+#define UMODE_z 0x00000010 /* umode u - operwall */
+#define UMODE_w 0x00000020 /* umode w - wallops */
+#define UMODE_s 0x00000040 /* umode s - server notices */
+#define UMODE_Q 0x00000080 /* umode Q - block forwarding */
+#define UMODE_R 0x00000200 /* umode R - reject messages from unauthenticated users */
+#define UMODE_S 0x00000400 /* umode S - network service */
+#define UMODE_l 0x00020000 /* umode l - locops */
+
 
 #define CMODE_i 0x00000001
 #define CMODE_m 0x00000002
diff --git a/version.log b/version.log
index b0fcb3a53..456ebbdb4 100644
--- a/version.log
+++ b/version.log
@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="13"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1009"
+VERSION_BUILD="1010"
 
 # $Log$
 #
+# BUILD : 1.7.13 (1010)
+# BUGS  : 471
+# NOTES : fixed charybdis umodes.
+#
 # BUILD : 1.7.13 (1009)
 # BUGS  : 460
 # NOTES : fixed sstrdup(NULL) in cs_akick.c