update contrib modules

9 files changed, 264 insertions, 178 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index 65e368c..3a86d3d 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,8 +14,7 @@ modules_LTLIBRARIES = example_module.la     \
                       m_ltrace.la           \
                       m_ojoin.la            \
                       m_operspy.la          \
-                      m_opme.la             \
-                      m_webirc.la
+                      m_opme.la
 
 example_module_la_LDFLAGS = $(MODULE_FLAGS)
 ip_cloaking_la_LDFLAGS = $(MODULE_FLAGS)
@@ -28,7 +27,6 @@ m_ltrace_la_LDFLAGS = $(MODULE_FLAGS)
 m_ojoin_la_LDFLAGS = $(MODULE_FLAGS)
 m_operspy_la_LDFLAGS = $(MODULE_FLAGS)
 m_opme_la_LDFLAGS = $(MODULE_FLAGS)
-m_webirc_la_LDFLAGS = $(MODULE_FLAGS)
 
 
 example_module_la_SOURCES = example_module.c
@@ -42,6 +40,5 @@ m_ltrace_la_SOURCES = m_ltrace.c
 m_ojoin_la_SOURCES = m_ojoin.c
 m_operspy_la_SOURCES = m_operspy.c
 m_opme_la_SOURCES = m_opme.c
-m_webirc_la_SOURCES = m_webirc.c
 
 modules: $(modules_LTLIBRARIES)
diff --git a/contrib/Makefile.in b/contrib/Makefile.in
index 73c098a..de62d00 100644
--- a/contrib/Makefile.in
+++ b/contrib/Makefile.in
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.12.4 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -15,23 +15,51 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,11 +79,20 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = contrib
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/depcomp
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/depcomp README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \
+	$(top_srcdir)/m4/argz.m4 \
+	$(top_srcdir)/m4/ax_append_compile_flags.m4 \
+	$(top_srcdir)/m4/ax_append_flag.m4 \
+	$(top_srcdir)/m4/ax_check_compile_flag.m4 \
+	$(top_srcdir)/m4/ax_check_openssl.m4 \
+	$(top_srcdir)/m4/gcc_stack_protect.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltdl.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -94,110 +131,151 @@ LTLIBRARIES = $(modules_LTLIBRARIES)
 example_module_la_LIBADD =
 am_example_module_la_OBJECTS = example_module.lo
 example_module_la_OBJECTS = $(am_example_module_la_OBJECTS)
-example_module_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(example_module_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+example_module_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(example_module_la_LDFLAGS) $(LDFLAGS) \
+	-o $@
 ip_cloaking_la_LIBADD =
 am_ip_cloaking_la_OBJECTS = ip_cloaking.lo
 ip_cloaking_la_OBJECTS = $(am_ip_cloaking_la_OBJECTS)
-ip_cloaking_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(ip_cloaking_la_LDFLAGS) $(LDFLAGS) -o $@
+ip_cloaking_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(ip_cloaking_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
 m_change_la_LIBADD =
 am_m_change_la_OBJECTS = m_change.lo
 m_change_la_OBJECTS = $(am_m_change_la_OBJECTS)
-m_change_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_change_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_change_la_LDFLAGS) $(LDFLAGS) -o $@
 m_clearchan_la_LIBADD =
 am_m_clearchan_la_OBJECTS = m_clearchan.lo
 m_clearchan_la_OBJECTS = $(am_m_clearchan_la_OBJECTS)
-m_clearchan_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(m_clearchan_la_LDFLAGS) $(LDFLAGS) -o $@
+m_clearchan_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(m_clearchan_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
 m_ctrace_la_LIBADD =
 am_m_ctrace_la_OBJECTS = m_ctrace.lo
 m_ctrace_la_OBJECTS = $(am_m_ctrace_la_OBJECTS)
-m_ctrace_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_ctrace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_ctrace_la_LDFLAGS) $(LDFLAGS) -o $@
 m_force_la_LIBADD =
 am_m_force_la_OBJECTS = m_force.lo
 m_force_la_OBJECTS = $(am_m_force_la_OBJECTS)
-m_force_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_force_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_force_la_LDFLAGS) $(LDFLAGS) -o $@
 m_forcenick_la_LIBADD =
 am_m_forcenick_la_OBJECTS = m_forcenick.lo
 m_forcenick_la_OBJECTS = $(am_m_forcenick_la_OBJECTS)
