Move cmode +N to cmode +d, so that extensions/m_roleplay can retain cmode +N and...

[irc/rqf/shadowircd.git] / src / .depend

diff --git a/src/.depend b/src/.depend
index 1c8c58ddfb62bad27d9f5d0d7ddb9654373684aa..6d1bfde62886af62fa50bca0a6f7fdd64881ebc0 100644 (file)
--- a/src/.depend
+++ b/src/.depend
@@ -8,11 +8,11 @@ blacklist.o: blacklist.c ../include/stdinc.h \
   ../include/config.h ../include/setup.h ../include/defaults.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/res.h ../include/numeric.h \
-  ../include/reject.h ../include/s_conf.h ../include/class.h \
-  ../include/s_user.h ../include/blacklist.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/res.h ../include/numeric.h ../include/reject.h \
+  ../include/s_conf.h ../include/class.h ../include/s_user.h \
+  ../include/blacklist.h
 cache.o: cache.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -24,10 +24,9 @@ cache.o: cache.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/ircd_defs.h \
   ../include/common.h ../include/s_conf.h ../include/class.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/hash.h ../include/cache.h \
-  ../include/sprintf_irc.h ../include/irc_dictionary.h \
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/hash.h ../include/cache.h ../include/irc_dictionary.h \
   ../include/numeric.h
 channel.o: channel.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
@@ -40,13 +39,12 @@ channel.o: channel.c ../include/stdinc.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/channel.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/common.h \
-  ../include/hash.h ../include/hook.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/numeric.h \
-  ../include/s_serv.h ../include/s_user.h ../include/send.h \
-  ../include/whowas.h ../include/s_conf.h ../include/class.h \
-  ../include/s_newconf.h ../include/logger.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/common.h ../include/hash.h \
+  ../include/hook.h ../include/match.h ../include/ircd.h \
+  ../include/numeric.h ../include/s_serv.h ../include/s_user.h \
+  ../include/send.h ../include/whowas.h ../include/s_conf.h \
+  ../include/class.h ../include/s_newconf.h ../include/logger.h
 chmode.o: chmode.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -57,14 +55,13 @@ chmode.o: chmode.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/channel.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/common.h ../include/hash.h \
-  ../include/hook.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/numeric.h ../include/s_serv.h \
-  ../include/s_user.h ../include/send.h ../include/whowas.h \
-  ../include/s_conf.h ../include/class.h ../include/s_newconf.h \
-  ../include/logger.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/common.h ../include/hash.h ../include/hook.h \
+  ../include/match.h ../include/ircd.h ../include/numeric.h \
+  ../include/s_serv.h ../include/s_user.h ../include/send.h \
+  ../include/whowas.h ../include/s_conf.h ../include/class.h \
+  ../include/s_newconf.h ../include/logger.h ../include/chmode.h
 class.o: class.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -76,11 +73,10 @@ class.o: class.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/config.h \
   ../include/class.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/common.h \
-  ../include/ircd.h ../include/numeric.h ../include/s_conf.h \
-  ../include/class.h ../include/s_newconf.h ../include/send.h \
-  ../include/irc_string.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/common.h ../include/ircd.h \
+  ../include/numeric.h ../include/s_conf.h ../include/class.h \
+  ../include/s_newconf.h ../include/send.h ../include/match.h
 client.o: client.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -91,18 +87,17 @@ client.o: client.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/config.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/class.h ../include/common.h \
-  ../include/hash.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/s_gline.h ../include/numeric.h \
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/class.h ../include/common.h ../include/hash.h \
+  ../include/match.h ../include/ircd.h ../include/numeric.h \
   ../include/packet.h ../include/s_auth.h ../include/s_conf.h \
   ../include/class.h ../include/s_newconf.h ../include/logger.h \
   ../include/s_serv.h ../include/s_stats.h ../include/send.h \
   ../include/whowas.h ../include/s_user.h ../include/hostmask.h \
   ../include/listener.h ../include/hook.h ../include/msg.h \
   ../include/monitor.h ../include/blacklist.h ../include/reject.h \
