From: Kevin L. Mitchell <klmitch@mit.edu>
Date: Mon, 4 Dec 2000 20:07:31 +0000 (+0000)
Subject: Author: Kev <klmitch@mit.edu>
X-Git-Url: http://git.pk910.de/?p=ircu2.10.12-pk.git;a=commitdiff_plain;h=13e5ea0dd2bc6ff69a492189165a80d6a922ab05

Author: Kev <klmitch@mit.edu>
Log message:

Switched from calling ircd_log/write_log to log_write; removed all the
compile-time cruft associated with logging and syslogging; corrected a
couple of bugs in the new ircd_log.c functions; corrected a warning, then a
bug in m_create.c, presumably introduced by Isomer

Status: stable

Testing needed: Beat on it for a while.  example.conf still references
USERLOG and OPERLOG subsystems, but they no longer exist; use USER and OPER
instead.


git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@321 c9e4aea6-c8fd-4c43-8297-357d70d61c8c
---

diff --git a/ChangeLog b/ChangeLog
index df70ed1..1cdf64c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+2000-12-04  Kevin L. Mitchell  <klmitch@mit.edu>
+
+	* ircd/m_create.c: I'm tired of the exit_client warning :)
+	(ms_create): discovered that exit_client() was being called with
+	too few arguments
+
+	* ircd/s_misc.c (exit_client): remove all dependance on
+	FNAME_USERLOG, since that's now gone; log only to LS_USER
+
+	* ircd/s_debug.c: USE_SYSLOG no longer means anything
+
+	* ircd/m_oper.c (m_oper): no longer log to LS_OPERLOG--we already
+	log to LS_OPER
+
+	* ircd/m_kill.c: no longer conditionalize on SYSLOG_KILL
+
+	* ircd/ircd_log.c: remove LS_OPERLOG, LS_USERLOG
+
+	* include/ircd_log.h: remove LS_OPERLOG, LS_USERLOG--they serve
+	the same purpose as LS_USER and LS_OPER
+
+	* config/config-sh.in: remove no longer relevant log config
+	variables
+
+	* ircd/uping.c (uping_init): use log_write instead of ircd_log
+
+	* ircd/s_misc.c (exit_client): use log_write instead of ircd_log
+
+	* ircd/s_conf.c: use log_write instead of ircd_log
+
+	* ircd/s_bsd.c (report_error): use log_write instead of ircd_log
+
+	* ircd/s_auth.c (timeout_auth_queries): use log_write instead of
+	ircd_log
+
+	* ircd/res.c (send_res_msg): use log_write instead of ircd_log
+
+	* ircd/m_who.c: use log_write instead of write_log; no longer
+	conditionalize on WPATH; mark dead ircd_log calls
+
+	* ircd/m_uping.c: mark dead ircd_log call
+
+	* ircd/m_server.c (mr_server): use log_write instead of ircd_log
+
+	* ircd/m_restart.c: use log_write instead of ircd_log; mark dead
+	ircd_log calls
+
+	* ircd/m_rehash.c (mo_rehash): use log_write instead of ircd_log
+
+	* ircd/m_oper.c: use log_write instead of ircd_log; no longer
+	conditionalize on FNAME_OPERLOG; mark dead ircd_log calls
+
+	* ircd/m_kill.c: mark dead ircd_log calls
+
+	* ircd/m_connect.c: use log_write instead of ircd_log; mark dead
+	ircd_log
+
+	* ircd/m_clearmode.c: use log_write instead of write_log; no
+	longer conditionalize on OPATH
+
+	* ircd/jupe.c: use log_write instead of write_log; no longer
+	conditionalize on JPATH
+
+	* ircd/ircd_log.c: add USER subsystem; remove ircd_log() compat
+	function; fix a couple of bugs
+
+	* ircd/ircd_alloc.c: fixed a comment
+
+	* ircd/ircd.c: use log_write instead of ircd_log; fold server
+	notice generation in a couple of cases
+
+	* ircd/gline.c: use log_write instead of write_log; no longer
+	conditionalize on GPATH
+
+	* ircd/channel.c (modebuf_flush_int): use log_write instead of
+	write_log; no longer conditionalize on OPATH
+
+	* ircd/Makefile.in: run make depend, since dependencies have
+	changed
+
+	* doc/example.conf: add system USER to documentation
+
+	* include/ircd_log.h: add system USER; remove old ircd_log()
+	declarations
+
 2000-12-04  Isomer <isomer@coders.net>
 	* ircd/m_names.c: Add NAMES_EON to do_names to say add a
 	'end_of_names' reply when done.
diff --git a/config/config-sh.in b/config/config-sh.in
index 12444d8..e3ce7c9 100644
--- a/config/config-sh.in
+++ b/config/config-sh.in
@@ -227,10 +227,6 @@ endmenu
 
 mainmenu_option next_comment
 comment 'Logging (filenames are either full paths or files within DPATH)'