-m_forcenick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(m_forcenick_la_LDFLAGS) $(LDFLAGS) -o $@
+m_forcenick_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(AM_CFLAGS) $(CFLAGS) $(m_forcenick_la_LDFLAGS) $(LDFLAGS) -o \
+	$@
 m_ltrace_la_LIBADD =
 am_m_ltrace_la_OBJECTS = m_ltrace.lo
 m_ltrace_la_OBJECTS = $(am_m_ltrace_la_OBJECTS)
-m_ltrace_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_ltrace_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_ltrace_la_LDFLAGS) $(LDFLAGS) -o $@
 m_ojoin_la_LIBADD =
 am_m_ojoin_la_OBJECTS = m_ojoin.lo
 m_ojoin_la_OBJECTS = $(am_m_ojoin_la_OBJECTS)
-m_ojoin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_ojoin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_ojoin_la_LDFLAGS) $(LDFLAGS) -o $@
 m_operspy_la_LIBADD =
 am_m_operspy_la_OBJECTS = m_operspy.lo
 m_operspy_la_OBJECTS = $(am_m_operspy_la_OBJECTS)
-m_operspy_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_operspy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_operspy_la_LDFLAGS) $(LDFLAGS) -o $@
 m_opme_la_LIBADD =
 am_m_opme_la_OBJECTS = m_opme.lo
 m_opme_la_OBJECTS = $(am_m_opme_la_OBJECTS)