-  ../include/scache.h ../include/irc_dictionary.h
+  ../include/scache.h ../include/irc_dictionary.h ../include/sslproc.h
 extban.o: extban.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -113,9 +108,9 @@ extban.o: extban.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/channel.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/common.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/common.h
 getopt.o: getopt.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -136,12 +131,11 @@ hash.o: hash.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/ircd_defs.h \
   ../include/s_conf.h ../include/class.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/channel.h \
-  ../include/client.h ../include/common.h ../include/hash.h \
-  ../include/irc_string.h ../include/ircd.h ../include/numeric.h \
-  ../include/send.h ../include/msg.h ../include/cache.h \
-  ../include/s_newconf.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/channel.h ../include/client.h \
+  ../include/common.h ../include/hash.h ../include/match.h \
+  ../include/ircd.h ../include/numeric.h ../include/send.h \
+  ../include/msg.h ../include/cache.h ../include/s_newconf.h
 hook.o: hook.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -151,7 +145,7 @@ hook.o: hook.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/rb_patricia.h ../include/config.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/hook.h \
-  ../include/irc_string.h
+  ../include/match.h
 hostmask.o: hostmask.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -163,24 +157,9 @@ hostmask.o: hostmask.c ../include/stdinc.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/ircd_defs.h ../include/s_conf.h ../include/class.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/hostmask.h ../include/numeric.h ../include/send.h \
-  ../include/irc_string.h
-irc_string.o: irc_string.c ../include/stdinc.h \
-  ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
-  ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
-  ../libratbox/include/rb_commio.h ../libratbox/include/rb_balloc.h \
-  ../libratbox/include/rb_linebuf.h ../libratbox/include/rb_snprintf.h \
-  ../libratbox/include/rb_event.h ../libratbox/include/rb_helper.h \
-  ../libratbox/include/rb_rawbuf.h ../libratbox/include/rb_patricia.h \
-  ../include/config.h ../include/setup.h ../include/defaults.h \
-  ../include/ircd_defs.h ../include/logger.h ../include/send.h \
-  ../include/sprintf_irc.h ../include/irc_string.h ../include/client.h \
-  ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/setup.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/hostmask.h \
+  ../include/numeric.h ../include/send.h ../include/match.h
 irc_dictionary.o: irc_dictionary.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -190,11 +169,10 @@ irc_dictionary.o: irc_dictionary.c ../include/stdinc.h \
   ../libratbox/include/rb_rawbuf.h ../libratbox/include/rb_patricia.h \
   ../include/config.h ../include/setup.h ../include/defaults.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
-  ../include/sprintf_irc.h ../include/irc_string.h ../include/client.h \
-  ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/setup.h ../include/irc_dictionary.h
+  ../include/match.h ../include/client.h ../include/channel.h \
+  ../include/res.h ../include/common.h ../include/reslib.h \
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/setup.h ../include/irc_dictionary.h
 ircd.o: ircd.c ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -208,10 +186,9 @@ ircd.o: ircd.c ../libratbox/include/ratbox_lib.h \
   ../include/config.h ../include/ircd.h ../include/channel.h \
   ../include/class.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/common.h \
-  ../include/hash.h ../include/irc_string.h ../include/ircd_signal.h \
-  ../include/sprintf_irc.h ../include/s_gline.h ../include/msg.h \
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/common.h ../include/hash.h \
+  ../include/match.h ../include/ircd_signal.h ../include/msg.h \
   ../include/hostmask.h ../include/numeric.h ../include/parse.h \
   ../include/irc_dictionary.h ../include/res.h ../include/restart.h \
   ../include/s_auth.h ../include/s_conf.h ../include/class.h \
@@ -221,7 +198,8 @@ ircd.o: ircd.c ../libratbox/include/ratbox_lib.h \
   ../include/parse.h ../include/msg.h ../include/hook.h ../include/hook.h \
   ../include/ircd_getopt.h ../include/newconf.h ../include/reject.h \
   ../include/s_newconf.h ../include/cache.h ../include/monitor.h \
-  ../include/patchlevel.h ../include/serno.h
+  ../include/patchlevel.h ../include/serno.h ../include/sslproc.h \
+  ../include/chmode.h
 ircd_signal.o: ircd_signal.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -234,35 +212,9 @@ ircd_signal.o: ircd_signal.c ../include/stdinc.h \
   ../include/ircd_signal.h ../include/ircd.h ../include/restart.h \
   ../include/logger.h ../include/s_conf.h ../include/class.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/send.h
