9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modules: revert lt_dlopenext() change

Browse source
This commit is contained in:
William Pitcock 2016-01-06 01:57:24 -06:00
parent 4f0e3623ca
commit d76258f559
3 changed files with 89 additions and 89 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
doc/ircd.conf.example
View file

@ -10,30 +10,30 @@
*/ */
/* Extensions */ /* Extensions */
#loadmodule "extensions/chm_operonly_compat"; #loadmodule "extensions/chm_operonly_compat.la";
#loadmodule "extensions/chm_quietunreg_compat"; #loadmodule "extensions/chm_quietunreg_compat.la";
#loadmodule "extensions/chm_sslonly_compat"; #loadmodule "extensions/chm_sslonly_compat.la";
#loadmodule "extensions/createauthonly"; #loadmodule "extensions/createauthonly.la";
#loadmodule "extensions/extb_account"; #loadmodule "extensions/extb_account.la";
#loadmodule "extensions/extb_canjoin"; #loadmodule "extensions/extb_canjoin.la";
#loadmodule "extensions/extb_channel"; #loadmodule "extensions/extb_channel.la";
#loadmodule "extensions/extb_combi"; #loadmodule "extensions/extb_combi.la";
#loadmodule "extensions/extb_extgecos"; #loadmodule "extensions/extb_extgecos.la";
#loadmodule "extensions/extb_hostmask"; #loadmodule "extensions/extb_hostmask.la";
#loadmodule "extensions/extb_oper"; #loadmodule "extensions/extb_oper.la";
#loadmodule "extensions/extb_realname"; #loadmodule "extensions/extb_realname.la";
#loadmodule "extensions/extb_server"; #loadmodule "extensions/extb_server.la";
#loadmodule "extensions/extb_ssl"; #loadmodule "extensions/extb_ssl.la";
#loadmodule "extensions/hurt"; #loadmodule "extensions/hurt.la";
#loadmodule "extensions/m_findforwards"; #loadmodule "extensions/m_findforwards.la";
#loadmodule "extensions/m_identify"; #loadmodule "extensions/m_identify.la";
#loadmodule "extensions/no_oper_invis"; #loadmodule "extensions/no_oper_invis.la";
#loadmodule "extensions/sno_farconnect"; #loadmodule "extensions/sno_farconnect.la";
#loadmodule "extensions/sno_globalkline"; #loadmodule "extensions/sno_globalkline.la";
#loadmodule "extensions/sno_globaloper"; #loadmodule "extensions/sno_globaloper.la";
#loadmodule "extensions/sno_whois"; #loadmodule "extensions/sno_whois.la";
#loadmodule "extensions/override"; #loadmodule "extensions/override.la";
#loadmodule "extensions/no_kill_services"; #loadmodule "extensions/no_kill_services.la";
/* /*
* IP cloaking extensions: use ip_cloaking_4.0 * IP cloaking extensions: use ip_cloaking_4.0
@ -42,8 +42,8 @@
* releases. * releases.
*/ */
#loadmodule "extensions/ip_cloaking_4.0"; #loadmodule "extensions/ip_cloaking_4.0.la";
#loadmodule "extensions/ip_cloaking"; #loadmodule "extensions/ip_cloaking.la";
serverinfo { serverinfo {
name = "hades.arpa"; name = "hades.arpa";

124
doc/reference.conf
View file

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

2
ircd/modules.c
View file

@ -619,7 +619,7 @@ load_a_module(const char *path, int warn, int core)
mod_basename = rb_basename(path); mod_basename = rb_basename(path);
tmpptr = lt_dlopenext(path); tmpptr = lt_dlopen(path);
if(tmpptr == NULL) if(tmpptr == NULL)
{ {