-m_opme_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+m_opme_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(m_opme_la_LDFLAGS) $(LDFLAGS) -o $@
-m_webirc_la_LIBADD =
-am_m_webirc_la_OBJECTS = m_webirc.lo
-m_webirc_la_OBJECTS = $(am_m_webirc_la_OBJECTS)
-m_webirc_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(m_webirc_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-	$(LDFLAGS) -o $@
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = $(example_module_la_SOURCES) $(ip_cloaking_la_SOURCES) \
 	$(m_change_la_SOURCES) $(m_clearchan_la_SOURCES) \
-	$(m_ctrace_la_SOURCES) $(m_force_la_SOURCES) $(m_forcenick_la_SOURCES) \
-	$(m_ltrace_la_SOURCES) $(m_ojoin_la_SOURCES) \
-	$(m_operspy_la_SOURCES) $(m_opme_la_SOURCES) \
-	$(m_webirc_la_SOURCES)
+	$(m_ctrace_la_SOURCES) $(m_force_la_SOURCES) \
+	$(m_forcenick_la_SOURCES) $(m_ltrace_la_SOURCES) \
+	$(m_ojoin_la_SOURCES) $(m_operspy_la_SOURCES) \
+	$(m_opme_la_SOURCES)
 DIST_SOURCES = $(example_module_la_SOURCES) $(ip_cloaking_la_SOURCES) \
 	$(m_change_la_SOURCES) $(m_clearchan_la_SOURCES) \
-	$(m_ctrace_la_SOURCES) $(m_force_la_SOURCES) $(m_forcenick_la_SOURCES) \
-	$(m_ltrace_la_SOURCES) $(m_ojoin_la_SOURCES) \
-	$(m_operspy_la_SOURCES) $(m_opme_la_SOURCES) \
-	$(m_webirc_la_SOURCES)
+	$(m_ctrace_la_SOURCES) $(m_force_la_SOURCES) \
+	$(m_forcenick_la_SOURCES) $(m_ltrace_la_SOURCES) \
+	$(m_ojoin_la_SOURCES) $(m_operspy_la_SOURCES) \
+	$(m_opme_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
 ARGZ_H = @ARGZ_H@
 AUTOCONF = @AUTOCONF@
@@ -350,8 +428,7 @@ modules_LTLIBRARIES = example_module.la     \
                       m_ltrace.la           \
                       m_ojoin.la            \
                       m_operspy.la          \
-                      m_opme.la             \
-                      m_webirc.la
+                      m_opme.la
 
 example_module_la_LDFLAGS = $(MODULE_FLAGS)
 ip_cloaking_la_LDFLAGS = $(MODULE_FLAGS)
@@ -364,7 +441,6 @@ m_ltrace_la_LDFLAGS = $(MODULE_FLAGS)
 m_ojoin_la_LDFLAGS = $(MODULE_FLAGS)
 m_operspy_la_LDFLAGS = $(MODULE_FLAGS)
 m_opme_la_LDFLAGS = $(MODULE_FLAGS)
-m_webirc_la_LDFLAGS = $(MODULE_FLAGS)
 example_module_la_SOURCES = example_module.c
 ip_cloaking_la_SOURCES = ip_cloaking.c
 m_change_la_SOURCES = m_change.c
@@ -376,7 +452,6 @@ m_ltrace_la_SOURCES = m_ltrace.c
 m_ojoin_la_SOURCES = m_ojoin.c
 m_operspy_la_SOURCES = m_operspy.c
 m_opme_la_SOURCES = m_opme.c
-m_webirc_la_SOURCES = m_webirc.c
 all: all-am
 
 .SUFFIXES:
@@ -411,6 +486,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
 install-modulesLTLIBRARIES: $(modules_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(modules_LTLIBRARIES)'; test -n "$(modulesdir)" || list=; \
@@ -445,30 +521,39 @@ clean-modulesLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+
 example_module.la: $(example_module_la_OBJECTS) $(example_module_la_DEPENDENCIES) $(EXTRA_example_module_la_DEPENDENCIES) 
-	$(example_module_la_LINK) -rpath $(modulesdir) $(example_module_la_OBJECTS) $(example_module_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(example_module_la_LINK) -rpath $(modulesdir) $(example_module_la_OBJECTS) $(example_module_la_LIBADD) $(LIBS)
+
 ip_cloaking.la: $(ip_cloaking_la_OBJECTS) $(ip_cloaking_la_DEPENDENCIES) $(EXTRA_ip_cloaking_la_DEPENDENCIES) 
-	$(ip_cloaking_la_LINK) -rpath $(modulesdir) $(ip_cloaking_la_OBJECTS) $(ip_cloaking_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(ip_cloaking_la_LINK) -rpath $(modulesdir) $(ip_cloaking_la_OBJECTS) $(ip_cloaking_la_LIBADD) $(LIBS)
+
 m_change.la: $(m_change_la_OBJECTS) $(m_change_la_DEPENDENCIES) $(EXTRA_m_change_la_DEPENDENCIES) 
-	$(m_change_la_LINK) -rpath $(modulesdir) $(m_change_la_OBJECTS) $(m_change_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_change_la_LINK) -rpath $(modulesdir) $(m_change_la_OBJECTS) $(m_change_la_LIBADD) $(LIBS)
+
 m_clearchan.la: $(m_clearchan_la_OBJECTS) $(m_clearchan_la_DEPENDENCIES) $(EXTRA_m_clearchan_la_DEPENDENCIES) 
-	$(m_clearchan_la_LINK) -rpath $(modulesdir) $(m_clearchan_la_OBJECTS) $(m_clearchan_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_clearchan_la_LINK) -rpath $(modulesdir) $(m_clearchan_la_OBJECTS) $(m_clearchan_la_LIBADD) $(LIBS)
+
 m_ctrace.la: $(m_ctrace_la_OBJECTS) $(m_ctrace_la_DEPENDENCIES) $(EXTRA_m_ctrace_la_DEPENDENCIES) 
-	$(m_ctrace_la_LINK) -rpath $(modulesdir) $(m_ctrace_la_OBJECTS) $(m_ctrace_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_ctrace_la_LINK) -rpath $(modulesdir) $(m_ctrace_la_OBJECTS) $(m_ctrace_la_LIBADD) $(LIBS)
+
 m_force.la: $(m_force_la_OBJECTS) $(m_force_la_DEPENDENCIES) $(EXTRA_m_force_la_DEPENDENCIES) 
-	$(m_force_la_LINK) -rpath $(modulesdir) $(m_force_la_OBJECTS) $(m_force_la_LIBADD) $(LIBS)
-m_forcenick.la: $(m_forcenick_la_OBJECTS) $(m_forcenick_la_DEPENDENCIES) $(EXTRA_m_forcenick_la_DEPENDENCIES)
-	$(m_forcenick_la_LINK) -rpath $(modulesdir) $(m_forcenick_la_OBJECTS) $(m_forcenick_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_force_la_LINK) -rpath $(modulesdir) $(m_force_la_OBJECTS) $(m_force_la_LIBADD) $(LIBS)
+
+m_forcenick.la: $(m_forcenick_la_OBJECTS) $(m_forcenick_la_DEPENDENCIES) $(EXTRA_m_forcenick_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(m_forcenick_la_LINK) -rpath $(modulesdir) $(m_forcenick_la_OBJECTS) $(m_forcenick_la_LIBADD) $(LIBS)
+
 m_ltrace.la: $(m_ltrace_la_OBJECTS) $(m_ltrace_la_DEPENDENCIES) $(EXTRA_m_ltrace_la_DEPENDENCIES) 
-	$(m_ltrace_la_LINK) -rpath $(modulesdir) $(m_ltrace_la_OBJECTS) $(m_ltrace_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_ltrace_la_LINK) -rpath $(modulesdir) $(m_ltrace_la_OBJECTS) $(m_ltrace_la_LIBADD) $(LIBS)
+
 m_ojoin.la: $(m_ojoin_la_OBJECTS) $(m_ojoin_la_DEPENDENCIES) $(EXTRA_m_ojoin_la_DEPENDENCIES) 
-	$(m_ojoin_la_LINK) -rpath $(modulesdir) $(m_ojoin_la_OBJECTS) $(m_ojoin_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_ojoin_la_LINK) -rpath $(modulesdir) $(m_ojoin_la_OBJECTS) $(m_ojoin_la_LIBADD) $(LIBS)
+
 m_operspy.la: $(m_operspy_la_OBJECTS) $(m_operspy_la_DEPENDENCIES) $(EXTRA_m_operspy_la_DEPENDENCIES) 
-	$(m_operspy_la_LINK) -rpath $(modulesdir) $(m_operspy_la_OBJECTS) $(m_operspy_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_operspy_la_LINK) -rpath $(modulesdir) $(m_operspy_la_OBJECTS) $(m_operspy_la_LIBADD) $(LIBS)
+
 m_opme.la: $(m_opme_la_OBJECTS) $(m_opme_la_DEPENDENCIES) $(EXTRA_m_opme_la_DEPENDENCIES) 
-	$(m_opme_la_LINK) -rpath $(modulesdir) $(m_opme_la_OBJECTS) $(m_opme_la_LIBADD) $(LIBS)
-m_webirc.la: $(m_webirc_la_OBJECTS) $(m_webirc_la_DEPENDENCIES) $(EXTRA_m_webirc_la_DEPENDENCIES) 
-	$(m_webirc_la_LINK) -rpath $(modulesdir) $(m_webirc_la_OBJECTS) $(m_webirc_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(m_opme_la_LINK) -rpath $(modulesdir) $(m_opme_la_OBJECTS) $(m_opme_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -487,28 +572,30 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_ojoin.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_operspy.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_opme.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_webirc.Plo@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
-@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -516,26 +603,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -547,15 +623,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -564,9 +636,10 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
 
-cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS) $(LISP)'; \
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
 	case "$(srcdir)" in \
 	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
 	  *) sdir=$(subdir)/$(srcdir) ;; \
@@ -722,9 +795,9 @@ uninstall-am: uninstall-modulesLTLIBRARIES
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-modulesLTLIBRARIES cscopelist ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
+	clean-libtool clean-modulesLTLIBRARIES cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -734,7 +807,7 @@ uninstall-am: uninstall-modulesLTLIBRARIES
 	install-strip installcheck installcheck-am installdirs \
 	maintainer-clean maintainer-clean-generic mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
 	uninstall-modulesLTLIBRARIES
 
 
diff --git a/contrib/ip_cloaking.c b/contrib/ip_cloaking.c
index 2b2cf48..b091ae5 100644
--- a/contrib/ip_cloaking.c
+++ b/contrib/ip_cloaking.c
@@ -65,7 +65,6 @@
 #include "modules.h"
 #include "memory.h"
 #include "log.h"
-#include "sprintf_irc.h"
 #include "userhost.h"
 
 static unsigned int umode_vhost = 0;
@@ -272,15 +271,15 @@ make_virthost(char *curr, char *host, char *new)
 
     if (strchr("0123456789", parv2[3][len - 1]) || parc2 < 2)
     {
-      ircsprintf(mask, "%s.%s.%s.%lx",
-                 parv2[parc2 - 4], parv2[parc2 - 3],
-                 parv2[parc2 - 2], hash[3]);
+      snprintf(mask, sizeof(mask), "%s.%s.%s.%lx",
+              parv2[parc2 - 4], parv2[parc2 - 3],
+              parv2[parc2 - 2], hash[3]);
     }
     else
     {
       /* isp.tld */
-      ircsprintf(mask, "%lx-%lx.%s.%s",
-                 hash[0], hash[3], parv2[parc2 - 2], parv2[parc2 - 1]);
+      snprintf(mask, sizeof(mask), "%lx-%lx.%s.%s",
+              hash[0], hash[3], parv2[parc2 - 2], parv2[parc2 - 1]);
     }
   }
   else
@@ -288,28 +287,28 @@ make_virthost(char *curr, char *host, char *new)
     if (parc2 >= 4)
     {
       /* isp.sub.tld or district.isp.tld */
-      ircsprintf(mask, "%lx-%lx.%s.%s.%s",
+      snprintf(mask, sizeof(mask), "%lx-%lx.%s.%s.%s",
             hash[3], hash[1], parv2[parc2 - 3], parv2[parc2 - 2],
             parv2[parc2 - 1]);
     }
     else
     {
       /* isp.tld */
-      ircsprintf(mask, "%lx-%lx.%s.%s",
+      snprintf(mask, sizeof(mask), "%lx-%lx.%s.%s",
             hash[0], hash[3], parv2[parc2 - 2], parv2[parc2 - 1]);
     }
     
     if (parc2 >= 5)
     {
       /* zone.district.isp.tld or district.isp.sub.tld */
-      ircsprintf(mask, "%lx-%lx.%s.%s.%s.%s",
+      snprintf(mask, sizeof(mask), "%lx-%lx.%s.%s.%s.%s",
             hash[1], hash[0], parv2[parc2 - 4], parv2[parc2 - 3],
             parv2[parc2 - 2], parv2[parc2 - 1]);
     }
     else
     { 
       /* isp.tld */
-      ircsprintf(mask, "%lx-%lx.%s.%s",
+      snprintf(mask, sizeof(mask), "%lx-%lx.%s.%s",
             hash[0], hash[3], parv2[parc2 - 2], parv2[parc2 - 1]);
     }
   }
diff --git a/contrib/m_change.c b/contrib/m_change.c
index b81b137..2719858 100644
--- a/contrib/m_change.c
+++ b/contrib/m_change.c
@@ -41,7 +41,7 @@
 #include "channel_mode.h"
 
 
-static void
+static int
 mo_chgident(struct Client *client_p, struct Client *source_p,
             int parc, char *parv[])
 {
@@ -51,7 +51,7 @@ mo_chgident(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVS),
                me.name, source_p->name, "CHGIDENT");
-    return;
+    return 0;
   }
 
   if (EmptyString(parv[2]))
@@ -60,7 +60,7 @@ mo_chgident(struct Client *client_p, struct Client *source_p,
     target_p = source_p;
 
     if (!IsClient(target_p))
-      return;
+      return 0;
   }
   else {
     target_p = hash_find_client(parv[1]);
@@ -69,15 +69,15 @@ mo_chgident(struct Client *client_p, struct Client *source_p,
     {
       sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                  me.name, source_p->name, parv[1]);
-      return;
+      return 0;
     }
   }
 
-  if (strlen(parv[2]) > USERLEN || !*parv[2] || !valid_username(parv[2]))
+  if (strlen(parv[2]) > USERLEN || !*parv[2] || !valid_username(parv[2], 1))
   {
     sendto_one(source_p, ":%s NOTICE %s :Invalid username",
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   if (IsUserHostIp(target_p))
@@ -105,9 +105,11 @@ mo_chgident(struct Client *client_p, struct Client *source_p,
 
     clear_ban_cache_client(target_p);
   }
+
+  return 0;
 }
 
-static void
+static int
 mo_chghost(struct Client *client_p, struct Client *source_p,
            int parc, char *parv[])
 {
@@ -117,7 +119,7 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVS),
                me.name, source_p->name, "CHGHOST");
-    return;
+    return 0;
   }
 
   if (EmptyString(parv[2]))
@@ -126,7 +128,7 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
     target_p = source_p;
 
     if (!IsClient(target_p))
-      return;
+      return 0;
   }
   else {
     target_p = hash_find_client(parv[1]);
@@ -135,7 +137,7 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
     {
       sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                  me.name, source_p->name, parv[1]);
-      return;
+      return 0;
     }
   }
 
@@ -143,7 +145,7 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, ":%s NOTICE %s :Invalid hostname",
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   if (IsUserHostIp(target_p))
@@ -171,9 +173,11 @@ mo_chghost(struct Client *client_p, struct Client *source_p,
                  me.name, target_p->name, target_p->username, target_p->host);
     clear_ban_cache_client(target_p);
   }
+
+  return 0;
 }
 
-static void
+static int
 mo_chgname(struct Client *client_p, struct Client *source_p,
           int parc, char *parv[])
 {
@@ -183,7 +187,7 @@ mo_chgname(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVS),
                me.name, source_p->name, "CHGNAME");
-    return;
+    return 0;
   }
 
   if (EmptyString(parv[2]))
@@ -195,14 +199,14 @@ mo_chgname(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                me.name, source_p->name, parv[1]);
-    return;
+    return 0;
   }
 
   if (strlen(parv[2]) > REALLEN || !*parv[2])
   {
     sendto_one(source_p, ":%s NOTICE %s :Invalid realname",
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   if (parc > 3 && MyClient(source_p))
@@ -223,6 +227,8 @@ mo_chgname(struct Client *client_p, struct Client *source_p,
   if (MyClient(target_p) && IsClient(source_p))
     sendto_one(target_p, ":%s NOTICE %s :Your realname is now [%s]",
                me.name, target_p->name, target_p->info);
+
+  return 0;
 }
 
 static struct Message chgident_msgtab = {
diff --git a/contrib/m_clearchan.c b/contrib/m_clearchan.c
index e818fa3..ce7fad2 100644
--- a/contrib/m_clearchan.c
+++ b/contrib/m_clearchan.c
@@ -33,7 +33,6 @@
 #include "s_serv.h"
 #include "send.h"
 #include "irc_string.h"
-#include "sprintf_irc.h"
 #include "hash.h"
 #include "parse.h"
 #include "modules.h"
@@ -50,7 +49,7 @@ static void remove_a_mode(struct Channel *, int, char);
 **      parv[0] = sender prefix
 **      parv[1] = channel
 */
-static void
+static int
 mo_clearchan(struct Client *client_p, struct Client *source_p,
              int parc, char *parv[])
 {
@@ -61,21 +60,21 @@ mo_clearchan(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   if ((chptr = hash_find_channel(parv[1])) == NULL)
   {
     sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
                me.name, source_p->name, parv[1]);
-    return;
+    return 0;
   }
 
   if (IsMember(source_p, chptr))
   {
     sendto_one(source_p, ":%s NOTICE %s :*** Please part %s before using CLEARCHAN",
                me.name, source_p->name, chptr->chname);
-    return;
+    return 0;
   }
 
   sendto_wallops_flags(UMODE_WALLOP, &me, "CLEARCHAN called for [%s] by %s!%s@%s",
@@ -119,11 +118,13 @@ mo_clearchan(struct Client *client_p, struct Client *source_p,
   chptr->mode.mode = MODE_SECRET | MODE_TOPICLIMIT |
                      MODE_INVITEONLY | MODE_NOPRIVMSGS;
 
-  set_channel_topic(chptr, "", "", 0);
+  set_channel_topic(chptr, "", "", 0, 0);
   chptr->mode.key[0] = '\0';
 
   /* Kick the users out and join the oper */
   kick_list(source_p, chptr);
+
+  return 0;
 }
 
 static void
diff --git a/contrib/m_ctrace.c b/contrib/m_ctrace.c
index 7b4d658..3ab5caa 100644
--- a/contrib/m_ctrace.c
+++ b/contrib/m_ctrace.c
@@ -45,7 +45,7 @@ static void report_this_status(struct Client *, struct Client *);
 **      parv[0] = sender prefix
 **      parv[1] = classname
 */
-static void
+static int
 mo_ctrace(struct Client *client_p, struct Client *source_p,
           int parc, char *parv[])
 {
@@ -53,7 +53,7 @@ mo_ctrace(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NEEDMOREPARAMS),
                me.name, source_p->name, "CTRACE");
-    return;
+    return 0;
   }
 
   do_ctrace(source_p, parc, parv);
diff --git a/contrib/m_force.c b/contrib/m_force.c
index 9e8265b..db96553 100644
--- a/contrib/m_force.c
+++ b/contrib/m_force.c
@@ -50,7 +50,7 @@
  *  parv[1] = user to force
  *  parv[2] = channel to force them into
  */
-static void
+static int
 mo_forcejoin(struct Client *client_p, struct Client *source_p,
              int parc, char *parv[])
 {
@@ -66,14 +66,14 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   if ((target_p = hash_find_client(parv[1])) == NULL || !IsClient(target_p))
   {
     sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                me.name, source_p->name, parv[1]);
-    return;
+    return 0;
   }
 
   if (!MyConnect(target_p))
@@ -89,7 +89,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p,
                    source_p->name, target_p->name, parv[2]);
     }
 
-    return;
+    return 0;
   }
 
   /* select our modes from parv[2] if they exist... (chanop)*/
@@ -127,7 +127,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p,
     {
       sendto_one(source_p, ":%s NOTICE %s :*** Notice -- %s is already in %s",
                  me.name, source_p->name, target_p->name, chptr->chname);
-      return;
+      return 0;
     }
 
     add_user_to_channel(chptr, target_p, type, 0);
@@ -191,7 +191,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p,
     {
       sendto_one(source_p, form_str(ERR_BADCHANNAME),
                  me.name, source_p->name, newch);
-      return;
+      return 0;
     }
 
     chptr = make_channel(newch);
@@ -225,9 +225,11 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p,
     sendto_one(source_p, ":%s NOTICE %s :*** Notice -- Creating channel %s",
                me.name, source_p->name, chptr->chname);
   }
