modules: revert lt_dlopenext() change

diff --git a/doc/ircd.conf.example b/doc/ircd.conf.example
index 58dd2fdb85fe19773095d77d7d5585922b40d61b..0466cba46175e739be6144a5212560dc408cffa4 100755 (executable)
--- a/doc/ircd.conf.example
+++ b/doc/ircd.conf.example
@@ -10,30 +10,30 @@
  */
 
 /* Extensions */
-#loadmodule "extensions/chm_operonly_compat";
-#loadmodule "extensions/chm_quietunreg_compat";
-#loadmodule "extensions/chm_sslonly_compat";
-#loadmodule "extensions/createauthonly";
-#loadmodule "extensions/extb_account";
-#loadmodule "extensions/extb_canjoin";
-#loadmodule "extensions/extb_channel";
-#loadmodule "extensions/extb_combi";
-#loadmodule "extensions/extb_extgecos";
-#loadmodule "extensions/extb_hostmask";
-#loadmodule "extensions/extb_oper";
-#loadmodule "extensions/extb_realname";
-#loadmodule "extensions/extb_server";
-#loadmodule "extensions/extb_ssl";
-#loadmodule "extensions/hurt";
-#loadmodule "extensions/m_findforwards";
-#loadmodule "extensions/m_identify";
-#loadmodule "extensions/no_oper_invis";
-#loadmodule "extensions/sno_farconnect";
-#loadmodule "extensions/sno_globalkline";
-#loadmodule "extensions/sno_globaloper";
-#loadmodule "extensions/sno_whois";
-#loadmodule "extensions/override";
-#loadmodule "extensions/no_kill_services";
+#loadmodule "extensions/chm_operonly_compat.la";
+#loadmodule "extensions/chm_quietunreg_compat.la";
+#loadmodule "extensions/chm_sslonly_compat.la";
+#loadmodule "extensions/createauthonly.la";
+#loadmodule "extensions/extb_account.la";
+#loadmodule "extensions/extb_canjoin.la";
+#loadmodule "extensions/extb_channel.la";
+#loadmodule "extensions/extb_combi.la";
+#loadmodule "extensions/extb_extgecos.la";
+#loadmodule "extensions/extb_hostmask.la";
+#loadmodule "extensions/extb_oper.la";
+#loadmodule "extensions/extb_realname.la";
+#loadmodule "extensions/extb_server.la";
+#loadmodule "extensions/extb_ssl.la";
+#loadmodule "extensions/hurt.la";
+#loadmodule "extensions/m_findforwards.la";
+#loadmodule "extensions/m_identify.la";
+#loadmodule "extensions/no_oper_invis.la";
+#loadmodule "extensions/sno_farconnect.la";
+#loadmodule "extensions/sno_globalkline.la";
+#loadmodule "extensions/sno_globaloper.la";
+#loadmodule "extensions/sno_whois.la";
+#loadmodule "extensions/override.la";
+#loadmodule "extensions/no_kill_services.la";
 
 /*
  * IP cloaking extensions: use ip_cloaking_4.0
@@ -42,8 +42,8 @@
  * releases.
  */
 