-ircd_state.o: ircd_state.c ../include/stdinc.h \
-  ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
-  ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
-  ../libratbox/include/rb_commio.h ../libratbox/include/rb_balloc.h \
-  ../libratbox/include/rb_linebuf.h ../libratbox/include/rb_snprintf.h \
-  ../libratbox/include/rb_event.h ../libratbox/include/rb_helper.h \
-  ../libratbox/include/rb_rawbuf.h ../libratbox/include/rb_patricia.h \
-  ../include/config.h ../include/setup.h ../include/defaults.h \
-  ../include/ircd_defs.h ../include/logger.h ../include/send.h \
-  ../include/setup.h ../include/config.h ../include/client.h \
-  ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
+  ../include/common.h ../include/reslib.h ../include/match.h \
   ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/ircd.h ../include/channel.h ../include/class.h \
-  ../include/common.h ../include/hash.h ../include/irc_string.h \
-  ../include/ircd_signal.h ../include/sprintf_irc.h ../include/s_gline.h \
-  ../include/msg.h ../include/hostmask.h ../include/numeric.h \
-  ../include/parse.h ../include/irc_dictionary.h ../include/res.h \
-  ../include/restart.h ../include/s_auth.h ../include/s_conf.h \
-  ../include/class.h ../include/logger.h ../include/s_serv.h \
-  ../include/s_user.h ../include/s_stats.h ../include/scache.h \
-  ../include/send.h ../include/whowas.h ../include/modules.h \
-  ../include/parse.h ../include/msg.h ../include/hook.h ../include/hook.h \
-  ../include/ircd_getopt.h ../include/newconf.h ../include/reject.h \
-  ../include/s_newconf.h ../include/cache.h ../include/monitor.h \
-  ../include/patchlevel.h ../include/serno.h
+  ../include/send.h
 kdparse.o: kdparse.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -274,10 +226,10 @@ kdparse.o: kdparse.c ../include/stdinc.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/logger.h ../include/s_conf.h ../include/class.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/s_newconf.h ../include/hostmask.h ../include/client.h \
-  ../include/irc_string.h ../include/hash.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/s_newconf.h \
+  ../include/hostmask.h ../include/client.h ../include/match.h \
+  ../include/hash.h
 listener.o: listener.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -289,13 +241,13 @@ listener.o: listener.c ../include/stdinc.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/setup.h ../include/listener.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/ircd_defs.h ../include/numeric.h ../include/s_conf.h \
-  ../include/class.h ../include/s_newconf.h ../include/s_stats.h \
-  ../include/send.h ../include/s_auth.h ../include/reject.h \
-  ../include/hostmask.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/client.h ../include/match.h \
+  ../include/ircd.h ../include/ircd_defs.h ../include/numeric.h \
+  ../include/s_conf.h ../include/class.h ../include/s_newconf.h \
+  ../include/s_stats.h ../include/send.h ../include/s_auth.h \
+  ../include/reject.h ../include/hostmask.h ../include/sslproc.h \
+  ../include/hash.h
 logger.o: logger.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -307,10 +259,9 @@ logger.o: logger.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/ircd_defs.h \
   ../include/logger.h ../include/s_conf.h ../include/class.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/sprintf_irc.h ../include/send.h ../include/client.h \
-  ../include/s_serv.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/send.h \
+  ../include/client.h ../include/s_serv.h
 match.o: match.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -321,9 +272,9 @@ match.o: match.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/config.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/ircd.h ../include/irc_string.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/ircd.h ../include/match.h
 modules.o: modules.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -337,11 +288,10 @@ modules.o: modules.c ../include/stdinc.h \
   ../include/msg.h ../include/hook.h ../include/logger.h \
   ../include/ircd.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/send.h \
