New extensions documented + typo fixed

diff --git a/doc/example.conf b/doc/example.conf
index 34b2497ea9ae5bc640cea323402fd2e7763ce2b5..42c079ecbf4dac9f2cd9d22c96d79b82837973c0 100755 (executable)
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -10,6 +10,9 @@
  */
 
 /* Extensions */
+#loadmodule "extensions/chm_operonly_compat.so";
+#loadmodule "extensions/chm_quietunreg_compat.so";
+#loadmodule "extensions/chm_sslonly_compat.so";
 #loadmodule "extensions/createauthonly.so";
 #loadmodule "extensions/extb_account.so";
 #loadmodule "extensions/extb_canjoin.so";
@@ -18,6 +21,7 @@
 #loadmodule "extensions/extb_oper.so";
 #loadmodule "extensions/extb_realname.so";
 #loadmodule "extensions/extb_server.so";
+#loadmodule "extensions/extb_ssl.so";
 #loadmodule "extensions/hurt.so";
 #loadmodule "extensions/ip_cloaking.so";
 #loadmodule "extensions/m_findforwards.so";

diff --git a/doc/reference.conf b/doc/reference.conf
index 16aefa8ad71cdb03420309ca144a5c63d0186419..2afc5c241bf95fb5d52de58346f7dbcc34c53068 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -41,24 +41,31 @@
  * Charybdis contains several extensions that are not enabled by default.
  * To use them, uncomment the lines below.
  *
- * Restrict channel creation to logged in users   -- createauthonly.so
- * Account bans (+b $a[:mask])                    -- extb_account.so
- * Banned from another channel (+b $j:mask)       -- extb_canjoin.so
- * Other-channel bans (+b $c:mask)                -- extb_channel.so
- * Extended ban (+b $x:mask)                      -- extb_extgecos.so
- * Oper bans (+b $o)                              -- extb_oper.so
- * Realname (gecos) bans (+b $r:mask)             -- extb_realname.so
- * Server bans (+b $s:mask)                       -- extb_server.so
- * HURT system                                    -- hurt.so
- * Host mangling (umode +h)                       -- ip_cloaking.so
- * Find channel forwards                          -- m_findforwards.so
- * /identify support                              -- m_identify.so
- * Opers cannot be invisible (umode +i)           -- no_oper_invis.so
- * Far connection notices (snomask +F)            -- sno_farconnect.so
- * Remote k/d/g/x line active notices             -- sno_globalkline.so
- * Remote oper up notices                         -- sno_globaloper.so
- * /whois notifications (snomask +W)              -- sno_whois.so
+ * Emulates channel mode +-O (oper only) (+-iI $o)   -- chm_operonly_compat.so
+ * Emulates channel mode +-R (quiet unreg) (+-q $~a) -- chm_quietunreg_compat.so
+ * Emulates channel mode +-S (ssl only) (+-b $~z)    -- chm_sslonly_compat.so
+ * Restrict channel creation to logged in users      -- createauthonly.so
+ * Account bans (+b $a[:mask])                       -- extb_account.so
+ * Banned from another channel (+b $j:mask)          -- extb_canjoin.so
+ * Other-channel bans (+b $c:mask)                   -- extb_channel.so
+ * Extended ban (+b $x:mask)                         -- extb_extgecos.so
+ * Oper bans (+b $o)                                 -- extb_oper.so
+ * Realname (gecos) bans (+b $r:mask)                -- extb_realname.so
+ * Server bans (+b $s:mask)                          -- extb_server.so
+ * SSL bans (+b $z)                                  -- extb_ssl.so
+ * HURT system                                       -- hurt.so
+ * Host mangling (umode +h)                          -- ip_cloaking.so
+ * Find channel forwards                             -- m_findforwards.so
+ * /identify support                                 -- m_identify.so
+ * Opers cannot be invisible (umode +i)              -- no_oper_invis.so
+ * Far connection notices (snomask +F)               -- sno_farconnect.so
+ * Remote k/d/g/x line active notices                -- sno_globalkline.so
+ * Remote oper up notices                            -- sno_globaloper.so
+ * /whois notifications (snomask +W)                 -- sno_whois.so
  */
+#loadmodule "extensions/chm_operonly_compat.so";
+#loadmodule "extensions/chm_quietunreg_compat.so";
+#loadmodule "extensions/chm_sslonly_compat.so";
 #loadmodule "extensions/createauthonly.so";
 #loadmodule "extensions/extb_account.so";
 #loadmodule "extensions/extb_canjoin.so";
@@ -67,6 +74,7 @@
 #loadmodule "extensions/extb_oper.so";
 #loadmodule "extensions/extb_realname.so";
 #loadmodule "extensions/extb_server.so";
+#loadmodule "extensions/extb_ssl.so";
 #loadmodule "extensions/hurt.so";
 #loadmodule "extensions/ip_cloaking.so";
 #loadmodule "extensions/m_findforwards.so";

diff --git a/extensions/extb_ssl.c b/extensions/extb_ssl.c
index b3a8d810d8088d58deb13a0309a7c6431e9ed9e9..73e835b15564bd9ed8ab90dc889385f313e97627 100644 (file)
--- a/extensions/extb_ssl.c
+++ b/extensions/extb_ssl.c
@@ -1,4 +1,4 @@
-/* Oper extban type: matches ssl users */
+/* SSL extban type: matches ssl users */
 
 #include "stdinc.h"
 #include "modules.h"
@@ -31,8 +31,6 @@ static int eb_ssl(const char *data, struct Client *client_p,
 
        (void)chptr;
        (void)mode_type;
-       /* perhaps use data somehow? (opernick/flags?) */
-       /* so deny any bans with data for now */
        if (data != NULL)
                return EXTBAN_INVALID;
        return IsSSLClient(client_p) ? EXTBAN_MATCH : EXTBAN_NOMATCH;