+
+  return 0;
 }
 
-static void
+static int
 mo_forcepart(struct Client *client_p, struct Client *source_p,
              int parc, char *parv[])
 {
@@ -239,7 +241,7 @@ mo_forcepart(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   /* if target_p == NULL then let the oper know */
@@ -247,7 +249,7 @@ mo_forcepart(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOSUCHNICK),
                me.name, source_p->name, parv[1]);
-    return;
+    return 0;
   }
 
   if (!MyConnect(target_p))
@@ -263,21 +265,21 @@ mo_forcepart(struct Client *client_p, struct Client *source_p,
                    source_p->name, target_p->name, parv[2]);
     }
 
-    return;
+    return 0;
   }
 
   if ((chptr = hash_find_channel(parv[2])) == NULL)
   {
     sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
                me.name, source_p->name, parv[2]);
-    return;
+    return 0;
   }
 
   if ((member = find_channel_link(target_p, chptr)) == NULL)
   {
     sendto_one(source_p, form_str(ERR_USERNOTINCHANNEL),
                me.name, source_p->name, chptr->chname, target_p->name);
-    return;
+    return 0;
   }
 
   sendto_server(target_p, CAP_TS6, NOCAPS,
@@ -292,6 +294,8 @@ mo_forcepart(struct Client *client_p, struct Client *source_p,
                        target_p->host, chptr->chname,
                        target_p->name);
   remove_user_from_channel(member);
+
+  return 0;
 }
 
 static struct Message forcejoin_msgtab = {
diff --git a/contrib/m_ltrace.c b/contrib/m_ltrace.c
index afdf2f5..03ae363 100644
--- a/contrib/m_ltrace.c
+++ b/contrib/m_ltrace.c
@@ -60,7 +60,7 @@ trace_get_dependent(int *const server,
  *	parv[0] = sender prefix
  *	parv[1] = target client/server to trace
  */
-static void
+static int
 m_ltrace(struct Client *client_p, struct Client *source_p,
          int parc, char *parv[])
 {
@@ -72,6 +72,8 @@ m_ltrace(struct Client *client_p, struct Client *source_p,
     tname = me.name;
   sendto_one(source_p, form_str(RPL_ENDOFTRACE),
              me.name, source_p->name, tname);
+
+  return 0;
 }
 
 /*
@@ -200,7 +202,7 @@ do_ltrace(struct Client *source_p, int parc, char *parv[])
  *      parv[0] = sender prefix
  *      parv[1] = servername
  */
-static void
+static int
 mo_ltrace(struct Client *client_p, struct Client *source_p,
           int parc, char *parv[])
 {
@@ -208,14 +210,16 @@ mo_ltrace(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(RPL_ENDOFTRACE), me.name, parv[0],
                parc > 1 ? parv[1] : me.name);
-    return;
+    return 0;
   }
 
   if (parc > 2)
     if (hunt_server(client_p, source_p, ":%s LTRACE %s :%s", 2, parc, parv))
-      return;
+      return 0;
 
   do_ltrace(source_p, parc, parv);
+
+  return 0;
 }
 
 /*
diff --git a/contrib/m_ojoin.c b/contrib/m_ojoin.c
index e0ff868..8be0a4a 100644
--- a/contrib/m_ojoin.c
+++ b/contrib/m_ojoin.c
@@ -41,7 +41,7 @@
  *      parv[0] = sender prefix
  *      parv[1] = channels separated by commas
  */
-static void
+static int
 mo_ojoin(struct Client *client_p, struct Client *source_p,
          int parc, char *parv[])
 {
@@ -58,7 +58,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p,
   {
     sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
                me.name, source_p->name);
-    return;
+    return 0;
   }
 
   for (name = strtoken(&t, name, ","); name;
@@ -143,6 +143,8 @@ mo_ojoin(struct Client *client_p, struct Client *source_p,
       channel_member_names(source_p, chptr, 1);
     }
   }
+
+  return 0;
 }
 
 static struct Message ojoin_msgtab = {