-  ../include/s_conf.h ../include/class.h ../include/s_newconf.h \
-  ../include/numeric.h ../include/parse.h ../include/ircd_defs.h \
-  ../include/irc_string.h ../include/sprintf_irc.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/send.h ../include/s_conf.h \
+  ../include/class.h ../include/s_newconf.h ../include/numeric.h \
+  ../include/parse.h ../include/ircd_defs.h ../include/match.h
 monitor.o: monitor.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -352,10 +302,9 @@ monitor.o: monitor.c ../include/stdinc.h \
   ../include/config.h ../include/setup.h ../include/defaults.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/monitor.h ../include/hash.h \
-  ../include/numeric.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/monitor.h ../include/hash.h ../include/numeric.h
 newconf.o: newconf.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -367,15 +316,15 @@ newconf.o: newconf.c ../include/stdinc.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/newconf.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/ircd_defs.h ../include/sprintf_irc.h \
-  ../include/common.h ../include/logger.h ../include/s_conf.h \
-  ../include/class.h ../include/s_user.h ../include/s_newconf.h \
-  ../include/send.h ../include/setup.h ../include/modules.h \
-  ../include/parse.h ../include/irc_dictionary.h ../include/msg.h \
-  ../include/hook.h ../include/listener.h ../include/hostmask.h \
-  ../include/s_serv.h ../include/hash.h ../include/cache.h \
-  ../include/ircd.h ../include/snomask.h ../include/blacklist.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/ircd_defs.h ../include/common.h ../include/logger.h \
+  ../include/s_conf.h ../include/class.h ../include/s_user.h \
+  ../include/s_newconf.h ../include/send.h ../include/setup.h \
+  ../include/modules.h ../include/parse.h ../include/irc_dictionary.h \
+  ../include/msg.h ../include/hook.h ../include/listener.h \
+  ../include/hostmask.h ../include/s_serv.h ../include/hash.h \
+  ../include/cache.h ../include/ircd.h ../include/snomask.h \
+  ../include/blacklist.h ../include/sslproc.h
 numeric.o: numeric.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -388,9 +337,9 @@ numeric.o: numeric.c ../include/stdinc.h \
   ../include/setup.h ../include/config.h ../include/s_conf.h \
   ../include/class.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/numeric.h ../include/irc_string.h \
-  ../include/common.h messages.tab
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/numeric.h ../include/match.h ../include/common.h \
+  messages.tab
 packet.o: packet.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -402,11 +351,11 @@ packet.o: packet.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/s_conf.h \
   ../include/class.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/s_serv.h ../include/client.h \
-  ../include/common.h ../include/ircd.h ../include/parse.h \
-  ../include/irc_dictionary.h ../include/packet.h ../include/irc_string.h \
-  ../include/hook.h ../include/send.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/s_serv.h ../include/client.h ../include/common.h \
+  ../include/ircd.h ../include/parse.h ../include/irc_dictionary.h \
+  ../include/packet.h ../include/match.h ../include/hook.h \
+  ../include/send.h
 parse.o: parse.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -418,13 +367,12 @@ parse.o: parse.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/parse.h \
   ../include/irc_dictionary.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/channel.h \
-  ../include/common.h ../include/hash.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/numeric.h \
-  ../include/logger.h ../include/s_stats.h ../include/send.h \
-  ../include/msg.h ../include/s_conf.h ../include/class.h \
-  ../include/s_serv.h ../include/packet.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/channel.h ../include/common.h \
+  ../include/hash.h ../include/match.h ../include/ircd.h \
+  ../include/numeric.h ../include/logger.h ../include/s_stats.h \
+  ../include/send.h ../include/msg.h ../include/s_conf.h \
+  ../include/class.h ../include/s_serv.h ../include/packet.h
 res.o: res.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -435,11 +383,10 @@ res.o: res.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/ircd_defs.h \
   ../include/common.h ../include/ircd.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/numeric.h \
-  ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/snomask.h ../include/client.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/reslib.h ../include/match.h \
+  ../include/numeric.h ../include/client.h ../include/channel.h \
+  ../include/res.h ../include/snomask.h ../include/client.h
 reslib.o: reslib.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -450,9 +397,8 @@ reslib.o: reslib.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/ircd_defs.h \
   ../include/common.h ../include/ircd.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/reslib.h ../include/match.h
 reject.o: reject.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -463,11 +409,10 @@ reject.o: reject.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/config.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/s_conf.h ../include/class.h \