-#loadmodule "extensions/ip_cloaking_4.0";
-#loadmodule "extensions/ip_cloaking";
+#loadmodule "extensions/ip_cloaking_4.0.la";
+#loadmodule "extensions/ip_cloaking.la";
 
 serverinfo {
        name = "hades.arpa";

diff --git a/doc/reference.conf b/doc/reference.conf
index 50d448a3736b8ba0496f51d877fbc2f3ede3c7ad..31817ef34544d3541918f4e85d96d5ca292a7e21 100755 (executable)
--- a/doc/reference.conf
+++ b/doc/reference.conf
@@ -44,65 +44,65 @@
  * Charybdis contains several extensions that are not enabled by default.
  * To use them, uncomment the lines below.
  *
- * Channel mode +-A (admin only)                     -- chm_adminonly
- * Channel mode +-O (oper only)                      -- chm_operonly
- * Channel mode +-S (ssl only)                       -- chm_sslonly
- * Emulates channel mode +-O (oper only) (+-iI $o)   -- chm_operonly_compat
- * Emulates channel mode +-R (quiet unreg) (+-q $~a) -- chm_quietunreg_compat
- * Emulates channel mode +-S (ssl only) (+-b $~z)    -- chm_sslonly_compat
- * Restrict channel creation to logged in users      -- createauthonly
- * Account bans (+b $a[:mask])                       -- extb_account
- * Banned from another channel (+b $j:mask)          -- extb_canjoin
- * Other-channel bans (+b $c:mask)                   -- extb_channel
- * Combination extbans                               -- extb_combi
- * Extended ban (+b $x:mask)                         -- extb_extgecos
- * Hostmask bans (for combination extbans)           -- extb_hostmask
- * Oper bans (+b $o)                                 -- extb_oper
- * Realname (gecos) bans (+b $r:mask)                -- extb_realname
- * Server bans (+b $s:mask)                          -- extb_server
- * SSL bans (+b $z)                                  -- extb_ssl
- * HURT system                                       -- hurt
- * New host mangling (umode +x)                      -- ip_cloaking_4.0
- * Old host mangling (umode +h)                      -- ip_cloaking
- * Find channel forwards                             -- m_findforwards
- * /identify support                                 -- m_identify
- * Opers cannot be invisible (umode +i)              -- no_oper_invis
- * Far connection notices (snomask +F)               -- sno_farconnect
- * Remote k/d/x line active notices                  -- sno_globalkline
- * Remote oper up notices                            -- sno_globaloper
- * /whois notifications (snomask +W)                 -- sno_whois
- * Oper-override (modehacking only)                  -- override
- * Stop services kills                               -- no_kill_services
+ * Channel mode +-A (admin only)                     -- chm_adminonly.la
+ * Channel mode +-O (oper only)                      -- chm_operonly.la
+ * Channel mode +-S (ssl only)                       -- chm_sslonly.la
+ * Emulates channel mode +-O (oper only) (+-iI $o)   -- chm_operonly_compat.la
+ * Emulates channel mode +-R (quiet unreg) (+-q $~a) -- chm_quietunreg_compat.la
+ * Emulates channel mode +-S (ssl only) (+-b $~z)    -- chm_sslonly_compat.la
+ * Restrict channel creation to logged in users      -- createauthonly.la
+ * Account bans (+b $a[:mask])                       -- extb_account.la
+ * Banned from another channel (+b $j:mask)          -- extb_canjoin.la
+ * Other-channel bans (+b $c:mask)                   -- extb_channel.la
+ * Combination extbans                               -- extb_combi.la
+ * Extended ban (+b $x:mask)                         -- extb_extgecos.la
+ * Hostmask bans (for combination extbans)           -- extb_hostmask.la
+ * Oper bans (+b $o)                                 -- extb_oper.la
+ * Realname (gecos) bans (+b $r:mask)                -- extb_realname.la
+ * Server bans (+b $s:mask)                          -- extb_server.la
+ * SSL bans (+b $z)                                  -- extb_ssl.la
+ * HURT system                                       -- hurt.la
+ * New host mangling (umode +x)                      -- ip_cloaking_4.0.la
+ * Old host mangling (umode +h)                      -- ip_cloaking.la
+ * Find channel forwards                             -- m_findforwards.la
+ * /identify support                                 -- m_identify.la
+ * Opers cannot be invisible (umode +i)              -- no_oper_invis.la
+ * Far connection notices (snomask +F)               -- sno_farconnect.la
+ * Remote k/d/x line active notices                  -- sno_globalkline.la
+ * Remote oper up notices                            -- sno_globaloper.la
+ * /whois notifications (snomask +W)                 -- sno_whois.la
+ * Oper-override (modehacking only)                  -- override.la
+ * Stop services kills                               -- no_kill_services.la
  */
-#loadmodule "extensions/chm_adminonly";
-#loadmodule "extensions/chm_operonly";
-#loadmodule "extensions/chm_sslonly";
-#loadmodule "extensions/chm_operonly_compat";
-#loadmodule "extensions/chm_quietunreg_compat";
-#loadmodule "extensions/chm_sslonly_compat";
-#loadmodule "extensions/createauthonly";
-#loadmodule "extensions/extb_account";
-#loadmodule "extensions/extb_canjoin";
-#loadmodule "extensions/extb_channel";
-#loadmodule "extensions/extb_combi";
-#loadmodule "extensions/extb_extgecos";
-#loadmodule "extensions/extb_hostmask";
-#loadmodule "extensions/extb_oper";
-#loadmodule "extensions/extb_realname";
-#loadmodule "extensions/extb_server";
-#loadmodule "extensions/extb_ssl";
-#loadmodule "extensions/hurt";
-#loadmodule "extensions/ip_cloaking_4.0";
-#loadmodule "extensions/ip_cloaking";
-#loadmodule "extensions/m_findforwards";
-#loadmodule "extensions/m_identify";
-#loadmodule "extensions/no_oper_invis";
-#loadmodule "extensions/sno_farconnect";
-#loadmodule "extensions/sno_globalkline";
-#loadmodule "extensions/sno_globaloper";
-#loadmodule "extensions/sno_whois";
-#loadmodule "extensions/override";
-#loadmodule "extensions/no_kill_services";
+#loadmodule "extensions/chm_adminonly.la";
+#loadmodule "extensions/chm_operonly.la";
+#loadmodule "extensions/chm_sslonly.la";
+#loadmodule "extensions/chm_operonly_compat.la";
+#loadmodule "extensions/chm_quietunreg_compat.la";
+#loadmodule "extensions/chm_sslonly_compat.la";
+#loadmodule "extensions/createauthonly.la";
+#loadmodule "extensions/extb_account.la";
+#loadmodule "extensions/extb_canjoin.la";
+#loadmodule "extensions/extb_channel.la";
+#loadmodule "extensions/extb_combi.la";
+#loadmodule "extensions/extb_extgecos.la";
+#loadmodule "extensions/extb_hostmask.la";
+#loadmodule "extensions/extb_oper.la";
+#loadmodule "extensions/extb_realname.la";
+#loadmodule "extensions/extb_server.la";
+#loadmodule "extensions/extb_ssl.la";
+#loadmodule "extensions/hurt.la";
+#loadmodule "extensions/ip_cloaking_4.0.la";
+#loadmodule "extensions/ip_cloaking.la";
+#loadmodule "extensions/m_findforwards.la";
+#loadmodule "extensions/m_identify.la";
+#loadmodule "extensions/no_oper_invis.la";
+#loadmodule "extensions/sno_farconnect.la";
+#loadmodule "extensions/sno_globalkline.la";
+#loadmodule "extensions/sno_globaloper.la";
+#loadmodule "extensions/sno_whois.la";
+#loadmodule "extensions/override.la";
+#loadmodule "extensions/no_kill_services.la";
 
 /* serverinfo {}:  Contains information about the server. (OLD M:) */
 serverinfo {
@@ -560,7 +560,7 @@ connect "irc.uplink.com" {
        flags = compressed, topicburst;
 };
 
-connect "ipv6me.server" {
+connect "ipv6.lame.server" {
        /* Hosts that are IPv6 addresses must be in :: shortened form
         * if applicable.  Addresses starting with a colon get an extra
         * zero prepended, for example: 0::1
@@ -616,8 +616,8 @@ cluster {
         *    all     - share all of the above
         */
 
-       /* share klines/unklines/xlines with *n */
-       name = "*n";
+       /* share klines/unklines/xlines with *.lan */
+       name = "*.lan";
        flags = kline, unkline, xline;
 
        /* share locops with irc.ircd-ratbox.org and ircd.ircd-ratbox.org */
@@ -1328,5 +1328,5 @@ modules {
        path = "/usr/local/ircd/modules/autoload";
 
        /* module: the name of a module to load on startup/rehash */
-       #module = "some_module";
+       #module = "some_module.la";
 };

diff --git a/ircd/modules.c b/ircd/modules.c
index 42b798049723969914916b934165ea6454d1c5d7..ada22c121a0c489fb26ea5478d0071b74bf7a6ce 100644 (file)
--- a/ircd/modules.c
+++ b/ircd/modules.c
@@ -619,7 +619,7 @@ load_a_module(const char *path, int warn, int core)
 
        mod_basename = rb_basename(path);
 
-       tmpptr = lt_dlopenext(path);
+       tmpptr = lt_dlopen(path);
 
        if(tmpptr == NULL)
        {