-  bool 'Do you want to log the use of /WHO x% (recommended)' CONFIG_LOG_WHOX y
-    if [ "$CONFIG_LOG_WHOX" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' WPATH 'whox.log'
-    fi
 
 comment 'Bad Channel G-Lines allow operators to add channel masks to a list which prohibits local clients from being able joining channels which match the mask.  Remote BadChan Glines allow Uworld to add or remove channels from the servers internal list of badchans'
   bool 'Do you want to enable Bad Channel G-lines' BADCHAN y
@@ -240,68 +236,6 @@ comment 'Bad Channel G-Lines allow operators to add channel masks to a list whic
       echo " Use of LOCAL BAD Channel G-Lines can be cause for REMOVAL"
       bool 'Allow LOCAL BAD Channel G-lines' LOCAL_BADCHAN
     fi
-
-  bool 'Do you want to log G-lines to a separate file' CONFIG_LOG_GLINES
-    if [ "$CONFIG_LOG_GLINES" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' GPATH 'gline.log'
-    fi
-  bool 'Do you want to log JUPEs to a separate file' CONFIG_LOG_JUPES y
-    if [ "$CONFIG_LOG_JUPES" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' JPATH 'jupe.log'
-    fi
-  bool 'Do you want to log OPMODEs and CLEARMODEs to a separate file' CONFIG_LOG_OPMODES y
-    if [ "$CONFIG_LOG_OPMODES" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' OPATH 'opmode.log'
-    fi
-  bool 'Do you want to log connecting users to a separate file' CONFIG_LOG_USERS
-    if [ "$CONFIG_LOG_USERS" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' FNAME_USERLOG users.log
-    fi
-  bool 'Do you want to log Opers to a separate file' CONFIG_LOG_OPERS
-    if [ "$CONFIG_LOG_OPERS" = "y" ]; then
-      string '   Give the path and(or) filename of this log file' FNAME_OPERLOG opers.log
-    fi
-  if [ "$ac_cv_header_syslog_h" = "yes" ]; then
-    bool 'Do you want to use syslog' USE_SYSLOG
-  else
-    USE_SYSLOG=n
-  fi
-    if [ "$USE_SYSLOG" = "y" ]; then
-      bool '   Log all operator kills to syslog' SYSLOG_KILL
-      bool '   Log all remote squits for all servers to syslog' SYSLOG_SQUIT
-      bool '   Log remote connect messages for other all servs' SYSLOG_CONNECT
-      bool '   Log all users who successfully become an Oper' SYSLOG_OPER
-      bool '   Send userlog stuff to syslog' SYSLOG_USERS
-      if [ "$SYSLOG_KILL" = "n" -a "$SYSLOG_SQUIT" = "n" -a \
-           "$SYSLOG_CONNECT" = "n" -a "$SYSLOG_OPER" = "n" -a \
-	   "$SYSLOG_USERS" = "n" ]; then
-	define_macro LOG_FACILITY $LOG_FACILITY
-        define_bool USE_SYSLOG n
-      else
-        choice '   Log facility' \
-		"daemon		CONFIG_DAEMON	\
-		user		CONFIG_USER	\
-		local0-7	CONFIG_LOCAL" daemon
-	if [ "$CONFIG_DAEMON" = "y" ]; then
-	  define_macro LOG_FACILITY LOG_DAEMON
-	else
-	  if [ "$CONFIG_USER" = "y" ]; then
-	    define_macro LOG_FACILITY LOG_USER
-	  else
-	    int '      Which local facility (0-7)' INT_LOCAL
-	    define_macro LOG_FACILITY LOG_LOCAL$INT_LOCAL
-	  fi
-	fi
-	echo "    Using log facility $LOG_FACILITY"
-      fi
-    else
-      define_bool SYSLOG_KILL $SYSLOG_KILL
-      define_bool SYSLOG_SQUIT $SYSLOG_SQUIT
-      define_bool SYSLOG_CONNECT $SYSLOG_CONNECT
-      define_bool SYSLOG_OPER $SYSLOG_OPER
-      define_bool SYSLOG_USERS $SYSLOG_USERS
-      define_macro LOG_FACILITY $LOG_FACILITY
-    fi
 endmenu
 
 mainmenu_option next_comment
diff --git a/doc/example.conf b/doc/example.conf
index 6fc165a..652e1a9 100644
--- a/doc/example.conf
+++ b/doc/example.conf
@@ -395,12 +395,12 @@ P:192.168.*:::6666
 #
 # The currently defined subsystems are SYSTEM, CONFIG, OPERMODE (used by
 # /opmode and /clearmode), GLINE, JUPE, WHO (used by /whox), NETWORK
-# (connects and disconnects), OPERKILL, SERVKILL, OPER, OPERLOG, USERLOG,
-# RESOLVER, SOCKET, DEBUG, and OLDLOG.  You can set log files for these
-# subsystems to log to, or you can tell them to syslog their data, or
-# even send server notices.  You can do any of these in combination, but
-# you can't log to more than one file.  You can also set minimum log
-# levels per subsystem, if you wish.
+# (connects and disconnects), OPERKILL, SERVKILL, USER, OPER, OPERLOG,
+# USERLOG, RESOLVER, SOCKET, DEBUG, and OLDLOG.  You can set log files
+# for these subsystems to log to, or you can tell them to syslog their
+# data, or even send server notices.  You can do any of these in
+# combination, but you can't log to more than one file.  You can also set
+# minimum log levels per subsystem, if you wish.
 #
 # The format for LOG Feature lines is as follows:
 #
diff --git a/include/ircd_log.h b/include/ircd_log.h
index 3673434..e16b087 100644
--- a/include/ircd_log.h
+++ b/include/ircd_log.h
@@ -45,22 +45,11 @@ enum LogLevel {
 
 enum LogSys {
   LS_SYSTEM, LS_CONFIG, LS_OPERMODE, LS_GLINE, LS_JUPE, LS_WHO, LS_NETWORK,
-  LS_OPERKILL, LS_SERVKILL, LS_OPER, LS_OPERLOG, LS_USERLOG, LS_RESOLVER,
-  LS_SOCKET, LS_DEBUG, LS_OLDLOG,
+  LS_OPERKILL, LS_SERVKILL, LS_USER, LS_OPER, LS_RESOLVER, LS_SOCKET,
+  LS_DEBUG, LS_OLDLOG,
   LS_LAST_SYSTEM
 };
 
-extern void open_log(const char* process_name);
-extern void close_log(void);
-extern void set_log_level(int level);
-extern int  get_log_level(void);
-extern void ircd_log(int priority, const char* fmt, ...);
-
-extern void ircd_log_kill(const struct Client* victim,
-                          const struct Client* killer,
-                          const char*          inpath,
-                          const char*          path);
-
 extern void log_debug_init(char *file);
 extern void log_init(const char *process_name);
 extern void log_reopen(void);
diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index 16da513..c0966bd 100644
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -291,8 +291,8 @@ stamp-m:
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 IPcheck.o: IPcheck.c ../include/IPcheck.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/numnicks.h ../include/ircd_alloc.h \
  ../include/fda.h ../include/s_debug.h ../include/s_user.h \
  ../include/send.h
@@ -300,28 +300,29 @@ channel.o: channel.c ../include/channel.h ../config/config.h \
  ../config/setup.h ../include/ircd_defs.h ../include/client.h \
  ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
  ../include/ircd.h ../include/struct.h ../include/ircd_alloc.h \
- ../include/fda.h ../include/ircd_chattr.h ../include/ircd_reply.h \
- ../include/ircd_snprintf.h ../include/ircd_string.h ../include/list.h \
- ../include/match.h ../include/msg.h ../include/numeric.h \
- ../include/numnicks.h ../include/querycmds.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
- ../include/s_user.h ../include/send.h ../include/sprintf_irc.h \
- ../include/support.h ../include/sys.h ../include/whowas.h
+ ../include/fda.h ../include/ircd_chattr.h ../include/ircd_log.h \
+ ../include/ircd_reply.h ../include/ircd_snprintf.h \
+ ../include/ircd_string.h ../include/list.h ../include/match.h \
+ ../include/msg.h ../include/numeric.h ../include/numnicks.h \
+ ../include/querycmds.h ../include/s_bsd.h ../include/s_conf.h \
+ ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
+ ../include/send.h ../include/sprintf_irc.h ../include/support.h \
+ ../include/sys.h ../include/whowas.h
 class.o: class.c ../include/class.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_reply.h ../include/list.h ../include/numeric.h \
  ../include/s_conf.h ../include/s_debug.h ../include/send.h
 client.o: client.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/class.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/class.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/list.h \
  ../include/numeric.h ../include/s_conf.h ../include/s_debug.h \
  ../include/send.h
 crule.o: crule.c ../include/crule.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_chattr.h ../include/ircd_string.h ../include/match.h \
  ../include/s_bsd.h ../include/s_debug.h
@@ -335,14 +336,14 @@ gline.o: gline.c ../include/gline.h ../config/config.h \
  ../config/setup.h ../include/client.h ../include/ircd_defs.h \
  ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
- ../include/ircd_reply.h ../include/ircd_string.h \
- ../include/ircd_chattr.h ../include/match.h ../include/numeric.h \
- ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
- ../include/send.h ../include/support.h ../include/msg.h \
- ../include/numnicks.h ../include/sys.h
+ ../include/ircd_log.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
+ ../include/numeric.h ../include/s_bsd.h ../include/s_debug.h \
+ ../include/s_misc.h ../include/send.h ../include/support.h \
+ ../include/msg.h ../include/numnicks.h ../include/sys.h
 hash.o: hash.c ../include/hash.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/channel.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/channel.h \
  ../include/ircd_chattr.h ../include/ircd_string.h ../include/ircd.h \
  ../include/struct.h ../include/msg.h ../include/send.h \
  ../include/support.h ../include/sys.h
@@ -363,10 +364,23 @@ ircd.o: ircd.c ../include/ircd.h ../config/config.h ../config/setup.h \
 ircd_alloc.o: ircd_alloc.c ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_string.h ../config/config.h ../config/setup.h \
  ../include/ircd_chattr.h ../include/s_debug.h ../include/ircd_defs.h
+ircd_features.o: ircd_features.c /usr/include/features.h \
+ ../include/client.h ../include/ircd_defs.h ../config/config.h \
+ ../config/setup.h ../include/dbuf.h ../include/ircd_handler.h \
+ ../include/hash.h ../include/ircd.h ../include/struct.h \
+ ../include/ircd_alloc.h ../include/fda.h ../include/ircd_log.h \
+ ../include/ircd_reply.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
+ ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
+ ../include/s_debug.h ../include/s_misc.h ../include/send.h \
+ ../include/support.h ../include/sys.h
 ircd_log.o: ircd_log.c ../include/ircd_log.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../config/config.h ../config/setup.h ../include/ircd_string.h \
- ../include/ircd_chattr.h ../include/s_debug.h ../include/struct.h
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_alloc.h \
+ ../include/fda.h ../include/ircd_reply.h ../include/ircd_snprintf.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/ircd.h \
+ ../include/struct.h ../include/numeric.h ../include/s_debug.h \
+ ../include/send.h
 ircd_osdep.o: ircd_osdep.c ../include/ircd_osdep.h
 ircd_relay.o: ircd_relay.c ../include/ircd_relay.h \
  ../include/channel.h ../config/config.h ../config/setup.h \
@@ -377,8 +391,8 @@ ircd_relay.o: ircd_relay.c ../include/ircd_relay.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \
  ../include/s_misc.h ../include/s_user.h ../include/send.h
 ircd_reply.o: ircd_reply.c ../include/ircd_reply.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_snprintf.h ../include/numeric.h \
  ../include/msg.h ../include/s_conf.h ../include/s_debug.h \
  ../include/send.h
@@ -386,8 +400,8 @@ ircd_signal.o: ircd_signal.c ../include/ircd_signal.h \
  ../include/ircd.h ../config/config.h ../config/setup.h \
  ../include/struct.h ../include/ircd_defs.h
 ircd_snprintf.o: ircd_snprintf.c ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/channel.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/channel.h \
  ../include/ircd_snprintf.h ../include/struct.h
 ircd_string.o: ircd_string.c ../include/ircd_string.h \
  ../config/config.h ../config/setup.h ../include/ircd_chattr.h \
@@ -397,14 +411,14 @@ jupe.o: jupe.c ../include/jupe.h ../config/config.h ../config/setup.h \
  ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
  ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
- ../include/ircd_reply.h ../include/ircd_string.h \
- ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
- ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
- ../include/s_misc.h ../include/send.h ../include/support.h \
- ../include/sys.h
+ ../include/ircd_log.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
+ ../include/msg.h ../include/numeric.h ../include/numnicks.h \
+ ../include/s_bsd.h ../include/s_misc.h ../include/send.h \
+ ../include/support.h ../include/sys.h
 list.o: list.c ../include/list.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/listener.h ../include/match.h \
@@ -413,8 +427,8 @@ list.o: list.c ../include/list.h ../include/client.h \
  ../include/s_user.h ../include/send.h ../include/support.h \
  ../include/whowas.h
 listener.o: listener.c ../include/listener.h ../include/ircd_defs.h \
- ../include/client.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/client.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_osdep.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h \
@@ -422,12 +436,13 @@ listener.o: listener.c ../include/listener.h ../include/ircd_defs.h \
  ../include/s_misc.h ../include/send.h ../include/sprintf_irc.h \
  ../include/sys.h
 m_admin.o: m_admin.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_reply.h \
- ../include/msg.h ../include/numeric.h ../include/numnicks.h \
- ../include/s_conf.h ../include/s_user.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_reply.h ../include/msg.h \
+ ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
+ ../include/s_user.h
 m_away.o: m_away.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_user.h ../include/send.h
@@ -441,59 +456,60 @@ m_burst.o: m_burst.c ../include/channel.h ../config/config.h \
  ../include/s_conf.h ../include/s_misc.h ../include/send.h \
  ../include/support.h
 m_clearmode.o: m_clearmode.c ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/channel.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/channel.h \
  ../include/hash.h ../include/ircd.h ../include/struct.h \
- ../include/ircd_alloc.h ../include/fda.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../include/ircd_chattr.h ../include/list.h \
- ../include/msg.h ../include/numeric.h ../include/numnicks.h \
- ../include/send.h ../include/support.h
+ ../include/ircd_alloc.h ../include/fda.h ../include/ircd_log.h \
+ ../include/ircd_reply.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/list.h ../include/msg.h \
+ ../include/numeric.h ../include/numnicks.h ../include/send.h \
+ ../include/support.h
 m_close.o: m_close.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/numeric.h ../include/s_bsd.h \
  ../include/send.h
 m_connect.o: m_connect.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/crule.h \
- ../include/hash.h ../include/ircd.h ../config/config.h \
- ../config/setup.h ../include/struct.h ../include/ircd_log.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/crule.h ../include/hash.h \
+ ../include/ircd.h ../include/struct.h ../include/ircd_log.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/jupe.h ../include/match.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_bsd.h ../include/s_conf.h ../include/s_user.h \
  ../include/send.h
 m_cprivmsg.o: m_cprivmsg.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../config/config.h ../config/setup.h \
- ../include/ircd_chattr.h ../include/s_user.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/s_user.h
 m_create.o: m_create.c ../include/channel.h ../config/config.h \
  ../config/setup.h ../include/ircd_defs.h ../include/client.h \
  ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
  ../include/ircd.h ../include/struct.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \
- ../include/s_user.h ../include/send.h
+ ../include/s_misc.h ../include/s_user.h ../include/send.h
 m_defaults.o: m_defaults.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/numeric.h ../include/numnicks.h \
  ../include/send.h ../include/supported.h ../include/channel.h \
  ../include/version.h
 m_destruct.o: m_destruct.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/send.h
 m_desynch.o: m_desynch.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_bsd.h ../include/send.h
 m_die.o: m_die.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_bsd.h ../include/send.h
@@ -504,29 +520,36 @@ m_endburst.o: m_endburst.c ../include/channel.h ../config/config.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/send.h
 m_error.o: m_error.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_debug.h ../include/s_misc.h ../include/send.h
+m_get.o: m_get.c ../include/client.h ../include/ircd_defs.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
+ ../include/struct.h ../include/ircd_features.h \
+ ../include/ircd_reply.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \
+ ../include/send.h
 m_gline.o: m_gline.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/gline.h \
- ../config/config.h ../config/setup.h ../include/hash.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/gline.h ../include/hash.h \
  ../include/ircd.h ../include/struct.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_conf.h ../include/s_misc.h ../include/send.h \
  ../include/support.h
 m_help.o: m_help.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/send.h
 m_info.o: m_info.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_misc.h ../include/s_user.h \
@@ -539,8 +562,8 @@ m_invite.o: m_invite.c ../include/channel.h ../config/config.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_user.h ../include/send.h
 m_ison.o: m_ison.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/numeric.h ../include/send.h
 m_join.o: m_join.c ../include/channel.h ../config/config.h \
@@ -552,8 +575,8 @@ m_join.o: m_join.c ../include/channel.h ../config/config.h \
  ../include/numnicks.h ../include/s_debug.h ../include/s_user.h \
  ../include/send.h ../include/handlers.h
 m_jupe.o: m_jupe.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/jupe.h \
- ../config/config.h ../config/setup.h ../include/hash.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/jupe.h ../include/hash.h \
  ../include/ircd.h ../include/struct.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
@@ -566,15 +589,15 @@ m_kick.o: m_kick.c ../include/channel.h ../config/config.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/send.h
 m_kill.o: m_kill.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_log.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_misc.h \
  ../include/send.h ../include/whowas.h
 m_links.o: m_links.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_user.h \
@@ -587,15 +610,15 @@ m_list.o: m_list.c ../include/channel.h ../config/config.h \
  ../include/ircd_string.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/send.h
 m_lusers.o: m_lusers.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/querycmds.h ../include/s_user.h \
  ../include/s_serv.h ../include/send.h
 m_map.o: m_map.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_snprintf.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/list.h \
  ../include/match.h ../include/numeric.h ../include/s_user.h \
@@ -609,8 +632,8 @@ m_mode.o: m_mode.c ../include/handlers.h ../include/channel.h \
  ../include/numnicks.h ../include/s_conf.h ../include/s_debug.h \
  ../include/s_user.h ../include/send.h
 m_motd.o: m_motd.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/match.h ../include/motd.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
@@ -624,21 +647,21 @@ m_names.o: m_names.c ../include/channel.h ../config/config.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_user.h \
  ../include/send.h
 m_nick.o: m_nick.c ../include/IPcheck.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/hash.h ../include/ircd.h ../config/config.h \
- ../config/setup.h ../include/struct.h ../include/ircd_chattr.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
+ ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \
  ../include/ircd_reply.h ../include/ircd_string.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \
  ../include/s_misc.h ../include/s_user.h ../include/send.h
 m_notice.o: m_notice.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_chattr.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_chattr.h \
  ../include/ircd_relay.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../config/config.h ../config/setup.h \
- ../include/match.h ../include/msg.h ../include/numeric.h \
- ../include/send.h ../include/handlers.h
+ ../include/ircd_string.h ../include/match.h ../include/msg.h \
+ ../include/numeric.h ../include/send.h ../include/handlers.h
 m_oper.o: m_oper.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_log.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h \
  ../include/ircd_xopen.h ../include/msg.h ../include/numeric.h \
@@ -646,8 +669,8 @@ m_oper.o: m_oper.c ../include/client.h ../include/ircd_defs.h \
  ../include/s_debug.h ../include/s_user.h ../include/s_misc.h \
  ../include/send.h ../include/support.h
 m_opmode.o: m_opmode.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/channel.h \
- ../config/config.h ../config/setup.h ../include/hash.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/channel.h ../include/hash.h \
  ../include/ircd.h ../include/struct.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/send.h
@@ -658,30 +681,30 @@ m_part.o: m_part.c ../include/channel.h ../config/config.h \
  ../include/ircd_string.h ../include/ircd_chattr.h \
  ../include/numeric.h ../include/numnicks.h ../include/send.h
 m_pass.o: m_pass.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../config/config.h ../config/setup.h \
- ../include/ircd_chattr.h ../include/send.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/send.h
 m_ping.o: m_ping.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd_reply.h ../include/ircd_string.h ../config/config.h \
- ../config/setup.h ../include/ircd_chattr.h ../include/ircd.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/ircd.h \
  ../include/struct.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_debug.h ../include/send.h
 m_pong.o: m_pong.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_user.h ../include/send.h
 m_privmsg.o: m_privmsg.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_chattr.h ../include/ircd_relay.h \
  ../include/ircd_reply.h ../include/ircd_string.h ../include/match.h \
  ../include/msg.h ../include/numeric.h ../include/send.h
 m_proto.o: m_proto.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_alloc.h ../include/fda.h ../include/ircd_chattr.h \
  ../include/ircd_reply.h ../include/ircd_string.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_debug.h ../include/s_misc.h \
@@ -693,33 +716,40 @@ m_quit.o: m_quit.c ../include/channel.h ../config/config.h \
  ../include/ircd_chattr.h ../include/struct.h ../include/s_misc.h \
  ../include/ircd_reply.h
 m_rehash.o: m_rehash.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_log.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../include/ircd_chattr.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/motd.h \
  ../include/numeric.h ../include/s_conf.h ../include/send.h
+m_reset.o: m_reset.c ../include/client.h ../include/ircd_defs.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
+ ../include/struct.h ../include/ircd_features.h \
+ ../include/ircd_reply.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \
+ ../include/send.h
 m_restart.o: m_restart.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_log.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h \
  ../include/numeric.h ../include/numnicks.h ../include/send.h
 m_rping.o: m_rping.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/opercmds.h ../include/s_user.h \
  ../include/send.h
 m_rpong.o: m_rpong.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/opercmds.h ../include/send.h
 m_server.o: m_server.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_log.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/jupe.h \
  ../include/list.h ../include/match.h ../include/msg.h \
@@ -727,9 +757,16 @@ m_server.o: m_server.c ../include/client.h ../include/ircd_defs.h \
  ../include/s_bsd.h ../include/s_conf.h ../include/s_debug.h \
  ../include/s_misc.h ../include/s_serv.h ../include/send.h \
  ../include/userload.h
+m_set.o: m_set.c ../include/client.h ../include/ircd_defs.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
+ ../include/struct.h ../include/ircd_features.h \
+ ../include/ircd_reply.h ../include/ircd_string.h \
+ ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \
+ ../include/send.h
 m_settime.o: m_settime.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/list.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_user.h \
@@ -742,8 +779,8 @@ m_silence.o: m_silence.c ../include/channel.h ../config/config.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_user.h ../include/send.h
 m_squit.o: m_squit.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_chattr.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/numeric.h ../include/numnicks.h \
  ../include/match.h ../include/s_debug.h ../include/s_misc.h \
@@ -761,8 +798,8 @@ m_stats.o: m_stats.c ../include/s_stats.h ../include/channel.h \
  ../include/s_misc.h ../include/s_serv.h ../include/s_user.h \
  ../include/send.h ../include/userload.h
 m_time.o: m_time.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_misc.h ../include/s_user.h \
@@ -774,40 +811,40 @@ m_topic.o: m_topic.c ../include/channel.h ../config/config.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/send.h
 m_trace.o: m_trace.c ../include/class.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/hash.h ../include/ircd.h ../config/config.h \
- ../config/setup.h ../include/struct.h ../include/ircd_reply.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
+ ../include/ircd.h ../include/struct.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_bsd.h ../include/s_conf.h ../include/s_user.h \
  ../include/send.h ../include/version.h
 m_uping.o: m_uping.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
  ../include/s_user.h ../include/send.h ../include/uping.h
 m_user.o: m_user.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_chattr.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
  ../include/send.h
 m_userhost.o: m_userhost.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../config/config.h ../config/setup.h \
- ../include/ircd_chattr.h ../include/numeric.h ../include/s_user.h \
- ../include/struct.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h \
+ ../include/numeric.h ../include/s_user.h ../include/struct.h
 m_userip.o: m_userip.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../config/config.h ../config/setup.h \
- ../include/ircd_chattr.h ../include/numeric.h ../include/s_user.h \
- ../include/struct.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h \
+ ../include/numeric.h ../include/s_user.h ../include/struct.h
 m_version.o: m_version.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_debug.h ../include/s_user.h \
@@ -821,10 +858,10 @@ m_wallchops.o: m_wallchops.c ../include/channel.h ../config/config.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_user.h \
  ../include/send.h
 m_wallops.o: m_wallops.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/ircd_reply.h \
- ../include/ircd_string.h ../config/config.h ../config/setup.h \
- ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
- ../include/send.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
+ ../include/numeric.h ../include/send.h
 m_who.o: m_who.c ../include/channel.h ../config/config.h \
  ../config/setup.h ../include/ircd_defs.h ../include/client.h \
  ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
@@ -841,44 +878,44 @@ m_whois.o: m_whois.c ../include/channel.h ../config/config.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_user.h ../include/send.h ../include/whocmds.h
 m_whowas.o: m_whowas.c ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/hash.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
  ../include/numnicks.h ../include/s_user.h ../include/s_misc.h \
  ../include/send.h ../include/whowas.h
 match.o: match.c ../include/match.h ../include/ircd_chattr.h
 motd.o: motd.c ../include/motd.h ../include/class.h \
- ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
- ../include/ircd_handler.h ../include/fileio.h ../include/ircd.h \
- ../config/config.h ../config/setup.h ../include/struct.h \
+ ../include/client.h ../include/ircd_defs.h ../config/config.h \
+ ../config/setup.h ../include/dbuf.h ../include/ircd_handler.h \
+ ../include/fileio.h ../include/ircd.h ../include/struct.h \
  ../include/ircd_alloc.h ../include/fda.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
  ../include/s_conf.h ../include/s_debug.h ../include/s_user.h \
  ../include/send.h
 numnicks.o: numnicks.c ../include/numnicks.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
  ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h
 opercmds.o: opercmds.c ../include/opercmds.h ../include/class.h \
- ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
- ../include/ircd_handler.h ../include/ircd.h ../config/config.h \
- ../config/setup.h ../include/struct.h ../include/ircd_chattr.h \
+ ../include/client.h ../include/ircd_defs.h ../config/config.h \
+ ../config/setup.h ../include/dbuf.h ../include/ircd_handler.h \
+ ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
  ../include/listener.h ../include/match.h ../include/msg.h \
  ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
  ../include/send.h
 packet.o: packet.c ../include/packet.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_chattr.h ../include/parse.h \
  ../include/s_bsd.h ../include/s_misc.h ../include/send.h
 parse.o: parse.c ../include/parse.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/channel.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/channel.h \
  ../include/handlers.h ../include/hash.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_chattr.h ../include/ircd_reply.h \
@@ -892,8 +929,8 @@ querycmds.o: querycmds.c ../include/querycmds.h
 random.o: random.c ../include/random.h ../config/config.h \
  ../config/setup.h
 res.o: res.c ../include/res.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_log.h ../include/ircd_osdep.h ../include/ircd_reply.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
@@ -924,27 +961,27 @@ s_bsd.o: s_bsd.c ../include/s_bsd.h ../config/config.h \
  ../include/sys.h ../include/uping.h ../include/version.h
 s_conf.o: s_conf.c ../include/s_conf.h ../include/IPcheck.h \
  ../include/class.h ../include/client.h ../include/ircd_defs.h \
- ../include/dbuf.h ../include/ircd_handler.h ../include/crule.h \
- ../include/fileio.h ../include/gline.h ../config/config.h \
- ../config/setup.h ../include/hash.h ../include/ircd.h \
- ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
- ../include/ircd_chattr.h ../include/ircd_log.h \
- ../include/ircd_reply.h ../include/ircd_snprintf.h \
- ../include/ircd_string.h ../include/list.h ../include/listener.h \
- ../include/match.h ../include/motd.h ../include/numeric.h \
- ../include/numnicks.h ../include/opercmds.h ../include/parse.h \
- ../include/res.h ../include/s_bsd.h ../include/s_debug.h \
- ../include/s_misc.h ../include/send.h ../include/sprintf_irc.h \
- ../include/support.h ../include/sys.h
+ ../config/config.h ../config/setup.h ../include/dbuf.h \
+ ../include/ircd_handler.h ../include/crule.h \
+ ../include/ircd_features.h ../include/fileio.h ../include/gline.h \
+ ../include/hash.h ../include/ircd.h ../include/struct.h \
+ ../include/ircd_alloc.h ../include/fda.h ../include/ircd_chattr.h \
+ ../include/ircd_log.h ../include/ircd_reply.h \
+ ../include/ircd_snprintf.h ../include/ircd_string.h ../include/list.h \
+ ../include/listener.h ../include/match.h ../include/motd.h \
+ ../include/numeric.h ../include/numnicks.h ../include/opercmds.h \
+ ../include/parse.h ../include/res.h ../include/s_bsd.h \
+ ../include/s_debug.h ../include/s_misc.h ../include/send.h \
+ ../include/sprintf_irc.h ../include/support.h ../include/sys.h
 s_debug.o: s_debug.c ../include/s_debug.h ../config/config.h \
  ../config/setup.h ../include/ircd_defs.h ../include/channel.h \
  ../include/class.h ../include/client.h ../include/dbuf.h \
  ../include/ircd_handler.h ../include/hash.h ../include/ircd_alloc.h \
- ../include/fda.h ../include/ircd_osdep.h ../include/ircd_reply.h \
- ../include/ircd.h ../include/struct.h ../include/list.h \
- ../include/numeric.h ../include/numnicks.h ../include/res.h \
- ../include/s_bsd.h ../include/s_conf.h ../include/send.h \
- ../include/sys.h ../include/whowas.h
+ ../include/fda.h ../include/ircd_log.h ../include/ircd_osdep.h \
+ ../include/ircd_reply.h ../include/ircd.h ../include/struct.h \
+ ../include/list.h ../include/numeric.h ../include/numnicks.h \
+ ../include/res.h ../include/s_bsd.h ../include/s_conf.h \
+ ../include/send.h ../include/sys.h ../include/whowas.h
 s_err.o: s_err.c ../include/numeric.h ../include/s_debug.h \
  ../config/config.h ../config/setup.h ../include/ircd_defs.h \
  ../include/sprintf_irc.h
@@ -980,13 +1017,13 @@ s_serv.o: s_serv.c ../include/s_serv.h ../include/IPcheck.h \
  ../include/s_misc.h ../include/s_user.h ../include/send.h \
  ../include/sprintf_irc.h ../include/sys.h ../include/userload.h
 s_stats.o: s_stats.c ../include/s_stats.h ../include/class.h \
- ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
- ../include/ircd_handler.h ../include/ircd.h ../config/config.h \
- ../config/setup.h ../include/struct.h ../include/ircd_chattr.h \
- ../include/ircd_reply.h ../include/ircd_string.h \
- ../include/listener.h ../include/match.h ../include/msg.h \
- ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
- ../include/s_user.h ../include/send.h
+ ../include/client.h ../include/ircd_defs.h ../config/config.h \
+ ../config/setup.h ../include/dbuf.h ../include/ircd_handler.h \
+ ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \
+ ../include/ircd_log.h ../include/ircd_reply.h \
+ ../include/ircd_string.h ../include/listener.h ../include/match.h \
+ ../include/msg.h ../include/numeric.h ../include/numnicks.h \
+ ../include/s_conf.h ../include/s_user.h ../include/send.h
 s_user.o: s_user.c ../include/s_user.h ../include/IPcheck.h \
  ../include/channel.h ../config/config.h ../config/setup.h \
  ../include/ircd_defs.h ../include/class.h ../include/client.h \
@@ -1019,8 +1056,8 @@ support.o: support.c ../include/support.h ../config/config.h \
  ../include/ircd_snprintf.h ../include/s_bsd.h ../include/s_debug.h \
  ../include/send.h ../include/sprintf_irc.h ../include/sys.h
 uping.o: uping.c ../include/uping.h ../include/ircd_defs.h \
- ../include/client.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/client.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_log.h ../include/ircd_osdep.h \
  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
@@ -1029,8 +1066,8 @@ uping.o: uping.c ../include/uping.h ../include/ircd_defs.h \
  ../include/s_misc.h ../include/s_user.h ../include/send.h \
  ../include/sys.h
 userload.o: userload.c ../include/userload.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/msg.h ../include/numnicks.h \
  ../include/querycmds.h ../include/s_misc.h ../include/send.h \
  ../include/sys.h
@@ -1047,8 +1084,8 @@ whocmds.o: whocmds.c ../include/whocmds.h ../config/config.h \
  ../include/userload.h ../include/version.h ../include/whowas.h \
  ../include/msg.h
 whowas.o: whowas.c ../include/whowas.h ../include/client.h \
- ../include/ircd_defs.h ../include/dbuf.h ../include/ircd_handler.h \
- ../include/ircd.h ../config/config.h ../config/setup.h \
+ ../include/ircd_defs.h ../config/config.h ../config/setup.h \
+ ../include/dbuf.h ../include/ircd_handler.h ../include/ircd.h \
  ../include/struct.h ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_chattr.h ../include/ircd_string.h ../include/list.h \
  ../include/numeric.h ../include/s_misc.h ../include/s_user.h \
diff --git a/ircd/channel.c b/ircd/channel.c
index 3a1ff75..6c974c6 100644
--- a/ircd/channel.c
+++ b/ircd/channel.c
@@ -25,6 +25,7 @@
 #include "ircd.h"
 #include "ircd_alloc.h"
 #include "ircd_chattr.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -2828,13 +2829,11 @@ modebuf_flush_int(struct ModeBuf *mbuf, int all)
 			   addbuf, remstr, addstr,
 			   mbuf->mb_channel->creationtime);
 
-#ifdef OPATH
-    if (mbuf->mb_dest & MODEBUF_DEST_LOG) {
-      write_log(OPATH, "%Tu %#C OPMODE %H %s%s%s%s%s%s\n", TStime(),
-		mbuf->mb_source, mbuf->mb_channel, rembuf_i ? "-" : "", rembuf,
+    if (mbuf->mb_dest & MODEBUF_DEST_LOG)
+      log_write(LS_OPERMODE, L_INFO, LOG_NOSNOTICE,
+		"%#C OPMODE %H %s%s%s%s%s%s", mbuf->mb_source,
+		mbuf->mb_channel, rembuf_i ? "-" : "", rembuf,
 		addbuf_i ? "+" : "", addbuf, remstr, addstr);
-    }
-#endif
 
     if (mbuf->mb_dest & MODEBUF_DEST_CHANNEL)
       sendcmdto_channel_butserv(app_source, CMD_MODE, mbuf->mb_channel,
diff --git a/ircd/gline.c b/ircd/gline.c
index 3de628d..f32671b 100644
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -23,6 +23,7 @@
 #include "client.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -261,13 +262,12 @@ gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
 		       flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", userhost,
 		       expire + TSoffset, reason);
 
-#ifdef GPATH
   /* and log it */
-  write_log(GPATH, "# %Tu %C adding %s %s for %s, expiring at %Tu: %s\n",
-	    TStime(), sptr, flags & GLINE_LOCAL ? "local" : "global",
+  log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
+	    "%#C adding %s %s for %s, expiring at %Tu: %s", sptr,
+	    flags & GLINE_LOCAL ? "local" : "global",
 	    flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", userhost,
 	    expire + TSoffset, reason);
-#endif /* GPATH */
 
   /* make the gline */
   agline = make_gline(userhost, reason, expire, lastmod, flags);
@@ -280,12 +280,6 @@ gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
   if (GlineIsBadChan(agline))
     return 0;
 
-#ifdef GPATH
-  /* this can be inserted into the conf */
-  write_log(GPATH, "%c:%s:%s:%s\n", GlineIsIpMask(agline) ? 'k' : 'K',
-	    GlineHost(agline), GlineReason(agline), GlineUser(agline));
-#endif /* GPATH */
-
   return do_gline(cptr, sptr, agline); /* knock off users if necessary */
 }
 
@@ -322,14 +316,12 @@ gline_activate(struct Client *cptr, struct Client *sptr, struct Gline *gline,
 		       GlineIsBadChan(gline) ? "" : gline->gl_host,
 		       gline->gl_expire + TSoffset, gline->gl_reason);
 
-#ifdef GPATH
-  write_log(GPATH, "# %Tu %C activating global %s for %s%s%s, expiring at "
-	    "%Tu: %s\n", TStime(), sptr,
-	    GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
-	    gline->gl_user, GlineIsBadChan(gline) ? "" : "@",
+  log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
+	    "%#C activating global %s for %s%s%s, expiring at %Tu: %s", sptr,
+	    GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
+	    GlineIsBadChan(gline) ? "" : "@",
 	    GlineIsBadChan(gline) ? "" : gline->gl_host,
 	    gline->gl_expire + TSoffset, gline->gl_reason);
-#endif /* GPATH */
 
   if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
     propagate_gline(cptr, sptr, gline);
@@ -379,13 +371,12 @@ gline_deactivate(struct Client *cptr, struct Client *sptr, struct Gline *gline,
 		       GlineIsBadChan(gline) ? "" : gline->gl_host,
 		       gline->gl_expire + TSoffset, gline->gl_reason);
 
-#ifdef GPATH
-  write_log(GPATH, "# %Tu %C %s %s for %s%s%s, expiring at %Tu: %s\n",
-	    TStime(), sptr, msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
-	    gline->gl_user, GlineIsBadChan(gline) ? "" : "@",
+  log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
+	    "%#C %s %s for %s%s%s, expiring at %Tu: %s", sptr, msg,
+	    GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
+	    GlineIsBadChan(gline) ? "" : "@",
 	    GlineIsBadChan(gline) ? "" : gline->gl_host,
 	    gline->gl_expire + TSoffset, gline->gl_reason);
-#endif /* GPATH */
 
   if (GlineIsLocal(gline) || (!gline->gl_lastmod && !(flags & GLINE_LOCAL)))
     gline_free(gline);
diff --git a/ircd/ircd.c b/ircd/ircd.c
index 45f2336..8e90c19 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -105,8 +105,8 @@ static struct Daemon thisServer  = { 0 };     // server process info
  * API: server_die
  *--------------------------------------------------------------------------*/
 void server_die(const char* message) {
-  ircd_log(L_CRIT, "Server terminating: %s", message);
-  sendto_opmask_butone(0, SNO_OLDSNO, "Server terminating: %s", message);
+  /* log_write will send out message to both log file and as server notice */
+  log_write(LS_SYSTEM, L_CRIT, 0, "Server terminating: %s", message);
   flush_connections(0);
   close_connections(1);
   thisServer.running = 0;
@@ -119,8 +119,10 @@ void server_die(const char* message) {
 void server_restart(const char* message) {
   static int restarting = 0;
 
-  ircd_log(L_WARNING, "Restarting Server: %s", message);
-  if (restarting)
+  /* inhibit sending any server notices; we may be in a loop */
+  log_write(LS_SYSTEM, L_WARNING, LOG_NOSNOTICE, "Restarting Server: %s",
+	    message);
+  if (restarting++) /* increment restarting to prevent looping */
     return;
 
   sendto_opmask_butone(0, SNO_OLDSNO, "Restarting server: %s", message);
@@ -136,7 +138,8 @@ void server_restart(const char* message) {
   /* Have to reopen since it has been closed above */
   log_reopen();
 
-  ircd_log(L_CRIT, "execv(%s,%s) failed: %m\n", SPATH, *thisServer.argv);
+  log_write(LS_SYSTEM, L_CRIT, 0, "execv(%s,%s) failed: %m", SPATH,
+	    *thisServer.argv);
 
   Debug((DEBUG_FATAL, "Couldn't restart server \"%s\": %s",
          SPATH, (strerror(errno)) ? strerror(errno) : ""));
@@ -642,7 +645,7 @@ int main(int argc, char **argv) {
   set_nomem_handler(outofmemory);
   
   if (!init_string()) {
-    ircd_log(L_CRIT, "Failed to initialize string module");
+    log_write(LS_SYSTEM, L_CRIT, 0, "Failed to initialize string module");
     return 6;
   }
 
@@ -659,7 +662,8 @@ int main(int argc, char **argv) {
   motd_init();
 
   if (!init_conf()) {
-    ircd_log(L_CRIT, "Failed to read configuration file %s", configfile);
+    log_write(LS_SYSTEM, L_CRIT, 0, "Failed to read configuration file %s",
+	      configfile);
     return 7;
   }
 
@@ -689,7 +693,7 @@ int main(int argc, char **argv) {
   init_counters();
 
   Debug((DEBUG_NOTICE, "Server ready..."));
-  ircd_log(L_NOTICE, "Server Ready");
+  log_write(LS_SYSTEM, L_NOTICE, 0, "Server Ready");
 
   event_loop();
 
diff --git a/ircd/ircd_alloc.c b/ircd/ircd_alloc.c
index 903b9b1..ced748d 100644
--- a/ircd/ircd_alloc.c
+++ b/ircd/ircd_alloc.c
@@ -1,5 +1,5 @@
 /************************************************************************
- *   IRC - Internet Relay Chat, src/ircd_log.c
+ *   IRC - Internet Relay Chat, ircd/ircd_alloc.c
  *   Copyright (C) 1999 Thomas Helvey (BleepSoft)
  *                     
  *   See file AUTHORS in IRC package for additional names of
diff --git a/ircd/ircd_log.c b/ircd/ircd_log.c
index b8669a4..37422bd 100644
--- a/ircd/ircd_log.c
+++ b/ircd/ircd_log.c
@@ -145,9 +145,8 @@ static struct LogDesc {
   S(NETWORK, -1, SNO_NETWORK),
   S(OPERKILL, -1, 0),
   S(SERVKILL, -1, 0),
+  S(USER, -1, 0),
   S(OPER, -1, SNO_OLDREALOP),
-  S(OPERLOG, -1, 0),
-  S(USERLOG, -1, 0),
   S(RESOLVER, -1, 0),
   S(SOCKET, -1, 0),
   S(DEBUG, -1, SNO_DEBUG),
@@ -174,15 +173,6 @@ static struct {
   struct LogFile *dbfile;   /* debug file */
 } logInfo = { 0, 0, LOG_USER, "ircd", 0 };
 
-void ircd_log(int priority, const char* fmt, ...)
-{
-  va_list vl;
-
-  va_start(vl, fmt);
-  log_vwrite(LS_OLDLOG, priority, 0, fmt, vl);
-  va_end(vl);
-}
-
 /* helper routine to open a log file if needed */
 static void
 log_open(struct LogFile *lf)
@@ -473,7 +463,8 @@ log_file_create(const char *file)
 
   tmp->next = logInfo.filelist; /* link it into the list... */
   tmp->prev_p = &logInfo.filelist;
-  logInfo.filelist->prev_p = &tmp->next;
+  if (logInfo.filelist)
+    logInfo.filelist->prev_p = &tmp->next;
   logInfo.filelist = tmp;
 
   return tmp;
@@ -627,7 +618,7 @@ log_set_file(const char *subsys, const char *filename)
     return 2;
 
   /* no change, don't go to the trouble of destroying and recreating */
-  if (filename && !strcmp(desc->file->file, filename))
+  if (desc->file && filename && !strcmp(desc->file->file, filename))
     return 0;
 
   /* debug log is special, since it has to be opened on fd 2 */
diff --git a/ircd/jupe.c b/ircd/jupe.c
index c49b4fa..27fc778 100644
--- a/ircd/jupe.c
+++ b/ircd/jupe.c
@@ -25,6 +25,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "match.h"
@@ -124,11 +125,10 @@ jupe_add(struct Client *cptr, struct Client *sptr, char *server, char *reason,
 		       flags & JUPE_LOCAL ? "local " : "", server,
 		       expire + TSoffset, reason);
 
-#ifdef JPATH
-  write_log(JPATH, "%Tu %C adding %sJUPE for %s, expiring at %Tu: %s\n",
-	    TStime(), sptr, flags & JUPE_LOCAL ? "local " : "", server,
-	    expire + TSoffset, reason);
-#endif /* JPATH */
+  log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
+	    "%#C adding %sJUPE for %s, expiring at %Tu: %s", sptr,
+	    flags & JUPE_LOCAL ? "local " : "", server, expire + TSoffset,
+	    reason);
 
   /* make the jupe */
   ajupe = make_jupe(server, reason, expire, lastmod, flags);
@@ -170,11 +170,9 @@ jupe_activate(struct Client *cptr, struct Client *sptr, struct Jupe *jupe,
 		       jupe->ju_server, jupe->ju_expire + TSoffset,
 		       jupe->ju_reason);
 
-#ifdef JPATH
-  write_log(JPATH, "%Tu %C activating JUPE for %s, expiring at %Tu: %s\n",
-	    TStime(), sptr, jupe->ju_server, jupe->ju_expire + TSoffset,
-	    jupe->ju_reason);
-#endif /* JPATH */
+  log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
+	    "%#C activating JUPE for %s, expiring at %Tu: %s",sptr,
+	    jupe->ju_server, jupe->ju_expire + TSoffset, jupe->ju_reason);
 
   if (!(flags & JUPE_LOCAL)) /* don't propagate local changes */
     propagate_jupe(cptr, sptr, jupe);
@@ -216,11 +214,10 @@ jupe_deactivate(struct Client *cptr, struct Client *sptr, struct Jupe *jupe,
 		       jupe->ju_server, jupe->ju_expire + TSoffset,
 		       jupe->ju_reason);
 
-#ifdef JPATH
-  write_log(JPATH, "%Tu %s %s JUPE for %s, expiring at %Tu: %s\n", TStime(),
-	    sptr, JupeIsLocal(jupe) ? "removing local" : "deactivating",
+  log_write(LS_JUPE, L_INFO, LOG_NOSNOTICE,
+	    "%#C %s JUPE for %s, expiring at %Tu: %s", sptr,
+	    JupeIsLocal(jupe) ? "removing local" : "deactivating",
 	    jupe->ju_server, jupe->ju_expire + TSoffset, jupe->ju_reason);
-#endif /* JPATH */
 
   if (JupeIsLocal(jupe))
     jupe_free(jupe);
diff --git a/ircd/m_clearmode.c b/ircd/m_clearmode.c
index ef2e10b..5eca38b 100644
--- a/ircd/m_clearmode.c
+++ b/ircd/m_clearmode.c
@@ -93,6 +93,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_alloc.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_string.h"
 #include "list.h"
@@ -224,12 +225,6 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
   if (del_mode & MODE_KEY)
     chptr->mode.key[0] = '\0';
 
-#ifndef OPATH
-  /* Don't propagate CLEARMODE if it's a local channel */
-  if (IsLocalChannel(chptr->chname))
-    return 0;
-#endif
-
   /* Ok, build control string again */
   for (flag_p = flags; flag_p[0]; flag_p += 2)
     if (del_mode & flag_p[0])
@@ -237,10 +232,9 @@ do_clearmode(struct Client *cptr, struct Client *sptr, struct Channel *chptr,
 
   control_buf[control_buf_i] = '\0';
 
-#ifdef OPATH
-  write_log(OPATH, "%Tu %#C CLEARMODE %H %s\n", TStime(), sptr, chptr,
-	    control_buf);
-#endif
+  /* Log it... */
+  log_write(LS_OPERMODE, L_INFO, LOG_NOSNOTICE, "%#C CLEARMODE %H %s", sptr,
+	    chptr, control_buf);
 
   /* Then send it */
   if (!IsLocalChannel(chptr->chname))
diff --git a/ircd/m_connect.c b/ircd/m_connect.c
index 3f7d6f9..094253e 100644
--- a/ircd/m_connect.c
+++ b/ircd/m_connect.c
@@ -214,8 +214,8 @@ int ms_connect(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 			":Remote CONNECT %s %s from %s", parv[1],
 			parv[2] ? parv[2] : "",
 			get_client_name(sptr, HIDE_IP));
-  ircd_log(L_INFO, "CONNECT From %s : %s %d", parv[0], parv[1],
-	   parv[2] ? parv[2] : "");
+  log_write(LS_NETWORK, L_INFO, 0, "CONNECT From %C : %s %s", sptr, parv[1],
+	    parv[2] ? parv[2] : "");
 
   if (connect_server(aconf, sptr, 0)) {
     sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :*** Connecting to %s.", sptr,
@@ -509,7 +509,7 @@ int m_connect(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     sendto_ops_butone(0, &me, ":%s WALLOPS :Remote CONNECT %s %s from %s", /* XXX DEAD */
                       me.name, parv[1], parv[2] ? parv[2] : "",
                       get_client_name(sptr, HIDE_IP));
-    ircd_log(L_INFO, "CONNECT From %s : %s %d",
+    ircd_log(L_INFO, "CONNECT From %s : %s %d", /* XXX DEAD */
              parv[0], parv[1], parv[2] ? parv[2] : "");
   }
   aconf->port = port;
diff --git a/ircd/m_create.c b/ircd/m_create.c
index e89afa3..5313c2b 100644
--- a/ircd/m_create.c
+++ b/ircd/m_create.c
@@ -97,6 +97,7 @@
 #include "numeric.h"
 #include "numnicks.h"
 #include "s_debug.h"
+#include "s_misc.h"
 #include "s_user.h"
 #include "send.h"
 
@@ -140,7 +141,7 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 #if 1
   /* If this server is >5 minutes fast, squit it */
   if (TStime() - chanTS<-5*60*60)
-  	return exit_client(sptr,sptr,"Timestamp Drift/Bogus TS");
+  	return exit_client(sptr, sptr, &me, "Timestamp Drift/Bogus TS");
 #endif
 #if 0  	
   /* If we recieve a CREATE for a channel from a server before that server
diff --git a/ircd/m_kill.c b/ircd/m_kill.c
index 5ffb7a9..49fc718 100644
--- a/ircd/m_kill.c
+++ b/ircd/m_kill.c
@@ -103,10 +103,6 @@
 #include <assert.h>
 #include <string.h>
 
-#if defined(DEBUGMODE)
-#define SYSLOG_KILL
-#endif
-
 /*
  * ms_kill - server message handler template
  *
@@ -179,9 +175,7 @@ int ms_kill(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 		       "Received KILL message for %s. From %s Path: %C!%s",
 		       get_client_name(victim,SHOW_IP), parv[0], cptr, path);
 
-#if defined(SYSLOG_KILL)
   log_write_kill(victim, sptr, cptr->name, path);
-#endif
   /*
    * And pass on the message to other servers. Note, that if KILL
    * was changed, the message has to be sent to all links, also
@@ -339,9 +333,7 @@ int mo_kill(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 		       "Received KILL message for %s. From %s Path: %s!%s",
 		       get_client_name(victim,SHOW_IP), parv[0], inpath, path);
 
-#if defined(SYSLOG_KILL)
   log_write_kill(victim, sptr, inpath, path);
-#endif
   /*
    * And pass on the message to other servers. Note, that if KILL
    * was changed, the message has to be sent to all links, also
@@ -526,19 +518,19 @@ int m_kill(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
   {                                /* get more infos when your local
                                    clients are killed -- _dl */
     if (IsServer(sptr))
-      ircd_log(L_TRACE,
+      ircd_log(L_TRACE, /* XXX DEAD */
           "A local client %s!%s@%s KILLED from %s [%s] Path: %s!%s)",
           acptr->name, acptr->user->username, acptr->user->host,
           parv[0], sptr->name, inpath, path);
     else
-      ircd_log(L_TRACE,
+      ircd_log(L_TRACE, /* XXX DEAD */
           "A local client %s!%s@%s KILLED by %s [%s!%s@%s] (%s!%s)",
           acptr->name, acptr->user->username, acptr->user->host,
           parv[0], sptr->name, sptr->user->username, sptr->user->host,
           inpath, path);
   }
   else if (IsOper(sptr))
-    ircd_log(L_TRACE, "KILL From %s For %s Path %s!%s",
+    ircd_log(L_TRACE, "KILL From %s For %s Path %s!%s", /* XXX DEAD */
         parv[0], acptr->name, inpath, path);
 #endif
   /*
diff --git a/ircd/m_oper.c b/ircd/m_oper.c
index fb624f0..8dda348 100644
--- a/ircd/m_oper.c
+++ b/ircd/m_oper.c
@@ -196,13 +196,7 @@ int m_oper(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 			 parv[0], sptr->user->username, sptr->sockhost,
 			 IsOper(sptr) ? 'O' : 'o');
 
-    ircd_log(L_INFO, "OPER (%s) by (%s!%s@%s)",
-             name, parv[0], sptr->user->username, sptr->sockhost);
-#ifdef FNAME_OPERLOG
-    if (IsUser(sptr))
-      write_log(FNAME_OPERLOG,
-                "%s OPER (%s) by (%#C)\n", myctime(CurrentTime), name, sptr);
-#endif
+    log_write(LS_OPER, L_INFO, 0, "OPER (%s) by (%#C)", name, sptr);
   }
   else {
     send_reply(sptr, ERR_PASSWDMISMATCH);
@@ -341,11 +335,11 @@ int m_oper(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
     send_umode_out(cptr, sptr, old);
     sendto_one(sptr, rpl_str(RPL_YOUREOPER), me.name, parv[0]); /* XXX DEAD */
 
-    ircd_log(L_INFO, "OPER (%s) by (%s!%s@%s)",
+    ircd_log(L_INFO, "OPER (%s) by (%s!%s@%s)", /* XXX DEAD */
              name, parv[0], sptr->user->username, sptr->sockhost);
 #ifdef FNAME_OPERLOG
     if (IsUser(sptr))
-      write_log(FNAME_OPERLOG,
+      write_log(FNAME_OPERLOG, /* XXX DEAD */
           "%s OPER (%s) by (%s!%s@%s)\n", myctime(CurrentTime),
           name, parv[0], sptr->user->username, sptr->sockhost);
 #endif
diff --git a/ircd/m_rehash.c b/ircd/m_rehash.c
index 01cfedc..f95562c 100644
--- a/ircd/m_rehash.c
+++ b/ircd/m_rehash.c
@@ -139,7 +139,7 @@ int mo_rehash(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   sendto_opmask_butone(0, SNO_OLDSNO, "%C is rehashing Server config file",
 		       sptr);
 
-  ircd_log(L_INFO, "REHASH From %s\n", get_client_name(sptr, HIDE_IP));
+  log_write(LS_SYSTEM, L_INFO, 0, "REHASH From %#C", sptr);
 
   return rehash(cptr, flag);
 #endif /* defined(OPER_REHASH) || defined(LOCOP_REHASH) */
diff --git a/ircd/m_restart.c b/ircd/m_restart.c
index 11d71e9..aed3bf6 100644
--- a/ircd/m_restart.c
+++ b/ircd/m_restart.c
@@ -117,7 +117,7 @@ int mo_restart(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     send_reply(sptr, ERR_NOPRIVILEGES);
     return 0;
   }
-  ircd_log(L_NOTICE, "Server RESTART by %s\n", get_client_name(sptr, HIDE_IP));
+  log_write(LS_SYSTEM, L_NOTICE, 0, "Server RESTART by %#C", sptr);
   server_restart("received RESTART");
 
 #endif /* defined(OPER_RESTART) || defined(LOCOP_RESTART) */
@@ -146,7 +146,7 @@ int m_restart(struct Client *cptr, struct Client *sptr, int parc,
     sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); /* XXX DEAD */
     return 0;
   }
-  ircd_log(L_NOTICE, "Server RESTART by %s\n", get_client_name(sptr, HIDE_IP));
+  ircd_log(L_NOTICE, "Server RESTART by %s\n", get_client_name(sptr, HIDE_IP)); /* XXX DEAD */
   server_restart("received RESTART");
   return 0;
 }
diff --git a/ircd/m_server.c b/ircd/m_server.c
index 9c072dc..e60419a 100644
--- a/ircd/m_server.c
+++ b/ircd/m_server.c
@@ -165,7 +165,8 @@ int mr_server(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if ((ajupe = jupe_find(host)) && JupeIsActive(ajupe))
     return exit_client_msg(cptr, sptr, &me, "Juped: %s", JupeReason(ajupe));
 
-  ircd_log(L_NOTICE, "SERVER: %s %s[%s]", parv[1], cptr->sockhost, cptr->sock_ip);
+  log_write(LS_NETWORK, L_NOTICE, 0, "SERVER: %s %s[%s]", parv[1],
+	    cptr->sockhost, cptr->sock_ip);
 
   /*
    * Detect protocol
diff --git a/ircd/m_uping.c b/ircd/m_uping.c
index 4fe7327..0c65dca 100644
--- a/ircd/m_uping.c
+++ b/ircd/m_uping.c
@@ -380,7 +380,7 @@ int m_uping(struct Client* cptr, struct Client *sptr, int parc, char *parv[])
       sendto_one(sptr, /* XXX DEAD */
                  "%s NOTICE %s%s :UPING: Unable to create udp ping socket",
                  NumServ(&me), NumNick(sptr));
-    ircd_log(L_ERROR, "UPING: Unable to create UDP socket");
+    ircd_log(L_ERROR, "UPING: Unable to create UDP socket"); /* XXX DEAD */
     return 0;
   }
 
diff --git a/ircd/m_who.c b/ircd/m_who.c
index 12f6b34..eb9e543 100644
--- a/ircd/m_who.c
+++ b/ircd/m_who.c
@@ -188,12 +188,9 @@ int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
         case 'x':
         case 'X':
           bitsel |= WHOSELECT_EXTRA;
-#ifdef WPATH
           if (IsAnOper(sptr))
-            write_log(WPATH, "# " TIME_T_FMT " %#C WHO %s %s\n",
-		      CurrentTime, sptr, (BadPtr(parv[3]) ? parv[1] : parv[3]),
-		      parv[2]);
-#endif /* WPATH */
+	    log_write(LS_WHO, L_INFO, LOG_NOSNOTICE, "%#C WHO %s %s", sptr,
+		      (BadPtr(parv[3]) ? parv[1] : parv[3]), parv[2]);
           continue;
         case 'n':
         case 'N':
@@ -513,7 +510,7 @@ int m_who(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
           bitsel |= WHOSELECT_EXTRA;
 #ifdef WPATH
           if (IsAnOper(sptr))
-            write_log(WPATH, "# " TIME_T_FMT " %s!%s@%s WHO %s %s\n",
+            write_log(WPATH, "# " TIME_T_FMT " %s!%s@%s WHO %s %s\n", /* XXX DEAD */
                 CurrentTime, sptr->name, sptr->user->username, sptr->user->host,
                 (BadPtr(parv[3]) ? parv[1] : parv[3]), parv[2]);
 #endif /* WPATH */
diff --git a/ircd/res.c b/ircd/res.c
index 9da34d4..7d92105 100644
--- a/ircd/res.c
+++ b/ircd/res.c
@@ -578,8 +578,7 @@ static int send_res_msg(const u_char* msg, int len, int rcount)
       ++sent;
     }
     else
-      ircd_log(L_ERROR, "Resolver: send failed %s", 
-               (strerror(errno)) ? strerror(errno) : "Unknown");
+      log_write(LS_RESOLVER, L_ERROR, 0, "Resolver: send failed %m");
   }
   return sent;
 }
diff --git a/ircd/s_auth.c b/ircd/s_auth.c
index d5d84ec..9c5db4c 100644
--- a/ircd/s_auth.c
+++ b/ircd/s_auth.c
@@ -581,8 +581,8 @@ void timeout_auth_queries(time_t now)
         if (IsUserPort(auth->client))
           sendheader(auth->client, REPORT_FAIL_DNS);
       }
-      ircd_log(L_INFO, "DNS/AUTH timeout %s",
-               get_client_name(auth->client, HIDE_IP));
+      log_write(LS_RESOLVER, L_INFO, 0, "DNS/AUTH timeout %s",
+		get_client_name(auth->client, HIDE_IP));
 
       release_auth_client(auth->client);
       unlink_auth_request(auth, &AuthPollList);
@@ -595,7 +595,8 @@ void timeout_auth_queries(time_t now)
       delete_resolver_queries(auth);
       if (IsUserPort(auth->client))
         sendheader(auth->client, REPORT_FAIL_DNS);
-      ircd_log(L_INFO, "DNS timeout %s", get_client_name(auth->client, HIDE_IP));
+      log_write(LS_RESOLVER, L_INFO, 0, "DNS timeout %s",
+		get_client_name(auth->client, HIDE_IP));
 
       release_auth_client(auth->client);
       unlink_auth_request(auth, &AuthIncompleteList);
diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index 613af93..5ca23bf 100644
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -165,7 +165,7 @@ void report_error(const char* text, const char* who, int err)
     sendto_opmask_butone(0, SNO_OLDSNO, text, who, errmsg);
     last_notice = CurrentTime;
   }
-  ircd_log(L_ERROR, text, who, errmsg);
+  log_write(LS_SOCKET, L_ERROR, 0, text, who, errmsg);
   errno = errtmp;
 }
 
diff --git a/ircd/s_conf.c b/ircd/s_conf.c
index 44d311b..0a017bf 100644
--- a/ircd/s_conf.c
+++ b/ircd/s_conf.c
@@ -703,7 +703,7 @@ void conf_add_listener(const char* const* fields, int count)
 void conf_add_local(const char* const* fields, int count)
 {
   if (count < 6 || EmptyString(fields[1]) || EmptyString(fields[5])) {
-    ircd_log(L_CRIT, "Your M: line must have 6 fields!\n");
+    log_write(LS_CONFIG, L_CRIT, 0, "Your M: line must have 6 fields!");
     return;
   }
   /*
@@ -716,7 +716,8 @@ void conf_add_local(const char* const* fields, int count)
   if (0 == localConf.numeric) {
     localConf.numeric = atoi(fields[5]);
     if (0 == localConf.numeric)
-      ircd_log(L_WARNING, "Your M: line must have a Numeric value greater than 0\n");
+      log_write(LS_CONFIG, L_WARNING, 0,
+		"Your M: line must have a Numeric value greater than 0");
   }
   /*
    * these two can be changed while the server is running
@@ -740,7 +741,7 @@ void conf_add_admin(const char* const* fields, int count)
    * if you have one, it MUST have 3 lines
    */
   if (count < 4) {
-    ircd_log(L_CRIT, "Your A: line must have 4 fields!\n");
+    log_write(LS_CONFIG, L_CRIT, 0, "Your A: line must have 4 fields!");
     return;
   }
   MyFree(localConf.location1);
diff --git a/ircd/s_debug.c b/ircd/s_debug.c
index cb7aadb..33ce080 100644
--- a/ircd/s_debug.c
+++ b/ircd/s_debug.c
@@ -167,9 +167,6 @@ char serveropts[] = {
 #ifdef LOCAL_BADCHAN
     'x',
 #endif
-#endif
-#ifdef  USE_SYSLOG
-    'Y',
 #endif
     '\0'
 };
diff --git a/ircd/s_misc.c b/ircd/s_misc.c
index f905331..6cba7aa 100644
--- a/ircd/s_misc.c
+++ b/ircd/s_misc.c
@@ -378,31 +378,22 @@ int exit_client(struct Client *cptr,    /* Connection being handled by
 {
   struct Client* acptr = 0;
   struct DLink *dlp;
-#ifdef  FNAME_USERLOG
   time_t on_for;
-#endif
+
   char comment1[HOSTLEN + HOSTLEN + 2];
   assert(killer);
   if (MyConnect(victim)) {
     victim->flags |= FLAGS_CLOSING;
     update_load();
-#ifdef FNAME_USERLOG
+
     on_for = CurrentTime - victim->firsttime;
-#if defined(USE_SYSLOG) && defined(SYSLOG_USERS)
-    if (IsUser(victim))
-      ircd_log(L_TRACE, "%s (%3d:%02d:%02d): %s@%s (%s)\n",
-               myctime(victim->firsttime), on_for / 3600, (on_for % 3600) / 60,
-               on_for % 60, victim->user->username, victim->sockhost, victim->name);
-#else
+
     if (IsUser(victim))
-      write_log(FNAME_USERLOG,
-               "%s (%3d:%02d:%02d): %s@%s [%s]\n",
-               myctime(victim->firsttime),
-               on_for / 3600, (on_for % 3600) / 60,
-               on_for % 60,
-               victim->user->username, victim->user->host, victim->username);
-#endif
-#endif
+      log_write(LS_USER, L_TRACE, 0, "%s (%3d:%02d:%02d): %s@%s (%s)",
+		myctime(victim->firsttime), on_for / 3600,
+		(on_for % 3600) / 60, on_for % 60, victim->user->username,
+		victim->sockhost, victim->name);
+
     if (victim != killer->from  /* The source knows already */
         && IsClient(victim))    /* Not a Ping struct or Log file */
     {
diff --git a/ircd/uping.c b/ircd/uping.c
index accc52d..83f8a23 100644
--- a/ircd/uping.c
+++ b/ircd/uping.c
@@ -105,14 +105,17 @@ int uping_init(void)
     return -1;
   }
   if (!os_set_reuseaddr(fd)) {
-    ircd_log(L_ERROR, "UPING: setsockopt UDP listener: fd %d", fd);
+    log_write(LS_SOCKET, L_ERROR, 0,
+	      "UPING: set reuseaddr on UDP listener failed: %m (fd %d)", fd);
     Debug((DEBUG_ERROR, "UPING: set reuseaddr on UDP listener failed: %s",
            (strerror(errno)) ? strerror(errno) : "Unknown error"));
     close(fd);
     return -1;
   }
   if (bind(fd, (struct sockaddr*) &from, sizeof(from)) == -1) {
-    ircd_log(L_ERROR, "UPING: bind UDP listener %d fd %d", htons(from.sin_port), fd);
+    log_write(LS_SOCKET, L_ERROR, 0,
+	      "UPING: bind on UDP listener (%d fd %d) failed: %m",
+	      htons(from.sin_port), fd);
     Debug((DEBUG_ERROR, "UPING: bind on UDP listener failed : %s",
            (strerror(errno)) ? strerror(errno) : "Unknown error"));
     close(fd);