-  ../include/reject.h ../include/s_stats.h ../include/msg.h \
-  ../include/hash.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/s_conf.h ../include/class.h ../include/reject.h \
+  ../include/s_stats.h ../include/msg.h ../include/hash.h
 restart.o: restart.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -480,9 +425,9 @@ restart.o: restart.c ../include/stdinc.h \
   ../include/restart.h ../include/ircd.h ../include/send.h \
   ../include/logger.h ../include/s_conf.h ../include/class.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/ircd_signal.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/ircd_signal.h
 s_auth.o: s_auth.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -492,15 +437,14 @@ s_auth.o: s_auth.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/rb_patricia.h ../include/config.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/config.h \
-  ../include/s_auth.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/s_conf.h ../include/class.h \
-  ../include/client.h ../include/channel.h ../include/snomask.h \
-  ../include/client.h ../include/common.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/numeric.h \
-  ../include/packet.h ../include/res.h ../include/logger.h \
-  ../include/s_stats.h ../include/send.h ../include/hook.h \
-  ../include/blacklist.h
+  ../include/s_auth.h ../include/s_conf.h ../include/class.h \
+  ../include/client.h ../include/channel.h ../include/res.h \
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/common.h ../include/match.h ../include/ircd.h \
+  ../include/numeric.h ../include/packet.h ../include/res.h \
+  ../include/logger.h ../include/s_stats.h ../include/send.h \
+  ../include/hook.h ../include/blacklist.h
 s_conf.o: s_conf.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -512,16 +456,16 @@ s_conf.o: s_conf.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/ircd_defs.h \
   ../include/s_conf.h ../include/class.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/s_newconf.h \
-  ../include/s_serv.h ../include/s_stats.h ../include/channel.h \
-  ../include/class.h ../include/client.h ../include/common.h \
-  ../include/hash.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/listener.h ../include/hostmask.h \
-  ../include/modules.h ../include/parse.h ../include/irc_dictionary.h \
-  ../include/msg.h ../include/hook.h ../include/numeric.h \
-  ../include/logger.h ../include/send.h ../include/s_gline.h \
-  ../include/reject.h ../include/cache.h ../include/blacklist.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/s_newconf.h ../include/s_serv.h \
+  ../include/s_stats.h ../include/channel.h ../include/class.h \
+  ../include/client.h ../include/common.h ../include/hash.h \
+  ../include/match.h ../include/ircd.h ../include/listener.h \
+  ../include/hostmask.h ../include/modules.h ../include/parse.h \
+  ../include/irc_dictionary.h ../include/msg.h ../include/hook.h \
+  ../include/numeric.h ../include/logger.h ../include/send.h \
+  ../include/reject.h ../include/cache.h ../include/blacklist.h \
+  ../include/sslproc.h
 s_newconf.o: s_newconf.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -534,29 +478,10 @@ s_newconf.o: s_newconf.c ../include/stdinc.h \
   ../include/ircd_defs.h ../include/common.h ../include/s_conf.h \
   ../include/class.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/s_newconf.h ../include/client.h \
-  ../include/s_serv.h ../include/send.h ../include/hostmask.h \
-  ../include/newconf.h ../include/hash.h ../include/sprintf_irc.h \
-  ../include/irc_dictionary.h
-s_gline.o: s_gline.c ../include/stdinc.h \
-  ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
-  ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
-  ../libratbox/include/rb_commio.h ../libratbox/include/rb_balloc.h \
-  ../libratbox/include/rb_linebuf.h ../libratbox/include/rb_snprintf.h \
-  ../libratbox/include/rb_event.h ../libratbox/include/rb_helper.h \
-  ../libratbox/include/rb_rawbuf.h ../libratbox/include/rb_patricia.h \
-  ../include/config.h ../include/setup.h ../include/defaults.h \
-  ../include/ircd_defs.h ../include/logger.h ../include/send.h \
-  ../include/channel.h ../include/client.h ../include/channel.h \
-  ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/common.h \
-  ../include/config.h ../include/irc_string.h ../include/ircd.h \
-  ../include/hostmask.h ../include/numeric.h ../include/s_conf.h \
-  ../include/class.h ../include/scache.h ../include/send.h \
-  ../include/msg.h ../include/s_serv.h ../include/s_gline.h \
-  ../include/hash.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/s_newconf.h ../include/client.h ../include/s_serv.h \
+  ../include/send.h ../include/hostmask.h ../include/newconf.h \
+  ../include/hash.h ../include/irc_dictionary.h
 s_serv.o: s_serv.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -568,15 +493,15 @@ s_serv.o: s_serv.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/s_serv.h \
   ../include/class.h ../include/client.h ../include/channel.h \
   ../include/res.h ../include/common.h ../include/reslib.h \
-  ../include/irc_string.h ../include/sprintf_irc.h ../include/ircd.h \
-  ../include/snomask.h ../include/client.h ../include/common.h \
-  ../include/hash.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/ircd_defs.h ../include/numeric.h \
-  ../include/packet.h ../include/res.h ../include/s_conf.h \
-  ../include/class.h ../include/s_newconf.h ../include/logger.h \
-  ../include/s_stats.h ../include/s_user.h ../include/scache.h \
-  ../include/send.h ../include/channel.h ../include/hook.h \
-  ../include/msg.h ../include/reject.h
+  ../include/match.h ../include/ircd.h ../include/snomask.h \
+  ../include/client.h ../include/common.h ../include/hash.h \
+  ../include/match.h ../include/ircd.h ../include/ircd_defs.h \
+  ../include/numeric.h ../include/packet.h ../include/res.h \
+  ../include/s_conf.h ../include/class.h ../include/s_newconf.h \
+  ../include/logger.h ../include/s_stats.h ../include/s_user.h \
+  ../include/scache.h ../include/send.h ../include/channel.h \
+  ../include/hook.h ../include/msg.h ../include/reject.h \
+  ../include/sslproc.h
 s_user.o: s_user.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -588,17 +513,17 @@ s_user.o: s_user.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/s_user.h \
   ../include/channel.h ../include/class.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/common.h ../include/hash.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/listener.h \
-  ../include/msg.h ../include/numeric.h ../include/s_conf.h \
-  ../include/class.h ../include/s_newconf.h ../include/logger.h \
-  ../include/s_serv.h ../include/s_stats.h ../include/scache.h \
-  ../include/send.h ../include/supported.h ../include/whowas.h \
-  ../include/packet.h ../include/reject.h ../include/cache.h \
-  ../include/hook.h ../include/monitor.h ../include/snomask.h \
-  ../include/blacklist.h ../include/substitution.h ../include/stdinc.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/client.h ../include/common.h \
+  ../include/hash.h ../include/match.h ../include/ircd.h \
+  ../include/listener.h ../include/msg.h ../include/numeric.h \
+  ../include/s_conf.h ../include/class.h ../include/s_newconf.h \
+  ../include/logger.h ../include/s_serv.h ../include/s_stats.h \
+  ../include/scache.h ../include/send.h ../include/supported.h \
+  ../include/whowas.h ../include/packet.h ../include/reject.h \
+  ../include/cache.h ../include/hook.h ../include/monitor.h \
+  ../include/snomask.h ../include/blacklist.h ../include/substitution.h \
+  ../include/stdinc.h ../include/chmode.h
 scache.o: scache.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -609,11 +534,11 @@ scache.o: scache.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/common.h ../include/irc_string.h ../include/ircd.h \
-  ../include/numeric.h ../include/send.h ../include/scache.h \
-  ../include/s_conf.h ../include/class.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/client.h ../include/common.h \
+  ../include/match.h ../include/ircd.h ../include/numeric.h \
+  ../include/send.h ../include/scache.h ../include/s_conf.h \
+  ../include/class.h
 send.o: send.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -625,12 +550,12 @@ send.o: send.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/logger.h ../include/send.h ../include/send.h \
   ../include/channel.h ../include/class.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/client.h \
-  ../include/common.h ../include/irc_string.h ../include/ircd.h \
-  ../include/numeric.h ../include/s_serv.h ../include/sprintf_irc.h \
-  ../include/s_conf.h ../include/class.h ../include/s_newconf.h \
-  ../include/logger.h ../include/hook.h ../include/monitor.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/client.h ../include/common.h \
+  ../include/match.h ../include/ircd.h ../include/numeric.h \
+  ../include/s_serv.h ../include/s_conf.h ../include/class.h \
+  ../include/s_newconf.h ../include/logger.h ../include/hook.h \
+  ../include/monitor.h
 snomask.o: snomask.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -641,9 +566,9 @@ snomask.o: snomask.c ../include/stdinc.h \
   ../include/config.h ../include/setup.h ../include/defaults.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/snomask.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/snomask.h
 sslproc.o: sslproc.c ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -655,11 +580,11 @@ sslproc.o: sslproc.c ../libratbox/include/ratbox_lib.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/s_conf.h ../include/class.h ../include/client.h \
   ../include/channel.h ../include/res.h ../include/common.h \
-  ../include/reslib.h ../include/irc_string.h ../include/sprintf_irc.h \
-  ../include/ircd.h ../include/snomask.h ../include/logger.h \
-  ../include/listener.h ../include/sslproc.h ../include/s_serv.h \
-  ../include/ircd.h ../include/hash.h ../include/client.h \
-  ../include/send.h ../include/packet.h
+  ../include/reslib.h ../include/match.h ../include/ircd.h \
+  ../include/snomask.h ../include/logger.h ../include/listener.h \
+  ../include/sslproc.h ../include/s_serv.h ../include/ircd.h \
+  ../include/hash.h ../include/client.h ../include/send.h \
+  ../include/packet.h
 substitution.o: substitution.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -669,7 +594,8 @@ substitution.o: substitution.c ../include/stdinc.h \
   ../libratbox/include/rb_rawbuf.h ../libratbox/include/rb_patricia.h \
   ../include/config.h ../include/setup.h ../include/defaults.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
-  ../include/s_user.h ../include/irc_string.h
+  ../include/s_user.h ../include/match.h ../include/substitution.h \
+  ../include/stdinc.h
 supported.o: supported.c ../include/stdinc.h \
   ../libratbox/include/ratbox_lib.h ../libratbox/include/librb-config.h \
   ../libratbox/include/rb_tools.h ../libratbox/include/rb_memory.h \
@@ -680,11 +606,11 @@ supported.o: supported.c ../include/stdinc.h \
   ../include/config.h ../include/setup.h ../include/defaults.h \
   ../include/ircd_defs.h ../include/logger.h ../include/send.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/common.h ../include/numeric.h \
-  ../include/ircd.h ../include/s_conf.h ../include/class.h \
-  ../include/supported.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/common.h ../include/numeric.h ../include/ircd.h \
+  ../include/s_conf.h ../include/class.h ../include/supported.h \
+  ../include/chmode.h
 whowas.o: whowas.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../libratbox/include/librb-config.h ../libratbox/include/rb_tools.h \
   ../libratbox/include/rb_memory.h ../libratbox/include/rb_commio.h \
@@ -695,10 +621,9 @@ whowas.o: whowas.c ../include/stdinc.h ../libratbox/include/ratbox_lib.h \
   ../include/setup.h ../include/defaults.h ../include/ircd_defs.h \
   ../include/logger.h ../include/send.h ../include/whowas.h \
   ../include/client.h ../include/channel.h ../include/res.h \
-  ../include/common.h ../include/reslib.h ../include/irc_string.h \
-  ../include/sprintf_irc.h ../include/ircd.h ../include/snomask.h \
-  ../include/client.h ../include/common.h ../include/hash.h \
-  ../include/irc_string.h ../include/ircd.h ../include/ircd_defs.h \
-  ../include/numeric.h ../include/s_serv.h ../include/s_user.h \
-  ../include/send.h ../include/s_conf.h ../include/class.h \
-  ../include/scache.h
+  ../include/common.h ../include/reslib.h ../include/match.h \
+  ../include/ircd.h ../include/snomask.h ../include/client.h \
+  ../include/common.h ../include/hash.h ../include/match.h \
+  ../include/ircd.h ../include/ircd_defs.h ../include/numeric.h \
+  ../include/s_serv.h ../include/s_user.h ../include/send.h \
+  ../include/s_conf.h ../include/class.h ../include/scache.h