commit f8a6fedfcf8615daf5ddc559cfe199a3e808f359
Author: acidvegas <acid.vegas@acid.vegas>
Date:   Sun Mar 29 05:16:53 2020 -0400

    Initial commit

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..46780c6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,75 @@
+# Ignore configure step
+aclocal.m4
+autom4te.cache
+config.log
+conftest.*
+config.settings
+extras/pcre2*
+extras/c-ares*
+config.status
+extras/ircdcron/ircd.cron
+extras/ircdcron/ircdchk
+src/modules/snomasks/Makefile
+src/modules/chanmodes/Makefile
+src/modules/extbans/Makefile
+src/modules/usermodes/Makefile
+src/modules/Makefile
+src/modules/third/Makefile
+/Makefile
+/src/Makefile
+/unrealircd
+include/setup.h
+
+# Ignore tags file
+tags
+
+# Ignore editor files
+*\#*
+*~
+
+# Ignore SSL Stuff
+server.cert.pem
+server.key.pem
+server.req.pem
+tls.rnd
+
+# Ignores for platform stuff
+.DS_Store
+
+# Ignores for build artifacts
+*.so
+*.o
+*.dSYM
+*.dylib
+src/ircd
+src/version.c
+src/include
+
+# Ignores for mac stuff
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+src/macosx/build/
+DerivedData
+src/macosx/pods/
+
+# Doxygen generated files
+doc/doxygen/
diff --git a/Config b/Config
new file mode 100755
index 0000000..28ccb7f
--- /dev/null
+++ b/Config
@@ -0,0 +1,793 @@
+#!/bin/sh
+#
+# Config script for UnrealIRCd
+# (C) 2001-2019 The UnrealIRCd Team
+#
+# This configure script is free software; the UnrealIRCd Team gives 
+# unlimited permission to copy, distribute and modify as long as the
+# copyright headers stay intact
+#
+#
+# Rewritten completely to be an interface to autoconf by codemastr
+# This was inspired by the config by Michael Graff (explorer@flame.org)
+# but was written from scratch
+
+# In order to be faster than the old Config, this assumes that all information
+# in the cache file is valid and therefore doesn't check it, so if you messed with
+# default values thats your problem :P
+
+# some bits edited by baafie on March 17 2004, every change marked.
+
+
+RUN_CONFIGURE () {
+ARG=" "
+
+if [ -z "$BINDIR" -o -z "$DATADIR" -o -z "$CONFDIR" -o -z "$MODULESDIR" -o -z "$LOGDIR" -o -z "$CACHEDIR" -o -z "$DOCDIR" -o -z "$TMPDIR" -o -z "$PRIVATELIBDIR" ]; then
+	echo "Sorry './Config -quick' cannot be used because your 'config.settings'"
+	echo "file either does not exist or is from an old UnrealIRCd version"
+	echo "(older than UnrealIRCd 5.0.0)."
+	echo ""
+	echo "Please run './Config' without -quick and answer all questions."
+	echo ""
+	exit
+fi
+
+
+mkdir -p $TMPDIR
+mkdir -p $PRIVATELIBDIR
+
+# Do this even if we're not in advanced mode
+if [ "$SHOWLISTMODES" = "1" ] ; then
+	ARG="$ARG--with-showlistmodes "
+fi
+if [ "$ADVANCED" = "1" ] ; then
+if [ "$NOOPEROVERRIDE" = "1" ] ; then
+	ARG="$ARG--with-no-operoverride "
+fi
+if [ "$OPEROVERRIDEVERIFY" = "1" ] ; then
+	ARG="$ARG--with-operoverride-verify "
+fi
+fi
+if test x"$SSLDIR" = "x" ; then
+ARG="$ARG--enable-ssl "
+else
+ARG="$ARG--enable-ssl=$SSLDIR "
+fi
+if [ "$REMOTEINC" = "1" ] ; then
+ARG="$ARG--enable-libcurl=$CURLDIR "
+fi
+if [ "$PREFIXAQ" != "1" ]; then
+ARG="$ARG--disable-prefixaq "
+fi
+if [ "$MAXCONNECTIONS_REQUEST" != "auto" ]; then
+	ARG="$ARG--with-maxconnections=$MAXCONNECTIONS_REQUEST "
+fi
+
+ARG="$ARG--with-bindir=$BINDIR "
+ARG="$ARG--with-datadir=$DATADIR "
+ARG="$ARG--with-pidfile=$DATADIR/unrealircd.pid "
+ARG="$ARG--with-confdir=$CONFDIR "
+ARG="$ARG--with-modulesdir=$MODULESDIR "
+ARG="$ARG--with-logdir=$LOGDIR "
+ARG="$ARG--with-cachedir=$CACHEDIR "
+ARG="$ARG--with-docdir=$DOCDIR "
+ARG="$ARG--with-tmpdir=$TMPDIR "
+ARG="$ARG--with-privatelibdir=$PRIVATELIBDIR "
+ARG="$ARG--with-scriptdir=$BASEPATH "
+ARG="$ARG--with-nick-history=$NICKNAMEHISTORYLENGTH "
+ARG="$ARG--with-permissions=$DEFPERM "
+ARG="$ARG--enable-dynamic-linking "
+ARG="$ARG $EXTRAPARA "
+CONF="./configure $ARG"
+# remove possibly old instances of curl in ~/unrealircd/lib/
+rm -f $PRIVATELIBDIR/*curl* 1>/dev/null 2>&1
+# Ensure we install curl even if someone does ./Config -quick...
+if [ "x$CURLDIR" = "x$UNREALCWD/extras/curl" ]; then
+	INSTALLCURL=1
+fi
+if [ "x$INSTALLCURL" = "x1" ]; then
+	extras/curlinstall "$PRIVATELIBDIR" || exit 1
+fi
+echo $CONF
+$CONF || exit 1
+cd "$UNREALCWD"
+if [  "$QUICK" != "1" ] ; then
+if [ ! -f $CONFDIR/tls/server.cert.pem -a ! -f $CONFDIR/ssl/server.cert.pem ]; then
+export OPENSSLPATH
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$GENCERTIFICATE" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to generate an SSL certificate for the IRCd?"
+    echo "Only answer No if you already have one."
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    GENCERTIFICATE="1"
+	    ;;
+	[Nn]*)
+	    GENCERTIFICATE=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+if [ "$GENCERTIFICATE" = 1 ]; then
+	make pem
+	echo "Certificate created successfully."
+	sleep 1
+else
+	echo "Ok, not generating SSL certificate. Make sure that the certificate and key"
+	echo "are installed in conf/tls/server.crt.pem and conf/tls/server.key.pem prior to starting the IRCd."
+fi
+else
+echo "SSL certificate already exists in configuration directory, no need to regenerate."
+fi
+fi
+
+# Silently force a 'make clean' as otherwise part (or whole) of the
+# compiled source could be using different settings than the user
+# just requested when re-running ./Config.
+make clean 1>/dev/null 2>&1
+}
+
+RUN_ADVANCED () {
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$SHOWLISTMODES" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to show the modes a channel has set in the /list output?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    SHOWLISTMODES="1"
+	    ;;
+	[Nn]*)
+	    SHOWLISTMODES=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$NOOPEROVERRIDE" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to disable oper override?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    NOOPEROVERRIDE="1"
+	    ;;
+	[Nn]*)
+	    NOOPEROVERRIDE=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$OPEROVERRIDEVERIFY" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to require opers to /invite themselves into a +s or +p channel?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    OPEROVERRIDEVERIFY="1"
+	    ;;
+	[Nn]*)
+	    OPEROVERRIDEVERIFY=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+}
+c=""
+n=""
+UNREALCWD="`pwd`"
+BASEPATH="$HOME/unrealircd"
+DEFPERM="0600"
+SSLDIR=""
+NICKNAMEHISTORYLENGTH="100"
+MAXCONNECTIONS_REQUEST="auto"
+REMOTEINC="1"
+CURLDIR=""
+PREFIXAQ="0"
+SHOWLISTMODES="0"
+NOOPEROVERRIDE=""
+OPEROVERRIDEVERIFY=""
+GENCERTIFICATE="1"
+EXTRAPARA=""
+if [ "`eval echo -n 'a'`" = "-n a" ] ; then
+        c="\c"
+else
+        n="-n"
+fi
+
+
+#parse arguments
+NOCACHE=""
+IMPORTEDSETTINGS=""
+NOINTRO=""
+QUICK=""
+CLEAN=""
+ADVANCED=""
+while [ $# -ge 1 ] ; do
+	if [ $1 = "--help" ] ; then
+		echo "Config utility for UnrealIRCd"
+		echo "-----------------------------"
+		echo "Syntax: ./Config [options]"
+		echo "-nocache     Ignore settings saved in config.settings"
+		echo "-nointro     Skip intro (release notes, etc)"
+		echo "-quick       Skip questions, go straight to configure"
+		echo "-advanced    Include additional advanced questions"
+		echo "-clean       Clean ./configure cache"
+		exit 0
+	elif [ $1 = "-nocache" ] ; then
+		NOCACHE="1"
+	elif [ $1 = "-nointro" ] ; then
+		NOINTRO="1"
+	elif [ $1 = "-quick" -o $1 = "-q" ] ; then
+		QUICK="1"
+		echo "running quick config"
+		if [ -f "config.settings" ] ; then
+			. ./config.settings
+		fi
+		RUN_CONFIGURE
+		cd "$UNREALCWD"
+		exit 0
+	elif [ $1 = "-clean" -o $1 = "-C" ] ; then
+		CLEAN="1"
+	elif [ $1 = "-advanced" ] ; then
+		PREADVANCED="1"
+	fi
+	shift 1
+done
+
+if [ "$PREADVANCED" = "1" ] ; then
+	ADVANCED="1"
+elif [ "$ADVANCED" = "1" ]; then
+	ADVANCED=""
+fi
+
+if [ -n "$CLEAN" ] ; then
+	rm -f config.cache
+fi
+
+if [ "`id -u`" = "0" ]; then
+	echo "ERROR: You cannot build or run UnrealIRCd as root"
+	echo ""
+	echo "Please create a separate account for building and running UnrealIRCd."
+	echo "See https://www.unrealircd.org/docs/Do_not_run_as_root"
+	exit
+fi
+
+clear
+
+    if [ -f "doc/Config.header" -a -z "$NOINTRO" ] ; then
+        more doc/Config.header
+        echo ""
+        echo $n "[Press Enter to continue]"
+        read cc
+        clear
+    fi
+
+echo "We will now ask you a number of questions. You can just press ENTER to accept the defaults!"
+echo ""
+
+if [ -z "$NOCACHE" ] ; then
+	# This needs to be updated each release so auto-upgrading works for settings, modules, etc!!:
+	UNREALRELEASES="unrealircd-5.0.2 unrealircd-5.0.1 unrealircd-5.0.0 unrealircd-5.0.0-rc2 unrealircd-5.0.0-rc1"
+	if [ -f "config.settings" ]; then
+		. ./config.settings
+	else
+		# Try to load a previous config.settings
+		for x in $UNREALRELEASES
+		do
+			if [ -f ../$x/config.settings ]; then
+				IMPORTEDSETTINGS="../$x"
+				break
+			fi
+		done
+		echo "If you have previously installed UnrealIRCd on this shell then you can specify a"
+		echo "directory here so I can import the build settings and third party modules"
+		echo "to make your life a little easier."
+		if [ ! -z "$IMPORTEDSETTINGS" ]; then
+			echo "Found previous installation in: $IMPORTEDSETTINGS."
+			echo "You can enter a different path or type 'none' if you don't want to use it."
+			echo "Just press Enter to accept the default settings."
+		else
+			echo "If you install UnrealIRCd for the first time on this shell, then just hit Enter";
+		fi
+
+		TEST="$IMPORTEDSETTINGS"
+		echo $n "[$TEST] -> $c"
+		read cc
+		if [ -z "$cc" ]; then
+			IMPORTEDSETTINGS="$TEST"
+		else
+			IMPORTEDSETTINGS="$cc"
+		fi
+		if [ "$IMPORTEDSETTINGS" = "none" ]; then
+			IMPORTEDSETTINGS=""
+		fi
+		if [ "$IMPORTEDSETTINGS" != "" ]; then
+			if [ -d $IMPORTEDSETTINGS/conf ]; then
+				echo "ERROR: Directory $IMPORTEDSETTINGS is an INSTALLATION directory (eg /home/irc/unrealircd)."
+				echo "This question was about a SOURCE directory (eg /home/irc/unrealircd-5.0.0)."
+				exit
+			fi
+			if [ ! -f $IMPORTEDSETTINGS/config.settings ]; then
+				echo "Directory $IMPORTEDSETTINGS does not exist or does not contain a config.settings file"
+				exit
+			fi
+			COPYMODULES="1"
+			if grep -q TOPICNICKISNUH $IMPORTEDSETTINGS/config.settings; then
+				echo "Directory $IMPORTEDSETTINGS seems to be UnrealIRCd 4.x (or older)."
+				echo "I will copy the settings but not any 3rd party modules, as they are incompatible with 5.x."
+				COPYMODULES="0"
+			fi
+			# Actually load the settings
+			. $IMPORTEDSETTINGS/config.settings
+			if [ "$COPYMODULES" = "1" ]; then
+				# Copy over 3rd party modules (also deals with 0 file cases, hence the silly looking code)
+				for f in $IMPORTEDSETTINGS/src/modules/third/*.c
+				do
+					[ -e "$f" ] && cp $f src/modules/third/
+				done
+			fi
+		fi
+	fi
+	# If we just imported settings and the curl dir is set to
+	# something like /home/xxx/unrealircd-5.x.y/extras/curl/
+	# (what we call 'local-curl') then remove this setting as
+	# it would refer to the old UnrealIRCd installation.
+	if [ ! -z "$IMPORTEDSETTINGS" ]; then
+		if echo "$CURLDIR"|grep -qi unrealircd; then
+			CURLDIR=""
+		fi
+	fi
+fi
+
+TEST="$BASEPATH"
+echo ""
+echo "In what directory do you want to install UnrealIRCd?"
+echo "(Note: UnrealIRCd 5 will need to be installed somewhere."
+echo " If this directory does not exist it will be created.)"
+echo $n "[$TEST] -> $c"
+read cc
+if [ -z "$cc" ] ; then
+   BASEPATH=$TEST
+else
+   BASEPATH=`eval echo $cc` # modified
+fi
+if [ "$BASEPATH" = "$UNREALCWD" ]; then
+	echo ""
+	echo "ERROR: The installation directory cannot be the same as the directory"
+	echo "       containing the source code ($UNREALCWD)."
+	echo " HINT: Usually the directory containing the source is $HOME/unrealircd-5.x.y"
+	echo "       and the installation directory you would need to enter is $HOME/unrealircd"
+	exit 1
+fi
+
+# TODO: For -advanced we could prompt the user.
+BINDIR="$BASEPATH/bin"
+DATADIR="$BASEPATH/data"
+CONFDIR="$BASEPATH/conf"
+MODULESDIR="$BASEPATH/modules"
+LOGDIR="$BASEPATH/logs"
+CACHEDIR="$BASEPATH/cache"
+DOCDIR="$BASEPATH/doc"
+TMPDIR="$BASEPATH/tmp"
+PRIVATELIBDIR="$BASEPATH/lib"
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    TEST="$DEFPERM"
+    echo ""
+    echo "What should the default permissions for your configuration files be? (Set this to 0 to disable)"
+    echo "It is strongly recommended that you use 0600 to prevent unwanted reading of the file"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	DEFPERM=$TEST
+	break
+    fi
+    case "$cc" in
+	[0-9]*)
+	    DEFPERM="$cc"
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter a number"
+	    TEST=""
+	    ;;
+    esac
+
+done
+
+
+
+
+echo ""
+echo "If you want, you can manually enter the path to OpenSSL/LibreSSL here."
+echo "In most cases you can leave this blank and it will be detected automatically."
+
+if [ -z "$SSLDIR" ]; then
+	uname|grep -q Darwin
+	if [ "$?" = 0 ]; then
+		echo "Looks like you're on a Mac - El Capitan and higher require"
+		echo "a 3rd party OpenSSL installation. We recommend using homebrew"
+		echo "to install OpenSSL, but you may install it any other way as well."
+		echo "We are selecting the default homebrew OpenSSL path - but you can"
+		echo "change it to another path if you have installed OpenSSL another way"
+		SSLDIR="/usr/local/opt/openssl/"
+	fi
+fi
+
+TEST="$SSLDIR"
+echo $n "[$TEST] -> $c"
+    read cc
+if [ -z "$cc" ] ; then
+    SSLDIR="$TEST"
+else 
+    SSLDIR=`eval echo $cc` # modified
+fi
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$REMOTEINC" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to enable remote includes?"
+    echo "This allows stuff like this in your configuration file:"
+    echo "include \"http://www.somesite.org/files/opers.conf\";"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    REMOTEINC="1"
+	    ;;
+	[Nn]*)
+	    REMOTEINC=""
+	    CURLDIR=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+if [ "$REMOTEINC" = "1" ] ; then
+	if [ ! -d "$CURLDIR" ]; then
+		# Reset any previous CURLDIR if it doesn't exist (anymore)
+		CURLDIR=""
+	fi
+
+	INSTALLCURL="0"
+	SUGGESTCURLDIR=""
+
+	if [ -d "/usr/local/include/curl" ]; then
+		SUGGESTCURLDIR="/usr/local"
+	fi
+	if [ -d "/usr/include/curl" ]; then
+		SUGGESTCURLDIR="/usr"
+	fi
+	# This one also works for /usr/include/x86_64-linux-gnu and friends:
+	if [ -f "/usr/bin/curl-config" ]; then
+		SUGGESTCURLDIR="/usr"
+	fi
+
+	GOTASYNC=0
+	if [ "x$SUGGESTCURLDIR" != "x" ]; then
+		# Check if it's of any use: a curl without async dns (cares) hangs the entire ircd..
+		# normally this is done in ./configure but now we're forced to do it also here..
+		if "$SUGGESTCURLDIR"/bin/curl-config --features | grep -q -e AsynchDNS; then
+			GOTASYNC="1"
+		fi
+		if [ "$GOTASYNC" != "1" ]; then
+			SUGGESTCURLDIRBAD="$CURLDIR"
+			SUGGESTCURLDIR=""
+		fi
+	fi
+
+	if [ "x$CURLDIR" = "x$HOME/curl" ]; then
+		if [ "x$SUGGESTCURLDIR" != "x" ]; then
+			# I guess some people will complain about this, but if system wide cURL is available
+			# and many people have old defaults then this is much preferred:
+			echo ""
+			echo "WARNING: Your previous (potentially old) setting is to use cURL from $HOME/curl."
+			echo "However, your operating system also provides a working cURL."
+			echo "I am therefore changing the setting to: $SUGGESTCURLDIR"
+			CURLDIR="$SUGGESTCURLDIR"
+		else
+			echo ""
+			echo "WARNING: We no longer use $HOME/curl nowadays."
+			echo "Use the automatic download and install feature below."
+			CURLDIR=""
+		fi
+	fi
+
+	if [ "x$CURLDIR" = "x" ]; then
+		CURLDIR="$SUGGESTCURLDIR"
+		# NOTE: CURLDIR may still be empty after this
+
+		# System curl has no asyncdns, so install our own.
+		if [ "$GOTASYNC" != "1" ]; then
+			CURLDIR=""
+		fi
+
+		# Need to output it here, as the HOME check from above may cause this to be no longer relevant.
+		if [ "x$CURLDIR" = "x" -a "x$SUGGESTCURLDIRBAD" != "x" ]; then
+			echo "Curl library was found in $SUGGESTCURLDIRBAD, but it does not support Asynchronous DNS (not compiled with c-ares)"
+			echo "so it's of no use to us as it would stall the IRCd on REHASH."
+		fi
+	fi
+
+	# Final check
+	if [ "x$CURLDIR" != "x" ]; then
+		"$CURLDIR/bin/curl-config" --features 2>/dev/null | grep -q -e AsynchDNS
+		if [ "$?" != 0 ]; then
+			echo "Curl from $CURLDIR seems unusable ($CURLDIR/bin/curl-config does not exist)"
+			CURLDIR=""
+		fi
+	fi
+
+        if [ "x$CURLDIR" = "x" ]; then
+        	# Still empty?
+        	TEST=""
+                while [ -z "$TEST" ] ; do
+                    TEST="Yes"
+                    echo ""
+        	    echo "Do you want me to automatically download and install curl for you?"
+                    echo $n "[$TEST] -> $c"
+                        read cc
+                    if [ -z "$cc" ] ; then
+                        cc=$TEST
+                    fi
+                    case "$cc" in
+                        [Yy]*)
+                            INSTALLCURL="1"
+                            CURLDIR="$UNREALCWD/extras/curl"
+                            ;;
+                        [Nn]*)
+                            INSTALLCURL="0"
+                            ;;
+                        *)
+                            echo ""
+                            echo "You must enter either Yes or No"
+                            TEST=""
+                            ;;
+                    esac
+                done
+        fi
+
+	if [ "$INSTALLCURL" != "1" ]; then
+	  TEST=""
+          while [ -z "$TEST" ] ; do
+                  TEST="$CURLDIR"
+                  echo ""
+                  echo "Specify the directory you installed libcurl to"
+                  echo $n "[$TEST] -> $c"
+                  read cc
+                  if [ -z "$cc" ] ; then
+                      cc=$TEST
+                  else
+                      TEST=$cc
+                      CURLDIR=`eval echo $cc` # modified
+                  fi
+          done
+        fi
+fi
+
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    if [ "$PREFIXAQ" = "1" ] ; then
+	TEST="Yes"
+    else
+	TEST="No"
+    fi
+    echo ""
+    echo "Do you want to enable prefixes for chanadmin and chanowner?"
+    echo "This will give +a the & prefix and ~ for +q (just like +o is @)"
+    echo "Supported by the major clients (mIRC, xchat, epic, eggdrop, Klient,"
+    echo "PJIRC, irssi, CGI:IRC, etc.)"
+    echo "This feature should be enabled/disabled network-wide."
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	cc=$TEST
+    fi
+    case "$cc" in
+	[Yy]*)
+	    PREFIXAQ="1"
+	    ;;
+	[Nn]*)
+	    PREFIXAQ=""
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter either Yes or No"
+	    TEST=""
+	    ;;
+    esac
+done
+
+TEST=""
+while [ -z "$TEST" ] ; do
+    TEST="$NICKNAMEHISTORYLENGTH"
+    echo ""
+    echo "How far back do you want to keep the nickname history?"
+    echo $n "[$TEST] -> $c"
+	read cc
+    if [ -z "$cc" ] ; then
+	NICKNAMEHISTORYLENGTH=$TEST
+	break
+    fi
+    case "$cc" in
+	[1-9]*)
+	    NICKNAMEHISTORYLENGTH="$cc"
+	    ;;
+	*)
+	    echo ""
+	    echo "You must enter a number"
+	    TEST=""
+	    ;;
+    esac
+done
+
+echo ""
+TEST=""
+while [ -z "$TEST" ] ; do
+	TEST="$MAXCONNECTIONS_REQUEST"
+	echo ""
+	echo "What is the maximum number of sockets (and file descriptors) that"
+	echo "UnrealIRCd may use?"
+	echo "It is recommended to leave this at the default setting 'auto',"
+	echo "which at present results in a limit of up to 8192, depending on"
+	echo "the system. When you boot UnrealIRCd later you will always see"
+	echo "the effective limit."
+	echo $n "[$TEST] -> $c"
+	read cc
+	if [ -z "$cc" ] ; then
+		MAXCONNECTIONS_REQUEST=$TEST
+		break
+	fi
+	case "$cc" in
+		auto)
+			MAXCONNECTIONS_REQUEST="$cc"
+			;;
+		[1-9][0-9][0-9]*)
+			MAXCONNECTIONS_REQUEST="$cc"
+			;;
+		*)
+			echo ""
+			echo "You must to enter a number greater than or equal to 100."
+			echo "Or enter 'auto' to leave it at automatic, which is recommended."
+			TEST=""
+			;;
+	esac
+done
+if [ -n "$ADVANCED" ] ; then
+	RUN_ADVANCED
+fi
+
+TEST="$EXTRAPARA"
+echo ""
+echo "Would you like to pass any custom parameters to configure?"
+echo "Most people don't need this and can just press ENTER."
+echo "Otherwise, see \`./configure --help' and write them here:"
+echo $n "[$TEST] -> $c"
+read EXTRAPARA
+if [ -z "$EXTRAPARA" ]; then
+    EXTRAPARA="$TEST"
+fi
+
+rm -f config.settings
+cat > config.settings << __EOF__
+#
+BASEPATH="$BASEPATH"
+BINDIR="$BINDIR"
+DATADIR="$DATADIR"
+CONFDIR="$CONFDIR"
+MODULESDIR="$MODULESDIR"
+LOGDIR="$LOGDIR"
+CACHEDIR="$CACHEDIR"
+DOCDIR="$DOCDIR"
+TMPDIR="$TMPDIR"
+PRIVATELIBDIR="$PRIVATELIBDIR"
+PREFIXAQ="$PREFIXAQ"
+MAXCONNECTIONS_REQUEST="$MAXCONNECTIONS_REQUEST"
+NICKNAMEHISTORYLENGTH="$NICKNAMEHISTORYLENGTH"
+DEFPERM="$DEFPERM"
+SSLDIR="$SSLDIR"
+REMOTEINC="$REMOTEINC"
+CURLDIR="$CURLDIR"
+SHOWLISTMODES="$SHOWLISTMODES"
+NOOPEROVERRIDE="$NOOPEROVERRIDE"
+OPEROVERRIDEVERIFY="$OPEROVERRIDEVERIFY"
+GENCERTIFICATE="$GENCERTIFICATE"
+EXTRAPARA="$EXTRAPARA"
+ADVANCED="$ADVANCED"
+__EOF__
+RUN_CONFIGURE
+cd "$UNREALCWD"
+cat << __EOF__
+
+ _______________________________________________________________________
+|                                                                       |
+|                    UnrealIRCd Compile-Time Config                     |
+|_______________________________________________________________________|
+|_______________________________________________________________________|
+|                                                                       |
+| Now all you have to do is type 'make' and let it compile. When that's |
+| done, you will receive other instructions on what to do next.         |
+|                                                                       |
+|_______________________________________________________________________|
+|_______________________________________________________________________|
+|                        - The UnrealIRCd Team -                        |
+|                                                                       |
+| * Bram Matthys (Syzop)     syzop@unrealircd.org                       |
+| * Gottem                   gottem@unrealircd.org                      |
+| * i                        i@unrealircd.org                           |
+|_______________________________________________________________________|
+__EOF__
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..d60c31a
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/Makefile.in b/Makefile.in
new file mode 100644
index 0000000..48853d6
--- /dev/null
+++ b/Makefile.in
@@ -0,0 +1,255 @@
+#/************************************************************************
+#*   IRC - Internet Relay Chat, Makefile
+#*   Copyright (C) 1990, Jarkko Oikarinen
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*  
+#*   $Id$
+#*/
+
+CC=@CC@
+INCLUDEDIR=@UNRLINCDIR@
+NETWORKSDIR=
+FROMDOS=/home/cmunk/bin/4dos
+
+# [CHANGEME]
+# Default flags:
+# Change XCFLAGS if you don't like what Config puts there.  Same with
+# IRCDLIBS.
+#
+# If you are configuring by hand, try "-O -g" for XCFLAGS, and leave
+# IRCDLIBS blank.  If that fails, try recomendations below.
+#
+
+#XCFLAGS=-O -g -export-dynamic
+IRCDLIBS=@IRCDLIBS@ @PCRE2_LIBS@ @ARGON2_LIBS@ @CARES_LIBS@ @PTHREAD_LIBS@
+CRYPTOLIB=@CRYPTOLIB@
+OPENSSLINCLUDES=
+
+XCFLAGS=@PTHREAD_CFLAGS@ @PCRE2_CFLAGS@ @ARGON2_CFLAGS@ @CARES_CFLAGS@ @CFLAGS@ @HARDEN_CFLAGS@ @CPPFLAGS@
+#
+# use the following on MIPS:
+#CFLAGS= -systype bsd43 -DSYSTYPE_BSD43 -I$(INCLUDEDIR)
+# For Irix 4.x (SGI), use the following:
+#CFLAGS= -g -cckr -I$(INCLUDEDIR)
+#
+# on NEXT use:
+#CFLAGS=-bsd -I$(INCLUDEDIR)
+#on NeXT other than 2.0:
+#IRCDLIBS=-lsys_s
+#
+# AIX 370 flags
+#CFLAGS=-D_BSD -Hxa -I$(INCLUDEDIR)
+#IRCDLIBS=-lbsd
+#
+# Dynix/ptx V2.0.x
+#CFLAGS= -I$(INCLUDEDIR) -O -Xo
+#IRCDLIBS= -lsocket -linet -lnsl -lseq
+# 
+# Dynix/ptx V1.x.x
+#IRCDLIBS= -lsocket -linet -lnsl -lseq
+#
+#use the following on SUN OS without nameserver libraries inside libc
+#IRCDLIBS=-lresolv
+#
+# Solaris 2
+#IRCDLIBS=-lsocket -lnsl -lresolv -L/usr/ucblib -R/usr/ucblib -lgen
+#
+# ESIX
+#CFLAGS=-O -I$(INCLUDEDIR) -I/usr/ucbinclude
+#IRCDLIBS=-L/usr/ucblib -L/usr/lib -lsocket -lucb -lns -lnsl
+#
+# LDFLAGS - flags to send the loader (ld). SunOS users may want to add
+# -Bstatic here.
+#
+#LDFLAGS=-Bstatic
+#
+#Dell SVR4
+#CC=gcc
+#CFLAGS= -I$(INCLUDEDIR) -O2
+#IRCDLIBS=-lsocket -lnsl -lucb
+
+# [CHANGEME]
+# IRCDMODE is the mode you want the binary to be.
+# The 4 at the front is important (allows for setuidness)
+#
+# WARNING: if you are making ircd SUID or SGID, check config.h to make sure
+#          you are not defining CMDLINE_CONFIG 
+IRCDMODE = 711
+
+URL=@URL@
+
+# Where is your openssl binary
+OPENSSLPATH=@OPENSSLPATH@
+
+CFLAGS=-I$(INCLUDEDIR) $(XCFLAGS)
+XLDFLAGS=@LDFLAGS_PRIVATELIBS@ @HARDEN_LDFLAGS@ @LDFLAGS@
+LDFLAGS=$(XLDFLAGS)
+
+SHELL=/bin/sh
+SUBDIRS=src
+BINDIR=@BINDIR@
+INSTALL=@INSTALL@
+RM=@RM@
+CP=@CP@
+TOUCH=@TOUCH@
+RES=
+all:	build
+
+MAKEARGS =	'CFLAGS=${CFLAGS}' 'CC=${CC}' 'IRCDLIBS=${IRCDLIBS}' \
+		'LDFLAGS=${LDFLAGS}' 'IRCDMODE=${IRCDMODE}' \
+		'RES=${RES}' 'BINDIR=${BINDIR}' 'INSTALL=${INSTALL}' \
+		'INCLUDEDIR=${INCLUDEDIR}' \
+		'RM=${RM}' 'CP=${CP}' 'TOUCH=${TOUCH}' \
+		'SHELL=${SHELL}' \
+		'CRYPTOLIB=${CRYPTOLIB}' \
+		'CRYPTOINCLUDES=${CRYPTOINCLUDES}' \
+		'URL=${URL}'
+
+custommodule:
+	@if test -z "${MODULEFILE}"; then echo "Please set MODULEFILE when calling \`\`make custommodule''. For example, \`\`make custommodule MODULEFILE=callerid''." >&2; exit 1; fi
+	+cd src; ${MAKE} ${MAKEARGS} MODULEFILE=${MODULEFILE} 'EXLIBS=${EXLIBS}' custommodule
+
+server: Makefile
+build: Makefile
+	-@if [ ! -f include/setup.h ] ; then \
+		echo "Hmm...doesn't look like you've run Config..."; \
+		echo "Doing so now."; \
+		sh Config; \
+	fi
+	@+for i in $(SUBDIRS); do \
+		echo "Building $$i";\
+		( cd $$i; ${MAKE} ${MAKEARGS} build; ) \
+	done
+	@echo ''
+	@echo '* UnrealIRCd compiled successfully'
+	@echo '* YOU ARE NOT DONE YET! Run "make install" to install UnrealIRCd !'
+	@echo ''
+
+clean:
+	$(RM) -f *~ \#* core *.orig include/*.orig
+	@+for i in $(SUBDIRS); do \
+		echo "Cleaning $$i";\
+		( cd $$i; ${MAKE} ${MAKEARGS} clean; ) \
+	done
+	-@if [ -f include/setup.h ] ; then \
+	  echo "To really restart installation, remove include/setup.h" ; \
+	fi
+
+cleandir: clean
+	rm -rf include/setup.h Makefile Settings
+
+distclean: cleandir
+	rm -rf extras/*.bak extras/*.tar extras/c-ares
+	rm -rf extras/c-ares-* extras/tre-*
+	rm -rf config.log config.settings *.pem ircd.* unrealircd
+	rm -rf Makefile config.status
+	
+depend:
+	@+for i in $(SUBDIRS); do \
+		echo "Making dependencies in $$i";\
+		( cd $$i; ${MAKE} ${MAKEARGS} depend; ) \
+	done
+
+install: all
+	$(INSTALL) -m 0700 -d @BINDIR@
+	$(INSTALL) -m 0700 src/ircd @BINDIR@/unrealircd
+	$(INSTALL) -m 0700 -d @DOCDIR@
+	$(INSTALL) -m 0600 doc/Authors doc/coding-guidelines doc/tao.of.irc @DOCDIR@
+	$(INSTALL) -m 0700 -d @CONFDIR@
+	$(INSTALL) -m 0600 doc/conf/*.conf @CONFDIR@
+	$(INSTALL) -m 0600 doc/conf/*.motd @CONFDIR@
+	$(INSTALL) -m 0600 doc/conf/modules.sources.list @CONFDIR@
+	$(INSTALL) -m 0700 unrealircd @SCRIPTDIR@
+	$(INSTALL) -m 0700 -d @MODULESDIR@
+	@rm -f @MODULESDIR@/*.so 1>/dev/null 2>&1
+	$(INSTALL) -m 0700 src/modules/*.so @MODULESDIR@
+	$(INSTALL) -m 0700 -d @MODULESDIR@/usermodes
+	@rm -f @MODULESDIR@/usermodes/*.so 1>/dev/null 2>&1
+	$(INSTALL) -m 0700 src/modules/usermodes/*.so @MODULESDIR@/usermodes
+	$(INSTALL) -m 0700 -d @MODULESDIR@/chanmodes
+	@rm -f @MODULESDIR@/chanmodes/*.so 1>/dev/null 2>&1
+	$(INSTALL) -m 0700 src/modules/chanmodes/*.so @MODULESDIR@/chanmodes
+	$(INSTALL) -m 0700 -d @MODULESDIR@/snomasks
+	@rm -f @MODULESDIR@/snomasks/*.so 1>/dev/null 2>&1
+	$(INSTALL) -m 0700 src/modules/snomasks/*.so @MODULESDIR@/snomasks
+	$(INSTALL) -m 0700 -d @MODULESDIR@/extbans
+	@rm -f @MODULESDIR@/extbans/*.so 1>/dev/null 2>&1
+	$(INSTALL) -m 0700 src/modules/extbans/*.so @MODULESDIR@/extbans
+	@#If the conf/ssl directory exists then rename it here to conf/tls
+	@#and add a symlink for backwards compatibility (so that f.e. certbot
+	@#doesn't randomly fail after an upgrade to U5).
+	-@if [ -d "@CONFDIR@/ssl" ] ; then \
+		mv "@CONFDIR@/ssl" "@CONFDIR@/tls" ; \
+		ln -s "@CONFDIR@/tls" "@CONFDIR@/ssl" ; \
+	fi
+	$(INSTALL) -m 0700 -d @CONFDIR@/tls
+	$(INSTALL) -m 0600 doc/conf/tls/curl-ca-bundle.crt @CONFDIR@/tls
+	@# delete modules/cap directory, to avoid confusing with U4 to U5 upgrades:
+	rm -rf @MODULESDIR@/cap
+	$(INSTALL) -m 0700 -d @MODULESDIR@/third
+	@rm -f @MODULESDIR@/third/*.so 1>/dev/null 2>&1
+	@#This step can fail with zero files, so we ignore exit status:
+	-$(INSTALL) -m 0700 src/modules/third/*.so @MODULESDIR@/third
+	$(INSTALL) -m 0700 -d @TMPDIR@
+	$(INSTALL) -m 0700 -d @CACHEDIR@
+	$(INSTALL) -m 0700 -d @PERMDATADIR@
+	$(INSTALL) -m 0700 -d @LOGDIR@
+	-@if [ ! -f "@CONFDIR@/tls/server.cert.pem" ] ; then \
+		$(INSTALL) -m 0600 server.req.pem @CONFDIR@/tls ; \
+		$(INSTALL) -m 0600 server.key.pem @CONFDIR@/tls ; \
+		$(INSTALL) -m 0600 server.cert.pem @CONFDIR@/tls ; \
+	fi
+	@echo ''
+	@echo '* UnrealIRCd is now installed.'
+	
+	-@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
+		echo '* Leave this directory and run "cd @SCRIPTDIR@" now' ; \
+	fi
+	@echo '* Directory layout:'
+	-@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
+		echo ' * Base directory: @SCRIPTDIR@' ; \
+	fi
+	@echo '  * Configuration files: @CONFDIR@'
+	@echo '  * Log files: @LOGDIR@'
+	@echo '  * Modules: @MODULESDIR@'
+	@echo '* To start/stop UnrealIRCd run: @SCRIPTDIR@/unrealircd"'
+	@echo ''
+	@echo '* Consult the documentation online at:'
+	@echo '  * https://www.unrealircd.org/docs/'
+	@echo '  * https://www.unrealircd.org/docs/FAQ'
+	@echo '* You may also wish to install a cron job to ensure UnrealIRCd is always running:'
+	@echo '  * https://www.unrealircd.org/docs/Cron_job'
+	@echo ''
+	-@if [ "@SCRIPTDIR@/bin" = "@BINDIR@" ] ; then \
+		echo 'Again, be sure to change to the @SCRIPTDIR@ directory!' ; \
+	fi
+
+pem:	extras/tls.cnf
+	@echo "Generating server key..."
+	$(OPENSSLPATH) ecparam -out server.key.pem -name secp384r1 -genkey
+	@echo "Generating certificate request..."
+	$(OPENSSLPATH) req -new \
+              -config extras/tls.cnf -sha256 -out server.req.pem \
+              -key server.key.pem -nodes
+	@echo "Generating self-signed certificate..."
+	$(OPENSSLPATH) req -x509 -days 3650 -sha256 -in server.req.pem \
+               -key server.key.pem -out server.cert.pem
+	@echo "Setting permissions on server.*.pem files..."
+	chmod o-rwx server.req.pem server.key.pem server.cert.pem
+	chmod g-rwx server.req.pem server.key.pem server.cert.pem
+
+Makefile: config.status Makefile.in
+	./config.status
diff --git a/Makefile.windows b/Makefile.windows
new file mode 100644
index 0000000..d8acb23
--- /dev/null
+++ b/Makefile.windows
@@ -0,0 +1,1084 @@
+#
+# UnrealIRCd Makefile - codemastr
+#
+CC=cl
+LINK=link
+RC=rc
+MT=mt
+
+############################ USER CONFIGURATION ############################
+
+# You are encouraged NOT to set these values here, but instead make a batch file
+# which passes all these arguments to nmake, like:
+# nmake -f makefile.windows LIBRESSL_INC_DIR="c:\dev\libressl" etc etc...
+# Both ways will work, but if you use a batch file it's easier with
+# upgrading UnrealIRCd as you won't have to edit this makefile again.
+
+### PCRE2 ###
+#PCRE2_LIB_DIR="C:\dev\pcre2\build\release"
+#PCRE2_INC_DIR="C:\dev\pcre2"
+#PCRE2LIB="pcre2-8.lib"
+
+### ARGON2 ###
+#ARGON2_LIB_DIR="C:\dev\argon2\vs2015\build"
+#ARGON2_INC_DIR="C:\dev\argon2\include"
+#ARGON2LIB="Argon2RefDll.lib"
+
+### C-ARES ####
+#CARES_LIB_DIR="C:\dev\c-ares\vc\cares\dll-release"
+#CARES_INC_DIR="C:\dev\c-ares"
+#CARESLIB="cares.lib"
+
+##### REMOTE INCLUDES ####
+#To enable remote include support you must have libcurl installed on your
+#system and it must have ares support enabled.
+#
+#
+#To enable remote includes uncomment the next line:
+#USE_REMOTEINC=1
+#
+#If your libcurl library and include files are not in your compiler's
+#default locations, specify the locations here:
+#LIBCURL_INC_DIR="c:\dev\curl\include"
+#LIBCURL_LIB_DIR="c:\dev\curl\lib"
+#
+#
+### END REMOTE INCLUDES ##
+
+####### SSL/TLS SUPPORT (MANDATORY) ######
+#Use LibreSSL or OpenSSL. Define paths and libraries:
+#LIBRESSL_INC_DIR="c:\dev\libressl\include"
+#LIBRESSL_LIB_DIR="c:\dev\libressl\lib"
+#SSLLIB=libcrypto-38.lib libssl-39.lib libtls-11.lib
+#The version numbers of the 3 libraries in the last line change
+#every libressl release. So be sure to update after any libressl upgrade.
+######### END SSL/TLS ########
+
+###### _EXTRA_ DEBUGGING #####
+# We always build releases with debugging information, since otherwise
+# we cannot trace the source of a crash. Plus we do not mind the extra
+# performance hit caused by not enabling super-optimization, tracing
+# crashes properly is more important.
+# You can choose (at your own risk) to enable EVEN MORE debugging,
+# note that this causes /MDd to be used instead of /MD which can make
+# libraries incompatible, plus all the other side-effects such as
+# requiring a different dll we do not ship (and maybe you are not even
+# allowed to ship due to license agreements), etc...
+# In any case, this probably should not be used, unless debugging a
+# problem locally, in which case it can be useful.
+#DEBUGEXTRA=1
+#
+#
+#### END RELEASE BUILD ###
+
+############################# END CONFIGURATION ############################
+
+!IFDEF CARES_INC_DIR
+CARES_INC=/I "$(CARES_INC_DIR)"
+!ENDIF
+!IFDEF CARES_LIB_DIR
+CARES_LIB=/LIBPATH:"$(CARES_LIB_DIR)"
+!ENDIF
+
+!IFDEF PCRE2_INC_DIR
+PCRE2_INC=/I "$(PCRE2_INC_DIR)"
+!ENDIF
+!IFDEF PCRE2_LIB_DIR
+PCRE2_LIB=/LIBPATH:"$(PCRE2_LIB_DIR)"
+!ENDIF
+
+!IFDEF ARGON2_INC_DIR
+ARGON2_INC=/I "$(ARGON2_INC_DIR)"
+!ENDIF
+!IFDEF ARGON2_LIB_DIR
+ARGON2_LIB=/LIBPATH:"$(ARGON2_LIB_DIR)"
+!ENDIF
+
+!IFDEF USE_REMOTEINC
+CURLCFLAGS=/D USE_LIBCURL
+CURLOBJ=SRC/URL.OBJ
+CURLLIB=libcurl.lib
+!IFDEF LIBCURL_INC_DIR
+LIBCURL_INC=/I "$(LIBCURL_INC_DIR)"
+!ENDIF
+!IFDEF LIBCURL_LIB_DIR
+LIBCURL_LIB=/LIBPATH:"$(LIBCURL_LIB_DIR)"
+!ENDIF
+!ENDIF
+
+!IFDEF LIBRESSL_INC_DIR
+LIBRESSL_INC=/I "$(LIBRESSL_INC_DIR)"
+!ENDIF
+!IFDEF LIBRESSL_LIB_DIR
+LIBRESSL_LIB=/LIBPATH:"$(LIBRESSL_LIB_DIR)"
+!ENDIF
+
+!IFDEF DEBUGEXTRA
+DBGCFLAG=/MDd /Zi /Od
+DBGCFLAGST=/MTd /Zi /Od
+DBGLFLAG=/debug
+MODDBGCFLAG=/LDd /MDd /Zi
+!ELSE
+DBGCFLAG=/MD /Zi
+DBGCFLAGST=/MT /Zi
+DBGLFLAG=/debug
+MODDBGCFLAG=/LDd /MD /Zi
+!ENDIF 
+
+STDOPTIONS=$(PCRE2_INC) $(ARGON2_INC) $(CARES_INC) $(LIBCURL_INC) $(LIBRESSL_INC) /J /I ./INCLUDE /nologo \
+ $(CURLCFLAGS) /D FD_SETSIZE=16384 $(SSLCFLAGS) /D _CRT_SECURE_NO_DEPRECATE /D _CRT_NONSTDC_NO_DEPRECATE \
+ /D FAKELAG_CONFIGURABLE=1 \
+ /W3 /wd4267 /wd4101 /wd4018 /wd4244 /wd4996 /WX \
+ /analyze:ruleset extras\VStudioAnalyze.ruleset
+STDLIBS=$(CARES_LIB) $(CARESLIB) $(PCRE2_LIB) $(PCRE2LIB) $(ARGON2_LIB) $(ARGON2LIB) \
+ $(LIBRESSL_LIB) $(SSLLIB) $(LIBCURL_LIB) $(CURLLIB)
+CFLAGS=$(DBGCFLAG) $(STDOPTIONS) /c /Fosrc/
+CFLAGSST=$(DBGCFLAGST) $(STDOPTIONS) /c /Fosrc/
+LFLAGS=kernel32.lib user32.lib gdi32.lib shell32.lib ws2_32.lib advapi32.lib \
+ dbghelp.lib oldnames.lib comctl32.lib comdlg32.lib $(STDLIBS) \
+ /def:UnrealIRCd.def /implib:UnrealIRCd.lib \
+ /nologo $(DBGLFLAG) /out:UnrealIRCd.exe
+MODCFLAGS=$(MODDBGCFLAG) $(STDOPTIONS) /D DYNAMIC_LINKING /D MODULE_COMPILE
+MODLFLAGS=/link /def:src/modules/module.def UnrealIRCd.lib ws2_32.lib $(STDLIBS)
+
+INCLUDES=./include/struct.h ./include/config.h ./include/sys.h \
+ ./include/common.h ./include/version.h ./include/h.h ./include/numeric.h \
+ ./include/msg.h ./include/setup.h ./include/dynconf.h
+
+EXP_OBJ_FILES=SRC/CHANNEL.OBJ SRC/SEND.OBJ SRC/SOCKET.OBJ \
+ SRC/CONF.OBJ SRC/CONF_PREPROCESSOR.OBJ \
+ SRC/FDLIST.OBJ SRC/DBUF.OBJ  \
+ SRC/HASH.OBJ SRC/PARSE.OBJ SRC/IRCD.OBJ \
+ SRC/WHOWAS.OBJ \
+ SRC/MISC.OBJ SRC/MATCH.OBJ SRC/CRULE.OBJ \
+ SRC/DEBUG.OBJ  SRC/SUPPORT.OBJ SRC/LIST.OBJ \
+ SRC/NUMERIC.OBJ \
+ SRC/SERV.OBJ SRC/USER.OBJ \
+ SRC/VERSION.OBJ SRC/IRCSPRINTF.OBJ \
+ SRC/SCACHE.OBJ SRC/DNS.OBJ SRC/MODULES.OBJ \
+ SRC/ALIASES.OBJ SRC/API-EVENT.OBJ SRC/API-USERMODE.OBJ SRC/AUTH.OBJ SRC/TLS.OBJ \
+ SRC/RANDOM.OBJ SRC/API-CHANNELMODE.OBJ SRC/API-MODDATA.OBJ SRC/MEMPOOL.OBJ \
+ SRC/DISPATCH.OBJ SRC/API-ISUPPORT.OBJ SRC/API-COMMAND.OBJ \
+ SRC/API-CLICAP.OBJ SRC/API-MESSAGETAG.OBJ SRC/API-HISTORY-BACKEND.OBJ \
+ SRC/API-EXTBAN.OBJ SRC/API-EFUNCTIONS.OBJ SRC/CRYPT_BLOWFISH.OBJ \
+ SRC/OPERCLASS.OBJ SRC/UPDCONF.OBJ SRC/CRASHREPORT.OBJ \
+ SRC/OPENSSL_HOSTNAME_VALIDATION.OBJ \
+ SRC/UTF8.OBJ $(CURLOBJ)
+
+OBJ_FILES=$(EXP_OBJ_FILES) SRC/GUI.OBJ SRC/SERVICE.OBJ SRC/WINDEBUG.OBJ SRC/RTF.OBJ \
+ SRC/EDITOR.OBJ SRC/WIN.OBJ 
+
+DLL_FILES=SRC/MODULES/CLOAK.DLL \
+ SRC/MODULES/CHGHOST.DLL SRC/MODULES/SDESC.DLL SRC/MODULES/SETIDENT.DLL \
+ SRC/MODULES/SETNAME.DLL SRC/MODULES/SETHOST.DLL SRC/MODULES/CHGIDENT.DLL \
+ SRC/MODULES/SVSMOTD.DLL SRC/MODULES/SVSNLINE.DLL SRC/MODULES/WHO_OLD.DLL \
+ SRC/MODULES/WHOX.DLL \
+ SRC/MODULES/SWHOIS.DLL SRC/MODULES/SVSMODE.DLL SRC/MODULES/AWAY.DLL \
+ SRC/MODULES/SVSNOOP.DLL SRC/MODULES/MKPASSWD.DLL \
+ SRC/MODULES/SVSNICK.DLL \
+ SRC/MODULES/CHGNAME.DLL \
+ SRC/MODULES/LAG.DLL SRC/MODULES/MESSAGE.DLL \
+ SRC/MODULES/OPER.DLL SRC/MODULES/PINGPONG.DLL SRC/MODULES/QUIT.DLL \
+ SRC/MODULES/SENDUMODE.DLL \
+ SRC/MODULES/SQLINE.DLL SRC/MODULES/KILL.DLL SRC/MODULES/TSCTL.DLL \
+ SRC/MODULES/UNSQLINE.DLL \
+ SRC/MODULES/WHOIS.DLL SRC/MODULES/TKL.DLL SRC/MODULES/VHOST.DLL \
+ SRC/MODULES/CYCLE.DLL SRC/MODULES/SVSJOIN.DLL SRC/MODULES/SVSPART.DLL \
+ SRC/MODULES/SVSLUSERS.DLL SRC/MODULES/SVSWATCH.DLL SRC/MODULES/SVSSILENCE.DLL \
+ SRC/MODULES/SENDSNO.DLL SRC/MODULES/SVSSNO.DLL SRC/MODULES/SAJOIN.DLL \
+ SRC/MODULES/SAPART.DLL SRC/MODULES/SAMODE.DLL SRC/MODULES/KICK.DLL \
+ SRC/MODULES/TOPIC.DLL SRC/MODULES/INVITE.DLL SRC/MODULES/LIST.DLL \
+ SRC/MODULES/TIME.DLL SRC/MODULES/SVSKILL.DLL SRC/MODULES/KNOCK.DLL \
+ SRC/MODULES/UMODE2.DLL SRC/MODULES/SQUIT.DLL SRC/MODULES/PROTOCTL.DLL \
+ SRC/MODULES/SJOIN.DLL SRC/MODULES/PASS.DLL SRC/MODULES/USERHOST.DLL \
+ SRC/MODULES/ISON.DLL SRC/MODULES/SILENCE.DLL \
+ SRC/MODULES/ADDMOTD.DLL SRC/MODULES/ADDOMOTD.DLL SRC/MODULES/WALLOPS.DLL \
+ SRC/MODULES/GLOBOPS.DLL SRC/MODULES/LOCOPS.DLL \
+ SRC/MODULES/ADMIN.DLL SRC/MODULES/TRACE.DLL SRC/MODULES/NETINFO.DLL \
+ SRC/MODULES/LINKS.DLL SRC/MODULES/HELP.DLL SRC/MODULES/RULES.DLL \
+ SRC/MODULES/CLOSE.DLL SRC/MODULES/MAP.DLL SRC/MODULES/EOS.DLL \
+ SRC/MODULES/SERVER.DLL SRC/MODULES/STATS.DLL \
+ SRC/MODULES/DCCDENY.DLL SRC/MODULES/WHOWAS.DLL \
+ SRC/MODULES/CONNECT.DLL SRC/MODULES/DCCALLOW.DLL SRC/MODULES/USERIP.DLL \
+ SRC/MODULES/NICK.DLL SRC/MODULES/USER.DLL SRC/MODULES/MODE.DLL \
+ SRC/MODULES/WATCH.DLL SRC/MODULES/PART.DLL SRC/MODULES/JOIN.DLL \
+ SRC/MODULES/MOTD.DLL SRC/MODULES/OPERMOTD.DLL SRC/MODULES/BOTMOTD.DLL \
+ SRC/MODULES/LUSERS.DLL SRC/MODULES/NAMES.DLL SRC/MODULES/SVSNOLAG.DLL \
+ SRC/MODULES/STARTTLS.DLL \
+ SRC/MODULES/WEBREDIR.DLL \
+ SRC/MODULES/CAP.DLL \
+ SRC/MODULES/SASL.DLL \
+ SRC/MODULES/TLS_ANTIDOS.DLL \
+ SRC/MODULES/MD.DLL \
+ SRC/MODULES/CERTFP.DLL \
+ SRC/MODULES/WEBIRC.DLL \
+ SRC/MODULES/WEBSOCKET.DLL \
+ SRC/MODULES/BLACKLIST.DLL \
+ SRC/MODULES/JOINTHROTTLE.DLL \
+ SRC/MODULES/ANTIRANDOM.DLL \
+ SRC/MODULES/HIDESERVER.DLL \
+ SRC/MODULES/JUMPSERVER.DLL \
+ SRC/MODULES/IRCOPS.DLL \
+ SRC/MODULES/STAFF.DLL \
+ SRC/MODULES/NOCODES.DLL \
+ SRC/MODULES/CHARSYS.DLL \
+ SRC/MODULES/ANTIMIXEDUTF8.DLL \
+ SRC/MODULES/AUTHPROMPT.DLL \
+ SRC/MODULES/SINFO.DLL \
+ SRC/MODULES/REPUTATION.DLL \
+ SRC/MODULES/CONNTHROTTLE.DLL \
+ SRC/MODULES/CHANMODES/CENSOR.DLL \
+ SRC/MODULES/CHANMODES/DELAYJOIN.DLL \
+ SRC/MODULES/CHANMODES/FLOODPROT.DLL \
+ SRC/MODULES/CHANMODES/ISSECURE.DLL \
+ SRC/MODULES/CHANMODES/LINK.DLL \
+ SRC/MODULES/CHANMODES/NOCOLOR.DLL \
+ SRC/MODULES/CHANMODES/NOCTCP.DLL \
+ SRC/MODULES/CHANMODES/NOINVITE.DLL \
+ SRC/MODULES/CHANMODES/NOKICK.DLL \
+ SRC/MODULES/CHANMODES/NOKNOCK.DLL \
+ SRC/MODULES/CHANMODES/NONICKCHANGE.DLL \
+ SRC/MODULES/CHANMODES/NONOTICE.DLL \
+ SRC/MODULES/CHANMODES/OPERONLY.DLL \
+ SRC/MODULES/CHANMODES/PERMANENT.DLL \
+ SRC/MODULES/CHANMODES/REGONLY.DLL \
+ SRC/MODULES/CHANMODES/REGONLYSPEAK.DLL \
+ SRC/MODULES/CHANMODES/SECUREONLY.DLL \
+ SRC/MODULES/CHANMODES/STRIPCOLOR.DLL \
+ SRC/MODULES/CHANMODES/HISTORY.DLL \
+ SRC/MODULES/USERMODES/CENSOR.DLL \
+ SRC/MODULES/USERMODES/NOCTCP.DLL \
+ SRC/MODULES/USERMODES/BOT.DLL \
+ SRC/MODULES/USERMODES/SERVICEBOT.DLL \
+ SRC/MODULES/USERMODES/SHOWWHOIS.DLL \
+ SRC/MODULES/USERMODES/PRIVACY.DLL \
+ SRC/MODULES/USERMODES/NOKICK.DLL \
+ SRC/MODULES/USERMODES/REGONLYMSG.DLL \
+ SRC/MODULES/USERMODES/PRIVDEAF.DLL \
+ SRC/MODULES/USERMODES/SECUREONLYMSG.DLL \
+ SRC/MODULES/SNOMASKS/DCCREJECT.DLL \
+ SRC/MODULES/EXTBANS/ACCOUNT.DLL \
+ SRC/MODULES/EXTBANS/INCHANNEL.DLL \
+ SRC/MODULES/EXTBANS/JOIN.DLL \
+ SRC/MODULES/EXTBANS/NICKCHANGE.DLL \
+ SRC/MODULES/EXTBANS/QUIET.DLL \
+ SRC/MODULES/EXTBANS/REALNAME.DLL \
+ SRC/MODULES/EXTBANS/OPERCLASS.DLL \
+ SRC/MODULES/EXTBANS/CERTFP.DLL \
+ SRC/MODULES/EXTBANS/TEXTBAN.DLL \
+ SRC/MODULES/EXTBANS/MSGBYPASS.DLL \
+ SRC/MODULES/EXTBANS/TIMEDBAN.DLL \
+ SRC/MODULES/EXTBANS/PARTMSG.DLL \
+ SRC/MODULES/ACCOUNT-NOTIFY.DLL \
+ SRC/MODULES/MESSAGE-TAGS.DLL \
+ SRC/MODULES/BATCH.DLL \
+ SRC/MODULES/ACCOUNT-TAG.DLL \
+ SRC/MODULES/LABELED-RESPONSE.DLL \
+ SRC/MODULES/LINK-SECURITY.DLL \
+ SRC/MODULES/MESSAGE-IDS.DLL \
+ SRC/MODULES/PLAINTEXT-POLICY.DLL \
+ SRC/MODULES/SERVER-TIME.DLL \
+ SRC/MODULES/STS.DLL \
+ SRC/MODULES/TKLDB.DLL \
+ SRC/MODULES/CHANNELDB.DLL \
+ SRC/MODULES/HISTORY_BACKEND_MEM.DLL \
+ SRC/MODULES/HISTORY_BACKEND_NULL.DLL \
+ SRC/MODULES/RESTRICT-COMMANDS.DLL \
+ SRC/MODULES/RMTKL.DLL \
+ SRC/MODULES/ECHO-MESSAGE.DLL \
+ SRC/MODULES/USERIP-TAG.DLL \
+ SRC/MODULES/USERHOST-TAG.DLL \
+ SRC/MODULES/REQUIRE-MODULE.DLL \
+ SRC/MODULES/IDENT_LOOKUP.DLL \
+ SRC/MODULES/HISTORY.DLL
+
+
+ALL: CONF UNREALSVC.EXE UnrealIRCd.exe MODULES 
+
+CLEAN:
+        -@erase *.obj >NUL
+        -@erase src\*.obj >NUL
+        -@erase src\win.res >NUL
+        -@erase src\version.c >NUL
+        -@erase src\windows\*.obj >NUL
+	-@erase src\modules\*.obj >NUL
+	-@erase src\modules\*.lib >NUL
+	-@erase src\modules\*.pdb >NUL
+	-@erase src\modules\*.dll >NUL
+	-@erase src\modules\*.exp >NUL
+	-@erase src\modules\*.ilk >NUL
+	-@erase src\modules\chanmodes\*.obj >NUL
+	-@erase src\modules\chanmodes\*.lib >NUL
+	-@erase src\modules\chanmodes\*.pdb >NUL
+	-@erase src\modules\chanmodes\*.dll >NUL
+	-@erase src\modules\chanmodes\*.exp >NUL
+	-@erase src\modules\chanmodes\*.ilk >NUL
+	-@erase src\modules\usermodes\*.obj >NUL
+	-@erase src\modules\usermodes\*.lib >NUL
+	-@erase src\modules\usermodes\*.pdb >NUL
+	-@erase src\modules\usermodes\*.dll >NUL
+	-@erase src\modules\usermodes\*.exp >NUL
+	-@erase src\modules\usermodes\*.ilk >NUL
+	-@erase src\modules\snomasks\*.obj >NUL
+	-@erase src\modules\snomasks\*.lib >NUL
+	-@erase src\modules\snomasks\*.pdb >NUL
+	-@erase src\modules\snomasks\*.dll >NUL
+	-@erase src\modules\snomasks\*.exp >NUL
+	-@erase src\modules\snomasks\*.ilk >NUL
+	-@erase src\modules\extbans\*.obj >NUL
+	-@erase src\modules\extbans\*.lib >NUL
+	-@erase src\modules\extbans\*.pdb >NUL
+	-@erase src\modules\extbans\*.dll >NUL
+	-@erase src\modules\extbans\*.exp >NUL
+	-@erase src\modules\extbans\*.ilk >NUL
+        -@erase .\*.exe >NUL
+	-@erase UnrealIRCd.lib >NUL
+
+./UNREALSVC.EXE: SRC/UNREALSVC.OBJ SRC/WINDOWS/UNREALSVC.RES
+	$(LINK) $(DBGLFLAGST) advapi32.lib src/unrealsvc.obj src/windows/unrealsvc.res
+
+CONF:
+	-@copy include\windows\setup.h include\setup.h >NUL
+	$(CC) src/windows/config.c
+	-@config.exe
+
+
+
+./UnrealIRCd.exe: $(OBJ_FILES) src/windows/win.res
+        $(LINK) $(LFLAGS) $(OBJ_FILES) src/windows/win.res /MAP
+	-@erase src\windows\win.res
+	$(MT) -manifest src\windows\UnrealIRCd.exe.manifest -outputresource:UnrealIRCd.exe;1
+!IFNDEF DEBUGEXTRA
+ @echo Standard version built 
+!ELSE
+ @echo Extra-Debug version built ... 
+!ENDIF
+
+#Source files
+
+src/version.obj: src/version.c
+        $(CC) $(CFLAGS) src/version.c
+
+src/parse.obj: src/parse.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/parse.c
+
+src/socket.obj: src/socket.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/socket.c
+
+src/dbuf.obj: src/dbuf.c $(INCLUDES) ./include/dbuf.h
+        $(CC) $(CFLAGS) src/dbuf.c
+
+src/ircsprintf.obj: src/ircsprintf.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/ircsprintf.c
+
+src/fdlist.obj: src/fdlist.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/fdlist.c
+
+src/dynconf.obj: src/dynconf.c $(INCLUDES) ./include/dbuf.h \
+                ./include/channel.h ./include/whowas.h
+        $(CC) $(CFLAGS) src/dynconf.c
+
+src/send.obj: src/send.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/send.c
+
+src/match.obj: src/match.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/match.c
+
+src/support.obj: src/support.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/support.c
+
+src/channel.obj: src/channel.c $(INCLUDES) ./include/channel.h
+        $(CC) $(CFLAGS) src/channel.c
+
+src/class.obj: src/class.c $(INCLUDES) ./include/class.h
+        $(CC) $(CFLAGS) src/class.c
+
+src/ircd.obj: src/ircd.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/ircd.c
+
+src/list.obj: src/list.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/list.c
+
+src/dns.obj: src/dns.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/dns.c
+
+src/conf.obj: src/conf.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/conf.c
+
+src/conf_preprocessor.obj: src/conf_preprocessor.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/conf_preprocessor.c
+
+src/debug.obj: src/debug.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/debug.c
+
+src/numeric.obj: src/numeric.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/numeric.c
+
+src/misc.obj: src/misc.c $(INCLUDES) ./include/dbuf.h
+        $(CC) $(CFLAGS) src/misc.c
+
+src/scache.obj: src/scache.c $(INCLUDES) ./include/dbuf.h
+        $(CC) $(CFLAGS) src/scache.c
+
+src/socks.obj: src/socks.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/socks.c
+
+src/aliases.obj: src/aliases.c $(INCLUDES)
+	  $(CC) $(CFLAGS) src/aliases.c
+
+src/user.obj: src/user.c $(INCLUDES) ./include/dbuf.h \
+                ./include/channel.h ./include/whowas.h
+        $(CC) $(CFLAGS) src/user.c
+
+src/serv.obj: src/serv.c $(INCLUDES) ./include/dbuf.h ./include/whowas.h
+        $(CC) $(CFLAGS) src/serv.c
+
+src/whowas.obj: src/whowas.c $(INCLUDES) ./include/dbuf.h ./include/whowas.h
+        $(CC) $(CFLAGS) src/whowas.c
+
+src/hash.obj: src/hash.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/hash.c
+
+src/crule.obj: src/crule.c $(INCLUDES)
+        $(CC) $(CFLAGS) src/crule.c
+
+src/gui.obj: src/windows/gui.c $(INCLUDES) ./include/resource.h
+        $(CC) $(CFLAGS) src/windows/gui.c
+
+src/rtf.obj: src/windows/rtf.c $(INCLUDES) ./src/windows/win.h
+	$(CC) $(CFLAGS) src/windows/rtf.c
+
+src/editor.obj: src/windows/editor.c $(INCLUDES) ./include/resource.h ./src/windows/win.h
+        $(CC) $(CFLAGS) src/windows/editor.c
+
+src/service.obj: src/windows/service.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/windows/service.c
+
+src/windebug.obj: src/windows/windebug.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/windows/windebug.c
+
+src/win.obj: src/windows/win.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/windows/win.c
+
+src/unrealsvc.obj: src/windows/unrealsvc.c $(INCLUDES)
+	$(CC) $(CFLAGSST) src/windows/unrealsvc.c
+
+src/modules.obj: src/modules.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/modules.c
+
+src/api-event.obj: src/api-event.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-event.c
+
+src/api-usermode.obj: src/api-usermode.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-usermode.c
+
+src/auth.obj: src/auth.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/auth.c
+
+src/random.obj: src/random.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/random.c
+
+src/api-channelmode.obj: src/api-channelmode.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-channelmode.c
+
+src/api-moddata.obj: src/api-moddata.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-moddata.c
+
+src/mempool.obj: src/mempool.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/mempool.c
+
+src/dispatch.obj: src/dispatch.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/dispatch.c
+
+src/url.obj: src/url.c $(INCLUDES) ./include/url.h
+	$(CC) $(CFLAGS) src/url.c
+
+src/api-extban.obj: src/api-extban.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-extban.c
+
+src/api-efunctions.obj: src/api-efunctions.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-efunctions.c
+
+src/api-isupport.obj: src/api-isupport.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-isupport.c
+
+src/api-command.obj: src/api-command.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-command.c
+
+src/api-clicap.obj: src/api-clicap.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-clicap.c
+
+src/api-messagetag.obj: src/api-messagetag.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-messagetag.c
+
+src/api-history-backend.obj: src/api-history-backend.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/api-history-backend.c
+
+src/tls.obj: src/tls.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/tls.c
+
+src/crypt_blowfish.obj: src/crypt_blowfish.c $(INCLUDES)
+	$(CC) $(CFLAGS) src/crypt_blowfish.c
+
+src/operclass.obj: src/operclass.c $(INCLUDES) ./include/dbuf.h
+        $(CC) $(CFLAGS) src/operclass.c
+
+src/updconf.obj: src/updconf.c $(INCLUDES) ./include/dbuf.h
+        $(CC) $(CFLAGS) src/updconf.c
+
+src/utf8.obj: src/utf8.c $(INCLUDES) ./include/dbuf.h
+        $(CC) $(CFLAGS) src/utf8.c
+
+src/windows/win.res: src/windows/wingui.rc
+        $(RC) /l 0x409 /fosrc/windows/win.res /i ./include /i ./src \
+              /d NDEBUG src/windows/wingui.rc
+
+src/windows/unrealsvc.res: src/windows/unrealsvc.rc
+        $(RC) /l 0x409 /fosrc/windows/unrealsvc.res /i ./include /i ./src \
+              /d NDEBUG src/windows/unrealsvc.rc
+
+################# Modules #################
+
+CUSTOMMODULE: src/modules/third/$(MODULEFILE).c
+	$(CC) $(MODCFLAGS) src/modules/third/$(MODULEFILE).c /Fesrc/modules/third/ /Fosrc/modules/third/ $(MODLFLAGS) \
+	      /OUT:src/modules/third/$(MODULEFILE).dll $(EXLIBS)
+
+SYMBOLFILE: 
+	$(CC) src/windows/def-clean.c
+	dlltool --output-def UnrealIRCd.def.in --export-all-symbols $(EXP_OBJ_FILES)
+	def-clean UnrealIRCd.def.in UnrealIRCd.def
+
+MODULES: $(DLL_FILES)
+
+src/modules/cloak.dll: src/modules/cloak.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/cloak.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/chghost.dll: src/modules/chghost.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/chghost.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/chgident.dll: src/modules/chgident.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/chgident.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sdesc.dll: src/modules/sdesc.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/sdesc.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sethost.dll: src/modules/sethost.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/sethost.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/setident.dll: src/modules/setident.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/setident.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/setname.dll: src/modules/setname.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/setname.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsmotd.dll: src/modules/svsmotd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsmotd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsmode.dll: src/modules/svsmode.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsmode.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/tkl.dll: src/modules/tkl.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/tkl.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/swhois.dll: src/modules/swhois.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/swhois.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsnline.dll: src/modules/svsnline.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsnline.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/who_old.dll: src/modules/who_old.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/who_old.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/whox.dll: src/modules/whox.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/whox.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/away.dll: src/modules/away.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/away.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/mkpasswd.dll: src/modules/mkpasswd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/mkpasswd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsnoop.dll: src/modules/svsnoop.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsnoop.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsnick.dll: src/modules/svsnick.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsnick.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/chgname.dll: src/modules/chgname.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/chgname.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/kill.dll: src/modules/kill.c $(INCLUDES) 
+	$(CC) $(MODCFLAGS) src/modules/kill.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/lag.dll: src/modules/lag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/lag.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/message.dll: src/modules/message.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/message.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/oper.dll: src/modules/oper.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/oper.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/pingpong.dll: src/modules/pingpong.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/pingpong.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/quit.dll: src/modules/quit.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/quit.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sendumode.dll: src/modules/sendumode.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sendumode.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sqline.dll: src/modules/sqline.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sqline.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/tsctl.dll: src/modules/tsctl.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/tsctl.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/unsqline.dll: src/modules/unsqline.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/unsqline.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/whois.dll: src/modules/whois.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/whois.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/vhost.dll: src/modules/vhost.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/vhost.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/cycle.dll: src/modules/cycle.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/cycle.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsjoin.dll: src/modules/svsjoin.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsjoin.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svspart.dll: src/modules/svspart.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svspart.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svslusers.dll: src/modules/svslusers.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/svslusers.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svswatch.dll: src/modules/svswatch.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/svswatch.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svssilence.dll: src/modules/svssilence.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/svssilence.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sendsno.dll: src/modules/sendsno.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sendsno.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svssno.dll: src/modules/svssno.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/svssno.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sajoin.dll: src/modules/sajoin.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sajoin.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sapart.dll: src/modules/sapart.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sapart.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/samode.dll: src/modules/samode.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/samode.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/kick.dll: src/modules/kick.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/kick.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/topic.dll: src/modules/topic.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/topic.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/invite.dll: src/modules/invite.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/invite.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/list.dll: src/modules/list.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/list.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/time.dll: src/modules/time.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/time.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svskill.dll: src/modules/svskill.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/svskill.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sjoin.dll: src/modules/sjoin.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sjoin.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/pass.dll: src/modules/pass.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/pass.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/userhost.dll: src/modules/userhost.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/userhost.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/ison.dll: src/modules/ison.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/ison.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/silence.dll: src/modules/silence.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/silence.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/knock.dll: src/modules/knock.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/knock.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/umode2.dll: src/modules/umode2.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/umode2.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/squit.dll: src/modules/squit.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/squit.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/protoctl.dll: src/modules/protoctl.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/protoctl.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/addmotd.dll: src/modules/addmotd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/addmotd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/addomotd.dll: src/modules/addomotd.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/addomotd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/wallops.dll: src/modules/wallops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/wallops.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/admin.dll: src/modules/admin.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/admin.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/globops.dll: src/modules/globops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/globops.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/locops.dll: src/modules/locops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/locops.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/trace.dll: src/modules/trace.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/trace.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/netinfo.dll: src/modules/netinfo.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/netinfo.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/links.dll: src/modules/links.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/links.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/help.dll: src/modules/help.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/help.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/rules.dll: src/modules/rules.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/rules.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+ 
+src/modules/close.dll: src/modules/close.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/close.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/map.dll: src/modules/map.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/map.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/eos.dll: src/modules/eos.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/eos.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/server.dll: src/modules/server.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/server.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/stats.dll: src/modules/stats.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/stats.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/dccdeny.dll: src/modules/dccdeny.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/dccdeny.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/whowas.dll: src/modules/whowas.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/whowas.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/connect.dll: src/modules/connect.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/connect.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/dccallow.dll: src/modules/dccallow.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/dccallow.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/userip.dll: src/modules/userip.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/userip.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/nick.dll: src/modules/nick.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/nick.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/user.dll: src/modules/user.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/user.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/mode.dll: src/modules/mode.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/mode.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/watch.dll: src/modules/watch.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/watch.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/part.dll: src/modules/part.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/part.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/join.dll: src/modules/join.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/join.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/motd.dll: src/modules/motd.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/motd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/opermotd.dll: src/modules/opermotd.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/opermotd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/botmotd.dll: src/modules/botmotd.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/botmotd.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/lusers.dll: src/modules/lusers.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/lusers.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/names.dll: src/modules/names.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/names.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/md.dll: src/modules/md.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/md.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/certfp.dll: src/modules/certfp.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/certfp.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/webirc.dll: src/modules/webirc.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/webirc.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/websocket.dll: src/modules/websocket.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/websocket.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/blacklist.dll: src/modules/blacklist.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/blacklist.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/jointhrottle.dll: src/modules/jointhrottle.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/jointhrottle.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/svsnolag.dll: src/modules/svsnolag.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/svsnolag.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/starttls.dll: src/modules/starttls.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/starttls.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/webredir.dll: src/modules/webredir.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/webredir.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/cap.dll: src/modules/cap.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/cap.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sasl.dll: src/modules/sasl.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/sasl.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/tls_antidos.dll: src/modules/tls_antidos.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) src/modules/tls_antidos.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/antirandom.dll: src/modules/antirandom.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/antirandom.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/hideserver.dll: src/modules/hideserver.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/hideserver.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/jumpserver.dll: src/modules/jumpserver.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/jumpserver.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/ircops.dll: src/modules/ircops.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/ircops.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/staff.dll: src/modules/staff.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/staff.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/nocodes.dll: src/modules/nocodes.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/nocodes.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/charsys.dll: src/modules/charsys.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/charsys.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/antimixedutf8.dll: src/modules/antimixedutf8.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/antimixedutf8.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/authprompt.dll: src/modules/authprompt.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/authprompt.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/sinfo.dll: src/modules/sinfo.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/sinfo.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/reputation.dll: src/modules/reputation.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/reputation.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/connthrottle.dll: src/modules/connthrottle.c $(INCLUDES)
+        $(CC) $(MODCFLAGS) src/modules/connthrottle.c /Fesrc/modules/ /Fosrc/modules/ $(MODLFLAGS)
+
+src/modules/chanmodes/censor.dll: src/modules/chanmodes/censor.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/censor.c $(MODLFLAGS)
+
+src/modules/chanmodes/delayjoin.dll: src/modules/chanmodes/delayjoin.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/delayjoin.c $(MODLFLAGS)
+
+src/modules/chanmodes/floodprot.dll: src/modules/chanmodes/floodprot.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/floodprot.c $(MODLFLAGS)
+
+src/modules/chanmodes/issecure.dll: src/modules/chanmodes/issecure.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/issecure.c $(MODLFLAGS)
+
+src/modules/chanmodes/link.dll: src/modules/chanmodes/link.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/link.c $(MODLFLAGS)
+
+src/modules/chanmodes/nocolor.dll: src/modules/chanmodes/nocolor.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/nocolor.c $(MODLFLAGS)
+
+src/modules/chanmodes/noctcp.dll: src/modules/chanmodes/noctcp.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/noctcp.c $(MODLFLAGS)
+
+src/modules/chanmodes/noinvite.dll: src/modules/chanmodes/noinvite.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/noinvite.c $(MODLFLAGS)
+
+src/modules/chanmodes/nokick.dll: src/modules/chanmodes/nokick.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/nokick.c $(MODLFLAGS)
+
+src/modules/chanmodes/noknock.dll: src/modules/chanmodes/noknock.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/noknock.c $(MODLFLAGS)
+
+src/modules/chanmodes/nonickchange.dll: src/modules/chanmodes/nonickchange.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/nonickchange.c $(MODLFLAGS)
+
+src/modules/chanmodes/nonotice.dll: src/modules/chanmodes/nonotice.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/nonotice.c $(MODLFLAGS)
+
+src/modules/chanmodes/operonly.dll: src/modules/chanmodes/operonly.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/operonly.c $(MODLFLAGS)
+
+src/modules/chanmodes/permanent.dll: src/modules/chanmodes/permanent.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/permanent.c $(MODLFLAGS)
+
+src/modules/chanmodes/regonly.dll: src/modules/chanmodes/regonly.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/regonly.c $(MODLFLAGS)
+
+src/modules/chanmodes/regonlyspeak.dll: src/modules/chanmodes/regonlyspeak.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/regonlyspeak.c $(MODLFLAGS)
+
+src/modules/chanmodes/secureonly.dll: src/modules/chanmodes/secureonly.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/secureonly.c $(MODLFLAGS)
+
+src/modules/chanmodes/stripcolor.dll: src/modules/chanmodes/stripcolor.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/stripcolor.c $(MODLFLAGS)
+
+src/modules/chanmodes/history.dll: src/modules/chanmodes/history.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/chanmodes/ /Fesrc/modules/chanmodes/ src/modules/chanmodes/history.c $(MODLFLAGS)
+
+src/modules/usermodes/censor.dll: src/modules/usermodes/censor.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/censor.c $(MODLFLAGS)
+
+src/modules/usermodes/noctcp.dll: src/modules/usermodes/noctcp.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/noctcp.c $(MODLFLAGS)
+
+src/modules/usermodes/bot.dll: src/modules/usermodes/bot.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/bot.c $(MODLFLAGS)
+
+src/modules/usermodes/servicebot.dll: src/modules/usermodes/servicebot.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/servicebot.c $(MODLFLAGS)
+
+src/modules/usermodes/showwhois.dll: src/modules/usermodes/showwhois.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/showwhois.c $(MODLFLAGS)
+
+src/modules/usermodes/privacy.dll: src/modules/usermodes/privacy.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/privacy.c $(MODLFLAGS)
+
+src/modules/usermodes/nokick.dll: src/modules/usermodes/nokick.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/nokick.c $(MODLFLAGS)
+
+src/modules/usermodes/regonlymsg.dll: src/modules/usermodes/regonlymsg.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/regonlymsg.c $(MODLFLAGS)
+
+src/modules/usermodes/privdeaf.dll: src/modules/usermodes/privdeaf.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/privdeaf.c $(MODLFLAGS)
+
+src/modules/usermodes/secureonlymsg.dll: src/modules/usermodes/secureonlymsg.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/usermodes/ /Fesrc/modules/usermodes/ src/modules/usermodes/secureonlymsg.c $(MODLFLAGS)
+
+src/modules/snomasks/dccreject.dll: src/modules/snomasks/dccreject.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/snomasks/ /Fesrc/modules/snomasks/ src/modules/snomasks/dccreject.c $(MODLFLAGS)
+
+src/modules/extbans/account.dll: src/modules/extbans/account.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/account.c $(MODLFLAGS)
+
+src/modules/extbans/inchannel.dll: src/modules/extbans/inchannel.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/inchannel.c $(MODLFLAGS)
+
+src/modules/extbans/join.dll: src/modules/extbans/join.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/join.c $(MODLFLAGS)
+
+src/modules/extbans/nickchange.dll: src/modules/extbans/nickchange.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/nickchange.c $(MODLFLAGS)
+
+src/modules/extbans/quiet.dll: src/modules/extbans/quiet.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/quiet.c $(MODLFLAGS)
+
+src/modules/extbans/realname.dll: src/modules/extbans/realname.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/realname.c $(MODLFLAGS)
+
+src/modules/extbans/operclass.dll: src/modules/extbans/operclass.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/operclass.c $(MODLFLAGS)
+
+src/modules/extbans/certfp.dll: src/modules/extbans/certfp.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/certfp.c $(MODLFLAGS)
+
+src/modules/extbans/textban.dll: src/modules/extbans/textban.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/textban.c $(MODLFLAGS)
+
+src/modules/extbans/msgbypass.dll: src/modules/extbans/msgbypass.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/msgbypass.c $(MODLFLAGS)
+
+src/modules/extbans/timedban.dll: src/modules/extbans/timedban.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/timedban.c $(MODLFLAGS)
+
+src/modules/extbans/partmsg.dll: src/modules/extbans/partmsg.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/extbans/ /Fesrc/modules/extbans/ src/modules/extbans/partmsg.c $(MODLFLAGS)
+
+src/modules/account-notify.dll: src/modules/account-notify.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/account-notify.c $(MODLFLAGS)
+
+src/modules/message-tags.dll: src/modules/message-tags.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/message-tags.c $(MODLFLAGS)
+
+src/modules/batch.dll: src/modules/batch.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/batch.c $(MODLFLAGS)
+
+src/modules/account-tag.dll: src/modules/account-tag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/account-tag.c $(MODLFLAGS)
+
+src/modules/labeled-response.dll: src/modules/labeled-response.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/labeled-response.c $(MODLFLAGS)
+
+src/modules/link-security.dll: src/modules/link-security.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/link-security.c $(MODLFLAGS)
+
+src/modules/message-ids.dll: src/modules/message-ids.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/message-ids.c $(MODLFLAGS)
+
+src/modules/plaintext-policy.dll: src/modules/plaintext-policy.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/plaintext-policy.c $(MODLFLAGS)
+
+src/modules/server-time.dll: src/modules/server-time.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/server-time.c $(MODLFLAGS)
+
+src/modules/sts.dll: src/modules/sts.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/sts.c $(MODLFLAGS)
+
+src/modules/tkldb.dll: src/modules/tkldb.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/tkldb.c $(MODLFLAGS)
+
+src/modules/channeldb.dll: src/modules/channeldb.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/channeldb.c $(MODLFLAGS)
+
+src/modules/history_backend_mem.dll: src/modules/history_backend_mem.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/history_backend_mem.c $(MODLFLAGS)
+
+src/modules/history_backend_null.dll: src/modules/history_backend_null.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/history_backend_null.c $(MODLFLAGS)
+
+src/modules/restrict-commands.dll: src/modules/restrict-commands.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/restrict-commands.c $(MODLFLAGS)
+
+src/modules/rmtkl.dll: src/modules/rmtkl.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/rmtkl.c $(MODLFLAGS)
+
+src/modules/echo-message.dll: src/modules/echo-message.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/echo-message.c $(MODLFLAGS)
+
+src/modules/userip-tag.dll: src/modules/userip-tag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/userip-tag.c $(MODLFLAGS)
+
+src/modules/userhost-tag.dll: src/modules/userhost-tag.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/userhost-tag.c $(MODLFLAGS)
+
+src/modules/require-module.dll: src/modules/require-module.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/require-module.c $(MODLFLAGS)
+
+src/modules/ident_lookup.dll: src/modules/ident_lookup.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/ident_lookup.c $(MODLFLAGS)
+
+src/modules/history.dll: src/modules/history.c $(INCLUDES)
+	$(CC) $(MODCFLAGS) /Fosrc/modules/ /Fesrc/modules/ src/modules/history.c $(MODLFLAGS)
+
+dummy:
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..cf4a267
--- /dev/null
+++ b/README.md
@@ -0,0 +1,58 @@
+[![Twitter Follow](https://img.shields.io/twitter/follow/Unreal_IRCd.svg?style=social&label=Follow)](https://twitter.com/Unreal_IRCd)
+
+## About UnrealIRCd
+UnrealIRCd is an Open Source IRC Server, serving thousands of networks since 1999. 
+It runs on Linux, OS X and Windows and is currently the most widely deployed IRCd
+with a market share of 42%. UnrealIRCd is a highly advanced IRCd with a strong
+focus on modularity, an advanced and highly configurable configuration file.
+Key features include SSL/TLS, cloaking, its advanced anti-flood and anti-spam systems,
+swear filtering and module support. We are also particularly proud on our extensive
+online documentation. 
+
+## How to get started
+Please consult our excellent online documentation at https://www.unrealircd.org/docs/
+when setting up the IRCd!
+
+### Step 1: Installation
+#### Windows
+Simply download the UnrealIRCd Windows version from www.unrealircd.org
+
+Alternatively you can compile UnrealIRCd for Windows yourself. However this is not straightforward and thus not recommended.
+
+#### *BSD/Linux/macOS
+Do the following steps under a separate account for running UnrealIRCd,
+[do NOT compile or run as root](https://www.unrealircd.org/docs/Do_not_run_as_root).
+
+### Step 1: Compile the IRCd
+
+* Run `./Config`
+* Run `make`
+* Run `make install`
+* Now change to the directory where you installed UnrealIRCd, e.g. `cd /home/xxxx/unrealircd`
+
+### Step 2: Configuration
+Configuration files are stored in the conf/ folder by default (eg: /home/xxxx/unrealircd/conf)
+
+#### Create a configuration file
+If you are new, then you need to create your own configuration file:
+Copy conf/examples/example.conf to conf/ and call it unrealircd.conf.
+Then open it in an editor and carefully modify it using the documentation and FAQ as a guide (see below).
+
+### Step 3: Booting
+
+#### Linux/*BSD/macOS
+Run `./unrealircd start` in the directory where you installed UnrealIRCd.
+
+#### Windows
+Start -> All Programs -> UnrealIRCd -> UnrealIRCd
+
+## Documentation & FAQ
+You can find the **documentation** online at: https://www.unrealircd.org/docs/
+
+We also have a good **FAQ**: https://www.unrealircd.org/docs/FAQ
+
+## Website, support, and other links ##
+* https://www.unrealircd.org - Our main website
+* https://forums.unrealircd.org - Support
+* https://bugs.unrealircd.org - Bug tracker
+* ircs://irc.unrealircd.org:6697/unreal-support - IRC support
diff --git a/autoconf/Makefile b/autoconf/Makefile
new file mode 100644
index 0000000..5402a68
--- /dev/null
+++ b/autoconf/Makefile
@@ -0,0 +1,3 @@
+all:
+	@autoconf
+	cp configure ..
\ No newline at end of file
diff --git a/autoconf/config.guess b/autoconf/config.guess
new file mode 100644
index 0000000..f7eb141
--- /dev/null
+++ b/autoconf/config.guess
@@ -0,0 +1,1438 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
+
+timestamp='2015-03-04'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+#
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
+#
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches@gnu.org>.
+
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright 1992-2015 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help" >&2
+       exit 1 ;;
+    * )
+       break ;;
+  esac
+done
+
+if test $# != 0; then
+  echo "$me: too many arguments$help" >&2
+  exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,)    echo "int x;" > $dummy.c ;
+	for c in cc gcc c89 c99 ; do
+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+	     CC_FOR_BUILD="$c"; break ;
+	  fi ;
+	done ;
+	if test x"$CC_FOR_BUILD" = x ; then
+	  CC_FOR_BUILD=no_compiler_found ;
+	fi
+	;;
+ ,,*)   CC_FOR_BUILD=$CC ;;
+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+esac ; set_cc_for_build= ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi@noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+	PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# NetBSD (nbsd) targets should (where applicable) match one or
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	#
+	# Note: NetBSD doesn't particularly care about the vendor
+	# portion of the name.  We always set it to "unknown".
+	sysctl="sysctl -n hw.machine_arch"
+	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
+	    /sbin/$sysctl 2>/dev/null || \
+	    /usr/sbin/$sysctl 2>/dev/null || \
+	    echo unknown)`
+	case "${UNAME_MACHINE_ARCH}" in
+	    armeb) machine=armeb-unknown ;;
+	    arm*) machine=arm-unknown ;;
+	    sh3el) machine=shl-unknown ;;
+	    sh3eb) machine=sh-unknown ;;
+	    sh5el) machine=sh5le-unknown ;;
+	    earmv*)
+		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
+		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
+		machine=${arch}${endian}-unknown
+		;;
+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+	esac
+	# The Operating System including object format, if it has switched
+	# to ELF recently, or will in the future.
+	case "${UNAME_MACHINE_ARCH}" in
+	    arm*|earm*|i386|m68k|ns32k|sh3*|sparc|vax)
+		eval $set_cc_for_build
+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+			| grep -q __ELF__
+		then
+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+		    # Return netbsd for either.  FIX?
+		    os=netbsd
+		else
+		    os=netbsdelf
+		fi
+		;;
+	    *)
+		os=netbsd
+		;;
+	esac
+	# Determine ABI tags.
+	case "${UNAME_MACHINE_ARCH}" in
+	    earm*)
+		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
+		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
+		;;
+	esac
+	# The OS release
+	# Debian GNU/NetBSD machines have a different userland, and
+	# thus, need a distinct triplet. However, they do not need
+	# kernel version information, so it can be replaced with a
+	# suitable tag, in the style of linux-gnu.
+	case "${UNAME_VERSION}" in
+	    Debian*)
+		release='-gnu'
+		;;
+	    *)
+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+		;;
+	esac
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}${abi}"
+	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
+    *:OpenBSD:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+	exit ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit ;;
+    *:SolidBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+	exit ;;
+    macppc:MirBSD:*:*)
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit ;;
+    alpha:OSF1:*:*)
+	case $UNAME_RELEASE in
+	*4.0)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+		;;
+	*5.*)
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
+	# According to Compaq, /usr/sbin/psrinfo has been available on
+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+	# covers most systems running today.  This code pipes the CPU
+	# types through head -n 1, so we only detect the type of CPU 0.
+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+	case "$ALPHA_CPU_TYPE" in
+	    "EV4 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV4.5 (21064)")
+		UNAME_MACHINE="alpha" ;;
+	    "LCA4 (21066/21068)")
+		UNAME_MACHINE="alpha" ;;
+	    "EV5 (21164)")
+		UNAME_MACHINE="alphaev5" ;;
+	    "EV5.6 (21164A)")
+		UNAME_MACHINE="alphaev56" ;;
+	    "EV5.6 (21164PC)")
+		UNAME_MACHINE="alphapca56" ;;
+	    "EV5.7 (21164PC)")
+		UNAME_MACHINE="alphapca57" ;;
+	    "EV6 (21264)")
+		UNAME_MACHINE="alphaev6" ;;
+	    "EV6.7 (21264A)")
+		UNAME_MACHINE="alphaev67" ;;
+	    "EV6.8CB (21264C)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8AL (21264B)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.8CX (21264D)")
+		UNAME_MACHINE="alphaev68" ;;
+	    "EV6.9A (21264/EV69A)")
+		UNAME_MACHINE="alphaev69" ;;
+	    "EV7 (21364)")
+		UNAME_MACHINE="alphaev7" ;;
+	    "EV7.9 (21364A)")
+		UNAME_MACHINE="alphaev79" ;;
+	esac
+	# A Pn.n version is a patched version.
+	# A Vn.n version is a released version.
+	# A Tn.n version is a released field test version.
+	# A Xn.n version is an unreleased experimental baselevel.
+	# 1.2 uses "1.2" for uname -r.
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit ;;
+    21064:Windows_NT:50:3)
+	echo alpha-dec-winnt3.5
+	exit ;;
+    Amiga*:UNIX_System_V:4.0:*)
+	echo m68k-unknown-sysv4
+	exit ;;
+    *:[Aa]miga[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-amigaos
+	exit ;;
+    *:[Mm]orph[Oo][Ss]:*:*)
+	echo ${UNAME_MACHINE}-unknown-morphos
+	exit ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit ;;
+    *:z/VM:*:*)
+	echo s390-ibm-zvmoe
+	exit ;;
+    *:OS400:*:*)
+	echo powerpc-ibm-os400
+	exit ;;
+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+	echo arm-acorn-riscix${UNAME_RELEASE}
+	exit ;;
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
+	echo arm-unknown-riscos
+	exit ;;
+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+	echo hppa1.1-hitachi-hiuxmpp
+	exit ;;
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+		echo pyramid-pyramid-sysv3
+	else
+		echo pyramid-pyramid-bsd
+	fi
+	exit ;;
+    NILE*:*:*:dcosx)
+	echo pyramid-pyramid-svr4
+	exit ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit ;;
+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+	case `/usr/bin/uname -p` in
+	    sparc) echo sparc-icl-nx7; exit ;;
+	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4H:SunOS:5.*:*)
+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+	echo i386-pc-auroraux${UNAME_RELEASE}
+	exit ;;
+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:6*:*)
+	# According to config.sub, this is the proper way to canonicalize
+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
+	# it's likely to be more like Solaris than SunOS4.
+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    sun4*:SunOS:*:*)
+	case "`/usr/bin/arch -k`" in
+	    Series*|S4*)
+		UNAME_RELEASE=`uname -v`
+		;;
+	esac
+	# Japanese Language versions have a version number like `4.1.3-JL'.
+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+	exit ;;
+    sun3*:SunOS:*:*)
+	echo m68k-sun-sunos${UNAME_RELEASE}
+	exit ;;
+    sun*:*:4.2BSD:*)
+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+	case "`/bin/arch`" in
+	    sun3)
+		echo m68k-sun-sunos${UNAME_RELEASE}
+		;;
+	    sun4)
+		echo sparc-sun-sunos${UNAME_RELEASE}
+		;;
+	esac
+	exit ;;
+    aushp:SunOS:*:*)
+	echo sparc-auspex-sunos${UNAME_RELEASE}
+	exit ;;
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+	exit ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit ;;
+    powerpc:machten:*:*)
+	echo powerpc-apple-machten${UNAME_RELEASE}
+	exit ;;
+    RISC*:Mach:*:*)
+	echo mips-dec-mach_bsd4.3
+	exit ;;
+    RISC*:ULTRIX:*:*)
+	echo mips-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    VAX*:ULTRIX*:*:*)
+	echo vax-dec-ultrix${UNAME_RELEASE}
+	exit ;;
+    2020:CLIX:*:* | 2430:CLIX:*:*)
+	echo clipper-intergraph-clix${UNAME_RELEASE}
+	exit ;;
+    mips:*:*:UMIPS | mips:*:*:RISCos)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
+	#if defined (host_mips) && defined (MIPSEB)
+	#if defined (SYSTYPE_SYSV)
+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_SVR4)
+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+	#endif
+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+	#endif
+	#endif
+	  exit (-1);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c &&
+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+	  SYSTEM_NAME=`$dummy $dummyarg` &&
+	    { echo "$SYSTEM_NAME"; exit; }
+	echo mips-mips-riscos${UNAME_RELEASE}
+	exit ;;
+    Motorola:PowerMAX_OS:*:*)
+	echo powerpc-motorola-powermax
+	exit ;;
+    Motorola:*:4.3:PL8-*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+	echo powerpc-harris-powermax
+	exit ;;
+    Night_Hawk:Power_UNIX:*:*)
+	echo powerpc-harris-powerunix
+	exit ;;
+    m88k:CX/UX:7*:*)
+	echo m88k-harris-cxux7
+	exit ;;
+    m88k:*:4*:R4*)
+	echo m88k-motorola-sysv4
+	exit ;;
+    m88k:*:3*:R3*)
+	echo m88k-motorola-sysv3
+	exit ;;
+    AViiON:dgux:*:*)
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
+		echo m88k-dg-dgux${UNAME_RELEASE}
+	    else
+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
+	fi
+	exit ;;
+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+	echo m88k-dolphin-sysv3
+	exit ;;
+    M88*:*:R3*:*)
+	# Delta 88k system running SVR3
+	echo m88k-motorola-sysv3
+	exit ;;
+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+	echo m88k-tektronix-sysv3
+	exit ;;
+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+	echo m68k-tektronix-bsd
+	exit ;;
+    *:IRIX*:*:*)
+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+	exit ;;
+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
+    i*86:AIX:*:*)
+	echo i386-ibm-aix
+	exit ;;
+    ia64:AIX:*:*)
+	if [ -x /usr/bin/oslevel ] ; then
+		IBM_REV=`/usr/bin/oslevel`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:2:3)
+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+		eval $set_cc_for_build
+		sed 's/^		//' << EOF >$dummy.c
+		#include <sys/systemcfg.h>
+
+		main()
+			{
+			if (!__power_pc())
+				exit(1);
+			puts("powerpc-ibm-aix3.2.5");
+			exit(0);
+			}
+EOF
+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+		then
+			echo "$SYSTEM_NAME"
+		else
+			echo rs6000-ibm-aix3.2.5
+		fi
+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+		echo rs6000-ibm-aix3.2.4
+	else
+		echo rs6000-ibm-aix3.2
+	fi
+	exit ;;
+    *:AIX:*:[4567])
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+		IBM_ARCH=rs6000
+	else
+		IBM_ARCH=powerpc
+	fi
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
+	else
+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+	fi
+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+	exit ;;
+    *:AIX:*:*)
+	echo rs6000-ibm-aix
+	exit ;;
+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+	echo romp-ibm-bsd4.4
+	exit ;;
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+	exit ;;                             # report: romp-ibm BSD 4.3
+    *:BOSX:*:*)
+	echo rs6000-bull-bosx
+	exit ;;
+    DPX/2?00:B.O.S.:*:*)
+	echo m68k-bull-sysv3
+	exit ;;
+    9000/[34]??:4.3bsd:1.*:*)
+	echo m68k-hp-bsd
+	exit ;;
+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+	echo m68k-hp-bsd4.4
+	exit ;;
+    9000/[34678]??:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	case "${UNAME_MACHINE}" in
+	    9000/31? )            HP_ARCH=m68000 ;;
+	    9000/[34]?? )         HP_ARCH=m68k ;;
+	    9000/[678][0-9][0-9])
+		if [ -x /usr/bin/getconf ]; then
+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+			esac ;;
+		    esac
+		fi
+		if [ "${HP_ARCH}" = "" ]; then
+		    eval $set_cc_for_build
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
+
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
+EOF
+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+		    test -z "$HP_ARCH" && HP_ARCH=hppa
+		fi ;;
+	esac
+	if [ ${HP_ARCH} = "hppa2.0w" ]
+	then
+	    eval $set_cc_for_build
+
+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+	    # generating 64-bit code.  GNU and HP use different nomenclature:
+	    #
+	    # $ CC_FOR_BUILD=cc ./config.guess
+	    # => hppa2.0w-hp-hpux11.23
+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+	    # => hppa64-hp-hpux11.23
+
+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+		grep -q __LP64__
+	    then
+		HP_ARCH="hppa2.0w"
+	    else
+		HP_ARCH="hppa64"
+	    fi
+	fi
+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+	exit ;;
+    ia64:HP-UX:*:*)
+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+	echo ia64-hp-hpux${HPUX_REV}
+	exit ;;
+    3050*:HI-UX:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#include <unistd.h>
+	int
+	main ()
+	{
+	  long cpu = sysconf (_SC_CPU_VERSION);
+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
+	     results, however.  */
+	  if (CPU_IS_PA_RISC (cpu))
+	    {
+	      switch (cpu)
+		{
+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
+		}
+	    }
+	  else if (CPU_IS_HP_MC68K (cpu))
+	    puts ("m68k-hitachi-hiuxwe2");
+	  else puts ("unknown-hitachi-hiuxwe2");
+	  exit (0);
+	}
+EOF
+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+		{ echo "$SYSTEM_NAME"; exit; }
+	echo unknown-hitachi-hiuxwe2
+	exit ;;
+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+	echo hppa1.1-hp-bsd
+	exit ;;
+    9000/8??:4.3bsd:*:*)
+	echo hppa1.0-hp-bsd
+	exit ;;
+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit ;;
+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+	echo hppa1.1-hp-osf
+	exit ;;
+    hp8??:OSF1:*:*)
+	echo hppa1.0-hp-osf
+	exit ;;
+    i*86:OSF1:*:*)
+	if [ -x /usr/sbin/sysversion ] ; then
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
+	else
+	    echo ${UNAME_MACHINE}-unknown-osf1
+	fi
+	exit ;;
+    parisc*:Lites*:*:*)
+	echo hppa1.1-hp-lites
+	exit ;;
+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+	echo c1-convex-bsd
+	exit ;;
+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+	if getsysinfo -f scalar_acc
+	then echo c32-convex-bsd
+	else echo c2-convex-bsd
+	fi
+	exit ;;
+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+	echo c34-convex-bsd
+	exit ;;
+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+	echo c38-convex-bsd
+	exit ;;
+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+	echo c4-convex-bsd
+	exit ;;
+    CRAY*Y-MP:*:*:*)
+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*[A-Z]90:*:*:*)
+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+	      -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*TS:*:*:*)
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*T3E:*:*:*)
+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    *:UNICOS/mp:*:*)
+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit ;;
+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    5000:UNIX_System_V:4.*:*)
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+	exit ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit ;;
+    *:FreeBSD:*:*)
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
+	    amd64)
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	    *)
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	esac
+	exit ;;
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
+	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
+    *:MINGW*:*)
+	echo ${UNAME_MACHINE}-pc-mingw32
+	exit ;;
+    *:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
+    i*:windows32*:*)
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
+	exit ;;
+    i*:PW*:*)
+	echo ${UNAME_MACHINE}-pc-pw32
+	exit ;;
+    *:Interix*:*)
+	case ${UNAME_MACHINE} in
+	    x86)
+		echo i586-pc-interix${UNAME_RELEASE}
+		exit ;;
+	    authenticamd | genuineintel | EM64T)
+		echo x86_64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	    IA64)
+		echo ia64-unknown-interix${UNAME_RELEASE}
+		exit ;;
+	esac ;;
+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+	echo i${UNAME_MACHINE}-pc-mks
+	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
+    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+	# UNAME_MACHINE based on the output of uname instead of i386?
+	echo i586-pc-interix
+	exit ;;
+    i*:UWIN*:*)
+	echo ${UNAME_MACHINE}-pc-uwin
+	exit ;;
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+	echo x86_64-unknown-cygwin
+	exit ;;
+    p*:CYGWIN*:*)
+	echo powerpcle-unknown-cygwin
+	exit ;;
+    prep*:SunOS:5.*:*)
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
+    *:GNU:*:*)
+	# the GNU system
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	exit ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
+	exit ;;
+    i*86:Minix:*:*)
+	echo ${UNAME_MACHINE}-pc-minix
+	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    alpha:Linux:*:*)
+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+	  EV5)   UNAME_MACHINE=alphaev5 ;;
+	  EV56)  UNAME_MACHINE=alphaev56 ;;
+	  PCA56) UNAME_MACHINE=alphapca56 ;;
+	  PCA57) UNAME_MACHINE=alphapca56 ;;
+	  EV6)   UNAME_MACHINE=alphaev6 ;;
+	  EV67)  UNAME_MACHINE=alphaev67 ;;
+	  EV68*) UNAME_MACHINE=alphaev68 ;;
+	esac
+	objdump --private-headers /bin/sh | grep -q ld.so.1
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arm*:Linux:*:*)
+	eval $set_cc_for_build
+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+	    | grep -q __ARM_EABI__
+	then
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	else
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	    fi
+	fi
+	exit ;;
+    avr32*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    cris:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    crisv32:Linux:*:*)
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
+	exit ;;
+    e2k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    frv:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:Linux:*:*)
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
+	exit ;;
+    ia64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    m68*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    mips:Linux:*:* | mips64:Linux:*:*)
+	eval $set_cc_for_build
+	sed 's/^	//' << EOF >$dummy.c
+	#undef CPU
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+	CPU=${UNAME_MACHINE}el
+	#else
+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+	CPU=${UNAME_MACHINE}
+	#else
+	CPU=
+	#endif
+	#endif
+EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	;;
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-${LIBC}
+	exit ;;
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
+	echo hppa64-unknown-linux-${LIBC}
+	exit ;;
+    parisc:Linux:*:* | hppa:Linux:*:*)
+	# Look for CPU level
+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	esac
+	exit ;;
+    ppc64:Linux:*:*)
+	echo powerpc64-unknown-linux-${LIBC}
+	exit ;;
+    ppc:Linux:*:*)
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
+	exit ;;
+    s390:Linux:*:* | s390x:Linux:*:*)
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
+	exit ;;
+    sh64*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sh*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    sparc:Linux:*:* | sparc64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    vax:Linux:*:*)
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	exit ;;
+    x86_64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    xtensa*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    i*86:DYNIX/ptx:4*:*)
+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+	# earlier versions are messed up and put the nodename in both
+	# sysname and nodename.
+	echo i386-sequent-sysv4
+	exit ;;
+    i*86:UNIX_SV:4.2MP:2.*)
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
+	# I just have to hope.  -- rms.
+	# Use sysv4.2uw... so that sysv4* matches it.
+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+	exit ;;
+    i*86:OS/2:*:*)
+	# If we were able to find `uname', then EMX Unix compatibility
+	# is probably installed.
+	echo ${UNAME_MACHINE}-pc-os2-emx
+	exit ;;
+    i*86:XTS-300:*:STOP)
+	echo ${UNAME_MACHINE}-unknown-stop
+	exit ;;
+    i*86:atheos:*:*)
+	echo ${UNAME_MACHINE}-unknown-atheos
+	exit ;;
+    i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit ;;
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+	echo i386-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    i*86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit ;;
+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+	else
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+	fi
+	exit ;;
+    i*86:*:5:[678]*)
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	case `/bin/uname -X | grep "^Machine"` in
+	    *486*)	     UNAME_MACHINE=i486 ;;
+	    *Pentium)	     UNAME_MACHINE=i586 ;;
+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+	esac
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	exit ;;
+    i*86:*:3.2:*)
+	if test -f /usr/options/cb.name; then
+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+			&& UNAME_MACHINE=i586
+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+			&& UNAME_MACHINE=i686
+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+	else
+		echo ${UNAME_MACHINE}-pc-sysv32
+	fi
+	exit ;;
+    pc:*:*:*)
+	# Left here for compatibility:
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
+	exit ;;
+    Intel:Mach:3*:*)
+	echo i386-pc-mach3
+	exit ;;
+    paragon:*:*:*)
+	echo i860-intel-osf1
+	exit ;;
+    i860:*:4.*:*) # i860-SVR4
+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+	else # Add other i860-SVR4 vendors below as they are discovered.
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	fi
+	exit ;;
+    mini*:CTIX:SYS*5:*)
+	# "miniframe"
+	echo m68010-convergent-sysv
+	exit ;;
+    mc68k:UNIX:SYSTEM5:3.51m)
+	echo m68k-convergent-sysv
+	exit ;;
+    M680?0:D-NIX:5.3:*)
+	echo m68k-diab-dnix
+	exit ;;
+    M68*:*:R3V[5678]*:*)
+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+	OS_REL=''
+	test -r /etc/.relid \
+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    mc68030:UNIX_System_V:4.*:*)
+	echo m68k-atari-sysv4
+	exit ;;
+    TSUNAMI:LynxOS:2.*:*)
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    rs6000:LynxOS:2.*:*)
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
+	exit ;;
+    SM[BE]S:UNIX_SV:*:*)
+	echo mips-dde-sysv${UNAME_RELEASE}
+	exit ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    RM*:SINIX-*:*:*)
+	echo mips-sni-sysv4
+	exit ;;
+    *:SINIX-*:*:*)
+	if uname -p 2>/dev/null >/dev/null ; then
+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
+		echo ${UNAME_MACHINE}-sni-sysv4
+	else
+		echo ns32k-sni-sysv
+	fi
+	exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
+    *:UNIX_System_V:4*:FTX*)
+	# From Gerald Hewes <hewes@openmarket.com>.
+	# How about differentiating between stratus architectures? -djm
+	echo hppa1.1-stratus-sysv4
+	exit ;;
+    *:*:*:FTX*)
+	# From seanf@swdc.stratus.com.
+	echo i860-stratus-sysv4
+	exit ;;
+    i*86:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo ${UNAME_MACHINE}-stratus-vos
+	exit ;;
+    *:VOS:*:*)
+	# From Paul.Green@stratus.com.
+	echo hppa1.1-stratus-vos
+	exit ;;
+    mc68*:A/UX:*:*)
+	echo m68k-apple-aux${UNAME_RELEASE}
+	exit ;;
+    news*:NEWS-OS:6*:*)
+	echo mips-sony-newsos6
+	exit ;;
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+	if [ -d /usr/nec ]; then
+		echo mips-nec-sysv${UNAME_RELEASE}
+	else
+		echo mips-unknown-sysv${UNAME_RELEASE}
+	fi
+	exit ;;
+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
+	echo powerpc-be-beos
+	exit ;;
+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
+	echo powerpc-apple-beos
+	exit ;;
+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
+	echo i586-pc-beos
+	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-6:SUPER-UX:*:*)
+	echo sx6-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-7:SUPER-UX:*:*)
+	echo sx7-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8:SUPER-UX:*:*)
+	echo sx8-nec-superux${UNAME_RELEASE}
+	exit ;;
+    SX-8R:SUPER-UX:*:*)
+	echo sx8r-nec-superux${UNAME_RELEASE}
+	exit ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit ;;
+    *:Darwin:*:*)
+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+	exit ;;
+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
+	UNAME_PROCESSOR=`uname -p`
+	if test "$UNAME_PROCESSOR" = "x86"; then
+		UNAME_PROCESSOR=i386
+		UNAME_MACHINE=pc
+	fi
+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+	exit ;;
+    *:QNX:*:4*)
+	echo i386-pc-qnx
+	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSE-*:NONSTOP_KERNEL:*:*)
+	echo nse-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    NSR-?:NONSTOP_KERNEL:*:*)
+	echo nsr-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+    *:NonStop-UX:*:*)
+	echo mips-compaq-nonstopux
+	exit ;;
+    BS2000:POSIX*:*:*)
+	echo bs2000-siemens-sysv
+	exit ;;
+    DS/*:UNIX_System_V:*:*)
+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+	exit ;;
+    *:Plan9:*:*)
+	# "uname -m" is not consistent, so use $cputype instead. 386
+	# is converted to i386 for consistency with other x86
+	# operating systems.
+	if test "$cputype" = "386"; then
+	    UNAME_MACHINE=i386
+	else
+	    UNAME_MACHINE="$cputype"
+	fi
+	echo ${UNAME_MACHINE}-unknown-plan9
+	exit ;;
+    *:TOPS-10:*:*)
+	echo pdp10-unknown-tops10
+	exit ;;
+    *:TENEX:*:*)
+	echo pdp10-unknown-tenex
+	exit ;;
+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+	echo pdp10-dec-tops20
+	exit ;;
+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+	echo pdp10-xkl-tops20
+	exit ;;
+    *:TOPS-20:*:*)
+	echo pdp10-unknown-tops20
+	exit ;;
+    *:ITS:*:*)
+	echo pdp10-unknown-its
+	exit ;;
+    SEI:*:*:SEIUX)
+	echo mips-sei-seiux${UNAME_RELEASE}
+	exit ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	exit ;;
+    *:*VMS:*:*)
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	case "${UNAME_MACHINE}" in
+	    A*) echo alpha-dec-vms ; exit ;;
+	    I*) echo ia64-dec-vms ; exit ;;
+	    V*) echo vax-dec-vms ; exit ;;
+	esac ;;
+    *:XENIX:*:SysV)
+	echo i386-pc-xenix
+	exit ;;
+    i*86:skyos:*:*)
+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+	exit ;;
+    i*86:rdos:*:*)
+	echo ${UNAME_MACHINE}-pc-rdos
+	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
+esac
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+and
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches@gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo               = `(hostinfo) 2>/dev/null`
+/bin/universe          = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch              = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM  = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/autoconf/config.sub b/autoconf/config.sub
new file mode 100644
index 0000000..8f1229c
--- /dev/null
+++ b/autoconf/config.sub
@@ -0,0 +1,1810 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
+
+timestamp='2015-03-08'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
+
+
+# Please send patches to <config-patches@gnu.org>.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# You can get the latest version of this script from:
+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support.  The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+       $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+  -h, --help         print this help, then exit
+  -t, --time-stamp   print date of last modification, then exit
+  -v, --version      print version number, then exit
+
+Report bugs and patches to <config-patches@gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright 1992-2015 Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+  case $1 in
+    --time-stamp | --time* | -t )
+       echo "$timestamp" ; exit ;;
+    --version | -v )
+       echo "$version" ; exit ;;
+    --help | --h* | -h )
+       echo "$usage"; exit ;;
+    -- )     # Stop option processing
+       shift; break ;;
+    - )	# Use stdin as input.
+       break ;;
+    -* )
+       echo "$me: invalid option $1$help"
+       exit 1 ;;
+
+    *local*)
+       # First pass through any local machine types.
+       echo $1
+       exit ;;
+
+    * )
+       break ;;
+  esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+    exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+    exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
+  kopensolaris*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
+    os=-$maybe_os
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+    ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
+  *)
+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+    if [ $basic_machine != $1 ]
+    then os=`echo $1 | sed 's/.*-/-/'`
+    else os=; fi
+    ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work.  We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+	-sun*os*)
+		# Prevent following clause from handling this invalid input.
+		;;
+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+	-apple | -axis | -knuth | -cray | -microblaze*)
+		os=
+		basic_machine=$1
+		;;
+	-bluegene*)
+		os=-cnk
+		;;
+	-sim | -cisco | -oki | -wec | -winbond)
+		os=
+		basic_machine=$1
+		;;
+	-scout)
+		;;
+	-wrs)
+		os=-vxworks
+		basic_machine=$1
+		;;
+	-chorusos*)
+		os=-chorusos
+		basic_machine=$1
+		;;
+	-chorusrdb)
+		os=-chorusrdb
+		basic_machine=$1
+		;;
+	-hiux*)
+		os=-hiuxwe2
+		;;
+	-sco6)
+		os=-sco5v6
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5)
+		os=-sco3.2v5
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco4)
+		os=-sco3.2v4
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2.[4-9]*)
+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco3.2v[4-9]*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco5v6*)
+		# Don't forget version if it is 3.2v4 or newer.
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-sco*)
+		os=-sco3.2v2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-udk*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-isc)
+		os=-isc2.2
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-clix*)
+		basic_machine=clipper-intergraph
+		;;
+	-isc*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
+	-lynx*)
+		os=-lynxos
+		;;
+	-ptx*)
+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+		;;
+	-windowsnt*)
+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
+		;;
+	-psos*)
+		os=-psos
+		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+	# Recognize the basic CPU types without company name.
+	# Some are omitted here because they have special meanings below.
+	1750a | 580 \
+	| a29k \
+	| aarch64 | aarch64_be \
+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+	| am33_2.0 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
+	| bfin \
+	| c4x | c8051 | clipper \
+	| d10v | d30v | dlx | dsp16xx \
+	| e2k | epiphany \
+	| fido | fr30 | frv | ft32 \
+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
+	| i370 | i860 | i960 | ia64 \
+	| ip2k | iq2000 \
+	| k1om \
+	| le32 | le64 \
+	| lm32 \
+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
+	| mips | mipsbe | mipseb | mipsel | mipsle \
+	| mips16 \
+	| mips64 | mips64el \
+	| mips64octeon | mips64octeonel \
+	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
+	| mips64vr4100 | mips64vr4100el \
+	| mips64vr4300 | mips64vr4300el \
+	| mips64vr5000 | mips64vr5000el \
+	| mips64vr5900 | mips64vr5900el \
+	| mipsisa32 | mipsisa32el \
+	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
+	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
+	| mipsisa64sb1 | mipsisa64sb1el \
+	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
+	| mipstx39 | mipstx39el \
+	| mn10200 | mn10300 \
+	| moxie \
+	| mt \
+	| msp430 \
+	| nds32 | nds32le | nds32be \
+	| nios | nios2 | nios2eb | nios2el \
+	| ns16k | ns32k \
+	| open8 | or1k | or1knd | or32 \
+	| pdp10 | pdp11 | pj | pjl \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
+	| pyramid \
+	| riscv32 | riscv64 \
+	| rl78 | rx \
+	| score \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh64 | sh64le \
+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
+	| ubicom32 \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
+	| we32k \
+	| x86 | xc16x | xstormy16 | xtensa \
+	| z8k | z80)
+		basic_machine=$basic_machine-unknown
+		;;
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+		;;
+	ms1)
+		basic_machine=mt-unknown
+		;;
+
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
+	# We use `pc' rather than `unknown'
+	# because (1) that's what they normally are, and
+	# (2) the word "unknown" tends to confuse beginning users.
+	i*86 | x86_64)
+	  basic_machine=$basic_machine-pc
+	  ;;
+	# Object if more than one company name word.
+	*-*-*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+	# Recognize the basic CPU types with company name.
+	580-* \
+	| a29k-* \
+	| aarch64-* | aarch64_be-* \
+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+	| avr-* | avr32-* \
+	| be32-* | be64-* \
+	| bfin-* | bs2000-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
+	| d10v-* | d30v-* | dlx-* \
+	| e2k-* | elxsi-* \
+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
+	| h8300-* | h8500-* \
+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
+	| i*86-* | i860-* | i960-* | ia64-* \
+	| ip2k-* | iq2000-* \
+	| k1om-* \
+	| le32-* | le64-* \
+	| lm32-* \
+	| m32c-* | m32r-* | m32rle-* \
+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+	| mips16-* \
+	| mips64-* | mips64el-* \
+	| mips64octeon-* | mips64octeonel-* \
+	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
+	| mips64vr4100-* | mips64vr4100el-* \
+	| mips64vr4300-* | mips64vr4300el-* \
+	| mips64vr5000-* | mips64vr5000el-* \
+	| mips64vr5900-* | mips64vr5900el-* \
+	| mipsisa32-* | mipsisa32el-* \
+	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
+	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
+	| mipsisa64sb1-* | mipsisa64sb1el-* \
+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
+	| mipstx39-* | mipstx39el-* \
+	| mmix-* \
+	| mt-* \
+	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
+	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
+	| or1k*-* \
+	| orion-* \
+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
+	| pyramid-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+	| sparclite-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tile*-* \
+	| tron-* \
+	| ubicom32-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
+	| visium-* \
+	| we32k-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
+	| xstormy16-* | xtensa*-* \
+	| ymp-* \
+	| z8k-* | z80-*)
+		;;
+	# Recognize the basic CPU types without company name, with glob match.
+	xtensa*)
+		basic_machine=$basic_machine-unknown
+		;;
+	# Recognize the various machine names and aliases which stand
+	# for a CPU type and a company and sometimes even an OS.
+	386bsd)
+		basic_machine=i386-unknown
+		os=-bsd
+		;;
+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+		basic_machine=m68000-att
+		;;
+	3b*)
+		basic_machine=we32k-att
+		;;
+	a29khif)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	abacus)
+		basic_machine=abacus-unknown
+		;;
+	adobe68k)
+		basic_machine=m68010-adobe
+		os=-scout
+		;;
+	alliant | fx80)
+		basic_machine=fx80-alliant
+		;;
+	altos | altos3068)
+		basic_machine=m68k-altos
+		;;
+	am29k)
+		basic_machine=a29k-none
+		os=-bsd
+		;;
+	amd64)
+		basic_machine=x86_64-pc
+		;;
+	amd64-*)
+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	amdahl)
+		basic_machine=580-amdahl
+		os=-sysv
+		;;
+	amiga | amiga-*)
+		basic_machine=m68k-unknown
+		;;
+	amigaos | amigados)
+		basic_machine=m68k-unknown
+		os=-amigaos
+		;;
+	amigaunix | amix)
+		basic_machine=m68k-unknown
+		os=-sysv4
+		;;
+	apollo68)
+		basic_machine=m68k-apollo
+		os=-sysv
+		;;
+	apollo68bsd)
+		basic_machine=m68k-apollo
+		os=-bsd
+		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
+        asmjs)
+		basic_machine=asmjs-unknown
+		;;
+	aux)
+		basic_machine=m68k-apple
+		os=-aux
+		;;
+	balance)
+		basic_machine=ns32k-sequent
+		os=-dynix
+		;;
+	blackfin)
+		basic_machine=bfin-unknown
+		os=-linux
+		;;
+	blackfin-*)
+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c90)
+		basic_machine=c90-cray
+		os=-unicos
+		;;
+	cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
+	convex-c1)
+		basic_machine=c1-convex
+		os=-bsd
+		;;
+	convex-c2)
+		basic_machine=c2-convex
+		os=-bsd
+		;;
+	convex-c32)
+		basic_machine=c32-convex
+		os=-bsd
+		;;
+	convex-c34)
+		basic_machine=c34-convex
+		os=-bsd
+		;;
+	convex-c38)
+		basic_machine=c38-convex
+		os=-bsd
+		;;
+	cray | j90)
+		basic_machine=j90-cray
+		os=-unicos
+		;;
+	craynv)
+		basic_machine=craynv-cray
+		os=-unicosmp
+		;;
+	cr16 | cr16-*)
+		basic_machine=cr16-unknown
+		os=-elf
+		;;
+	crds | unos)
+		basic_machine=m68k-crds
+		;;
+	crisv32 | crisv32-* | etraxfs*)
+		basic_machine=crisv32-axis
+		;;
+	cris | cris-* | etrax*)
+		basic_machine=cris-axis
+		;;
+	crx)
+		basic_machine=crx-unknown
+		os=-elf
+		;;
+	da30 | da30-*)
+		basic_machine=m68k-da30
+		;;
+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+		basic_machine=mips-dec
+		;;
+	decsystem10* | dec10*)
+		basic_machine=pdp10-dec
+		os=-tops10
+		;;
+	decsystem20* | dec20*)
+		basic_machine=pdp10-dec
+		os=-tops20
+		;;
+	delta | 3300 | motorola-3300 | motorola-delta \
+	      | 3300-motorola | delta-motorola)
+		basic_machine=m68k-motorola
+		;;
+	delta88)
+		basic_machine=m88k-motorola
+		os=-sysv3
+		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
+	djgpp)
+		basic_machine=i586-pc
+		os=-msdosdjgpp
+		;;
+	dpx20 | dpx20-*)
+		basic_machine=rs6000-bull
+		os=-bosx
+		;;
+	dpx2* | dpx2*-bull)
+		basic_machine=m68k-bull
+		os=-sysv3
+		;;
+	ebmon29k)
+		basic_machine=a29k-amd
+		os=-ebmon
+		;;
+	elxsi)
+		basic_machine=elxsi-elxsi
+		os=-bsd
+		;;
+	encore | umax | mmax)
+		basic_machine=ns32k-encore
+		;;
+	es1800 | OSE68k | ose68k | ose | OSE)
+		basic_machine=m68k-ericsson
+		os=-ose
+		;;
+	fx2800)
+		basic_machine=i860-alliant
+		;;
+	genix)
+		basic_machine=ns32k-ns
+		;;
+	gmicro)
+		basic_machine=tron-gmicro
+		os=-sysv
+		;;
+	go32)
+		basic_machine=i386-pc
+		os=-go32
+		;;
+	h3050r* | hiux*)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	h8300hms)
+		basic_machine=h8300-hitachi
+		os=-hms
+		;;
+	h8300xray)
+		basic_machine=h8300-hitachi
+		os=-xray
+		;;
+	h8500hms)
+		basic_machine=h8500-hitachi
+		os=-hms
+		;;
+	harris)
+		basic_machine=m88k-harris
+		os=-sysv3
+		;;
+	hp300-*)
+		basic_machine=m68k-hp
+		;;
+	hp300bsd)
+		basic_machine=m68k-hp
+		os=-bsd
+		;;
+	hp300hpux)
+		basic_machine=m68k-hp
+		os=-hpux
+		;;
+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k2[0-9][0-9] | hp9k31[0-9])
+		basic_machine=m68000-hp
+		;;
+	hp9k3[2-9][0-9])
+		basic_machine=m68k-hp
+		;;
+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k78[0-9] | hp78[0-9])
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+		# FIXME: really hppa2.0-hp
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][13679] | hp8[0-9][13679])
+		basic_machine=hppa1.1-hp
+		;;
+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+		basic_machine=hppa1.0-hp
+		;;
+	hppa-next)
+		os=-nextstep3
+		;;
+	hppaosf)
+		basic_machine=hppa1.1-hp
+		os=-osf
+		;;
+	hppro)
+		basic_machine=hppa1.1-hp
+		os=-proelf
+		;;
+	i370-ibm* | ibm*)
+		basic_machine=i370-ibm
+		;;
+	i*86v32)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv32
+		;;
+	i*86v4*)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv4
+		;;
+	i*86v)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-sysv
+		;;
+	i*86sol2)
+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+		os=-solaris2
+		;;
+	i386mach)
+		basic_machine=i386-mach
+		os=-mach
+		;;
+	i386-vsta | vsta)
+		basic_machine=i386-unknown
+		os=-vsta
+		;;
+	iris | iris4d)
+		basic_machine=mips-sgi
+		case $os in
+		    -irix*)
+			;;
+		    *)
+			os=-irix4
+			;;
+		esac
+		;;
+	isi68 | isi)
+		basic_machine=m68k-isi
+		os=-sysv
+		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
+	m68knommu)
+		basic_machine=m68k-unknown
+		os=-linux
+		;;
+	m68knommu-*)
+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	m88k-omron*)
+		basic_machine=m88k-omron
+		;;
+	magnum | m3230)
+		basic_machine=mips-mips
+		os=-sysv
+		;;
+	merlin)
+		basic_machine=ns32k-utek
+		os=-sysv
+		;;
+	microblaze*)
+		basic_machine=microblaze-xilinx
+		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
+	mingw32)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	mingw32ce)
+		basic_machine=arm-unknown
+		os=-mingw32ce
+		;;
+	miniframe)
+		basic_machine=m68000-convergent
+		;;
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
+	mips3*-*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+		;;
+	mips3*)
+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+		;;
+	monitor)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	morphos)
+		basic_machine=powerpc-unknown
+		os=-morphos
+		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
+	msdos)
+		basic_machine=i386-pc
+		os=-msdos
+		;;
+	ms1-*)
+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
+		;;
+	msys)
+		basic_machine=i686-pc
+		os=-msys
+		;;
+	mvs)
+		basic_machine=i370-ibm
+		os=-mvs
+		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
+	ncr3000)
+		basic_machine=i486-ncr
+		os=-sysv4
+		;;
+	netbsd386)
+		basic_machine=i386-unknown
+		os=-netbsd
+		;;
+	netwinder)
+		basic_machine=armv4l-rebel
+		os=-linux
+		;;
+	news | news700 | news800 | news900)
+		basic_machine=m68k-sony
+		os=-newsos
+		;;
+	news1000)
+		basic_machine=m68030-sony
+		os=-newsos
+		;;
+	news-3600 | risc-news)
+		basic_machine=mips-sony
+		os=-newsos
+		;;
+	necv70)
+		basic_machine=v70-nec
+		os=-sysv
+		;;
+	next | m*-next )
+		basic_machine=m68k-next
+		case $os in
+		    -nextstep* )
+			;;
+		    -ns2*)
+		      os=-nextstep2
+			;;
+		    *)
+		      os=-nextstep3
+			;;
+		esac
+		;;
+	nh3000)
+		basic_machine=m68k-harris
+		os=-cxux
+		;;
+	nh[45]000)
+		basic_machine=m88k-harris
+		os=-cxux
+		;;
+	nindy960)
+		basic_machine=i960-intel
+		os=-nindy
+		;;
+	mon960)
+		basic_machine=i960-intel
+		os=-mon960
+		;;
+	nonstopux)
+		basic_machine=mips-compaq
+		os=-nonstopux
+		;;
+	np1)
+		basic_machine=np1-gould
+		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
+	nsr-tandem)
+		basic_machine=nsr-tandem
+		;;
+	op50n-* | op60c-*)
+		basic_machine=hppa1.1-oki
+		os=-proelf
+		;;
+	openrisc | openrisc-*)
+		basic_machine=or32-unknown
+		;;
+	os400)
+		basic_machine=powerpc-ibm
+		os=-os400
+		;;
+	OSE68000 | ose68000)
+		basic_machine=m68000-ericsson
+		os=-ose
+		;;
+	os68k)
+		basic_machine=m68k-none
+		os=-os68k
+		;;
+	pa-hitachi)
+		basic_machine=hppa1.1-hitachi
+		os=-hiuxwe2
+		;;
+	paragon)
+		basic_machine=i860-intel
+		os=-osf
+		;;
+	parisc)
+		basic_machine=hppa-unknown
+		os=-linux
+		;;
+	parisc-*)
+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+		os=-linux
+		;;
+	pbd)
+		basic_machine=sparc-tti
+		;;
+	pbb)
+		basic_machine=m68k-tti
+		;;
+	pc532 | pc532-*)
+		basic_machine=ns32k-pc532
+		;;
+	pc98)
+		basic_machine=i386-pc
+		;;
+	pc98-*)
+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium | p5 | k5 | k6 | nexgen | viac3)
+		basic_machine=i586-pc
+		;;
+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+		basic_machine=i686-pc
+		;;
+	pentiumii | pentium2 | pentiumiii | pentium3)
+		basic_machine=i686-pc
+		;;
+	pentium4)
+		basic_machine=i786-pc
+		;;
+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pentium4-*)
+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	pn)
+		basic_machine=pn-gould
+		;;
+	power)	basic_machine=power-ibm
+		;;
+	ppc | ppcbe)	basic_machine=powerpc-unknown
+		;;
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppcle | powerpclittle | ppc-le | powerpc-little)
+		basic_machine=powerpcle-unknown
+		;;
+	ppcle-* | powerpclittle-*)
+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64)	basic_machine=powerpc64-unknown
+		;;
+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+		basic_machine=powerpc64le-unknown
+		;;
+	ppc64le-* | powerpc64little-*)
+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	ps2)
+		basic_machine=i386-ibm
+		;;
+	pw32)
+		basic_machine=i586-unknown
+		os=-pw32
+		;;
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
+		basic_machine=i386-pc
+		os=-rdos
+		;;
+	rom68k)
+		basic_machine=m68k-rom68k
+		os=-coff
+		;;
+	rm[46]00)
+		basic_machine=mips-siemens
+		;;
+	rtpc | rtpc-*)
+		basic_machine=romp-ibm
+		;;
+	s390 | s390-*)
+		basic_machine=s390-ibm
+		;;
+	s390x | s390x-*)
+		basic_machine=s390x-ibm
+		;;
+	sa29200)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	sb1)
+		basic_machine=mipsisa64sb1-unknown
+		;;
+	sb1el)
+		basic_machine=mipsisa64sb1el-unknown
+		;;
+	sde)
+		basic_machine=mipsisa32-sde
+		os=-elf
+		;;
+	sei)
+		basic_machine=mips-sei
+		os=-seiux
+		;;
+	sequent)
+		basic_machine=i386-sequent
+		;;
+	sh)
+		basic_machine=sh-hitachi
+		os=-hms
+		;;
+	sh5el)
+		basic_machine=sh5le-unknown
+		;;
+	sh64)
+		basic_machine=sh64-unknown
+		;;
+	sparclite-wrs | simso-wrs)
+		basic_machine=sparclite-wrs
+		os=-vxworks
+		;;
+	sps7)
+		basic_machine=m68k-bull
+		os=-sysv2
+		;;
+	spur)
+		basic_machine=spur-unknown
+		;;
+	st2000)
+		basic_machine=m68k-tandem
+		;;
+	stratus)
+		basic_machine=i860-stratus
+		os=-sysv4
+		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	sun2)
+		basic_machine=m68000-sun
+		;;
+	sun2os3)
+		basic_machine=m68000-sun
+		os=-sunos3
+		;;
+	sun2os4)
+		basic_machine=m68000-sun
+		os=-sunos4
+		;;
+	sun3os3)
+		basic_machine=m68k-sun
+		os=-sunos3
+		;;
+	sun3os4)
+		basic_machine=m68k-sun
+		os=-sunos4
+		;;
+	sun4os3)
+		basic_machine=sparc-sun
+		os=-sunos3
+		;;
+	sun4os4)
+		basic_machine=sparc-sun
+		os=-sunos4
+		;;
+	sun4sol2)
+		basic_machine=sparc-sun
+		os=-solaris2
+		;;
+	sun3 | sun3-*)
+		basic_machine=m68k-sun
+		;;
+	sun4)
+		basic_machine=sparc-sun
+		;;
+	sun386 | sun386i | roadrunner)
+		basic_machine=i386-sun
+		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
+	symmetry)
+		basic_machine=i386-sequent
+		os=-dynix
+		;;
+	t3e)
+		basic_machine=alphaev5-cray
+		os=-unicos
+		;;
+	t90)
+		basic_machine=t90-cray
+		os=-unicos
+		;;
+	tile*)
+		basic_machine=$basic_machine-unknown
+		os=-linux-gnu
+		;;
+	tx39)
+		basic_machine=mipstx39-unknown
+		;;
+	tx39el)
+		basic_machine=mipstx39el-unknown
+		;;
+	toad1)
+		basic_machine=pdp10-xkl
+		os=-tops20
+		;;
+	tower | tower-32)
+		basic_machine=m68k-ncr
+		;;
+	tpf)
+		basic_machine=s390x-ibm
+		os=-tpf
+		;;
+	udi29k)
+		basic_machine=a29k-amd
+		os=-udi
+		;;
+	ultra3)
+		basic_machine=a29k-nyu
+		os=-sym1
+		;;
+	v810 | necv810)
+		basic_machine=v810-nec
+		os=-none
+		;;
+	vaxv)
+		basic_machine=vax-dec
+		os=-sysv
+		;;
+	vms)
+		basic_machine=vax-dec
+		os=-vms
+		;;
+	vpp*|vx|vx-*)
+		basic_machine=f301-fujitsu
+		;;
+	vxworks960)
+		basic_machine=i960-wrs
+		os=-vxworks
+		;;
+	vxworks68)
+		basic_machine=m68k-wrs
+		os=-vxworks
+		;;
+	vxworks29k)
+		basic_machine=a29k-wrs
+		os=-vxworks
+		;;
+	w65*)
+		basic_machine=w65-wdc
+		os=-none
+		;;
+	w89k-*)
+		basic_machine=hppa1.1-winbond
+		os=-proelf
+		;;
+	xbox)
+		basic_machine=i686-pc
+		os=-mingw32
+		;;
+	xps | xps100)
+		basic_machine=xps100-honeywell
+		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
+	ymp)
+		basic_machine=ymp-cray
+		os=-unicos
+		;;
+	z8k-*-coff)
+		basic_machine=z8k-unknown
+		os=-sim
+		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
+	none)
+		basic_machine=none-none
+		os=-none
+		;;
+
+# Here we handle the default manufacturer of certain CPU types.  It is in
+# some cases the only manufacturer, in others, it is the most popular.
+	w89k)
+		basic_machine=hppa1.1-winbond
+		;;
+	op50n)
+		basic_machine=hppa1.1-oki
+		;;
+	op60c)
+		basic_machine=hppa1.1-oki
+		;;
+	romp)
+		basic_machine=romp-ibm
+		;;
+	mmix)
+		basic_machine=mmix-knuth
+		;;
+	rs6000)
+		basic_machine=rs6000-ibm
+		;;
+	vax)
+		basic_machine=vax-dec
+		;;
+	pdp10)
+		# there are many clones, so DEC is not a safe bet
+		basic_machine=pdp10-unknown
+		;;
+	pdp11)
+		basic_machine=pdp11-dec
+		;;
+	we32k)
+		basic_machine=we32k-att
+		;;
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+		basic_machine=sh-unknown
+		;;
+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+		basic_machine=sparc-sun
+		;;
+	cydra)
+		basic_machine=cydra-cydrome
+		;;
+	orion)
+		basic_machine=orion-highlevel
+		;;
+	orion105)
+		basic_machine=clipper-highlevel
+		;;
+	mac | mpw | mac-mpw)
+		basic_machine=m68k-apple
+		;;
+	pmac | pmac-mpw)
+		basic_machine=powerpc-apple
+		;;
+	*-unknown)
+		# Make sure to match an already-canonicalized machine name.
+		;;
+	*)
+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+		exit 1
+		;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+	*-digital*)
+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+		;;
+	*-commodore*)
+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+		;;
+	*)
+		;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+	# First match some system type aliases
+	# that might get confused with valid system types.
+	# -solaris* is a basic system type, with this one exception.
+	-auroraux)
+		os=-auroraux
+		;;
+	-solaris1 | -solaris1.*)
+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+		;;
+	-solaris)
+		os=-solaris2
+		;;
+	-svr4*)
+		os=-sysv4
+		;;
+	-unixware*)
+		os=-sysv4.2uw
+		;;
+	-gnu/linux*)
+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+		;;
+	# First accept the basic system types.
+	# The portable systems comes first.
+	# Each alternative MUST END IN A *, to match a version number.
+	# -sysv* is not here because it comes later, after sysvr4.
+	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+	      | -aos* | -aros* | -cloudabi* \
+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
+	# Remember, each alternative MUST END IN *, to match a version number.
+		;;
+	-qnx*)
+		case $basic_machine in
+		    x86-* | i*86-*)
+			;;
+		    *)
+			os=-nto$os
+			;;
+		esac
+		;;
+	-nto-qnx*)
+		;;
+	-nto*)
+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+		;;
+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+		;;
+	-mac*)
+		os=`echo $os | sed -e 's|mac|macos|'`
+		;;
+	-linux-dietlibc)
+		os=-linux-dietlibc
+		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
+	-sunos5*)
+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+		;;
+	-sunos6*)
+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+		;;
+	-opened*)
+		os=-openedition
+		;;
+	-os400*)
+		os=-os400
+		;;
+	-wince*)
+		os=-wince
+		;;
+	-osfrose*)
+		os=-osfrose
+		;;
+	-osf*)
+		os=-osf
+		;;
+	-utek*)
+		os=-bsd
+		;;
+	-dynix*)
+		os=-bsd
+		;;
+	-acis*)
+		os=-aos
+		;;
+	-atheos*)
+		os=-atheos
+		;;
+	-syllable*)
+		os=-syllable
+		;;
+	-386bsd)
+		os=-bsd
+		;;
+	-ctix* | -uts*)
+		os=-sysv
+		;;
+	-nova*)
+		os=-rtmk-nova
+		;;
+	-ns2 )
+		os=-nextstep2
+		;;
+	-nsk*)
+		os=-nsk
+		;;
+	# Preserve the version number of sinix5.
+	-sinix5.*)
+		os=`echo $os | sed -e 's|sinix|sysv|'`
+		;;
+	-sinix*)
+		os=-sysv4
+		;;
+	-tpf*)
+		os=-tpf
+		;;
+	-triton*)
+		os=-sysv3
+		;;
+	-oss*)
+		os=-sysv3
+		;;
+	-svr4)
+		os=-sysv4
+		;;
+	-svr3)
+		os=-sysv3
+		;;
+	-sysvr4)
+		os=-sysv4
+		;;
+	# This must come after -sysvr4.
+	-sysv*)
+		;;
+	-ose*)
+		os=-ose
+		;;
+	-es1800*)
+		os=-ose
+		;;
+	-xenix)
+		os=-xenix
+		;;
+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+		os=-mint
+		;;
+	-aros*)
+		os=-aros
+		;;
+	-zvmoe)
+		os=-zvmoe
+		;;
+	-dicos*)
+		os=-dicos
+		;;
+	-nacl*)
+		;;
+	-none)
+		;;
+	*)
+		# Get rid of the `-' at the beginning of $os.
+		os=`echo $os | sed 's/[^-]*-//'`
+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+		exit 1
+		;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system.  Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+	score-*)
+		os=-elf
+		;;
+	spu-*)
+		os=-elf
+		;;
+	*-acorn)
+		os=-riscix1.2
+		;;
+	arm*-rebel)
+		os=-linux
+		;;
+	arm*-semi)
+		os=-aout
+		;;
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
+		;;
+	# This must come before the *-dec entry.
+	pdp10-*)
+		os=-tops20
+		;;
+	pdp11-*)
+		os=-none
+		;;
+	*-dec | vax-*)
+		os=-ultrix4.2
+		;;
+	m68*-apollo)
+		os=-domain
+		;;
+	i386-sun)
+		os=-sunos4.0.2
+		;;
+	m68000-sun)
+		os=-sunos3
+		;;
+	m68*-cisco)
+		os=-aout
+		;;
+	mep-*)
+		os=-elf
+		;;
+	mips*-cisco)
+		os=-elf
+		;;
+	mips*-*)
+		os=-elf
+		;;
+	or32-*)
+		os=-coff
+		;;
+	*-tti)	# must be before sparc entry or we get the wrong os.
+		os=-sysv3
+		;;
+	sparc-* | *-sun)
+		os=-sunos4.1.1
+		;;
+	*-be)
+		os=-beos
+		;;
+	*-haiku)
+		os=-haiku
+		;;
+	*-ibm)
+		os=-aix
+		;;
+	*-knuth)
+		os=-mmixware
+		;;
+	*-wec)
+		os=-proelf
+		;;
+	*-winbond)
+		os=-proelf
+		;;
+	*-oki)
+		os=-proelf
+		;;
+	*-hp)
+		os=-hpux
+		;;
+	*-hitachi)
+		os=-hiux
+		;;
+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+		os=-sysv
+		;;
+	*-cbm)
+		os=-amigaos
+		;;
+	*-dg)
+		os=-dgux
+		;;
+	*-dolphin)
+		os=-sysv3
+		;;
+	m68k-ccur)
+		os=-rtu
+		;;
+	m88k-omron*)
+		os=-luna
+		;;
+	*-next )
+		os=-nextstep
+		;;
+	*-sequent)
+		os=-ptx
+		;;
+	*-crds)
+		os=-unos
+		;;
+	*-ns)
+		os=-genix
+		;;
+	i370-*)
+		os=-mvs
+		;;
+	*-next)
+		os=-nextstep3
+		;;
+	*-gould)
+		os=-sysv
+		;;
+	*-highlevel)
+		os=-bsd
+		;;
+	*-encore)
+		os=-bsd
+		;;
+	*-sgi)
+		os=-irix
+		;;
+	*-siemens)
+		os=-sysv4
+		;;
+	*-masscomp)
+		os=-rtu
+		;;
+	f30[01]-fujitsu | f700-fujitsu)
+		os=-uxpv
+		;;
+	*-rom68k)
+		os=-coff
+		;;
+	*-*bug)
+		os=-coff
+		;;
+	*-apple)
+		os=-macos
+		;;
+	*-atari*)
+		os=-mint
+		;;
+	*)
+		os=-none
+		;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer.  We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+	*-unknown)
+		case $os in
+			-riscix*)
+				vendor=acorn
+				;;
+			-sunos*)
+				vendor=sun
+				;;
+			-cnk*|-aix*)
+				vendor=ibm
+				;;
+			-beos*)
+				vendor=be
+				;;
+			-hpux*)
+				vendor=hp
+				;;
+			-mpeix*)
+				vendor=hp
+				;;
+			-hiux*)
+				vendor=hitachi
+				;;
+			-unos*)
+				vendor=crds
+				;;
+			-dgux*)
+				vendor=dg
+				;;
+			-luna*)
+				vendor=omron
+				;;
+			-genix*)
+				vendor=ns
+				;;
+			-mvs* | -opened*)
+				vendor=ibm
+				;;
+			-os400*)
+				vendor=ibm
+				;;
+			-ptx*)
+				vendor=sequent
+				;;
+			-tpf*)
+				vendor=ibm
+				;;
+			-vxsim* | -vxworks* | -windiss*)
+				vendor=wrs
+				;;
+			-aux*)
+				vendor=apple
+				;;
+			-hms*)
+				vendor=hitachi
+				;;
+			-mpw* | -macos*)
+				vendor=apple
+				;;
+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+				vendor=atari
+				;;
+			-vos*)
+				vendor=stratus
+				;;
+		esac
+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+		;;
+esac
+
+echo $basic_machine$os
+exit
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
diff --git a/autoconf/install-sh b/autoconf/install-sh
new file mode 100644
index 0000000..e69de29
diff --git a/autoconf/m4/ax_check_compile_flag.m4 b/autoconf/m4/ax_check_compile_flag.m4
new file mode 100644
index 0000000..c3a8d69
--- /dev/null
+++ b/autoconf/m4/ax_check_compile_flag.m4
@@ -0,0 +1,72 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the current language's compiler
+#   or gives an error.  (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the current language's default
+#   flags (e.g. CFLAGS) when the check is done.  The check is thus made with
+#   the flags: "CFLAGS EXTRA-FLAGS FLAG".  This can for example be used to
+#   force the compiler to issue an error when a bad flag is given.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_CHECK_COMPILE_FLAG],
+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX
+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl
+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [
+  ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS
+  _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1"
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_COMPILE_FLAGS
diff --git a/autoconf/m4/ax_check_link_flag.m4 b/autoconf/m4/ax_check_link_flag.m4
new file mode 100644
index 0000000..e2d0d36
--- /dev/null
+++ b/autoconf/m4/ax_check_link_flag.m4
@@ -0,0 +1,71 @@
+# ===========================================================================
+#    http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS])
+#
+# DESCRIPTION
+#
+#   Check whether the given FLAG works with the linker or gives an error.
+#   (Warnings, however, are ignored)
+#
+#   ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on
+#   success/failure.
+#
+#   If EXTRA-FLAGS is defined, it is added to the linker's default flags
+#   when the check is done.  The check is thus made with the flags: "LDFLAGS
+#   EXTRA-FLAGS FLAG".  This can for example be used to force the linker to
+#   issue an error when a bad flag is given.
+#
+#   NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this
+#   macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Guido U. Draheim <guidod@gmx.de>
+#   Copyright (c) 2011 Maarten Bosmans <mkbosmans@gmail.com>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 2
+
+AC_DEFUN([AX_CHECK_LINK_FLAG],
+[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl
+AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS $4 $1"
+  AC_LINK_IFELSE([AC_LANG_PROGRAM()],
+    [AS_VAR_SET(CACHEVAR,[yes])],
+    [AS_VAR_SET(CACHEVAR,[no])])
+  LDFLAGS=$ax_check_save_flags])
+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes],
+  [m4_default([$2], :)],
+  [m4_default([$3], :)])
+AS_VAR_POPDEF([CACHEVAR])dnl
+])dnl AX_CHECK_LINK_FLAGS
diff --git a/autoconf/m4/ax_pthread.m4 b/autoconf/m4/ax_pthread.m4
new file mode 100644
index 0000000..d383ad5
--- /dev/null
+++ b/autoconf/m4/ax_pthread.m4
@@ -0,0 +1,332 @@
+# ===========================================================================
+#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+#
+# DESCRIPTION
+#
+#   This macro figures out how to build C programs using POSIX threads. It
+#   sets the PTHREAD_LIBS output variable to the threads library and linker
+#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
+#   flags that are needed. (The user can also force certain compiler
+#   flags/libs to be tested by setting these environment variables.)
+#
+#   Also sets PTHREAD_CC to any special C compiler that is needed for
+#   multi-threaded programs (defaults to the value of CC otherwise). (This
+#   is necessary on AIX to use the special cc_r compiler alias.)
+#
+#   NOTE: You are assumed to not only compile your program with these flags,
+#   but also link it with them as well. e.g. you should link with
+#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
+#
+#   If you are only building threads programs, you may wish to use these
+#   variables in your default LIBS, CFLAGS, and CC:
+#
+#     LIBS="$PTHREAD_LIBS $LIBS"
+#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+#     CC="$PTHREAD_CC"
+#
+#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
+#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
+#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+#
+#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
+#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
+#   PTHREAD_CFLAGS.
+#
+#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
+#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
+#   is not found. If ACTION-IF-FOUND is not specified, the default action
+#   will define HAVE_PTHREAD.
+#
+#   Please let the authors know if this macro fails on any platform, or if
+#   you have any other suggestions or comments. This macro was based on work
+#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
+#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
+#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
+#   grateful for the helpful feedback of numerous users.
+#
+#   Updated for Autoconf 2.68 by Daniel Richard G.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
+#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
+#
+#   This program is free software: you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation, either version 3 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+#serial 21
+
+AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
+AC_DEFUN([AX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_PUSH([C])
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+        AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes])
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test x"$ax_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.
+
+AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags])
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])],
+                  [AC_MSG_RESULT([yes])],
+                  [ax_pthread_extra_flags=
+                   AC_MSG_RESULT([no])])
+CFLAGS="$save_CFLAGS"
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                AC_MSG_CHECKING([whether pthreads work without any flags])
+                ;;
+
+                -*)
+                AC_MSG_CHECKING([whether pthreads work with $flag])
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no])
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                AC_MSG_CHECKING([for the pthreads library -l$flag])
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }],
+                       [pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */])],
+                [ax_pthread_ok=yes],
+                [])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        AC_MSG_RESULT([$ax_pthread_ok])
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        AC_MSG_CHECKING([for joinable pthread attribute])
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
+                           [int attr = $attr; return attr /* ; */])],
+                [attr_name=$attr; break],
+                [])
+        done
+        AC_MSG_RESULT([$attr_name])
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+            AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name],
+                               [Define to necessary symbol if this constant
+                                uses a non-standard name on your system.])
+        fi
+
+        AC_MSG_CHECKING([if more special flags are required for pthreads])
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                # TODO: What about Clang on Solaris?
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        AC_MSG_RESULT([$flag])
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
+            [ax_cv_PTHREAD_PRIO_INHERIT], [
+                AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]],
+                                                [[int i = PTHREAD_PRIO_INHERIT;]])],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
+                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
+            ])
+        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
+            [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])])
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                AS_CASE(["x/$CC"],
+                  [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6],
+                  [#handle absolute path differently from PATH based program lookup
+                   AS_CASE(["x$CC"],
+                     [x/*],
+                     [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])],
+                     [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])])
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+AC_SUBST([PTHREAD_LIBS])
+AC_SUBST([PTHREAD_CFLAGS])
+AC_SUBST([PTHREAD_CC])
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+        ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1])
+        :
+else
+        ax_pthread_ok=no
+        $2
+fi
+AC_LANG_POP
+])dnl AX_PTHREAD
diff --git a/autoconf/m4/unreal.m4 b/autoconf/m4/unreal.m4
new file mode 100644
index 0000000..a77b095
--- /dev/null
+++ b/autoconf/m4/unreal.m4
@@ -0,0 +1,254 @@
+#serial 1
+
+dnl Macro: unreal_CHECK_TYPE_SIZES
+dnl originally called unet_CHECK_TYPE_SIZES
+dnl
+dnl Check the size of several types and define a valid int16_t and int32_t.
+dnl
+AC_DEFUN([unreal_CHECK_TYPE_SIZES],
+[dnl Check type sizes
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+if test "$ac_cv_sizeof_int" = 2 ; then
+  AC_CHECK_TYPE(int16_t, int)
+  AC_CHECK_TYPE(u_int16_t, unsigned int)
+elif test "$ac_cv_sizeof_short" = 2 ; then
+  AC_CHECK_TYPE(int16_t, short)
+  AC_CHECK_TYPE(u_int16_t, unsigned short)
+else
+  AC_MSG_ERROR([Cannot find a type with size of 16 bits])
+fi
+if test "$ac_cv_sizeof_int" = 4 ; then
+  AC_CHECK_TYPE(int32_t, int)
+  AC_CHECK_TYPE(u_int32_t, unsigned int)
+elif test "$ac_cv_sizeof_short" = 4 ; then
+  AC_CHECK_TYPE(int32_t, short)
+  AC_CHECK_TYPE(u_int32_t, unsigned short)
+elif test "$ac_cv_sizeof_long" = 4 ; then
+  AC_CHECK_TYPE(int32_t, long)
+  AC_CHECK_TYPE(u_int32_t, unsigned long)
+else
+  AC_MSG_ERROR([Cannot find a type with size of 32 bits])
+fi
+AC_CHECK_SIZEOF(rlim_t)
+if test "$ac_cv_sizeof_rlim_t" = 8 ; then
+AC_DEFINE([LONG_LONG_RLIM_T], [], [Define if rlim_t is long long])
+fi
+])
+
+AC_DEFUN([CHECK_LIBCURL],
+[
+	AC_ARG_ENABLE(libcurl,
+	[AC_HELP_STRING([--enable-libcurl=DIR],[enable libcurl (remote include) support])],
+	[enable_curl=$enableval],
+	[enable_curl=no])
+
+	AS_IF([test "x$enable_curl" != "xno"],
+	[
+		dnl sane, default directory for Operating System-managed libcURL
+		dnl (when --enable-libcurl is passed without any arguments). On
+		dnl systems with stuff in /usr/local, /usr/local/bin should already
+		dnl be in PATH. On sane systems, this will invoke the curl-config
+		dnl installed by the package manager.
+		CURLCONFIG="curl-config"
+		AS_IF([test "x$enable_curl" != "xyes"],
+			[CURLCONFIG="$enable_curl/bin/curl-config"])
+
+		AC_MSG_CHECKING([$CURLCONFIG])
+		AS_IF([$CURLCONFIG --version 2>/dev/null >/dev/null],
+			[AC_MSG_RESULT([yes])],
+			[AC_MSG_RESULT([no])
+				AC_MSG_FAILURE([Could not find curl-config, try editing --enable-libcurl])])
+
+		CURLCFLAG="`$CURLCONFIG --cflags`"
+		CURLLIBS="`$CURLCONFIG --libs`"
+
+		dnl This test must be this way because of #3981
+		AS_IF([$CURLCONFIG --libs | grep -q -e ares],
+			[CURLUSESCARES="1"],
+			[CURLUSESCARES="0"])
+
+		dnl sanity warnings
+		AS_IF([test -z "${CURLLIBS}"],
+			[AC_MSG_WARN([CURLLIBS is empty, that probably means that I could not find $enable_curl/bin/curl-config])])
+
+		dnl Ok this is ugly, basically we need to strip the version of c-ares that curl uses
+		dnl because we want to use our own version (which is hopefully fully binary
+		dnl compatible with the curl one as well).
+		dnl Therefore we need to strip the cares libs in a weird way...
+		dnl If anyone can come up with something better and still portable (no awk!?)
+		dnl then let us know. -- Syzop
+		dnl
+		dnl It is dangerous to mix and match cURL with potentially ABI-incompatible versions of
+		dnl c-ares, just use --with-system-cares.
+		dnl Thus, make sure to use --with-system-cares when using system-cURL. If the user
+		dnl wants bundled c-ares + system libcURL, then we should filter out c-ares
+		dnl flags. _Only_ in that case should we mess with the flags. -- ohnobinki
+
+		AS_IF([test "x$has_system_cares" = "xno" && test "x$BUILDDIR/extras/curl" != "x$enable_curl" && test "$CURLUSESCARES" != "0" ],
+		[
+			AC_MSG_ERROR([[
+
+  You have decided to build unrealIRCd with libcURL (remote includes) support.
+  However, you have system-installed c-ares support has either been disabled
+  (--without-system-cares) or is unavailable.
+  Because UnrealIRCd will use a bundled copy of c-ares which may be incompatible
+  with the system-installed libcURL, this is a bad idea which may result in error
+  messages looking like:
+
+  	\`\`[error] unrealircd.conf:9: include: error downloading '(http://example.net/ex.conf)': Could not resolve host: example.net (Successful completion)''
+
+  Or UnrealIRCd might even crash.
+
+  Please build UnrealIRCd with --with-system-cares when enabling --enable-libcurl
+]])
+		])
+
+		dnl Make sure that linking against cURL works rather than letting the user
+		dnl find out after compiling most of his program. ~ohnobinki
+		IRCDLIBS="$IRCDLIBS $CURLLIBS"
+		CFLAGS="$CFLAGS $CURLCFLAG"
+		AC_DEFINE([USE_LIBCURL], [], [Define if you have libcurl installed to get remote includes and MOTD support])
+
+		AC_MSG_CHECKING([curl_easy_init() in $CURLLIBS])
+		LIBS_SAVEDA="$LIBS"
+		CFLAGS_SAVEDA="$CFLAGS"
+
+		LIBS="$IRCDLIBS $IRCDLIBS_CURL_CARES"
+		CFLAGS="$CFLAGS $CFLAGS_CURL_CARES"
+		AC_LINK_IFELSE(
+		    [
+			AC_LANG_PROGRAM(
+			    [[#include <curl/curl.h>]],
+			    [[CURL *curl = curl_easy_init();]])
+			],
+		    [AC_MSG_RESULT([yes])],
+		    [AC_MSG_RESULT([no])
+			AC_MSG_FAILURE([You asked for libcURL (remote includes) support, but it can't be found at $enable_curl])
+		])
+		LIBS="$LIBS_SAVEDA"
+		CFLAGS="$CFLAGS_SAVEDA"
+
+		URL="url.o"
+		AC_SUBST(URL)
+	]) dnl AS_IF(enable_curl) 
+])
+
+dnl the following 2 macros are based on CHECK_SSL by Mark Ethan Trostler <trostler@juniper.net> 
+
+AC_DEFUN([CHECK_SSL],
+[
+AC_ARG_ENABLE(ssl,
+	[AC_HELP_STRING([--enable-ssl=],[enable ssl will check /usr/local/opt/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/sfw /usr/local /usr])],
+	[],
+	[enable_ssl=no])
+AS_IF([test $enable_ssl != "no"],
+	[ 
+	AC_MSG_CHECKING([for OpenSSL])
+	for dir in $enable_ssl /usr/local/opt/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/sfw /usr/local /usr; do
+		ssldir="$dir"
+		if test -f "$dir/include/openssl/ssl.h"; then
+			AC_MSG_RESULT([found in $ssldir/include/openssl])
+			found_ssl="yes";
+			if test ! "$ssldir" = "/usr" ; then
+				CFLAGS="$CFLAGS -I$ssldir/include";
+			fi
+			break
+		fi
+		if test -f "$dir/include/ssl.h"; then
+			AC_MSG_RESULT([found in $ssldir/include])
+			found_ssl="yes";
+			if test ! "$ssldir" = "/usr" ; then
+				CFLAGS="$CFLAGS -I$ssldir/include";
+			fi
+			break
+		fi
+	done
+	if test x_$found_ssl != x_yes; then
+		AC_MSG_RESULT(not found)
+		echo ""
+		echo "Apparently you do not have both the openssl binary and openssl development libraries installed."
+		echo "The following packages are required:"
+		echo "1) The library package is often called 'openssl-dev', 'openssl-devel' or 'libssl-dev'"
+		echo "2) The binary package is usually called 'openssl'."
+		echo "NOTE: you or your system administrator needs to install the library AND the binary package."
+		echo "After doing so, simply re-run ./Config"
+		exit 1
+	else
+		CRYPTOLIB="-lssl -lcrypto";
+		if test ! "$ssldir" = "/usr" ; then
+			LDFLAGS="$LDFLAGS -L$ssldir/lib";
+			dnl check if binary path exists
+			if test -f "$ssldir/bin/openssl"; then
+			    OPENSSLPATH="$ssldir/bin/openssl";
+			fi
+		fi
+		dnl linking require -ldl?
+		AC_MSG_CHECKING([OpenSSL linking with -ldl])
+		SAVE_LIBS="$LIBS"
+		LIBS="$LIBS $CRYPTOLIB -ldl"
+		AC_TRY_LINK([#include <openssl/err.h>], [ERR_clear_error();],
+		[
+			AC_MSG_RESULT(yes)
+			CRYPTOLIB="$CRYPTOLIB -ldl"
+		],
+		[
+			AC_MSG_RESULT(no)
+
+			dnl linking require both -ldl and -lpthread?
+			AC_MSG_CHECKING([OpenSSL linking with -ldl and -lpthread])
+			LIBS="$SAVE_LIBS $CRYPTOLIB -ldl -lpthread"
+			AC_TRY_LINK([#include <openssl/err.h>], [ERR_clear_error();],
+			[
+				AC_MSG_RESULT(yes)
+				CRYPTOLIB="$CRYPTOLIB -ldl -lpthread"
+			],
+			[
+				AC_MSG_RESULT(no)
+			])
+		])
+		LIBS="$SAVE_LIBS"
+	fi
+	])
+])
+
+AC_DEFUN([CHECK_SSL_CTX_SET1_CURVES_LIST],
+[
+AC_MSG_CHECKING([for SSL_CTX_set1_curves_list in SSL library])
+AC_LANG_PUSH(C)
+SAVE_LIBS="$LIBS"
+LIBS="$LIBS $CRYPTOLIB"
+AC_TRY_LINK([#include <openssl/ssl.h>],
+	[SSL_CTX *ctx = NULL; SSL_CTX_set1_curves_list(ctx, "test");],
+	has_function=1,
+	has_function=0)
+LIBS="$SAVE_LIBS"
+AC_LANG_POP(C)
+if test $has_function = 1; then
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([HAS_SSL_CTX_SET1_CURVES_LIST], [], [Define if ssl library has SSL_CTX_set1_curves_list])
+else
+	AC_MSG_RESULT([no])
+fi
+])
+
+AC_DEFUN([CHECK_SSL_CTX_SET_MIN_PROTO_VERSION],
+[
+AC_MSG_CHECKING([for SSL_CTX_set_min_proto_version in SSL library])
+AC_LANG_PUSH(C)
+SAVE_LIBS="$LIBS"
+LIBS="$LIBS $CRYPTOLIB"
+AC_TRY_LINK([#include <openssl/ssl.h>],
+	[SSL_CTX *ctx = NULL; SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);],
+	has_function=1,
+	has_function=0)
+LIBS="$SAVE_LIBS"
+AC_LANG_POP(C)
+if test $has_function = 1; then
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([HAS_SSL_CTX_SET_MIN_PROTO_VERSION], [], [Define if ssl library has SSL_CTX_set_min_proto_version])
+else
+	AC_MSG_RESULT([no])
+fi
+])
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..2bfc13e
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+echo "Regenerating 'configure' and headers..."
+echo "NOTE: Normally only UnrealIRCd developers run this command!!"
+
+cd "$(dirname "${0}")"
+
+ACLOCAL_AMFLAGS=(-I autoconf/m4)
+
+aclocal "${ACLOCAL_AMFLAGS[@]}"
+autoconf
+autoheader
diff --git a/configure b/configure
new file mode 100755
index 0000000..125017a
--- /dev/null
+++ b/configure
@@ -0,0 +1,9027 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.69 for unrealircd 5.0.3.1.
+#
+# Report bugs to <https://bugs.unrealircd.org/>.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+#
+#
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+  else
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
+$0: https://bugs.unrealircd.org/ about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
+  # Exit status is that of the last command.
+  exit
+}
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
+
+# Name of the host.
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_clean_files=
+ac_config_libobj_dir=.
+LIBOBJS=
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+
+# Identity of this package.
+PACKAGE_NAME='unrealircd'
+PACKAGE_TARNAME='unrealircd'
+PACKAGE_VERSION='5.0.3.1'
+PACKAGE_STRING='unrealircd 5.0.3.1'
+PACKAGE_BUGREPORT='https://bugs.unrealircd.org/'
+PACKAGE_URL='https://unrealircd.org/'
+
+ac_unique_file="src/ircd.c"
+# Factoring default headers for most tests.
+ac_includes_default="\
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
+#endif
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_INTTYPES_H
+# include <inttypes.h>
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif"
+
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+UNRLINCDIR
+IRCDLIBS
+URL
+PTHREAD_CFLAGS
+PTHREAD_LIBS
+PTHREAD_CC
+ax_pthread_config
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+CARES_LIBS
+CARES_CFLAGS
+ARGON2_LIBS
+ARGON2_CFLAGS
+PCRE2_LIBS
+PCRE2_CFLAGS
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+LDFLAGS_PRIVATELIBS
+PIDFILE
+DOCDIR
+PERMDATADIR
+TMPDIR
+CACHEDIR
+LOGDIR
+MODULESDIR
+CONFDIR
+SCRIPTDIR
+BINDIR
+BUILDDIR
+DYNAMIC_LDFLAGS
+MODULEFLAGS
+CRYPTOLIB
+EGREP
+GREP
+CPP
+HARDEN_BINLDFLAGS
+HARDEN_BINCFLAGS
+HARDEN_LDFLAGS
+HARDEN_CFLAGS
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+PKGCONFIG
+GUNZIP
+GMAKE
+MAKER
+INSTALL
+OPENSSLPATH
+TOUCH
+CP
+RM
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+runstatedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL'
+ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_hardening
+with_nick_history
+with_permissions
+with_bindir
+with_scriptdir
+with_confdir
+with_builddir
+with_modulesdir
+with_logdir
+with_cachedir
+with_tmpdir
+with_datadir
+with_docdir
+with_pidfile
+with_privatelibdir
+with_maxconnections
+enable_prefixaq
+with_showlistmodes
+with_no_operoverride
+with_operoverride_verify
+with_system_pcre2
+with_system_argon2
+with_system_cares
+enable_ssl
+enable_dynamic_linking
+enable_werror
+enable_asan
+enable_libcurl
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
+PCRE2_CFLAGS
+PCRE2_LIBS
+ARGON2_CFLAGS
+ARGON2_LIBS
+CARES_CFLAGS
+CARES_LIBS'
+
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
+
+ac_prev=
+ac_dashdash=
+for ac_option
+do
+  # If the previous option needs an argument, assign it.
+  if test -n "$ac_prev"; then
+    eval $ac_prev=\$ac_option
+    ac_prev=
+    continue
+  fi
+
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
+
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
+
+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
+    ac_prev=bindir ;;
+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+    bindir=$ac_optarg ;;
+
+  -build | --build | --buil | --bui | --bu)
+    ac_prev=build_alias ;;
+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+    build_alias=$ac_optarg ;;
+
+  -cache-file | --cache-file | --cache-fil | --cache-fi \
+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+    ac_prev=cache_file ;;
+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+    cache_file=$ac_optarg ;;
+
+  --config-cache | -C)
+    cache_file=config.cache ;;
+
+  -datadir | --datadir | --datadi | --datad)
+    ac_prev=datadir ;;
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
+    datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
+  -disable-* | --disable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
+
+  -enable-* | --enable-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=\$ac_optarg ;;
+
+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+  | --exec | --exe | --ex)
+    ac_prev=exec_prefix ;;
+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+  | --exec=* | --exe=* | --ex=*)
+    exec_prefix=$ac_optarg ;;
+
+  -gas | --gas | --ga | --g)
+    # Obsolete; use --with-gas.
+    with_gas=yes ;;
+
+  -help | --help | --hel | --he | -h)
+    ac_init_help=long ;;
+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+    ac_init_help=recursive ;;
+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+    ac_init_help=short ;;
+
+  -host | --host | --hos | --ho)
+    ac_prev=host_alias ;;
+  -host=* | --host=* | --hos=* | --ho=*)
+    host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
+
+  -includedir | --includedir | --includedi | --included | --include \
+  | --includ | --inclu | --incl | --inc)
+    ac_prev=includedir ;;
+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+  | --includ=* | --inclu=* | --incl=* | --inc=*)
+    includedir=$ac_optarg ;;
+
+  -infodir | --infodir | --infodi | --infod | --info | --inf)
+    ac_prev=infodir ;;
+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+    infodir=$ac_optarg ;;
+
+  -libdir | --libdir | --libdi | --libd)
+    ac_prev=libdir ;;
+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
+    libdir=$ac_optarg ;;
+
+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+  | --libexe | --libex | --libe)
+    ac_prev=libexecdir ;;
+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+  | --libexe=* | --libex=* | --libe=*)
+    libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
+
+  -localstatedir | --localstatedir | --localstatedi | --localstated \
+  | --localstate | --localstat | --localsta | --localst | --locals)
+    ac_prev=localstatedir ;;
+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
+    localstatedir=$ac_optarg ;;
+
+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+    ac_prev=mandir ;;
+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+    mandir=$ac_optarg ;;
+
+  -nfp | --nfp | --nf)
+    # Obsolete; use --without-fp.
+    with_fp=no ;;
+
+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+  | --no-cr | --no-c | -n)
+    no_create=yes ;;
+
+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+    no_recursion=yes ;;
+
+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+  | --oldin | --oldi | --old | --ol | --o)
+    ac_prev=oldincludedir ;;
+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+    oldincludedir=$ac_optarg ;;
+
+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+    ac_prev=prefix ;;
+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+    prefix=$ac_optarg ;;
+
+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
+  | --program-pre | --program-pr | --program-p)
+    ac_prev=program_prefix ;;
+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+    program_prefix=$ac_optarg ;;
+
+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
+  | --program-suf | --program-su | --program-s)
+    ac_prev=program_suffix ;;
+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+    program_suffix=$ac_optarg ;;
+
+  -program-transform-name | --program-transform-name \
+  | --program-transform-nam | --program-transform-na \
+  | --program-transform-n | --program-transform- \
+  | --program-transform | --program-transfor \
+  | --program-transfo | --program-transf \
+  | --program-trans | --program-tran \
+  | --progr-tra | --program-tr | --program-t)
+    ac_prev=program_transform_name ;;
+  -program-transform-name=* | --program-transform-name=* \
+  | --program-transform-nam=* | --program-transform-na=* \
+  | --program-transform-n=* | --program-transform-=* \
+  | --program-transform=* | --program-transfor=* \
+  | --program-transfo=* | --program-transf=* \
+  | --program-trans=* | --program-tran=* \
+  | --progr-tra=* | --program-tr=* | --program-t=*)
+    program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
+
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil)
+    silent=yes ;;
+
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+    ac_prev=sbindir ;;
+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+  | --sbi=* | --sb=*)
+    sbindir=$ac_optarg ;;
+
+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+  | --sharedst | --shareds | --shared | --share | --shar \
+  | --sha | --sh)
+    ac_prev=sharedstatedir ;;
+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+  | --sha=* | --sh=*)
+    sharedstatedir=$ac_optarg ;;
+
+  -site | --site | --sit)
+    ac_prev=site ;;
+  -site=* | --site=* | --sit=*)
+    site=$ac_optarg ;;
+
+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+    ac_prev=srcdir ;;
+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+    srcdir=$ac_optarg ;;
+
+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+  | --syscon | --sysco | --sysc | --sys | --sy)
+    ac_prev=sysconfdir ;;
+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+    sysconfdir=$ac_optarg ;;
+
+  -target | --target | --targe | --targ | --tar | --ta | --t)
+    ac_prev=target_alias ;;
+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+    target_alias=$ac_optarg ;;
+
+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
+    verbose=yes ;;
+
+  -version | --version | --versio | --versi | --vers | -V)
+    ac_init_version=: ;;
+
+  -with-* | --with-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=\$ac_optarg ;;
+
+  -without-* | --without-*)
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    # Reject names that are not valid shell variable names.
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
+
+  --x)
+    # Obsolete; use --with-x.
+    with_x=yes ;;
+
+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+  | --x-incl | --x-inc | --x-in | --x-i)
+    ac_prev=x_includes ;;
+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+    x_includes=$ac_optarg ;;
+
+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+    ac_prev=x_libraries ;;
+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+    x_libraries=$ac_optarg ;;
+
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
+    ;;
+
+  *=*)
+    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+    # Reject names that are not valid shell variable names.
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
+    export $ac_envvar ;;
+
+  *)
+    # FIXME: should be removed in autoconf 3.0.
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    ;;
+
+  esac
+done
+
+if test -n "$ac_prev"; then
+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir runstatedir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+  if test "x$build_alias" = x; then
+    cross_compiling=maybe
+  elif test "x$build_alias" != "x$host_alias"; then
+    cross_compiling=yes
+  fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+  ac_srcdir_defaulted=yes
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  srcdir=$ac_confdir
+  if test ! -r "$srcdir/$ac_unique_file"; then
+    srcdir=..
+  fi
+else
+  ac_srcdir_defaulted=no
+fi
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+  # Omit some internal or obsolete options to make the list less imposing.
+  # This message is too long to be a string in the A/UX 3.1 sh.
+  cat <<_ACEOF
+\`configure' configures unrealircd 5.0.3.1 to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE.  See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+      --help=short        display options specific to this package
+      --help=recursive    display the short help of all the included packages
+  -V, --version           display version information and exit
+  -q, --quiet, --silent   do not print \`checking ...' messages
+      --cache-file=FILE   cache test results in FILE [disabled]
+  -C, --config-cache      alias for \`--cache-file=config.cache'
+  -n, --no-create         do not create output files
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [$ac_default_prefix]
+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
+                          [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/unrealircd]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
+_ACEOF
+
+  cat <<\_ACEOF
+
+System types:
+  --build=BUILD     configure for building on BUILD [guessed]
+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+  case $ac_init_help in
+     short | recursive ) echo "Configuration of unrealircd 5.0.3.1:";;
+   esac
+  cat <<\_ACEOF
+
+Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-hardening      Enable compiler and linker options to frustrate
+                          memory corruption exploits [yes]
+  --disable-prefixaq      Disable chanadmin (+a) and chanowner (+q) prefixes
+  --enable-ssl=           enable ssl will check /usr/local/opt/openssl
+                          /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg
+                          /usr/sfw /usr/local /usr
+  --disable-dynamic-linking
+                          Make the IRCd statically link with shared objects
+                          rather than dynamically (noone knows if disabling
+                          dynamic linking actually does anything or not)
+  --enable-werror         Turn compilation warnings into errors (-Werror)
+  --enable-asan           Enable address sanitizer and other debugging
+                          options, not recommended for production servers!
+  --enable-libcurl=DIR    enable libcurl (remote include) support
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-nick-history=length
+                          Specify the length of the nickname history
+  --with-permissions=permissions
+                          Specify the default permissions for configuration
+                          files
+  --with-bindir=path      Specify the directory for the unrealircd binary
+  --with-scriptdir=path   Specify the directory for the unrealircd start-stop
+                          script
+  --with-confdir=path     Specify the directory where configuration files are
+                          stored
+  --with-builddir=path    Specify the build directory
+  --with-modulesdir=path  Specify the directory for loadable modules
+  --with-logdir=path      Specify the directory where log files are stored
+  --with-cachedir=path    Specify the directory where cached files are stored
+  --with-tmpdir=path      Specify the directory where private temporary files
+                          are stored. Should not be readable or writable by
+                          others, so not /tmp!!
+  --with-datadir=path     Specify the directory where permanent data is stored
+  --with-docdir=path      Specify the directory where documentation is stored
+  --with-pidfile=path     Specify the path of the pid file
+  --with-privatelibdir=path
+                          Specify the directory where private libraries are
+                          stored. Disable when building a package for a distro
+  --with-maxconnections=size
+                          Specify the max file descriptors to use
+  --with-showlistmodes    Specify whether modes are shown in /list
+  --with-no-operoverride  Disable OperOverride
+  --with-operoverride-verify
+                          Require opers to invite themselves to +s/+p channels
+  --without-system-pcre2  Use the system pcre2 package instead of bundled,
+                          discovered using pkg-config
+  --without-system-argon2 Use bundled version instead of system argon2
+                          library. Normally autodetected via pkg-config
+  --without-system-cares  Use bundled version instead of system c-ares.
+                          Normally autodetected via pkg-config.
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
+  PCRE2_CFLAGS
+              C compiler flags for PCRE2, overriding pkg-config
+  PCRE2_LIBS  linker flags for PCRE2, overriding pkg-config
+  ARGON2_CFLAGS
+              C compiler flags for ARGON2, overriding pkg-config
+  ARGON2_LIBS linker flags for ARGON2, overriding pkg-config
+  CARES_CFLAGS
+              C compiler flags for CARES, overriding pkg-config
+  CARES_LIBS  linker flags for CARES, overriding pkg-config
+
+Use these variables to override the choices made by `configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <https://bugs.unrealircd.org/>.
+unrealircd home page: <https://unrealircd.org/>.
+_ACEOF
+ac_status=$?
+fi
+
+if test "$ac_init_help" = "recursive"; then
+  # If there are subdirs, report their specific --help.
+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
+    ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
+    else
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
+  done
+fi
+
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+  cat <<\_ACEOF
+unrealircd configure 5.0.3.1
+generated by GNU Autoconf 2.69
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+  exit
+fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ------------------------------------------- ##
+## Report this to https://bugs.unrealircd.org/ ##
+## ------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+cat >config.log <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by unrealircd $as_me 5.0.3.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ $0 $@
+
+_ACEOF
+exec 5>>config.log
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
+
+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+  for ac_arg
+  do
+    case $ac_arg in
+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+    | -silent | --silent | --silen | --sile | --sil)
+      continue ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    case $ac_pass in
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+    2)
+      as_fn_append ac_configure_args1 " '$ac_arg'"
+      if test $ac_must_keep_next = true; then
+	ac_must_keep_next=false # Got value, back to normal.
+      else
+	case $ac_arg in
+	  *=* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=true ;;
+	esac
+      fi
+      as_fn_append ac_configure_args " '$ac_arg'"
+      ;;
+    esac
+  done
+done
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log.  We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
+trap 'exit_status=$?
+  # Save into config.log some information that might help in debugging.
+  {
+    echo
+
+    $as_echo "## ---------------- ##
+## Cache variables. ##
+## ---------------- ##"
+    echo
+    # The following way of writing the cache mishandles newlines in values,
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
+    echo
+
+    $as_echo "## ----------------- ##
+## Output variables. ##
+## ----------------- ##"
+    echo
+    for ac_var in $ac_subst_vars
+    do
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
+    done | sort
+    echo
+
+    if test -n "$ac_subst_files"; then
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
+      echo
+      for ac_var in $ac_subst_files
+      do
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
+      done | sort
+      echo
+    fi
+
+    if test -s confdefs.h; then
+      $as_echo "## ----------- ##
+## confdefs.h. ##
+## ----------- ##"
+      echo
+      cat confdefs.h
+      echo
+    fi
+    test "$ac_signal" != 0 &&
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
+  } >&5
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
+    exit $exit_status
+' 0
+for ac_signal in 1 2 13 15; do
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+    sed 's/^/| /' "$ac_site_file" >&5
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
+  fi
+done
+
+if test -r "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
+    case $cache_file in
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
+    esac
+  fi
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
+  >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in $ac_precious_vars; do
+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
+  eval ac_new_set=\$ac_env_${ac_var}_set
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
+  case $ac_old_set,$ac_new_set in
+    set,)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,set)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      ac_cache_corrupted=: ;;
+    ,);;
+    *)
+      if test "x$ac_old_val" != "x$ac_new_val"; then
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+      fi;;
+  esac
+  # Pass precious variables to config.status.
+  if test "$ac_new_set" = set; then
+    case $ac_new_val in
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *) ac_arg=$ac_var=$ac_new_val ;;
+    esac
+    case " $ac_configure_args " in
+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+    esac
+  fi
+done
+if $ac_cache_corrupted; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_config_headers="$ac_config_headers include/setup.h"
+
+ac_aux_dir=
+for ac_dir in autoconf "$srcdir"/autoconf; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in autoconf \"$srcdir\"/autoconf" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
+
+
+
+
+if test "x$enable_dynamic_linking" = "x"; then
+	echo "Please use ./Config instead of ./configure"
+	exit 1
+fi
+
+orig_cflags="$CFLAGS"
+
+BUILDDIR_NOW="`pwd`"
+
+# Generation version number (e.g.: X in X.Y.Z)
+UNREAL_VERSION_GENERATION="5"
+
+cat >>confdefs.h <<_ACEOF
+#define UNREAL_VERSION_GENERATION $UNREAL_VERSION_GENERATION
+_ACEOF
+
+
+# Major version number (e.g.: Y in X.Y.Z)
+UNREAL_VERSION_MAJOR="0"
+
+cat >>confdefs.h <<_ACEOF
+#define UNREAL_VERSION_MAJOR $UNREAL_VERSION_MAJOR
+_ACEOF
+
+
+# Minor version number (e.g.: Z in X.Y.Z)
+UNREAL_VERSION_MINOR="3"
+
+cat >>confdefs.h <<_ACEOF
+#define UNREAL_VERSION_MINOR $UNREAL_VERSION_MINOR
+_ACEOF
+
+
+# The version suffix such as a beta marker or release candidate
+# marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
+# string instead of an integer because it contains arbitrary data.
+UNREAL_VERSION_SUFFIX=".1"
+
+cat >>confdefs.h <<_ACEOF
+#define UNREAL_VERSION_SUFFIX "$UNREAL_VERSION_SUFFIX"
+_ACEOF
+
+
+# Extract the first word of "rm", so it can be a program name with args.
+set dummy rm; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_RM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $RM in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RM="$RM" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_RM="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+RM=$ac_cv_path_RM
+if test -n "$RM"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+$as_echo "$RM" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "cp", so it can be a program name with args.
+set dummy cp; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_CP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $CP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_CP="$CP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_CP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+CP=$ac_cv_path_CP
+if test -n "$CP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
+$as_echo "$CP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "touch", so it can be a program name with args.
+set dummy touch; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_TOUCH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $TOUCH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_TOUCH="$TOUCH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_TOUCH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+TOUCH=$ac_cv_path_TOUCH
+if test -n "$TOUCH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TOUCH" >&5
+$as_echo "$TOUCH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "openssl", so it can be a program name with args.
+set dummy openssl; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_OPENSSLPATH+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $OPENSSLPATH in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_OPENSSLPATH="$OPENSSLPATH" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_OPENSSLPATH="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+OPENSSLPATH=$ac_cv_path_OPENSSLPATH
+if test -n "$OPENSSLPATH"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSLPATH" >&5
+$as_echo "$OPENSSLPATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+if test x"$OPENSSLPATH" = "x"; then :
+
+echo ""
+echo "Apparently you do not have both the openssl binary and openssl development libraries installed."
+echo "The following packages are required:"
+echo "1) The library package is often called 'openssl-dev', 'openssl-devel' or 'libssl-dev'"
+echo "2) The binary package is usually called 'openssl'."
+echo "NOTE: you or your system administrator needs to install the library AND the binary package."
+echo "After doing so, simply re-run ./Config"
+exit 1
+
+fi
+
+# Extract the first word of "install", so it can be a program name with args.
+set dummy install; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_INSTALL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $INSTALL in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_INSTALL="$INSTALL" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_INSTALL="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+INSTALL=$ac_cv_path_INSTALL
+if test -n "$INSTALL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gmake", so it can be a program name with args.
+set dummy gmake; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MAKER+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MAKER"; then
+  ac_cv_prog_MAKER="$MAKER" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MAKER="gmake"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_MAKER" && ac_cv_prog_MAKER="make"
+fi
+fi
+MAKER=$ac_cv_prog_MAKER
+if test -n "$MAKER"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKER" >&5
+$as_echo "$MAKER" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "gmake", so it can be a program name with args.
+set dummy gmake; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GMAKE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GMAKE in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GMAKE="$GMAKE" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GMAKE="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GMAKE=$ac_cv_path_GMAKE
+if test -n "$GMAKE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMAKE" >&5
+$as_echo "$GMAKE" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+if $MAKER --version | grep -q "GNU Make"; then :
+  GNUMAKE="0"
+else
+  as_fn_error $? "It seems your system does not have gmake installed. Please install gmake." "$LINENO" 5
+fi
+
+# Extract the first word of "gunzip", so it can be a program name with args.
+set dummy gunzip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GUNZIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GUNZIP in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GUNZIP="$GUNZIP" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_GUNZIP="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GUNZIP=$ac_cv_path_GUNZIP
+if test -n "$GUNZIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GUNZIP" >&5
+$as_echo "$GUNZIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKGCONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKGCONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKGCONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKGCONFIG=$ac_cv_path_PKGCONFIG
+if test -n "$PKGCONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5
+$as_echo "$PKGCONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CC"; then
+  ac_ct_CC=$CC
+  # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="gcc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+else
+  CC="$ac_cv_prog_CC"
+fi
+
+if test -z "$CC"; then
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="${ac_tool_prefix}cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+fi
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+       ac_prog_rejected=yes
+       continue
+     fi
+    ac_cv_prog_CC="cc"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# != 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+  fi
+fi
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$CC"; then
+  if test -n "$ac_tool_prefix"; then
+  for ac_prog in cl.exe
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$CC" && break
+  done
+fi
+if test -z "$CC"; then
+  ac_ct_CC=$CC
+  for ac_prog in cl.exe
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_CC" && break
+done
+
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
+fi
+
+fi
+
+
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
+
+# Provide some information about the compiler.
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+# Try to create an executable without -o first, disregard a.out.
+# It will help us diagnose broken compilers, and finding out an intuition
+# of exeext.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
+do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
+	;;
+    [ab].out )
+	# We found the default executable, but exeext='' is most
+	# certainly right.
+	break;;
+    *.* )
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
+	break;;
+    * )
+	break;;
+  esac
+done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
+else
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+# work properly (i.e., refer to `conftest.exe'), while it won't with
+# `rm'.
+for ac_file in conftest.exe conftest conftest.*; do
+  test -f "$ac_file" || continue
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	  break;;
+    * ) break;;
+  esac
+done
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
+
+rm -f conftest.$ac_ext
+EXEEXT=$ac_cv_exeext
+ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.o conftest.obj
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+       break;;
+  esac
+done
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
+OBJEXT=$ac_cv_objext
+ac_objext=$OBJEXT
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+#ifndef __GNUC__
+       choke me
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_compiler_gnu=yes
+else
+  ac_compiler_gnu=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+ac_test_CFLAGS=${CFLAGS+set}
+ac_save_CFLAGS=$CFLAGS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS=$ac_save_CFLAGS
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
+
+fi
+
+
+if test "$ac_cv_prog_cc_c99" = "no"; then :
+  as_fn_error $? "No C99 compiler was found. Please install gcc or clang and other build tools. Eg, on Debian/Ubuntu you probably want to run the following as root: apt-get install build-essential " "$LINENO" 5
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -ldescrypt" >&5
+$as_echo_n "checking for crypt in -ldescrypt... " >&6; }
+if ${ac_cv_lib_descrypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldescrypt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_descrypt_crypt=yes
+else
+  ac_cv_lib_descrypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_descrypt_crypt" >&5
+$as_echo "$ac_cv_lib_descrypt_crypt" >&6; }
+if test "x$ac_cv_lib_descrypt_crypt" = xyes; then :
+
+$as_echo "#define HAVE_CRYPT /**/" >>confdefs.h
+
+		IRCDLIBS="$IRCDLIBS-ldescrypt "
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcrypt  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char crypt ();
+int
+main ()
+{
+return crypt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_crypt_crypt=yes
+else
+  ac_cv_lib_crypt_crypt=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
+$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
+if test "x$ac_cv_lib_crypt_crypt" = xyes; then :
+
+$as_echo "#define HAVE_CRYPT /**/" >>confdefs.h
+
+			IRCDLIBS="$IRCDLIBS-lcrypt "
+fi
+
+fi
+
+
+# We want to check for compiler flag support, but there is no way to make
+# clang's "argument unused" warning fatal.  So we invoke the compiler through a
+# wrapper script that greps for this message.
+saved_CC="$CC"
+saved_CXX="$CXX"
+saved_LD="$LD"
+flag_wrap="$srcdir/extras/wrap-compiler-for-flag-check"
+CC="$flag_wrap $CC"
+CXX="$flag_wrap $CXX"
+LD="$flag_wrap $LD"
+
+# We use the same hardening flags for C and C++.  We must check that each flag
+# is supported by both compilers.
+
+
+
+
+# Check whether --enable-hardening was given.
+if test "${enable_hardening+set}" = set; then :
+  enableval=$enable_hardening; hardening="$enableval"
+else
+  hardening="yes"
+fi
+
+
+HARDEN_CFLAGS=""
+HARDEN_LDFLAGS=""
+if test x"$hardening" != x"no"; then :
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-overflow" >&5
+$as_echo_n "checking whether C compiler accepts -fno-strict-overflow... " >&6; }
+if ${ax_cv_check_cflags__Werror___fno_strict_overflow+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -fno-strict-overflow"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___fno_strict_overflow=yes
+else
+  ax_cv_check_cflags__Werror___fno_strict_overflow=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___fno_strict_overflow" >&5
+$as_echo "$ax_cv_check_cflags__Werror___fno_strict_overflow" >&6; }
+if test x"$ax_cv_check_cflags__Werror___fno_strict_overflow" = xyes; then :
+  HARDEN_CFLAGS="$HARDEN_CFLAGS -fno-strict-overflow"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  # This one will likely succeed, even on platforms where it does nothing.
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -D_FORTIFY_SOURCE=2" >&5
+$as_echo_n "checking whether C compiler accepts -D_FORTIFY_SOURCE=2... " >&6; }
+if ${ax_cv_check_cflags__Werror___D_FORTIFY_SOURCE_2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -D_FORTIFY_SOURCE=2"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___D_FORTIFY_SOURCE_2=yes
+else
+  ax_cv_check_cflags__Werror___D_FORTIFY_SOURCE_2=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___D_FORTIFY_SOURCE_2" >&5
+$as_echo "$ax_cv_check_cflags__Werror___D_FORTIFY_SOURCE_2" >&6; }
+if test x"$ax_cv_check_cflags__Werror___D_FORTIFY_SOURCE_2" = xyes; then :
+  HARDEN_CFLAGS="$HARDEN_CFLAGS -D_FORTIFY_SOURCE=2"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-protector-all" >&5
+$as_echo_n "checking whether C compiler accepts -fstack-protector-all... " >&6; }
+if ${ax_cv_check_cflags__Werror___fstack_protector_all+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -fstack-protector-all"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___fstack_protector_all=yes
+else
+  ax_cv_check_cflags__Werror___fstack_protector_all=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___fstack_protector_all" >&5
+$as_echo "$ax_cv_check_cflags__Werror___fstack_protector_all" >&6; }
+if test x"$ax_cv_check_cflags__Werror___fstack_protector_all" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fstack-protector-all" >&5
+$as_echo_n "checking whether the linker accepts -fstack-protector-all... " >&6; }
+if ${ax_cv_check_ldflags__Werror___fstack_protector_all+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS -Werror  -fstack-protector-all"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags__Werror___fstack_protector_all=yes
+else
+  ax_cv_check_ldflags__Werror___fstack_protector_all=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___fstack_protector_all" >&5
+$as_echo "$ax_cv_check_ldflags__Werror___fstack_protector_all" >&6; }
+if test x"$ax_cv_check_ldflags__Werror___fstack_protector_all" = xyes; then :
+  HARDEN_CFLAGS="$HARDEN_CFLAGS -fstack-protector-all"
+      ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstack-protector" >&5
+$as_echo_n "checking whether C compiler accepts -Wstack-protector... " >&6; }
+if ${ax_cv_check_cflags__Werror__fstack_protector_all__Wstack_protector+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror -fstack-protector-all -Wstack-protector"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror__fstack_protector_all__Wstack_protector=yes
+else
+  ax_cv_check_cflags__Werror__fstack_protector_all__Wstack_protector=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fstack_protector_all__Wstack_protector" >&5
+$as_echo "$ax_cv_check_cflags__Werror__fstack_protector_all__Wstack_protector" >&6; }
+if test x"$ax_cv_check_cflags__Werror__fstack_protector_all__Wstack_protector" = xyes; then :
+  HARDEN_CFLAGS="$HARDEN_CFLAGS -Wstack-protector"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+      ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts --param ssp-buffer-size=1" >&5
+$as_echo_n "checking whether C compiler accepts --param ssp-buffer-size=1... " >&6; }
+if ${ax_cv_check_cflags__Werror__fstack_protector_all___param_ssp_buffer_size_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror -fstack-protector-all --param ssp-buffer-size=1"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror__fstack_protector_all___param_ssp_buffer_size_1=yes
+else
+  ax_cv_check_cflags__Werror__fstack_protector_all___param_ssp_buffer_size_1=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fstack_protector_all___param_ssp_buffer_size_1" >&5
+$as_echo "$ax_cv_check_cflags__Werror__fstack_protector_all___param_ssp_buffer_size_1" >&6; }
+if test x"$ax_cv_check_cflags__Werror__fstack_protector_all___param_ssp_buffer_size_1" = xyes; then :
+  HARDEN_CFLAGS="$HARDEN_CFLAGS --param ssp-buffer-size=1"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+  :
+fi
+
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  # At the link step, we might want -pie (GCC) or -Wl,-pie (Clang on OS X)
+  #
+  # The linker checks also compile code, so we need to include -fPIE as well.
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIE" >&5
+$as_echo_n "checking whether C compiler accepts -fPIE... " >&6; }
+if ${ax_cv_check_cflags__Werror___fPIE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -fPIE"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___fPIE=yes
+else
+  ax_cv_check_cflags__Werror___fPIE=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___fPIE" >&5
+$as_echo "$ax_cv_check_cflags__Werror___fPIE" >&6; }
+if test x"$ax_cv_check_cflags__Werror___fPIE" = xyes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIE -pie" >&5
+$as_echo_n "checking whether the linker accepts -fPIE -pie... " >&6; }
+if ${ax_cv_check_ldflags__Werror___fPIE__pie+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS -Werror  -fPIE -pie"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags__Werror___fPIE__pie=yes
+else
+  ax_cv_check_ldflags__Werror___fPIE__pie=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___fPIE__pie" >&5
+$as_echo "$ax_cv_check_ldflags__Werror___fPIE__pie" >&6; }
+if test x"$ax_cv_check_ldflags__Werror___fPIE__pie" = xyes; then :
+  HARDEN_BINCFLAGS="-fPIE"
+      HARDEN_BINLDFLAGS="-pie"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIE -Wl,-pie" >&5
+$as_echo_n "checking whether the linker accepts -fPIE -Wl,-pie... " >&6; }
+if ${ax_cv_check_ldflags__Werror___fPIE__Wl__pie+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS -Werror  -fPIE -Wl,-pie"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags__Werror___fPIE__Wl__pie=yes
+else
+  ax_cv_check_ldflags__Werror___fPIE__Wl__pie=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___fPIE__Wl__pie" >&5
+$as_echo "$ax_cv_check_ldflags__Werror___fPIE__Wl__pie" >&6; }
+if test x"$ax_cv_check_ldflags__Werror___fPIE__Wl__pie" = xyes; then :
+  HARDEN_BINCFLAGS="-fPIE"
+        HARDEN_BINLDFLAGS="-Wl,-pie"
+else
+  :
+fi
+
+fi
+
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,relro" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,relro... " >&6; }
+if ${ax_cv_check_ldflags__Werror___Wl__z_relro+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS -Werror  -Wl,-z,relro"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags__Werror___Wl__z_relro=yes
+else
+  ax_cv_check_ldflags__Werror___Wl__z_relro=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___Wl__z_relro" >&5
+$as_echo "$ax_cv_check_ldflags__Werror___Wl__z_relro" >&6; }
+if test x"$ax_cv_check_ldflags__Werror___Wl__z_relro" = xyes; then :
+  HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,relro"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,-z,now" >&5
+$as_echo_n "checking whether the linker accepts -Wl,-z,now... " >&6; }
+if ${ax_cv_check_ldflags__Werror___Wl__z_now+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS -Werror  -Wl,-z,now"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags__Werror___Wl__z_now=yes
+else
+  ax_cv_check_ldflags__Werror___Wl__z_now=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags__Werror___Wl__z_now" >&5
+$as_echo "$ax_cv_check_ldflags__Werror___Wl__z_now" >&6; }
+if test x"$ax_cv_check_ldflags__Werror___Wl__z_now" = xyes; then :
+  HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,now"
+else
+  :
+fi
+
+else
+  :
+fi
+
+fi
+
+
+
+
+
+# End of flag tests.
+CC="$saved_CC"
+CXX="$saved_CXX"
+LD="$saved_LD"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-strict-aliasing" >&5
+$as_echo_n "checking whether C compiler accepts -fno-strict-aliasing... " >&6; }
+if ${ax_cv_check_cflags__Werror___fno_strict_aliasing+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -fno-strict-aliasing"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___fno_strict_aliasing=yes
+else
+  ax_cv_check_cflags__Werror___fno_strict_aliasing=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___fno_strict_aliasing" >&5
+$as_echo "$ax_cv_check_cflags__Werror___fno_strict_aliasing" >&6; }
+if test x"$ax_cv_check_cflags__Werror___fno_strict_aliasing" = xyes; then :
+  CFLAGS="$CFLAGS -fno-strict-aliasing"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
+$as_echo_n "checking whether C compiler accepts -fno-common... " >&6; }
+if ${ax_cv_check_cflags__Werror___fno_common+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -fno-common"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___fno_common=yes
+else
+  ax_cv_check_cflags__Werror___fno_common=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___fno_common" >&5
+$as_echo "$ax_cv_check_cflags__Werror___fno_common" >&6; }
+if test x"$ax_cv_check_cflags__Werror___fno_common" = xyes; then :
+  CFLAGS="$CFLAGS -fno-common"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+CFLAGS="$CFLAGS -funsigned-char"
+
+
+CFLAGS="$CFLAGS -Wall"
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wextra" >&5
+$as_echo_n "checking whether C compiler accepts -Wextra... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wextra+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wextra"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wextra=yes
+else
+  ax_cv_check_cflags__Werror___Wextra=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wextra" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wextra" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wextra" = xyes; then :
+  CFLAGS="$CFLAGS -Wextra"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Waggregate-return" >&5
+$as_echo_n "checking whether C compiler accepts -Waggregate-return... " >&6; }
+if ${ax_cv_check_cflags__Werror___Waggregate_return+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Waggregate-return"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Waggregate_return=yes
+else
+  ax_cv_check_cflags__Werror___Waggregate_return=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Waggregate_return" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Waggregate_return" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Waggregate_return" = xyes; then :
+  CFLAGS="$CFLAGS -Waggregate-return"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
+$as_echo_n "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wduplicated_cond+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wduplicated-cond"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wduplicated_cond=yes
+else
+  ax_cv_check_cflags__Werror___Wduplicated_cond=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wduplicated_cond" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wduplicated_cond" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wduplicated_cond" = xyes; then :
+  CFLAGS="$CFLAGS -Wduplicated-cond"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-branches" >&5
+$as_echo_n "checking whether C compiler accepts -Wduplicated-branches... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wduplicated_branches+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wduplicated-branches"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wduplicated_branches=yes
+else
+  ax_cv_check_cflags__Werror___Wduplicated_branches=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wduplicated_branches" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wduplicated_branches" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wduplicated_branches" = xyes; then :
+  CFLAGS="$CFLAGS -Wduplicated-branches"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wpointer-sign" >&5
+$as_echo_n "checking whether C compiler accepts -Wpointer-sign... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wpointer_sign+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wpointer-sign"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wpointer_sign=yes
+else
+  ax_cv_check_cflags__Werror___Wpointer_sign=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wpointer_sign" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wpointer_sign" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wpointer_sign" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-pointer-sign"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Winvalid-source-encoding" >&5
+$as_echo_n "checking whether C compiler accepts -Winvalid-source-encoding... " >&6; }
+if ${ax_cv_check_cflags__Werror___Winvalid_source_encoding+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Winvalid-source-encoding"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Winvalid_source_encoding=yes
+else
+  ax_cv_check_cflags__Werror___Winvalid_source_encoding=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Winvalid_source_encoding" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Winvalid_source_encoding" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Winvalid_source_encoding" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-invalid-source-encoding"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-zero-length" >&5
+$as_echo_n "checking whether C compiler accepts -Wformat-zero-length... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wformat_zero_length+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wformat-zero-length"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wformat_zero_length=yes
+else
+  ax_cv_check_cflags__Werror___Wformat_zero_length=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wformat_zero_length" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wformat_zero_length" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wformat_zero_length" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-format-zero-length"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
+$as_echo_n "checking whether C compiler accepts -Wformat-truncation... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wformat_truncation+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wformat-truncation"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wformat_truncation=yes
+else
+  ax_cv_check_cflags__Werror___Wformat_truncation=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wformat_truncation" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wformat_truncation" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wformat_truncation" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-format-truncation"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wunused" >&5
+$as_echo_n "checking whether C compiler accepts -Wunused... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wunused+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wunused"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wunused=yes
+else
+  ax_cv_check_cflags__Werror___Wunused=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wunused" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wunused" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wunused" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-unused"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wunused-parameter" >&5
+$as_echo_n "checking whether C compiler accepts -Wunused-parameter... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wunused_parameter+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wunused-parameter"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wunused_parameter=yes
+else
+  ax_cv_check_cflags__Werror___Wunused_parameter=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wunused_parameter" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wunused_parameter" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wunused_parameter" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-unused-parameter"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wunused-but-set-parameter" >&5
+$as_echo_n "checking whether C compiler accepts -Wunused-but-set-parameter... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wunused_but_set_parameter+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wunused-but-set-parameter"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wunused_but_set_parameter=yes
+else
+  ax_cv_check_cflags__Werror___Wunused_but_set_parameter=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wunused_but_set_parameter" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wunused_but_set_parameter" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wunused_but_set_parameter" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-unused-but-set-parameter"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wchar-subscripts" >&5
+$as_echo_n "checking whether C compiler accepts -Wchar-subscripts... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wchar_subscripts+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wchar-subscripts"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wchar_subscripts=yes
+else
+  ax_cv_check_cflags__Werror___Wchar_subscripts=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wchar_subscripts" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wchar_subscripts" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wchar_subscripts" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-char-subscripts"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wsign-compare" >&5
+$as_echo_n "checking whether C compiler accepts -Wsign-compare... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wsign_compare+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wsign-compare"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wsign_compare=yes
+else
+  ax_cv_check_cflags__Werror___Wsign_compare=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wsign_compare" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wsign_compare" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wsign_compare" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-sign-compare"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wempty-body" >&5
+$as_echo_n "checking whether C compiler accepts -Wempty-body... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wempty_body+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wempty-body"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wempty_body=yes
+else
+  ax_cv_check_cflags__Werror___Wempty_body=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wempty_body" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wempty_body" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wempty_body" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-empty-body"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Waddress" >&5
+$as_echo_n "checking whether C compiler accepts -Waddress... " >&6; }
+if ${ax_cv_check_cflags__Werror___Waddress+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Waddress"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Waddress=yes
+else
+  ax_cv_check_cflags__Werror___Waddress=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Waddress" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Waddress" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Waddress" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-address"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wcast-function-type" >&5
+$as_echo_n "checking whether C compiler accepts -Wcast-function-type... " >&6; }
+if ${ax_cv_check_cflags__Werror___Wcast_function_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS -Werror  -Wcast-function-type"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags__Werror___Wcast_function_type=yes
+else
+  ax_cv_check_cflags__Werror___Wcast_function_type=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror___Wcast_function_type" >&5
+$as_echo "$ax_cv_check_cflags__Werror___Wcast_function_type" >&6; }
+if test x"$ax_cv_check_cflags__Werror___Wcast_function_type" = xyes; then :
+  CFLAGS="$CFLAGS -Wno-cast-function-type"
+else
+  :
+fi
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system has IPv6 support" >&5
+$as_echo_n "checking if your system has IPv6 support... " >&6; }
+if ${ac_cv_ip6+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test "$cross_compiling" = yes; then :
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run test program while cross compiling
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+int main() {
+int s = socket(AF_INET6, SOCK_STREAM, 0);
+exit(0); /* We only check if the code compiles, that's enough. We can deal with missing runtime IPv6 */
+}
+
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_ip6=yes
+else
+  ac_cv_ip6=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ip6" >&5
+$as_echo "$ac_cv_ip6" >&6; }
+if test "$ac_cv_ip6" = "no"; then
+	as_fn_error $? "Your system does not support IPv6" "$LINENO" 5
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CPP=$CPP
+
+fi
+  CPP=$ac_cv_prog_CPP
+else
+  ac_cv_prog_CPP=$CPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <string.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
+
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int
+main ()
+{
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+fi
+
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/syslog.h" "ac_cv_header_sys_syslog_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_syslog_h" = xyes; then :
+
+$as_echo "#define SYSSYSLOGH /**/" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "sys/rusage.h" "ac_cv_header_sys_rusage_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_rusage_h" = xyes; then :
+
+$as_echo "#define RUSAGEH /**/" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_header_mongrel "$LINENO" "glob.h" "ac_cv_header_glob_h" "$ac_includes_default"
+if test "x$ac_cv_header_glob_h" = xyes; then :
+
+$as_echo "#define GLOBH /**/" >>confdefs.h
+
+fi
+
+
+for ac_header in stdint.h inttypes.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+for ac_func in strlcpy
+do :
+  ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
+if test "x$ac_cv_func_strlcpy" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRLCPY 1
+_ACEOF
+
+$as_echo "#define HAVE_STRLCPY /**/" >>confdefs.h
+
+fi
+done
+
+for ac_func in strlcat
+do :
+  ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
+if test "x$ac_cv_func_strlcat" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRLCAT 1
+_ACEOF
+
+$as_echo "#define HAVE_STRLCAT /**/" >>confdefs.h
+
+fi
+done
+
+for ac_func in strlncat
+do :
+  ac_fn_c_check_func "$LINENO" "strlncat" "ac_cv_func_strlncat"
+if test "x$ac_cv_func_strlncat" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRLNCAT 1
+_ACEOF
+
+$as_echo "#define HAVE_STRLNCAT /**/" >>confdefs.h
+
+fi
+done
+
+
+for ac_func in getrusage
+do :
+  ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage"
+if test "x$ac_cv_func_getrusage" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETRUSAGE 1
+_ACEOF
+
+$as_echo "#define GETRUSAGE_2 /**/" >>confdefs.h
+
+else
+  for ac_func in times
+do :
+  ac_fn_c_check_func "$LINENO" "times" "ac_cv_func_times"
+if test "x$ac_cv_func_times" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_TIMES 1
+_ACEOF
+
+$as_echo "#define TIMES_2 /**/" >>confdefs.h
+
+fi
+done
+
+fi
+done
+
+for ac_func in setproctitle
+do :
+  ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
+if test "x$ac_cv_func_setproctitle" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETPROCTITLE 1
+_ACEOF
+
+$as_echo "#define HAVE_SETPROCTITLE /**/" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setproctitle in -lutil" >&5
+$as_echo_n "checking for setproctitle in -lutil... " >&6; }
+if ${ac_cv_lib_util_setproctitle+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lutil  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char setproctitle ();
+int
+main ()
+{
+return setproctitle ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_util_setproctitle=yes
+else
+  ac_cv_lib_util_setproctitle=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_setproctitle" >&5
+$as_echo "$ac_cv_lib_util_setproctitle" >&6; }
+if test "x$ac_cv_lib_util_setproctitle" = xyes; then :
+
+$as_echo "#define HAVE_SETPROCTITLE /**/" >>confdefs.h
+
+		IRCDLIBS="$IRCDLIBS-lutil"
+else
+
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/exec.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "#define.*PS_STRINGS.*" >/dev/null 2>&1; then :
+
+$as_echo "#define HAVE_PSSTRINGS /**/" >>confdefs.h
+
+else
+  for ac_func in pstat
+do :
+  ac_fn_c_check_func "$LINENO" "pstat" "ac_cv_func_pstat"
+if test "x$ac_cv_func_pstat" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PSTAT 1
+_ACEOF
+
+$as_echo "#define HAVE_PSTAT /**/" >>confdefs.h
+
+fi
+done
+
+fi
+rm -f conftest*
+
+
+fi
+
+
+
+fi
+done
+
+
+for ac_func in explicit_bzero
+do :
+  ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
+if test "x$ac_cv_func_explicit_bzero" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_EXPLICIT_BZERO 1
+_ACEOF
+
+$as_echo "#define HAVE_EXPLICIT_BZERO /**/" >>confdefs.h
+
+fi
+done
+
+for ac_func in syslog
+do :
+  ac_fn_c_check_func "$LINENO" "syslog" "ac_cv_func_syslog"
+if test "x$ac_cv_func_syslog" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSLOG 1
+_ACEOF
+
+$as_echo "#define HAVE_SYSLOG /**/" >>confdefs.h
+
+fi
+done
+
+
+
+
+
+# Check whether --with-nick-history was given.
+if test "${with_nick_history+set}" = set; then :
+  withval=$with_nick_history;
+cat >>confdefs.h <<_ACEOF
+#define NICKNAMEHISTORYLENGTH $withval
+_ACEOF
+
+else
+
+$as_echo "#define NICKNAMEHISTORYLENGTH 2000" >>confdefs.h
+
+fi
+
+
+# Check whether --with-permissions was given.
+if test "${with_permissions+set}" = set; then :
+  withval=$with_permissions;
+cat >>confdefs.h <<_ACEOF
+#define DEFAULT_PERMISSIONS 0$withval
+_ACEOF
+
+else
+
+$as_echo "#define DEFAULT_PERMISSIONS 0600" >>confdefs.h
+
+fi
+
+
+
+# Check whether --with-bindir was given.
+if test "${with_bindir+set}" = set; then :
+  withval=$with_bindir;
+cat >>confdefs.h <<_ACEOF
+#define BINDIR "$withval"
+_ACEOF
+
+		BINDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define BINDIR "$HOME/unrealircd/bin"
+_ACEOF
+
+		BINDIR="$HOME/unrealircd/bin"
+fi
+
+
+
+# Check whether --with-scriptdir was given.
+if test "${with_scriptdir+set}" = set; then :
+  withval=$with_scriptdir;
+cat >>confdefs.h <<_ACEOF
+#define SCRIPTDIR "$withval"
+_ACEOF
+
+		SCRIPTDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define SCRIPTDIR "$HOME/unrealircd"
+_ACEOF
+
+		SCRIPTDIR="$HOME/unrealircd"
+fi
+
+
+
+# Check whether --with-confdir was given.
+if test "${with_confdir+set}" = set; then :
+  withval=$with_confdir;
+cat >>confdefs.h <<_ACEOF
+#define CONFDIR "$withval"
+_ACEOF
+
+		CONFDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define CONFDIR "$HOME/unrealircd/conf"
+_ACEOF
+
+		CONFDIR="$HOME/unrealircd/conf"
+fi
+
+
+
+# Check whether --with-builddir was given.
+if test "${with_builddir+set}" = set; then :
+  withval=$with_builddir;
+cat >>confdefs.h <<_ACEOF
+#define BUILDDIR "$withval"
+_ACEOF
+
+		BUILDDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define BUILDDIR "$BUILDDIR_NOW"
+_ACEOF
+
+		BUILDDIR="$BUILDDIR_NOW"
+fi
+
+
+
+# Check whether --with-modulesdir was given.
+if test "${with_modulesdir+set}" = set; then :
+  withval=$with_modulesdir;
+cat >>confdefs.h <<_ACEOF
+#define MODULESDIR "$withval"
+_ACEOF
+
+		MODULESDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define MODULESDIR "$HOME/unrealircd/modules"
+_ACEOF
+
+		MODULESDIR="$HOME/unrealircd/modules"
+fi
+
+
+
+# Check whether --with-logdir was given.
+if test "${with_logdir+set}" = set; then :
+  withval=$with_logdir;
+cat >>confdefs.h <<_ACEOF
+#define LOGDIR "$withval"
+_ACEOF
+
+		LOGDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define LOGDIR "$HOME/unrealircd/logs"
+_ACEOF
+
+		LOGDIR="$HOME/unrealircd/logs"
+fi
+
+
+
+# Check whether --with-cachedir was given.
+if test "${with_cachedir+set}" = set; then :
+  withval=$with_cachedir;
+cat >>confdefs.h <<_ACEOF
+#define CACHEDIR "$withval"
+_ACEOF
+
+		CACHEDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define CACHEDIR "$HOME/unrealircd/cache"
+_ACEOF
+
+		CACHEDIR="$HOME/unrealircd/cache"
+fi
+
+
+
+# Check whether --with-tmpdir was given.
+if test "${with_tmpdir+set}" = set; then :
+  withval=$with_tmpdir;
+cat >>confdefs.h <<_ACEOF
+#define TMPDIR "$withval"
+_ACEOF
+
+		TMPDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define TMPDIR "$HOME/unrealircd/tmp"
+_ACEOF
+
+		TMPDIR="$HOME/unrealircd/tmp"
+fi
+
+
+
+# Check whether --with-datadir was given.
+if test "${with_datadir+set}" = set; then :
+  withval=$with_datadir;
+cat >>confdefs.h <<_ACEOF
+#define PERMDATADIR "$withval"
+_ACEOF
+
+		PERMDATADIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define DATADIR "$HOME/unrealircd/data"
+_ACEOF
+
+		PERMDATADIR="$HOME/unrealircd/data"
+fi
+
+
+
+# Check whether --with-docdir was given.
+if test "${with_docdir+set}" = set; then :
+  withval=$with_docdir;
+cat >>confdefs.h <<_ACEOF
+#define DOCDIR "$withval"
+_ACEOF
+
+		DOCDIR="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define DOCDIR "$HOME/unrealircd/doc"
+_ACEOF
+
+		DOCDIR="$HOME/unrealircd/doc"
+fi
+
+
+
+# Check whether --with-pidfile was given.
+if test "${with_pidfile+set}" = set; then :
+  withval=$with_pidfile;
+cat >>confdefs.h <<_ACEOF
+#define PIDFILE "$withval"
+_ACEOF
+
+		PIDFILE="$withval"
+else
+
+cat >>confdefs.h <<_ACEOF
+#define PIDFILE "$HOME/unrealircd/data/unrealircd.pid"
+_ACEOF
+
+		PIDFILE="$HOME/unrealircd/data/unrealircd.pid"
+fi
+
+
+
+# Check whether --with-privatelibdir was given.
+if test "${with_privatelibdir+set}" = set; then :
+  withval=$with_privatelibdir;
+else
+  with_privatelibdir="yes"
+fi
+
+if test "x$with_privatelibdir" = "xno"; then :
+  PRIVATELIBDIR=
+elif test "x$with_privatelibdir" = "xyes"; then :
+  PRIVATELIBDIR="$HOME/unrealircd/lib"
+else
+  PRIVATELIBDIR="$with_privatelibdir"
+fi
+if test "x$PRIVATELIBDIR" = "x"; then :
+  LDFLAGS_PRIVATELIBS=""
+else
+
+cat >>confdefs.h <<_ACEOF
+#define PRIVATELIBDIR "$PRIVATELIBDIR"
+_ACEOF
+
+		LDFLAGS_PRIVATELIBS="-Wl,-rpath,$PRIVATELIBDIR"
+		LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS"
+		export LDFLAGS
+fi
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# Check whether --with-maxconnections was given.
+if test "${with_maxconnections+set}" = set; then :
+  withval=$with_maxconnections; ac_fd=$withval
+else
+  ac_fd=0
+fi
+
+
+cat >>confdefs.h <<_ACEOF
+#define MAXCONNECTIONS_REQUEST $ac_fd
+_ACEOF
+
+
+# Check whether --enable-prefixaq was given.
+if test "${enable_prefixaq+set}" = set; then :
+  enableval=$enable_prefixaq;
+else
+  enable_prefixaq=yes
+fi
+
+if test $enable_prefixaq = "yes"; then :
+
+$as_echo "#define PREFIX_AQ /**/" >>confdefs.h
+
+fi
+
+
+# Check whether --with-showlistmodes was given.
+if test "${with_showlistmodes+set}" = set; then :
+  withval=$with_showlistmodes; if test $withval = "yes"; then :
+
+$as_echo "#define LIST_SHOW_MODES /**/" >>confdefs.h
+
+fi
+fi
+
+
+# Check whether --with-no-operoverride was given.
+if test "${with_no_operoverride+set}" = set; then :
+  withval=$with_no_operoverride; if test $withval = "yes"; then :
+
+$as_echo "#define NO_OPEROVERRIDE /**/" >>confdefs.h
+
+fi
+fi
+
+
+# Check whether --with-operoverride-verify was given.
+if test "${with_operoverride_verify+set}" = set; then :
+  withval=$with_operoverride_verify; if test $withval = "yes"; then :
+
+$as_echo "#define OPEROVERRIDE_VERIFY /**/" >>confdefs.h
+
+fi
+fi
+
+
+# Check whether --with-system-pcre2 was given.
+if test "${with_system_pcre2+set}" = set; then :
+  withval=$with_system_pcre2;
+else
+  with_system_pcre2=yes
+fi
+
+
+# Check whether --with-system-argon2 was given.
+if test "${with_system_argon2+set}" = set; then :
+  withval=$with_system_argon2;
+else
+  with_system_argon2=yes
+fi
+
+
+# Check whether --with-system-cares was given.
+if test "${with_system_cares+set}" = set; then :
+  withval=$with_system_cares;
+else
+  with_system_cares=yes
+fi
+
+
+# Check whether --enable-ssl was given.
+if test "${enable_ssl+set}" = set; then :
+  enableval=$enable_ssl;
+else
+  enable_ssl=no
+fi
+
+if test $enable_ssl != "no"; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL" >&5
+$as_echo_n "checking for OpenSSL... " >&6; }
+	for dir in $enable_ssl /usr/local/opt/openssl /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/sfw /usr/local /usr; do
+		ssldir="$dir"
+		if test -f "$dir/include/openssl/ssl.h"; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ssldir/include/openssl" >&5
+$as_echo "found in $ssldir/include/openssl" >&6; }
+			found_ssl="yes";
+			if test ! "$ssldir" = "/usr" ; then
+				CFLAGS="$CFLAGS -I$ssldir/include";
+			fi
+			break
+		fi
+		if test -f "$dir/include/ssl.h"; then
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found in $ssldir/include" >&5
+$as_echo "found in $ssldir/include" >&6; }
+			found_ssl="yes";
+			if test ! "$ssldir" = "/usr" ; then
+				CFLAGS="$CFLAGS -I$ssldir/include";
+			fi
+			break
+		fi
+	done
+	if test x_$found_ssl != x_yes; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+		echo ""
+		echo "Apparently you do not have both the openssl binary and openssl development libraries installed."
+		echo "The following packages are required:"
+		echo "1) The library package is often called 'openssl-dev', 'openssl-devel' or 'libssl-dev'"
+		echo "2) The binary package is usually called 'openssl'."
+		echo "NOTE: you or your system administrator needs to install the library AND the binary package."
+		echo "After doing so, simply re-run ./Config"
+		exit 1
+	else
+		CRYPTOLIB="-lssl -lcrypto";
+		if test ! "$ssldir" = "/usr" ; then
+			LDFLAGS="$LDFLAGS -L$ssldir/lib";
+						if test -f "$ssldir/bin/openssl"; then
+			    OPENSSLPATH="$ssldir/bin/openssl";
+			fi
+		fi
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl" >&5
+$as_echo_n "checking OpenSSL linking with -ldl... " >&6; }
+		SAVE_LIBS="$LIBS"
+		LIBS="$LIBS $CRYPTOLIB -ldl"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <openssl/err.h>
+int
+main ()
+{
+ERR_clear_error();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+			CRYPTOLIB="$CRYPTOLIB -ldl"
+
+else
+
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+						{ $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl and -lpthread" >&5
+$as_echo_n "checking OpenSSL linking with -ldl and -lpthread... " >&6; }
+			LIBS="$SAVE_LIBS $CRYPTOLIB -ldl -lpthread"
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <openssl/err.h>
+int
+main ()
+{
+ERR_clear_error();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+				CRYPTOLIB="$CRYPTOLIB -ldl -lpthread"
+
+else
+
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		LIBS="$SAVE_LIBS"
+	fi
+
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set1_curves_list in SSL library" >&5
+$as_echo_n "checking for SSL_CTX_set1_curves_list in SSL library... " >&6; }
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+SAVE_LIBS="$LIBS"
+LIBS="$LIBS $CRYPTOLIB"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <openssl/ssl.h>
+int
+main ()
+{
+SSL_CTX *ctx = NULL; SSL_CTX_set1_curves_list(ctx, "test");
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  has_function=1
+else
+  has_function=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="$SAVE_LIBS"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test $has_function = 1; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAS_SSL_CTX_SET1_CURVES_LIST /**/" >>confdefs.h
+
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SSL_CTX_set_min_proto_version in SSL library" >&5
+$as_echo_n "checking for SSL_CTX_set_min_proto_version in SSL library... " >&6; }
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+SAVE_LIBS="$LIBS"
+LIBS="$LIBS $CRYPTOLIB"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <openssl/ssl.h>
+int
+main ()
+{
+SSL_CTX *ctx = NULL; SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  has_function=1
+else
+  has_function=0
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS="$SAVE_LIBS"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+if test $has_function = 1; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAS_SSL_CTX_SET_MIN_PROTO_VERSION /**/" >>confdefs.h
+
+else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+# Check whether --enable-dynamic-linking was given.
+if test "${enable_dynamic_linking+set}" = set; then :
+  enableval=$enable_dynamic_linking; enable_dynamic_linking=$enableval
+else
+  enable_dynamic_linking="yes"
+fi
+
+if test $enable_dynamic_linking = "yes"; then :
+
+ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ldl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char dlopen ();
+int
+main ()
+{
+return dlopen ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_dl_dlopen=yes
+else
+  ac_cv_lib_dl_dlopen=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
+  IRCDLIBS="$IRCDLIBS -ldl"
+else
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dynamic linking is not enabled because dlopen was not found" >&5
+$as_echo "$as_me: WARNING: Dynamic linking is not enabled because dlopen was not found" >&2;}
+$as_echo "#define STATIC_LINKING 1" >>confdefs.h
+
+
+fi
+
+fi
+
+
+hold_cflags=$CFLAGS
+DYNAMIC_LDFLAGS=""
+CFLAGS="$CFLAGS -Wl,-export-dynamic"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we need the -export-dynamic flag" >&5
+$as_echo_n "checking if we need the -export-dynamic flag... " >&6; }
+if ${ac_cv_export_dynamic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int i;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_export_dynamic=yes
+else
+  ac_cv_export_dynamic=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_export_dynamic" >&5
+$as_echo "$ac_cv_export_dynamic" >&6; }
+CFLAGS=$hold_cflags
+if test "$ac_cv_export_dynamic" = "yes"; then
+	DYNAMIC_LDFLAGS="-Wl,-export-dynamic"
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compiler option to produce PIC" >&5
+$as_echo_n "checking for compiler option to produce PIC... " >&6; }
+if ${ac_cv_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test "$ac_cv_c_compiler_gnu" = "yes"; then
+	ac_cv_pic="-fPIC -DPIC -shared"
+	case `uname -s` in
+		Darwin*)
+		ac_cv_pic="-std=gnu89 -bundle -flat_namespace -undefined suppress"
+		;;
+		HP-UX*)
+		ac_cv_pic="-fPIC"
+		;;
+	esac
+else
+case `uname -s` in
+	SunOS*)
+	ac_cv_pic="-KPIC -DPIC -G"
+	;;
+esac
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pic" >&5
+$as_echo "$ac_cv_pic" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if your system prepends an underscore on symbols" >&5
+$as_echo_n "checking if your system prepends an underscore on symbols... " >&6; }
+if ${ac_cv_underscore+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+cat >uscore.c << __EOF__
+int main() {
+	return 0;
+}
+__EOF__
+$CC -o uscore $CFLAGS uscore.c 1>&5
+if test -z "`strings -a uscore |grep '^_main$'`"; then
+ac_cv_underscore=no
+else
+ac_cv_underscore=yes
+fi
+rm -f uscore uscore.c
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_underscore" >&5
+$as_echo "$ac_cv_underscore" >&6; }
+if test "$ac_cv_underscore" = "yes"; then
+
+$as_echo "#define UNDERSCORE /**/" >>confdefs.h
+
+fi
+
+MODULEFLAGS="$ac_cv_pic $DYNAMIC_LDFLAGS"
+
+else
+
+$as_echo "#define STATIC_LINKING /**/" >>confdefs.h
+
+fi
+
+# Check whether --enable-werror was given.
+if test "${enable_werror+set}" = set; then :
+  enableval=$enable_werror; ac_cv_werror="$enableval"
+else
+  ac_cv_werror="no"
+fi
+
+
+# Check whether --enable-asan was given.
+if test "${enable_asan+set}" = set; then :
+  enableval=$enable_asan; ac_cv_asan="$enableval"
+else
+  ac_cv_asan="no"
+fi
+
+
+for ac_func in poll
+do :
+  ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
+if test "x$ac_cv_func_poll" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_POLL 1
+_ACEOF
+
+$as_echo "#define HAVE_POLL /**/" >>confdefs.h
+
+fi
+done
+
+for ac_func in epoll_create epoll_ctl epoll_wait
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+$as_echo "#define HAVE_EPOLL /**/" >>confdefs.h
+
+fi
+done
+
+for ac_func in kqueue kevent
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+$as_echo "#define HAVE_KQUEUE /**/" >>confdefs.h
+
+fi
+done
+
+
+export PATH_SEPARATOR
+
+has_system_pcre2="no"
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.9.0
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+if test "x$with_system_pcre2" = "xyes"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PCRE2" >&5
+$as_echo_n "checking for PCRE2... " >&6; }
+
+if test -n "$PCRE2_CFLAGS"; then
+    pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.00\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.00") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PCRE2_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-8 >= 10.00" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$PCRE2_LIBS"; then
+    pkg_cv_PCRE2_LIBS="$PCRE2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.00\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.00") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8 >= 10.00" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        PCRE2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre2-8 >= 10.00" 2>&1`
+        else
+	        PCRE2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre2-8 >= 10.00" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$PCRE2_PKG_ERRORS" >&5
+
+	has_system_pcre2=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	has_system_pcre2=no
+else
+	PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS
+	PCRE2_LIBS=$pkg_cv_PCRE2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	has_system_pcre2=yes
+if test "x$PRIVATELIBDIR" != "x"; then :
+  rm -f "$PRIVATELIBDIR/"libpcre2*
+fi
+fi
+fi
+
+if test "$has_system_pcre2" = "no"; then :
+
+pcre2_version="10.33"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: extracting PCRE2 regex library" >&5
+$as_echo "extracting PCRE2 regex library" >&6; }
+cur_dir=`pwd`
+cd extras
+rm -rf pcre2-$pcre2_version pcre2
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz pcre2.tar.gz
+else
+	cp pcre2.tar.gz pcre2.tar.gz.bak
+	gunzip -f pcre2.tar.gz
+	cp pcre2.tar.gz.bak pcre2.tar.gz
+	tar xf pcre2.tar
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring PCRE2 regex library" >&5
+$as_echo "configuring PCRE2 regex library" >&6; }
+cd pcre2-$pcre2_version
+./configure --enable-jit --enable-shared --disable-unicode --prefix=$cur_dir/extras/pcre2 --libdir=$PRIVATELIBDIR || exit 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling PCRE2 regex library" >&5
+$as_echo "compiling PCRE2 regex library" >&6; }
+$ac_cv_prog_MAKER || exit 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: installing PCRE2 regex library" >&5
+$as_echo "installing PCRE2 regex library" >&6; }
+$ac_cv_prog_MAKER install || exit 1
+PCRE2_CFLAGS="-I$cur_dir/extras/pcre2/include"
+
+PCRE2_LIBS=
+if test -n "$ac_cv_path_PKGCONFIG"; then :
+  PCRE2_LIBS="`$ac_cv_path_PKGCONFIG --libs libpcre2-8.pc`"
+fi
+if test -z "$PCRE2_LIBS"; then :
+  PCRE2_LIBS="$PRIVATELIBDIR/libpcre2-8.so"
+fi
+
+cd $cur_dir
+
+fi
+
+has_system_argon2="no"
+if test "x$with_system_argon2" = "xyes"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ARGON2" >&5
+$as_echo_n "checking for ARGON2... " >&6; }
+
+if test -n "$ARGON2_CFLAGS"; then
+    pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 0~20161029\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libargon2 >= 0~20161029") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2 >= 0~20161029" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$ARGON2_LIBS"; then
+    pkg_cv_ARGON2_LIBS="$ARGON2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2 >= 0~20161029\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libargon2 >= 0~20161029") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2 >= 0~20161029" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
+        else
+	        ARGON2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libargon2 >= 0~20161029" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$ARGON2_PKG_ERRORS" >&5
+
+	has_system_argon2=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	has_system_argon2=no
+else
+	ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS
+	ARGON2_LIBS=$pkg_cv_ARGON2_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	has_system_argon2=yes
+if test "x$PRIVATELIBDIR" != "x"; then :
+  rm -f "$PRIVATELIBDIR/"libargon2*
+fi
+fi
+fi
+
+if test "$has_system_argon2" = "no"; then :
+
+argon2_version="20181209"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: extracting Argon2 library" >&5
+$as_echo "extracting Argon2 library" >&6; }
+cur_dir=`pwd`
+cd extras
+rm -rf argon2-$argon2_version argon2
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz argon2-$argon2_version.tar.gz
+else
+	cp argon2-$argon2_version.tar.gz argon2-$argon2_version.tar.gz.bak
+	gunzip -f argon2-$argon2_version.tar.gz
+	cp argon2-$argon2_version.tar.gz.bak argon2-$argon2_version.tar.gz
+	tar xf argon2-$argon2_version.tar
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling Argon2 library" >&5
+$as_echo "compiling Argon2 library" >&6; }
+cd argon2-$argon2_version
+$ac_cv_prog_MAKER || exit 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: installing Argon2 library" >&5
+$as_echo "installing Argon2 library" >&6; }
+$ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 || exit 1
+# We need to manually copy the libs to PRIVATELIBDIR because
+# there is no way to tell make install in libargon2 to do so.
+cp -av $cur_dir/extras/argon2/lib/* $PRIVATELIBDIR/
+ARGON2_CFLAGS="-I$cur_dir/extras/argon2/include"
+
+ARGON2_LIBS="-L$PRIVATELIBDIR -largon2"
+
+cd $cur_dir
+
+fi
+
+has_system_cares="no"
+if test "x$with_system_cares" = "xyes"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CARES" >&5
+$as_echo_n "checking for CARES... " >&6; }
+
+if test -n "$CARES_CFLAGS"; then
+    pkg_cv_CARES_CFLAGS="$CARES_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CARES_CFLAGS=`$PKG_CONFIG --cflags "libcares >= 1.6.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$CARES_LIBS"; then
+    pkg_cv_CARES_LIBS="$CARES_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcares >= 1.6.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libcares >= 1.6.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_CARES_LIBS=`$PKG_CONFIG --libs "libcares >= 1.6.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        CARES_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
+        else
+	        CARES_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcares >= 1.6.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$CARES_PKG_ERRORS" >&5
+
+	has_system_cares=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	has_system_cares=no
+else
+	CARES_CFLAGS=$pkg_cv_CARES_CFLAGS
+	CARES_LIBS=$pkg_cv_CARES_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	has_system_cares=yes
+if test "x$PRIVATELIBDIR" != "x"; then :
+  rm -f "$PRIVATELIBDIR/"libcares*
+fi
+fi
+fi
+
+if test "$has_system_cares" = "no"; then :
+
+cares_version="1.15.0"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: extracting c-ares resolver library" >&5
+$as_echo "extracting c-ares resolver library" >&6; }
+cur_dir=`pwd`
+cd extras
+rm -rf c-ares-$cares_version c-ares
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz c-ares.tar.gz
+else
+	cp c-ares.tar.gz c-ares.tar.gz.bak
+	gunzip -f c-ares.tar.gz
+	cp c-ares.tar.gz.bak c-ares.tar.gz
+	tar xf c-ares.tar
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: configuring c-ares library" >&5
+$as_echo "configuring c-ares library" >&6; }
+cd c-ares-$cares_version
+save_cflags="$CFLAGS"
+CFLAGS="$orig_cflags"
+export CFLAGS
+./configure --prefix=$cur_dir/extras/c-ares --libdir=$PRIVATELIBDIR --enable-shared || exit 1
+CFLAGS="$save_cflags"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling c-ares resolver library" >&5
+$as_echo "compiling c-ares resolver library" >&6; }
+$ac_cv_prog_MAKER || exit 1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: installing c-ares resolver library" >&5
+$as_echo "installing c-ares resolver library" >&6; }
+$ac_cv_prog_MAKER install || exit 1
+CARES_CFLAGS="-I$cur_dir/extras/c-ares/include"
+
+CARES_LIBS="-L$PRIVATELIBDIR"
+
+cd ../..
+CARESLIBSALT="$PRIVATELIBDIR/libcares.so"
+cd -
+case `uname -s` in
+	*FreeBSD*)
+		CARESLIBSALT="$CARESLIBSALT"
+		;;
+	*Linux*)
+		CARESLIBSALT="$CARESLIBSALT -lrt"
+		;;
+	*SunOS*)
+		CARESLIBSALT="$CARESLIBSALT -lrt"
+		;;
+esac
+
+if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
+	CARES_LIBS="$CARES_LIBS $CARESLIBSALT"
+else
+	CARES_LIBSPRE="$CARES_LIBS"
+					CARES_LIBS="$CARES_LIBS `$ac_cv_path_PKGCONFIG --libs libcares.pc | sed -e 's,-L\([^ ]\+lib\) -lcares,\1/libcares.so,'`"
+	if test "$CARES_LIBS" = "$CARES_LIBSPRE " ; then
+		CARES_LIBS="$CARES_LIBS $CARESLIBSALT"
+	fi
+fi
+
+cd $cur_dir
+
+fi
+
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
+test "x$ac_build_alias" = x &&
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+test "x$ac_build_alias" = x &&
+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
+case $ac_cv_build in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+esac
+build=$ac_cv_build
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_build
+shift
+build_cpu=$1
+build_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+build_os=$*
+IFS=$ac_save_IFS
+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
+  ac_cv_host=$ac_cv_build
+else
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
+case $ac_cv_host in
+*-*-*) ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+esac
+host=$ac_cv_host
+ac_save_IFS=$IFS; IFS='-'
+set x $ac_cv_host
+shift
+host_cpu=$1
+host_vendor=$2
+shift; shift
+# Remember, the first character of IFS is used to create $*,
+# except with old shells:
+host_os=$*
+IFS=$ac_save_IFS
+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ax_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_join ();
+int
+main ()
+{
+return pthread_join ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+$as_echo "$ax_pthread_ok" >&6; }
+        if test x"$ax_pthread_ok" = xno; then
+                PTHREAD_LIBS=""
+                PTHREAD_CFLAGS=""
+        fi
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try.  Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important.  Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+#       other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+#      doesn't hurt to check since this sometimes defines pthreads too;
+#      also defines -D_REENTRANT)
+#      ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case ${host_os} in
+        solaris*)
+
+        # On Solaris (at least, for some versions), libc contains stubbed
+        # (non-functional) versions of the pthreads routines, so link-based
+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+        # a function called by this macro, so we could check for that, but
+        # who knows whether they'll stub that too in a future libc.)  So,
+        # we'll just look for -pthreads and -lpthread first:
+
+        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
+        ;;
+
+        darwin*)
+        ax_pthread_flags="-pthread $ax_pthread_flags"
+        ;;
+esac
+
+# Clang doesn't consider unrecognized options an error unless we specify
+# -Werror. We throw in some extra Clang-specific options to ensure that
+# this doesn't happen for GCC, which also accepts -Werror.
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler needs -Werror to reject unknown flags" >&5
+$as_echo_n "checking if compiler needs -Werror to reject unknown flags... " >&6; }
+save_CFLAGS="$CFLAGS"
+ax_pthread_extra_flags="-Werror"
+CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int foo(void);
+int
+main ()
+{
+foo()
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  ax_pthread_extra_flags=
+                   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$save_CFLAGS"
+
+if test x"$ax_pthread_ok" = xno; then
+for flag in $ax_pthread_flags; do
+
+        case $flag in
+                none)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
+                ;;
+
+                -*)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5
+$as_echo_n "checking whether pthreads work with $flag... " >&6; }
+                PTHREAD_CFLAGS="$flag"
+                ;;
+
+                pthread-config)
+                # Extract the first word of "pthread-config", so it can be a program name with args.
+set dummy pthread-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ax_pthread_config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ax_pthread_config"; then
+  ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ax_pthread_config="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no"
+fi
+fi
+ax_pthread_config=$ac_cv_prog_ax_pthread_config
+if test -n "$ax_pthread_config"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5
+$as_echo "$ax_pthread_config" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+                if test x"$ax_pthread_config" = xno; then continue; fi
+                PTHREAD_CFLAGS="`pthread-config --cflags`"
+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+                ;;
+
+                *)
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
+                PTHREAD_LIBS="-l$flag"
+                ;;
+        esac
+
+        save_LIBS="$LIBS"
+        save_CFLAGS="$CFLAGS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags"
+
+        # Check for various functions.  We must include pthread.h,
+        # since some functions may be macros.  (On the Sequent, we
+        # need a special flag -Kthread to make this header compile.)
+        # We check for pthread_join because it is in -lpthread on IRIX
+        # while pthread_create is in libc.  We check for pthread_attr_init
+        # due to DEC craziness with -lpthreads.  We check for
+        # pthread_cleanup_push because it is one of the few pthread
+        # functions on Solaris that doesn't have a non-functional libc stub.
+        # We try pthread_create on general principles.
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+                        static void routine(void *a) { a = 0; }
+                        static void *start_routine(void *a) { return a; }
+int
+main ()
+{
+pthread_t th; pthread_attr_t attr;
+                        pthread_create(&th, 0, start_routine, 0);
+                        pthread_join(th, 0);
+                        pthread_attr_init(&attr);
+                        pthread_cleanup_push(routine, 0);
+                        pthread_cleanup_pop(0) /* ; */
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_pthread_ok=yes
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5
+$as_echo "$ax_pthread_ok" >&6; }
+        if test "x$ax_pthread_ok" = xyes; then
+                break;
+        fi
+
+        PTHREAD_LIBS=""
+        PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$ax_pthread_ok" = xyes; then
+        save_LIBS="$LIBS"
+        LIBS="$PTHREAD_LIBS $LIBS"
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
+$as_echo_n "checking for joinable pthread attribute... " >&6; }
+        attr_name=unknown
+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+int attr = $attr; return attr /* ; */
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  attr_name=$attr; break
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+        done
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5
+$as_echo "$attr_name" >&6; }
+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+
+cat >>confdefs.h <<_ACEOF
+#define PTHREAD_CREATE_JOINABLE $attr_name
+_ACEOF
+
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
+        flag=no
+        case ${host_os} in
+            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
+            osf* | hpux*) flag="-D_REENTRANT";;
+            solaris*)
+            if test "$GCC" = "yes"; then
+                flag="-D_REENTRANT"
+            else
+                # TODO: What about Clang on Solaris?
+                flag="-mt -D_REENTRANT"
+            fi
+            ;;
+        esac
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flag" >&5
+$as_echo "$flag" >&6; }
+        if test "x$flag" != xno; then
+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+        fi
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5
+$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; }
+if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+                cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <pthread.h>
+int
+main ()
+{
+int i = PTHREAD_PRIO_INHERIT;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_PTHREAD_PRIO_INHERIT=yes
+else
+  ax_cv_PTHREAD_PRIO_INHERIT=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5
+$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; }
+        if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then :
+
+$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h
+
+fi
+
+        LIBS="$save_LIBS"
+        CFLAGS="$save_CFLAGS"
+
+        # More AIX lossage: compile with *_r variant
+        if test "x$GCC" != xyes; then
+            case $host_os in
+                aix*)
+                case "x/$CC" in #(
+  x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6) :
+    #handle absolute path differently from PATH based program lookup
+                   case "x$CC" in #(
+  x/*) :
+    if as_fn_executable_p ${CC}_r; then :
+  PTHREAD_CC="${CC}_r"
+fi ;; #(
+  *) :
+    for ac_prog in ${CC}_r
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PTHREAD_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PTHREAD_CC"; then
+  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_PTHREAD_CC="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
+if test -n "$PTHREAD_CC"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
+$as_echo "$PTHREAD_CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$PTHREAD_CC" && break
+done
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+ ;;
+esac ;; #(
+  *) :
+     ;;
+esac
+                ;;
+            esac
+        fi
+fi
+
+test -n "$PTHREAD_CC" || PTHREAD_CC="$CC"
+
+
+
+
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$ax_pthread_ok" = xyes; then
+
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+        :
+else
+        ax_pthread_ok=no
+
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+	# Check whether --enable-libcurl was given.
+if test "${enable_libcurl+set}" = set; then :
+  enableval=$enable_libcurl; enable_curl=$enableval
+else
+  enable_curl=no
+fi
+
+
+	if test "x$enable_curl" != "xno"; then :
+
+												CURLCONFIG="curl-config"
+		if test "x$enable_curl" != "xyes"; then :
+  CURLCONFIG="$enable_curl/bin/curl-config"
+fi
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $CURLCONFIG" >&5
+$as_echo_n "checking $CURLCONFIG... " >&6; }
+		if $CURLCONFIG --version 2>/dev/null >/dev/null; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+				{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "Could not find curl-config, try editing --enable-libcurl
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+		CURLCFLAG="`$CURLCONFIG --cflags`"
+		CURLLIBS="`$CURLCONFIG --libs`"
+
+				if $CURLCONFIG --libs | grep -q -e ares; then :
+  CURLUSESCARES="1"
+else
+  CURLUSESCARES="0"
+fi
+
+				if test -z "${CURLLIBS}"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: CURLLIBS is empty, that probably means that I could not find $enable_curl/bin/curl-config" >&5
+$as_echo "$as_me: WARNING: CURLLIBS is empty, that probably means that I could not find $enable_curl/bin/curl-config" >&2;}
+fi
+
+
+		if test "x$has_system_cares" = "xno" && test "x$BUILDDIR/extras/curl" != "x$enable_curl" && test "$CURLUSESCARES" != "0" ; then :
+
+			as_fn_error $? "
+
+  You have decided to build unrealIRCd with libcURL (remote includes) support.
+  However, you have system-installed c-ares support has either been disabled
+  (--without-system-cares) or is unavailable.
+  Because UnrealIRCd will use a bundled copy of c-ares which may be incompatible
+  with the system-installed libcURL, this is a bad idea which may result in error
+  messages looking like:
+
+  	\`\`[error] unrealircd.conf:9: include: error downloading '(http://example.net/ex.conf)': Could not resolve host: example.net (Successful completion)''
+
+  Or UnrealIRCd might even crash.
+
+  Please build UnrealIRCd with --with-system-cares when enabling --enable-libcurl
+" "$LINENO" 5
+
+fi
+
+						IRCDLIBS="$IRCDLIBS $CURLLIBS"
+		CFLAGS="$CFLAGS $CURLCFLAG"
+
+$as_echo "#define USE_LIBCURL /**/" >>confdefs.h
+
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking curl_easy_init() in $CURLLIBS" >&5
+$as_echo_n "checking curl_easy_init() in $CURLLIBS... " >&6; }
+		LIBS_SAVEDA="$LIBS"
+		CFLAGS_SAVEDA="$CFLAGS"
+
+		LIBS="$IRCDLIBS $IRCDLIBS_CURL_CARES"
+		CFLAGS="$CFLAGS $CFLAGS_CURL_CARES"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+			#include <curl/curl.h>
+int
+main ()
+{
+CURL *curl = curl_easy_init();
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+			{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "You asked for libcURL (remote includes) support, but it can't be found at $enable_curl
+See \`config.log' for more details" "$LINENO" 5; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		LIBS="$LIBS_SAVEDA"
+		CFLAGS="$CFLAGS_SAVEDA"
+
+		URL="url.o"
+
+
+fi
+
+UNRLINCDIR="`pwd`/include"
+
+if test "$ac_cv_werror" = "yes" ; then
+	CFLAGS="$CFLAGS -Werror"
+fi
+
+if test "$ac_cv_asan" = "yes" ; then
+	CFLAGS="$CFLAGS -O1 -fno-inline -fsanitize=address -fno-omit-frame-pointer -DNOCLOSEFD"
+	IRCDLIBS="-fsanitize=address $IRCDLIBS"
+fi
+
+
+
+
+
+ac_config_files="$ac_config_files Makefile src/Makefile src/modules/Makefile src/modules/chanmodes/Makefile src/modules/usermodes/Makefile src/modules/snomasks/Makefile src/modules/extbans/Makefile src/modules/third/Makefile unrealircd"
+
+cat >confcache <<\_ACEOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs, see configure's option --config-cache.
+# It is not useful on other systems.  If it contains results you don't
+# want to keep, you may remove or edit it.
+#
+# config.status only pays attention to the cache file if you give it
+# the --recheck option to rerun configure.
+#
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# following values.
+
+_ACEOF
+
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, we kill variables containing newlines.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
+  (set) 2>&1 |
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
+      sed -n \
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+      ;; #(
+    *)
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+) |
+  sed '
+     /^ac_cv_env_/b end
+     t clear
+     :clear
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
+     t end
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+  fi
+fi
+rm -f confcache
+
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+# Let make expand exec_prefix.
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+DEFS=-DHAVE_CONFIG_H
+
+ac_libobjs=
+ac_ltlibobjs=
+U=
+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+  # 1. Remove the extension, and $U if already installed.
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+done
+LIBOBJS=$ac_libobjs
+
+LTLIBOBJS=$ac_ltlibobjs
+
+
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
+ac_clean_files_save=$ac_clean_files
+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by unrealircd $as_me 5.0.3.1, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+_ACEOF
+
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+# Files that config.status was made for.
+config_files="$ac_config_files"
+config_headers="$ac_config_headers"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=FILE[:TEMPLATE]
+                   instantiate the configuration header FILE
+
+Configuration files:
+$config_files
+
+Configuration headers:
+$config_headers
+
+Report bugs to <https://bugs.unrealircd.org/>.
+unrealircd home page: <https://unrealircd.org/>."
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ac_cs_version="\\
+unrealircd config.status 5.0.3.1
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --header | --heade | --head | --hea )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h)
+    # Conflict between --help and --header
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
+  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+if \$ac_cs_recheck; then
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "include/setup.h") CONFIG_HEADERS="$CONFIG_HEADERS include/setup.h" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
+    "src/modules/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/Makefile" ;;
+    "src/modules/chanmodes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/chanmodes/Makefile" ;;
+    "src/modules/usermodes/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/usermodes/Makefile" ;;
+    "src/modules/snomasks/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/snomasks/Makefile" ;;
+    "src/modules/extbans/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/extbans/Makefile" ;;
+    "src/modules/third/Makefile") CONFIG_FILES="$CONFIG_FILES src/modules/third/Makefile" ;;
+    "unrealircd") CONFIG_FILES="$CONFIG_FILES unrealircd" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim='%!_!# '
+for ac_last_try in false false :; do
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
+D["\1"]=" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  for (key in D) D_is_set[key] = 1
+  FS = ""
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line = \$ 0
+  split(line, arg, " ")
+  if (arg[1] == "#") {
+    defundef = arg[2]
+    mac1 = arg[3]
+  } else {
+    defundef = substr(arg[1], 2)
+    mac1 = arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro = mac2[1]
+  prefix = substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef == "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
+$extrasub
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+  :H)
+  #
+  # CONFIG_HEADER
+  #
+  if test x"$ac_file" != x-; then
+    {
+      $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
+    else
+      rm -f "$ac_file"
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    fi
+  else
+    $as_echo "/* $configure_input  */" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
+  fi
+ ;;
+
+
+  esac
+
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+
+
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
+
+chmod 0700 unrealircd
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..983b6dd
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,721 @@
+dnl Process this file with autoconf to produce a configure script.
+
+dnl When updating the version, remember to update the following files
+dnl appropriately:
+dnl include/windows/setup.h
+dnl src/windows/unrealinst.iss
+dnl doc/Config.header
+dnl src/version.c.SH
+
+AC_INIT([unrealircd], [5.0.3.1], [https://bugs.unrealircd.org/], [], [https://unrealircd.org/])
+AC_CONFIG_SRCDIR([src/ircd.c])
+AC_CONFIG_HEADER([include/setup.h])
+AC_CONFIG_AUX_DIR([autoconf])
+AC_CONFIG_MACRO_DIR([autoconf/m4])
+
+if test "x$enable_dynamic_linking" = "x"; then
+	echo "Please use ./Config instead of ./configure"
+	exit 1
+fi
+
+dnl Save CFLAGS, use this when building the libraries like c-ares
+orig_cflags="$CFLAGS"
+
+dnl Save build directory early on (used in our m4 macros too)
+BUILDDIR_NOW="`pwd`"
+
+dnl Calculate the versions. Perhaps the use of expr is a little too extravagant
+# Generation version number (e.g.: X in X.Y.Z)
+UNREAL_VERSION_GENERATION=["5"]
+AC_DEFINE_UNQUOTED([UNREAL_VERSION_GENERATION], [$UNREAL_VERSION_GENERATION], [Generation version number (e.g.: X for X.Y.Z)])
+
+# Major version number (e.g.: Y in X.Y.Z)
+UNREAL_VERSION_MAJOR=["0"]
+AC_DEFINE_UNQUOTED([UNREAL_VERSION_MAJOR], [$UNREAL_VERSION_MAJOR], [Major version number (e.g.: Y for X.Y.Z)])
+
+# Minor version number (e.g.: Z in X.Y.Z)
+UNREAL_VERSION_MINOR=["3"]
+AC_DEFINE_UNQUOTED([UNREAL_VERSION_MINOR], [$UNREAL_VERSION_MINOR], [Minor version number (e.g.: Z for X.Y.Z)])
+
+# The version suffix such as a beta marker or release candidate
+# marker. (e.g.: -rcX for unrealircd-3.2.9-rcX). This macro is a
+# string instead of an integer because it contains arbitrary data.
+UNREAL_VERSION_SUFFIX=[".1"]
+AC_DEFINE_UNQUOTED([UNREAL_VERSION_SUFFIX], ["$UNREAL_VERSION_SUFFIX"], [Version suffix such as a beta marker or release candidate marker. (e.g.: -rcX for unrealircd-3.2.9-rcX)])
+
+AC_PATH_PROG(RM,rm)
+AC_PATH_PROG(CP,cp)
+AC_PATH_PROG(TOUCH,touch)
+AC_PATH_PROG(OPENSSLPATH,openssl)
+AS_IF([test x"$OPENSSLPATH" = "x"],
+[
+echo ""
+echo "Apparently you do not have both the openssl binary and openssl development libraries installed."
+echo "The following packages are required:"
+echo "1) The library package is often called 'openssl-dev', 'openssl-devel' or 'libssl-dev'"
+echo "2) The binary package is usually called 'openssl'."
+echo "NOTE: you or your system administrator needs to install the library AND the binary package."
+echo "After doing so, simply re-run ./Config"
+exit 1
+])
+
+AC_PATH_PROG(INSTALL,install)
+AC_CHECK_PROG(MAKER, gmake, gmake, make)
+AC_PATH_PROG(GMAKE,gmake)
+
+AS_IF([$MAKER --version | grep -q "GNU Make"],
+        [GNUMAKE="0"],
+        [AC_MSG_ERROR([It seems your system does not have gmake installed. Please install gmake.])])
+
+AC_PATH_PROG(GUNZIP, gunzip)
+AC_PATH_PROG(PKGCONFIG, pkg-config)
+
+dnl Check for compiler
+AC_PROG_CC_C99
+AS_IF([test "$ac_cv_prog_cc_c99" = "no"],
+	[AC_MSG_ERROR([No C99 compiler was found. Please install gcc or clang and other build tools. Eg, on Debian/Ubuntu you probably want to run the following as root: apt-get install build-essential ])])
+
+dnl Checks for libraries.
+AC_CHECK_LIB(descrypt, crypt,
+	[AC_DEFINE([HAVE_CRYPT], [], [Define if you have crypt])
+		IRCDLIBS="$IRCDLIBS-ldescrypt "],
+	[AC_CHECK_LIB(crypt, crypt,
+		[AC_DEFINE([HAVE_CRYPT], [], [Define if you have crypt])
+			IRCDLIBS="$IRCDLIBS-lcrypt "])])
+
+dnl HARDENING START
+dnl This is taken from https://github.com/kmcallister/autoharden
+dnl With some very small modifications (to remove C++ checking for instance)
+# We want to check for compiler flag support, but there is no way to make
+# clang's "argument unused" warning fatal.  So we invoke the compiler through a
+# wrapper script that greps for this message.
+saved_CC="$CC"
+saved_CXX="$CXX"
+saved_LD="$LD"
+flag_wrap="$srcdir/extras/wrap-compiler-for-flag-check"
+CC="$flag_wrap $CC"
+CXX="$flag_wrap $CXX"
+LD="$flag_wrap $LD"
+
+# We use the same hardening flags for C and C++.  We must check that each flag
+# is supported by both compilers.
+AC_DEFUN([check_cc_flag],
+ [AC_LANG_PUSH(C)
+  AX_CHECK_COMPILE_FLAG([$1], [$2], [$3], [-Werror $4])
+  AC_LANG_POP(C)])
+
+AC_DEFUN([check_link_flag],
+ [AX_CHECK_LINK_FLAG([$1], [$2], [$3], [-Werror $4])])
+
+AC_ARG_ENABLE([hardening],
+  [AS_HELP_STRING([--enable-hardening],
+    [Enable compiler and linker options to frustrate memory corruption exploits @<:@yes@:>@])],
+  [hardening="$enableval"],
+  [hardening="yes"])
+
+HARDEN_CFLAGS=""
+HARDEN_LDFLAGS=""
+AS_IF([test x"$hardening" != x"no"], [
+  check_cc_flag([-fno-strict-overflow], [HARDEN_CFLAGS="$HARDEN_CFLAGS -fno-strict-overflow"])
+
+  # This one will likely succeed, even on platforms where it does nothing.
+  check_cc_flag([-D_FORTIFY_SOURCE=2], [HARDEN_CFLAGS="$HARDEN_CFLAGS -D_FORTIFY_SOURCE=2"])
+
+  check_cc_flag([-fstack-protector-all],
+   [check_link_flag([-fstack-protector-all],
+     [HARDEN_CFLAGS="$HARDEN_CFLAGS -fstack-protector-all"
+      check_cc_flag([-Wstack-protector], [HARDEN_CFLAGS="$HARDEN_CFLAGS -Wstack-protector"],
+        [], [-fstack-protector-all])
+      check_cc_flag([--param ssp-buffer-size=1], [HARDEN_CFLAGS="$HARDEN_CFLAGS --param ssp-buffer-size=1"],
+        [], [-fstack-protector-all])])])
+
+  # At the link step, we might want -pie (GCC) or -Wl,-pie (Clang on OS X)
+  #
+  # The linker checks also compile code, so we need to include -fPIE as well.
+  check_cc_flag([-fPIE],
+   [check_link_flag([-fPIE -pie],
+     [HARDEN_BINCFLAGS="-fPIE"
+      HARDEN_BINLDFLAGS="-pie"],
+     [check_link_flag([-fPIE -Wl,-pie],
+       [HARDEN_BINCFLAGS="-fPIE"
+        HARDEN_BINLDFLAGS="-Wl,-pie"])])])
+
+  check_link_flag([-Wl,-z,relro],
+   [HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,relro"
+    check_link_flag([-Wl,-z,now], [HARDEN_LDFLAGS="$HARDEN_LDFLAGS -Wl,-z,now"])])])
+AC_SUBST([HARDEN_CFLAGS])
+AC_SUBST([HARDEN_LDFLAGS])
+AC_SUBST([HARDEN_BINCFLAGS])
+AC_SUBST([HARDEN_BINLDFLAGS])
+
+# End of flag tests.
+CC="$saved_CC"
+CXX="$saved_CXX"
+LD="$saved_LD"
+dnl HARDENING END
+
+dnl UnrealIRCd might not be strict-aliasing safe at this time
+check_cc_flag([-fno-strict-aliasing], [CFLAGS="$CFLAGS -fno-strict-aliasing"])
+
+dnl UnrealIRCd should be able to compile with -fno-common
+dnl This also makes ASan (if it is in use) able to instrument these variables.
+check_cc_flag([-fno-common], [CFLAGS="$CFLAGS -fno-common"])
+
+dnl Previously -funsigned-char was in a config check. It would always
+dnl be enabled with gcc and clang. We now unconditionally enable it,
+dnl skipping the check. This will cause an error if someone uses a
+dnl non-gcc/non-clang compiler that does not support -funsigned-char
+dnl which is good. After all, we really depend on it.
+dnl UnrealIRCd should never be compiled without char being unsigned.
+CFLAGS="$CFLAGS -funsigned-char"
+
+dnl Compiler -W checks...
+
+dnl We should be able to turn this on unconditionally:
+CFLAGS="$CFLAGS -Wall"
+
+dnl More warnings (if the compiler supports it):
+check_cc_flag([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
+check_cc_flag([-Waggregate-return], [CFLAGS="$CFLAGS -Waggregate-return"])
+dnl The following few are more experimental, if they have false positives we'll have
+dnl to disable them:
+dnl Can't use this, too bad: check_cc_flag([-Wlogical-op], [CFLAGS="$CFLAGS -Wlogical-op"])
+check_cc_flag([-Wduplicated-cond], [CFLAGS="$CFLAGS -Wduplicated-cond"])
+check_cc_flag([-Wduplicated-branches], [CFLAGS="$CFLAGS -Wduplicated-branches"])
+
+dnl And now to filter out certain warnings:
+dnl [!] NOTE REGARDING THE check_cc_flag used by these:
+dnl We check for the -Woption even though we are going to use -Wno-option.
+dnl This is due to the following (odd) gcc behavior:
+dnl "When an unrecognized warning option is requested (e.g.,
+dnl  -Wunknown-warning), GCC emits a diagnostic stating that the option is not
+dnl  recognized.  However, if the -Wno- form is used, the behavior is slightly
+dnl  different: no diagnostic is produced for -Wno-unknown-warning unless
+dnl  other diagnostics are being produced.  This allows the use of new -Wno-
+dnl  options with old compilers, but if something goes wrong, the compiler
+dnl  warns that an unrecognized option is present."
+dnl Since we don't want to use any unrecognized -Wno-option, we test for
+dnl -Woption instead.
+
+dnl Pointer signedness warnings are really a pain and 99.9% of the time
+dnl they are of absolutely no use whatsoever. IMO the person who decided
+dnl to enable this without -Wall should be shot on sight.
+check_cc_flag([-Wpointer-sign], [CFLAGS="$CFLAGS -Wno-pointer-sign"])
+
+dnl This is purely for charsys.c... I like it so we can easily read
+dnl this for non-utf8. We can remove it once we ditch non-utf8 some day
+dnl of course, or decide to ignore me and encode them.
+check_cc_flag([-Winvalid-source-encoding], [CFLAGS="$CFLAGS -Wno-invalid-source-encoding"])
+
+check_cc_flag([-Wformat-zero-length], [CFLAGS="$CFLAGS -Wno-format-zero-length"])
+
+check_cc_flag([-Wformat-truncation], [CFLAGS="$CFLAGS -Wno-format-truncation"])
+
+dnl While it can be useful to occasionally to compile with warnings about
+dnl unused variables and parameters, we often 'think ahead' when coding things
+dnl so they may be useless now but not later. Similarly, for variables, we
+dnl don't always care about a variable that may still be present in a build
+dnl without DEBUGMODE. Unused variables are optimized out anyway.
+check_cc_flag([-Wunused], [CFLAGS="$CFLAGS -Wno-unused"])
+check_cc_flag([-Wunused-parameter], [CFLAGS="$CFLAGS -Wno-unused-parameter"])
+check_cc_flag([-Wunused-but-set-parameter], [CFLAGS="$CFLAGS -Wno-unused-but-set-parameter"])
+
+dnl We use this and this warning is meaningless since 'char' is always unsigned
+dnl in UnrealIRCd compiles (-funsigned-char).
+check_cc_flag([-Wchar-subscripts], [CFLAGS="$CFLAGS -Wno-char-subscripts"])
+
+check_cc_flag([-Wsign-compare], [CFLAGS="$CFLAGS -Wno-sign-compare"])
+
+dnl Don't warn about empty body, we use this, eg via Debug(()) or in if's.
+check_cc_flag([-Wempty-body], [CFLAGS="$CFLAGS -Wno-empty-body"])
+
+dnl This one fails with ircstrdup(var, staticstring)
+dnl Shame we have to turn it off completely...
+check_cc_flag([-Waddress], [CFLAGS="$CFLAGS -Wno-address"])
+
+dnl This one breaks our TO_INTFUNC() that is used in m_tkl for tkl_typetochar
+check_cc_flag([-Wcast-function-type], [CFLAGS="$CFLAGS -Wno-cast-function-type"])
+
+dnl End of -W... compiler checks.
+
+
+dnl module checking based on Hyb7's module checking code
+AC_DEFUN([AC_ENABLE_DYN],
+[
+AC_CHECK_FUNC(dlopen,, [AC_CHECK_LIB(dl, dlopen,IRCDLIBS="$IRCDLIBS -ldl",
+[
+AC_MSG_WARN(Dynamic linking is not enabled because dlopen was not found) 
+AC_DEFINE(STATIC_LINKING)
+])])
+
+hold_cflags=$CFLAGS
+DYNAMIC_LDFLAGS=""
+CFLAGS="$CFLAGS -Wl,-export-dynamic"
+AC_CACHE_CHECK(if we need the -export-dynamic flag, ac_cv_export_dynamic, [
+AC_TRY_LINK(, [int i];, ac_cv_export_dynamic=yes, ac_cv_export_dynamic=no)])
+CFLAGS=$hold_cflags
+if test "$ac_cv_export_dynamic" = "yes"; then
+	DYNAMIC_LDFLAGS="-Wl,-export-dynamic"
+fi
+
+AC_CACHE_CHECK(for compiler option to produce PIC,ac_cv_pic,[
+if test "$ac_cv_prog_gcc" = "yes"; then
+	ac_cv_pic="-fPIC -DPIC -shared"
+	case `uname -s` in
+		Darwin*[)]
+		ac_cv_pic="-std=gnu89 -bundle -flat_namespace -undefined suppress"
+		;;
+		HP-UX*[)]
+		ac_cv_pic="-fPIC"
+		;;
+	esac
+else
+case `uname -s` in
+	SunOS*[)]
+	ac_cv_pic="-KPIC -DPIC -G"
+	;;
+esac
+fi
+])
+AC_CACHE_CHECK(if your system prepends an underscore on symbols,ac_cv_underscore,[
+cat >uscore.c << __EOF__
+int main() {
+	return 0;
+}
+__EOF__
+$CC -o uscore $CFLAGS uscore.c 1>&5
+if test -z "`strings -a uscore |grep '^_main$'`"; then
+ac_cv_underscore=no
+else
+ac_cv_underscore=yes
+fi
+rm -f uscore uscore.c
+])
+dnl libtool has built-in tests that determine proper underscorage
+if test "$ac_cv_underscore" = "yes"; then
+	AC_DEFINE([UNDERSCORE], [], [Define if your system prepends an underscore to symbols])
+fi
+
+MODULEFLAGS="$ac_cv_pic $DYNAMIC_LDFLAGS"
+dnl DYNAMIC_LINKING is not meant to be defined in include/setup.h, it's 
+dnl defined in the Makefiles using -D. Having it defined globally will
+dnl only cause braindamage and symbol collisions :-D.
+dnl AC_DEFINE([DYNAMIC_LINKING], [], [Link dynamically as opposed to statically. (Dynamic linking is the only supported method of linking atm)])
+])
+
+AC_CACHE_CHECK([if your system has IPv6 support], [ac_cv_ip6], [
+AC_TRY_RUN([
+#include <sys/types.h>
+#include <sys/socket.h>
+int main() {
+int s = socket(AF_INET6, SOCK_STREAM, 0);
+exit(0); /* We only check if the code compiles, that's enough. We can deal with missing runtime IPv6 */
+}
+],
+	[ac_cv_ip6=yes],
+	[ac_cv_ip6=no])
+])
+if test "$ac_cv_ip6" = "no"; then
+	AC_MSG_ERROR([Your system does not support IPv6])
+fi
+
+AC_CHECK_HEADER(sys/syslog.h,
+	AC_DEFINE([SYSSYSLOGH], [], [Define if you have the <sys/syslog.h> header file.]))
+AC_CHECK_HEADER(sys/rusage.h,
+	AC_DEFINE([RUSAGEH], [], [Define if you have the <sys/rusage.h> header file.]))
+AC_CHECK_HEADER(glob.h,
+	AC_DEFINE([GLOBH], [], [Define if you have the <glob.h> header file.]))
+AC_CHECK_HEADERS([stdint.h inttypes.h])
+
+dnl Checks for library functions.
+AC_CHECK_FUNCS(strlcpy,
+	AC_DEFINE([HAVE_STRLCPY], [], [Define if you have strlcpy. Otherwise, an internal implementation will be used!]))
+AC_CHECK_FUNCS(strlcat,
+	AC_DEFINE([HAVE_STRLCAT], [], [Define if you have strlcat]))
+AC_CHECK_FUNCS(strlncat,
+	AC_DEFINE([HAVE_STRLNCAT], [], [Define if you have strlncat]))
+
+AC_CHECK_FUNCS([getrusage],
+	[AC_DEFINE([GETRUSAGE_2], [], [Define if you have getrusage])],
+	[AC_CHECK_FUNCS([times],
+		[AC_DEFINE([TIMES_2], [], [Define if you have times])])])
+AC_CHECK_FUNCS([setproctitle],
+	[AC_DEFINE([HAVE_SETPROCTITLE], [], [Define if you have setproctitle])],
+	[AC_CHECK_LIB([util],
+		[setproctitle],
+		[AC_DEFINE([HAVE_SETPROCTITLE], [], [Define if you have setproctitle])
+		IRCDLIBS="$IRCDLIBS-lutil"],
+		[
+		AC_EGREP_HEADER([#define.*PS_STRINGS.*],[sys/exec.h],
+			[AC_DEFINE([HAVE_PSSTRINGS],[], [Define if you have PS_STRINGS])],
+			[AC_CHECK_FUNCS([pstat],
+				[AC_DEFINE([HAVE_PSTAT], [], [Define if you have pstat])])])
+		])
+	]
+)
+
+AC_CHECK_FUNCS(explicit_bzero,AC_DEFINE([HAVE_EXPLICIT_BZERO], [], [Define if you have explicit_bzero]))
+AC_CHECK_FUNCS(syslog,AC_DEFINE([HAVE_SYSLOG], [], [Define if you have syslog]))
+AC_SUBST(CRYPTOLIB)
+AC_SUBST(MODULEFLAGS)
+AC_SUBST(DYNAMIC_LDFLAGS)
+AC_ARG_WITH(nick-history, [AS_HELP_STRING([--with-nick-history=length],[Specify the length of the nickname history])],
+	[AC_DEFINE_UNQUOTED([NICKNAMEHISTORYLENGTH], [$withval], [Set to the nickname history length you want])],
+	[AC_DEFINE([NICKNAMEHISTORYLENGTH], [2000], [Set to the nickname history length you want])])
+AC_ARG_WITH(permissions, [AS_HELP_STRING([--with-permissions=permissions], [Specify the default permissions for
+configuration files])],
+	dnl We have an apparently out-of-place 0 here because of a MacOSX bug and because
+	dnl we assume that a user thinks that `chmod 0600 blah' is the same as `chmod 600 blah'
+	dnl (#3189)
+	[AC_DEFINE_UNQUOTED([DEFAULT_PERMISSIONS], [0$withval], [The default permissions for configuration files. Set to 0 to prevent unrealircd from calling chmod() on the files.])],
+	[AC_DEFINE([DEFAULT_PERMISSIONS], [0600], [The default permissions for configuration files. Set to 0 to prevent unrealircd from calling chmod() on the files.])]) 
+
+AC_ARG_WITH(bindir, [AS_HELP_STRING([--with-bindir=path],[Specify the directory for the unrealircd binary])],
+	[AC_DEFINE_UNQUOTED([BINDIR], ["$withval"], [Define the directory where the unrealircd binary is located])
+		BINDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([BINDIR], ["$HOME/unrealircd/bin"], [Define the directory where the unrealircd binary is located])
+		BINDIR="$HOME/unrealircd/bin"])
+
+AC_ARG_WITH(scriptdir, [AS_HELP_STRING([--with-scriptdir=path],[Specify the directory for the unrealircd start-stop script])],
+	[AC_DEFINE_UNQUOTED([SCRIPTDIR], ["$withval"], [Define the directory where the unrealircd start stop scripts is located])
+		SCRIPTDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([SCRIPTDIR], ["$HOME/unrealircd"], [Define the directory where the unrealircd start stop scripts is located])
+		SCRIPTDIR="$HOME/unrealircd"])
+
+AC_ARG_WITH(confdir, [AS_HELP_STRING([--with-confdir=path],[Specify the directory where configuration files are stored])],
+	[AC_DEFINE_UNQUOTED([CONFDIR], ["$withval"], [Define the location of the configuration files])
+		CONFDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([CONFDIR], ["$HOME/unrealircd/conf"], [Define the location of the configuration files])
+		CONFDIR="$HOME/unrealircd/conf"])
+
+dnl We have to pass the builddir as well, for the module manager
+AC_ARG_WITH(builddir, [AS_HELP_STRING([--with-builddir=path],[Specify the build directory])],
+	[AC_DEFINE_UNQUOTED([BUILDDIR], ["$withval"], [Define the build directory])
+		BUILDDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([BUILDDIR], ["$BUILDDIR_NOW"], [Specify the build directory])
+		BUILDDIR="$BUILDDIR_NOW"])
+
+AC_ARG_WITH(modulesdir, [AS_HELP_STRING([--with-modulesdir=path],[Specify the directory for loadable modules])],
+	[AC_DEFINE_UNQUOTED([MODULESDIR], ["$withval"], [Define the location of the modules])
+		MODULESDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([MODULESDIR], ["$HOME/unrealircd/modules"], [Define the location of the modules])
+		MODULESDIR="$HOME/unrealircd/modules"])
+
+AC_ARG_WITH(logdir, [AS_HELP_STRING([--with-logdir=path],[Specify the directory where log files are stored])],
+	[AC_DEFINE_UNQUOTED([LOGDIR], ["$withval"], [Define the location of the log files])
+		LOGDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([LOGDIR], ["$HOME/unrealircd/logs"], [Define the location of the log files])
+		LOGDIR="$HOME/unrealircd/logs"])
+
+AC_ARG_WITH(cachedir, [AS_HELP_STRING([--with-cachedir=path],[Specify the directory where cached files are stored])],
+	[AC_DEFINE_UNQUOTED([CACHEDIR], ["$withval"], [Define the location of the cached remote include files])
+		CACHEDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([CACHEDIR], ["$HOME/unrealircd/cache"], [Define the location of the cached remote include files])
+		CACHEDIR="$HOME/unrealircd/cache"])
+
+AC_ARG_WITH(tmpdir, [AS_HELP_STRING([--with-tmpdir=path],[Specify the directory where private temporary files are stored. Should not be readable or writable by others, so not /tmp!!])],
+	[AC_DEFINE_UNQUOTED([TMPDIR], ["$withval"], [Define the location of private temporary files])
+		TMPDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([TMPDIR], ["$HOME/unrealircd/tmp"], [Define the location of private temporary files])
+		TMPDIR="$HOME/unrealircd/tmp"])
+
+AC_ARG_WITH(datadir, [AS_HELP_STRING([--with-datadir=path],[Specify the directory where permanent data is stored])],
+	[AC_DEFINE_UNQUOTED([PERMDATADIR], ["$withval"], [Define the location of permanent data files])
+		PERMDATADIR="$withval"],
+	[AC_DEFINE_UNQUOTED([DATADIR], ["$HOME/unrealircd/data"], [Define the location of permanent data files])
+		PERMDATADIR="$HOME/unrealircd/data"])
+
+AC_ARG_WITH(docdir, [AS_HELP_STRING([--with-docdir=path],[Specify the directory where documentation is stored])],
+	[AC_DEFINE_UNQUOTED([DOCDIR], ["$withval"], [Define the location of the documentation])
+		DOCDIR="$withval"],
+	[AC_DEFINE_UNQUOTED([DOCDIR], ["$HOME/unrealircd/doc"], [Define the location of the documentation])
+		DOCDIR="$HOME/unrealircd/doc"])
+
+AC_ARG_WITH(pidfile, [AS_HELP_STRING([--with-pidfile=path],[Specify the path of the pid file])],
+	[AC_DEFINE_UNQUOTED([PIDFILE], ["$withval"], [Define the path of the pid file])
+		PIDFILE="$withval"],
+	[AC_DEFINE_UNQUOTED([PIDFILE], ["$HOME/unrealircd/data/unrealircd.pid"], [Define the path of the pid file])
+		PIDFILE="$HOME/unrealircd/data/unrealircd.pid"])
+
+dnl Ensure that this “feature� can be disabled as it makes it harder to package unrealircd.
+dnl Users have always been able to specify “./configure LDFLAGS=-Wl,-rpath,/path/to/blah�—binki
+AC_ARG_WITH(privatelibdir, [AS_HELP_STRING([--with-privatelibdir=path],[Specify the directory where private libraries are stored. Disable when building a package for a distro])],
+	[],
+	[with_privatelibdir="yes"])
+AS_IF([test "x$with_privatelibdir" = "xno"],
+	[PRIVATELIBDIR=],
+	[test "x$with_privatelibdir" = "xyes"],
+	[PRIVATELIBDIR="$HOME/unrealircd/lib"],
+	[PRIVATELIBDIR="$with_privatelibdir"])
+AS_IF([test "x$PRIVATELIBDIR" = "x"],
+	[LDFLAGS_PRIVATELIBS=""],
+	[AC_DEFINE_UNQUOTED([PRIVATELIBDIR], ["$PRIVATELIBDIR"], [Define the location of private libraries])
+		LDFLAGS_PRIVATELIBS="-Wl,-rpath,$PRIVATELIBDIR"
+		LDFLAGS="$LDFLAGS $LDFLAGS_PRIVATELIBS"
+		export LDFLAGS])
+
+AC_SUBST(BUILDDIR)
+AC_SUBST(BINDIR)
+AC_SUBST(SCRIPTDIR)
+AC_SUBST(CONFDIR)
+AC_SUBST(MODULESDIR)
+AC_SUBST(LOGDIR)
+AC_SUBST(CACHEDIR)
+AC_SUBST(TMPDIR)
+dnl Why o why PERMDATADIR and not DATADIR you ask?
+dnl well, Because DATADIR conflicts with the Windows SDK header files.. amazing.
+AC_SUBST(PERMDATADIR)
+AC_SUBST(DOCDIR)
+AC_SUBST(PIDFILE)
+AC_SUBST(LDFLAGS_PRIVATELIBS)
+
+AC_ARG_WITH(maxconnections, [AS_HELP_STRING([--with-maxconnections=size], [Specify the max file descriptors to use])],
+	[ac_fd=$withval],
+	[ac_fd=0])
+AC_DEFINE_UNQUOTED([MAXCONNECTIONS_REQUEST], [$ac_fd], [Set to the maximum number of connections you want])
+
+AC_ARG_ENABLE([prefixaq],
+	[AS_HELP_STRING([--disable-prefixaq],[Disable chanadmin (+a) and chanowner (+q) prefixes])],
+	[],
+	[enable_prefixaq=yes])
+AS_IF([test $enable_prefixaq = "yes"],
+	[AC_DEFINE([PREFIX_AQ], [], [Define if you want +a/+q prefixes])])
+
+AC_ARG_WITH(showlistmodes,
+	[AS_HELP_STRING([--with-showlistmodes], [Specify whether modes are shown in /list])],
+	[AS_IF([test $withval = "yes"],
+		[AC_DEFINE([LIST_SHOW_MODES], [], [Define if you want modes shown in /list])])])
+AC_ARG_WITH(no-operoverride, [AS_HELP_STRING([--with-no-operoverride], [Disable OperOverride])],
+	[AS_IF([test $withval = "yes"],
+		[AC_DEFINE([NO_OPEROVERRIDE], [], [Define if you want OperOverride disabled])])])
+AC_ARG_WITH(operoverride-verify, [AS_HELP_STRING([--with-operoverride-verify], [Require opers to invite themselves to +s/+p channels])],
+	[AS_IF([test $withval = "yes"],
+		[AC_DEFINE([OPEROVERRIDE_VERIFY], [], [Define if you want opers to have to use /invite to join +s/+p channels])])])
+AC_ARG_WITH(system-pcre2, [AS_HELP_STRING([--without-system-pcre2], [Use the system pcre2 package instead of bundled, discovered using pkg-config])], [], [with_system_pcre2=yes])
+AC_ARG_WITH(system-argon2, [AS_HELP_STRING([--without-system-argon2], [Use bundled version instead of system argon2 library. Normally autodetected via pkg-config])], [], [with_system_argon2=yes])
+AC_ARG_WITH(system-cares, [AS_HELP_STRING([--without-system-cares], [Use bundled version instead of system c-ares. Normally autodetected via pkg-config.])], [], [with_system_cares=yes])
+CHECK_SSL
+CHECK_SSL_CTX_SET1_CURVES_LIST
+CHECK_SSL_CTX_SET_MIN_PROTO_VERSION
+AC_ARG_ENABLE(dynamic-linking, [AS_HELP_STRING([--disable-dynamic-linking], [Make the IRCd statically link with shared objects rather than dynamically (noone knows if disabling dynamic linking actually does anything or not)])],
+	[enable_dynamic_linking=$enableval], [enable_dynamic_linking="yes"])
+AS_IF([test $enable_dynamic_linking = "yes"],
+	[AC_ENABLE_DYN],
+	[AC_DEFINE([STATIC_LINKING], [], [Link... statically(?) (defining this macro will probably cause the build tofail)])])
+
+AC_ARG_ENABLE([werror],
+  [AS_HELP_STRING([--enable-werror],
+    [Turn compilation warnings into errors (-Werror)])],
+  [ac_cv_werror="$enableval"],
+  [ac_cv_werror="no"])
+
+AC_ARG_ENABLE([asan],
+  [AS_HELP_STRING([--enable-asan],
+    [Enable address sanitizer and other debugging options, not recommended for production servers!])],
+  [ac_cv_asan="$enableval"],
+  [ac_cv_asan="no"])
+
+AC_CHECK_FUNCS([poll],
+	AC_DEFINE([HAVE_POLL], [], [Define if you have poll]))
+AC_CHECK_FUNCS([epoll_create epoll_ctl epoll_wait],
+	AC_DEFINE([HAVE_EPOLL], [], [Define if you have epoll]))
+AC_CHECK_FUNCS([kqueue kevent],
+	AC_DEFINE([HAVE_KQUEUE], [], [Define if you have kqueue]))
+
+dnl c-ares needs PATH_SEPARATOR set or it will
+dnl fail on certain solaris boxes. We might as
+dnl well set it here.
+export PATH_SEPARATOR
+
+dnl Use system pcre2 when available, unless --without-system-pcre2.
+has_system_pcre2="no"
+AS_IF([test "x$with_system_pcre2" = "xyes"],[
+PKG_CHECK_MODULES([PCRE2], libpcre2-8 >= 10.00,[has_system_pcre2=yes
+AS_IF([test "x$PRIVATELIBDIR" != "x"], [rm -f "$PRIVATELIBDIR/"libpcre2*])],[has_system_pcre2=no])])
+
+AS_IF([test "$has_system_pcre2" = "no"], [
+dnl REMEMBER TO CHANGE WITH A NEW PCRE2 RELEASE!
+pcre2_version="10.33"
+AC_MSG_RESULT(extracting PCRE2 regex library)
+cur_dir=`pwd`
+cd extras
+dnl remove old pcre2 directory to force a recompile...
+dnl and remove its installation prefix just to clean things up.
+rm -rf pcre2-$pcre2_version pcre2
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz pcre2.tar.gz
+else
+	cp pcre2.tar.gz pcre2.tar.gz.bak
+	gunzip -f pcre2.tar.gz
+	cp pcre2.tar.gz.bak pcre2.tar.gz
+	tar xf pcre2.tar
+fi
+AC_MSG_RESULT(configuring PCRE2 regex library)
+cd pcre2-$pcre2_version
+./configure --enable-jit --enable-shared --disable-unicode --prefix=$cur_dir/extras/pcre2 --libdir=$PRIVATELIBDIR || exit 1
+AC_MSG_RESULT(compiling PCRE2 regex library)
+$ac_cv_prog_MAKER || exit 1
+AC_MSG_RESULT(installing PCRE2 regex library)
+$ac_cv_prog_MAKER install || exit 1
+PCRE2_CFLAGS="-I$cur_dir/extras/pcre2/include"
+AC_SUBST(PCRE2_CFLAGS)
+PCRE2_LIBS=
+dnl See c-ares's compilation section for more info on this hack.
+dnl ensure that we're linking against the bundled version of pcre2
+dnl (we only reach this code if linking against the bundled version is desired).
+AS_IF([test -n "$ac_cv_path_PKGCONFIG"],
+       [PCRE2_LIBS="`$ac_cv_path_PKGCONFIG --libs libpcre2-8.pc`"])
+dnl For when pkg-config isn't available -- or for when pkg-config
+dnl doesn't see the libpcre2-8.pc file somehow... (#3982)
+AS_IF([test -z "$PCRE2_LIBS"],
+       [PCRE2_LIBS="$PRIVATELIBDIR/libpcre2-8.so"])
+AC_SUBST(PCRE2_LIBS)
+cd $cur_dir
+])
+
+dnl Use system argon2 when available, unless --without-system-argon2
+has_system_argon2="no"
+AS_IF([test "x$with_system_argon2" = "xyes"],[
+PKG_CHECK_MODULES([ARGON2], [libargon2 >= 0~20161029],[has_system_argon2=yes
+AS_IF([test "x$PRIVATELIBDIR" != "x"], [rm -f "$PRIVATELIBDIR/"libargon2*])],[has_system_argon2=no])])
+
+AS_IF([test "$has_system_argon2" = "no"],[
+dnl REMEMBER TO CHANGE WITH A NEW ARGON2 RELEASE!
+argon2_version="20181209"
+AC_MSG_RESULT(extracting Argon2 library)
+cur_dir=`pwd`
+cd extras
+dnl remove old argon2 directory to force a recompile...
+dnl and remove its installation prefix just to clean things up.
+rm -rf argon2-$argon2_version argon2
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz argon2-$argon2_version.tar.gz
+else
+	cp argon2-$argon2_version.tar.gz argon2-$argon2_version.tar.gz.bak
+	gunzip -f argon2-$argon2_version.tar.gz
+	cp argon2-$argon2_version.tar.gz.bak argon2-$argon2_version.tar.gz
+	tar xf argon2-$argon2_version.tar
+fi
+AC_MSG_RESULT(compiling Argon2 library)
+cd argon2-$argon2_version
+$ac_cv_prog_MAKER || exit 1
+AC_MSG_RESULT(installing Argon2 library)
+$ac_cv_prog_MAKER install PREFIX=$cur_dir/extras/argon2 || exit 1
+# We need to manually copy the libs to PRIVATELIBDIR because
+# there is no way to tell make install in libargon2 to do so.
+cp -av $cur_dir/extras/argon2/lib/* $PRIVATELIBDIR/
+ARGON2_CFLAGS="-I$cur_dir/extras/argon2/include"
+AC_SUBST(ARGON2_CFLAGS)
+ARGON2_LIBS="-L$PRIVATELIBDIR -largon2"
+AC_SUBST(ARGON2_LIBS)
+cd $cur_dir
+])
+
+dnl Use system c-ares when available, unless --without-system-cares.
+has_system_cares="no"
+AS_IF([test "x$with_system_cares" = "xyes"],[
+PKG_CHECK_MODULES([CARES], libcares >= 1.6.0,[has_system_cares=yes
+AS_IF([test "x$PRIVATELIBDIR" != "x"], [rm -f "$PRIVATELIBDIR/"libcares*])],[has_system_cares=no])])
+
+AS_IF([test "$has_system_cares" = "no"], [
+dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
+dnl NOTE: when changing this here, ALSO change it in extras/curlinstall
+dnl       and in the comment in this file around line 400!
+cares_version="1.15.0"
+AC_MSG_RESULT(extracting c-ares resolver library)
+cur_dir=`pwd`
+cd extras
+dnl remove old c-ares directory to force a recompile...
+rm -rf c-ares-$cares_version c-ares
+if test "x$ac_cv_path_GUNZIP" = "x" ; then
+	tar xfz c-ares.tar.gz
+else
+	cp c-ares.tar.gz c-ares.tar.gz.bak
+	gunzip -f c-ares.tar.gz
+	cp c-ares.tar.gz.bak c-ares.tar.gz
+	tar xf c-ares.tar
+fi
+AC_MSG_RESULT(configuring c-ares library)
+cd c-ares-$cares_version
+save_cflags="$CFLAGS"
+CFLAGS="$orig_cflags"
+export CFLAGS
+./configure --prefix=$cur_dir/extras/c-ares --libdir=$PRIVATELIBDIR --enable-shared || exit 1
+CFLAGS="$save_cflags"
+AC_MSG_RESULT(compiling c-ares resolver library)
+$ac_cv_prog_MAKER || exit 1
+AC_MSG_RESULT(installing c-ares resolver library)
+$ac_cv_prog_MAKER install || exit 1
+CARES_CFLAGS="-I$cur_dir/extras/c-ares/include"
+AC_SUBST(CARES_CFLAGS)
+CARES_LIBS="-L$PRIVATELIBDIR"
+
+dnl Set default library parameters for when pkg-config is not available
+dnl Ugly cd'ing out of extras/c-ares-xxx ;)
+dnl Note: must be a full path, not relative path.
+cd ../..
+CARESLIBSALT="$PRIVATELIBDIR/libcares.so"
+cd -
+case `uname -s` in
+	*FreeBSD*)
+		CARESLIBSALT="$CARESLIBSALT"
+		;;
+	*Linux*)
+		CARESLIBSALT="$CARESLIBSALT -lrt"
+		;;
+	*SunOS*)
+		CARESLIBSALT="$CARESLIBSALT -lrt"
+		;;
+esac
+
+dnl Use pkg-config for c-ares libraries, and if not available use defaults
+dnl from above (also if pkg-config returns an empty result).
+if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
+	CARES_LIBS="$CARES_LIBS $CARESLIBSALT"
+else
+	CARES_LIBSPRE="$CARES_LIBS"
+	dnl the sed expression forces an absolute path to the .so file to be generated
+	dnl because this is what libtool would do. If this wasn't done and /usr/lib*/libcares.so
+	dnl exists, then unrealircd would still try to link against the system c-ares.
+	dnl The [] quotation is needed because the sed expression has [] in it.
+	[CARES_LIBS="$CARES_LIBS `$ac_cv_path_PKGCONFIG --libs libcares.pc | sed -e 's,-L\([^ ]\+lib\) -lcares,\1/libcares.so,'`"]
+	if test "$CARES_LIBS" = "$CARES_LIBSPRE " ; then
+		CARES_LIBS="$CARES_LIBS $CARESLIBSALT"
+	fi
+fi
+AC_SUBST(CARES_LIBS)
+cd $cur_dir
+])
+
+AX_PTHREAD()
+
+CHECK_LIBCURL
+
+UNRLINCDIR="`pwd`/include"
+
+dnl Moved to the very end to ensure it doesn't affect any libs or tests.
+if test "$ac_cv_werror" = "yes" ; then
+	CFLAGS="$CFLAGS -Werror"
+fi
+
+dnl Address sanitizer build
+if test "$ac_cv_asan" = "yes" ; then
+	CFLAGS="$CFLAGS -O1 -fno-inline -fsanitize=address -fno-omit-frame-pointer -DNOCLOSEFD"
+	IRCDLIBS="-fsanitize=address $IRCDLIBS"
+fi
+
+AC_SUBST(IRCDLIBS)
+
+AC_SUBST(UNRLINCDIR)
+
+AC_CONFIG_FILES([Makefile
+	src/Makefile
+	src/modules/Makefile
+	src/modules/chanmodes/Makefile
+	src/modules/usermodes/Makefile
+	src/modules/snomasks/Makefile
+	src/modules/extbans/Makefile
+	src/modules/third/Makefile
+	unrealircd])
+AC_OUTPUT
+chmod 0700 unrealircd
diff --git a/doc/Authors b/doc/Authors
new file mode 100644
index 0000000..69fef62
--- /dev/null
+++ b/doc/Authors
@@ -0,0 +1,148 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, doc/AUTHORS
+ *   Copyright (C) 1990
+ *
+ * AUTHORS FILE:
+ *   This file attempts to remember all contributors to the IRC
+ *   developement. Names can be only added this file, no name
+ *   should never be removed. This file must be included into all
+ *   distributions of IRC and derived works.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+IRC was conceived of and written by Jarkko Oikarinen <jto@tolsun.oulu.fi>.
+IRC was originally written in University of Oulu, Computing Center.
+Jan 1991 - IRC 2.6  jto@tolsun.oulu.fi
+	- Multiple Channels and protocol changes
+
+Contributions were made by a cast of dozens, including the following:
+
+Markku Jarvinen <mta@tut.fi>: Emacs-like editing facility for the client
+
+Kimmo Suominen <kim@kannel.lut.fi>: HP-UX port
+
+Jeff Trim <jtrim@orion.cair.du.edu>: enhancements and advice
+
+Vijay Subramaniam <vijay@lll-winken.llnl.gov>: advice and ruthless publicity
+
+Karl Kleinpaste <karl@cis.ohio-state.edu>: user's manual
+
+Greg Lindahl <gl8f@virginia.edu>: AUTOMATON code, the Wumpus GM automaton,
+myriad bug fixes
+
+Bill Wisner <wisner@hayes.fai.alaska.edu>: numerous bug fixes and code
+enhancements
+
+Tom Davis <conslt16@zeus.unl.edu> and Tim Russell <russell@zeus.unl.edu>:
+VMS modifications
+
+Markku Savela <msa@tel4.tel.vtt.fi>: advice, support, and being the
+incentive to do some of our *own* coding. :)
+
+Tom Hopkins <hoppie@buengf.bu.edu>: bug fixes, quarantine lines,
+consolidation of various patches.
+
+Christopher Davis <ckd@cs.bu.edu>: EFnet/Anet gateway coding,
+many automata ;), documentation fixing.
+
+Helen Rose <hrose@cs.bu.edu>: documentation updating, and fixing.
+
+Tom Hinds <rocker@bucsf.bu.edu>: emacs client updating.
+
+Tim Miller <cerebus@bu-pub.bu.edu>: various server and client-breaking
+features.
+
+Darren Reed <avalon@coombs.anu.edu.au>: various bug fixes and enhancements.
+Introduced nickname and channelname hash tables into the server.
+
+The version 2.2 release was coordinated by Mike Bolotski
+<mikeb@salmon.ee.ubc.ca>.
+
+The version 2.4 release was coordinated by Markku Savela and
+Chelsea Ashley Dyerman
+
+The version 2.5.2 release was coordinated by Christopher Davis, Helen Rose,
+and Tom Hopkins.
+
+The versions 2.6.2, 2.7 and 2.8 releases were coordinated by Darren Reed.
+
+Contributions for the 2.8 release from the following people:
+Matthew Green <phone@coombs.anu.edu.au>
+Chuck Kane <ckane@ece.uiuc.edu>
+Matt Lyle <matt@oc.com>
+Vesa Ruokonen <ruokonen@lut.fi>
+
+Markku Savela <Markku.Savela@vtt.fi> / April 1990
+Fixed various bugs in 2.2PL1 release server (2.2msa.4) and changed
+sockets to use non-blocking mode (2.2msa.9). [I have absolutely
+nothing to do with clients :-]
+
+Chelsea Ashley Dyerman <chelsea@earth.cchem.berkeley.edu> / April 1990
+Rewrote the Makefiles, restructuring of source tree. Added libIrcd.a to
+the Makefile macros, numerous reformatting of server text messages, and
+added mkversion.sh to keep track of compilation statistics. Numerous
+bug fixes and enhancements, and co-coordinator of the 2.4 release.
+
+Jarle Lyngaas (nmijl@alf.uib.no) added Note functions to ircd.
+
+Armin Gruner <gruner@informatik.tu-muenchen.de> / May, June 1990:
+* Patched KILL-line feature for ircd.conf, works now.
+  Enhancement:  Time intervals can be specified in passwd-field.
+  Result: KILL-Line is only active during these intervals
+* Patched PRIVMSG handling, now OPER can specify masks for sending
+  private messages, advantage: msg to all at a specified server or host.
+* Little tests on irc 2.5 alpha, fixed some little typos in client code.
+  Change: common/debug.c has been moved to ircd/s_debug.c, and a
+  irc/c_debug.c has been created, for the benefit that wrong server msg
+  are displayed if client does not recognize them. (strange, if a server
+  sends an 'unknown command', isn't it?)
+
+Tom Hopkins <hoppie@buengf.bu.edu> / September, October 1990:
+* Patched msa's K lines for servers (Q lines).
+* Consolidated several patches, including Stealth's logging patch. 
+* Fixed several minor bugs. 
+* Has done lots of other stuff that I can't seem to remember, but he
+  always works on code, so he has to have done alot more than three
+  lines worth. :) 
+
+UnrealIRCd Coders
+Carsten Munk <stskeeps@unrealircd.com> / May 1999 - December 2008
+Dominick Meglio <codemastr@unrealircd.com> / June 1999 - August 2005
+David Flynn / March 2000 - June 2000
+McSkaf / June 2001 - September 2001
+Finny Merrill <griever@unrealircd.com> / November 2001 - December 2002
+Bram Matthys <syzop@unrealircd.com> / January 2002 - date
+This list is incomplete, type /INFO on IRC to find the updated list.
+
+Thanks go to those persons not mentioned here who have added their advice,
+opinions, and code to IRC.
+
+Various modifications, bugreports, cleanups and testing by:
+
+Hugo Calendar <hugo@ucscb.ucsc.edu>
+Bo Adler <adler@csvax.cs.caltech.edu>
+Michael Sandrof <ms5n+@andrew.cmu.edu>
+Jon Solomon <jsol@cs.bu.edu>
+Jan Peterson <jlp@hamblin.math.byu.edu>
+Nathan Glasser <nathan@brokaw.lcs.mit.edu>
+Helen Rose <hrose@eff.org>
+Mike Pelletier <stealth@caen.engin.umich.edu>
+Basalat Ali Raja <gwydion@tavi.rice.edu>
+Eric P. Scott <eps@toaster.sfsu.edu>
+Dan Goodwin <fornax@wpi.wpi.edu>
+Noah Friedman <friedman@ai.mit.edu>
+
+[ $Id$ ]
diff --git a/doc/Config.header b/doc/Config.header
new file mode 100644
index 0000000..caeeb18
--- /dev/null
+++ b/doc/Config.header
@@ -0,0 +1,32 @@
+
+ _   _                      _ ___________  _____     _
+| | | |                    | |_   _| ___ \/  __ \   | |
+| | | |_ __  _ __ ___  __ _| | | | | |_/ /| /  \/ __| |
+| | | | '_ \| '__/ _ \/  _ | | | | |    / | |    /  _ |
+| |_| | | | | | |  __/ (_| | |_| |_| |\ \ | \__/\ (_| |
+ \___/|_| |_|_|  \___|\__,_|_|\___/\_| \_| \____/\__,_|
+
+                               Configuration Program
+                                for UnrealIRCd 5.0.3.1
+                                    
+This program will help you to compile your IRC server, and ask you
+questions regarding the compile-time settings of it during the process. 
+regarding the setup of it, during the process.
+
+A short installation guide is available online at:
+https://www.unrealircd.org/docs/Installing_from_source
+
+Full documentation is available at:
+https://www.unrealircd.org/docs/UnrealIRCd_5_documentation
+
+--------------------------------------------------------------------------------------
+
+The full release notes are available in doc/RELEASE-NOTES.md
+For easier viewing, check out the latest online release notes at:
+https://github.com/unrealircd/unrealircd/blob/unreal50/doc/RELEASE-NOTES.md
+
+UnrealIRCd 5 is compatible with the following services:
+* anope with the "unreal4" protocol module - version 2.0.7 or higher required!
+* atheme with the "unreal4" protocol module - tested with version 7.2.9
+
+--------------------------------------------------------------------------------------
diff --git a/doc/Donation b/doc/Donation
new file mode 100644
index 0000000..d841432
--- /dev/null
+++ b/doc/Donation
@@ -0,0 +1,14 @@
+Although UnrealIRCd is a free program, we do put a great deal of time,
+effort, and money into keeping UnrealIRCd alive. If you like UnrealIRCd and
+want to support us then please consider making a donation.
+
+PayPal Donation Link: https://unrealircd.org/index/donations
+
+If you don't want to use PayPal, or you want to donate something other than
+money, then please contact Syzop (syzop@unrealircd.com).
+
+All those who donate at least a certain minimum amount will have their name
+and/or company listed in /CREDITS and will be listed on the website.
+
+Thank you for your support,
+The UnrealIRCd Team
diff --git a/doc/RELEASE-NOTES.md b/doc/RELEASE-NOTES.md
new file mode 100644
index 0000000..b7625dc
--- /dev/null
+++ b/doc/RELEASE-NOTES.md
@@ -0,0 +1,563 @@
+UnrealIRCd 5.0.3.1 Release Notes
+=================================
+
+UnrealIRCd 5.0.3.1
+-------------------
+This fixes a crash issue after REHASH in 5.0.3.
+
+UnrealIRCd 5.0.3
+-----------------
+Fixes:
+* Fix serious flood issue in labeled-response implementation.
+* An IRCOp SQUIT'ing a far remote server may cause a broken link topology
+* In channels that are +D (delayed join), PARTs were not shown correctly to
+  channel operators.
+
+Enhancements:
+* A new HISTORY command for history playback (```HISTORY #channel number-of-lines```)
+  which allows you to fetch more lines than the on-join history playback.
+  Of course, taking into account the set limits in the +H channel mode.
+  This command is one of the [two interfaces](https://www.unrealircd.org/docs/Channel_history#Ways_to_retrieve_history)
+  to [Channel history](https://www.unrealircd.org/docs/Channel_history).
+* Two new [message tags](https://www.unrealircd.org/docs/Message_tags),
+  ```unrealircd.org/userip``` and ```unrealircd.org/userhost```
+  which communicate the user@ip and real user@host to IRCOps.
+
+Changes:
+* Drop the draft/ prefix now that the IRCv3
+  [labeled-response](https://ircv3.net/specs/extensions/labeled-response.html)
+  specification is out of draft.
+* The operclass permission ```immune:target-limit``` is now called
+  ```immune:max-concurrent-conversations```, since it bypasses
+  [set::anti-flood::max-concurrent-conversations](https://www.unrealircd.org/docs/Set_block#set::anti-flood::max-concurrent-conversations).
+  For 99% of the users this change is not important, but it may be
+  if you use highly customized [operclass blocks](https://www.unrealircd.org/docs/Operclass_block)
+
+Are you upgrading from UnrealIRCd 4.x to UnrealIRCd 5? If so,
+then check out the *UnrealIRCd 5* release notes [further down](#unrealircd-5). At the
+very least, check out [Upgrading from 4.x](https://www.unrealircd.org/docs/Upgrading_from_4.x).
+
+UnrealIRCd 5.0.2
+-----------------
+
+Fixes:
+* Halfop users are not synced correctly, resulting in missing users across links.
+* [Channel history](https://www.unrealircd.org/docs/Channel_history) used
+incorrect time internally, resulting in messages expiring too soon.
+The syntax is now really ```/MODE #chan +H lines:time-in-minutes```.
+To make clear that the time is in minutes, an 'm' will be added
+automatically by the server (eg ```+H 15:1440m```).
+* Documentation: to exempt someone from gline via /ELINE you have to use type 'G', not 'g'.
+  Similarly, to exempt from spamfilter, use type 'F' and not 'f'.
+* Exempting IPs from throttling via [except throttle](https://www.unrealircd.org/docs/Except_throttle_block) was not working.
+* Unable to customize [set::tls::outdated-protocols](https://www.unrealircd.org/docs/Set_block#set::ssl::outdated-protocols)
+  and [set::tls::outdated-ciphers](https://www.unrealircd.org/docs/Set_block#set::ssl::outdated-ciphers).
+* Specifying multiple channels did not work in [set::auto-join](https://www.unrealircd.org/docs/Set_block#set::auto-join),
+  [set::oper-auto-join](https://www.unrealircd.org/docs/Set_block#set::oper-auto-join) and
+  [tld::channel](https://www.unrealircd.org/docs/Tld_block).
+
+Enhancements:
+* [Extended server bans](https://www.unrealircd.org/docs/Extended_server_bans) in *LINE and /ELINE allow
+  you to ban or exempt users on criteria other than host/IP. These use a
+  similar syntax to extended bans. Currently supported are ~a, ~S and ~r. Examples:
+  * ```/ELINE ~a:TrustedAccount kG 0 This user can bypass kline/gline when using SASL```
+  * ```/ELINE ~S:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef kGF 0 Trusted user with this certificate fingerprint```
+  * ```/GLINE ~r:*some*stupid*real*name*```
+  * These can also be used in the configuration file, eg: ```except ban { mask ~S:11223344etc; type all; };```
+* New options that may not be used much, but can be useful on specific networks:
+  * The IRCd may add automatic bans, for example due to a blacklist hit,
+    a spamfilter hit, or because of antirandom or antimixedutf8. The new
+    option [set::automatic-ban-target](https://www.unrealircd.org/docs/Set_block#set::automatic-ban-target) specifies on *what* the ban should
+    be placed. The default is *ip*. Other options are: userip, host, userhost, account, certfp.
+  * Similarly, an oper may type ```/GLINE nickname```. The new option
+    [set::manual-ban-target](https://www.unrealircd.org/docs/Set_block#set::manual-ban-target) specifies on what the ban should be placed.
+    By default this is *host* (fallback to *ip*).
+* New options to exempt webirc users: [set::connthrottle::webirc-bypass](https://www.unrealircd.org/docs/Connthrottle),
+  [set::restrict-commands::name-of-command::exempt-webirc](https://www.unrealircd.org/docs/Set_block#set::restrict-commands).
+
+UnrealIRCd 5.0.1
+-----------------
+
+Fixes:
+* IRCd may hang in rare circumstances
+* Windows: fix repeated "ERROR renaming 'data/reputation.db.tmp'" warnings
+* Antirandom and blacklist did not deal properly with 'warn' actions
+* [Authprompt](https://www.unrealircd.org/docs/Authentication#How_it_looks_like)
+  did not always work properly
+* Line numbers were incorrect in config file warnings/errors when using @if or @define
+
+Enhancements:
+* New /ELINE exception type 'm' to bypass allow::maxperip.
+  Or in the configuration file: ```except ban { mask 203.0.113.0/24; type maxperip; };```
+* IRCOps can override MLOCK restrictions when services are down,
+  if they have the channel:override:mlock operclass permission,
+  such as opers which use the operclass 'netadmin-with-override'.
+
+Other:
+* Gottem and k4be have [uploaded their 3rd party modules](https://modules.unrealircd.org/)
+  to unrealircd-contrib so *NIX users can now easily install them using the new
+  [Module manager](https://www.unrealircd.org/docs/Module_manager)
+
+UnrealIRCd 5
+-------------
+After more than 6 months of hard work, UnrealIRCd 5 is now our new "stable" branch.
+In particular I would like to thank Gottem and 'i' for their source code
+contributions and PeGaSuS and westor for testing releases.
+
+When we transitioned from 3.2.x to 4.0.0 there were 175,000 lines of source code
+added/removed during 3 years of development. This time it was 120,000 lines in
+only 6 months, a major effort!
+
+**If you are upgrading from 4.x to 5.x, then it would be wise to read
+[Upgrading from 4.x](https://www.unrealircd.org/docs/Upgrading_from_4.x).
+In any case, be sure to upgrade your services package first! (if you use any)**
+
+UnrealIRCd 5 is compatible with the following services:
+* [anope](https://www.anope.org/) (version 2.0.7 or higher) -
+  with the "unreal4" protocol module
+* [atheme](https://atheme.github.io/atheme.html) (version 7.2.9 or higher) -
+  with the "unreal4" protocol module
+
+Summary
+--------
+The most visible change to end-users is channel history. A lot of IRCv3 features were added.
+Various modules from Gottem have been integrated and enhanced.
+We now have a 3rd party module manager so you can install modules with 1 simple command.
+Channel settings of ```+P``` channels and *LINES are saved in a database and
+restored on startup (via 'channeldb' and 'tkldb' respectively).
+Channel mode ```+L``` has a slight change of meaning, the existing floodprot
+mode (```+f```) has a new type to prevent repeated messages and a new drop action.
+A few extended bans have been added as well (```~f``` and ```~p```).
+IRCOps now have the ability to add ban exceptions via the ```/ELINE``` command.
+Advanced admins can use more dynamic configuration options where you can
+define variables and use them later in the configuration file.
+Finally, there have been speed improvements, we use better defaults and
+have added more countermeasures and options against spambots.
+Under the hood *a significant amount* of the source code was changed and cleaned up.
+
+Read below for the full list of enhancements, changes and removals (and information for developers too).
+
+Enhancements
+-------------
+* Support for IRCv3 server generated [message tags](https://ircv3.net/specs/extensions/message-tags), which allows us to communicate
+  additional information in protocol messages such as in JOIN and PRIVMSG.
+  Currently implemented and permitted message tags are:
+  * [account](https://ircv3.net/specs/extensions/account-tag-3.2): communicate the services account that a user uses
+  * [msgid](https://ircv3.net/specs/extensions/message-ids): assign an unique message id to each message
+  * [time](https://ircv3.net/specs/extensions/server-time-3.2): assign a time label to each message
+  The last two are mainly for history playback.
+* Support for IRCv3 [echo-message](https://ircv3.net/specs/extensions/echo-message-3.2), which helps clients, among other things,
+  to see if the message you sent was altered in any way, eg: censored,
+  stripped from color, etc.
+* Support for IRCv3 [draft/labeled-response-0.2](https://ircv3.net/specs/extensions/labeled-response), which helps clients to
+  correlate commands and responses.
+* Support for IRCv3 [BATCH](https://ircv3.net/specs/extensions/batch-3.2), needed for some other features.
+* Recording and playback of [channel history](https://www.unrealircd.org/docs/Channel_history) when channel mode +H is set.
+  The syntax is: ```MODE #chan +H max-lines-to-record:max-time-to-record-in-minutes```.
+
+  For example: ```MODE #chan +H 50:1440``` means the last 50 messages will be stored and no
+  message will be stored longer than 1440 minutes (1 day).
+
+  The channel history is then played back when joining such a channel,
+  but with two things to keep in mind:
+  1) The client must support the 'server-time' CAP ('time' message tag),
+     otherwise history is not shown. Any modern IRC client supports this.
+  2) Only a maximum of 15 lines are played back on-join by default
+
+  The reason for the maximum 15 lines on-join playback is that this can
+  be quite annoying if you rejoin repeatedly and as to not flood the users
+  screen too much (unwanted). In the future we will support a mechanism
+  for clients to "fetch" history - rather than sending it on-join - so
+  they can fetch more than the 15 lines, up to the number of lines and
+  time configured in the +H channel mode.
+
+  You can configure the exact number of lines that are played back and
+  all the limits that apply to +H via [set::history::channel](https://www.unrealircd.org/docs/Set_block#set::history).
+* For saving and retrieving history we currently have the following options:
+  * *history_backend_mem*: channel history is stored in memory.
+    This is very fast but also means history is lost on restart.
+  * *history_backend_null*: don't store channel history at all.
+    This can be useful to load on servers with no users on it, such as a
+    hub server, where storing history is unnecessary.
+
+  As you can see there is currently no 'disk' backend. However, in the
+  future more options may be added. Also note that 3rd party modules
+  can add history backends as well.
+* Support for ban exceptions via the new ```/ELINE``` command. This allows you
+  to add exceptions for regular bans (KLINE/GLINE/ZLINE/etc), but also
+  for connection throttling and blacklist checking.
+  For more information, just type ```/ELINE ``` in your IRC client as an IRCOp.
+* [Websocket](https://www.unrealircd.org/docs/WebSocket_support) support now includes type 'text'
+  in addition to 'binary', which should work with [KiwiIRC](https://kiwiirc.com/)'s nextclient.
+
+  Also, websockets are no longer active on all ports by default. You have to explicitly
+  enable the websocket option in the listen block and also specify type *text* or *binary*,
+  eg: ```listen { ip *; port 6667; options { websocket { type text; } } }```
+
+  Also note that websockets require nick names and channels to consist of UTF8
+  characters only, due to
+  [WebSocket being incompatible with non-UTF8](https://www.unrealircd.org/docs/WebSocket_support#Problems_with_websockets_and_non-UTF8)
+* There's now a [Module manager](https://www.unrealircd.org/docs/Module_manager)
+  which allows you to install and upgrade 3rd party modules in an easy way:
+  * ```./unrealircd module list``` - to list all available 3rd party modules
+  * ```./unrealircd module install third/something``` - to install the specified module.
+* You can now test for configuration errors without actually starting the
+  IRC server. This is ideal if you are upgrading UnrealIRCd to a newer
+  version: simply run ```./unrealircd configtest``` to make sure it passes
+  the configuration test, and then you can safely restart the server for
+  the upgrade (in this example case).
+* Channel mode +L now kicks in for any rejected join, so not just for +l but
+  also for +b, +i, +O, +z, +R and +k. If, for example, the channel is
+  +L #insecure and also +z then, when an insecure user ties to join, they
+  will be redirected to #insecure.
+* New extended ban ~f to forward users to the specified channel if the ban
+  matches. Example: ```MODE #chan +b ~f:#badisp:*!*@*.isp.org```
+* Channel mode +f now has a 'd' action: drop message. This will send an
+  error message to the user and not show the message in the channel but
+  otherwise do nothing (no kick or ban).
+  For example: ```MODE #chan +f [5t#d]:15``` will limit sending a maximum of
+  5 messages per 15 seconds per-user and drop any messages sent above that limit.
+* Channel mode +f now has 'r' floodtype to prevent repeated lines. This will
+  compare the current message to the last message and the one before that
+  the user sent to the channel. If it's a repeat then the user can be
+  kicked (the default action), the message can be dropped ('d') or the
+  user can be banned ('b'). Example: ```MODE #chan +f [1r#d]:15```
+  If you want to permit 1 repeated line but not 2 then use: ```+f [2r#d]:15```
+* New module **tkldb** (loaded by default): all *LINES and spamfilters are now
+  saved across reboots. No need for services for that anymore.
+* New module **channeldb** (loaded by default): saves and restores all channel
+  settings including topic, modes, bans etc. of +P (persistent) channels.
+* New module [restrict-commands](https://www.unrealircd.org/docs/Set_block#set::restrict-commands), which allows you to restrict any IRC
+  command based on criteria such as "how long is this user connected",
+  "is this user registered (has a services account)" etc.
+  The example.conf now ships with configuration to disable LIST the
+  first 60 seconds and disable INVITE the first 120 seconds.
+  If you are having spambot problems then tweaking this configuration
+  may be helpful to you.
+* New option [set::require-module](https://www.unrealircd.org/docs/Set_block#set::require-module), which allows you to require certain
+  modules on other UnrealIRCd 5 servers, otherwise the link is rejected.
+* New option [set::min-nick-length](https://www.unrealircd.org/docs/Set_block#set::min-nick-length) to set a minimum nick length.
+* New module rmtkl (loaded by default): this allows you to remove TKL's
+  such as GLINEs easily via the /RMTKL command.
+* The [reputation and connthrottle](https://www.unrealircd.org/docs/Connthrottle) modules are now loaded by default.
+  Just as a reminder, what these do is classifying your users in "known
+  users (known IP's)" and "unknown IP's" for IP's that have not been
+  seen before (or only for a short amount of time). Then, when there
+  is a connection flood, unknown/new IP addresses are throttled at
+  20 connections per minute, while known users are always allowed in.
+* Add support for [defines and conditional configuration](https://www.unrealircd.org/docs/Defines_and_conditional_config) via @define and @if.
+  This is mostly for power users, in particular users who share the same
+  configuration file across several servers.
+* New extban ~p to hide the part/quit message in PART and QUIT.
+  For example: ```MODE #chan +b ~p:*!*@*.nl```
+* You will now see a warning when a server is not responding even
+  before they time out. How long to wait for a PONG reply upon PING
+  can be changed via [set::ping-warning](https://www.unrealircd.org/docs/Set_block#set::ping-warning) and defaults to 15 seconds.
+  If you see the warning frequently then your connection is flakey.
+* Add new setting [set::broadcast-channel-messages](https://www.unrealircd.org/docs/Set_block#set::broadcast-channel-messages) which defines when
+  channel messages are sent across server links. The default setting
+  is *auto* which is the correct setting for pretty much everyone.
+* Add new option [set::part-instead-of-quit-on-comment-change](https://www.unrealircd.org/docs/Set_block#set::part-instead-of-quit-on-comment-change):
+  when a QUIT message is changed due to channel restrictions, such as
+  stripping color or censoring a word, we normally change the QUIT
+  message. This has an effect on ALL channels, not just the one that
+  imposed the restrictions. While we feel that is the best tradeoff,
+  there is now also this new option (off by default) that will change
+  the QUIT into a PART in such a case, so the other channels that
+  do not have the restrictions (eg: are -S and -G) can still see the
+  original QUIT message.
+* New module [webredir](https://www.unrealircd.org/docs/Set_block#set::webredir::url). Quite some people run their IRCd on port 443 or 80
+  so their users can avoid firewall restrictions in place. In such a case,
+  with this module, you can now send a HTTP redirect in case some user
+  enters your IRC server name in their browser. Eg https://irc.example.org/
+  can be made to redirect to https://www.example.org/
+* We now protect against misbehaving SASL servers and will time out
+  SASL sessions after
+  [set::sasl-timeout](https://www.unrealircd.org/docs/Set_block#set::sasl-timeout),
+  which is 15 seconds by default.
+
+Changed
+--------
+* Channel mode +L can now be set by chanops (+o and higher) instead of only
+  by +q (channel owner)
+* Channel names must now be valid UTF8 by default.
+  We actually have 3 possible settings of [set::allowed-channelchars](https://www.unrealircd.org/docs/Set_block#set::allowed-channelchars):
+  * **utf8**:  Channel must be valid UTF8, this is the new default
+  * **ascii**: A very strict setting, for example in use at freenode,
+     the channel name may not contain high ascii or UTF8
+  * **any**:   A very loose setting, which allows almost all characters
+     in the channel name. This was the OLD default, up to and
+     including UnrealIRCd 4. It is no longer recommended.
+
+  For most networks this new default setting of utf8 will be fine, since
+  by far most IRC clients use UTF8 for many years already.
+  If you have a network that has a significant portion of chatters
+  that are on old non-UTF8 clients that use a specific character set
+  then you may want to use ```set { allowed-nickchars any; }```
+  Some Russian and Ukrainian networks are known to need this.
+* The "except tkl" block is now called [except ban](https://www.unrealircd.org/docs/Except_ban_block#UnrealIRCd_5). If no type
+  is specified in an except ban { } block then we exempt the entry
+  from kline, gline, zline, gzline and shun.
+* We no longer use a blacklist for stats (set::oper-only-stats).
+  We use a whitelist now instead: [set::allow-user-starts](https://www.unrealircd.org/docs/Set_block#set::allow-user-stats).
+  Most users can just remove their old set::oper-only-stats line,
+  since the new default set::allow-user-starts setting is fine.
+* Windows: we now require a 64-bit version, Windows 7 or later.
+  The new program path is: C:\Program Files\UnrealIRCd 5
+  and the binaries have been moved to a new subdirectory: bin\
+* Modules lost their m_ prefix, so for example m_map is now just map.
+  Also the modules in cap/ are now directly in modules.
+* More modules that were previously PERM (permanent) can now be unloaded
+  and reloaded on the fly. This allows more "hotfixing" without restart
+  in case of a bug and also more control for admins at runtime.
+  Only <5 modules out of 173 are permanent now.
+* User mode +T now blocks channel CTCPs as well.
+* User mode +q (unkickable) could previously be set by any IRCOp.
+  This has been changed to require the self:unkickablemode operclass
+  permission. This is included in the *-with-override operclasses
+  (eg: netadmin-with-operoverride).
+* [set::modes-on-join](https://www.unrealircd.org/docs/Set_block#set::modes-on-join) is now ```+nt``` by default.
+* The [authprompt](https://www.unrealircd.org/docs/Authentication#How_it_looks_like) module is now loaded by default. This means that if
+  you do a soft kline on someone (eg: ```KLINE %*@*.badisp```) then the user
+  has a chance to [authenticate](https://www.unrealircd.org/docs/Authentication#How_it_looks_like) to services, even without SASL, and
+  bypass the ban if (s)he is authenticated.
+* The WHOX module is now used by default. Previously it was optional.
+  WHOX enhances the "WHO" output, providing additional information to
+  IRC clients such as the services account that someone is using.
+  It is also more universal than standard WHO. Unfortunately this also
+  means the WHO syntax changed to something less logical.
+* At many places the term *SSL* has been changed to *SSL/TLS* or *TLS*.
+  Configuration items (eg: set::ssl to set::tls) have been renamed
+  as well and so have directories (eg: conf/ssl to conf/tls).
+  The old configuration names still work and currently does NOT raise
+  any warning. Also, when upgrading an existing installation on *NIX,
+  the conf/tls directory will be symlinked to conf/ssl as to not break
+  any Let's Encrypt certificate scripts.
+* It is now mandatory to have at least one open SSL/TLS port, otherwise
+  UnrealIRCd will refuse to boot. Previously this was a warning.
+* IRCOps now need to use SSL/TLS in order to oper up, as the
+  [set::plaintext-policy::oper](https://www.unrealircd.org/docs/Set_block#set::plaintext-policy) default setting is now 'deny'.
+  Similarly, [set::outdated-tls-policy::oper](https://www.unrealircd.org/docs/Set_block#set::outdated-tls-policy) is now also 'deny'.
+  You can change this, if you want, but it is not recommended.
+* [set::outdated-tls-policy::server](https://www.unrealircd.org/docs/Set_block#set::outdated-tls-policy) is now 'deny' as well, since all
+  servers should use reasonable SSL/TLS protocols and ciphers.
+* The default generated certificated has been changed from RSA 4096 bits
+  to Elliptic Curve Cryptography "384r1". This provides the same amount
+  of security but at higher speed. This only affects the default self-
+  signed certificate. You can still use RSA certificates just fine.
+* If you do use an RSA certificate, we now require it to be at least
+  2048 bits otherwise UnrealIRCd will refuse to boot.
+* When matching [allow { } blocks](https://www.unrealircd.org/docs/Allow_block), we now always continue with the next
+  block (if any) if the password did not match or no password was
+  specified. In other words, allow::options::nopasscont is now the
+  default and we behave as if there was a ::wrongpasscont too.
+* All snomasks are now oper-only. Previously some were not, which
+  was confusing and could lead to information leaks.
+  Also removed weird set::snomask-on-connect accordingly.
+* The IRCd now uses hash tables that are resilient against hash table
+  attacks. Also, the hash tables have increased in size to speed things
+  up when looking up nick names etc.
+* Server options in VERSION (eg: Fhin6OoEMR3) are no longer shown to
+  normal users. They don't mean much nowadays anyway.
+* ```./Config``` now asks fewer questions and configure runs faster since
+  many unnecessary checks have been removed (compatibility with very
+  old compilers / systems).
+* We now default to system libs (eg: ```--with-system-pcre2``` is assumed)
+* Spamfilter should catch some more spam evasion techniques.
+* All /DCCDENY and deny dcc { } parsing and checking is now moved to
+  the 'dccdeny' module.
+* Windows: If you choose to run UnrealIRCd as a service then it now
+  runs under the low-privilege NetworkService account rather than
+  the high-privilege LocalSystem account.
+
+Minor issues fixed
+-------------------
+* Specifying a custom OpenSSL/LibreSSL path should work now
+
+Removed
+--------
+* Support for old server protocols has been removed.
+  This means UnrealIRCd 5.x cannot link to 3.2.x. It also means you need
+  to use reasonably new services. Generally, if your services can link to
+  4.x then they should be able to link to 5.x as well. More information
+  about this change and why it was done
+  [can be found here](https://www.unrealircd.org/docs/FAQ#old-server-protocol).
+* Connecting with a server password will no longer send that password
+  to NickServ. Use [SASL](https://www.unrealircd.org/docs/SASL) instead!
+* Extended ban ~R (registered nick): this was the old method to match
+  registered users. Everyone should use ~a (services account) instead.
+* The old TRE **posix** regex method has been removed because the TRE
+  library is no longer maintained for over a decade and contains many
+  bugs. (It was already deprecated in UnrealIRCd 4.2.3).
+  Use type **regex** instead, which uses the modern PCRE2 regex engine.
+* Timesync support has been removed. Use your OS time synchronization
+  instead. (Note that Timesync was already disabled by default in 2018)
+* Changing time offsets via ```TSCTL OFFSET``` and ```TSCTL SVSTIME``` are no longer
+  supported. Use your OS time synchronization (NTP!). Adjustments via
+  TSCTL are simply not accurate enough.
+* The *nopost* module was removed since it no longer serves any useful
+  purpose. UnrealIRCd already protects against these kind of attacks
+  via ping cookies ([set::ping-cookie](https://www.unrealircd.org/docs/Set_block#set::ping-cookie), enabled by default).
+
+Deprecated
+-----------
+* The set::official-channels block is now deprecated. This provided a
+  mechanism to pre-configure channels that would have 0 members and
+  would appear in /LIST with those settings, but once you joined all
+  those settings would be gone. Rather confusing.
+
+  Since UnrealIRCd 4.x we have permanent channels (+P) and since 5.x
+  we store these permanent channels in a database so all settings are
+  saved every few minutes and across restarts.
+
+  Since permanent channels (+P) are much better, the official-channels
+  support will be removed in a later version. There's no reason to
+  use official-channels anymore.
+
+Developers
+-----------
+* The module header is now as follows:
+
+      ModuleHeader MOD_HEADER
+        = {
+              "nameofmodule",
+              "5.0",
+              "Some description", 
+              "Name of Author",
+              "unrealircd-5",
+          };
+  There's a new author field, the version must start with a digit,
+  and also the name of the module must match the loadmodule name.
+  So for example third/funmod must also be named third/funmod.
+* The ```MOD_TEST```, ```MOD_INIT```, ```MOD_LOAD``` and ```MOD_UNLOAD``` functions no longer
+  take a name argument. So: ```MOD_INIT(mymod)``` is now ```MOD_INIT()```
+* We now use our own BuildBot infrastructure, so Travis-CI and AppVeyor
+  have been removed.
+* We now use a new test framework.
+* ```Auth_Check()``` now returns ```1``` for allow and ```0``` on deny (!!)
+* New function ```new_message()``` which should be called when a new message
+  is sent, or at least for all channel events. It adds (or inherits)
+  message tags like 'account', 'msgid', 'time', etc.
+* Many send functions now take an extra MessageTag *mtags parameter,
+  including but not limited to: sendto_one() and sendto_server().
+* Command functions (CMD_FUNC) have an extra ```MessageTag *mtags```,
+  on the other hand the ```cptr``` parameter has been removed.
+* Command functions no longer return ```int``` but are ```void```,
+  the same is true for  ```exit_client()```. ```FLUSH_BUFFER``` has been removed too.
+  All this is a consequence of removing this (limited) signaling
+  of client exits. From now on, if you call ```exit_client()``` it will free
+  a lot of the client data and exit the user (close socket, send [s]quit),
+  but it will **not free 'sptr' itself**, so you can simply check if some
+  upstream function killed the client by checking ```IsDead(sptr)```.
+  This is highly recommended after running ```do_cmd()``` or calling other
+  functions that could kill a client. In which case you should return
+  rather than continue doing anything with ```sptr```.
+  Ultimately, in the main loop, the client will be freed (normally in less than 1 second).
+* New single unified ```sendto_channel()``` and ```sendto_local_common_channels()```
+  functions that are used by all the channel commands.
+* Numerics should now be sent using ```sendnumeric()```. There's also
+  a format string version ```sendnumericfmt()``` in case you need it,
+  in which case you need to pass the numeric format string yourself.
+  In such a case, don't forget the colon character, like ":%s", where needed.
+* The parameters in several hooks have changed. Many now have an
+  extra ```MessageTag *mtags``` parameter. Sometimes there are other changes
+  as well, for example ```HOOKTYPE_CHANMSG``` now has 4 extra parameters.
+* You can call do_cmd() with NULL mtags. Usually this is the correct way.
+* If you used ```HOOKTYPE_PRE_USERMSG``` to block a message then you
+  should now use ```HOOKTYPE_CAN_SEND_TO_USER```. Similarly, the hook
+  ```HOOKTYPE_CAN_SEND``` which deals with channels is now called
+  ```HOOKTYPE_CAN_SEND_TO_CHANNEL```. Some other remarks:
+  * You CANNOT use HOOKTYPE_PRE_USERMSG anymore.
+  * The hooks require you to set an error message if you return HOOK_DENY.
+  * You should not send an error message yourself from these hooks.
+    In other words: do not use sendnumeric(). This is done by the
+    hook caller, based on the error message you return.
+  * Thanks to this, all rejecting of user messages now use generic
+    numeric 531 and all rejecting of channel messages use numeric 404.
+    See also under *Client protocol* later in this document.
+* If you use CommandOverrideAddEx() to specify a priority value (rare)
+  then be aware that in 5.0.1 we now use the 4.0.x behavior again to
+  match the same style of priorities in hooks: overrides with the
+  lowest priority are run first.
+* If you ever send a timestamp in a printf-like function, such as
+  in ```sendto_server()```, then be sure to use ```%lld``` and cast the timestamp
+  to *long long* so that it is compatible with both *NIX and Windows.
+  Example: ```sendnotice(sptr, "Timestamp is %lld", (long long)ts);```
+* ```EventAdd()``` changed the order of parameters and expects every_msec now
+  which specifies the time in milliseconds rather than seconds. This
+  allows for additional precision, or at least multiple calls per second.
+  The minimum allowed every_msec value is 100 at this time.
+  The prototype is now: ```EventAdd(Module *module, char *name,
+  vFP event, void *data, long every_msec, int count);```
+* New ```HOOKTYPE_IS_HANDSHAKE_FINISHED```. If a module returns ```0``` there, then
+  the ```register_user()``` function will not be called and the user will
+  not come online (yet). This is used by CAP and some other stuff.
+  Can be useful if your module needs to "hold" a user in the registration
+  phase.
+* The function ```is_module_loaded()``` now takes a relative path like
+  "usermodes/noctcp" because with just "ctcp" one could not see the
+  difference between usermodes/noctcp and chanmodes/noctcp.
+* ```CHFL_CHANPROT``` is now ```CHFL_CHANADMIN```, ```is_chanprot()``` is now ```is_chanadmin()```
+* All hash tables now use [SipHash](https://en.wikipedia.org/wiki/SipHash), which is a hash function that is
+  resilient against hash table attacks. If you, as a module dev, too
+  use any hash tables anywhere (note: this is quite rare), then you
+  are recommended to use our functions, see the functions siphash()
+  and siphash_nocase() in src/hash.c.
+* The random generator has been updated to use [ChaCha](https://en.wikipedia.org/wiki/Salsa20#ChaCha20_adoption) (more modern).
+* You can now save pointers and integers etc. across rehashes by using
+  ```LoadPersistentPointer()``` and ```SavePersistentPointer()```. For an example,
+  see ```src/modules/chanmodes/floodprot.c``` how this can be used.
+  Note that there can be no struct or type changes between rehashes.
+* New ModData types: ```MODDATA_LOCALVAR``` and ```MODDA_GLOBALVAR```. These are
+  settings or things that are locally or globally identified by the
+  variable name only and not attached to any user/channel.
+* Various files have been renamed. As previously mentioned, the m_
+  prefix was dropped in ```src/modules/m_*.c```. Similarly the s_ prefix
+  was dropped in ```src/s_*.c``` since it no longer had meaning. Also some
+  files have been deleted and integrated elsewhere or renamed to
+  have a name that better reflects their true meaning.
+  Related to this change is that all command functions are now called
+  ```cmd_name``` rather than ```m_name```.
+* ```HOOKTYPE_CHECK_INIT``` and ```HOOKTYPE_PRE_LOCAL_CONNECT```
+  have their return value changed. You should now return ```HOOK_*```, such
+  as ```HOOK_DENY``` or ```HOOK_CONTINUE```.
+
+Server protocol
+----------------
+* UnrealIRCd 5 now assumes you support the following PROTOCTL options:
+  ```NOQUIT EAUTH SID NICKv2 SJOIN SJ3 NICKIP TKLEXT2```.
+  If you fail to use ```SID``` or ```EAUTH``` then you will receive an
+  error. For the other options, support is *assumed*, no warning or
+  error is shown when you lack support. These are options that most,
+  if not all, services support since UnrealIRCd 4.x so it shouldn't be
+  a problem. More information [here](https://www.unrealircd.org/docs/FAQ#old-server-protocol)
+* ```PROTOCTL MTAGS``` indicates that the server is capable of handling
+  message tags and that the server can cope with 4K lines. (Note that
+  the ordinary non-message-tag part is still limited to 512 bytes).
+* Pseudo ID support in SASL was removed. We now use real UID's.
+  This breaks services who rely on the old pseudo ID format.
+
+Client protocol
+----------------
+* Support for message tags and other IRCv3 features. See the IRCv3
+  specifications for more details.
+* When a message is blocked, for whatever reason, we now use a generic
+  numeric response: ```:server 531 yourname targetname :reason``` for the block
+  This replaces all the various NOTICEs, ```ERR_NOCTCP```, ```ERR_NONONREG```, etc.
+  with just one single numeric.
+  The only other numerics that you may still encounter when PM'ing are
+  ```ERR_NOSUCHNICK```, ```ERR_TOOMANYTARGETS``` and ```ERR_TARGETTOOFAST```, which are
+  generic errors to any command involving targets. And ```ERR_SERVICESDOWN```.
+  Note that channel messages already had a generic numeric for signaling
+  blocked messages for a very long time, ```ERR_CANNOTSENDTOCHAN```.
+* The 271 response to the SILENCE command is now:
+  ```:server 271 yournick listentry!*@*```
+  Previously the nick name appeared twice, which was a mistake.
+* The 470 numeric, which is sent on /JOIN #channel redirect to #redirect
+  now uses the following format:
+  ```:server 470 yournick #channel #redirect :[Link] Cannot join channel...etc..```
+* Clients are recommended to implement and enable the
+  [server-time](https://ircv3.net/specs/extensions/server-time-3.2)
+  extension by default. When enabled, channel history is played back
+  on-join (if any) when the channel has channel mode +H.
+  Otherwise your users will not see channel history.
diff --git a/doc/coding-guidelines b/doc/coding-guidelines
new file mode 100644
index 0000000..f9cedc2
--- /dev/null
+++ b/doc/coding-guidelines
@@ -0,0 +1,123 @@
+Rules about patches & modifications to UnrealIRCd
+
+1. When making a change, always add a small description in the commit log.
+   Don't forget to mention the bug# and credit the reporter (if any).
+
+2. If new files are made, they must contain proper copyright headers.
+
+3. Each bug or feature should have a bug# so people can have a discussion
+   about it. This has a few implications (read!!):
+   * People must report bugs/feature requests to bugs.unrealircd.org and
+     not on IRC, e-mail, etc.
+   * That means other people can see the bug# and comment on it. This means
+     discussion is easy to read back for each issue and not spread between
+     several IRC logs.
+     Furthermore, by using the bugtracker instead of directly committing,
+     people could point out that there might be a better way to do things
+     than you originally thought, or it might be that other devs don't like
+     it at all.
+   * If a head coder has 'acknowledged' or 'confirmed' the issue or stated
+     in a comment that it's OK to implement, then any dev may take the issue.
+     The dev should change the status to 'assigned' and work on it, then
+     commit and change it to 'resolved', set 'fixed in version' to the
+     correct release, and add a comment pasting the relevant commit log.
+     Of course other guidelines, in particular rule #7, still applies.
+
+4. If you don't have direct write access to the repository then you can
+   submit changes as as PR on github. It is very much preferred to also
+   have a bugs.unrealircd.org entry for it as well (see previous item).
+
+5. For the stable branch, in general, only commit changes that have an
+   associated bugid# and/or were discussed.
+   For branches currently in development (alpha/beta) there's more freedom
+   and if you think the change will be small and is fine without a
+   discussion then feel free to commit.
+
+6. Regarding reidenting, restructuring or other major code cleanups: please
+   discuss before doing so. The other devs might not agree with you on the
+   particular cleanup you have in mind which would result in another
+   clean-up-the-cleanup commit.
+   You may, however reindent and clean up individual sections when you are
+   working on fixing a particular bug# or implementing a new feature. In fact
+   you're encouraged to do so if the code is confusing without it. However,
+   obey the style of Unreal's code (mostly outlined in this document)
+   and do not introduce yet another (new) style. Also, be careful with doing
+   any cleanup: if you're unsure in any way about the use of something,
+   or something that looks redundant on first sight, then look more
+   carefully... it might indeed be useless and/or redundant, but it might
+   also be a subtle thing that can create great bugs when 'cleaned up'.
+
+7. During the Release Candidate stage (from RC1 until the final release)
+   only the head coder may commit directly, all others should ask and
+   present their patch before committing. Yes, even if you are changing
+   only 1 line of code or text.
+
+9. UnrealIRCd should compile on all supported operating systems and
+   platforms, using GCC 3 or higher on *NIX, and Visual Studio 2008 or
+   higher on Windows. This means you cannot blindly use all C99 extensions.
+
+10. Coders must test their code before committing.
+
+11. /*  
+     * These kind of comments
+     */
+ 
+   NOT
+ 
+   // These kind of comments
+
+12. 	if (something == 1) 
+   	{
+		moo; /* comment */
+		/* This does what what what */
+		cow(go(moo));
+	}
+	
+	NOT 
+	
+	if (something == 1) {
+	}
+	
+13. Do not touch version.c.SH or version.h, unless you are a head coder.
+    If you need a credit in, contact us
+   
+14. Protocol changes must be discussed before making patches for it.
+
+15. We do NOT rip people off. If we use other people's code, it MUST be
+    properly credited.
+
+16. We use tabsize 8 and we use tabs AND NOT SPACES.
+    Some code is old and horrible and has a mix of tabs and spaces used for
+    spacing, that's something we do not want to have ;)
+
+17. Be careful about overflows. Do not do any unchecked string copies.
+    Instead of strcpy, strcat and sprintf/ircsprintf, use the following
+    functions: strlcpy, strlcat, snprintf/ircnsprintf.
+    If you are copying/writing character-by-character or word-by-word in a
+    loop, eg using *p++ = x; then be very sure about your size counting.
+    Often it's better to avoid such code altogether, by simply using
+    strlcat for everything.
+
+18. Speed.  When optimizing or writing code, keep in mind that readability and
+    stability comes FIRST, and after that comes speed. So we'd rather prefer some
+    readable code (even if difficult) over some odd highly optimized routine which
+    nobody understands, is difficult to extend, and might have several bugs.
+    As mentioned earlier: use ircsnprintf, not snprintf (this is because
+    ircsnprintf is optimized for simple strings like the ones we use).
+    ircsnprintf calls snprintf when it finds a (non-simple) format specifier it
+    can't handle.  Simple format specifiers do not have prefixes other than
+    h and l.
+
+19. Initialize your structs and use the proper memory calls.
+    In UnrealIRCd we use safe_alloc, safe_free, safe_strdup and safe_strldup.
+    Do NOT use malloc, calloc or strdup.
+
+20. Comment your code! This should speak for itself...
+    Put comments wherever you think they are needed, to aid any further coders
+    with reading your code.. and, in fact, it will aid yourself as well if you
+    would look back at your code 2 years later.
+    If there's some obscure pitfall, DO mention it! Don't just "hope" a next
+    author will see it like you did.
+
+21. Use enums whenever possible, rather than #define constants. Besides making
+    things more clean, it also aids debugging.
diff --git a/doc/compiling_win32.txt b/doc/compiling_win32.txt
new file mode 100644
index 0000000..11d52ab
--- /dev/null
+++ b/doc/compiling_win32.txt
@@ -0,0 +1,2 @@
+For information on how to compile UnrealIRCd (modules) on Windows, see:
+https://www.unrealircd.org/docs/Compiling_UnrealIRCd_on_Windows
diff --git a/doc/conf/badwords.conf b/doc/conf/badwords.conf
new file mode 100644
index 0000000..8b8a792
--- /dev/null
+++ b/doc/conf/badwords.conf
@@ -0,0 +1,99 @@
+badword channel { word "bitch";     replace "wombat";         }
+badword channel { word "bro";       replace "bo";             }
+badword channel { word "(brother)"; replace "bredda";         }
+badword channel { word "car";       replace "taxi";           }
+badword channel { word "discord";   replace "dicsord";        }
+badword channel { word "efnet";     replace "efrael";         }
+badword channel { word "hate";      replace "04 hate "; }
+badword channel { word "hello";     replace "smello";         }
+badword channel { word "house";     replace "flat";           }
+badword channel { word "gaming";    replace "gaymen";         }
+badword channel { word "im";        replace "m";              }
+badword channel { word "i'm";       replace "m";              }
+badword channel { word "i am";      replace "m";              }
+badword channel { word "my";        replace "me";             }
+badword channel { word "(nigger)";  replace "angel";          }
+badword channel { word "np";        replace "mp";             }
+badword channel { word "on";        replace "pon";            }
+badword channel { word "same";      replace "salami";         }
+badword channel { word "(skyp)";    replace "skik";           }
+badword channel { word "(ss)";      replace "ÏŸÏŸ";             }
+badword channel { word "(troll)";   replace "papillion";      }
+badword channel { word "uber";      replace "HELLS ANGELS";   }
+badword channel { word "(year)";    replace "yonk";           }
+
+badword channel { word "sup";       replace "wah gwaan"; }
+badword channel { word "wussup";    replace "wah gwaan"; }
+badword channel { word "wats up";   replace "wah gwaan"; }
+badword channel { word "watsup";    replace "wah gwaan"; }
+badword channel { word "whatsup";   replace "wah gwaan"; }
+badword channel { word "whats up";  replace "wah gwaan"; }
+badword channel { word "what's up"; replace "wah gwaan"; }
+badword channel { word "wuddup";    replace "wah gwaan"; }
+
+badword channel { word "gal";     replace "bint";  }
+badword channel { word "(girl)";  replace "bint";  }
+badword channel { word "lady";    replace "bint";  }
+badword channel { word "ladies";  replace "bints"; }
+badword channel { word "(woman)"; replace "bint";  }
+badword channel { word "women";   replace "bints"; }
+
+badword channel { word "ganja";     replace "bobby brown"; }
+badword channel { word "marijuana"; replace "bobby brown"; }
+badword channel { word "pot";       replace "bobby brown"; }
+badword channel { word "weed";      replace "bobby brown"; }
+
+badword channel { word "kek";   replace "%%"; }
+badword channel { word "lmao";  replace "%%"; }
+badword channel { word "lmfao"; replace "%%"; }
+badword channel { word "(lol)"; replace "%%"; }
+badword channel { word "lorf";  replace "%%"; }
+badword channel { word "rofl";  replace "%%"; }
+badword channel { word "rr";    replace "%%"; }
+
+#badword channel { word "came";     replace "came (nohomo)";    }
+#badword channel { word "come";     replace "come (nohomo)";    }
+#badword channel { word "comes";    replace "comes (nohomo)";   }
+#badword channel { word "coming";   replace "coming (nohomo)";  }
+#badword channel { word "hard";     replace "hard (nohomo)";    }
+#badword channel { word "nut";      replace "nut (nohomo)";     }
+#badword channel { word "nuts";     replace "nuts (nohomo)";    }
+#badword channel { word "up";       replace "up (nohomo)";      }
+#badword channel { word "vertical"; replace "vertical (nohmo)"; }
+
+#badword channel { word "(a)"; replace "Ａ"; }
+#badword channel { word "(b)"; replace "ï¼¢"; }
+#badword channel { word "(c)"; replace "ï¼£"; }
+#badword channel { word "(d)"; replace "Ｄ"; }
+#badword channel { word "(e)"; replace "ï¼¥"; }
+#badword channel { word "(f)"; replace "Ｆ"; }
+#badword channel { word "(g)"; replace "Ｇ"; }
+#badword channel { word "(h)"; replace "Ｈ"; }
+#badword channel { word "(i)"; replace "Ｉ"; }
+#badword channel { word "(j)"; replace "Ｊ"; }
+#badword channel { word "(k)"; replace "Ｋ"; }
+#badword channel { word "(l)"; replace "Ｌ"; }
+#badword channel { word "(m)"; replace "ï¼­"; }
+#badword channel { word "(n)"; replace "ï¼®"; }
+#badword channel { word "(o)"; replace "Ｏ"; }
+#badword channel { word "(p)"; replace "ï¼°"; }
+#badword channel { word "(q)"; replace "ï¼±"; }
+#badword channel { word "(r)"; replace "ï¼²"; }
+#badword channel { word "(s)"; replace "ï¼³"; }
+#badword channel { word "(t)"; replace "ï¼´"; }
+#badword channel { word "(u)"; replace "ï¼µ"; }
+#badword channel { word "(v)"; replace "Ｖ"; }
+#badword channel { word "(w)"; replace "ï¼·"; }
+#badword channel { word "(x)"; replace "Ｘ"; }
+#badword channel { word "(y)"; replace "ï¼¹"; }
+#badword channel { word "(z)"; replace "Ｚ"; }
+#badword channel { word "(0)"; replace "�"; }
+#badword channel { word "(1)"; replace "１"; }
+#badword channel { word "(2)"; replace "ï¼’"; }
+#badword channel { word "(3)"; replace "３"; }
+#badword channel { word "(4)"; replace "ï¼”"; }
+#badword channel { word "(5)"; replace "５"; }
+#badword channel { word "(6)"; replace "ï¼–"; }
+#badword channel { word "(7)"; replace "ï¼—"; }
+#badword channel { word "(8)"; replace "８"; }
+#badword channel { word "(9)"; replace "ï¼™"; }
diff --git a/doc/conf/except.conf b/doc/conf/except.conf
new file mode 100644
index 0000000..14a9be5
--- /dev/null
+++ b/doc/conf/except.conf
@@ -0,0 +1,35 @@
+# Localhost
+except ban { mask *@127.0.0.1; }
+
+# IRCCloud
+except ban { mask *@192.184.9.108;      } # highgate.irccloud.com
+except ban { mask *@192.184.9.110;      } # ealing.irccloud.com
+except ban { mask *@192.184.9.112;      } # charlton.irccloud.com
+except ban { mask *@192.184.10.118;     } # brockwell.irccloud.com
+except ban { mask *@192.184.10.9;       } # tooting.irccloud.com
+except ban { mask *@192.184.8.73;       } # hathersage.irccloud.com
+except ban { mask *@192.184.8.103;      } # stonehaven.irccloud.com
+except ban { mask *@2001:67c:2f08::/48; } # IPv6
+
+# IRC Source
+except ban { mask *@49.56.142.157;            } # yin.ircs.me
+except ban { mask *@149.56.142.163;           } # yang.ircs.me
+except ban { mask *@2607:5300:201:3100::13dd; } # yin.ircs.me
+except ban { mask *@2607:5300:201:3100::299d; } # yang.ircs.me
+
+# KiwiIRC
+except ban { mask *@107.161.19.53;  }
+except ban { mask *@107.161.19.109; }
+except ban { mask *@109.169.31.4;   }
+except ban { mask *@109.169.31.13;  } # KiwiIRC Verify Bot (out.kiwiirc.com)
+
+# Mibbit
+except ban { mask *@207.192.75.252;                 } # ircip1.mibbit.com
+except ban { mask *@64.62.228.82;                   } # ircip2.mibbit.com
+except ban { mask *@78.129.202.38;                  } # ircip3.mibbit.com
+except ban { mask *@109.169.29.95;                  } # ircip4.mibbit.com
+except ban { mask *@97.107.138.109;                 } # bot.search.mibbit.com
+except ban { mask *@2600:3c03::f03c:91ff:fe96:c1fa; } # bot.search.mibbit.com
+
+# Netsplit
+except ban { mask *@85.25.137.63; } # eagle.netsplit.de
diff --git a/doc/conf/ircd.motd b/doc/conf/ircd.motd
new file mode 100644
index 0000000..1113ad7
--- /dev/null
+++ b/doc/conf/ircd.motd
@@ -0,0 +1,47 @@
+   0,0     0â•—  0,0  0â•—  0,0  0â•— 0,0      0â•—  0,0       0â•— 0,0      0â•—
+  0,0  0╔��0,0  0╗ 0,0  0║  0,0  0║ 0,0  0╔��0,0  0╗ 0,0  0╔����� 0,0  0╔��0,0  0╗
+  0,0  0║  ╚�� 0,0  0║  0,0  0║ 0,0  0║  0,0  0║ 0,0  0║      0,0  0║  0,0  0║
+  0╚0,0     0╗  0,0  0║  0,0  0║ 0,0      0╔� 0,0       0╗ 0,0      0╔�
+   0╚���0,0  0╗ 0,0  0║  0,0  0║ 0,0  0╔����  0,0  0╔����� 0,0  0╔��0,0  0╗
+  0,0  0â•—  0,0  0â•‘ 0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘      0,0  0â•‘      0,0  0â•‘  0,0  0â•‘
+  0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘      0,0  0â•‘      0,0  0â•‘  0,0  0â•‘
+  0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘      0,0  0â•‘      0,0  0â•‘  0,0  0â•‘
+  0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘  0,0  0â•‘ 0,0  0â•‘      0,0  0â•‘      0,0  0â•‘  0,0  0â•‘
+  0╚0,0     0╔� ╚0,0     0╔� 0,0  0║      0,0       0╗ 0,0  0║  0,0  0║
+0   ╚�����   ╚�����  ╚��      ╚������� ╚��  ╚��
+
+      0,12                                          
+    0,12    0,4                              0,12          
+  0,12    0,4      0,8  0,4    0,8        0,4    0,8  0,4        0,12        
+0,12    0,4      0,8  0,4    0,8            0,4      0,8  0,4      0,12      
+0,12    0,4    0,8    0,4    0,8                      0,4    0,12      
+  0,12    0,4    0,8  0,4                      0,8    0,4  0,12        
+    0,12    0,4                              0,12          
+      0,12    0,4    0,8              0,4        0,12            
+        0,12    0,4      0,8  0,4  0,8      0,4      0,12              
+          0,12    0,4                  0,12                
+            0,12    0,4    0,8      0,4    0,12                  
+              0,12    0,4    0,8  0,4    0,12                    
+                0,12    0,4      0,12                      
+                  0,12    0,4  0,12                        
+                    0,12                            
+                      0,12  
+
+     0,0     0â•—  0,0  0â•— 0,0       0â•— 0,0      0â•—  0,0     0â•—
+     0,0  0╔�0,0  0╗ 0,0  0║ 0,0  0╔�����   0,0  0╔�� 0,0  0╔��0,0  0╗
+     0,0  0║ 0,0  0║ 0,0  0║ 0,0  0║        0,0  0║   0,0  0║  ╚��
+     0,0  0â•‘ 0,0  0â•‘ 0,0  0â•‘ 0,0       0â•—   0,0  0â•‘   â•š0,0     0â•—
+     0,0  0║ 0,0  0║ 0,0  0║ 0,0  0╔�����   0,0  0║    ╚���0,0  0╗
+     0,0  0â•‘ 0,0  0â•‘ 0,0  0â•‘ 0,0  0â•‘        0,0  0â•‘   0,0     0,0  0â•‘
+     0,0  0║ ╚0,0     0║ 0,0       0╗   0,0  0║   ╚0,0     0╔�
+     0╚��  ╚����� ╚�������   ╚��    ╚�����
+
+
+
+4──────────────────┤ 0RULES 4├───────────────────
+
+14• 7Do not disrupt or compromise our security. 
+14• 7No malicious abuse of network services.
+14• 7No distribution of child pornography.
+
+4──────────────────────────────────────────────
\ No newline at end of file
diff --git a/doc/conf/links.conf b/doc/conf/links.conf
new file mode 100644
index 0000000..73f889e
--- /dev/null
+++ b/doc/conf/links.conf
@@ -0,0 +1,11 @@
+link bulbasaur.supernets.org {
+	incoming { mask REDACTED; }
+	outgoing {
+		bind-ip *;
+		hostname REDACTED;
+		port REDACTED;
+		options { tls; }
+	}
+	password "REDACTED" { spkifp; }
+	class servers;
+}
\ No newline at end of file
diff --git a/doc/conf/modules.conf b/doc/conf/modules.conf
new file mode 100644
index 0000000..d91700c
--- /dev/null
+++ b/doc/conf/modules.conf
@@ -0,0 +1,190 @@
+// User Commands (Minimal)
+#loadmodule "admin";
+loadmodule "away";
+loadmodule "invite";
+loadmodule "ison";
+loadmodule "join";
+loadmodule "kick";
+loadmodule "links";
+loadmodule "list";
+loadmodule "lusers";
+loadmodule "map";
+loadmodule "message";
+loadmodule "mode";
+loadmodule "motd";
+loadmodule "names";
+loadmodule "nick";
+loadmodule "part";
+loadmodule "pass";
+loadmodule "pingpong";
+loadmodule "protoctl";
+loadmodule "quit";
+#loadmodule "rules";
+loadmodule "topic";
+loadmodule "user";
+loadmodule "userhost";
+loadmodule "watch";
+loadmodule "whox";
+loadmodule "whois";
+#loadmodule "whowas";
+
+// User Commands (Extended)
+#loadmodule "botmotd";
+loadmodule "cap";
+loadmodule "cycle";
+#loadmodule "dccallow";
+#loadmodule "help";
+loadmodule "history";
+loadmodule "knock";
+loadmodule "lag";
+loadmodule "sasl";
+loadmodule "setname";
+loadmodule "silence";
+loadmodule "starttls";
+loadmodule "time";
+loadmodule "userip";
+loadmodule "vhost";
+
+// Operator Commands
+#loadmodule "addmotd";
+#loadmodule "addomotd";
+loadmodule "chghost";
+loadmodule "chgident";
+loadmodule "chgname";
+loadmodule "close";
+loadmodule "connect";
+#loadmodule "dccdeny";
+#loadmodule "globops";
+#loadmodule "jumpserver";
+loadmodule "kill";
+#loadmodule "locops";
+loadmodule "mkpasswd";
+loadmodule "oper";
+#loadmodule "opermotd";
+loadmodule "sajoin";
+loadmodule "samode";
+loadmodule "sapart";
+#loadmodule "sdesc";
+loadmodule "sethost";
+loadmodule "setident";
+loadmodule "squit";
+loadmodule "stats";
+loadmodule "tkl";
+loadmodule "trace";
+loadmodule "tsctl";
+loadmodule "unsqline";
+#loadmodule "wallops";
+
+// Server-2-Server Commands
+loadmodule "eos";
+loadmodule "md";
+loadmodule "netinfo";
+#loadmodule "require-module";
+loadmodule "server";
+loadmodule "sinfo";
+loadmodule "sjoin";
+loadmodule "sqline";
+loadmodule "swhois";
+loadmodule "umode2";
+
+// Services Commands
+loadmodule "sendsno";
+loadmodule "sendumode";
+loadmodule "svsjoin";
+loadmodule "svskill";
+loadmodule "svslusers";
+loadmodule "svsmode";
+loadmodule "svsmotd";
+loadmodule "svsnick";
+loadmodule "svsnline";
+loadmodule "svsnolag";
+loadmodule "svsnoop";
+loadmodule "svspart";
+loadmodule "svssilence";
+loadmodule "svssno";
+loadmodule "svswatch";
+
+// Channel Modes
+loadmodule "chanmodes/censor";       /* +G */
+loadmodule "chanmodes/delayjoin";    /* +D */
+loadmodule "chanmodes/floodprot";    /* +f */
+loadmodule "chanmodes/history";      /* +H */
+loadmodule "chanmodes/issecure";     /* +Z */
+loadmodule "chanmodes/link";         /* +L */
+loadmodule "chanmodes/nocolor";      /* +c */
+loadmodule "chanmodes/noctcp";       /* +C */
+loadmodule "chanmodes/noinvite";     /* +V */
+loadmodule "chanmodes/nokick";       /* +Q */
+loadmodule "chanmodes/noknock";      /* +K */
+loadmodule "chanmodes/nonickchange"; /* +N */
+loadmodule "chanmodes/nonotice";     /* +T */
+loadmodule "chanmodes/operonly";     /* +O */
+loadmodule "chanmodes/permanent";    /* +P */
+loadmodule "chanmodes/regonly";      /* +R */
+loadmodule "chanmodes/regonlyspeak"; /* +M */
+loadmodule "chanmodes/secureonly";   /* +z */
+loadmodule "chanmodes/stripcolor";   /* +S */
+
+// User Modes
+loadmodule "usermodes/bot";           /* +B */
+#loadmodule "usermodes/censor";       /* +G */
+loadmodule "usermodes/noctcp";        /* +T */
+loadmodule "usermodes/nokick";        /* +q */
+loadmodule "usermodes/privacy";       /* +p */
+loadmodule "usermodes/privdeaf";      /* +D */
+loadmodule "usermodes/regonlymsg";    /* +R */
+loadmodule "usermodes/secureonlymsg"; /* +Z */
+loadmodule "usermodes/servicebot";    /* +S */
+#loadmodule "usermodes/showwhois";    /* +W */
+
+
+// Snomasks
+#loadmodule "snomasks/dccreject"; /* +D */
+
+// Extended Bans
+loadmodule "extbans/account";     /* +b ~a */
+loadmodule "extbans/certfp";      /* +b ~S */
+#loadmodule "extbans/inchannel";  /* +b ~c */
+#loadmodule "extbans/join";       /* +b ~j */
+loadmodule "extbans/msgbypass";   /* +e ~m */
+#loadmodule "extbans/nickchange"; /* +b ~n */
+#loadmodule "extbans/operclass";  /* +b ~O */
+#loadmodule "extbans/partmsg";    /* +b ~p */
+loadmodule "extbans/quiet";       /* +b ~q */
+loadmodule "extbans/realname";    /* +b ~r */
+loadmodule "extbans/textban";     /* +b ~T */
+loadmodule "extbans/timedban";    /* +b ~t */
+
+// IRCv3 Extensions
+loadmodule "account-tag";
+loadmodule "batch";
+loadmodule "echo-message";
+loadmodule "labeled-response";
+loadmodule "link-security";
+loadmodule "message-ids";
+loadmodule "message-tags";
+loadmodule "plaintext-policy";
+loadmodule "server-time";
+loadmodule "sts";
+
+// Other
+loadmodule "antimixedutf8";
+#loadmodule "authprompt";
+loadmodule "blacklist";
+loadmodule "certfp";
+loadmodule "channeldb";
+loadmodule "charsys";
+loadmodule "connthrottle";
+loadmodule "hideserver";
+loadmodule "history_backend_mem";
+#loadmodule "history_backend_null";
+loadmodule "ident_lookup";
+loadmodule "jointhrottle";
+loadmodule "tkldb";
+loadmodule "tls_antidos";
+loadmodule "userhost-tag";
+loadmodule "userip-tag";
+loadmodule "reputation";
+loadmodule "restrict-commands";
+loadmodule "rmtkl";
+loadmodule "webirc";
\ No newline at end of file
diff --git a/doc/conf/modules.sources.list b/doc/conf/modules.sources.list
new file mode 100644
index 0000000..b8fec7e
--- /dev/null
+++ b/doc/conf/modules.sources.list
@@ -0,0 +1 @@
+https://modules.unrealircd.org/modules.list
diff --git a/doc/conf/opers.conf b/doc/conf/opers.conf
new file mode 100644
index 0000000..0c00b12
--- /dev/null
+++ b/doc/conf/opers.conf
@@ -0,0 +1,162 @@
+oper acidvegas {
+	mask localhost;
+	password "REDACTED" { sslclientcertfp; }
+	class clients;
+	operclass netadmin;
+	require-modes z;
+	maxlogins 1;
+	vhost super.nets;
+	swhois "1,1                                 1,5          1,1                                   ";
+	swhois "1,1                                1,5    1,7  1,5  1,7  1,5    1,1                                ";
+	swhois "1,1                              1,5   1,7 1,5 1,7   1,5  1,7     1,5   1,1                      0 1       ";
+	swhois "1,1                             1,5   1,7       1,5 1,7      1,5    1,1                            ";
+	swhois "1,1                            1,5   1,7        1,5 1,7        1,5   1,1                           ";
+	swhois "1,1                          1,5    1,7                    1,5   1,1                         ";
+	swhois "1,1                          1,5    1,7                     1,5   1,1                        ";
+	swhois "1,1                          1,5  1,7                        1,5  1,1                        ";
+	swhois "1,1                         1,5  1,7                         14 1,5 1,1                        ";
+	swhois "1,1                        1,5   1,7                           1,5 1,1                       ";
+	swhois "1,1                        1,5  1,7                            1,5 1,1                       ";
+	swhois "1,1                        1,5  1,7          1,5      1,7            1,5 1,1                       ";
+	swhois "1,1                        1,5  1,7      1,5        1,7              1,5 1,1                       ";
+	swhois "1,1                       1,5   1,7    1,5        1,7                1,5 1,1                       ";
+	swhois "1,1                      1,5              1,7                1,5   1,1                       ";
+	swhois "1,1                      1,5             1,7                   1,5 1,1                       ";
+	swhois "1,1                      1,5           1,7                     1,5  1,1                      ";
+	swhois "1,1                       1,5         1,7                      1,5  1,1                      ";
+	swhois "1,1                          1,5     1,7         1,5 1,7             1,5  1,1                      ";
+	swhois "1,1                            1,5  1,7          1,5 1,7             1,5  1,1                      ";
+	swhois "1,1                            1,5  1,7          1,5 1,7             1,5  1,1                      ";
+	swhois "1,1                            1,5  1,7          1,5 1,7             1,5  1,1                      ";
+	swhois "1,1                            1,5  1,7          1,5 1,7             1,5  1,1  0THE BIGGEST       1  ";
+	swhois "1,1                            1,5  1,7          1,5 1,7             1,5  1,1  0DICK ON IRC       1  ";
+	swhois "1,1                            1,5  1,7          1,5 1,7             1,5  1,1                      ";
+	swhois "1,1                            1,5  1,7         1,5  1,7             1,5  1,1                      ";
+	swhois "1,1                           1,5   1,7         1,5  1,7             1,5  1,1                      ";
+	swhois "1,1                           1,5  1,7          1,5 1,7              1,5  1,1                      ";
+	swhois "1,1                           1,5  1,7          1,5 1,7              1,5  1,1                      ";
+	swhois "1,1                          1,5   1,7          1,5 1,7              1,5  1,1                      ";
+	swhois "1,1                          1,5  1,7           1,5 1,7              1,5  1,1                      ";
+	swhois "1,1                          1,5  1,7                 1,5 1,7        1,5  1,1                      ";
+	swhois "1,1                          1,5  1,7                 1,5  1,7       1,5  1,1                      ";
+	swhois "1,1                         1,5   1,7                 1,5  1,7       1,5  1,1                      ";
+	swhois "1,1                         1,5  1,7                   1,5 1,7       1,5  1,1                      ";
+	swhois "1,1                        1,5   1,7                   1,5 1,7       1,5  1,1                      ";
+	swhois "1,1                        1,5  1,7                    1,5 1,7       1,5  1,1                      ";
+	swhois "1,1                       1,5  1,7                     1,5 1,7       1,5  1,1                      ";
+	swhois "1,1                      1,5   1,7      1,5 1,7              1,5 1,7       1,5  1,1                      ";
+	swhois "1,1                      1,5  1,7       1,5 1,7              1,5 1,7       1,5           1,1             ";
+	swhois "1,1                      1,5  1,7      1,5  1,7              1,5 1,7       1,5   1,7      1,5      1,1         ";
+	swhois "1,1                      1,5  1,7      1,5  1,7                      1,5  1,7           1,5    1,1       ";
+	swhois "1,1                      1,5  1,7      1,5 1,7                       1,5  1,7              1,5   1,1     ";
+	swhois "1,1              1,5            1,7                                              1,5   1,1   ";
+	swhois "1,1          1,5     1,7          1,5   1,7                                             1,5  1,1   ";
+	swhois "1,1      1,5     1,7               1,5  1,7                                             1,5  1,1   ";
+	swhois "1,1    1,5   1,7                                                                  1,5  1,1   ";
+	swhois "1,1   1,5  1,7                                   1,5    1,7                             1,5  1,1   ";
+	swhois "1,1  1,5   1,7                                     1,5  1,7                             1,5  1,1   ";
+	swhois "1,1  1,5  1,7                                      1,5  1,7                            1,5  1,1    ";
+	swhois "1,1  1,5  1,7                                      1,5  1,7                          1,5   1,1     ";
+	swhois "1,1  1,5  1,7                                      1,5  1,7                       1,5    1,1       ";
+	swhois "1,1  1,5  1,7                                      1,5   1,7                 1,5      1,1          ";
+	swhois "1,1  1,5  1,7                                      1,5                     1,1               ";
+	swhois "1,1  1,5  1,7                                    1,5    1,1                                  ";
+	swhois "1,1  1,5    1,7                                1,5    1,1                                    ";
+	swhois "1,1    1,5     1,7                          1,5    1,1                                       ";
+	swhois "1,1        1,5        1,7               1,5    1,1                                           ";
+	swhois "1,1              1,5                 1,1                                               ";
+}
+
+#oper mate {
+#	class clients;
+#	mask localhost;
+#	password "REDACTED" { sslclientcertfp; }
+#	operclass linker;
+#	require-modes z;
+#	maxlogins 1;
+#	vhost super.nets.link;
+#}
+
+oper 5000 {
+	class clients;
+	mask localhost;
+	password "REDACTED";
+	operclass fuckyou;
+	require-modes z;
+	maxlogins 1;
+	vhost 5000;
+}
+
+oper cancer {
+	class clients;
+	mask localhost;
+	password "REDACTED";
+	operclass linker;
+	require-modes z;
+	maxlogins 1;
+	vhost NCER;
+}
+
+operclass netadmin {
+	permissions {
+		chat { notice { global; } }
+		client { set; }
+		immune { join-flood; max-conncurrent-conversionations; maxchannelsperuser; nick-flood; server-ban { spamfilter; } }
+		kill;
+		channel { operonly; override; see; }
+		route;
+		sacmd;
+		self { set; }
+		server { rehash; }
+		server-ban { gline; spamfilter; zline; }
+	}
+}
+
+operclass linker {
+	permissions {
+		immune { join-flood; nick-flood; server-ban { spamfilter; } }
+		channel { operonly { join; topic; } }
+		channel {
+			override {
+				invite { self; }
+				message { ban; moderated; }
+				mode { extban; }
+			}
+		}
+		channel {
+			see {
+				list { secret; }
+				names { invisible; secret; }
+				whois;
+			}
+		}
+	}
+}
+
+operclass cancer {
+	permissions {
+		immune { join-flood; max-concurrent-conversations; server-ban { spamfilter; } }
+		kill { global; }
+		channel {
+			override {
+				flood; 
+				message { ban; moderated; }
+				mode { extban; }
+			}
+		}
+	}
+}
+
+operclass fuckyou {
+	permissions {
+		immune { join-flood; server-ban { spamfilter; } }
+		channel {
+			override {
+				flood; 
+				message { ban; moderated; }
+				mode { extban; }
+			}
+		}
+		sacmd { sajoin; }
+	}
+}
\ No newline at end of file
diff --git a/doc/conf/remote.motd b/doc/conf/remote.motd
new file mode 100644
index 0000000..e69de29
diff --git a/doc/conf/spamfilter.conf b/doc/conf/spamfilter.conf
new file mode 100644
index 0000000..ca469df
--- /dev/null
+++ b/doc/conf/spamfilter.conf
@@ -0,0 +1,7 @@
+#spamfilter {
+#	match-type simple;
+#	match "*spam*message*here*";
+#	target { private; private-notice; channel; channel-notice; }
+#	action kill;
+#	reason "8,4   E N T E R   T H E   V O I D   ";
+#}
\ No newline at end of file
diff --git a/doc/conf/tls/curl-ca-bundle.crt b/doc/conf/tls/curl-ca-bundle.crt
new file mode 100644
index 0000000..edc5090
--- /dev/null
+++ b/doc/conf/tls/curl-ca-bundle.crt
@@ -0,0 +1,3432 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Wed Oct 16 03:12:09 2019 GMT
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: c979c6f35714a0fedb17d9e5ba37adecbbc91a8faf4186b4e23d6f9ca44fd6cb
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R6
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIORea7A4Mzw4VlSOb/RVEwDQYJKoZIhvcNAQEMBQAwTDEgMB4GA1UECxMX
+R2xvYmFsU2lnbiBSb290IENBIC0gUjYxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkds
+b2JhbFNpZ24wHhcNMTQxMjEwMDAwMDAwWhcNMzQxMjEwMDAwMDAwWjBMMSAwHgYDVQQLExdHbG9i
+YWxTaWduIFJvb3QgQ0EgLSBSNjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFs
+U2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJUH6HPKZvnsFMp7PPcNCPG0RQss
+grRIxutbPK6DuEGSMxSkb3/pKszGsIhrxbaJ0cay/xTOURQh7ErdG1rG1ofuTToVBu1kZguSgMpE
+3nOUTvOniX9PeGMIyBJQbUJmL025eShNUhqKGoC3GYEOfsSKvGRMIRxDaNc9PIrFsmbVkJq3MQbF
+vuJtMgamHvm566qjuL++gmNQ0PAYid/kD3n16qIfKtJwLnvnvJO7bVPiSHyMEAc4/2ayd2F+4OqM
+PKq0pPbzlUoSB239jLKJz9CgYXfIWHSw1CM69106yqLbnQneXUQtkPGBzVeS+n68UARjNN9rkxi+
+azayOeSsJDa38O+2HBNXk7besvjihbdzorg1qkXy4J02oW9UivFyVm4uiMVRQkQVlO6jxTiWm05O
+WgtH8wY2SXcwvHE35absIQh1/OZhFj931dmRl4QKbNQCTXTAFO39OfuD8l4UoQSwC+n+7o/hbguy
+CLNhZglqsQY6ZZZZwPA1/cnaKI0aEYdwgQqomnUdnjqGBQCe24DWJfncBZ4nWUx2OVvq+aWh2IMP
+0f/fMBH5hc8zSPXKbWQULHpYT9NLCEnFlWQaYw55PfWzjMpYrZxCRXluDocZXFSxZba/jJvcE+kN
+b7gu3GduyYsRtYQUigAZcIN5kZeR1BonvzceMgfYFGM8KEyvAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSubAWjkxPioufi1xzWx/B/yGdToDAfBgNV
+HSMEGDAWgBSubAWjkxPioufi1xzWx/B/yGdToDANBgkqhkiG9w0BAQwFAAOCAgEAgyXt6NH9lVLN
+nsAEoJFp5lzQhN7craJP6Ed41mWYqVuoPId8AorRbrcWc+ZfwFSY1XS+wc3iEZGtIxg93eFyRJa0
+lV7Ae46ZeBZDE1ZXs6KzO7V33EByrKPrmzU+sQghoefEQzd5Mr6155wsTLxDKZmOMNOsIeDjHfrY
+BzN2VAAiKrlNIC5waNrlU/yDXNOd8v9EDERm8tLjvUYAGm0CuiVdjaExUd1URhxN25mW7xocBFym
+Fe944Hn+Xds+qkxV/ZoVqW/hpvvfcDDpw+5CRu3CkwWJ+n1jez/QcYF8AOiYrg54NMMl+68KnyBr
+3TsTjxKM4kEaSHpzoHdpx7Zcf4LIHv5YGygrqGytXm3ABdJ7t+uA/iU3/gKbaKxCXcPu9czc8FB1
+0jZpnOZ7BN9uBmm23goJSFmH63sUYHpkqmlD75HHTOwY3WzvUy2MmeFe8nI+z1TIvWfspA9MRf/T
+uTAjB0yPEL+GltmZWrSZVxykzLsViVO6LAUP5MSeGbEYNNVMnbrt9x+vJJUEeKgDu+6B5dpffItK
+oZB0JaezPkvILFa9x8jvOOJckvB595yEunQtYQEgfn7R8k8HWV+LLUNS60YMlOH1Zkd5d9VUWx+t
+JDfLRVpOoERIyNiwmcUVhAn21klJwGW45hpxbqCo8YLoRT5s1gLXCmeDBVrJpBA=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GC CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIICaTCCAe+gAwIBAgIQISpWDK7aDKtARb8roi066jAKBggqhkjOPQQDAzBtMQswCQYDVQQGEwJD
+SDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEo
+MCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQyBDQTAeFw0xNzA1MDkwOTQ4MzRa
+Fw00MjA1MDkwOTU4MzNaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYDVQQL
+ExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEdsb2Jh
+bCBSb290IEdDIENBMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAETOlQwMYPchi82PG6s4nieUqjFqdr
+VCTbUf/q9Akkwwsin8tqJ4KBDdLArzHkdIJuyiXZjHWd8dvQmqJLIX4Wp2OQ0jnUsYd4XxiWD1Ab
+NTcPasbc2RNNpI6QN+a9WzGRo1QwUjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUSIcUrOPDnpBgOtfKie7TrYy0UGYwEAYJKwYBBAGCNxUBBAMCAQAwCgYIKoZIzj0E
+AwMDaAAwZQIwJsdpW9zV57LnyAyMjMPdeYwbY9XJUpROTYJKcx6ygISpJcBMWm1JKWB4E+J+SOtk
+AjEA2zQgMgj/mkkCtojeFK9dbJlxjRo/i9fgojaGHAeCOnZT/cKi7e97sIBPWA9LUzm9
+-----END CERTIFICATE-----
+
+GTS Root R1
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxUtHDA3sM9CJuRz04TANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjEwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjEwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2EQKLHuOhd5s73L+UPreVp0A8of2C+X0yBoJx
+9vaMf/vo27xqLpeXo4xL+Sv2sfnOhB2x+cWX3u+58qPpvBKJXqeqUqv4IyfLpLGcY9vXmX7wCl7r
+aKb0xlpHDU0QM+NOsROjyBhsS+z8CZDfnWQpJSMHobTSPS5g4M/SCYe7zUjwTcLCeoiKu7rPWRnW
+r4+wB7CeMfGCwcDfLqZtbBkOtdh+JhpFAz2weaSUKK0PfyblqAj+lug8aJRT7oM6iCsVlgmy4HqM
+LnXWnOunVmSPlk9orj2XwoSPwLxAwAtcvfaHszVsrBhQf4TgTM2S0yDpM7xSma8ytSmzJSq0SPly
+4cpk9+aCEI3oncKKiPo4Zor8Y/kB+Xj9e1x3+naH+uzfsQ55lVe0vSbv1gHR6xYKu44LtcXFilWr
+06zqkUspzBmkMiVOKvFlRNACzqrOSbTqn3yDsEB750Orp2yjj32JgfpMpf/VjsPOS+C12LOORc92
+wO1AK/1TD7Cn1TsNsYqiA94xrcx36m97PtbfkSIS5r762DL8EGMUUXLeXdYWk70paDPvOmbsB4om
+3xPXV2V4J95eSRQAogB/mqghtqmxlbCluQ0WEdrHbEg8QOB+DVrNVjzRlwW5y0vtOUucxD/SVRNu
+JLDWcfr0wbrM7Rv1/oFB2ACYPTrIrnqYNxgFlQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU5K8rJnEaK0gnhS9SZizv8IkTcT4wDQYJKoZIhvcNAQEM
+BQADggIBADiWCu49tJYeX++dnAsznyvgyv3SjgofQXSlfKqE1OXyHuY3UjKcC9FhHb8owbZEKTV1
+d5iyfNm9dKyKaOOpMQkpAWBz40d8U6iQSifvS9efk+eCNs6aaAyC58/UEBZvXw6ZXPYfcX3v73sv
+fuo21pdwCxXu11xWajOl40k4DLh9+42FpLFZXvRq4d2h9mREruZRgyFmxhE+885H7pwoHyXa/6xm
+ld01D1zvICxi/ZG6qcz8WpyTgYMpl0p8WnK0OdC3d8t5/Wk6kjftbjhlRn7pYL15iJdfOBL07q9b
+gsiG1eGZbYwE8na6SfZu6W0eX6DvJ4J2QPim01hcDyxC2kLGe4g0x8HYRZvBPsVhHdljUEn2NIVq
+4BjFbkerQUIpm/ZgDdIx02OYI5NaAIFItO/Nis3Jz5nu2Z6qNuFoS3FJFDYoOj0dzpqPJeaAcWEr
+tXvM+SUWgeExX6GjfhaknBZqlxi9dnKlC54dNuYvoS++cJEPqOba+MSSQGwlfnuzCdyyF62ARPBo
+pY+Udf90WuioAnwMCeKpSwughQtiue+hMZL77/ZRBIls6Kl0obsXs7X9SQ98POyDGCBDTtWTurQ0
+sR8WNh8M5mQ5Fkzc4P4dyKliPUDqysU0ArSuiYgzNdwsE3PYJ/HQcu51OyLemGhmW/HGY0dVHLql
+CFF1pkgl
+-----END CERTIFICATE-----
+
+GTS Root R2
+===========
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQbkepxlqz5yDFMJo/aFLybzANBgkqhkiG9w0BAQwFADBHMQswCQYDVQQG
+EwJVUzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJv
+b3QgUjIwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAG
+A1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDO3v2m++zsFDQ8BwZabFn3GTXd98GdVarTzTuk
+k3LvCvptnfbwhYBboUhSnznFt+4orO/LdmgUud+tAWyZH8QiHZ/+cnfgLFuv5AS/T3KgGjSY6Dlo
+7JUle3ah5mm5hRm9iYz+re026nO8/4Piy33B0s5Ks40FnotJk9/BW9BuXvAuMC6C/Pq8tBcKSOWI
+m8Wba96wyrQD8Nr0kLhlZPdcTK3ofmZemde4wj7I0BOdre7kRXuJVfeKH2JShBKzwkCX44ofR5Gm
+dFrS+LFjKBC4swm4VndAoiaYecb+3yXuPuWgf9RhD1FLPD+M2uFwdNjCaKH5wQzpoeJ/u1U8dgbu
+ak7MkogwTZq9TwtImoS1mKPV+3PBV2HdKFZ1E66HjucMUQkQdYhMvI35ezzUIkgfKtzra7tEscsz
+cTJGr61K8YzodDqs5xoic4DSMPclQsciOzsSrZYuxsN2B6ogtzVJV+mSSeh2FnIxZyuWfoqjx5RW
+Ir9qS34BIbIjMt/kmkRtWVtd9QCgHJvGeJeNkP+byKq0rxFROV7Z+2et1VsRnTKaG73Vululycsl
+aVNVJ1zgyjbLiGH7HrfQy+4W+9OmTN6SpdTi3/UGVN4unUu0kzCqgc7dGtxRcw1PcOnlthYhGXmy
+5okLdWTK1au8CcEYof/UVKGFPP0UJAOyh9OktwIDAQABo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYD
+VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUu//KjiOfT5nK2+JopqUVJxce2Q4wDQYJKoZIhvcNAQEM
+BQADggIBALZp8KZ3/p7uC4Gt4cCpx/k1HUCCq+YEtN/L9x0Pg/B+E02NjO7jMyLDOfxA325BS0JT
+vhaI8dI4XsRomRyYUpOM52jtG2pzegVATX9lO9ZY8c6DR2Dj/5epnGB3GFW1fgiTz9D2PGcDFWEJ
++YF59exTpJ/JjwGLc8R3dtyDovUMSRqodt6Sm2T4syzFJ9MHwAiApJiS4wGWAqoC7o87xdFtCjMw
+c3i5T1QWvwsHoaRc5svJXISPD+AVdyx+Jn7axEvbpxZ3B7DNdehyQtaVhJ2Gg/LkkM0JR9SLA3Da
+WsYDQvTtN6LwG1BUSw7YhN4ZKJmBR64JGz9I0cNv4rBgF/XuIwKl2gBbbZCr7qLpGzvpx0QnRY5r
+n/WkhLx3+WuXrD5RRaIRpsyF7gpo8j5QOHokYh4XIDdtak23CZvJ/KRY9bb7nE4Yu5UC56Gtmwfu
+Nmsk0jmGwZODUNKBRqhfYlcsu2xkiAhu7xNUX90txGdj08+JN7+dIPT7eoOboB6BAFDC5AwiWVIQ
+7UNWhwD4FFKnHYuTjKJNRn8nxnGbJN7k2oaLDX5rIMHAnuFl2GqjpuiFizoHCBy69Y9Vmhh1fuXs
+gWbRIXOhNUQLgD1bnF5vKheW0YMjiGZt5obicDIvUiLnyOd/xCxgXS/Dr55FBcOEArf9LAhST4Ld
+o/DUhgkC
+-----END CERTIFICATE-----
+
+GTS Root R3
+===========
+-----BEGIN CERTIFICATE-----
+MIICDDCCAZGgAwIBAgIQbkepx2ypcyRAiQ8DVd2NHTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjMwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjMwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAAQfTzOHMymKoYTey8chWEGJ6ladK0uFxh1MJ7x/JlFyb+Kf1qPKzEUU
+Rout736GjOyxfi//qXGdGIRFBEFVbivqJn+7kAHjSxm65FSWRQmx1WyRRK2EE46ajA2ADDL24Cej
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTB8Sa6oC2uhYHP
+0/EqEr24Cmf9vDAKBggqhkjOPQQDAwNpADBmAjEAgFukfCPAlaUs3L6JbyO5o91lAFJekazInXJ0
+glMLfalAvWhgxeG4VDvBNhcl2MG9AjEAnjWSdIUlUfUk7GRSJFClH9voy8l27OyCbvWFGFPouOOa
+KaqW04MjyaR7YbPMAuhd
+-----END CERTIFICATE-----
+
+GTS Root R4
+===========
+-----BEGIN CERTIFICATE-----
+MIICCjCCAZGgAwIBAgIQbkepyIuUtui7OyrYorLBmTAKBggqhkjOPQQDAzBHMQswCQYDVQQGEwJV
+UzEiMCAGA1UEChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3Qg
+UjQwHhcNMTYwNjIyMDAwMDAwWhcNMzYwNjIyMDAwMDAwWjBHMQswCQYDVQQGEwJVUzEiMCAGA1UE
+ChMZR29vZ2xlIFRydXN0IFNlcnZpY2VzIExMQzEUMBIGA1UEAxMLR1RTIFJvb3QgUjQwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAATzdHOnaItgrkO4NcWBMHtLSZ37wWHO5t5GvWvVYRg1rkDdc/eJkTBa
+6zzuhXyiQHY7qca4R9gq55KRanPpsXI5nymfopjTX15YhmUPoYRlBtHci8nHc8iMai/lxKvRHYqj
+QjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSATNbrdP9JNqPV
+2Py1PsVq8JQdjDAKBggqhkjOPQQDAwNnADBkAjBqUFJ0CMRw3J5QdCHojXohw0+WbhXRIjVhLfoI
+N+4Zba3bssx9BzT1YBkstTTZbyACMANxsbqjYAuG7ZoIapVon+Kz4ZNkfF6Tpt95LY2F45TPI11x
+zPKwTdb+mciUqXWi4w==
+-----END CERTIFICATE-----
+
+UCA Global G2 Root
+==================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIQXd+x2lqj7V2+WmUgZQOQ7zANBgkqhkiG9w0BAQsFADA9MQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxGzAZBgNVBAMMElVDQSBHbG9iYWwgRzIgUm9vdDAeFw0x
+NjAzMTEwMDAwMDBaFw00MDEyMzEwMDAwMDBaMD0xCzAJBgNVBAYTAkNOMREwDwYDVQQKDAhVbmlU
+cnVzdDEbMBkGA1UEAwwSVUNBIEdsb2JhbCBHMiBSb290MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxeYrb3zvJgUno4Ek2m/LAfmZmqkywiKHYUGRO8vDaBsGxUypK8FnFyIdK+35KYmT
+oni9kmugow2ifsqTs6bRjDXVdfkX9s9FxeV67HeToI8jrg4aA3++1NDtLnurRiNb/yzmVHqUwCoV
+8MmNsHo7JOHXaOIxPAYzRrZUEaalLyJUKlgNAQLx+hVRZ2zA+te2G3/RVogvGjqNO7uCEeBHANBS
+h6v7hn4PJGtAnTRnvI3HLYZveT6OqTwXS3+wmeOwcWDcC/Vkw85DvG1xudLeJ1uK6NjGruFZfc8o
+LTW4lVYa8bJYS7cSN8h8s+1LgOGN+jIjtm+3SJUIsUROhYw6AlQgL9+/V087OpAh18EmNVQg7Mc/
+R+zvWr9LesGtOxdQXGLYD0tK3Cv6brxzks3sx1DoQZbXqX5t2Okdj4q1uViSukqSKwxW/YDrCPBe
+KW4bHAyvj5OJrdu9o54hyokZ7N+1wxrrFv54NkzWbtA+FxyQF2smuvt6L78RHBgOLXMDj6DlNaBa
+4kx1HXHhOThTeEDMg5PXCp6dW4+K5OXgSORIskfNTip1KnvyIvbJvgmRlld6iIis7nCs+dwp4wwc
+OxJORNanTrAmyPPZGpeRaOrvjUYG0lZFWJo8DA+DuAUlwznPO6Q0ibd5Ei9Hxeepl2n8pndntd97
+8XplFeRhVmUCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
+BBYEFIHEjMz15DD/pQwIX4wVZyF0Ad/fMA0GCSqGSIb3DQEBCwUAA4ICAQATZSL1jiutROTL/7lo
+5sOASD0Ee/ojL3rtNtqyzm325p7lX1iPyzcyochltq44PTUbPrw7tgTQvPlJ9Zv3hcU2tsu8+Mg5
+1eRfB70VVJd0ysrtT7q6ZHafgbiERUlMjW+i67HM0cOU2kTC5uLqGOiiHycFutfl1qnN3e92mI0A
+Ds0b+gO3joBYDic/UvuUospeZcnWhNq5NXHzJsBPd+aBJ9J3O5oUb3n09tDh05S60FdRvScFDcH9
+yBIw7m+NESsIndTUv4BFFJqIRNow6rSn4+7vW4LVPtateJLbXDzz2K36uGt/xDYotgIVilQsnLAX
+c47QN6MUPJiVAAwpBVueSUmxX8fjy88nZY41F7dXyDDZQVu5FLbowg+UMaeUmMxq67XhJ/UQqAHo
+jhJi6IjMtX9Gl8CbEGY4GjZGXyJoPd/JxhMnq1MGrKI8hgZlb7F+sSlEmqO6SWkoaY/X5V+tBIZk
+bxqgDMUIYs6Ao9Dz7GjevjPHF1t/gMRMTLGmhIrDO7gJzRSBuhjjVFc2/tsvfEehOjPI+Vg7RE+x
+ygKJBJYoaMVLuCaJu9YzL1DV/pqJuhgyklTGW+Cd+V7lDSKb9triyCGyYiGqhkCyLmTTX8jjfhFn
+RR8F/uOi77Oos/N9j/gMHyIfLXC0uAE0djAA5SN4p1bXUB+K+wb1whnw0A==
+-----END CERTIFICATE-----
+
+UCA Extended Validation Root
+============================
+-----BEGIN CERTIFICATE-----
+MIIFWjCCA0KgAwIBAgIQT9Irj/VkyDOeTzRYZiNwYDANBgkqhkiG9w0BAQsFADBHMQswCQYDVQQG
+EwJDTjERMA8GA1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9u
+IFJvb3QwHhcNMTUwMzEzMDAwMDAwWhcNMzgxMjMxMDAwMDAwWjBHMQswCQYDVQQGEwJDTjERMA8G
+A1UECgwIVW5pVHJ1c3QxJTAjBgNVBAMMHFVDQSBFeHRlbmRlZCBWYWxpZGF0aW9uIFJvb3QwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCpCQcoEwKwmeBkqh5DFnpzsZGgdT6o+uM4AHrs
+iWogD4vFsJszA1qGxliG1cGFu0/GnEBNyr7uaZa4rYEwmnySBesFK5pI0Lh2PpbIILvSsPGP2KxF
+Rv+qZ2C0d35qHzwaUnoEPQc8hQ2E0B92CvdqFN9y4zR8V05WAT558aopO2z6+I9tTcg1367r3CTu
+eUWnhbYFiN6IXSV8l2RnCdm/WhUFhvMJHuxYMjMR83dksHYf5BA1FxvyDrFspCqjc/wJHx4yGVMR
+59mzLC52LqGj3n5qiAno8geK+LLNEOfic0CTuwjRP+H8C5SzJe98ptfRr5//lpr1kXuYC3fUfugH
+0mK1lTnj8/FtDw5lhIpjVMWAtuCeS31HJqcBCF3RiJ7XwzJE+oJKCmhUfzhTA8ykADNkUVkLo4KR
+el7sFsLzKuZi2irbWWIQJUoqgQtHB0MGcIfS+pMRKXpITeuUx3BNr2fVUbGAIAEBtHoIppB/TuDv
+B0GHr2qlXov7z1CymlSvw4m6WC31MJixNnI5fkkE/SmnTHnkBVfblLkWU41Gsx2VYVdWf6/wFlth
+WG82UBEL2KwrlRYaDh8IzTY0ZRBiZtWAXxQgXy0MoHgKaNYs1+lvK9JKBZP8nm9rZ/+I8U6laUpS
+NwXqxhaN0sSZ0YIrO7o1dfdRUVjzyAfd5LQDfwIDAQABo0IwQDAdBgNVHQ4EFgQU2XQ65DA9DfcS
+3H5aBZ8eNJr34RQwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQEL
+BQADggIBADaNl8xCFWQpN5smLNb7rhVpLGsaGvdftvkHTFnq88nIua7Mui563MD1sC3AO6+fcAUR
+ap8lTwEpcOPlDOHqWnzcSbvBHiqB9RZLcpHIojG5qtr8nR/zXUACE/xOHAbKsxSQVBcZEhrxH9cM
+aVr2cXj0lH2RC47skFSOvG+hTKv8dGT9cZr4QQehzZHkPJrgmzI5c6sq1WnIeJEmMX3ixzDx/BR4
+dxIOE/TdFpS/S2d7cFOFyrC78zhNLJA5wA3CXWvp4uXViI3WLL+rG761KIcSF3Ru/H38j9CHJrAb
++7lsq+KePRXBOy5nAliRn+/4Qh8st2j1da3Ptfb/EX3C8CSlrdP6oDyp+l3cpaDvRKS+1ujl5BOW
+F3sGPjLtx7dCvHaj2GU4Kzg1USEODm8uNBNA4StnDG1KQTAYI1oyVZnJF+A83vbsea0rWBmirSwi
+GpWOvpaQXUJXxPkUAzUrHC1RVwinOt4/5Mi0A3PCwSaAuwtCH60NryZy2sy+s6ODWA2CxR9GUeOc
+GMyNm43sSet1UNWMKFnKdDTajAshqx7qG+XH/RU+wBeq+yNuJkbL+vmxcmtpzyKEC2IPrNkZAJSi
+djzULZrtBJ4tBmIQN1IchXIbJ+XMxjHsN+xjWZsLHXbMfjKaiJUINlK73nZfdklJrX+9ZSCyycEr
+dhh2n1ax
+-----END CERTIFICATE-----
+
+Certigna Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIGWzCCBEOgAwIBAgIRAMrpG4nxVQMNo+ZBbcTjpuEwDQYJKoZIhvcNAQELBQAwWjELMAkGA1UE
+BhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczEcMBoGA1UECwwTMDAwMiA0ODE0NjMwODEwMDAzNjEZ
+MBcGA1UEAwwQQ2VydGlnbmEgUm9vdCBDQTAeFw0xMzEwMDEwODMyMjdaFw0zMzEwMDEwODMyMjda
+MFoxCzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxHDAaBgNVBAsMEzAwMDIgNDgxNDYz
+MDgxMDAwMzYxGTAXBgNVBAMMEENlcnRpZ25hIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDNGDllGlmx6mQWDoyUJJV8g9PFOSbcDO8WV43X2KyjQn+Cyu3NW9sOty3tRQgX
+stmzy9YXUnIo245Onoq2C/mehJpNdt4iKVzSs9IGPjA5qXSjklYcoW9MCiBtnyN6tMbaLOQdLNyz
+KNAT8kxOAkmhVECe5uUFoC2EyP+YbNDrihqECB63aCPuI9Vwzm1RaRDuoXrC0SIxwoKF0vJVdlB8
+JXrJhFwLrN1CTivngqIkicuQstDuI7pmTLtipPlTWmR7fJj6o0ieD5Wupxj0auwuA0Wv8HT4Ks16
+XdG+RCYyKfHx9WzMfgIhC59vpD++nVPiz32pLHxYGpfhPTc3GGYo0kDFUYqMwy3OU4gkWGQwFsWq
+4NYKpkDfePb1BHxpE4S80dGnBs8B92jAqFe7OmGtBIyT46388NtEbVncSVmurJqZNjBBe3YzIoej
+wpKGbvlw7q6Hh5UbxHq9MfPU0uWZ/75I7HX1eBYdpnDBfzwboZL7z8g81sWTCo/1VTp2lc5ZmIoJ
+lXcymoO6LAQ6l73UL77XbJuiyn1tJslV1c/DeVIICZkHJC1kJWumIWmbat10TWuXekG9qxf5kBdI
+jzb5LdXF2+6qhUVB+s06RbFo5jZMm5BX7CO5hwjCxAnxl4YqKE3idMDaxIzb3+KhF1nOJFl0Mdp/
+/TBt2dzhauH8XwIDAQABo4IBGjCCARYwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFBiHVuBud+4kNTxOc5of1uHieX4rMB8GA1UdIwQYMBaAFBiHVuBud+4kNTxOc5of
+1uHieX4rMEQGA1UdIAQ9MDswOQYEVR0gADAxMC8GCCsGAQUFBwIBFiNodHRwczovL3d3d3cuY2Vy
+dGlnbmEuZnIvYXV0b3JpdGVzLzBtBgNVHR8EZjBkMC+gLaArhilodHRwOi8vY3JsLmNlcnRpZ25h
+LmZyL2NlcnRpZ25hcm9vdGNhLmNybDAxoC+gLYYraHR0cDovL2NybC5kaGlteW90aXMuY29tL2Nl
+cnRpZ25hcm9vdGNhLmNybDANBgkqhkiG9w0BAQsFAAOCAgEAlLieT/DjlQgi581oQfccVdV8AOIt
+OoldaDgvUSILSo3L6btdPrtcPbEo/uRTVRPPoZAbAh1fZkYJMyjhDSSXcNMQH+pkV5a7XdrnxIxP
+TGRGHVyH41neQtGbqH6mid2PHMkwgu07nM3A6RngatgCdTer9zQoKJHyBApPNeNgJgH60BGM+RFq
+7q89w1DTj18zeTyGqHNFkIwgtnJzFyO+B2XleJINugHA64wcZr+shncBlA2c5uk5jR+mUYyZDDl3
+4bSb+hxnV29qao6pK0xXeXpXIs/NX2NGjVxZOob4Mkdio2cNGJHc+6Zr9UhhcyNZjgKnvETq9Emd
+8VRY+WCv2hikLyhF3HqgiIZd8zvn/yk1gPxkQ5Tm4xxvvq0OKmOZK8l+hfZx6AYDlf7ej0gcWtSS
+6Cvu5zHbugRqh5jnxV/vfaci9wHYTfmJ0A6aBVmknpjZbyvKcL5kwlWj9Omvw5Ip3IgWJJk8jSaY
+tlu3zM63Nwf9JtmYhST/WSMDmu2dnajkXjjO11INb9I/bbEFa0nOipFGc/T2L/Coc3cOZayhjWZS
+aX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw3kAP+HwV96LOPNde
+E4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
+-----END CERTIFICATE-----
+
+emSign Root CA - G1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYDVQQGEwJJTjET
+MBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRl
+ZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBHMTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgx
+ODMwMDBaMGcxCzAJBgNVBAYTAklOMRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVk
+aHJhIFRlY2hub2xvZ2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQzf2N4aLTN
+LnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO8oG0x5ZOrRkVUkr+PHB1
+cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aqd7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHW
+DV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhMtTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ
+6DqS0hdW5TUaQBw+jSztOd9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrH
+hQIDAQABo0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQDAgEG
+MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31xPaOfG1vR2vjTnGs2
+vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjMwiI/aTvFthUvozXGaCocV685743Q
+NcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6dGNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q
++Mri/Tm3R7nrft8EI6/6nAYH6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeih
+U80Bv2noWgbyRQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
+iN66zB+Afko=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQGEwJJTjETMBEG
+A1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEg
+MB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4
+MTgzMDAwWjBrMQswCQYDVQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11
+ZGhyYSBUZWNobm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
+RzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0WXTsuwYc
+58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xySfvalY8L1X44uT6EYGQIr
+MgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuBzhccLikenEhjQjAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+D
+CBeQyh+KTOgNG3qxrdWBCUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7
+jHvrZQnD+JbNR6iC8hZVdyR+EhCVBCyj
+-----END CERTIFICATE-----
+
+emSign Root CA - C1
+===================
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkGA1UEBhMCVVMx
+EzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNp
+Z24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQD
+ExNlbVNpZ24gUm9vdCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+up
+ufGZBczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZHdPIWoU/
+Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH3DspVpNqs8FqOp099cGX
+OFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvHGPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4V
+I5b2P/AgNBbeCsbEBEV5f6f9vtKppa+cxSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleooms
+lMuoaJuvimUnzYnu3Yy1aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+
+XJGFehiqTbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQAD
+ggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87/kOXSTKZEhVb3xEp
+/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4kqNPEjE2NuLe/gDEo2APJ62gsIq1
+NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrGYQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9
+wC68AivTxEDkigcxHpvOJpkT+xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQ
+BmIMMMAVSKeoWXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
+-----END CERTIFICATE-----
+
+emSign ECC Root CA - C3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQGEwJVUzETMBEG
+A1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMxIDAeBgNVBAMTF2VtU2lnbiBF
+Q0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAwMFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UE
+BhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQD
+ExdlbVNpZ24gRUNDIFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd
+6bciMK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4OjavtisIGJAnB9
+SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0OBBYEFPtaSNCAIEDyqOkA
+B2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gA
+MGUCMQC02C8Cif22TGK6Q04ThHK1rt0c3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwU
+ZOR8loMRnLDRWmFLpg9J0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQELBQAwbzELMAkG
+A1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJSG9uZyBLb25nMRYwFAYDVQQK
+Ew1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25na29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2
+MDMwMjI5NDZaFw00MjA2MDMwMjI5NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtv
+bmcxEjAQBgNVBAcTCUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMX
+SG9uZ2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCz
+iNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFOdem1p+/l6TWZ5Mwc50tf
+jTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mIVoBc+L0sPOFMV4i707mV78vH9toxdCim
+5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOe
+sL4jpNrcyCse2m5FHomY2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj
+0mRiikKYvLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+TtbNe/
+JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZbx39ri1UbSsUgYT2u
+y1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+l2oBlKN8W4UdKjk60FSh0Tlxnf0h
++bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YKTE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsG
+xVd7GYYKecsAyVKvQv83j+GjHno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwID
+AQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
+i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEwDQYJKoZIhvcN
+AQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG7BJ8dNVI0lkUmcDrudHr9Egw
+W62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCkMpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWld
+y8joRTnU+kLBEUx3XZL7av9YROXrgZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov
++BS5gLNdTaqX4fnkGMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDc
+eqFS3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJmOzj/2ZQw
+9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+l6mc1X5VTMbeRRAc6uk7
+nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6cJfTzPV4e0hz5sy229zdcxsshTrD3mUcY
+hcErulWuBurQB7Lcq9CClnXO0lD+mefPL5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB
+60PZ2Pierc+xYw5F9KBaLJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fq
+dBb9HxEGmpv0
+-----END CERTIFICATE-----
diff --git a/doc/conf/unrealircd.hub.conf b/doc/conf/unrealircd.hub.conf
new file mode 100644
index 0000000..99a989a
--- /dev/null
+++ b/doc/conf/unrealircd.hub.conf
@@ -0,0 +1,55 @@
+include "links.conf";
+include "modules.conf";
+
+admin { "" }
+
+me { name "irc.supernets.org"; info "SuperNETs IRC Network"; sid 001; }
+
+class opers   { pingfreq 120; maxclients  2; sendq 1M; options { nofakelag; } }
+class servers { pingfreq 120; maxclients 10; sendq 1M; connfreq 30;           }
+
+allow { ip 127.0.0.1; class opers; maxperip 2; }
+
+listen { ip 127.0.0.1; port REDACTED; options { clientsonly; tls; } } # Admin
+listen { ip *;         port REDACTED; options { serversonly; tls; } } # Links
+listen { ip 127.0.0.1; port REDACTED; options { serversonly;      } } # Anope
+
+link services.supernets.org {
+	incoming { mask 127.0.0.1; port REDACTED; }
+	password "REDACTED";
+	class servers;
+}
+
+log "ircd.log" { flags { errors; } maxsize 1K; }
+
+except ban { mask *@127.0.0.1; }
+
+ulines { services.supernets.org; }
+
+set {
+	gline-address "banned@supernets.org";
+	kline-address "banned@supernets.org";
+	modes-on-connect "+ipTx";
+	modes-on-oper "+HIq";
+	snomask-on-oper "+bcFfkGsSo"
+	modes-on-join "+ns";
+	level-on-join "op";
+	static-quit "EMO-QUIT";
+	static-part "EMO-PART";
+	nick-length 20;
+	network-name "SuperNETs";
+	default-server "irc.supernets.org";
+	services-server "services.supernets.org";
+	sasl-server "services.supernets.org";
+	help-channel "#help";
+	channel-command-prefix "`!@$.";
+	cloak-method ip;
+	cloak-keys {
+		"REDACTED";
+		"REDACTED";
+		"REDACTED";
+	}
+	hiddenhost-prefix "SUPER";
+	default-bantime 1d;
+	manual-ban-target ip;
+}
\ No newline at end of file
diff --git a/doc/conf/unrealircd.link.conf b/doc/conf/unrealircd.link.conf
new file mode 100644
index 0000000..2f22ecd
--- /dev/null
+++ b/doc/conf/unrealircd.link.conf
@@ -0,0 +1,7 @@
+include "https://USERNAME:PASSWORD@HOSTNAME:PORT/badwords.conf";
+include "https://USERNAME:PASSWORD@HOSTNAME:PORT/except.conf";
+include "https://USERNAME:PASSWORD@HOSTNAME:PORT/ircd.conf";
+include "https://USERNAME:PASSWORD@HOSTNAME:PORT/modules.conf";
+include "https://USERNAME:PASSWORD@HOSTNAME:PORT/opers.conf";
+include "https://USERNAME:PASSWORD@HOSTNAME:PORT/spamfilter.conf";
+me { name "example.supernets.org"; info "SuperNETS IRC Network"; sid XXX; }
\ No newline at end of file
diff --git a/doc/conf/unrealircd.remote.conf b/doc/conf/unrealircd.remote.conf
new file mode 100644
index 0000000..d51e7fc
--- /dev/null
+++ b/doc/conf/unrealircd.remote.conf
@@ -0,0 +1,185 @@
+admin { ""; }
+
+alias botserv { type services; }
+alias bs { target botserv; type services; }
+alias chanserv { type services; }
+alias cs { target chanserv; type services; }
+alias hostserv { type services; }
+alias hs { target hostserv; type services; }
+alias nickserv { type services; }
+alias ns { target nickserv; type services; }
+alias operserv { type services; }
+alias os { target operserv; type services; }
+
+class clients { pingfreq 120; maxclients 100; sendq 1M; options { nofakelag; } }
+class servers { pingfreq 120; maxclients  10; sendq 1M; connfreq 30;           }
+
+allow { ip *; class clients; maxperip 2; }
+
+listen { ip *; port 6667;      options { clientsonly;      } }
+listen { ip *; port 6697;      options { clientsonly; tls; } }
+listen { ip *; port REDACTED;  options { serversonly; tls; } }
+
+link irc.supernets.org {
+	incoming { mask REDACTED; }
+	outgoing {
+		bind-ip *;
+		hostname REDACTED;
+		port REDACTED;
+		options { tls; autoconnect; }
+	}
+	password "REDACTED" { spkifp; }
+	class servers;
+}
+
+log "errors.log" { flags { errors; } maxsize 10K; }
+
+tld { mask *@*; motd remote.motd; rules remote.motd; options { remote; } }
+
+ulines { services.supernets.org; }
+
+blacklist dronebl {
+	dns {
+		name dnsbl.dronebl.org;
+		type record;
+		reply { 3; 5; 6; 7; 8; 9; 10; 11; 12; 13; 14; 15; 16; }
+	}
+	action gzline;
+	ban-time 1d;
+	reason "8,4   E N T E R   T H E   V O I D   ";
+}
+
+blacklist efnetrbl {
+	dns {
+		name rbl.efnetrbl.org;
+		type record;
+		reply { 1; 4; 5; }
+	}
+	action gzline;
+	ban-time 1d;
+	reason "8,4   E N T E R   T H E   V O I D   ";
+}
+
+blacklist torbl {
+	dns {
+		name torexit.dan.me.uk;
+		type record;
+		reply { 100; }
+	}
+	action gzline;
+	ban-time 1d;
+	reason "8,4   E N T E R   T H E   V O I D   ";
+}
+
+webirc { mask 107.161.19.53;  password "REDACTED"; } # KiwiIRC
+webirc { mask 107.161.19.109; password "REDACTED"; }
+webirc { mask 107.161.31.4;   password "REDACTED"; }
+
+webirc { mask 207.192.75.252; password "REDACTED"; } # Mibbit
+webirc { mask 64.62.228.82;   password "REDACTED"; }
+webirc { mask 78.129.202.38;  password "REDACTED"; }
+webirc { mask 109.169.29.95 ; password "REDACTED"; }
+
+set {
+	kline-address "banned@supernets.org";
+	gline-address "banned@supernets.org";
+	modes-on-connect "+ipTx";
+	modes-on-oper "+HIq";
+	snomask-on-oper "+bcFfkGsSo";
+	modes-on-join "+ns";
+	level-on-join "op";
+	restrict-channelmodes "Pps";
+	restrict-commands {
+		invite          { connect-delay 300; exempt-identified yes; }
+		list            { connect-delay  60; exempt-identified yes; }
+		private-message { connect-delay 300; exempt-identified yes; }
+		private-notice  { connect-delay 300; exempt-identified yes; }
+	}
+	auto-join "#superbowl";
+	oper-auto-join "#help";
+	static-quit "EMO-QUIT";
+	static-part "EMO-PART";
+	who-limit 100;
+	nick-length 20;
+	maxchannelsperuser 10;
+	channel-command-prefix "`!@$.";
+	options { hide-ulines; flat-map; identd-check; }
+	network-name "SuperNETs";
+	default-server "irc.supernets.org";
+	services-server "services.supernets.org";
+	sasl-server "services.supernets.org";
+	help-channel "#help";
+	cloak-method ip;
+	cloak-keys {
+		"REDACTED";
+		"REDACTED";
+		"REDACTED";
+	}
+	hiddenhost-prefix "SUPER";
+	plaintext-policy {
+		user warn;
+		oper deny;
+		server deny;
+		user-message "4WARNING: You are not using a secure connection with SSL/TLS";
+		oper-message "Network operators must connect using SSL/TLS";
+	}
+	outdated-tls-policy {
+		user warn;
+		oper deny;
+		server deny;
+		user-message "4WARNING: You are using an outdated SSL/TLS protocol or cipher";
+		oper-message "Network operators must connect using an up-to-date SSL/TLS protocol or cipher";
+	}
+	anti-flood {
+		away-flood 3:300;
+		connect-flood 3:300;
+		invite-flood 3:300;
+		join-flood 3:300;
+		knock-flood 3:300;
+		max-concurrent-conversations { users 5; new-user-every 60s; }
+		nick-flood 3:300;
+		unknown-flood-amount 2048;
+		unknown-flood-bantime 1h;
+	}
+	default-bantime 1d;
+	spamfilter {
+		ban-time 1d;
+		ban-reason "8,4   E N T E R   T H E   V O I D   ";
+		except "#anythinggoes";
+	}
+	max-targets-per-command { kick 1; part 1; privmsg 1; }
+	hide-ban-reason yes;
+	reject-message {
+		gline                "8,4   E N T E R   T H E   V O I D   ";
+		kline                "8,4   E N T E R   T H E   V O I D   ";
+		password-mismatch    "8,4   E N T E R   T H E   V O I D   ";
+		server-full          "8,4   E N T E R   T H E   V O I D   ";
+		too-many-connections "8,4   E N T E R   T H E   V O I D   ";
+		unauthorized         "8,4   E N T E R   T H E   V O I D   ";
+	}
+	antimixedutf8 {
+		score 10;
+		ban-action block;
+		ban-reason "8,4   E N T E R   T H E   V O I D   ";
+		ban-time 1h;
+	}
+	connthrottle {
+		known-users   { minimum-reputation-score 24; sasl-bypass yes;       }
+		new-users     { local-throttle 20:60;        global-throttle 30:60; }
+		disabled-when { reputation-gathering 1w;     start-delay 3m;        }
+	}
+	history {
+		channel {
+			playback-on-join        { lines 100; time 1d; }
+			max-storage-per-channel { lines 100; time 1d; }
+		}
+	}
+	manual-ban-target ip;
+}
+
+hideserver {
+	disable-map yes;
+	disable-links yes;
+	map-deny-message "Denied";
+	links-deny-message "Denied";
+}
\ No newline at end of file
diff --git a/doc/tao.of.irc b/doc/tao.of.irc
new file mode 100644
index 0000000..d78e3c5
--- /dev/null
+++ b/doc/tao.of.irc
@@ -0,0 +1,271 @@
+
+The Tao of Internet Relay Chat
+Copyright (C) Ove Ruben R Olsen 1994
+Version of 940110
+Contributing masters: Master ScottM
+
+-----
+Something is formed by the electrons, born in the silent cable. Shaping
+and growing and ungrowing. It is there yet not there. It is the source of
+Internet Relay Chat. I do not know the name, thus I will call it the Tao
+of Internet Relay Chat.
+
+If the Tao is great, then the IRC is running ceaselessly. If the IRC is
+great then the server is running without ever stoping. If the server is
+great then the client will always be the server. The luser is then pleased
+and there is Chat in the world.
+
+The Tao of IRC squits far away and connects on returning.
+
+
+-----
+The genetic potential of birth, a lot to know, yet unknown.
+
+In the begining there was nothing.
+
+Out of nothing the Tao gave birth to tolsun.oulu.fi. tolsun gave birth to
+OuluBox.
+
+OuluBox gave birth to rmsg.
+
+rmsg was not Tao, so MUT gave birth to IRC.
+
+No one knows when IRC came into existance, the mighty master WiZ have it
+to be at the end of the eight month in the year of the Dragon.
+
+
+-----
+Each channel has its purpose, however humble. Each channel is the Yin and
+Yang of IRC. Each channels has it's place within the IRC.
+
+In the beginning there was only channel 0, thus channel 0 is the soil of
+IRC.
+
+Channel 1 to channel 10 then was open as the sea. Channel 11 to 999 was the
+trees and forests of IRC. Channels above 999 should not be mentioned, and
+channels below 0 were unborn and contained many secrets.
+
+This was not the right Tao, so IRC gave birth to +channels.
+
++channels had the yin and yang. Mode does not.
+
+This was not the right Tao still, so IRC gave birth to #channels.
+
+#channels have the yin and yang.
+
+Only channel 0 is the right path to Tao, but avoid speaking on channel 0.
+
+
+-----
+There was a great dispute among the Broom-Walkers of the Relay. Some of them
+wanted neither yin nor yang. Out of this Eris came into existance. Some of the
+Broom-Walkers then created Eris Free-net.
+
+This was the right Tao.
+
+Kind Gentle and Boring Net was another wrong path to the Tao of Internet Relay
+Chat.
+
+Some time later there was a quantity of some lusers who wanted to be
+Broom-Walkers also. The Eris Free Broom-Walkers did not agree with them,
+thus a new IRC was born. This IRC is called the Undernet.
+
+But this is not the right Tao, either.
+
+
+-----
+There will always be disputes among the Broom-Walkers of Internet Relay Chat.
+
+This is the very nature of the IRC.
+
+
+-----
+Lusers that do not understand the Tao is always using the yang of Mode on
+their channels. Lusers that do understand the Tao are always using Ignore
+on their channels.
+
+How could this not be so ?
+
+
+-----
+The wise sage luser is told about the Chat and uses it. The luser is told
+about the IRC and is looking for it. The flock are told about the Tao and
+make a fool of the IRC.
+
+If there was no laughter, there would be no Tao.
+
+
+-----
+The master says:
+"Without the Tao of Internet Relay Chat, life becomes meaningless."
+
+The Relay of the old time was mysterious and sacred. We can neither imagine
+its thoughts nor path; we are left but to describe.
+
+
+-----
+The sage luser must be aware like a frog crossing the highway.
+
+
+-----
+The great master Wumpus once dreamed that he was an automaton. When he awoke
+he exclaimed:
+        "I don't know whether I am Wumpus dreaming that I am a client,
+                 or a client dreaming that I am Wumpus!"
+                 
+So was the first Automata born.
+
+The master Nap then said:
+        "Any automata should not speak unless spoken to.
+         Any automata shall only whisper when spoken to."
+
+Thus replied the master Gnarfer:
+        "The lusers shall keep in mind that a automata can be either good or
+         bad. Create good automata, and the IRC will hail you and you will
+         gain fame and fortune. Create bad automata and people will start to
+         hate you, and finaly you will be /KILLed to ethernal damnation"
+
+Many lusers have fallen into the clutches of ethernal damnation. They where
+not following the Tao.
+
+
+-----
+There once was a luser who went to #BotSex. Each day he saw the automatons.
+The luser decided that he also would have such a automata.
+He asked another luser for his automata. The other luser gave his automata
+away.
+
+The luser was not within the Tao, so he just started the automata. The automata
+had only Yang inside so all the lusers files where deleted.
+
+Some moons laither the same luser then had become a sage luser, and did create
+his automata from the very grounds with materials found inside the IRC.
+The luser was now within the Tao and his automata lived happily ever after.
+
+
+-----
+There once was a master who wrote automatons without the help of master Phone.
+A novice luser, seeking to imitate him, began with the help of master Phone.
+When the novice luser asked the master to evaluate his automata the master
+replied: "What is a working automata for the master is not for the luser.
+You must must BE the IRC before automating."
+
+
+-----
+Master BigCheese gave birth to master Troy; his duty clear. Master Troy gave
+birth to master Phone, for the Tao of Irc must be eternal and must flow as the
+ceaseless river of Time itself.
+
+
+-----
+Master Phone once said about the ircII client:
+        "public_msg is for a message from someone NOT on the channel
+         public_other is for a message on a channel that doesn't belong to
+         a window. public is for a message on a channel that belongs to a
+         window!"
+
+Out of this raised the mighty chaos.
+
+
+-----
+The sage luser came to the master who wrote automata without the help of
+master Phone. The sage luser asked the master who wrote automata: "Which is
+easiest to make. A automata with the help of master Phone or an automata
+made with the help of a language ?"
+
+The master who wrote automata then replied:
+        "With the help of a language."
+
+The sage luser was disapointed and exclaimed: "But, with master Phone you
+do not need to know anything about the soil of IRC. Is not that the easiet
+way ?"
+
+"Not really" said the master who wrote automata, "when using master Phone
+you are closed inside a box. For sure, it is a great box for the lusers,
+but the master will need more power, thus a language is the only path to go.
+With the language the master will never have to limit himself. When using
+such a language the master will seek the best between the need and the
+availibility."
+
+"I see", said the sage luser.
+
+This is the essence of Tao of IRC automatas.
+
+
+-----
+A client should be light and be used for communication. The spirit of a good
+client is that it should be very convinient for the luser to use, but hard
+for the luser who want to create automata.
+There should never ever be too many functions or too few functions.
+
+There should always be a ignore.
+
+Without ignore the client is not within the Tao of Chating.
+
+The client should always respond the luser with messages that will not
+astnonish him too much. The server likewise. If the server does not, then it
+is the clients job to explain what the server says.
+
+A client which fails this, will be useless and cause confusion for the lusers.
+The only way to correct this is to use another client or to write a new one.
+
+
+-----
+A luser asked the masters on #IrcHelp: "My client does not work".
+The masters replied: "Upgrade your client".
+The luser then wondered why the master knew. The master then told him about
+the Protocol.
+
+"Your client does not work beaucse it does not understand the server. Why
+should it always work ? Only a fool would expect such. But, clients are made
+by humans, and humans are not perfect. Only Tao is.
+
+The IRC is solid. The IRC is floating, and will always be dynamic. Live with
+that or /quit."
+
+
+-----
+The luser came to the masters of #IrcHelp, asking about the Tao of IRC within
+the client.
+The masters then said that the Tao of IRC always lies inside the client
+regardless of how the client connects to the server.
+
+"Is the Tao in irc ?" asked the luser.
+"It so is" replied the masters of #IrcHelp.
+"Is the Tao in the ircII, Kiwi, rxirc, vms, rockers and msa ?" asked the
+luser.
+"In all of them and in the TPC, irchat, zenirc, zircon X11-irc and even the
+dos irc has the Tao" said the master quietly.
+"Is the Tao in a telnet connection directly to the server ?"
+
+The master then was quiet for a long time and said. "Please leave, such
+questions are not within the Tao of IRC".
+
+
+-----
+The master says: "Without the Protocol of TCP the messages will not travel.
+                  Without the client, the server is useless."
+
+
+-----
+There once was a luser who used the ircII client. "ircII can do anything I
+ever need for using IRC" said the emacs client user, "I have /ON's, I have
+assignments, I have aliasing. Why don't you use this instead of the huge
+emacs client, which also has a messy screen?"
+The emacs client user then replied by saying that "it is better to have a
+scripting language that is the client instead of have a client that has
+a scripting language." Upon hearing this, the ircII client luser fell silent.
+
+
+-----
+The master Wumpus said: "Time for you to leave. I did, now I'm happy."
+The master Gnarfer replied: "Use, but never overuse IRC, then you will also
+be happy within IRC"
+
+
+-----
+A luser came unto the masters of #EU-Opers and asked, "How can I be, yet not
+be, a user@host within the IRC?"
+The masters of #EU-Opers replied: "To be Tao is to be ones true self. To hide
+ones self is not Tao, and is not IRC, you have much to learn before you shall
+be at rest within the Flow of Irc.  Please leave"
diff --git a/doc/technical/005.txt b/doc/technical/005.txt
new file mode 100644
index 0000000..c1d9b37
--- /dev/null
+++ b/doc/technical/005.txt
@@ -0,0 +1,180 @@
+Numeric 005 Documentation
+(c) 2002-2005 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
+(c) 2005-2009 syzop (Bram Matthys) [syzop@vulnscan.org]
+
+Numeric 005 allows the server to inform the client of any protocol specific features in the
+IRCd.  The numeric is sent at connection time immediately after numeric 004. Additionally
+the numeric is sent when a /version request is made by a local user, for remote users
+numeric 105 is used but contains the same information.
+
+Due to the limit imposed by RFC1459 on both the buffer size (512) and the amount of
+parameters that can be sent in a single command (15) a total of 13 parameters may be
+specified in each 005. Because of this, a client must be able to accept multiple 005s
+consecutively. The format for the 005 message is as follows:
+
+":" <servername> "005" SPACE <nickname> SPACE <token[=value]> SPACE ... ":are supported
+by this server"
+
+Currently UnrealIRCd supports several tokens that are included in numeric 005. A list of
+all tokens, their respective value and a brief description are listed below.
+
+Unreal attempts to follow the proposed ISupport standard as much as possible. Unreal only
+ignores the standard in one regard, the TARGMAX token. This token is believed to be 
+impractical and technically impossible to correctly implement due to existing limitations
+in the standard. Therefore, this token is not currently supported. 
+
+Unreal does additionally provide a few tokens which are not specified in the standard, these
+include: HCN, AWAYLEN, WATCH, SILENCE, EXTBAN, ELIST, CMDS, NAMESX, UHNAMES, and WATCHOPTS.
+Unreal also maintains a few legacy tokens such as MAXCHANNELS and WALLCHOPS to ensure
+compatibility until the ISupport standard is more widely accepted by clients.
+
+Token         Value           Default Value                Description
+------------------------------------------------------------------------------------------------
+MAP           none            none                         Informs the client that the /map 
+                                                           command is present. [Obsolete]
+
+KNOCK         none            none                         Informs the client that the /knock
+                                                           command is present. [Obsolete]
+
+SAFELIST      none            none                         The LIST command is sent in 
+                                                           multiple iterations so that the
+                                                           client's queue does not get filled
+                                                           causing the user to be killed.
+
+HCN           none            none                         The server supports the HCN
+                                                           (Hybrid Connect Notice) protocol.
+
+MAXCHANNELS   number          10                           The maximum number of channels a
+                                                           user may join. [Deprecated]
+
+MAXBANS       number          60                           The maximum number of bans that
+                                                           may be placed for a channel.
+                                                           [Obsolete]
+
+NICKLEN       number          30                           Maximum length of a user's
+                                                           nickname.
+
+TOPICLEN      number          307                          Maximum length of a channel's
+                                                           topic.
+
+KICKLEN       number          307                          Maximum length of a kick reason.
+
+MAXTARGETS    number          20                           Maximum targets for the PRIVMSG
+                                                           command.
+
+AWAYLEN       number          307                          Maximum length of an away message.
+
+WALLCHOPS     none            none                         Indicates that you may use
+                                                           NOTICE/PRIVMSG to send to +ohv by
+                                                           using PRIVMSG/NOTICE [@|%|+]#channel.
+                                                           [Deprecated]
+ 
+WATCH         number          128                          Indicates the presence of the
+                                                           WATCH command and specifies the
+                                                           maximum number of watch entries.
+
+SILENCE       number          15                           Indicates the maximum number of
+                                                           entries on the silence list.
+
+MODES         number          13                           Indicates the number of channel
+                                                           modes with parameters that may be
+                                                           sent at one time.
+
+CHANTYPES     chars           #                            Indicates the prefixes available
+                                                           for channels.
+ 
+PREFIX        (modes)prefixes (qaohv)~&@%+                 Indicates the modes on a channel
+                                                           that corespond to the given
+                                                           nickname prefixes.
+
+CHANMODES     A,B,C,D         be,kfL,lj,                   Specifies how each channel mode is
+                              psmntirRcOAQKVHGCuzNSMT      set/unset. The A section specifies
+                                                           modes that add a nick/mask to a
+                                                           list. The B section specifies
+                                                           modes that require a parameter
+                                                           to be both set and unset. The C
+                                                           section specifies modes that
+                                                           only require a parameter to be
+                                                           set, and the D section
+                                                           specifies modes that require no
+                                                           parameters.
+
+NETWORK       string          no default value             Specifies the name of the
+                                                           network that the server is
+                                                           connected to.
+
+CASEMAPPING   string          ascii                        Specifies what definition the
+                                                           server uses when determining if
+                                                           characters are upper/lowercase
+                                                           of eachother.
+
+EXTBAN        prefix,types    ~,cqnr                       Specifies what extbans are
+                                                           supported by the server. The prefix
+                                                           defines which character indicates
+                                                           an extban and the types defines
+                                                           which extbans the server supports.
+
+ELIST         flags           MNUCT                        Specifies the set of extended LIST
+                                                           options supported. The M flag 
+                                                           indicates mask based searching,
+                                                           the N flag indicates negative
+                                                           mask based searching. The U flag
+                                                           means support for user count
+                                                           searching. The C flag allows channel
+                                                           creation time searching, and the T
+                                                           flag allows topic set time 
+                                                           searching.
+
+CMDS          commands        MAP,KNOCK,DCCALLOW,USERIP    Specifies a series of commands that
+                                                           can be useful for the client to know
+                                                           exist as they may provide a more
+                                                           efficient means for the client to
+                                                           accomplish a specific task. This
+                                                           token replaces the MAP and KNOCK
+                                                           tokens.
+
+STATUSMSG     flags           ~&@%+                        Specifies the mode flags that may
+                                                           prefix a channel name in a PRIVMSG
+                                                           or NOTICE to limit who receives the
+                                                           message to only those with a certain
+                                                           level of access. This token will
+                                                           replace the WALLCHOPS token.
+
+EXCEPTS       none            none                         Indicates that channel ban exceptions
+                                                           (+e) are supported by the server.
+
+INVEX         none            none                         Indicates that channel invite
+                                                           exceptions (+I) are supported by
+                                                           the server.
+
+MAXLIST       mode:num,...    b:60,e:60,I:60               Specifies the maximum number of 
+                                                           entries that may be added to a 
+                                                           particular mode list (type A modes).
+                                                           This token replaces MAXBANS.
+
+CHANLIMIT     pfx:num,...     #:10                         Specifies the maximum number of 
+                                                           channels with the specified prefix
+                                                           that a user may join at one time.
+                                                           This token will replace MAXCHANNELS.
+
+CHANNELLEN    number          32                           Provides the maximum length of a
+                                                           channel name that a user can create.
+
+NAMESX        none            none                         Indicates that extended /NAMES info
+                                                           is available on this server. If the
+                                                           client sends "PROTOCTL NAMESX" then
+                                                           the server will, from then on, send
+                                                           all channel rights in a NAMES reply
+                                                           instead of only the highest right
+                                                           (eg: @+Person instead of @Person).
+
+UHNAMES       none            none                         Indicates that (other) extended
+                                                           /NAMES info is available on the
+                                                           server. If the client sends
+                                                           "PROTOCTL UHNAMES" then the server
+                                                           will, from then on, send user@host
+                                                           information in a NAMES reply
+                                                           (eg: @nick!ident@hostname).
+
+WATCHOPTS     flags           A                            WATCH options supported. 'A' means
+                                                           Away Notification is available.
diff --git a/doc/technical/base64.txt b/doc/technical/base64.txt
new file mode 100644
index 0000000..ba0edfa
--- /dev/null
+++ b/doc/technical/base64.txt
@@ -0,0 +1,11 @@
+base64 Documentation (c) 2002 codemastr (Dominick Meglio) [codemastr@unrealircd.com]
+(As of Unreal3.2-beta11)
+
+The base64 system used by Unreal is defined as follows:
+
+         0 1 2 3 4 5 6 7 8 9 A B C D E F G H I J K L M N O P Q R S T
+         U V W X Y Z a b c d e f g h i j k l m n o p q r s t u v w x
+         y z { }
+
+These numbers are translated to and from their decimal equivilents of 0-64 in order to
+provide a shorter way of expressing a number.
diff --git a/doc/technical/serverprotocol.txt b/doc/technical/serverprotocol.txt
new file mode 100644
index 0000000..bae498c
--- /dev/null
+++ b/doc/technical/serverprotocol.txt
@@ -0,0 +1,2 @@
+All server protocol documentation has been moved to the wiki:
+https://www.unrealircd.org/docs/Server_protocol
diff --git a/doc/translations.txt b/doc/translations.txt
new file mode 100644
index 0000000..800c00a
--- /dev/null
+++ b/doc/translations.txt
@@ -0,0 +1,26 @@
+==[ Translations ]===========================================================
+
+In UnrealIRCd 5 we support the following translations:
+* on-line documentation at https://www.unrealircd.org/docs/ (wiki!)
+* help.conf
+* example.conf
+
+For translating the wiki documentation see this article:
+https://www.unrealircd.org/docs/Translating_UnrealIRCd_wiki_pages
+
+For the .conf files the following rules apply:
+* You must translate the very latest (English) version of the document(s)
+* The translation must be correct. Not just the spelling and grammar,
+  but also 'technically'. You should therefore have some real experience
+  with UnrealIRCd.
+* Someone, usually the person who translated it, needs to be willing
+  to actively maintain the docs. This is very important! If docs are
+  out of date (out-of-synch) there will be confusion among users.
+  We will remove documents that have been out of date too long (months)
+
+If you want to start translating a document, please send an email to
+syzop@unrealircd.org and mention the language you are willing to translate
+to..  You will then receive an email back saying you can go ahead (or not). 
+This is mainly to avoid multiple persons working on the same translation.
+
+=============================================================================
diff --git a/extras/.indent.pro b/extras/.indent.pro
new file mode 100644
index 0000000..e2b4ff3
--- /dev/null
+++ b/extras/.indent.pro
@@ -0,0 +1,52 @@
+--leave-preprocessor-space
+--dont-break-procedure-type
+--no-space-after-function-call-names
+--brace-indent0
+--indent-level8
+-ip8
+--dont-line-up-parentheses
+--continuation-indentation4
+--case-indentation2
+--no-space-after-casts
+--blank-lines-after-procedures
+--no-blank-lines-after-declarations
+--braces-on-struct-decl-line
+--paren-indentation0
+--case-brace-indentation0
+--line-length80
+--declaration-indentation5
+-T size_t
+-T aClass
+-T TS
+-T aClient
+-T aServer
+-T anUser
+-T aChannel
+-T Mode
+-T aConfItem
+-T aMessage
+-T aMessageTree
+-T aGline
+-T aListingArgs
+-T snomask_t
+-T n_short
+-T n_long
+-T n_time
+-T u_char
+-T u_short
+-T u_long
+-T u_int
+-T dbuf
+-T dbufbuf
+-T aHashEntry
+-T Link
+-T Dlink
+-T VOIDSIG
+-T aHostent
+-T ResRQ
+-T aCache
+-T CacheTable
+-T cainfo
+-T reinfo
+-T RETSIGTYPE
+-T OPT_TYPE
diff --git a/extras/VStudioAnalyze.ruleset b/extras/VStudioAnalyze.ruleset
new file mode 100755
index 0000000..d1dd3f3
--- /dev/null
+++ b/extras/VStudioAnalyze.ruleset
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="UnrealIRCd rules - based off Microsoft Native Minimum Rules" Description="These rules focus on the most critical problems in your native code, including potential security holes and application crashes. It is recommended to include this rule set in any custom rule set you create for your native projects." ToolsVersion="10.0">
+  <Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
+    <Name Resource="NativeMinimumRules_Name" />
+    <Description Resource="NativeMinimumRules_Description" />
+  </Localization>
+
+  <Rules AnalyzerId="Microsoft.Analyzers.NativeCodeAnalysis" RuleNamespace="Microsoft.Rules.Native">
+<!-- Many false positives    <Rule Id="C6001" Action="Warning" /> -->
+<!-- Many false positives    <Rule Id="C6011" Action="Warning" /> -->
+    <Rule Id="C6029" Action="Warning" />
+    <Rule Id="C6053" Action="Warning" />
+    <Rule Id="C6059" Action="Warning" />
+    <Rule Id="C6063" Action="Warning" />
+    <Rule Id="C6064" Action="Warning" />
+    <Rule Id="C6066" Action="Warning" />
+    <Rule Id="C6067" Action="Warning" />
+    <Rule Id="C6101" Action="Warning" />
+    <Rule Id="C6200" Action="Warning" />
+    <Rule Id="C6201" Action="Warning" />
+    <Rule Id="C6270" Action="Warning" />
+    <Rule Id="C6271" Action="Warning" />
+    <Rule Id="C6272" Action="Warning" />
+    <Rule Id="C6273" Action="Warning" />
+    <Rule Id="C6274" Action="Warning" />
+    <Rule Id="C6276" Action="Warning" />
+    <Rule Id="C6277" Action="Warning" />
+    <Rule Id="C6284" Action="Warning" />
+    <Rule Id="C6290" Action="Warning" />
+    <Rule Id="C6291" Action="Warning" />
+    <Rule Id="C6302" Action="Warning" />
+    <Rule Id="C6303" Action="Warning" />
+    <Rule Id="C6305" Action="Warning" />
+    <Rule Id="C6306" Action="Warning" />
+    <Rule Id="C6328" Action="Warning" />
+<!--    <Rule Id="C6385" Action="Warning" /> more false positives -->
+<!--    <Rule Id="C6386" Action="Warning" /> the analysis this one does - or lack thereof - is particularly dumb pffff -->
+<!--    <Rule Id="C6387" Action="Warning" /> more null/0 false positives -->
+    <Rule Id="C6500" Action="Warning" />
+    <Rule Id="C6501" Action="Warning" />
+    <Rule Id="C6503" Action="Warning" />
+    <Rule Id="C6504" Action="Warning" />
+    <Rule Id="C6505" Action="Warning" />
+    <Rule Id="C6506" Action="Warning" />
+    <Rule Id="C6508" Action="Warning" />
+    <Rule Id="C6509" Action="Warning" />
+    <Rule Id="C6510" Action="Warning" />
+    <Rule Id="C6511" Action="Warning" />
+    <Rule Id="C6513" Action="Warning" />
+    <Rule Id="C6514" Action="Warning" />
+    <Rule Id="C6515" Action="Warning" />
+    <Rule Id="C6516" Action="Warning" />
+    <Rule Id="C6517" Action="Warning" />
+    <Rule Id="C6518" Action="Warning" />
+    <Rule Id="C6522" Action="Warning" />
+    <Rule Id="C6525" Action="Warning" />
+    <Rule Id="C6527" Action="Warning" />
+    <Rule Id="C6530" Action="Warning" />
+    <Rule Id="C6540" Action="Warning" />
+    <Rule Id="C6551" Action="Warning" />
+    <Rule Id="C6552" Action="Warning" />
+    <Rule Id="C6701" Action="Warning" />
+    <Rule Id="C6702" Action="Warning" />
+    <Rule Id="C6703" Action="Warning" />
+    <Rule Id="C6704" Action="Warning" />
+    <Rule Id="C6705" Action="Warning" />
+    <Rule Id="C6706" Action="Warning" />
+
+    <!-- CppCoreCheck -->
+    <!-- Span/View over temporary -->
+    <Rule Id="C26449" Action="Warning" />
+    <!-- Arithmetic overflow -->
+    <Rule Id="C26450" Action="Warning" />
+    <Rule Id="C26451" Action="Warning" />
+    <Rule Id="C26452" Action="Warning" />
+    <Rule Id="C26453" Action="Warning" />
+    <Rule Id="C26454" Action="Warning" />
+    <!-- Unitialized Member -->
+    <Rule Id="C26495" Action="Warning" />
+
+    <Rule Id="C28021" Action="Warning" />
+<!--    <Rule Id="C28182" Action="Warning" /> false positives for dereferencing null ptr -->
+    <Rule Id="C28202" Action="Warning" />
+    <Rule Id="C28203" Action="Warning" />
+    <Rule Id="C28205" Action="Warning" />
+    <Rule Id="C28206" Action="Warning" />
+    <Rule Id="C28207" Action="Warning" />
+    <Rule Id="C28210" Action="Warning" />
+    <Rule Id="C28211" Action="Warning" />
+    <Rule Id="C28212" Action="Warning" />
+    <Rule Id="C28213" Action="Warning" />
+    <Rule Id="C28214" Action="Warning" />
+    <Rule Id="C28215" Action="Warning" />
+    <Rule Id="C28216" Action="Warning" />
+    <Rule Id="C28217" Action="Warning" />
+    <Rule Id="C28218" Action="Warning" />
+    <Rule Id="C28219" Action="Warning" />
+    <Rule Id="C28220" Action="Warning" />
+    <Rule Id="C28221" Action="Warning" />
+    <Rule Id="C28222" Action="Warning" />
+    <Rule Id="C28223" Action="Warning" />
+    <Rule Id="C28224" Action="Warning" />
+    <Rule Id="C28225" Action="Warning" />
+    <Rule Id="C28226" Action="Warning" />
+    <Rule Id="C28227" Action="Warning" />
+    <Rule Id="C28228" Action="Warning" />
+    <Rule Id="C28229" Action="Warning" />
+    <Rule Id="C28230" Action="Warning" />
+    <Rule Id="C28231" Action="Warning" />
+    <Rule Id="C28232" Action="Warning" />
+    <Rule Id="C28233" Action="Warning" />
+    <Rule Id="C28234" Action="Warning" />
+    <Rule Id="C28235" Action="Warning" />
+    <Rule Id="C28236" Action="Warning" />
+    <Rule Id="C28237" Action="Warning" />
+    <Rule Id="C28238" Action="Warning" />
+    <Rule Id="C28239" Action="Warning" />
+    <Rule Id="C28240" Action="Warning" />
+    <Rule Id="C28241" Action="Warning" />
+    <Rule Id="C28243" Action="Warning" />
+    <Rule Id="C28245" Action="Warning" />
+    <Rule Id="C28246" Action="Warning" />
+    <Rule Id="C28250" Action="Warning" />
+<!--    <Rule Id="C28251" Action="Warning" /> this may be real but it's damn annoying: inconsistent annotation for function -->
+    <Rule Id="C28252" Action="Warning" />
+    <Rule Id="C28253" Action="Warning" />
+    <Rule Id="C28254" Action="Warning" />
+    <Rule Id="C28262" Action="Warning" />
+    <Rule Id="C28263" Action="Warning" />
+    <Rule Id="C28267" Action="Warning" />
+    <Rule Id="C28272" Action="Warning" />
+    <Rule Id="C28273" Action="Warning" />
+    <Rule Id="C28275" Action="Warning" />
+    <Rule Id="C28279" Action="Warning" />
+    <Rule Id="C28280" Action="Warning" />
+    <Rule Id="C28282" Action="Warning" />
+    <Rule Id="C28285" Action="Warning" />
+    <Rule Id="C28286" Action="Warning" />
+    <Rule Id="C28287" Action="Warning" />
+    <Rule Id="C28288" Action="Warning" />
+    <Rule Id="C28289" Action="Warning" />
+    <Rule Id="C28290" Action="Warning" />
+    <Rule Id="C28291" Action="Warning" />
+    <Rule Id="C28300" Action="Warning" />
+    <Rule Id="C28301" Action="Warning" />
+    <Rule Id="C28302" Action="Warning" />
+    <Rule Id="C28303" Action="Warning" />
+    <Rule Id="C28304" Action="Warning" />
+    <Rule Id="C28305" Action="Warning" />
+    <Rule Id="C28308" Action="Warning" />
+    <Rule Id="C28309" Action="Warning" />
+    <Rule Id="C28350" Action="Warning" />
+    <Rule Id="C28351" Action="Warning" />
+  </Rules>
+</RuleSet>
diff --git a/extras/argon2-20181209.tar.gz b/extras/argon2-20181209.tar.gz
new file mode 100644
index 0000000..9ed4ab3
Binary files /dev/null and b/extras/argon2-20181209.tar.gz differ
diff --git a/extras/build-tests/nix/build b/extras/build-tests/nix/build
new file mode 100755
index 0000000..c589458
--- /dev/null
+++ b/extras/build-tests/nix/build
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# Exit on any failure:
+set -e
+
+# Verbose:
+set -x
+
+if [ "$1" != "" ]; then
+	BUILDCONFIG="$*"
+fi
+
+if [[ "$OSTYPE" == "freebsd"* ]]; then
+	export MAKE="gmake -j4"
+else
+	export MAKE="make -j4"
+fi
+
+export CPPFLAGS="-DFAKELAG_CONFIGURABLE -DNOREMOVETMP"
+
+# !! skipped for now: extras/build-tests/nix/select-config $BUILDCONFIG !!
+# !! temporary use this:
+cp extras/build-tests/nix/configs/default ./config.settings
+
+# Debian 8 workaround:
+if lsb_release -av 2>&1|egrep 'Debian.*jessie'; then
+	echo "Disabling ASan due to false positives on deb8"
+	echo 'EXTRAPARA="--enable-werror --disable-asan"' >>config.settings
+fi
+
+# Read config.settings, this makes a couple of variables available to us.
+. ./config.settings
+if [ "$SSLDIR" != "" ]; then
+	# In case we build local openssl/libressl
+	export LD_LIBRARY_PATH="$SSLDIR/lib"
+fi
+./Config -quick || (tail -n 5000 config.log; exit 1)
+$MAKE
+yes ''|make pem
+make
+./unrealircd module install third/dumpcmds
+make install
+
+set +x
+echo ""
+echo "***********************************************"
+echo "UnrealIRCd build & install successful."
+echo "***********************************************"
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	otool -L ~/unrealircd/bin/unrealircd
+else
+	ldd ~/unrealircd/bin/unrealircd
+fi
+
+if [ "$BUILDCONFIG" = "local-curl" ]; then
+	# We broke the system significantly earlier that build tests
+	# won't work (eg: 'git' is uninstallable). Don't bother
+	# running the tests. I don't expect a 'local-curl' specific
+	# bug anyway.
+	exit 0
+fi
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	# 'rake' doesn't work. have to figure that one out..
+	echo "Not running test on OS X for now"
+	exit 0
+fi
+
+echo ""
+echo ""
+#echo "Now running UnrealIRCd test framework..."
+#set -x
+#extras/build-tests/nix/run-tests
diff --git a/extras/build-tests/nix/configs/default b/extras/build-tests/nix/configs/default
new file mode 100644
index 0000000..3a7c28a
--- /dev/null
+++ b/extras/build-tests/nix/configs/default
@@ -0,0 +1,24 @@
+#
+BASEPATH=$HOME/unrealircd
+BINDIR=$HOME/unrealircd/bin
+DATADIR=$HOME/unrealircd/data
+CONFDIR=$HOME/unrealircd/conf
+MODULESDIR=$HOME/unrealircd/modules
+LOGDIR=$HOME/unrealircd/logs
+CACHEDIR=$HOME/unrealircd/cache
+DOCDIR=$HOME/unrealircd/doc
+TMPDIR=$HOME/unrealircd/tmp
+PRIVATELIBDIR=$HOME/unrealircd/lib
+PREFIXAQ="1"
+MAXCONNECTIONS="1024"
+NICKNAMEHISTORYLENGTH="2000"
+DEFPERM="0600"
+SSLDIR=""
+REMOTEINC=""
+CURLDIR=""
+SHOWLISTMODES="1"
+NOOPEROVERRIDE=""
+OPEROVERRIDEVERIFY=""
+GENCERTIFICATE="0"
+EXTRAPARA="--enable-werror --enable-asan"
+ADVANCED=""
diff --git a/extras/build-tests/nix/run-tests b/extras/build-tests/nix/run-tests
new file mode 100755
index 0000000..5e9808e
--- /dev/null
+++ b/extras/build-tests/nix/run-tests
@@ -0,0 +1,44 @@
+#!/bin/bash
+#
+# This script fires up a two-server IRC network and runs the test framework
+#
+
+# Exit on error:
+set -e
+
+# Verbose:
+set -x
+
+# Kill old instances
+killall -9 unrealircd || true
+# Remove old junk
+rm -rf cipherscan/ unrealircd-tests/
+
+if [ ! -d ~/cipherscan ]; then
+	# Install 'cipherscan'
+	git clone -q https://github.com/mozilla/cipherscan
+fi
+
+# Install 'unrealircd-tests'
+git clone -q https://github.com/unrealircd/unrealircd-tests.git
+cd unrealircd-tests
+
+# Run the test framework, testing both services:
+if uname -a|grep -q FreeBSD; then
+	# FreeBSD runs without services since they fail mysteriously:
+	./run -services none || exit 1
+else
+	# Linux tests both with anope and atheme services:
+	./run -services anope || exit 1
+	./run -services atheme || exit 1
+fi
+
+# Do cipherscan test at the end
+if [[ "$OSTYPE" != "freebsd"* ]]; then
+	sleep 2
+	cd ../extras/tests/tls
+	./tls-tests
+	cd -
+fi
+
+killall -15 unrealircd atheme-services services anope || true
diff --git a/extras/build-tests/nix/run-tests.bbwrapper b/extras/build-tests/nix/run-tests.bbwrapper
new file mode 100755
index 0000000..86676df
--- /dev/null
+++ b/extras/build-tests/nix/run-tests.bbwrapper
@@ -0,0 +1,14 @@
+#!/bin/bash
+#
+# This is a simple wrapper script that will run the tests
+# When finished, either due to succes or failure,
+# it will kill the ircd
+#
+# Also, it makes sure the job times out (is killed)
+# in case it misbehaves
+#
+set +ex
+timeout --kill-after=5 600 extras/build-tests/nix/run-tests
+EX="$?"
+killall -9 valgrind valgrind.bin memcheck memcheck-amd64-linux memcheck-x86-linux ircd unrealircd val 1>/dev/null 2>&1
+exit $EX
diff --git a/extras/build-tests/nix/select-config b/extras/build-tests/nix/select-config
new file mode 100755
index 0000000..790e7e9
--- /dev/null
+++ b/extras/build-tests/nix/select-config
@@ -0,0 +1,114 @@
+#!/bin/bash
+#
+# This is a helper script for travis-ci builds and our own FreeBSD test machine.
+# It is not meant to be used by end-users
+#
+
+function fail()
+{
+	echo "select-config failed: $*"
+	exit 1
+}
+
+function build_ssl {
+	DIR="$2"
+	URL="$1/$2.tar.gz"
+	savewd="$PWD"
+	cd ~
+	wget "$URL" || exit 1
+	tar xzf $DIR.tar.gz
+	cd "$DIR"
+	(./configure --prefix=$HOME/ssl 1>/dev/null 2>&1 || ./config --prefix=$HOME/ssl -fPIC 1>/dev/null 2>&1 ) || fail "build_ssl: configure/config failed"
+	(make -j2 1>/dev/null 2>&1 && make install 1>/dev/null 2>&1) || fail "build_ssl: make failed"
+	cd "$savewd"
+	echo "SSLDIR=$HOME/ssl" >>config.settings
+}
+
+if [ ! -d extras ]; then
+	echo "This tool is supposed to be run from the source root, so ~/unrealircd-5.0.x or similar"
+	exit 1
+fi
+
+set -x
+
+# Take default settings as a starter..
+cp extras/build-tests/nix/configs/default ./config.settings
+
+# Libtool is required for the other options..
+# Also for our FreeBSD machine we have to uninstall some stuff since a clean
+# environment is not guaranteed...
+if [ "$OSTYPE" = "linux-gnu" ]; then
+	sudo apt-get -qq update
+	sudo apt-get install libtool -qq
+elif [[ "$OSTYPE" == "freebsd"* ]]; then
+	sudo pkg install -y libtool
+	sudo pkg remove -y c-ares
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+	brew update
+	brew install openssl
+else
+	echo "OS not correctly detected ($OSTYPE). Aborting."
+	exit 1
+fi
+
+echo "*****************************************************************"
+echo "SELECTED BUILD OPTIONS: $*"
+echo "*****************************************************************"
+
+while [ "$1" ]
+do
+	echo "Processing option $1..."
+	if [ "$1" = "system-cares" ]; then
+		if [ "$OSTYPE" = "linux-gnu" ]; then
+			sudo apt-get install libc-ares-dev -qq
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+			sudo pkg install -y c-ares
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+			brew install c-ares
+		fi
+	elif [ "$1" = "system-curl" ]; then
+		echo 'REMOTEINC=1' >>config.settings
+		if [ "$OSTYPE" = "linux-gnu" ]; then
+			sudo apt-get install libcurl4-openssl-dev -qq
+			echo 'CURLDIR=/usr' >>config.settings
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+			sudo pkg install -y curl
+			echo 'CURLDIR=/usr/local' >>config.settings
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+			brew install c-ares curl
+			echo 'CURLDIR=/usr/local/opt/curl' >>config.settings
+		fi
+	elif [ "$1" = "local-curl" ]; then
+		if [ "$OSTYPE" = "linux-gnu" ]; then
+			sudo apt-get remove libcurl4-openssl-dev libcurl3-gnutls libcurl3 -qq
+		elif [[ "$OSTYPE" == "freebsd"* ]]; then
+			sudo pkg remove -y curl #NOTE: unfortunately this also removes 'git' :D
+		elif [[ "$OSTYPE" == "darwin"* ]]; then
+			echo "No need to remove curl since it's not installed. Or at least I hope so..."
+		fi
+		echo 'REMOTEINC=1' >>config.settings
+		echo "CURLDIR=`pwd`/extras/curl" >>config.settings
+	elif [ "$1" = "libressl-27" ]; then
+		build_ssl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL libressl-2.7.5
+	elif [ "$1" = "libressl-28" ]; then
+		build_ssl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL libressl-2.8.3
+	elif [ "$1" = "libressl-29" ]; then
+		build_ssl https://ftp.openbsd.org/pub/OpenBSD/LibreSSL libressl-2.9.0
+	elif [ "$1" = "openssl-102" ]; then
+		build_ssl https://www.openssl.org/source openssl-1.0.2q
+	elif [ "$1" = "openssl-110" ]; then
+		build_ssl https://www.openssl.org/source openssl-1.1.0j
+	elif [ "$1" = "openssl-111" ]; then
+		build_ssl https://www.openssl.org/source openssl-1.1.1a
+	else
+		echo "Unknown option $1"
+		exit 1
+	fi
+	shift
+done
+
+if [[ "$OSTYPE" == "darwin"* ]]; then
+	echo "NOTE: Not building with -Werror for now on macOS..."
+else
+	echo 'EXTRAPARA="--enable-werror"' >>config.settings
+fi
diff --git a/extras/build-tests/windows/build.bat b/extras/build-tests/windows/build.bat
new file mode 100644
index 0000000..3a8ffe9
--- /dev/null
+++ b/extras/build-tests/windows/build.bat
@@ -0,0 +1,86 @@
+echo on
+
+rem Temporarily hardcoded:
+set TARGET=Visual Studio 2019
+set SHORTNAME=vs2019
+
+rem Initialize Visual Studio variables
+if "%TARGET%" == "Visual Studio 2017" call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"
+if "%TARGET%" == "Visual Studio 2019" call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
+
+rem Installing tools
+rem only for appveyor:
+rem cinst unrar -y
+rem cinst unzip -y
+rem cinst innosetup -y
+
+rem Installing UnrealIRCd dependencies
+cd \projects
+mkdir unrealircd-5-libs
+cd unrealircd-5-libs
+curl -fsS -o unrealircd-libraries-5-devel.zip https://www.unrealircd.org/files/dev/win/libs/unrealircd-libraries-5-devel.zip
+unzip unrealircd-libraries-5-devel.zip
+copy dlltool.exe \users\user\worker\unreal5-w10\build /y
+
+rem for appveyor: cd \projects\unrealircd
+cd \users\user\worker\unreal5-w10\build
+
+rem Now the actual build
+call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat
+
+rem The above command will fail, due to missing symbol file
+rem However the symbol file can only be generated after the above command
+rem So... we create the symbolfile...
+nmake -f makefile.windows SYMBOLFILE
+
+rem And we re-run the exact same command:
+call extras\build-tests\windows\compilecmd\%SHORTNAME%.bat
+if %ERRORLEVEL% NEQ 0 EXIT /B 1
+
+rem Convert c:\dev to c:\projects\unrealircd-5-libs
+rem TODO: should use environment variable in innosetup script?
+sed -i "s/c:\\dev\\unrealircd-5-libs/c:\\projects\\unrealircd-5-libs/gi" src\windows\unrealinst.iss
+
+rem Build installer file
+"c:\Program Files (x86)\Inno Setup 5\iscc.exe" /Q- src\windows\unrealinst.iss
+if %ERRORLEVEL% NEQ 0 EXIT /B 1
+
+rem Show some proof
+ren mysetup.exe unrealircd-dev-build.exe
+dir unrealircd-dev-build.exe
+sha256sum unrealircd-dev-build.exe
+
+rem Kill any old instances, just to be sure
+taskkill -im unrealircd.exe -f
+sleep 2
+rem Just a safety measure so we don't end up testing
+rem some old version...
+del "C:\Program Files\UnrealIRCd 5\bin\unrealircd.exe"
+
+echo Running installer...
+start /WAIT unrealircd-dev-build.exe /VERYSILENT /LOG=setup.log
+if %ERRORLEVEL% NEQ 0 goto installerfailed
+
+rem Upload artifact
+rem appveyor PushArtifact unrealircd-dev-build.exe
+rem if %ERRORLEVEL% NEQ 0 EXIT /B 1
+
+rem Install 'unrealircd-tests'
+cd ..
+rd /q/s unrealircd-tests
+git clone https://github.com/unrealircd/unrealircd-tests.git
+if %ERRORLEVEL% NEQ 0 EXIT /B 1
+cd unrealircd-tests
+dir
+
+"C:\Program Files\Git\bin\bash.exe" ./runwin
+if %ERRORLEVEL% NEQ 0 EXIT /B 1
+
+goto end
+
+:installerfailed
+type setup.log
+echo INSTALLATION FAILED
+EXIT /B 1
+
+:end
diff --git a/extras/build-tests/windows/compilecmd/vs2019.bat b/extras/build-tests/windows/compilecmd/vs2019.bat
new file mode 100644
index 0000000..dcc34ae
--- /dev/null
+++ b/extras/build-tests/windows/compilecmd/vs2019.bat
@@ -0,0 +1,18 @@
+rem Build command for Visual Studio 2019
+
+nmake -f makefile.windows ^
+LIBRESSL_INC_DIR="c:\projects\unrealircd-5-libs\libressl\include" ^
+LIBRESSL_LIB_DIR="c:\projects\unrealircd-5-libs\libressl\lib" ^
+SSLLIB="crypto-45.lib ssl-47.lib" ^
+USE_REMOTEINC=1 ^
+LIBCURL_INC_DIR="c:\projects\unrealircd-5-libs\curl\include" ^
+LIBCURL_LIB_DIR="c:\projects\unrealircd-5-libs\curl\builds\libcurl-vc-x64-release-dll-ssl-dll-cares-dll-ipv6-obj-lib" ^
+CARES_LIB_DIR="c:\projects\unrealircd-5-libs\c-ares\msvc\cares\dll-release" ^
+CARES_INC_DIR="c:\projects\unrealircd-5-libs\c-ares" ^
+CARESLIB="cares.lib" ^
+PCRE2_INC_DIR="c:\projects\unrealircd-5-libs\pcre2\include" ^
+PCRE2_LIB_DIR="c:\projects\unrealircd-5-libs\pcre2\lib" ^
+PCRE2LIB="pcre2-8.lib" ^
+ARGON2_LIB_DIR="c:\projects\unrealircd-5-libs\argon2\vs2015\build" ^
+ARGON2_INC_DIR="c:\projects\unrealircd-5-libs\argon2\include" ^
+ARGON2LIB="Argon2RefDll.lib" %*
diff --git a/extras/c-ares.tar.gz b/extras/c-ares.tar.gz
new file mode 100644
index 0000000..e39bf4c
Binary files /dev/null and b/extras/c-ares.tar.gz differ
diff --git a/extras/curlinstall b/extras/curlinstall
new file mode 100755
index 0000000..348c473
--- /dev/null
+++ b/extras/curlinstall
@@ -0,0 +1,98 @@
+#!/bin/sh
+URL="https://www.unrealircd.org/files/curl-latest.tar.gz"
+OUTF="curl-latest.tar.gz"
+OUTD="curl-latest"
+ARESPATH="`pwd`/extras/c-ares"
+UNREALDIR="`pwd`"
+CARESVERSION="1.15.0"
+LIBDIR="$1"
+
+if [ "x$1" = "x" ]; then
+	echo "You should (no longer) run this program directly."
+	echo "It will be invoked by ./Config"
+	exit 1
+fi
+
+if [ ! -f src/parse.c ]; then
+	if [ -f ../src/parse.c ]; then
+		cd ..
+	else
+		echo "Please run this program from your UnrealIRCd directory"
+		echo "(usually $HOME/unrealircd-5.0.X or something like that)"
+		exit 1
+	fi
+fi
+
+wget --version 1>/dev/null 2>&1
+if [ "$?" = 0 ]; then
+	FETCHER="wget"
+else
+	fetch --version 1>/dev/null 2>&1
+	if [ "$?" = 0 ]; then
+		FETCHER="fetch"
+	else
+		lynx --version 1>/dev/null 2>&1
+		if [ "$?" = 0 ]; then
+			FETCHER="lynx"
+		else
+			echo "ERROR: unable to find wget/fetch/lynx, please install at least one of these programs"
+			exit 1
+		fi
+	fi
+fi
+
+if [ ! -d tmp ]; then
+	mkdir tmp || exit 1
+fi
+
+cd tmp || exit 1
+
+rm -f "$OUTF"
+
+if [ "$FETCHER" = "wget" ]; then
+	wget -O "$OUTF" "$URL"
+elif [ "$FETCHER" = "lynx" ]; then
+	lynx -dump "$URL" >"$OUTF"
+elif [ "$FETCHER" = "fetch" ]; then
+	cd tmp #todo: find out the cmd line parameter ;)
+	fetch "$URL"
+fi
+
+if [ "$?" != 0 ]; then
+	echo "ERROR: Something went wrong while trying to download $URL"
+	exit 1
+fi
+
+rm -rf "$OUTD" # remove old directory prior to extracting
+tar xzf "$OUTF" || exit 1
+
+
+if [ "`eval echo -n 'a'`" = "-n a" ] ; then
+        c="\c"
+else
+        n="-n"
+fi
+
+if [ ! -d "$ARESPATH/lib" ]; then
+	echo "c-ares has not been build yet, let's do that now..."
+	cd ../extras/
+	tar xzf c-ares.tar.gz || exit 1
+	cd c-ares-$CARESVERSION || exit 1
+	./configure --prefix=$ARESPATH || exit 1
+	(make && make install) || exit 1
+	cd ../../tmp/
+	echo "c-ares built."
+	echo ""
+fi
+
+# We assume curl has been packaged in a way it will extract to "$OUTD"/
+cd "$OUTD" || exit 1
+
+echo "Building and installing libcurl"
+CPPFLAGS="-I$ARESPATH/include" ./configure --prefix=$UNREALDIR/extras/curl --libdir=$LIBDIR --enable-shared \
+ --disable-thread --enable-ares=$ARESPATH --disable-ipv6
+cp -R $ARESPATH/lib ares
+make && make install
+
+#cp $ARESPATH/lib/libcares.a $HOME/curl/lib
+# that isn't needed anymore as the lib is already in unreal...
diff --git a/extras/doxygen/Developers.md b/extras/doxygen/Developers.md
new file mode 100644
index 0000000..fa5f57f
--- /dev/null
+++ b/extras/doxygen/Developers.md
@@ -0,0 +1,17 @@
+Welcome to the doxygen-generated documentation for the UnrealIRCd 5.x API.
+This is intended **for developers only!**
+
+If you are creating a 3rd party module for UnrealIRCd or are interested
+in contributing to UnrealIRCd then this is the right place.
+
+Here you should be able to find a lot of information on the data structures
+and functions available to you when coding for UnrealIRCd.
+
+## Wiki documentation ##
+* Be sure to check the [Module API](https://www.unrealircd.org/docs/Dev:Module_API) article on the wiki, which currently provides a better overview of the module API.
+
+## Doxygen docs ##
+* [The most common structs](group__CommonStructs.html) - like Client, User, Server, Channel, etc.
+* [All structs](classes.html) - in a simple alphabetical index
+* [Functions and structs ordered by purpose](modules.html) - this is work in progress and still needs expansion!
+* [Browse by source file](dir_68267d1309a1af8e8297ef4c3efbcdba.html) - see all src/*.c files and their (documented) functions.
diff --git a/extras/doxygen/Doxyfile b/extras/doxygen/Doxyfile
new file mode 100644
index 0000000..7e3d7d7
--- /dev/null
+++ b/extras/doxygen/Doxyfile
@@ -0,0 +1,2494 @@
+# Doxyfile 1.8.13
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "UnrealIRCd"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 5.0.3
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "Module API documentation - for developers / module coders only"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doc/doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = YES
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = include/ src/ extras/doxygen/Developers.md
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          = *.c \
+                         *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.idl \
+                         *.ddl \
+                         *.odl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.cs \
+                         *.d \
+                         *.php \
+                         *.php4 \
+                         *.php5 \
+                         *.phtml \
+                         *.inc \
+                         *.m \
+                         *.markdown \
+                         *.md \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.pyw \
+                         *.f90 \
+                         *.f95 \
+                         *.f03 \
+                         *.f08 \
+                         *.f \
+                         *.for \
+                         *.tcl \
+                         *.vhd \
+                         *.vhdl \
+                         *.ucf \
+                         *.qsf
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = Developers.md
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = extras/doxygen/header.html
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = extras/doxygen/doxygen_custom.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = YES
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = NO
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = NO
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = NO
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = NO
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = NO
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/extras/doxygen/doxygen_custom.css b/extras/doxygen/doxygen_custom.css
new file mode 100644
index 0000000..c86e626
--- /dev/null
+++ b/extras/doxygen/doxygen_custom.css
@@ -0,0 +1,4 @@
+code {
+    border: 1px solid #C4CFE5;
+    background-color: #FBFCFD;
+}
diff --git a/extras/doxygen/header.html b/extras/doxygen/header.html
new file mode 100644
index 0000000..ee34a79
--- /dev/null
+++ b/extras/doxygen/header.html
@@ -0,0 +1,56 @@
+<!-- HTML header for doxygen 1.8.13-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
+<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta name="generator" content="Doxygen $doxygenversion"/>
+<meta name="viewport" content="width=device-width, initial-scale=1"/>
+<!--BEGIN PROJECT_NAME--><title>$projectname Module API: $title</title><!--END PROJECT_NAME-->
+<!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
+<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<script type="text/javascript" src="$relpath^jquery.js"></script>
+<script type="text/javascript" src="$relpath^dynsections.js"></script>
+$treeview
+$search
+$mathjax
+<link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" />
+$extrastylesheet
+</head>
+<body>
+<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
+
+<!--BEGIN TITLEAREA-->
+<div id="titlearea">
+<table cellspacing="0" cellpadding="0">
+ <tbody>
+ <tr style="height: 56px;">
+  <!--BEGIN PROJECT_LOGO-->
+  <td id="projectlogo"><img alt="Logo" src="$relpath^$projectlogo"/></td>
+  <!--END PROJECT_LOGO-->
+  <!--BEGIN PROJECT_NAME-->
+  <td id="projectalign" style="padding-left: 0.5em;">
+   <div id="projectname">$projectname
+   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">Module API $projectnumber</span><!--END PROJECT_NUMBER-->
+   </div>
+   <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
+  </td>
+  <!--END PROJECT_NAME-->
+  <!--BEGIN !PROJECT_NAME-->
+   <!--BEGIN PROJECT_BRIEF-->
+    <td style="padding-left: 0.5em;">
+    <div id="projectbrief">$projectbrief</div>
+    </td>
+   <!--END PROJECT_BRIEF-->
+  <!--END !PROJECT_NAME-->
+  <!--BEGIN DISABLE_INDEX-->
+   <!--BEGIN SEARCHENGINE-->
+   <td>$searchbox</td>
+   <!--END SEARCHENGINE-->
+  <!--END DISABLE_INDEX-->
+ </tr>
+ </tbody>
+</table>
+</div>
+<!--END TITLEAREA-->
+<!-- end header part -->
diff --git a/extras/patches/patch_spamfilter_conf b/extras/patches/patch_spamfilter_conf
new file mode 100755
index 0000000..7589f7f
--- /dev/null
+++ b/extras/patches/patch_spamfilter_conf
@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# This script tries to upgrade spamfilter.conf from an old
+# version that uses 'posix' spamfilters to a bit more recent
+# version with examples using 'regex' spamfilters.
+# This so fewer users end up with a headache when upgrading
+# to UnrealIRCd 4.2.3+.
+#
+
+if [ -f spamfilter.conf.patch ]; then
+	F="`pwd`/spamfilter.conf.patch"
+elif [ -f extras/patches/spamfilter.conf.patch ]; then
+	F="`pwd`/extras/patches/spamfilter.conf.patch"
+else
+	echo "WARNING: spamfilter.conf.patch not found"
+	exit 0
+fi
+
+if [ ! -f "$F" ]; then
+	echo "WARNING: spamfilter.conf.patch not found in round two"
+	exit 0
+fi
+
+if [ "$1" = "" ]; then
+	echo "ERROR: No target confdir specified."
+	exit 0
+fi
+
+if [ ! -f "$1/spamfilter.conf" ]; then
+	echo "WARNING: no spamfilter.conf found in $1 -- strange"
+	exit 0
+fi
+
+cd "$1" || exit 1
+cat "$F"|patch -p0 --dry-run -N 1>/dev/null 2>&1
+if [ "$?" = 0 ]; then
+	# Patch succeeded, patch now!
+	echo "Upgrading examples in your spamfilter.conf..."
+	cat "$F"|patch -p0 -N
+fi
diff --git a/extras/patches/spamfilter.conf.patch b/extras/patches/spamfilter.conf.patch
new file mode 100644
index 0000000..aba16d1
--- /dev/null
+++ b/extras/patches/spamfilter.conf.patch
@@ -0,0 +1,328 @@
+--- spamfilter.conf.old	2015-06-27 18:29:01.084559805 +0200
++++ spamfilter.conf	2019-04-04 18:29:38.390647262 +0200
+@@ -1,232 +1,154 @@
+ /*
+- * This an example spamfilter file, it contains several
+- * real and useful spamfilters. This should give you an
+- * idea of how powerful spamfilter can be in real-life
+- * situations.
++ * This configuration file contains example spamfilter rules.
++ * They are real rules that were useful a long time ago.
++ * Since 2005 these rules are no longer maintained.
++ * The main purpose nowadays is to serve as an example
++ * to give you an idea of how powerful spamfilters can
++ * be in real-life situations.
+  *
+- * $Id$
++ * Documentation on spamfilter is available at:
++ * https://www.unrealircd.org/docs/Spamfilter
+  */
+ 
+-/* Guidelines on the 'action' field:
+- * As a general rule we use 'action block' for any newly added
+- * spamfilters at first, later on (after knowing about false
+- * positives) we might change some to viruschan/kill/gline/etc..
++/* General note:
++ * If you want to use a \ in a spamfilter, or in fact
++ * anywhere in the configuration file, then you need
++ * to escape this to \\ instead.
+  */
+ 
+-spamfilter {
+-	match-type posix;
+-	match "\x01DCC (SEND|RESUME)[ ]+\"(.+ ){20}";
+-	target { private; channel; };
+-	action kill;
+-	reason "mIRC 6.0-6.11 exploit attempt";
+-};
+ 
+-spamfilter {
+-	match-type posix;
+-	match "\x01DCC (SEND|RESUME).{225}";
+-	target { private; channel; };
+-	action kill;
+-	reason "Possible mIRC 6.12 exploit attempt";
+-};
++/* First some spamfilters with match-type 'simple'.
++ * The only matchers available are * and ?
++ * PRO's: very fast, easy matching: everyone can do this.
++ * CON's: limited ability to fine-tune spamfilters
++ */
+ 
+ spamfilter {
+-	match-type posix;
+-	match "Come watch me on my webcam and chat /w me :-\) http://.+:\d+/me\.mpg";
++	match-type simple;
++	match "Come watch me on my webcam and chat /w me :-) http://*:*/me.mpg";
+ 	target private;
+ 	action gline;
+ 	reason "Infected by fyle trojan: see http://www.sophos.com/virusinfo/analyses/trojfylexa.html";
+ };
+ 
++/* This signature uses a \ which has to escaped to \\ in the configuration file */
+ spamfilter {
+-	match-type posix;
+-	match "Speed up your mIRC DCC Transfer by up to 75%.*www\.freewebs\.com/mircupdate/mircspeedup\.exe";
+-	target private;
+-	action gline;
+-	reason "Infected by mirseed trojan: see http://www.sophos.com/virusinfo/analyses/trojmirseeda.html";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^http://www\.angelfire\.com/[a-z0-9]+/[a-z0-9]+/[a-z_]+\.jpg <- .*!";
+-	target private;
++	match-type simple;
++	match "C:\\WINNT\\system32\\*.zip";
++	target dcc;
+ 	action block;
+-	reason "Infected by fagot worm: see http://www.f-secure.com/v-descs/fagot.shtml";
++	reason "Infected by Gaggle worm?";
+ };
+ 
+ spamfilter {
+-	match-type posix;
+-	match "^FREE PORN: http://free:porn@([0-9]{1,3}\.){3}[0-9]{1,3}:8180$";
++	match-type simple;
++	match "Speed up your mIRC DCC Transfer by up to 75%*www.freewebs.com/mircupdate/mircspeedup.exe";
+ 	target private;
+ 	action gline;
+-	reason "Infected by aplore worm: see http://www.f-secure.com/v-descs/aplore.shtml";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^!login Wasszup!$";
+-	target channel;
+-	action gline;
+-	reason "Attempting to login to a GTBot";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^!login grrrr yeah baby!$";
+-	target channel;
+-	action gline;
+-	reason "Attempting to login to a GTBot";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^!packet ([0-9]{1,3}\.){3}[0-9]{1,3} [0-9]{1,15}";
+-	target channel;
+-	action gline;
+-	reason "Attempting to use a GTBot";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^!icqpagebomb ([0-9]{1,15} ){2}.+";
+-	target channel;
+-	action gline;
+-	reason "Attempting to use a GTBot";
++	reason "Infected by mirseed trojan: see http://www.sophos.com/virusinfo/analyses/trojmirseeda.html";
+ };
+ 
+ spamfilter {
+-	match-type posix;
+-	match "^!pfast [0-9]{1,15} ([0-9]{1,3}\.){3}[0-9]{1,3} [0-9]{1,5}$";
+-	target channel;
++	match-type simple;
++	match "STOP SPAM, USE THIS COMMAND: //write nospam $decode(*) | .load -rs nospam | //mode $me +R";
++	target private;
+ 	action gline;
+-	reason "Attempting to use a GTBot";
++	reason "Infected by nkie worm: see http://www.trojaninfo.com/nkie/nkie.htm";
+ };
+ 
+-spamfilter {
+-	match-type posix;
+-	match "^!portscan ([0-9]{1,3}\.){3}[0-9]{1,3} [0-9]{1,5} [0-9]{1,5}$";
+-	target channel;
+-	action gline;
+-	reason "Attempting to use a GTBot";
+-};
+ 
+-spamfilter {
+-	match-type posix;
+-	match "^.u(dp)? ([0-9]{1,3}\.){3}[0-9]{1,3} [0-9]{1,15} [0-9]{1,15} [0-9]{1,15}( [0-9])*$";
+-	target channel;
+-	action gline;
+-	reason "Attempting to use an SDBot";
+-};
++/* Now spamfilters of type 'regex'.
++ * These use powerful regular expressions (Perl/PCRE style)
++ * You may have to learn more about "regex" first before you
++ * can use them. For example the dot ('.') has special meaning.
++ */
+ 
++/* This regex shows a pattern which requires 20 paramaters,
++ * such as "x x x x x x x x x x x x x x x x x x x x"
++ */
+ spamfilter {
+-	match-type posix;
+-	match "^.syn ((([0-9]{1,3}\.){3}[0-9]{1,3})|([a-zA-Z0-9_-]+\.[a-zA-Z0-9_-]+\.[a-zA-Z0-9_.-]+)) [0-9]{1,5} [0-9]{1,15} [0-9]{1,15}";
+-	target { channel; private; };
+-	action gline;
+-	reason "Attempting to use a SpyBot";
++	match-type regex;
++	match "\x01DCC (SEND|RESUME)[ ]+\"(.+ ){20}";
++	target { private; channel; };
++	action kill;
++	reason "mIRC 6.0-6.11 exploit attempt";
+ };
+ 
++/* Similarly, this regex shows a pattern that matches
++ * against at least 225 characters in length.
++ */
+ spamfilter {
+-	match-type posix;
+-	match "^porn! porno! http://.+\/sexo\.exe";
+-	target private;
+-	action gline;
+-	reason "Infected by soex trojan: see http://www.trendmicro.com/vinfo/virusencyclo/default5.asp?VName=TROJ%5FSOEX.A";
++	match-type regex;
++	match "\x01DCC (SEND|RESUME).{225}";
++	target { private; channel; };
++	action kill;
++	reason "Possible mIRC 6.12 exploit attempt";
+ };
+ 
++/* Earlier you saw an example of a $decode exploit which used
++ * match-type 'simple' and - indeed - the filter was quite simple.
++ * The following uses a regex with a similar example.
++ * Regular expressions are very powerful but here you can see
++ * that it actually complicates writing a filter quite a bit.
++ * With regex in this filter we need to escape the ( and all
++ * the dots, question marks, etc. if we want to match these
++ * characters in literal text.
++ */
+ spamfilter {
+-	match-type posix;
+-	match "(^wait a minute plz\. i am updating my site|.*my erotic video).*http://.+/erotic(a)?/myvideo\.exe$";
++	match-type regex;
++	match "^Want To Be An IRCOp\? Try This New Bug Type: //write \$decode\(.+=.?,m\) \| \.load -rs \$decode\(.+=.?,m\)$";
+ 	target private;
+-	action gline;
+-	reason "Infected by some trojan (erotica?)";
++	action block;
++	reason "Spamming users with an mIRC trojan. Type '/unload -rs newb' to remove the trojan.";
+ };
+ 
+ spamfilter {
+-	match-type posix;
+-	match "^STOP SPAM, USE THIS COMMAND: //write nospam \$decode\(.+\) \| \.load -rs nospam \| //mode \$me \+R$";
++	match-type regex;
++	match "^http://www\.angelfire\.com/[a-z0-9]+/[a-z0-9]+/[a-z_]+\.jpg <- .*!";
+ 	target private;
+-	action gline;
+-	reason "Infected by nkie worm: see http://www.trojaninfo.com/nkie/nkie.htm";
++	action block;
++	reason "Infected by fagot worm: see http://www.f-secure.com/v-descs/fagot.shtml";
+ };
+ 
++/* This shows a regex which specifically matches an entire line by 
++ * the use of ^ and $
++ */
+ spamfilter {
+-	match-type posix;
+-	match "^FOR MATRIX 2 DOWNLOAD, USE THIS COMMAND: //write Matrix2 \$decode\(.+=,m\) \| \.load -rs Matrix2 \| //mode \$me \+R$";
+-	target private;
++	match-type regex;
++	match "^!login Wasszup!$";
++	target channel;
+ 	action gline;
+-	reason "Infected by nkie worm: see http://www.trojaninfo.com/nkie/nkie.htm";
++	reason "Attempting to login to a GTBot";
+ };
+ 
++/* An example of how to match against an IP address in text (IPv4 only) */
+ spamfilter {
+-	match-type posix;
+-	match "^hey .* to get OPs use this hack in the chan but SHH! //\$decode\(.*,m\) \| \$decode\(.*,m\)$";
+-	target private;
++	match-type regex;
++	match "^!packet ([0-9]{1,3}\.){3}[0-9]{1,3} [0-9]{1,15}";
++	target channel;
+ 	action gline;
+-	reason "Infected by nkie worm: see http://www.trojaninfo.com/nkie/nkie.htm";
++	reason "Attempting to use a GTBot";
+ };
+ 
++/* A slightly more complex example with a partial OR matcher (|) */
+ spamfilter {
+-	match-type posix;
+-	match ".*(http://jokes\.clubdepeche\.com|http://horny\.69sexy\.net|http://private\.a123sdsdssddddgfg\.com).*";
++	match-type regex;
++	match "(^wait a minute plz\. i am updating my site|.*my erotic video).*http://.+/erotic(a)?/myvideo\.exe$";
+ 	target private;
+ 	action gline;
+-	reason "Infected by LOI trojan";
+-};
+-
+-/* This is a 'general sig' which might have a tad more false positives, hence just 'block' is used */
+-spamfilter {
+-	match-type posix;
+-	match "C:\\WINNT\\system32\\[][0-9a-z_-{|}`]+\.zip";
+-	target dcc;
+-	action block;
+-	reason "Infected by Gaggle worm?";
++	reason "Infected by some trojan (erotica?)";
+ };
+ 
++/* In regex a \ is special and needs to be escaped to \\
++ * However in this configuration file, \ is also special and
++ * needs to be escaped to \\ as well.
++ * The result is that we need double escaping:
++ * To match a \ you need to write \\\\ in the configuration file.
++ */
+ spamfilter {
+-	match-type posix;
+-	match "C:\\WINNT\\system32\\(notes|videos|xxx|ManualSeduccion|postal|hechizos|images|sex|avril)\.zip";
++	match-type regex;
++	match "C:\\\\WINNT\\\\system32\\\\(notes|videos|xxx|ManualSeduccion|postal|hechizos|images|sex|avril)\.zip";
+ 	target dcc;
+ 	action dccblock;
+ 	reason "Infected by Gaggle worm";
+ };
+-
+-spamfilter {
+-	match-type posix;
+-	match "http://.+\.lycos\..+/[iy]server[0-9]/[a-z]{4,11}\.(gif|jpg|avi|txt)";
+-	target { private; quit; };
+-	action block;
+-	reason "Infected by Gaggle worm";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^Free porn pic.? and movies (www\.sexymovies\.da\.ru|www\.girlporn\.org)";
+-	target private;
+-	action block;
+-	reason "Unknown virus. Site causes Backdoor.Delf.lq infection";
+-};
+-
+-spamfilter {
+-	match-type posix;
+-	match "^LOL! //echo -a \$\(\$decode\(.+,m\),[0-9]\)$";
+-	target channel;
+-	action block;
+-	reason "$decode exploit";
+-};
+-
+-/*
+-spamfilter {
+-	regex "//write \$decode\(.+\|.+load -rs";
+-	target { private; channel; };
+-	reason "Generic $decode exploit";
+-	action block;
+-};
+-*/
+-
+-spamfilter {
+-	match-type posix;
+-	match "^Want To Be An IRCOp\? Try This New Bug Type: //write \$decode\(.+=.?,m\) \| \.load -rs \$decode\(.+=.?,m\)$";
+-	target private;
+-	action block;
+-	reason "Spamming users with an mIRC trojan. Type '/unload -rs newb' to remove the trojan.";
+-};
diff --git a/extras/pcre2.tar.gz b/extras/pcre2.tar.gz
new file mode 100644
index 0000000..3d7de97
Binary files /dev/null and b/extras/pcre2.tar.gz differ
diff --git a/extras/security/apparmor/unrealircd b/extras/security/apparmor/unrealircd
new file mode 100644
index 0000000..c9eb837
--- /dev/null
+++ b/extras/security/apparmor/unrealircd
@@ -0,0 +1,27 @@
+# AppArmor profile for UnrealIRCd 5
+#
+# Note that you may still see some DENIED warnings in logs with
+# operation="chmod". These are harmless and can be safely ignored.
+#
+# Tested on Ubuntu 16.04 LTS and Ubuntu 18.04 LTS
+#
+# IMPORTANT: you will have to modify the path to executable below
+#            if it's not /home/ircd/unrealircd/bin/unrealircd !
+
+#include <tunables/global>
+
+# Change the pathname of your UnrealIRCd executable here:
+/home/ircd/unrealircd/bin/unrealircd {
+  #include <abstractions/base>
+  #include <abstractions/nameservice>
+
+  @{HOME}/unrealircd/conf/ r,
+  @{HOME}/unrealircd/conf/** r,
+  @{HOME}/unrealircd/data/** rw,
+  @{HOME}/unrealircd/lib/*.so* mr,
+  @{HOME}/unrealircd/logs/* rw,
+  @{HOME}/unrealircd/modules/**.so r,
+  @{HOME}/unrealircd/tmp/ r,
+  @{HOME}/unrealircd/tmp/* mrw,
+  @{HOME}/unrealircd/bin/unrealircd mr,
+}
diff --git a/extras/tests/tls/cipherscan_profiles/baseline.txt b/extras/tests/tls/cipherscan_profiles/baseline.txt
new file mode 100644
index 0000000..3231e7f
--- /dev/null
+++ b/extras/tests/tls/cipherscan_profiles/baseline.txt
@@ -0,0 +1,27 @@
+Target: 127.0.0.1:5901
+
+prio  ciphersuite                    protocols              pfs                 curves
+1     ECDHE-ECDSA-AES256-GCM-SHA384  TLSv1.2                ECDH,P-521,521bits  secp521r1,secp384r1
+2     ECDHE-ECDSA-AES128-GCM-SHA256  TLSv1.2                ECDH,P-521,521bits  secp521r1,secp384r1
+3     ECDHE-ECDSA-AES256-SHA384      TLSv1.2                ECDH,P-521,521bits  secp521r1,secp384r1
+4     ECDHE-ECDSA-AES128-SHA256      TLSv1.2                ECDH,P-521,521bits  secp521r1,secp384r1
+5     ECDHE-ECDSA-AES256-SHA         TLSv1,TLSv1.1,TLSv1.2  ECDH,P-521,521bits  secp521r1,secp384r1
+6     ECDHE-ECDSA-AES128-SHA         TLSv1,TLSv1.1,TLSv1.2  ECDH,P-521,521bits  secp521r1,secp384r1
+
+Certificate: untrusted, 384 bits, ecdsa-with-SHA256 signature
+TLS ticket lifetime hint: None
+NPN protocols: None
+OCSP stapling: not supported
+Cipher ordering: server
+Curves ordering: server - fallback: no
+Server supports secure renegotiation
+Server supported compression methods: NONE
+TLS Tolerance: yes
+
+Intolerance to:
+ SSL 3.254           : absent
+ TLS 1.0             : absent
+ TLS 1.1             : absent
+ TLS 1.2             : absent
+ TLS 1.3             : absent
+ TLS 1.4             : absent
diff --git a/extras/tests/tls/cipherscan_profiles/openssl-101.txt b/extras/tests/tls/cipherscan_profiles/openssl-101.txt
new file mode 100644
index 0000000..d74eb56
--- /dev/null
+++ b/extras/tests/tls/cipherscan_profiles/openssl-101.txt
@@ -0,0 +1,27 @@
+Target: 127.0.0.1:5901
+
+prio  ciphersuite                    protocols              pfs                 curves
+1     ECDHE-ECDSA-AES256-GCM-SHA384  TLSv1.2                ECDH,P-256,256bits  prime256v1
+2     ECDHE-ECDSA-AES128-GCM-SHA256  TLSv1.2                ECDH,P-256,256bits  prime256v1
+3     ECDHE-ECDSA-AES256-SHA384      TLSv1.2                ECDH,P-256,256bits  prime256v1
+4     ECDHE-ECDSA-AES256-SHA         TLSv1,TLSv1.1,TLSv1.2  ECDH,P-256,256bits  prime256v1
+5     ECDHE-ECDSA-AES128-SHA256      TLSv1.2                ECDH,P-256,256bits  prime256v1
+6     ECDHE-ECDSA-AES128-SHA         TLSv1,TLSv1.1,TLSv1.2  ECDH,P-256,256bits  prime256v1
+
+Certificate: untrusted, 384 bits, ecdsa-with-SHA256 signature
+TLS ticket lifetime hint: None
+NPN protocols: None
+OCSP stapling: not supported
+Cipher ordering: server
+Curves ordering: server - fallback: no
+Server supports secure renegotiation
+Server supported compression methods: NONE
+TLS Tolerance: yes
+
+Intolerance to:
+ SSL 3.254           : absent
+ TLS 1.0             : absent
+ TLS 1.1             : absent
+ TLS 1.2             : absent
+ TLS 1.3             : absent
+ TLS 1.4             : absent
diff --git a/extras/tests/tls/tls-tests b/extras/tests/tls/tls-tests
new file mode 100755
index 0000000..97efa55
--- /dev/null
+++ b/extras/tests/tls/tls-tests
@@ -0,0 +1,90 @@
+#!/bin/bash
+# We assume we are executed from extras/tests/tls
+
+function fail()
+{
+	echo "TLS TEST ERROR: $*"
+	exit 1
+}
+
+CIPHERSCAN="cipherscan"
+OPENSSL="openssl"
+if [ -x ~/cipherscan ]; then
+	CIPHERSCAN="$HOME/cipherscan/cipherscan"
+	OPENSSL="$HOME/cipherscan/openssl"
+elif [ -x /home/travis/build/unrealircd/unrealircd/cipherscan/cipherscan ]; then
+	CIPHERSCAN="/home/travis/build/unrealircd/unrealircd/cipherscan/cipherscan"
+	OPENSSL="/home/travis/build/unrealircd/unrealircd/cipherscan/openssl"
+elif [ -x ../../../cipherscan/ ]; then
+	CIPHERSCAN="`readlink -f ../../../cipherscan/cipherscan`"
+	OPENSSL="`readlink -f ../../../cipherscan/openssl`"
+fi
+
+$CIPHERSCAN --help >/dev/null || exit 1
+
+
+# This is the basic cipherscan test.
+# It compares the output against a reference .txt file and alarms us if there
+# are any changes. These changes may not always be harmful, but at least we
+# will get warned on any possible changes.
+$CIPHERSCAN --no-colors 127.0.0.1:5901|grep -vF '.....' >cipherscan.test.txt
+
+# Now check if profile matches, if so.. everything is ok.
+# We have 1 or more baseline profiles
+# And you can optionally add profile-specific, eg openssl-102.txt
+# Yeah that was a great idea but maintaining that is a bit of a hassle.
+# TODO: reintroduce it though, see below.
+##for f in cipherscan_profiles/baseline*txt cipherscan_profiles/$BUILDCONFIG.txt
+FAILED=1
+for f in cipherscan_profiles/*.txt
+do
+	diff -uab $f cipherscan.test.txt 1>/dev/null 2>&1
+	if [ "$?" -eq 0 ]; then
+		FAILED=0
+		echo "Cipherscan profile $f matched."
+		break
+	fi
+done
+
+if [ "$FAILED" -eq 1 ]; then
+	echo "*** Differences found between cipherscan scan and expected output ***"
+	if [ -f cipherscan_profiles/$BUILDCONFIG.txt ]; then
+		COMPARE_PROFILE="cipherscan_profiles/$BUILDCONFIG.txt"
+	else
+		COMPARE_PROFILE="cipherscan_profiles/baseline.txt"
+	fi
+	echo "== EXPECTED OUTPUT ($COMPARE_PROFILE) =="
+	cat $COMPARE_PROFILE
+	echo
+	echo "== ACTUAL TEST OUTPUT =="
+	cat cipherscan.test.txt
+	echo
+	echo "== DIFF =="
+	diff -uab $COMPARE_PROFILE cipherscan.test.txt
+	echo
+	echo "cipherscan test failed."
+	exit 1
+else
+	echo "*** Cipherscan output was good ***"
+	cat cipherscan.test.txt
+fi
+
+# This checks for a couple of old ciphers that should never work:
+for cipher in 3DES RC4
+do
+	echo "Testing cipher $cipher (MUST FAIL!).."
+	(echo QUIT|$OPENSSL s_client -connect 127.0.0.1:5901 -cipher $cipher) &&
+	fail "UnrealIRCd allowed us to connect with cipher $cipher, BAD!"
+done
+
+# This checks older SSL/TLS versions that should not work:
+for protocol in ssl2 ssl3
+do
+	echo "Testing protocol $protocol (MUST FAIL!).."
+	(echo QUIT|$OPENSSL s_client -connect 127.0.0.1:5901 -$protocol) &&
+	fail "UnrealIRCd allowed us to connect with protocol $protocol, BAD!"
+done
+
+echo
+echo "TLS tests ended (no issues)."
+exit 0
diff --git a/extras/tls.cnf b/extras/tls.cnf
new file mode 100644
index 0000000..7a04a4a
--- /dev/null
+++ b/extras/tls.cnf
@@ -0,0 +1,31 @@
+# create RSA certs - Server
+
+[ req ]
+# Note: RSA bits is ignored, as we use ECC now
+default_bits = 2048
+distinguished_name = req_dn
+x509_extensions = cert_type
+
+[ req_dn ]
+countryName = Country Name
+countryName_default             = US
+countryName_min                 = 2
+countryName_max                 = 2
+
+stateOrProvinceName             = State/Province
+stateOrProvinceName_default     = New York
+
+localityName                    = Locality Name (eg, city)
+
+0.organizationName              = Organization Name (eg, company)
+0.organizationName_default      = SuperNETs
+
+organizationalUnitName          = Organizational Unit Name (eg, section)
+organizationalUnitName_default  = IRCd  
+
+0.commonName                    = Common Name (Full domain of your server)
+1.commonName_value              = localhost
+
+[ cert_type ]
+nsCertType = server
+
diff --git a/extras/unreal.supp b/extras/unreal.supp
new file mode 100644
index 0000000..a89bfc0
--- /dev/null
+++ b/extras/unreal.supp
@@ -0,0 +1,10 @@
+{
+   arc4_rnd1
+   Memcheck:Value8
+   fun:getrandom8
+}
+{
+   arc4_rnd2
+   Memcheck:Value8
+   fun:add_entropy_configfile
+}
diff --git a/extras/wrap-compiler-for-flag-check b/extras/wrap-compiler-for-flag-check
new file mode 100755
index 0000000..579f577
--- /dev/null
+++ b/extras/wrap-compiler-for-flag-check
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# There is no way to make clang's "argument unused" warning fatal.  So when
+# configure checks for supported flags, it runs $CC, $CXX, $LD via this
+# wrapper.
+#
+# Ideally the search string would also include 'clang: ' but this output might
+# depend on clang's argv[0].
+
+if out=`"$@" 2>&1`; then
+  echo "$out"
+  if echo "$out" | grep 'warning: argument unused' >/dev/null; then
+    echo "$0: found clang warning"
+    exit 1
+  else
+    exit 0
+  fi
+else
+  code=$?
+  echo "$out"
+  exit $code
+fi
diff --git a/include/channel.h b/include/channel.h
new file mode 100644
index 0000000..44fe84a
--- /dev/null
+++ b/include/channel.h
@@ -0,0 +1,40 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, ircd/channel.h
+ *   Copyright (C) 1990 Jarkko Oikarinen
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#ifndef	__channel_include__
+#define __channel_include__
+#define CREATE 1		/* whether a channel should be
+				   created or just tested for existance */
+
+#define	MODEBUFLEN	200
+
+#define ChannelExists(n)	(find_channel(n, NULL))
+
+/* NOTE: Timestamps will be added to MODE-commands, so never make
+ * RESYNCMODES and MODEPARAMS higher than MAXPARA-3. DALnet servers
+ * before Dreamforge aren't safe with more than six. -Donwulff
+ */
+#include "msg.h"
+#define	MAXMODEPARAMS	(MAXPARA-3)	/* Maximum modes processed */
+#define RESYNCMODES	12	/* Max modes per MODE in resync */
+#define MODEPARAMS	6	/* Max modes from user */
+
+#endif
diff --git a/include/common.h b/include/common.h
new file mode 100644
index 0000000..a666bb9
--- /dev/null
+++ b/include/common.h
@@ -0,0 +1,240 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/common.h
+ *   Copyright (C) 1990 Armin Gruner
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#ifndef	__common_include__
+#define __common_include__
+
+#include <time.h>
+#ifdef _WIN32
+#include <malloc.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#include <io.h>
+#include <direct.h>
+#endif
+#include "types.h"
+#include "config.h"
+#ifndef _WIN32
+#include <sys/param.h>
+#include <stdbool.h>
+#else
+typedef int bool;
+#define false 0
+#define true 1
+#endif
+
+#include "sys.h"
+
+#include "ircsprintf.h"
+#include "list.h"
+
+#ifdef DEVELOP_CVS
+#define ID_Copyright(x) static char id_copyright[] = x
+#define ID_Notes(x) static char id_notes[] = x
+#else
+#define ID_Copyright(x)
+#define ID_Notes(x)
+#endif
+
+#define BMAGIC 0x4675636B596F754661736369737473
+
+#ifdef _WIN32
+#define DEADBEEF_ADDR 0xDEADBEEFDEADBEEF
+#else
+#define DEADBEEF_ADDR 0xDEADBEEF
+#endif
+
+#define BASE_VERSION "UnrealIRCd"
+#ifndef _WIN32
+#define FDwrite(x,y,z) write(x, y, z)
+#else
+#define FDwrite(x,y,z) send(x, y, z, 0)
+#endif
+#ifndef NULL
+#define NULL 0
+#endif
+
+#ifdef TRUE
+#undef TRUE
+#endif
+
+#ifdef FALSE
+#undef FALSE
+#endif
+
+#define FALSE (0)
+#define TRUE  (!FALSE)
+
+#ifndef UNSURE
+#define UNSURE (2)
+#endif
+
+#define mycmp(a,b) \
+ ( (toupper(a[0])!=toupper(b[0])) || smycmp((a)+1,(b)+1) )
+extern int smycmp(const char *, const char *);
+#ifndef GLIBC2_x
+extern int myncmp(const char *, const char *, int);
+#endif
+
+extern char *strtoken(char **, char *, char *);
+
+extern MODVAR int  global_count, max_global_count;
+extern char *myctime(time_t);
+#ifdef _WIN32
+extern int gettimeofday(struct timeval *tp, void *tzp);
+#endif
+
+#define PRECISE_CHECK
+
+#ifndef MAX
+#define MAX(a, b)	((a) > (b) ? (a) : (b))
+#endif
+#ifndef MIN
+#define MIN(a, b)	((a) < (b) ? (a) : (b))
+#endif
+
+extern MODVAR u_char tolowertab[], touppertab[];
+#undef tolower
+#define tolower(c) (tolowertab[(u_char)(c)])
+#undef toupper
+#define toupper(c) (touppertab[(u_char)(c)])
+#undef isalpha
+#undef isdigit
+#undef isxdigit
+#undef isalnum
+#undef isprint
+#undef isascii
+#undef isgraph
+#undef ispunct
+#undef islower
+#undef isupper
+#undef isspace
+#undef iscntrl
+extern MODVAR unsigned char char_atribs[];
+
+#define PRINT 1
+#define CNTRL 2
+#define ALPHA 4
+#define PUNCT 8
+#define DIGIT 16
+#define SPACE 32
+#define ALLOW 64
+#define ALLOWN 128
+
+#ifndef KLINE_TEMP
+#define KLINE_PERM 0
+#define KLINE_TEMP 1
+#define KLINE_AKILL 2
+#define KLINE_EXCEPT 3
+#endif
+
+#define isallowed(c) (char_atribs[(u_char)(c)]&ALLOW)
+#define	iscntrl(c) (char_atribs[(u_char)(c)]&CNTRL)
+#define isalpha(c) (char_atribs[(u_char)(c)]&ALPHA)
+#define isspace(c) (char_atribs[(u_char)(c)]&SPACE)
+#define islower(c) ((char_atribs[(u_char)(c)]&ALPHA) && ((u_char)(c) > 0x5f))
+#define isupper(c) ((char_atribs[(u_char)(c)]&ALPHA) && ((u_char)(c) < 0x60))
+#define isdigit(c) (char_atribs[(u_char)(c)]&DIGIT)
+#define	isxdigit(c) (isdigit(c) || ('a' <= (c) && (c) <= 'f') || \
+		     ('A' <= (c) && (c) <= 'F'))
+#define isalnum(c) (char_atribs[(u_char)(c)]&(DIGIT|ALPHA))
+#define isprint(c) (char_atribs[(u_char)(c)]&PRINT)
+#define isascii(c) ((u_char)(c) >= 0 && (u_char)(c) <= 0x7f)
+#define isgraph(c) ((char_atribs[(u_char)(c)]&PRINT) && ((u_char)(c) != 0x32))
+#define ispunct(c) (!(char_atribs[(u_char)(c)]&(CNTRL|ALPHA|DIGIT)))
+#define iswseperator(c) (!isalnum(c) && !((u_char)c >= 128))
+
+/*
+ * Protocol support text.  DO NO CHANGE THIS unless you know what
+ * you are doing.
+ */
+
+/* IRCu/Hybrid/Unreal way now :) -Stskeeps */
+
+#define EXPAR1	extchmstr[0]
+#define EXPAR2	extchmstr[1]
+#define EXPAR3	extchmstr[2]
+#define EXPAR4	extchmstr[3]
+
+#ifdef PREFIX_AQ
+#define CHPFIX        "(qaohv)~&@%+"
+#define CHPAR1        "beI"
+#else
+#define CHPFIX        "(ohv)@%+"
+#define CHPAR1        "beIqa"
+#endif /* PREFIX_AQ */
+
+#define CHPAR2        "k"
+#define CHPAR3        "l"
+#define CHPAR4        "psmntir"
+
+#ifdef _WIN32
+/*
+ * Used to display a string to the GUI interface.
+ * Windows' internal strerror() function doesn't work with socket errors.
+ */
+extern int DisplayString(HWND hWnd, char *InBuf, ...);
+#else
+typedef int SOCKET;
+#define INVALID_SOCKET -1
+#endif
+
+#if defined(__FreeBSD__) || defined(__APPLE__)
+extern char *malloc_options;
+#endif
+
+extern int lu_noninv, lu_inv, lu_serv, lu_oper,
+    lu_unknown, lu_channel, lu_lu, lu_lulocal, lu_lserv,
+    lu_clu, lu_mlu, lu_cglobalu, lu_mglobalu;
+
+extern MODVAR time_t now;
+
+#ifndef _WIN32
+#if defined(__STDC__)
+#define __const         const
+#define __signed        signed
+#define __volatile      volatile
+#ifndef __GNUC__
+#define __inline
+#endif
+
+#else
+#ifndef __GNUC__
+#define __const
+#define __inline
+#define __signed
+#define __volatile
+#ifndef NO_ANSI_KEYWORDS
+#define const                           /* delete ANSI C keywords */
+#define inline
+#define signed
+#define volatile
+#endif
+#endif
+#endif
+#else
+#define inline __inline
+#endif
+
+#define READBUF_SIZE 8192
+
+#endif /* __common_include__ */
diff --git a/include/config.h b/include/config.h
new file mode 100644
index 0000000..8e66000
--- /dev/null
+++ b/include/config.h
@@ -0,0 +1,327 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, include/config.h
+ *   Copyright (C) 1990 Jarkko Oikarinen
+ *
+ *   $Id$
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef	__config_include__
+#define	__config_include__
+
+#include "setup.h"
+
+/* IMPORTANT:
+ * Under normal conditions, you should not have to edit this file.  Run
+ * the ./Config script in the root directory instead!
+ *
+ * Windows is not a normal condition, edit this file if you use it. :-)
+ */
+
+/* Additional flags to give FreeBSD's malloc, only play with this if you
+ * know what you're doing.
+ */
+#define MALLOC_FLAGS_EXTRA ""
+
+/* I/O Engine: determine what method to use.
+ * So, the way this works is we determine using the preprocessor
+ * what polling backend to use for the eventloop.  We prefer epoll,
+ * followed by kqueue, followed by poll, and then finally select.
+ * Kind of ugly, but it gets the job done.  You can also fiddle with
+ * this to determine what backend is used.
+ */
+#ifndef _WIN32
+# ifdef HAVE_EPOLL
+#  define BACKEND_EPOLL
+# else
+#  ifdef HAVE_KQUEUE
+#   define BACKEND_KQUEUE
+#  else
+#   ifdef HAVE_POLL
+#    define BACKEND_POLL
+#   else
+#    define BACKEND_SELECT
+#   endif
+#  endif
+# endif
+#else
+# define BACKEND_SELECT
+#endif
+
+/* Define the ircd module suffix, should be .so on UNIX, and .dll on Windows. */
+#ifndef _WIN32
+# define MODULE_SUFFIX	".so"
+#else
+# define MODULE_SUFFIX	".dll"
+#endif
+
+/* Permit remote /rehash */
+#define REMOTE_REHASH
+
+/*
+** Freelinks garbage collector -Stskeeps
+**
+** GARBAGE_COLLECT_EVERY - how many seconds between every garbage collect
+** HOW_MANY_FREELINKS_ALLOWED - how many freelinks allowed
+*/
+#ifndef GARBAGE_COLLECT_EVERY
+#define GARBAGE_COLLECT_EVERY 		600	/* default: 600 (10 mins) */
+#endif
+
+#define HOW_MANY_FREELINKS_ALLOWED 	200	/* default: 200 */
+
+/*
+ * read/write are restarted after signals defining this 1, gets
+ * siginterrupt call compiled, which attempts to remove this
+ * behaviour (apollo sr10.1/bsd4.3 needs this)
+ */
+#ifdef APOLLO
+#define	RESTARTING_SYSTEMCALLS
+#endif
+
+/* DEBUGMODE: This should only be used when tracing a problem. It creates
+ * an insane amount of log output which can be very useful for debugging.
+ * You should *NEVER* enable this setting on production servers.
+ */
+/* #undef	DEBUGMODE */
+
+/* Similarly, DEBUG_IOENGINE can be used to debug the I/O engine. */
+/* #undef	DEBUG_IOENGINE */
+
+/*
+ * Full pathnames and defaults of irc system's support files.
+ */
+#define	CPATH		CONFDIR"/unrealircd.conf"	/* server configuration file */
+#define	MPATH		CONFDIR"/ircd.motd"	/* server MOTD file */
+#define SMPATH		CONFDIR"/ircd.smotd"    /* short MOTD file */
+#define RPATH   	CONFDIR"/ircd.rules"	/* server rules file */
+#define OPATH   	CONFDIR"/oper.motd"	/* Operators MOTD file */
+#define	LPATH		LOGDIR"/debug.log"	/* Where the debug file lives, if DEBUGMODE */
+#define VPATH		CONFDIR"/ircd.svsmotd"	/* Services MOTD append. */
+#define BPATH		CONFDIR"/bot.motd"	/* Bot MOTD */
+#define IRCDTUNE 	PERMDATADIR"/ircd.tune"	/* tuning .. */
+
+/** FAKELAG_CONFIGURABLE makes it possible to make certain classes exempted
+ * from 'fake lag' (that is, the artificial delay that is added by the ircd
+ * to prevent flooding, which causes the messages/commands of the user to
+ * slow down). Naturally, incorrect use of this feature can cause SEVERE
+ * issues, in fact it can easily bring your whole IRCd down if one of the
+ * users with class::options::nofakelag does a good flood at full speed.
+ * Hence, this is disabled by default, and you need to explicitly enable it
+ * here IF YOU KNOW WHAT YOU ARE DOING. People complaining their ircd
+ * ""crashed"" because of this setting will be shot. </DISCLAIMER>
+ * Common usage for this are: a trusted bot ran by an IRCOp, that you only
+ * want to give "flood access" and nothing else, and other such things.
+ */
+#define FAKELAG_CONFIGURABLE
+
+/* The default value for class::sendq */
+#define DEFAULT_SENDQ	3000000
+/* The default value for class::recvq */
+#define	DEFAULT_RECVQ	8000
+
+/* You can define the nickname of NickServ here (usually "NickServ").
+ * This is ONLY used for the ""infamous IDENTIFY feature"", which is:
+ * whenever a user connects with a server password but there isn't
+ * a server password set, the password is sent to NickServ in an
+ * 'IDENTIFY <pass>' message.
+ */
+#define NickServ "NickServ"
+
+/*   STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP STOP  */
+
+/* You shouldn't change anything below this line, unless absolutely needed. */
+
+/*
+ * Maximum number of network connections your server will allow.
+ * On *NIX this is configured via ./Config so don't set it here.
+ * The setting below is the Windows (default) setting and isn't actually
+ * the maximum number of network connections but the highest FD (File
+ * Descriptor) that we can deal with.
+ *
+ * 2004-10-13: 1024 -> 4096
+ */
+#ifdef _WIN32
+ #define MAXCONNECTIONS	10240
+#else
+ /* Non-Windows: */
+ #if (!defined(MAXCONNECTIONS_REQUEST) || (MAXCONNECTIONS_REQUEST < 1)) && \
+      (defined(HAVE_POLL) || defined(HAVE_EPOLL) || defined(HAVE_KQUEUE))
+  /* Have poll/epoll/kqueue and either no --with-maxconnections or
+   * --with-maxconnections=0, either of which indicates 'automatic' mode.
+   * At the time of writing we will try a limit of 8192.
+   * It will automatically be lowered at boottime if we can only use
+   * 4096, 2048 or 1024. No problem.
+   */
+  #define MAXCONNECTIONS 8192
+ #elif defined(MAXCONNECTIONS_REQUEST) && (MAXCONNECTIONS_REQUEST >= 1)
+  /* --with-maxconnections=something */
+  #define MAXCONNECTIONS MAXCONNECTIONS_REQUEST
+ #else
+  /* Automatic mode, but we only have select(). Bummer... */
+  #define MAXCONNECTIONS 1024
+ #endif
+#endif
+
+/* Number of file descriptors reserved for non-incoming-clients.
+ * One of which may be used by auth, the rest are really reserved.
+ * They can be used for outgoing server links, listeners, logging, etc.
+ */
+#if MAXCONNECTIONS > 1024
+ #define CLIENTS_RESERVE 8
+#else
+ #define CLIENTS_RESERVE 4
+#endif
+
+/*
+ * this defines the length of the nickname history.  each time a user changes
+ * nickname or signs off, their old nickname is added to the top of the list.
+ * The following sizes are recommended:
+ * 8MB or less  core memory : 500	(at least 1/4 of max users)
+ * 8MB-16MB     core memory : 500-750	(1/4 -> 1/2 of max users)
+ * 16MB-32MB    core memory : 750-1000	(1/2 -> 3/4 of max users)
+ * 32MB or more core memory : 1000+	(> 3/4 of max users)
+ * where max users is the expected maximum number of users.
+ * (100 nicks/users ~ 25k)
+ * NOTE: this is directly related to the amount of memory ircd will use whilst
+ *	 resident and running - it hardly ever gets swapped to disk! You can
+ *	 ignore these recommendations- they only are meant to serve as a guide
+ * NOTE: But the *Minimum* ammount should be 100, in order to make nick
+ *       chasing possible for mode and kick.
+ */
+#ifndef NICKNAMEHISTORYLENGTH
+#define NICKNAMEHISTORYLENGTH 2000
+#endif
+
+/*
+ * Maximum delay for socket loop (in miliseconds, so 1000 = 1 second). 
+ * This means any other events and such may be delayed up to this value
+ * when there is no socket data waiting for us (no clients sending anything).
+ * Was 2000ms in 3.2.x, 1000ms for versions below 3.4-alpha4.
+ * 500ms in UnrealIRCd 4 (?)
+ * 250ms in UnrealIRCd 5.
+ */
+#define SOCKETLOOP_MAX_DELAY 250
+
+/*
+ * Max time from the nickname change that still causes KILL
+ * automaticly to switch for the current nick of that user. (seconds)
+ */
+#define KILLCHASETIMELIMIT 30
+
+/* Detect slow spamfilters? This requires a little more cpu time when processing
+ * any spamfilter (like on text/connect/..) but will save you from slowing down
+ * your IRCd to a near-halt (well, in most cases.. there are still cases like when
+ * it goes into a loop that it will still stall completely... forever..).
+ * This is kinda experimental, and requires getrusage.
+ */
+#ifndef _WIN32
+#define SPAMFILTER_DETECTSLOW
+#endif
+
+/* Maximum number of ModData objects that may be attached to an object */
+/* UnrealIRCd 4.0.0 - 4.0.13:  8,    8, 4, 4
+ * UnrealIRCd 4.0.14+       : 12,    8, 4, 4
+ * UnrealIRCd 5.0.0         : 12, 8, 8, 4, 4, 500, 500
+ */
+#define MODDATA_MAX_CLIENT		 12
+#define MODDATA_MAX_LOCAL_CLIENT	  8
+#define MODDATA_MAX_CHANNEL		  8
+#define MODDATA_MAX_MEMBER		  4
+#define MODDATA_MAX_MEMBERSHIP		  4
+#define MODDATA_MAX_LOCAL_VARIABLE	500
+#define MODDATA_MAX_GLOBAL_VARIABLE	500
+
+/* If EXPERIMENTAL is #define'd then all users will receive a notice about
+ * this when they connect, along with a pointer to bugs.unrealircd.org where
+ * they can report any problems. This is mainly to help UnrealIRCd development.
+ */
+#undef EXPERIMENTAL
+
+/* Default SSL/TLS cipherlist (except for TLS1.3, see further down).
+ * This can be changed via set::ssl::options::ciphers in the config file.
+ */
+#define UNREALIRCD_DEFAULT_CIPHERS "TLS13-CHACHA20-POLY1305-SHA256 TLS13-AES-256-GCM-SHA384 TLS13-AES-128-GCM-SHA256 EECDH+CHACHA20 EECDH+AESGCM EECDH+AES AES256-GCM-SHA384 AES128-GCM-SHA256 AES256-SHA256 AES128-SHA256 AES256-SHA AES128-SHA"
+
+/* Default TLS 1.3 ciphersuites.
+ * This can be changed via set::ssl::options::ciphersuites in the config file.
+ */
+#define UNREALIRCD_DEFAULT_CIPHERSUITES "TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256:TLS_AES_128_CCM_8_SHA256:TLS_AES_128_CCM_SHA256"
+
+/* Default SSL/TLS curves for ECDH(E)
+ * This can be changed via set::ssl::options::ecdh-curve in the config file.
+ * NOTE: This requires openssl 1.0.2 or newer, otherwise these defaults
+ *       are not applied, due to the missing openssl API call.
+ */
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#define UNREALIRCD_DEFAULT_ECDH_CURVES "X25519:secp521r1:secp384r1:prime256v1"
+#else
+#define UNREALIRCD_DEFAULT_ECDH_CURVES "secp521r1:secp384r1:prime256v1"
+#endif
+
+/* ------------------------- END CONFIGURATION SECTION -------------------- */
+#define MOTD MPATH
+#define RULES RPATH
+#define	MYNAME BINDIR "/unrealircd"
+#define	CONFIGFILE CPATH
+#define	IRCD_PIDFILE PIDFILE
+
+#ifdef DEBUGMODE
+ #define Debug(x) debug x
+ #define LOGFILE LPATH
+#else
+ #define Debug(x) ;
+ #define LOGFILE "/dev/null"
+#endif
+
+#if defined(DEFAULT_RECVQ)
+#    if (DEFAULT_RECVQ < 512)
+     error DEFAULT_RECVQ needs redefining.
+#    endif
+#else
+     error DEFAULT_RECVQ undefined
+#endif
+#if (NICKNAMEHISTORYLENGTH < 100)
+#  define NICKNAMEHISTORYLENGTH 100
+#endif
+
+#if defined(__GNUC__) && defined(__GNUC_MINOR__) && \
+    ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) && \
+    !defined(__cplusplus)
+ #define GCC_TYPECHECKING
+
+ /* copied from cURL: */
+
+ #define _UNREAL_WARNING(id, message) \
+   static void __attribute__((__warning__(message))) \
+   __attribute__((__unused__)) __attribute__((__noinline__)) \
+   id(void) { __asm__(""); }
+
+ #define _UNREAL_ERROR(id, message) \
+   static void __attribute__((__error__(message))) \
+   __attribute__((__unused__)) __attribute__((__noinline__)) \
+   id(void) { __asm__(""); }
+#endif
+
+#ifndef __has_feature
+ #define __has_feature(x) 0  // Compatibility with non-clang compilers.
+#endif
+#ifndef __has_extension
+ #define __has_extension __has_feature // Compatibility with pre-3.0 compilers.
+#endif
+
+#endif				/* __config_include__ */
+
diff --git a/include/crypt_blowfish.h b/include/crypt_blowfish.h
new file mode 100644
index 0000000..2ee0d8c
--- /dev/null
+++ b/include/crypt_blowfish.h
@@ -0,0 +1,27 @@
+/*
+ * Written by Solar Designer <solar at openwall.com> in 2000-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * See crypt_blowfish.c for more information.
+ */
+
+#ifndef _CRYPT_BLOWFISH_H
+#define _CRYPT_BLOWFISH_H
+
+extern int _crypt_output_magic(const char *setting, char *output, int size);
+extern char *_crypt_blowfish_rn(const char *key, const char *setting,
+	char *output, int size);
+extern char *_crypt_gensalt_blowfish_rn(const char *prefix,
+	unsigned long count,
+	const char *input, int size, char *output, int output_size);
+
+#endif
diff --git a/include/dbuf.h b/include/dbuf.h
new file mode 100644
index 0000000..fe1e88e
--- /dev/null
+++ b/include/dbuf.h
@@ -0,0 +1,101 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/dbuf.h
+ *   Copyright (C) 1990 Markku Savela
+ *   Copyright (C) 2013 William Pitcock <nenolod@dereferenced.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#ifndef __dbuf_include__
+#define __dbuf_include__
+
+#include "list.h"
+
+/* 512 bytes -- 510 character bytes + \r\n, per rfc1459 */
+#define DBUF_BLOCK_SIZE		(512)
+
+/*
+** dbuf is a collection of functions which can be used to
+** maintain a dynamic buffering of a byte stream.
+** Functions allocate and release memory dynamically as
+** required [Actually, there is nothing that prevents
+** this package maintaining the buffer on disk, either]
+*/
+
+/*
+** These structure definitions are only here to be used
+** as a whole, *DO NOT EVER REFER TO THESE FIELDS INSIDE
+** THE STRUCTURES*! It must be possible to change the internal
+** implementation of this package without changing the
+** interface.
+*/
+typedef struct dbuf {
+	u_int length;		/* Current number of bytes stored */
+//	u_int offset;		/* Offset to the first byte */
+	struct list_head dbuf_list;
+} dbuf;
+
+/*
+** And this 'dbufbuf' should never be referenced outside the
+** implementation of 'dbuf'--would be "hidden" if C had such
+** keyword...
+** If it was possible, this would compile to be exactly 1 memory
+** page in size. 2048 bytes seems to be the most common size, so
+** as long as a pointer is 4 bytes, we get 2032 bytes for buffer
+** data after we take away a bit for malloc to play with. -avalon
+*/
+typedef struct dbufbuf {
+	struct list_head dbuf_node;
+	size_t size;
+	char data[DBUF_BLOCK_SIZE];
+} dbufbuf;
+
+/*
+** dbuf_put
+**	Append the number of bytes to the buffer, allocating more
+**	memory as needed. Bytes are copied into internal buffers
+**	from users buffer.
+*/
+void dbuf_put(dbuf *, char *, size_t);
+					/* Dynamic buffer header */
+					/* Pointer to data to be stored */
+					/* Number of bytes to store */
+
+void dbuf_delete(dbuf *, size_t);
+					/* Dynamic buffer header */
+					/* Number of bytes to delete */
+
+/*
+** DBufLength
+**	Return the current number of bytes stored into the buffer.
+**	(One should use this instead of referencing the internal
+**	length field explicitly...)
+*/
+#define DBufLength(dyn) ((dyn)->length)
+
+/*
+** DBufClear
+**	Scratch the current content of the buffer. Release all
+**	allocated buffers and make it empty.
+*/
+#define DBufClear(dyn)	dbuf_delete((dyn),DBufLength(dyn))
+
+extern int dbuf_getmsg(dbuf *, char *);
+extern void dbuf_queue_init(dbuf *dyn);
+extern void dbuf_init(void);
+
+#endif /* __dbuf_include__ */
diff --git a/include/dns.h b/include/dns.h
new file mode 100644
index 0000000..ab079ba
--- /dev/null
+++ b/include/dns.h
@@ -0,0 +1,72 @@
+/* OMG... OMG! WHAT AN INCLUDE HORROR !!! */
+#include <ares.h>
+#include <ares_version.h>
+
+typedef enum {
+	DNSREQ_CLIENT = 1,
+	DNSREQ_LINKCONF = 2,
+	DNSREQ_CONNECT = 3
+} DNSReqType;
+
+typedef struct DNSReq DNSReq;
+
+/* Depending on the request type, some fields are filled in:
+ * cptr: DNSREQ_CLIENT, DNSREQ_CONNECT
+ * link: DNSREQ_LINKCONF, DNSREQ_CONNECT
+ */
+
+struct DNSReq {
+	DNSReq *prev, *next;
+	char *name; /**< Name being resolved (only for DNSREQ_LINKCONF and DNSREQ_CONNECT) */
+	char ipv6; /**< Resolving for ipv6 or ipv4? */
+	DNSReqType type; /**< DNS Request type (DNSREQ_*) */
+	Client *client; /**< Client the request is for, NULL if client died OR unavailable */
+	ConfigItem_link *linkblock; /**< Linkblock */
+};
+
+typedef struct DNSCache DNSCache;
+
+struct DNSCache {
+	DNSCache *prev, *next;		/**< Previous and next in linked list */
+	DNSCache *hprev, *hnext;	/**< Previous and next in hash list */
+	char *name;					/**< The hostname */
+	char *ip;					/**< The IP address */
+	time_t expires;				/**< When record expires */
+};
+
+typedef struct DNSStats DNSStats;
+
+struct DNSStats {
+	unsigned int cache_hits;
+	unsigned int cache_misses;
+	unsigned int cache_adds;
+};
+
+/** Time to keep cache records. */
+#define DNSCACHE_TTL			600
+
+/** Size of the hash table (prime!).
+ * Consumes <this>*4 on ia32 and <this>*4 on 64 bit
+ * 241 seems a good bet.. which ~1k on ia32 and ~2k on ia64.
+ */
+#define DNS_HASH_SIZE	241
+
+/** Max # of entries we want in our cache.
+ * This:
+ * a) prevents us from using too much memory, and
+ * b) prevents us from keeping useless cache records
+ *
+ * A dnscache item is roughly ~80 bytes in size (slightly more on x86),
+ * so 241*80=~20k, which seems reasonable ;).
+ */
+#define DNS_MAX_ENTRIES	DNS_HASH_SIZE
+
+
+extern ares_channel resolver_channel;
+
+extern void init_resolver(int);
+
+struct hostent *unrealdns_doclient(Client *cptr);
+
+extern void unreal_gethostbyname(const char *name, int family, ares_host_callback callback, void *arg);
+
diff --git a/include/dynconf.h b/include/dynconf.h
new file mode 100644
index 0000000..07f9698
--- /dev/null
+++ b/include/dynconf.h
@@ -0,0 +1,375 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/dynconf.h
+ *   Copyright (C) 1999 Carsten Munk
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+
+#define DYNCONF_H
+
+typedef struct NetworkConfiguration NetworkConfiguration;
+struct NetworkConfiguration {
+	unsigned x_inah:1;
+	char *x_ircnetwork;
+	char *x_ircnet005;
+	char *x_defserv;
+	char *x_services_name;
+	char *x_hidden_host;
+	char *x_prefix_quit;
+	char *x_helpchan;
+	char *x_stats_server;
+	char *x_sasl_server;
+};
+
+enum UHAllowed { UHALLOW_ALWAYS, UHALLOW_NOCHANS, UHALLOW_REJOIN, UHALLOW_NEVER };
+
+struct ChMode {
+        long mode;
+	long extmodes;
+	char *extparams[EXTCMODETABLESZ];
+};
+
+typedef struct OperStat {
+	struct OperStat *prev, *next;
+	char *flag;
+} OperStat;
+
+typedef enum BroadcastChannelMessagesOption { BROADCAST_CHANNEL_MESSAGES_AUTO=1, BROADCAST_CHANNEL_MESSAGES_ALWAYS=2, BROADCAST_CHANNEL_MESSAGES_NEVER=3 } BroadcastChannelMessagesOption;
+
+typedef enum AllowedChannelChars { ALLOWED_CHANNELCHARS_ANY=1, ALLOWED_CHANNELCHARS_ASCII=2, ALLOWED_CHANNELCHARS_UTF8=3 } AllowedChannelChars;
+
+typedef enum BanTarget { BAN_TARGET_IP=1, BAN_TARGET_USERIP=2, BAN_TARGET_HOST=3, BAN_TARGET_USERHOST=4, BAN_TARGET_ACCOUNT=5, BAN_TARGET_CERTFP=6 } BanTarget;
+
+/** The set { } block configuration */
+typedef struct Configuration Configuration;
+struct Configuration {
+	unsigned som:1;
+	unsigned hide_ulines:1;
+	unsigned flat_map:1;
+	unsigned allow_chatops:1;
+	unsigned ident_check:1;
+	unsigned fail_oper_warn:1;
+	unsigned show_connect_info:1;
+	unsigned no_connect_tls_info:1;
+	unsigned dont_resolve:1;
+	unsigned use_ban_version:1;
+	unsigned mkpasswd_for_everyone:1;
+	unsigned hide_ban_reason;
+	unsigned allow_insane_bans;
+	unsigned allow_part_if_shunned:1;
+	unsigned disable_cap:1;
+	unsigned check_target_nick_bans:1;
+	unsigned use_egd : 1;
+	char *dns_bindip;
+	char *link_bindip;
+	long throttle_period;
+	char throttle_count;
+	char *kline_address;
+	char *gline_address;
+	long conn_modes;
+	long oper_modes;
+	char *oper_snomask;
+	char *auto_join_chans;
+	char *oper_auto_join_chans;
+	char *allow_user_stats;
+	OperStat *allow_user_stats_ext;
+	int  ping_warning;
+	int  maxchannelsperuser;
+	int  maxdccallow;
+	int  anti_spam_quit_message_time;
+	char *egd_path;
+	char *static_quit;
+	char *static_part;
+	TLSOptions *tls_options;
+	Policy plaintext_policy_user;
+	char *plaintext_policy_user_message;
+	Policy plaintext_policy_oper;
+	char *plaintext_policy_oper_message;
+	Policy plaintext_policy_server;
+	Policy outdated_tls_policy_user;
+	char *outdated_tls_policy_user_message;
+	Policy outdated_tls_policy_oper;
+	char *outdated_tls_policy_oper_message;
+	Policy outdated_tls_policy_server;
+	enum UHAllowed userhost_allowed;
+	char *restrict_usermodes;
+	char *restrict_channelmodes;
+	char *restrict_extendedbans;
+	char *channel_command_prefix;
+	long unknown_flood_bantime;
+	long unknown_flood_amount;
+	struct ChMode modes_on_join;
+	int level_on_join;
+	unsigned char away_count;
+	long away_period;
+	unsigned char nick_count;
+	long nick_period;
+	unsigned char invite_count;
+	long invite_period;
+	unsigned char knock_count;
+	long knock_period;
+	unsigned char max_concurrent_conversations_users;
+	unsigned char max_concurrent_conversations_new_user_every;
+	int ident_connect_timeout;
+	int ident_read_timeout;
+	long default_bantime;
+	int who_limit;
+	int silence_limit;
+	long ban_version_tkl_time;
+	long spamfilter_ban_time;
+	char *spamfilter_ban_reason;
+	char *spamfilter_virus_help_channel;
+	char spamfilter_vchan_deny;
+	SpamExcept *spamexcept;
+	char *spamexcept_line;
+	long spamfilter_detectslow_warn;
+	long spamfilter_detectslow_fatal;
+	int spamfilter_stop_on_first_match;
+	int maxbans;
+	int maxbanlength;
+	int watch_away_notification;
+	int uhnames;
+	NetworkConfiguration network;
+	unsigned short default_ipv6_clone_mask;
+	int ping_cookie;
+	int min_nick_length;
+	int nick_length;
+	int topic_length;
+	int kick_length;
+	int quit_length;
+	int away_length;
+	int hide_list;
+	int max_unknown_connections_per_ip;
+	long handshake_timeout;
+	long sasl_timeout;
+	long handshake_delay;
+	BanTarget automatic_ban_target;
+	BanTarget manual_ban_target;
+	char *reject_message_too_many_connections;
+	char *reject_message_server_full;
+	char *reject_message_unauthorized;
+	char *reject_message_kline;
+	char *reject_message_gline;
+	int topic_setter;
+	int ban_setter;
+	int ban_setter_sync;
+	int part_instead_of_quit_on_comment_change;
+	BroadcastChannelMessagesOption broadcast_channel_messages;
+	AllowedChannelChars allowed_channelchars;
+};
+
+extern MODVAR Configuration iConf;
+extern MODVAR Configuration tempiConf;
+extern MODVAR int ipv6_disabled;
+
+#define KLINE_ADDRESS			iConf.kline_address
+#define GLINE_ADDRESS			iConf.gline_address
+#define CONN_MODES			iConf.conn_modes
+#define OPER_MODES			iConf.oper_modes
+#define OPER_SNOMASK			iConf.oper_snomask
+#define SHOWOPERMOTD			iConf.som
+#define HIDE_ULINES			iConf.hide_ulines
+#define FLAT_MAP			iConf.flat_map
+#define ALLOW_CHATOPS			iConf.allow_chatops
+#define PINGWARNING			iConf.ping_warning
+#define MAXCHANNELSPERUSER		iConf.maxchannelsperuser
+#define MAXDCCALLOW			iConf.maxdccallow
+#define DONT_RESOLVE			iConf.dont_resolve
+#define AUTO_JOIN_CHANS			iConf.auto_join_chans
+#define OPER_AUTO_JOIN_CHANS		iConf.oper_auto_join_chans
+#define DNS_BINDIP			iConf.dns_bindip
+#define LINK_BINDIP			iConf.link_bindip
+#define IDENT_CHECK			iConf.ident_check
+#define FAILOPER_WARN			iConf.fail_oper_warn
+#define SHOWCONNECTINFO			iConf.show_connect_info
+#define NOCONNECTTLSLINFO		iConf.no_connect_tls_info
+#define ALLOW_USER_STATS			iConf.allow_user_stats
+#define ANTI_SPAM_QUIT_MSG_TIME		iConf.anti_spam_quit_message_time
+#ifdef HAVE_RAND_EGD
+#define USE_EGD				iConf.use_egd
+#else
+#define USE_EGD				0
+#endif
+#define EGD_PATH			iConf.egd_path
+
+#define ircnetwork			iConf.network.x_ircnetwork
+#define ircnet005			iConf.network.x_ircnet005
+#define defserv				iConf.network.x_defserv
+#define SERVICES_NAME		iConf.network.x_services_name
+#define hidden_host			iConf.network.x_hidden_host
+#define helpchan			iConf.network.x_helpchan
+#define STATS_SERVER			iConf.network.x_stats_server
+#define SASL_SERVER			iConf.network.x_sasl_server
+#define iNAH				iConf.network.x_inah
+#define PREFIX_QUIT			iConf.network.x_prefix_quit
+
+#define STATIC_QUIT			iConf.static_quit
+#define STATIC_PART			iConf.static_part
+#define UHOST_ALLOWED			iConf.userhost_allowed
+#define RESTRICT_USERMODES		iConf.restrict_usermodes
+#define RESTRICT_CHANNELMODES		iConf.restrict_channelmodes
+#define RESTRICT_EXTENDEDBANS		iConf.restrict_extendedbans
+#define THROTTLING_PERIOD		iConf.throttle_period
+#define THROTTLING_COUNT		iConf.throttle_count
+#define USE_BAN_VERSION			iConf.use_ban_version
+#define UNKNOWN_FLOOD_BANTIME		iConf.unknown_flood_bantime
+#define UNKNOWN_FLOOD_AMOUNT		iConf.unknown_flood_amount
+#define MODES_ON_JOIN			iConf.modes_on_join.mode
+#define LEVEL_ON_JOIN			iConf.level_on_join
+
+#define AWAY_PERIOD			iConf.away_period
+#define AWAY_COUNT			iConf.away_count
+#define NICK_PERIOD			iConf.nick_period
+#define NICK_COUNT			iConf.nick_count
+#define KNOCK_PERIOD			iConf.knock_period
+#define KNOCK_COUNT			iConf.knock_count
+#define INVITE_PERIOD			iConf.invite_period
+#define INVITE_COUNT			iConf.invite_count
+
+#define IDENT_CONNECT_TIMEOUT	iConf.ident_connect_timeout
+#define IDENT_READ_TIMEOUT		iConf.ident_read_timeout
+
+#define MKPASSWD_FOR_EVERYONE	iConf.mkpasswd_for_everyone
+#define HIDE_BAN_REASON		iConf.hide_ban_reason
+#define ALLOW_INSANE_BANS		iConf.allow_insane_bans
+#define CHANCMDPFX iConf.channel_command_prefix
+
+#define DEFAULT_BANTIME			iConf.default_bantime
+#define WHOLIMIT			iConf.who_limit
+
+#define ALLOW_PART_IF_SHUNNED	iConf.allow_part_if_shunned
+
+#define DISABLE_CAP	iConf.disable_cap
+
+#define DISABLE_IPV6	ipv6_disabled
+
+#define BAN_VERSION_TKL_TIME	iConf.ban_version_tkl_time
+#define SILENCE_LIMIT (iConf.silence_limit ? iConf.silence_limit : 15)
+
+#define SPAMFILTER_BAN_TIME		iConf.spamfilter_ban_time
+#define SPAMFILTER_BAN_REASON	iConf.spamfilter_ban_reason
+#define SPAMFILTER_VIRUSCHAN	iConf.spamfilter_virus_help_channel
+#define SPAMFILTER_VIRUSCHANDENY	iConf.spamfilter_vchan_deny
+#define SPAMFILTER_EXCEPT		iConf.spamexcept_line
+#define SPAMFILTER_DETECTSLOW_WARN	iConf.spamfilter_detectslow_warn
+#define SPAMFILTER_DETECTSLOW_FATAL	iConf.spamfilter_detectslow_fatal
+#define SPAMFILTER_STOP_ON_FIRST_MATCH	iConf.spamfilter_stop_on_first_match
+
+#define CHECK_TARGET_NICK_BANS	iConf.check_target_nick_bans
+
+#define MAXBANS		iConf.maxbans
+#define MAXBANLENGTH	iConf.maxbanlength
+
+#define WATCH_AWAY_NOTIFICATION	iConf.watch_away_notification
+
+#define UHNAMES_ENABLED	iConf.uhnames
+
+/** Used for testing the set { } block configuration.
+ * It tests if a setting is present and is also used for duplicate checking.
+ */
+struct SetCheck {
+	unsigned has_show_opermotd:1;
+	unsigned has_hide_ulines:1;
+	unsigned has_flat_map:1;
+	unsigned has_allow_chatops:1;
+	unsigned has_ident_check:1;
+	unsigned has_fail_oper_warn:1;
+	unsigned has_show_connect_info:1;
+	unsigned has_dont_resolve:1;
+	unsigned has_mkpasswd_for_everyone:1;
+	unsigned has_allow_part_if_shunned:1;
+	unsigned has_tls_server_cipher_list :1;
+	unsigned has_tls_protocols :1;
+	unsigned has_dns_bind_ip:1;
+	unsigned has_link_bind_ip:1;
+	unsigned has_throttle_period:1;
+	unsigned has_throttle_connections:1;
+	unsigned has_kline_address:1;
+	unsigned has_gline_address:1;
+	unsigned has_modes_on_connect:1;
+	unsigned has_modes_on_oper:1;
+	unsigned has_snomask_on_connect:1;
+	unsigned has_snomask_on_oper:1;
+	unsigned has_auto_join:1;
+	unsigned has_oper_auto_join:1;
+	unsigned has_check_target_nick_bans:1;
+	unsigned has_watch_away_notification:1;
+	unsigned has_uhnames:1;
+	unsigned has_allow_user_stats:1;
+	unsigned has_ping_warning:1;
+	unsigned has_maxchannelsperuser:1;
+	unsigned has_maxdccallow:1;
+	unsigned has_anti_spam_quit_message_time:1;
+	unsigned has_egd_path:1;
+	unsigned has_static_quit:1;
+	unsigned has_static_part:1;
+	unsigned has_allow_userhost_change:1;
+	unsigned has_restrict_usermodes:1;
+	unsigned has_restrict_channelmodes:1;
+	unsigned has_restrict_extendedbans:1;
+	unsigned has_channel_command_prefix:1;
+	unsigned has_anti_flood_unknown_flood_bantime:1;
+	unsigned has_anti_flood_unknown_flood_amount:1;
+	unsigned has_modes_on_join:1;
+	unsigned has_level_on_join:1;
+	unsigned has_anti_flood_away_count:1;
+	unsigned has_anti_flood_away_period:1;
+	unsigned has_anti_flood_nick_flood:1;
+	unsigned has_anti_flood_connect_flood:1;
+	unsigned has_anti_flood_invite_flood:1;
+	unsigned has_anti_flood_knock_flood:1;
+	unsigned has_ident_connect_timeout:1;
+	unsigned has_ident_read_timeout:1;
+	unsigned has_default_bantime:1;
+	unsigned has_who_limit:1;
+	unsigned has_maxbans:1;
+	unsigned has_maxbanlength:1;
+	unsigned has_silence_limit:1;
+	unsigned has_ban_version_tkl_time:1;
+	unsigned has_spamfilter_ban_time:1;
+	unsigned has_spamfilter_ban_reason:1;
+	unsigned has_spamfilter_virus_help_channel:1;
+	unsigned has_spamfilter_virus_help_channel_deny:1;
+	unsigned has_spamfilter_except:1;
+	unsigned has_network_name:1;
+	unsigned has_default_server:1;
+	unsigned has_services_server:1;
+	unsigned has_sasl_server:1;
+	unsigned has_hiddenhost_prefix:1;
+	unsigned has_prefix_quit:1;
+	unsigned has_help_channel:1;
+	unsigned has_stats_server:1;
+	unsigned has_cloak_keys:1;
+	unsigned has_options_hide_ulines:1;
+	unsigned has_options_flat_map:1;
+	unsigned has_options_show_opermotd:1;
+	unsigned has_options_identd_check:1;
+	unsigned has_options_fail_oper_warn:1;
+	unsigned has_options_dont_resolve:1;
+	unsigned has_options_show_connect_info:1;
+	unsigned has_options_no_connect_tls_info:1;
+	unsigned has_options_mkpasswd_for_everyone:1;
+	unsigned has_options_allow_insane_bans:1;
+	unsigned has_options_allow_part_if_shunned:1;
+	unsigned has_options_disable_cap:1;
+	unsigned has_options_disable_ipv6:1;
+	unsigned has_ping_cookie:1;
+	unsigned has_min_nick_length:1;
+	unsigned has_nick_length:1;
+	unsigned has_hide_ban_reason:1;
+};
diff --git a/include/fdlist.h b/include/fdlist.h
new file mode 100644
index 0000000..0d0fea1
--- /dev/null
+++ b/include/fdlist.h
@@ -0,0 +1,52 @@
+#ifndef FDLIST_H
+#define FDLIST_H
+
+/* $Id$ */
+
+#define FD_DESC_SZ	(100)
+
+typedef void (*IOCallbackFunc)(int fd, int revents, void *data);
+
+typedef struct fd_entry {
+	int fd;
+	char desc[FD_DESC_SZ];
+	IOCallbackFunc read_callback;
+	IOCallbackFunc write_callback;
+	void *data;
+	time_t deadline;
+	unsigned char is_open;
+	unsigned int backend_flags;
+} FDEntry;
+
+extern MODVAR FDEntry fd_table[MAXCONNECTIONS + 1];
+
+extern int fd_open(int fd, const char *desc);
+extern void fd_close(int fd);
+extern int fd_unmap(int fd);
+extern void fd_unnotify(int fd);
+extern int fd_socket(int family, int type, int protocol, const char *desc);
+extern int fd_accept(int sockfd);
+extern void fd_desc(int fd, const char *desc);
+extern int fd_fileopen(const char *path, unsigned int flags);
+
+#define FD_SELECT_READ		0x1
+#define FD_SELECT_WRITE		0x2
+
+/* Socket buffer sizes for clients and servers
+ * Note that these have been carefully chosen so you shouldn't touch these.
+ * If you make these much higher then be aware that this means you loose
+ * send queue / receive queue protection, otherwise known as "Excess flood"
+ * and "SendQ Exceeded", since these queues are ON TOP of UnrealIRCd's
+ * own queueing mechanism, it uses the OS TCP Socket queue.
+ */
+#define USER_SOCKET_RECEIVE_BUFFER	8192
+#define USER_SOCKET_SEND_BUFFER		32768
+#define SERVER_SOCKET_RECEIVE_BUFFER	131072
+#define SERVER_SOCKET_SEND_BUFFER	131072
+
+extern void fd_setselect(int fd, int flags, IOCallbackFunc iocb, void *data);
+extern void fd_select(time_t delay);		/* backend-specific */
+extern void fd_refresh(int fd);			/* backend-specific */
+extern void fd_fork(); /* backend-specific */
+
+#endif
diff --git a/include/h.h b/include/h.h
new file mode 100644
index 0000000..a31729d
--- /dev/null
+++ b/include/h.h
@@ -0,0 +1,967 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/h.h
+ *   Copyright (C) 1992 Darren Reed
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+/*
+ * "h.h". - Headers file.
+ *
+ * Most of the externs and prototypes thrown in here to 'cleanup' things.
+ * -avalon
+ */
+#include "setup.h"
+#include "fdlist.h"
+
+extern MODVAR char *extraflags;
+extern MODVAR int tainted;
+/* for the new s_err.c */
+extern char *getreply(int);
+#define rpl_str(x) getreply(x)
+#define err_str(x) getreply(x)
+extern MODVAR Member *freemember;
+extern MODVAR Membership *freemembership;
+extern MODVAR Client me;
+extern MODVAR Channel *channels;
+extern MODVAR ModData local_variable_moddata[MODDATA_MAX_LOCAL_VARIABLE];
+extern MODVAR ModData global_variable_moddata[MODDATA_MAX_GLOBAL_VARIABLE];
+extern MODVAR IRCStatistics ircstats;
+extern MODVAR int bootopt;
+extern MODVAR time_t timeofday;
+extern MODVAR struct timeval timeofday_tv;
+extern MODVAR char cmodestring[512];
+extern MODVAR char umodestring[UMODETABLESZ+1];
+/* newconf */
+#define get_sendq(x) ((x)->local->class ? (x)->local->class->sendq : DEFAULT_SENDQ)
+/* get_recvq is only called in send.c for local connections */
+#define get_recvq(x) ((x)->local->class->recvq ? (x)->local->class->recvq : DEFAULT_RECVQ)
+
+/* Configuration preprocessor */
+extern PreprocessorItem parse_preprocessor_item(char *start, char *end, char *filename, int linenumber, ConditionalConfig **cc);
+extern void preprocessor_cc_duplicate_list(ConditionalConfig *r, ConditionalConfig **out);
+extern void preprocessor_cc_free_level(ConditionalConfig **cc_list, int level);
+extern void preprocessor_cc_free_list(ConditionalConfig *cc);
+extern void preprocessor_resolve_conditionals_ce(ConfigEntry **ce_list, PreprocessorPhase phase);
+extern void preprocessor_resolve_conditionals_all(PreprocessorPhase phase);
+extern void free_config_defines(void);
+extern void preprocessor_replace_defines(char **item, ConfigEntry *ce);
+
+/*
+ * Configuration linked lists
+*/
+extern MODVAR ConfigItem_me		*conf_me;
+extern MODVAR ConfigItem_files		*conf_files;
+extern MODVAR ConfigItem_class 	*conf_class;
+extern MODVAR ConfigItem_class		*default_class;
+extern MODVAR ConfigItem_admin 	*conf_admin;
+extern MODVAR ConfigItem_admin		*conf_admin_tail;
+extern MODVAR ConfigItem_drpass	*conf_drpass;
+extern MODVAR ConfigItem_ulines	*conf_ulines;
+extern MODVAR ConfigItem_tld		*conf_tld;
+extern MODVAR ConfigItem_oper		*conf_oper;
+extern MODVAR ConfigItem_listen	*conf_listen;
+extern MODVAR ConfigItem_allow		*conf_allow;
+extern MODVAR ConfigItem_except	*conf_except;
+extern MODVAR ConfigItem_vhost		*conf_vhost;
+extern MODVAR ConfigItem_link		*conf_link;
+extern MODVAR ConfigItem_sni		*conf_sni;
+extern MODVAR ConfigItem_ban		*conf_ban;
+extern MODVAR ConfigItem_deny_channel  *conf_deny_channel;
+extern MODVAR ConfigItem_deny_link	*conf_deny_link;
+extern MODVAR ConfigItem_allow_channel *conf_allow_channel;
+extern MODVAR ConfigItem_deny_version	*conf_deny_version;
+extern MODVAR ConfigItem_log		*conf_log;
+extern MODVAR ConfigItem_alias		*conf_alias;
+extern MODVAR ConfigItem_include	*conf_include;
+extern MODVAR ConfigItem_help		*conf_help;
+extern MODVAR ConfigItem_offchans	*conf_offchans;
+extern void		completed_connection(int, int, void *);
+extern void clear_unknown();
+extern EVENT(e_unload_module_delayed);
+extern EVENT(throttling_check_expire);
+
+extern void  module_loadall(void);
+extern long set_usermode(char *umode);
+extern char *get_usermode_string_raw(long umodes);
+extern ConfigFile *config_parse(char *filename, char *confdata);
+extern ConfigFile *config_parse_with_offset(char *filename, char *confdata, unsigned int line_offset);
+extern void config_error(FORMAT_STRING(const char *format), ...) __attribute__((format(printf,1,2)));
+extern void config_warn(FORMAT_STRING(const char *format), ...) __attribute__((format(printf,1,2)));
+extern void config_error_missing(const char *filename, int line, const char *entry);
+extern void config_error_unknown(const char *filename, int line, const char *block, const char *entry);
+extern void config_error_unknownflag(const char *filename, int line, const char *block, const char *entry);
+extern void config_error_unknownopt(const char *filename, int line, const char *block, const char *entry);
+extern void config_error_noname(const char *filename, int line, const char *block);
+extern void config_error_blank(const char *filename, int line, const char *block);
+extern void config_error_empty(const char *filename, int line, const char *block, const char *entry);
+extern void config_warn_duplicate(const char *filename, int line, const char *entry);
+extern int config_is_blankorempty(ConfigEntry *cep, const char *block);
+extern MODVAR int config_verbose;
+extern void config_progress(FORMAT_STRING(const char *format), ...) __attribute__((format(printf,1,2)));
+extern void config_entry_free(ConfigEntry *ce);
+extern void config_entry_free_all(ConfigEntry *ce);
+extern ConfigFile *config_load(char *filename, char *displayname);
+extern void config_free(ConfigFile *cfptr);
+extern void ipport_seperate(char *string, char **ip, char **port);
+extern ConfigItem_class	*find_class(char *name);
+extern ConfigItem_deny_dcc	*find_deny_dcc(char *name);
+extern ConfigItem_oper		*find_oper(char *name);
+extern ConfigItem_operclass	*find_operclass(char *name);
+extern ConfigItem_listen *find_listen(char *ipmask, int port, int ipv6);
+extern ConfigItem_sni *find_sni(char *name);
+extern ConfigItem_ulines	*find_uline(char *host);
+extern ConfigItem_except	*find_except(Client *, short type);
+extern ConfigItem_tld		*find_tld(Client *cptr);
+extern ConfigItem_link		*find_link(char *servername, Client *acptr);
+extern ConfigItem_ban 		*find_ban(Client *, char *host, short type);
+extern ConfigItem_ban 		*find_banEx(Client *,char *host, short type, short type2);
+extern ConfigItem_vhost	*find_vhost(char *name);
+extern ConfigItem_deny_channel *find_channel_allowed(Client *cptr, char *name);
+extern ConfigItem_alias	*find_alias(char *name);
+extern ConfigItem_help 	*find_Help(char *command);
+
+extern OperPermission ValidatePermissionsForPath(char *path, Client *client, Client *victim, Channel *channel, void *extra);
+extern void OperClassValidatorDel(OperClassValidator *validator);
+
+extern ConfigItem_ban  *find_ban_ip(Client *client);
+extern void add_ListItem(ListStruct *, ListStruct **);
+extern void append_ListItem(ListStruct *item, ListStruct **list);
+extern void add_ListItemPrio(ListStructPrio *, ListStructPrio **, int);
+extern void del_ListItem(ListStruct *, ListStruct **);
+extern MODVAR LoopStruct loop;
+extern int del_banid(Channel *channel, char *banid);
+extern int del_exbanid(Channel *channel, char *banid);
+#define REPORT_DO_DNS	"NOTICE * :*** Looking up your hostname...\r\n"
+#define REPORT_FIN_DNS	"NOTICE * :*** Found your hostname\r\n"
+#define REPORT_FIN_DNSC "NOTICE * :*** Found your hostname (cached)\r\n"
+#define REPORT_FAIL_DNS "NOTICE * :*** Couldn't resolve your hostname; using your IP address instead\r\n"
+#define REPORT_DO_ID	"NOTICE * :*** Checking ident...\r\n"
+#define REPORT_FIN_ID	"NOTICE * :*** Received identd response\r\n"
+#define REPORT_FAIL_ID	"NOTICE * :*** No ident response; username prefixed with ~\r\n"
+extern MODVAR int R_do_dns, R_fin_dns, R_fin_dnsc, R_fail_dns, R_do_id, R_fin_id, R_fail_id;
+extern MODVAR struct list_head client_list;
+extern MODVAR struct list_head lclient_list;
+extern MODVAR struct list_head server_list;
+extern MODVAR struct list_head oper_list;
+extern MODVAR struct list_head unknown_list;
+extern MODVAR struct list_head global_server_list;
+extern MODVAR struct list_head dead_list;
+extern RealCommand *find_command(char *cmd, int flags);
+extern RealCommand *find_command_simple(char *cmd);
+extern Channel *find_channel(char *, Channel *);
+extern Membership *find_membership_link(Membership *lp, Channel *ptr);
+extern Member *find_member_link(Member *, Client *);
+extern int remove_user_from_channel(Client *, Channel *);
+extern void add_server_to_table(Client *);
+extern void remove_server_from_table(Client *);
+extern void iNAH_host(Client *client, char *host);
+extern void set_snomask(Client *client, char *snomask);
+extern char *get_snomask_string(Client *client);
+extern int check_tkls(Client *cptr);
+/* for services */
+extern void del_invite(Client *, Channel *);
+extern void send_user_joins(Client *, Client *);
+extern int valid_channelname(const char *);
+extern int valid_server_name(char *name);
+extern long get_access(Client *, Channel *);
+extern int ban_check_mask(Client *, Channel *, char *, int, char **, char **, int);
+extern int extban_is_ok_nuh_extban(Client *, Channel *, char *, int, int, int);
+extern char *extban_conv_param_nuh_or_extban(char *);
+extern char *extban_conv_param_nuh(char *);
+extern Ban *is_banned(Client *, Channel *, int, char **, char **);
+extern Ban *is_banned_with_nick(Client *, Channel *, int, char *, char **, char **);
+
+extern void ircd_log(int, FORMAT_STRING(const char *), ...) __attribute__((format(printf,2,3)));
+extern Client *find_client(char *, Client *);
+extern Client *find_name(char *, Client *);
+extern Client *find_nickserv(char *, Client *);
+extern Client *find_person(char *, Client *);
+extern Client *find_server(char *, Client *);
+extern Client *find_service(char *, Client *);
+#define find_server_quick(x) find_server(x, NULL)
+extern char *find_or_add(char *);
+extern void inittoken();
+extern void reset_help();
+
+extern MODVAR char *debugmode, *configfile, *sbrk0;
+extern char *getfield(char *);
+extern void set_sockhost(Client *, char *);
+#ifdef _WIN32
+extern MODFUNC char *sock_strerror(int);
+#endif
+extern int dgets(int, char *, int);
+
+#ifdef _WIN32
+extern MODVAR int debuglevel;
+#else
+extern int debuglevel, errno, h_errno;
+#endif
+extern MODVAR int OpenFiles;  /* number of files currently open */
+extern MODVAR int debuglevel, portnum, debugtty, maxusersperchannel;
+extern MODVAR int readcalls, udpfd, resfd;
+extern Client *add_connection(ConfigItem_listen *, int);
+extern void add_local_domain(char *, int);
+extern int check_server_init(Client *);
+extern void close_connection(Client *);
+extern void close_unbound_listeners();
+extern int connect_server(ConfigItem_link *, Client *, struct hostent *);
+extern void get_my_name(Client *, char *, int);
+extern int get_sockerr(Client *);
+extern int inetport(ConfigItem_listen *, char *, int, int);
+extern void init_sys();
+extern void check_user_limit(void);
+extern void init_modef();
+extern int verify_hostname(char *name);
+
+extern void report_error(char *, Client *);
+extern int setup_ping();
+
+extern void set_channel_mlock(Client *, Channel *, const char *, int);
+
+extern void restart(char *);
+extern void server_reboot(char *);
+extern void terminate(), write_pidfile();
+extern void *safe_alloc(size_t size);
+extern void set_socket_buffers(int fd, int rcvbuf, int sndbuf);
+extern int send_queued(Client *);
+extern void send_queued_cb(int fd, int revents, void *data);
+extern void sendto_connectnotice(Client *client, int disconnect, char *comment);
+extern void sendto_serv_butone_nickcmd(Client *one, Client *client, char *umodes);
+extern void    sendto_message_one(Client *to, Client *from, char *sender,
+    char *cmd, char *nick, char *msg);
+#define PREFIX_ALL		0
+#define PREFIX_HALFOP	0x1
+#define PREFIX_VOICE	0x2
+#define PREFIX_OP	0x4
+#define PREFIX_ADMIN	0x08
+#define PREFIX_OWNER	0x10
+extern void sendto_channel(Channel *channel, Client *from, Client *skip,
+                           int prefix, long clicap, int sendflags,
+                           MessageTag *mtags,
+                           FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,8,9)));
+extern void sendto_local_common_channels(Client *user, Client *skip,
+                                         long clicap, MessageTag *mtags,
+                                         FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,5,6)));
+extern void sendto_match_servs(Channel *, Client *, FORMAT_STRING(const char *), ...) __attribute__((format(printf,3,4)));
+extern void sendto_match_butone(Client *, Client *, char *, int, MessageTag *,
+    FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,6,7)));
+extern void sendto_all_butone(Client *, Client *, FORMAT_STRING(const char *), ...) __attribute__((format(printf,3,4)));
+extern void sendto_ops(FORMAT_STRING(const char *), ...) __attribute__((format(printf,1,2)));
+extern void sendto_ops_butone(Client *, Client *, FORMAT_STRING(const char *), ...) __attribute__((format(printf,3,4)));
+extern void sendto_prefix_one(Client *, Client *, MessageTag *, FORMAT_STRING(const char *), ...) __attribute__((format(printf,4,5)));
+extern void sendto_opers(FORMAT_STRING(const char *), ...) __attribute__((format(printf,1,2)));
+extern void sendto_umode(int, FORMAT_STRING(const char *), ...) __attribute__((format(printf,2,3)));
+extern void sendto_umode_global(int, FORMAT_STRING(const char *), ...) __attribute__((format(printf,2,3)));
+extern void sendto_snomask(int snomask, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,2,3)));
+extern void sendto_snomask_global(int snomask, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,2,3)));
+extern void sendnotice(Client *to, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,2,3)));
+extern void sendnumeric(Client *to, int numeric, ...);
+extern void sendnumericfmt(Client *to, int numeric, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,3,4)));
+extern void sendto_server(Client *one, unsigned long caps, unsigned long nocaps, MessageTag *mtags, FORMAT_STRING(const char *format), ...) __attribute__((format(printf, 5, 6)));
+extern void sendto_ops_and_log(FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,1,2)));
+
+extern MODVAR int writecalls, writeb[];
+extern int deliver_it(Client *cptr, char *str, int len, int *want_read);
+extern int target_limit_exceeded(Client *client, void *target, const char *name);
+extern char *canonize(char *buffer);
+extern int check_registered(Client *);
+extern int check_registered_user(Client *);
+extern char *get_client_name(Client *, int);
+extern char *get_client_host(Client *);
+extern char *myctime(time_t);
+extern char *short_date(time_t, char *buf);
+extern char *long_date(time_t);
+extern void exit_client(Client *client, MessageTag *recv_mtags, char *comment);
+extern void initstats(), tstats(Client *, char *);
+extern char *check_string(char *);
+extern char *make_nick_user_host(char *, char *, char *);
+extern char *make_nick_user_host_r(char *namebuf, char *nick, char *name, char *host);
+extern char *make_user_host(char *, char *);
+extern void parse(Client *cptr, char *buffer, int length);
+extern int hunt_server(Client *, MessageTag *, char *, int, int, char **);
+extern int cmd_server_estab(Client *);
+extern void umode_init(void);
+#define UMODE_GLOBAL 1
+#define UMODE_LOCAL 0
+extern int umode_allow_all(Client *client, int what);
+extern int umode_allow_unset(Client *client, int what);
+extern int umode_allow_opers(Client *client, int what);
+extern int umode_allow_none(Client *client, int what);
+extern int umode_delete(char ch, long val);
+extern void build_umode_string(Client *client, long old, long sendmask, char *umode_buf);
+extern void send_umode_out(Client *client, int show_to_user, long old);
+
+extern void free_client(Client *);
+extern void free_link(Link *);
+extern void free_ban(Ban *);
+extern void free_user(Client *);
+extern int find_str_match_link(Link *, char *);
+extern void free_str_list(Link *);
+extern Link *make_link();
+extern Ban *make_ban();
+extern ClientUser *make_user(Client *);
+extern Server *make_server();
+extern Client *make_client(Client *, Client *);
+extern Member *find_channel_link(Member *, Channel *);
+extern char *pretty_mask(char *);
+extern void add_client_to_list(Client *);
+extern void remove_client_from_list(Client *);
+extern void initlists();
+extern struct hostent *get_res(char *);
+extern struct hostent *gethost_byaddr(char *, Link *);
+extern struct hostent *gethost_byname(char *, Link *);
+extern void flush_cache();
+extern void init_resolver(int firsttime);
+extern time_t timeout_query_list(time_t);
+extern time_t expire_cache(time_t);
+extern void del_queries(char *);
+
+/* Hash stuff */
+#define NICK_HASH_TABLE_SIZE 32768
+#define CHAN_HASH_TABLE_SIZE 32768
+#define WATCH_HASH_TABLE_SIZE 32768
+#define WHOWAS_HASH_TABLE_SIZE 32768
+#define THROTTLING_HASH_TABLE_SIZE 8192
+#define find_channel hash_find_channel
+extern uint64_t siphash(const char *in, const char *k);
+extern uint64_t siphash_raw(const char *in, size_t len, const char *k);
+extern uint64_t siphash_nocase(const char *in, const char *k);
+extern void siphash_generate_key(char *k);
+extern void init_hash(void);
+uint64_t hash_whowas_name(const char *name);
+extern int add_to_client_hash_table(char *, Client *);
+extern int del_from_client_hash_table(char *, Client *);
+extern int add_to_id_hash_table(char *, Client *);
+extern int del_from_id_hash_table(char *, Client *);
+extern int add_to_channel_hash_table(char *, Channel *);
+extern void del_from_channel_hash_table(char *, Channel *);
+extern int add_to_watch_hash_table(char *, Client *, int);
+extern int del_from_watch_hash_table(char *, Client *);
+extern int hash_check_watch(Client *, int);
+extern int hash_del_watch_list(Client *);
+extern void count_watch_memory(int *, u_long *);
+extern Watch *hash_get_watch(char *);
+extern Channel *hash_get_chan_bucket(uint64_t);
+extern Client *hash_find_client(const char *, Client *);
+extern Client *hash_find_id(const char *, Client *);
+extern Client *hash_find_nickatserver(const char *, Client *);
+extern Channel *hash_find_channel(char *name, Channel *channel);
+extern Client *hash_find_server(const char *, Client *);
+extern struct MODVAR ThrottlingBucket *ThrottlingHash[THROTTLING_HASH_TABLE_SIZE];
+
+extern char *find_by_aln(char *);
+extern char *convert2aln(int);
+extern int convertfromaln(char *);
+extern char *find_server_aln(char *);
+extern time_t atime(char *xtime);
+
+
+/* Mode externs
+*/
+extern MODVAR long UMODE_INVISIBLE; /*  0x0001	 makes user invisible */
+extern MODVAR long UMODE_OPER;      /*  0x0002	 Operator */
+extern MODVAR long UMODE_WALLOP;    /*  0x0004	 send wallops to them */
+extern MODVAR long UMODE_REGNICK;   /*  0x0020	 Nick set by services as registered */
+extern MODVAR long UMODE_SERVNOTICE;/* 0x0100	 server notices such as kill */
+extern MODVAR long UMODE_HIDE;	     /* 0x8000	 Hide from Nukes */
+extern MODVAR long UMODE_SECURE;    /*	0x800000	 User is a secure connect */
+extern MODVAR long UMODE_DEAF;      /* 0x10000000       Deaf */
+extern MODVAR long UMODE_HIDEOPER;  /* 0x20000000	 Hide oper mode */
+extern MODVAR long UMODE_SETHOST;   /* 0x40000000	 used sethost */
+extern MODVAR long UMODE_HIDLE;     /* hides oper idle times */
+extern MODVAR long AllUmodes, SendUmodes;
+
+extern MODVAR long SNO_KILLS;
+extern MODVAR long SNO_CLIENT;
+extern MODVAR long SNO_FLOOD;
+extern MODVAR long SNO_FCLIENT;
+extern MODVAR long SNO_JUNK;
+extern MODVAR long SNO_VHOST;
+extern MODVAR long SNO_EYES;
+extern MODVAR long SNO_TKL;
+extern MODVAR long SNO_NICKCHANGE;
+extern MODVAR long SNO_FNICKCHANGE;
+extern MODVAR long SNO_QLINE;
+extern MODVAR long SNO_SNOTICE;
+extern MODVAR long SNO_SPAMF;
+extern MODVAR long SNO_OPER;
+
+#ifndef HAVE_STRLCPY
+extern size_t strlcpy(char *dst, const char *src, size_t size);
+#endif
+#ifndef HAVE_STRLCAT
+extern size_t strlcat(char *dst, const char *src, size_t size);
+#endif
+#ifndef HAVE_STRLNCAT
+extern size_t strlncat(char *dst, const char *src, size_t size, size_t n);
+#endif
+extern char *strldup(const char *src, size_t n);
+
+extern void dopacket(Client *, char *, int);
+
+extern void debug(int, FORMAT_STRING(const char *), ...) __attribute__((format(printf,2,3)));
+#if defined(DEBUGMODE)
+extern void send_usage(Client *, char *);
+extern void count_memory(Client *, char *);
+extern int checkprotoflags(Client *, int, char *, int);
+#endif
+
+extern char *inetntop(int af, const void *in, char *local_dummy, size_t the_size);
+
+/* Internal command stuff - not for modules */
+extern MODVAR RealCommand *CommandHash[256];
+extern void init_CommandHash(void);
+
+/* CRULE */
+char *crule_parse(char *);
+int crule_test(char *);
+char *crule_errstring(int);
+int crule_eval(char *);
+void crule_free(char **);
+
+/*
+ * Close all local socket connections, invalidate client fd's
+ * WIN32 cleanup winsock lib
+ */
+extern void close_connections(void);
+
+extern int b64_encode(unsigned char const *src, size_t srclength, char *target, size_t targsize);
+extern int b64_decode(char const *src, unsigned char *target, size_t targsize);
+
+extern AuthenticationType Auth_FindType(char *hash, char *type);
+extern AuthConfig	*AuthBlockToAuthConfig(ConfigEntry *ce);
+extern void		Auth_FreeAuthConfig(AuthConfig *as);
+extern int		Auth_Check(Client *cptr, AuthConfig *as, char *para);
+extern char   		*Auth_Hash(int type, char *para);
+extern int   		Auth_CheckError(ConfigEntry *ce);
+
+extern void make_cloakedhost(Client *client, char *curr, char *buf, size_t buflen);
+extern int  channel_canjoin(Client *client, char *name);
+extern char *collapse(char *pattern);
+extern void dcc_sync(Client *client);
+extern void report_flines(Client *client);
+extern void report_network(Client *client);
+extern void report_dynconf(Client *client);
+extern void count_memory(Client *cptr, char *nick);
+extern void list_scache(Client *client);
+extern char *oflagstr(long oflag);
+extern int rehash(Client *client, int sig);
+extern int match_simple(const char *mask, const char *name);
+extern int match_esc(const char *mask, const char *name);
+extern int add_listener(ConfigItem_listen *conf);
+extern void link_cleanup(ConfigItem_link *link_ptr);
+extern void       listen_cleanup();
+extern int  numeric_collides(long numeric);
+extern u_long cres_mem(Client *client, char *nick);
+extern void      flag_add(char ch);
+extern void      flag_del(char ch);
+extern void init_dynconf(void);
+extern char *pretty_time_val(long);
+extern char *pretty_date(time_t t);
+extern int        init_conf(char *filename, int rehash);
+extern void       validate_configuration(void);
+extern void       run_configuration(void);
+extern void rehash_motdrules();
+extern void read_motd(const char *filename, MOTDFile *motd); /* s_serv.c */
+extern void send_proto(Client *, ConfigItem_link *);
+extern void unload_all_modules(void);
+extern void set_sock_opts(int fd, Client *cptr, int ipv6);
+extern void stripcrlf(char *line);
+extern time_t rfc2time(char *s);
+extern char *rfctime(time_t t, char *buf);
+extern int strnatcmp(char const *a, char const *b);
+extern int strnatcasecmp(char const *a, char const *b);
+extern void outofmemory(size_t bytes);
+
+/** Memory allocation and deallocation functions and macros that should be used in UnrealIRCd.
+ * Use these instead of malloc/calloc/free.
+ * @defgroup MemoryRoutines Memory allocation and deallocation
+ * @{
+ */
+extern void *safe_alloc(size_t size);
+/** Free previously allocate memory pointer.
+ * This also sets the pointer to NULL, since that would otherwise be common to forget.
+ */
+#define safe_free(x) do { if (x) free(x); x = NULL; } while(0)
+/** Free previously allocated memory pointer.
+ * Raw version which does not touch the pointer itself. You most likely don't
+ * need this, as it's only used in 1 place in UnrealIRCd.
+ */
+#define safe_free_raw(x) free(x)
+
+/** Free previous memory (if any) and then save a duplicate of the specified string.
+ * @param dst   The current pointer and the pointer where a new copy of the string will be stored.
+ * @param str   The string you want to copy
+ */
+#define safe_strdup(dst,str) do { if (dst) free(dst); if (!(str)) dst = NULL; else dst = our_strdup(str); } while(0)
+
+/** Return a copy of the string. Do not free any existing memory.
+ * @param str   The string to duplicate
+ * @returns A pointer to the new copy.
+ * @note
+ * Generally you need to use safe_strdup() instead(!). But when clearly initializing
+ * a variable that does not have a previous value, then raw_strdup() usage is fine, eg:
+ * int somefunc()
+ * {
+ *     char *somevar = raw_strdup("IRC");
+ * And, similarly if you want to return a duplicate (there is no destination variable):
+ * return raw_strdup(something);
+ */
+#define raw_strdup(str) strdup(str)
+
+/** Free previous memory (if any) and then save a duplicate of the specified string with a length limit.
+ * @param dst   The current pointer and the pointer where a new copy of the string will be stored.
+ * @param str   The string you want to copy
+ * @param sz    Length limit including the NUL byte, usually sizeof(dst)
+ */
+#define safe_strldup(dst,str,sz) do { if (dst) free(dst); if (!str) dst = NULL; else dst = our_strldup(str,sz); } while(0)
+
+/** Return a duplicate of the specified string with a length limit. Do not free any existing memory.
+ * @param str   The string you want to copy
+ * @param sz    Length limit including the NUL byte, usually sizeof(dst)
+ * @returns A pointer to the new copy.
+ * @note
+ * Generally you need to use safe_strldup() instead(!). But when clearly initializing
+ * a variable that does not have a previous value, then raw_strldup() usage is fine, eg:
+ * int somefunc(char *str)
+ * {
+ *     char *somevar = raw_strldup(str, 16);
+ * And, similarly if you want to return a duplicate (there is no destination variable):
+ * return raw_strldup(something);
+ */
+#define raw_strldup(str, max) our_strldup(str, max)
+
+/** @} */
+extern char *our_strdup(const char *str);
+extern char *our_strldup(const char *str, size_t max);
+
+extern MODFUNC char  *tls_get_cipher(SSL *ssl);
+extern TLSOptions *get_tls_options_for_client(Client *acptr);
+extern int outdated_tls_client(Client *acptr);
+extern char *outdated_tls_client_build_string(char *pattern, Client *acptr);
+extern long config_checkval(char *value, unsigned short flags);
+extern void config_status(FORMAT_STRING(const char *format), ...) __attribute__((format(printf,1,2)));
+extern void init_random();
+extern u_char getrandom8();
+extern uint16_t getrandom16();
+extern uint32_t getrandom32();
+extern void gen_random_alnum(char *buf, int numbytes);
+
+extern MODVAR char extchmstr[4][64];
+
+extern int extcmode_default_requirechop(Client *, Channel *, char, char *, int, int);
+extern int extcmode_default_requirehalfop(Client *, Channel *, char, char *, int, int);
+extern Cmode_t extcmode_get(Cmode *);
+extern void extcmode_init(void);
+extern void make_extcmodestr();
+extern void extcmode_duplicate_paramlist(void **xi, void **xo);
+extern void extcmode_free_paramlist(void **ar);
+
+extern void chmode_str(struct ChMode *, char *, char *, size_t, size_t);
+extern char *get_client_status(Client *);
+extern char *get_snomask_string_raw(long);
+extern void SocketLoop(void *);
+#ifdef _WIN32
+extern void InitDebug(void);
+extern int InitUnrealIRCd(int argc, char **);
+extern void win_error();
+extern void win_log(FORMAT_STRING(const char *format), ...);
+extern int GetOSName(char *pszOS);
+extern void CleanUp(void);
+extern int CountRTFSize(unsigned char *buffer);
+extern void IRCToRTF(unsigned char *buffer, unsigned char *string);
+#endif
+extern void sendto_chmodemucrap(Client *, Channel *, char *);
+extern void verify_opercount(Client *, char *);
+extern int valid_host(char *host);
+extern int count_oper_sessions(char *);
+extern char *unreal_mktemp(const char *dir, const char *suffix);
+extern char *unreal_getpathname(char *filepath, char *path);
+extern char *unreal_getfilename(char *path);
+extern char *unreal_getmodfilename(char *path);
+extern char *unreal_mkcache(const char *url);
+extern int has_cached_version(const char *url);
+extern int unreal_copyfile(const char *src, const char *dest);
+extern int unreal_copyfileex(const char *src, const char *dest, int tryhardlink);
+extern time_t unreal_getfilemodtime(const char *filename);
+extern void unreal_setfilemodtime(const char *filename, time_t mtime);
+extern void DeleteTempModules(void);
+extern MODVAR Extban *extbaninfo;
+extern Extban *findmod_by_bantype(char c);
+extern Extban *ExtbanAdd(Module *reserved, ExtbanInfo req);
+extern void ExtbanDel(Extban *);
+extern void extban_init(void);
+extern char *trim_str(char *str, int len);
+extern MODVAR char *ban_realhost, *ban_virthost, *ban_ip;
+extern BanAction banact_stringtoval(char *s);
+extern char *banact_valtostring(BanAction val);
+extern BanAction banact_chartoval(char c);
+extern char banact_valtochar(BanAction val);
+extern int spamfilter_gettargets(char *s, Client *client);
+extern char *spamfilter_target_inttostring(int v);
+extern Spamfilter *unreal_buildspamfilter(char *s);
+extern char *our_strcasestr(char *haystack, char *needle);
+extern int spamfilter_getconftargets(char *s);
+extern void remove_oper_snomasks(Client *client);
+extern void remove_oper_modes(Client *client);
+extern char *spamfilter_inttostring_long(int v);
+extern Channel *get_channel(Client *cptr, char *chname, int flag);
+extern MODVAR char backupbuf[];
+extern void add_invite(Client *, Client *, Channel *, MessageTag *);
+extern void channel_modes(Client *cptr, char *mbuf, char *pbuf, size_t mbuf_size, size_t pbuf_size, Channel *channel);
+extern MODVAR char modebuf[BUFSIZE], parabuf[BUFSIZE];
+extern int op_can_override(char *acl, Client *client,Channel *channel,void* extra);
+extern Client *find_chasing(Client *client, char *user, int *chasing);
+extern MODVAR long opermode;
+extern MODVAR long sajoinmode;
+extern void add_user_to_channel(Channel *channel, Client *who, int flags);
+extern int add_banid(Client *, Channel *, char *);
+extern int add_exbanid(Client *cptr, Channel *channel, char *banid);
+extern int sub1_from_channel(Channel *);
+extern MODVAR CoreChannelModeTable corechannelmodetable[];
+extern char *unreal_encodespace(char *s);
+extern char *unreal_decodespace(char *s);
+extern MODVAR Link *helpign;
+extern void reread_motdsandrules();
+extern MODVAR int SVSNOOP;
+extern int callbacks_check(void);
+extern void callbacks_switchover(void);
+extern int efunctions_check(void);
+extern void efunctions_switchover(void);
+extern char *encode_ip(char *);
+extern char *decode_ip(char *);
+extern void sendto_fconnectnotice(Client *client, int disconnect, char *comment);
+extern void sendto_one_nickcmd(Client *server, Client *client, char *umodes);
+extern int on_dccallow_list(Client *to, Client *from);
+extern int add_dccallow(Client *client, Client *optr);
+extern int del_dccallow(Client *client, Client *optr);
+extern void delete_linkblock(ConfigItem_link *link_ptr);
+extern void delete_classblock(ConfigItem_class *class_ptr);
+extern void del_async_connects(void);
+extern void isupport_init(void);
+extern void clicap_init(void);
+extern void efunctions_init(void);
+extern void do_cmd(Client *client, MessageTag *mtags, char *cmd, int parc, char *parv[]);
+extern MODVAR char *me_hash;
+extern MODVAR int dontspread;
+extern MODVAR int labeled_response_inhibit;
+extern MODVAR int labeled_response_inhibit_end;
+extern MODVAR int labeled_response_force;
+
+/* Efuncs */
+extern MODVAR void (*do_join)(Client *, int, char **);
+extern MODVAR void (*join_channel)(Channel *channel, Client *client, MessageTag *mtags, int flags);
+extern MODVAR int (*can_join)(Client *client, Channel *channel, char *key, char *parv[]);
+extern MODVAR void (*do_mode)(Channel *channel, Client *client, MessageTag *mtags, int parc, char *parv[], time_t sendts, int samode);
+extern MODVAR void (*set_mode)(Channel *channel, Client *cptr, int parc, char *parv[], u_int *pcount,
+    char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], int bounce);
+extern MODVAR void (*cmd_umode)(Client *, MessageTag *, int, char **);
+extern MODVAR int (*register_user)(Client *client, char *nick, char *username, char *umode, char *virthost, char *ip);
+extern MODVAR int (*tkl_hash)(unsigned int c);
+extern MODVAR char (*tkl_typetochar)(int type);
+extern MODVAR int (*tkl_chartotype)(char c);
+extern MODVAR char *(*tkl_type_string)(TKL *tk);
+extern MODVAR TKL *(*tkl_add_serverban)(int type, char *usermask, char *hostmask, char *reason, char *setby,
+                                            time_t expire_at, time_t set_at, int soft, int flags);
+extern MODVAR TKL *(*tkl_add_banexception)(int type, char *usermask, char *hostmask, char *reason, char *set_by,
+                                               time_t expire_at, time_t set_at, int soft, char *bantypes, int flags);
+extern MODVAR TKL *(*tkl_add_nameban)(int type, char *name, int hold, char *reason, char *setby,
+                                          time_t expire_at, time_t set_at, int flags);
+extern MODVAR TKL *(*tkl_add_spamfilter)(int type, unsigned short target, unsigned short action, Match *match, char *setby,
+                                             time_t expire_at, time_t set_at,
+                                             time_t spamf_tkl_duration, char *spamf_tkl_reason,
+                                             int flags);
+extern MODVAR TKL *(*find_tkl_serverban)(int type, char *usermask, char *hostmask, int softban);
+extern MODVAR TKL *(*find_tkl_banexception)(int type, char *usermask, char *hostmask, int softban);
+extern MODVAR TKL *(*find_tkl_nameban)(int type, char *name, int hold);
+extern MODVAR TKL *(*find_tkl_spamfilter)(int type, char *match_string, unsigned short action, unsigned short target);
+extern MODVAR void (*sendnotice_tkl_del)(char *removed_by, TKL *tkl);
+extern MODVAR void (*sendnotice_tkl_add)(TKL *tkl);
+extern MODVAR void (*free_tkl)(TKL *tkl);
+extern MODVAR TKL *(*tkl_del_line)(TKL *tkl);
+extern MODVAR void (*tkl_check_local_remove_shun)(TKL *tmp);
+extern MODVAR int (*find_tkline_match)(Client *cptr, int skip_soft);
+extern MODVAR int (*find_shun)(Client *cptr);
+extern MODVAR int (*find_spamfilter_user)(Client *client, int flags);
+extern MODVAR TKL *(*find_qline)(Client *cptr, char *nick, int *ishold);
+extern MODVAR TKL *(*find_tkline_match_zap)(Client *cptr);
+extern MODVAR void (*tkl_stats)(Client *cptr, int type, char *para);
+extern MODVAR void (*tkl_sync)(Client *client);
+extern MODVAR void (*cmd_tkl)(Client *client, MessageTag *recv_mtags, int parc, char *parv[]);
+extern MODVAR int (*place_host_ban)(Client *client, BanAction action, char *reason, long duration);
+extern MODVAR int (*match_spamfilter)(Client *client, char *str_in, int type, char *target, int flags, TKL **rettk);
+extern MODVAR int (*join_viruschan)(Client *client, TKL *tk, int type);
+extern MODVAR unsigned char *(*StripColors)(unsigned char *text);
+extern MODVAR const char *(*StripControlCodes)(unsigned char *text);
+extern MODVAR void (*spamfilter_build_user_string)(char *buf, char *nick, Client *acptr);
+extern MODVAR void (*send_protoctl_servers)(Client *client, int response);
+extern MODVAR int (*verify_link)(Client *client, char *servername, ConfigItem_link **link_out);
+extern MODVAR void (*send_server_message)(Client *client);
+extern MODVAR void (*broadcast_md_client)(ModDataInfo *mdi, Client *acptr, ModData *md);
+extern MODVAR void (*broadcast_md_channel)(ModDataInfo *mdi, Channel *channel, ModData *md);
+extern MODVAR void (*broadcast_md_member)(ModDataInfo *mdi, Channel *channel, Member *m, ModData *md);
+extern MODVAR void (*broadcast_md_membership)(ModDataInfo *mdi, Client *acptr, Membership *m, ModData *md);
+extern MODVAR void (*broadcast_md_client_cmd)(Client *except, Client *sender, Client *acptr, char *varname, char *value);
+extern MODVAR void (*broadcast_md_channel_cmd)(Client *except, Client *sender, Channel *channel, char *varname, char *value);
+extern MODVAR void (*broadcast_md_member_cmd)(Client *except, Client *sender, Channel *channel, Client *acptr, char *varname, char *value);
+extern MODVAR void (*broadcast_md_membership_cmd)(Client *except, Client *sender, Client *acptr, Channel *channel, char *varname, char *value);
+extern MODVAR void (*send_moddata_client)(Client *srv, Client *acptr);
+extern MODVAR void (*send_moddata_channel)(Client *srv, Channel *channel);
+extern MODVAR void (*send_moddata_members)(Client *srv);
+extern MODVAR void (*broadcast_moddata_client)(Client *acptr);
+extern MODVAR int (*check_banned)(Client *cptr, int exitflags);
+extern MODVAR void (*introduce_user)(Client *to, Client *acptr);
+extern MODVAR int (*check_deny_version)(Client *cptr, char *software, int protocol, char *flags);
+extern MODVAR int (*match_user)(char *rmask, Client *acptr, int options);
+extern MODVAR void (*userhost_save_current)(Client *client);
+extern MODVAR void (*userhost_changed)(Client *client);
+extern MODVAR void (*send_join_to_local_users)(Client *client, Channel *channel, MessageTag *mtags);
+extern MODVAR int (*do_nick_name)(char *nick);
+extern MODVAR int (*do_remote_nick_name)(char *nick);
+extern MODVAR char *(*charsys_get_current_languages)(void);
+extern MODVAR void (*broadcast_sinfo)(Client *acptr, Client *to, Client *except);
+extern MODVAR void (*parse_message_tags)(Client *cptr, char **str, MessageTag **mtag_list);
+extern MODVAR char *(*mtags_to_string)(MessageTag *m, Client *acptr);
+extern MODVAR int (*can_send_to_channel)(Client *cptr, Channel *channel, char **msgtext, char **errmsg, int notice);
+extern MODVAR void (*broadcast_md_globalvar)(ModDataInfo *mdi, ModData *md);
+extern MODVAR void (*broadcast_md_globalvar_cmd)(Client *except, Client *sender, char *varname, char *value);
+extern MODVAR int (*tkl_ip_hash)(char *ip);
+extern MODVAR int (*tkl_ip_hash_type)(int type);
+extern MODVAR int (*find_tkl_exception)(int ban_type, Client *cptr);
+extern MODVAR int (*del_silence)(Client *client, const char *mask);
+extern MODVAR int (*add_silence)(Client *client, const char *mask, int senderr);
+extern MODVAR int (*is_silenced)(Client *client, Client *acptr);
+extern MODVAR void *(*labeled_response_save_context)(void);
+extern MODVAR void (*labeled_response_set_context)(void *ctx);
+extern MODVAR void (*labeled_response_force_end)(void);
+extern MODVAR void (*kick_user)(MessageTag *mtags, Channel *channel, Client *client, Client *victim, char *comment);
+/* /Efuncs */
+
+extern void parse_message_tags_default_handler(Client *client, char **str, MessageTag **mtag_list);
+extern char *mtags_to_string_default_handler(MessageTag *m, Client *client);
+extern void *labeled_response_save_context_default_handler(void);
+extern void labeled_response_set_context_default_handler(void *ctx);
+extern void labeled_response_force_end_default_handler(void);
+extern int add_silence_default_handler(Client *client, const char *mask, int senderr);
+extern int del_silence_default_handler(Client *client, const char *mask);
+extern int is_silenced_default_handler(Client *client, Client *acptr);
+
+extern MODVAR MOTDFile opermotd, svsmotd, motd, botmotd, smotd, rules;
+extern MODVAR int max_connection_count;
+extern int add_listmode(Ban **list, Client *cptr, Channel *channel, char *banid);
+extern int add_listmode_ex(Ban **list, Client *cptr, Channel *channel, char *banid, char *setby, time_t seton);
+extern int del_listmode(Ban **list, Channel *channel, char *banid);
+extern int Halfop_mode(long mode);
+extern char *clean_ban_mask(char *, int, Client *);
+extern int find_invex(Channel *channel, Client *client);
+extern void DoMD5(char *mdout, const char *src, unsigned long n);
+extern char *md5hash(char *dst, const char *src, unsigned long n);
+extern MODVAR TKL *tklines[TKLISTLEN];
+extern MODVAR TKL *tklines_ip_hash[TKLIPHASHLEN1][TKLIPHASHLEN2];
+extern char *cmdname_by_spamftarget(int target);
+extern void unrealdns_delreq_bycptr(Client *cptr);
+extern void sendtxtnumeric(Client *to, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,2,3)));
+extern void unrealdns_gethostbyname_link(char *name, ConfigItem_link *conf, int ipv4_only);
+extern void unrealdns_delasyncconnects(void);
+extern int is_autojoin_chan(char *chname);
+extern void unreal_free_hostent(struct hostent *he);
+extern struct hostent *unreal_create_hostent(char *name, char *ip);
+extern char *unreal_time_sync_error(void);
+extern int unreal_time_synch(int timeout);
+extern char *getcloak(Client *client);
+extern MODVAR unsigned char param_to_slot_mapping[256];
+extern char *cm_getparameter(Channel *channel, char mode);
+extern void cm_putparameter(Channel *channel, char mode, char *str);
+extern void cm_freeparameter(Channel *channel, char mode);
+extern char *cm_getparameter_ex(void **p, char mode);
+extern void cm_putparameter_ex(void **p, char mode, char *str);
+extern void cm_freeparameter_ex(void **p, char mode, char *str);
+extern int file_exists(char *file);
+extern void free_motd(MOTDFile *motd); /* s_serv.c */
+extern void fix_timers(void);
+extern char *chfl_to_sjoin_symbol(int s);
+extern char chfl_to_chanmode(int s);
+extern void add_pending_net(Client *client, char *str);
+extern void free_pending_net(Client *client);
+extern Client *find_non_pending_net_duplicates(Client *cptr);
+extern PendingNet *find_pending_net_by_sid_butone(char *sid, Client *exempt);
+extern Client *find_pending_net_duplicates(Client *cptr, Client **srv, char **sid);
+extern MODVAR char serveropts[];
+extern MODVAR char *ISupportStrings[];
+extern void read_packet(int fd, int revents, void *data);
+extern int process_packet(Client *cptr, char *readbuf, int length, int killsafely);
+extern void sendto_realops_and_log(FORMAT_STRING(const char *fmt), ...) __attribute__((format(printf,1,2)));
+extern int parse_chanmode(ParseMode *pm, char *modebuf_in, char *parabuf_in);
+extern void config_report_ssl_error(void);
+extern int dead_socket(Client *to, char *notice);
+extern Match *unreal_create_match(MatchType type, char *str, char **error);
+extern void unreal_delete_match(Match *m);
+extern int unreal_match(Match *m, char *str);
+extern int unreal_match_method_strtoval(char *str);
+extern char *unreal_match_method_valtostr(int val);
+extern int mixed_network(void);
+extern void unreal_delete_masks(ConfigItem_mask *m);
+extern void unreal_add_masks(ConfigItem_mask **head, ConfigEntry *ce);
+extern int unreal_mask_match(Client *acptr, ConfigItem_mask *m);
+extern char *our_strcasestr(char *haystack, char *needle);
+extern void update_conf(void);
+extern MODVAR int need_34_upgrade;
+#ifdef _WIN32
+extern MODVAR BOOL IsService;
+#endif
+extern int match_ip46(char *a, char *b);
+extern void extcmodes_check_for_changes(void);
+extern void umodes_check_for_changes(void);
+extern int config_parse_flood(char *orig, int *times, int *period);
+extern int swhois_add(Client *acptr, char *tag, int priority, char *swhois, Client *from, Client *skip);
+extern int swhois_delete(Client *acptr, char *tag, char *swhois, Client *from, Client *skip);
+extern void remove_oper_privileges(Client *client, int broadcast_mode_change);
+extern int client_starttls(Client *acptr);
+extern void start_server_handshake(Client *cptr);
+extern void reject_insecure_server(Client *cptr);
+extern void report_crash(void);
+extern void modulemanager(int argc, char *argv[]);
+extern int inet_pton4(const char *src, unsigned char *dst);
+extern int inet_pton6(const char *src, unsigned char *dst);
+extern int unreal_bind(int fd, char *ip, int port, int ipv6);
+extern int unreal_connect(int fd, char *ip, int port, int ipv6);
+extern int is_valid_ip(char *str);
+extern int ipv6_capable(void);
+extern MODVAR Client *remote_rehash_client;
+extern MODVAR int debugfd;
+extern void convert_to_absolute_path(char **path, char *reldir);
+extern int has_user_mode(Client *acptr, char mode);
+extern int has_channel_mode(Channel *channel, char mode);
+extern Cmode_t get_extmode_bitbychar(char m);
+extern long get_mode_bitbychar(char m);
+extern long find_user_mode(char mode);
+extern void start_listeners(void);
+extern void buildvarstring(const char *inbuf, char *outbuf, size_t len, const char *name[], const char *value[]);
+extern void reinit_ssl(Client *);
+extern CMD_FUNC(cmd_error);
+extern CMD_FUNC(cmd_dns);
+extern CMD_FUNC(cmd_info);
+extern CMD_FUNC(cmd_summon);
+extern CMD_FUNC(cmd_users);
+extern CMD_FUNC(cmd_version);
+extern CMD_FUNC(cmd_dalinfo);
+extern CMD_FUNC(cmd_credits);
+extern CMD_FUNC(cmd_license);
+extern CMD_FUNC(cmd_module);
+extern CMD_FUNC(cmd_rehash);
+extern CMD_FUNC(cmd_die);
+extern CMD_FUNC(cmd_restart);
+extern void cmd_alias(Client *client, MessageTag *recv_mtags, int parc, char *parv[], char *cmd); /* special! */
+extern void ban_flooder(Client *cptr);
+extern char *pcre2_version(void);
+extern int get_terminal_width(void);
+extern int has_common_channels(Client *c1, Client *c2);
+extern int user_can_see_member(Client *user, Client *target, Channel *channel);
+extern int invisible_user_in_channel(Client *target, Channel *channel);
+extern MODVAR int ssl_client_index;
+extern TLSOptions *FindTLSOptionsForUser(Client *acptr);
+extern int IsWebsocket(Client *acptr);
+extern Policy policy_strtoval(char *s);
+extern char *policy_valtostr(Policy policy);
+extern char policy_valtochar(Policy policy);
+extern int verify_certificate(SSL *ssl, char *hostname, char **errstr);
+extern char *certificate_name(SSL *ssl);
+extern void start_of_normal_client_handshake(Client *acptr);
+extern void clicap_pre_rehash(void);
+extern void clicap_post_rehash(void);
+extern void send_cap_notify(int add, char *token);
+extern void sendbufto_one(Client *to, char *msg, unsigned int quick);
+extern MODVAR int current_serial;
+extern char *spki_fingerprint(Client *acptr);
+extern char *spki_fingerprint_ex(X509 *x509_cert);
+extern int is_module_loaded(char *name);
+extern void close_std_descriptors(void);
+extern void banned_client(Client *acptr, char *bantype, char *reason, int global, int noexit);
+extern char *mystpcpy(char *dst, const char *src);
+extern size_t add_sjsby(char *buf, char *setby, time_t seton);
+extern MaxTarget *findmaxtarget(char *cmd);
+extern void setmaxtargets(char *cmd, int limit);
+extern void freemaxtargets(void);
+extern int max_targets_for_command(char *cmd);
+extern void set_targmax_defaults(void);
+extern void parse_chanmodes_protoctl(Client *client, char *str);
+extern void concat_params(char *buf, int len, int parc, char *parv[]);
+extern void charsys_check_for_changes(void);
+extern int maxclients;
+extern int fast_badword_match(ConfigItem_badword *badword, char *line);
+extern int fast_badword_replace(ConfigItem_badword *badword, char *line, char *buf, int max);
+extern char *stripbadwords(char *str, ConfigItem_badword *start_bw, int *blocked);
+extern int badword_config_process(ConfigItem_badword *ca, char *str);
+extern void badword_config_free(ConfigItem_badword *ca);
+extern char *badword_config_check_regex(char *s, int fastsupport, int check_broadness);
+extern AllowedChannelChars allowed_channelchars_strtoval(char *str);
+extern char *allowed_channelchars_valtostr(AllowedChannelChars v);
+extern long ClientCapabilityBit(const char *token);
+extern int is_handshake_finished(Client *client);
+extern void SetCapability(Client *acptr, const char *token);
+extern void ClearCapability(Client *acptr, const char *token);
+extern void new_message(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list);
+extern void new_message_special(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,4,5)));
+extern void generate_batch_id(char *str);
+extern MessageTag *find_mtag(MessageTag *mtags, const char *token);
+extern MessageTag *duplicate_mtag(MessageTag *mtag);
+extern void free_message_tags(MessageTag *m);
+extern time_t server_time_to_unix_time(const char *tbuf);
+extern int history_set_limit(char *object, int max_lines, long max_t);
+extern int history_add(char *object, MessageTag *mtags, char *line);
+extern int history_request(Client *acptr, char *object, HistoryFilter *filter);
+extern int history_destroy(char *object);
+extern void special_delayed_unloading(void);
+extern int write_int64(FILE *fd, uint64_t t);
+extern int write_int32(FILE *fd, uint32_t t);
+extern int read_int64(FILE *fd, uint64_t *t);
+extern int read_int32(FILE *fd, uint32_t *t);
+extern int read_data(FILE *fd, void *buf, size_t len);
+extern int write_data(FILE *fd, const void *buf, size_t len);
+extern int write_str(FILE *fd, char *x);
+extern int read_str(FILE *fd, char **x);
+extern int char_to_channelflag(char c);
+extern void _free_entire_name_list(NameList *n);
+extern void _add_name_list(NameList **list, char *name);
+extern void _del_name_list(NameList **list, char *name);
+extern NameList *find_name_list(NameList *list, char *name);
+extern NameList *find_name_list_match(NameList *list, char *name);
+extern int minimum_msec_since_last_run(struct timeval *tv_old, long minimum);
+extern int unrl_utf8_validate(const char *str, const char **end);
+extern char *unrl_utf8_make_valid(const char *str);
+extern void utf8_test(void);
+extern MODVAR int non_utf8_nick_chars_in_use;
+extern void short_motd(Client *client);
+extern int should_show_connect_info(Client *client);
+extern void send_invalid_channelname(Client *client, char *channelname);
+extern int is_extended_ban(const char *str);
+extern int valid_sid(char *name);
+extern void parse_client_queued(Client *client);
+extern char *sha256sum_file(const char *fname);
+extern char *filename_strip_suffix(const char *fname, const char *suffix);
+extern char *filename_add_suffix(const char *fname, const char *suffix);
+extern int filename_has_suffix(const char *fname, const char *suffix);
+extern void addmultiline(MultiLine **l, char *line);
+extern void freemultiline(MultiLine *l);
+extern void sendnotice_multiline(Client *client, MultiLine *m);
+extern void unreal_del_quotes(char *i);
+extern char *unreal_add_quotes(char *str);
+extern int unreal_add_quotes_r(char *i, char *o, size_t len);
+extern void user_account_login(MessageTag *recv_mtags, Client *client);
+extern void link_generator(void);
+extern void update_throttling_timer_settings(void);
diff --git a/include/ircsprintf.h b/include/ircsprintf.h
new file mode 100644
index 0000000..fe78767
--- /dev/null
+++ b/include/ircsprintf.h
@@ -0,0 +1,23 @@
+/*
+ * sprintf_irc.h
+ *
+ * $Id$
+ */
+
+#ifndef IRCSPRINTF_H
+#define IRCSPRINTF_H
+#include <stdarg.h>
+#include <stdio.h>
+
+/* ugly hack GRR, for both attribute and FORMAT_STRING */
+#if !defined(__GNUC__) && !defined(__common_include__)
+#define __attribute__(x) /* nothing */
+#endif
+#ifndef FORMAT_STRING
+# define FORMAT_STRING(p) p
+#endif
+
+extern char *ircvsnprintf(char *str, size_t size, const char *format, va_list);
+extern char *ircsnprintf(char *str, size_t size, FORMAT_STRING(const char *format), ...) __attribute__((format(printf,3,4)));
+
+#endif
diff --git a/include/license.h b/include/license.h
new file mode 100644
index 0000000..7ec743b
--- /dev/null
+++ b/include/license.h
@@ -0,0 +1,48 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, include/license.h
+ *   Copyright (C) 1999 Carsten Munk
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 
+ *   $Id$
+ */
+
+/* 
+ * GNU License converted by Techie <stskeeps@tspre.org>
+ *
+*/
+
+
+char *gnulicense[] = {
+	"   \2UnrealIRCd License\2",
+	"This program is free software; you can redistribute it and/or modify",
+	"it under the terms of the GNU General Public License as published by",
+	"the Free Software Foundation; either version 1, or (at your option)",
+	"any later version.",
+	"",
+	"This program is distributed in the hope that it will be useful,",
+	"but WITHOUT ANY WARRANTY; without even the implied warranty of",
+	"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the",
+	"GNU General Public License for more details.",
+	"",
+	"You should have received a copy of the GNU General Public License",
+	"along with this program; if not, write to the Free Software",
+	"Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.",
+	"",
+	"To see the UnrealIRCd License, please point your browser",
+	"at http://www.gnu.org/copyleft/gpl.html or look in the",
+	"file LICENSE in the UnrealIRCd dist",
+	0
+};
diff --git a/include/list.h b/include/list.h
new file mode 100644
index 0000000..27aeda2
--- /dev/null
+++ b/include/list.h
@@ -0,0 +1,592 @@
+/*
+ * These are list macros/functions derived from the Linux kernel.
+ * All original copyright (GPLv2) applies here.
+ *        -- nenolod
+ */
+
+#ifndef __LIST_H
+#define __LIST_H
+
+#include "common.h"
+
+#ifndef _WIN32
+#define SINLINE static inline
+#else
+#define SINLINE static
+#endif
+
+#ifdef _WIN32
+#define typeof(x)   Client 
+/* ^ FIXME if/when Microsoft supports this.
+ * All functions use Client at the moment, with the exception of CAP, which has
+ * to use list_for_each_entry2 because of it
+ * Yeah this looks ugly and hacky.. thanks nenolod for making all code use this
+ * non-portable gcc-specific stuff and violating all our code rules. Once again.
+ */
+#endif
+
+/**
+ * container_of - cast a member of a structure out to the containing structure
+ * @ptr:        the pointer to the member.
+ * @type:       the type of the container struct this is embedded in.
+ * @member:     the name of the member within the struct.
+ *
+ */
+#define container_of(ptr, type, member) \
+	((type *)( (char *)ptr - offsetof(type, member) ))
+
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+/*
+ * Simple doubly linked list implementation.
+ *
+ * Some of the internal functions ("__xxx") are useful when
+ * manipulating whole lists rather than single entries, as
+ * sometimes we already know the next/prev entries and we can
+ * generate better code by using them directly rather than
+ * using the generic single-entry routines.
+ */
+
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
+
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
+
+SINLINE void INIT_LIST_HEAD(struct list_head *list)
+{
+	list->next = list;
+	list->prev = list;
+}
+
+/*
+ * Insert a new entry between two known consecutive entries.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+SINLINE void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
+{
+	next->prev = new;
+	new->next = next;
+	new->prev = prev;
+	prev->next = new;
+}
+
+/**
+ * list_add - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it after
+ *
+ * Insert a new entry after the specified head.
+ * This is good for implementing stacks.
+ */
+SINLINE void list_add(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head, head->next);
+}
+
+
+/**
+ * list_add_tail - add a new entry
+ * @new: new entry to be added
+ * @head: list head to add it before
+ *
+ * Insert a new entry before the specified head.
+ * This is useful for implementing queues.
+ */
+SINLINE void list_add_tail(struct list_head *new, struct list_head *head)
+{
+	__list_add(new, head->prev, head);
+}
+
+/*
+ * Delete a list entry by making the prev/next entries
+ * point to each other.
+ *
+ * This is only for internal list manipulation where we know
+ * the prev/next entries already!
+ */
+SINLINE void __list_del(struct list_head * prev, struct list_head * next)
+{
+	next->prev = prev;
+	prev->next = next;
+}
+
+/**
+ * list_del - deletes entry from list.
+ * @entry: the element to delete from the list.
+ * Note: list_empty() on entry does not return true after this, the entry is
+ * in an undefined state.
+ */
+SINLINE void __list_del_entry(struct list_head *entry)
+{
+	__list_del(entry->prev, entry->next);
+}
+
+SINLINE void list_del(struct list_head *entry)
+{
+	__list_del_entry(entry);
+	INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_replace - replace old entry by new one
+ * @old : the element to be replaced
+ * @new : the new element to insert
+ *
+ * If @old was empty, it will be overwritten.
+ */
+SINLINE void list_replace(struct list_head *old,
+				struct list_head *new)
+{
+	new->next = old->next;
+	new->next->prev = new;
+	new->prev = old->prev;
+	new->prev->next = new;
+}
+
+SINLINE void list_replace_init(struct list_head *old,
+					struct list_head *new)
+{
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
+}
+
+/**
+ * list_del_init - deletes entry from list and reinitialize it.
+ * @entry: the element to delete from the list.
+ */
+SINLINE void list_del_init(struct list_head *entry)
+{
+	__list_del_entry(entry);
+	INIT_LIST_HEAD(entry);
+}
+
+/**
+ * list_move - delete from one list and add as another's head
+ * @list: the entry to move
+ * @head: the head that will precede our entry
+ */
+SINLINE void list_move(struct list_head *list, struct list_head *head)
+{
+	__list_del_entry(list);
+	list_add(list, head);
+}
+
+/**
+ * list_move_tail - delete from one list and add as another's tail
+ * @list: the entry to move
+ * @head: the head that will follow our entry
+ */
+SINLINE void list_move_tail(struct list_head *list,
+				  struct list_head *head)
+{
+	__list_del_entry(list);
+	list_add_tail(list, head);
+}
+
+/**
+ * list_is_last - tests whether @list is the last entry in list @head
+ * @list: the entry to test
+ * @head: the head of the list
+ */
+SINLINE int list_is_last(const struct list_head *list,
+				const struct list_head *head)
+{
+	return list->next == head;
+}
+
+/**
+ * list_empty - tests whether a list is empty
+ * @head: the list to test.
+ */
+SINLINE int list_empty(const struct list_head *head)
+{
+	return head->next == head;
+}
+
+/**
+ * list_empty_careful - tests whether a list is empty and not being modified
+ * @head: the list to test
+ *
+ * Description:
+ * tests whether a list is empty _and_ checks that no other CPU might be
+ * in the process of modifying either member (next or prev)
+ *
+ * NOTE: using list_empty_careful() without synchronization
+ * can only be safe if the only activity that can happen
+ * to the list entry is list_del_init(). Eg. it cannot be used
+ * if another CPU could re-list_add() it.
+ */
+SINLINE int list_empty_careful(const struct list_head *head)
+{
+	struct list_head *next = head->next;
+	return (next == head) && (next == head->prev);
+}
+
+/**
+ * list_rotate_left - rotate the list to the left
+ * @head: the head of the list
+ */
+SINLINE void list_rotate_left(struct list_head *head)
+{
+	struct list_head *first;
+
+	if (!list_empty(head)) {
+		first = head->next;
+		list_move_tail(first, head);
+	}
+}
+
+/**
+ * list_is_singular - tests whether a list has just one entry.
+ * @head: the list to test.
+ */
+SINLINE int list_is_singular(const struct list_head *head)
+{
+	return !list_empty(head) && (head->next == head->prev);
+}
+
+SINLINE void __list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
+{
+	struct list_head *new_first = entry->next;
+	list->next = head->next;
+	list->next->prev = list;
+	list->prev = entry;
+	entry->next = list;
+	head->next = new_first;
+	new_first->prev = head;
+}
+
+/**
+ * list_cut_position - cut a list into two
+ * @list: a new list to add all removed entries
+ * @head: a list with entries
+ * @entry: an entry within head, could be the head itself
+ *	and if so we won't cut the list
+ *
+ * This helper moves the initial part of @head, up to and
+ * including @entry, from @head to @list. You should
+ * pass on @entry an element you know is on @head. @list
+ * should be an empty list or a list you do not care about
+ * losing its data.
+ *
+ */
+SINLINE void list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
+{
+	if (list_empty(head))
+		return;
+	if (list_is_singular(head) &&
+		(head->next != entry && head != entry))
+		return;
+	if (entry == head)
+		INIT_LIST_HEAD(list);
+	else
+		__list_cut_position(list, head, entry);
+}
+
+SINLINE void __list_splice(const struct list_head *list,
+				 struct list_head *prev,
+				 struct list_head *next)
+{
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
+
+	first->prev = prev;
+	prev->next = first;
+
+	last->next = next;
+	next->prev = last;
+}
+
+/**
+ * list_splice - join two lists, this is designed for stacks
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+SINLINE void list_splice(const struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head, head->next);
+}
+
+/**
+ * list_splice_tail - join two lists, each list being a queue
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ */
+SINLINE void list_splice_tail(struct list_head *list,
+				struct list_head *head)
+{
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
+}
+
+/**
+ * list_splice_init - join two lists and reinitialise the emptied list.
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * The list at @list is reinitialised
+ */
+SINLINE void list_splice_init(struct list_head *list,
+				    struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head, head->next);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_splice_tail_init - join two lists and reinitialise the emptied list
+ * @list: the new list to add.
+ * @head: the place to add it in the first list.
+ *
+ * Each of the lists is a queue.
+ * The list at @list is reinitialised
+ */
+SINLINE void list_splice_tail_init(struct list_head *list,
+					 struct list_head *head)
+{
+	if (!list_empty(list)) {
+		__list_splice(list, head->prev, head);
+		INIT_LIST_HEAD(list);
+	}
+}
+
+/**
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_entry(ptr, type, member) \
+	container_of(ptr, type, member)
+
+/**
+ * list_first_entry - get the first element from a list
+ * @ptr:	the list head to take the element from.
+ * @type:	the type of the struct this is embedded in.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Note, that list is expected to be not empty.
+ */
+#define list_first_entry(ptr, type, member) \
+	list_entry((ptr)->next, type, member)
+
+/**
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * __list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ *
+ * This variant doesn't differ from list_for_each() any more.
+ * We don't do prefetching in either case.
+ */
+#define __list_for_each(pos, head) \
+	for (pos = (head)->next; pos != (head); pos = pos->next)
+
+/**
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev(pos, head) \
+	for (pos = (head)->prev; pos != (head); pos = pos->prev)
+
+/**
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_safe(pos, n, head) \
+	for (pos = (head)->next, n = pos->next; pos != (head); \
+		pos = n, n = pos->next)
+
+/**
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
+ * @head:	the head for your list.
+ */
+#define list_for_each_prev_safe(pos, n, head) \
+	for (pos = (head)->prev, n = pos->prev; \
+	     pos != (head); \
+	     pos = n, n = pos->prev)
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry	-	iterate over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry2(pos, tpe, head, member)				\
+	for (pos = list_entry((head)->next, tpe, member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.next, tpe, member))
+
+/**
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
+	     &pos->member != (head); 	\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
+ * @pos:	the type * to use as a start point
+ * @head:	the head of the list
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
+ */
+#define list_prepare_entry(pos, head, member) \
+	((pos) ? : list_entry(head, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue - continue iteration over list of given type
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Continue to iterate over list of given type, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head);	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Start to iterate over list of given type backwards, continuing after
+ * the current position.
+ */
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
+	     &pos->member != (head);	\
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_from - iterate over list of given type from the current point
+ * @pos:	the type * to use as a loop cursor.
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing from current position.
+ */
+#define list_for_each_entry_from(pos, head, member) 			\
+	for (; &pos->member != (head);	\
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
+
+/**
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ */
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_continue - continue list iteration safe against removal
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type, continuing after current point,
+ * safe against removal of list entry.
+ */
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
+	     &pos->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_from - iterate over list from current point safe against removal
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate over list of given type from current point, safe against
+ * removal of list entry.
+ */
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
+	     &pos->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
+
+/**
+ * list_for_each_entry_safe_reverse - iterate backwards over list safe against removal
+ * @pos:	the type * to use as a loop cursor.
+ * @n:		another type * to use as temporary storage
+ * @head:	the head for your list.
+ * @member:	the name of the list_struct within the struct.
+ *
+ * Iterate backwards over list of given type, safe against removal
+ * of list entry.
+ */
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		n = list_entry(pos->member.prev, typeof(*pos), member);	\
+	     &pos->member != (head); 					\
+	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
+
+/**
+ * list_safe_reset_next - reset a stale list_for_each_entry_safe loop
+ * @pos:	the loop cursor used in the list_for_each_entry_safe loop
+ * @n:		temporary storage used in list_for_each_entry_safe
+ * @member:	the name of the list_struct within the struct.
+ *
+ * list_safe_reset_next is not safe to use in general if the list may be
+ * modified concurrently (eg. the lock is dropped in the loop body). An
+ * exception to this is if the cursor element (pos) is pinned in the list,
+ * and list_safe_reset_next is called after re-taking the lock and before
+ * completing the current iteration of the loop body.
+ */
+#define list_safe_reset_next(pos, n, member)				\
+	n = list_entry(pos->member.next, typeof(*pos), member)
+
+#endif
diff --git a/include/mempool.h b/include/mempool.h
new file mode 100644
index 0000000..6648cee
--- /dev/null
+++ b/include/mempool.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2007-2012, The Tor Project, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following disclaimer
+ *     in the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright owners nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Imported from hybrid svn:
+ * \file mempool.h
+ * \brief Pooling allocator
+ * \version $Id: mempool.h 1662 2012-11-17 20:11:33Z michael $
+ */
+
+#ifndef TOR_MEMPOOL_H
+#define TOR_MEMPOOL_H
+
+#ifdef _WIN32
+  #define uint64_t unsigned __int64
+#endif
+
+/** A memory pool is a context in which a large number of fixed-sized
+* objects can be allocated efficiently.  See mempool.c for implementation
+* details. */
+typedef struct mp_pool_t mp_pool_t;
+
+extern void mp_pool_init(void);
+extern void *mp_pool_get(mp_pool_t *);
+extern void mp_pool_release(void *);
+extern mp_pool_t *mp_pool_new(size_t, size_t);
+extern void mp_pool_clean(mp_pool_t *, int, int);
+extern void mp_pool_destroy(mp_pool_t *);
+extern void mp_pool_assert_ok(mp_pool_t *);
+extern void mp_pool_log_status(mp_pool_t *);
+extern void mp_pool_garbage_collect(void *);
+
+#define MEMPOOL_STATS
+
+struct mp_pool_t {
+  /** Next pool. A pool is usually linked into the mp_allocated_pools list. */
+  mp_pool_t *next;
+
+  /** Doubly-linked list of chunks in which no items have been allocated.
+   * The front of the list is the most recently emptied chunk. */
+  struct mp_chunk_t *empty_chunks;
+
+  /** Doubly-linked list of chunks in which some items have been allocated,
+   * but which are not yet full. The front of the list is the chunk that has
+   * most recently been modified. */
+  struct mp_chunk_t *used_chunks;
+
+  /** Doubly-linked list of chunks in which no more items can be allocated.
+   * The front of the list is the chunk that has most recently become full. */
+  struct mp_chunk_t *full_chunks;
+
+  /** Length of <b>empty_chunks</b>. */
+  int n_empty_chunks;
+
+  /** Lowest value of <b>empty_chunks</b> since last call to
+   * mp_pool_clean(-1). */
+  int min_empty_chunks;
+
+  /** Size of each chunk (in items). */
+  int new_chunk_capacity;
+
+  /** Size to allocate for each item, including overhead and alignment
+   * padding. */
+  size_t item_alloc_size;
+#ifdef MEMPOOL_STATS
+  /** Total number of items allocated ever. */
+  uint64_t total_items_allocated;
+
+  /** Total number of chunks allocated ever. */
+  uint64_t total_chunks_allocated;
+
+  /** Total number of chunks freed ever. */
+  uint64_t total_chunks_freed;
+#endif
+};
+
+#endif
diff --git a/include/modules.h b/include/modules.h
new file mode 100644
index 0000000..dad5f0a
--- /dev/null
+++ b/include/modules.h
@@ -0,0 +1,1379 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/modules.h
+ *   (C) Carsten V. Munk 2000 <stskeeps@tspre.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+#ifndef MODULES_H
+#define MODULES_H
+#include "types.h"
+#define MAXCUSTOMHOOKS  30
+#define MAXHOOKTYPES	150
+#define MAXCALLBACKS	30
+#define MAXEFUNCTIONS	90
+#if defined(_WIN32)
+ #define MOD_EXTENSION "dll"
+ #define DLLFUNC	_declspec(dllexport)
+ #define irc_dlopen(x,y) LoadLibrary(x)
+ #define irc_dlclose FreeLibrary
+ #define irc_dlsym(x,y,z) z = (void *)GetProcAddress(x,y)
+ #define irc_dlerror our_dlerror
+#else
+ #define MOD_EXTENSION "so"
+ #define irc_dlopen dlopen
+ #define irc_dlclose dlclose
+ #if defined(UNDERSCORE)
+  #define irc_dlsym(x,y,z) z = obsd_dlsym(x,y)
+ #else
+  #define irc_dlsym(x,y,z) z = dlsym(x,y)
+ #endif
+ #define irc_dlerror dlerror
+ #define DLLFUNC 
+#endif
+
+#define EVENT(x) void (x) (void *data)
+
+/* Casts to int, void, void *, and char * function pointers */
+#define TO_INTFUNC(x) (int (*)())(x)
+#define TO_VOIDFUNC(x) (void (*)())(x)
+#define TO_PVOIDFUNC(x) (void *(*)())(x)
+#define TO_PCHARFUNC(x) (char *(*)())(x)
+
+typedef struct Event Event;
+typedef struct EventInfo EventInfo;
+typedef struct Hook Hook;
+typedef struct Hooktype Hooktype;
+typedef struct Callback Callback;
+typedef struct Efunction Efunction;
+typedef enum EfunctionType EfunctionType;
+
+/*
+ * Module header that every module must include, with the name of
+ * mod_header
+*/
+
+typedef struct ModuleHeader {
+	char *name;
+	char *version;
+	char *description;
+	char *author;
+	char *modversion;
+} ModuleHeader;
+
+typedef struct Module Module;
+
+typedef struct ModuleChild
+{
+	struct ModuleChild *prev, *next; 
+	Module *child; /* Aww. aint it cute? */
+} ModuleChild;
+
+typedef struct {
+	int size;
+	int module_load;
+	Module *handle;
+} ModuleInfo;
+
+
+typedef enum ModuleObjectType {
+	MOBJ_EVENT = 1,
+	MOBJ_HOOK = 2,
+	MOBJ_COMMAND = 3,
+	MOBJ_HOOKTYPE = 4,
+	MOBJ_VERSIONFLAG = 5,
+	MOBJ_SNOMASK = 6,
+	MOBJ_UMODE = 7,
+	MOBJ_COMMANDOVERRIDE = 8,
+	MOBJ_EXTBAN = 9,
+	MOBJ_CALLBACK = 10,
+	MOBJ_ISUPPORT = 11,
+	MOBJ_EFUNCTION = 12,
+	MOBJ_CMODE = 13,
+	MOBJ_MODDATA = 14,
+	MOBJ_VALIDATOR = 15,
+	MOBJ_CLICAP = 16,
+	MOBJ_MTAG = 17,
+	MOBJ_HISTORY_BACKEND = 18,
+} ModuleObjectType;
+
+typedef struct {
+        long mode; /**< Mode mask */
+        char flag; /**< Mode character */
+        int unset_on_deoper; /**< When set to 1 then this user mode will be unset on de-oper */
+        int (*allowed)(Client *client, int what); /**< The 'is this user allowed to set this mode?' routine */
+        char unloaded; /**< Internal flag to indicate module is being unloaded */
+        Module *owner; /**< Module that owns this user mode */
+} Umode;
+
+typedef struct {
+        long mode; /**< Snomask mask */
+        char flag; /**< Snomask character */
+        int unset_on_deoper; /**< When set to 1 then this snomask will be unset on de-oper */
+        int (*allowed)(Client *client, int what); /**< The 'is this user allowed to set this snomask?' routine */
+        char unloaded; /**< Internal flag to indicate module is being unloaded */
+        Module *owner; /**< Module that owns this snomask */
+} Snomask;
+
+typedef enum ModDataType {
+	MODDATATYPE_LOCAL_VARIABLE	= 1,
+	MODDATATYPE_GLOBAL_VARIABLE	= 2,
+	MODDATATYPE_CLIENT		= 3,
+	MODDATATYPE_LOCAL_CLIENT	= 4,
+	MODDATATYPE_CHANNEL		= 5,
+	MODDATATYPE_MEMBER		= 6,
+	MODDATATYPE_MEMBERSHIP		= 7,
+} ModDataType;
+
+typedef struct ModDataInfo ModDataInfo;
+
+struct ModDataInfo {
+	ModDataInfo *prev, *next;
+	char *name; /**< Name for this moddata */
+	Module *owner; /**< Owner of this moddata */
+	ModDataType type; /**< Type of module data (eg: for client, channel, etc..) */
+	int slot; /**< Assigned slot */
+	char unloaded; /**< Module being unloaded? */
+	void (*free)(ModData *m); /**< Function will be called when the data needs to be freed (may be NULL if not using dynamic storage) */
+	char *(*serialize)(ModData *m); /**< Function which converts the data to a string. May return NULL if 'm' contains no data (since for example m->ptr may be NULL). */
+	void (*unserialize)(char *str, ModData *m); /**< Function which converts the string back to data */
+	int sync; /**< Send in netsynch (when servers connect) */
+};
+
+#define moddata_client(acptr, md)    acptr->moddata[md->slot]
+#define moddata_local_client(acptr, md)    acptr->local->moddata[md->slot]
+#define moddata_channel(channel, md)   channel->moddata[md->slot]
+#define moddata_member(m, md)        m->moddata[md->slot]
+#define moddata_membership(m, md)    m->moddata[md->slot]
+#define moddata_local_variable(md)         local_variable_moddata[md->slot]
+#define moddata_global_variable(md)        global_variable_moddata[md->slot]
+
+/* Can bypass message restriction - Types */
+typedef enum BypassChannelMessageRestrictionType {
+	BYPASS_CHANMSG_EXTERNAL = 1,
+	BYPASS_CHANMSG_MODERATED = 2,
+	BYPASS_CHANMSG_COLOR = 3,
+	BYPASS_CHANMSG_CENSOR = 4,
+	BYPASS_CHANMSG_NOTICE = 5,
+} BypassChannelMessageRestrictionType;
+
+/** @defgroup ChannelModeAPI Channel mode API
+ * @{
+ */
+
+#define EXCHK_ACCESS		0 /**< Check user access */
+#define EXCHK_ACCESS_ERR	1 /**< Check user access and send error to user */
+#define EXCHK_PARAM		2 /**< Check parameter */
+
+/* return values for EXCHK_ACCESS*: */
+#define EX_DENY			0  /**< MODE change disallowed, except in case of operoverride */
+#define EX_ALLOW		1  /**< MODE change allowed */
+#define EX_ALWAYS_DENY		-1 /**< MODE change disallowed, even in case of operoverride */
+
+#define EXSJ_SAME		0 /**< SJOIN: Parameters are the same */
+#define EXSJ_WEWON		1 /**< SJOIN: We won! w00t */
+#define EXSJ_THEYWON		2 /**< SJOIN: They won :( */
+#define EXSJ_MERGE		3 /**< SJOIN: Merging of modes, neither won nor lost */
+
+/** Channel mode bit/value */
+typedef unsigned long Cmode_t;
+
+/** Channel mode handler.
+ * This struct contains all extended channel mode information,
+ * like the flag, mode, their handler functions, etc.
+ *
+ * @note For a channel mode without parameters you only need to set 'flag'
+ * and set the 'is_ok' function. All the rest is for parameter modes
+ * or is optional.
+ */
+typedef struct {
+	/** mode character (like 'Z') */
+	char		flag;
+
+	/** unique flag (like 0x10) */
+	Cmode_t		mode;
+
+	/** Number of paramters (1 or 0) */
+	int			paracount;
+
+	/** Check access or parameter of the channel mode.
+	 * @param client	The client
+	 * @param channel	The channel
+	 * @param para		The parameter (NULL for paramless modes)
+	 * @param checkt	Check type, see EXCHK_* macros
+	 * @param what		MODE_ADD or MODE_DEL
+	 * @returns EX_DENY, EX_ALLOW or EX_ALWAYS_DENY
+	 */
+	int (*is_ok)(Client *client, Channel *channel, char mode, char *para, int checkt, int what);
+
+	/** Store parameter in memory for channel.
+	 * This function pointer is NULL (unused) for modes without parameters.
+	 * @param list		The list, this usually points to channel->mode.extmodeparams.
+	 * @param para		The parameter to store.
+	 * @returns the head of the list, RTFS if you wonder why.
+	 * @note IMPORTANT: only allocate a new paramstruct if you need to.
+	 *       Search for any current one first! Eg: in case of mode +y 5 and then +y 6 later without -y.
+	 */
+	void *(*put_param)(void *list, char *para);
+
+	/** Get the stored parameter as a readable/printable string.
+	 * This function pointer is NULL (unused) for modes without parameters.
+	 * @param parastruct	The parameter struct
+	 * @returns a pointer to the string (temporary storage)
+	 */
+	char *(*get_param)(void *parastruct);
+
+	/** Convert input parameter to output.
+	 * This converts stuff like where a MODE +l "1aaa" becomes "1".
+	 *
+	 * This function pointer is NULL (unused) for modes without parameters.
+	 * @param para		The input parameter.
+	 * @param client	The client that the mode request came from (can be NULL)
+	 * @returns pointer to output string (temporary storage)
+	 * @note The 'client' field will be NULL if for example called for set::modes-on-join.
+	 * @note You should probably not use 'client' in most cases.
+	 *       In particular you MUST NOT SEND ERRORS to the client.
+	 *       This should be done in is_ok() and not in conv_param().
+	 */
+	char *(*conv_param)(char *para, Client *client);
+
+	/** Free and remove parameter from list.
+	 * This function pointer is NULL (unused) for modes without parameters.
+	 * @param parastruct		The parameter struct
+	 * @note In most cases you will just call safe_free() on 'list'
+	 */
+	void (*free_param)(void *parastruct);
+
+	/** duplicate a struct and return a pointer to duplicate.
+	 * This function pointer is NULL (unused) for modes without parameters.
+	 * @param parastruct		The parameter struct
+	 * @returns pointer to newly allocated struct.
+	 * @note In most cases you will simply safe_alloc() and memcpy()
+	 */
+	void *(*dup_struct)(void *parastruct);
+
+	/** Compares two parameters and decides who wins the SJOIN fight.
+	 * When syncing channel modes (cmd_sjoin) a parameter conflict may occur, things like
+	 * "+l 5" vs "+l 10". This function should determinate who wins the fight.
+	 * This decision should, of course, not be random. It needs to decide according to
+	 * the same principles on all servers on the IRC network. Examples of such
+	 * comparisons are "highest wins" (+l) and a strcmp() check (+k/+L).
+	 * 
+	 * This function pointer is NULL (unused) for modes without parameters.
+	 * @param channel	The channel that the fight is about
+	 * @param our		Our parameter struct
+	 * @param their		Their parameter struct
+	 */
+	int (*sjoin_check)(Channel *channel, void *our, void *their);
+
+	/** Local channel mode? Prevents remote servers from setting/unsetting this */
+	char local;
+	
+	/** Unsetting also eats/requires a parameter. Unusual, but possible. */
+	char unset_with_param;
+
+	/** Is this mode being unloaded?
+	 * This is set to 1 if the chanmode module providing this mode is unloaded
+	 * and we are waiting to see if in our new round of loads a "new" chanmode
+	 * module will popup to take this mode. This only happens during a rehash,
+	 * should never be 0 outside an internal rehash.
+	 */
+	char unloaded;
+	
+	/** Slot number - Can be used instead of GETPARAMSLOT() */
+	int slot;
+	
+	/** Module owner */
+        Module *owner;
+} Cmode;
+
+/** The struct used to register a channel mode handler.
+ * For documentation, see Cmode struct.
+ */
+typedef struct {
+	char		flag;
+	int		paracount;
+	int		(*is_ok)(Client *,Channel *, char mode, char *para, int, int);
+	void *	(*put_param)(void *, char *);
+	char *		(*get_param)(void *);
+	char *		(*conv_param)(char *, Client *);
+	void		(*free_param)(void *);
+	void *	(*dup_struct)(void *);
+	int		(*sjoin_check)(Channel *, void *, void *);
+	char		local;
+	char		unset_with_param;
+} CmodeInfo;
+
+/** Get a slot number for a param - eg GETPARAMSLOT('k') */
+#define GETPARAMSLOT(x)	param_to_slot_mapping[x]
+
+/** Get a cmode handler by slot - for example for [dont use this]: GETPARAMHANDLERBYSLOT(5)->get_param(channel) */
+#define GETPARAMHANDLERBYSLOT(slotid)	ParamTable[slotid]
+
+/** Same as GETPARAMHANDLERBYSLOT but then by letter - like [dont use this]: GETPARAMHANDLERBYSLOT('k')->get_param(channel) */
+#define GETPARAMHANDLERBYLETTER(x)	ParamTable[GETPARAMSLOT(x)]
+
+/** Get paramter data struct - for like: ((aModejEntry *)GETPARASTRUCT(channel, 'j'))->t */
+#define GETPARASTRUCT(mychannel, mychar)	channel->mode.extmodeparams[GETPARAMSLOT(mychar)]
+
+#define GETPARASTRUCTEX(v, mychar)	v[GETPARAMSLOT(mychar)]
+
+/** @} */
+
+#define CMP_GETSLOT(x) GETPARAMSLOT(x)
+#define CMP_GETHANDLERBYSLOT(x) GETPARAMHANDLERBYSLOT(x)
+#define CMP_GETHANDLERBYLETTER(x) GETPARAMHANDLERBYLETTER(x)
+#define CMP_GETSTRUCT(x,y) GETPARASTRUCT(x,y)
+
+/*** Extended bans ***/
+
+// TODO: These should be enums!
+
+#define EXBCHK_ACCESS		0 /* Check access */
+#define EXBCHK_ACCESS_ERR	1 /* Check access and send error */
+#define EXBCHK_PARAM		2 /* Check if the parameter is valid */
+
+#define EXBTYPE_BAN		0 /* a ban */
+#define EXBTYPE_EXCEPT		1 /* an except */
+#define EXBTYPE_INVEX		2 /* an invite exception */
+#define EXBTYPE_TKL		3 /* TKL or other generic matcher outside banning routines */
+
+#define EXTBANTABLESZ		32
+
+typedef enum ExtbanOptions { EXTBOPT_CHSVSMODE=0x1, EXTBOPT_ACTMODIFIER=0x2, EXTBOPT_NOSTACKCHILD=0x4, EXTBOPT_INVEX=0x8, EXTBOPT_TKL=0x10 } ExtbanOptions;
+
+typedef struct {
+	/** extbans module */
+	Module *owner;
+	/** extended ban character */
+	char	flag;
+
+	/** extban options */
+	ExtbanOptions options;
+
+	/** access checking [optional].
+	 * Client *: the client
+	 * Channel *: the channel
+	 * para: the ban parameter
+	 * int: check type (see EXBCHK_*)
+	 * int: what (MODE_ADD or MODE_DEL)
+	 * int: what2 (EXBTYPE_BAN or EXBTYPE_EXCEPT)
+	 * return value: 1=ok, 0=bad
+	 * NOTE: just set this of NULL if you want only +hoaq to place/remove bans as usual.
+	 * NOTE2: This has not been tested yet!!
+	 */
+	int			(*is_ok)(Client *, Channel *, char *para, int, int, int);
+
+	/** Convert input parameter to output [optional].
+	 * like with normal bans '+b blah' gets '+b blah!*@*', and it allows
+	 * you to limit the length of the ban too. You can set this to NULL however
+	 * to use the value as-is.
+	 * char *: the input parameter.
+	 * return value: pointer to output string (temp. storage)
+	 */
+	char *		(*conv_param)(char *);
+
+	/** Checks if the user is affected by this ban [required].
+	 * Called from is_banned.
+	 * Client *: the client
+	 * Channel *: the channel
+	 * para: the ban entry
+	 * int: a value of BANCHK_* (see struct.h)
+	 * char **: optionally a message, can be NULL!! (for some BANCHK_ types)
+	 * char **: optionally for setting an error message, can be NULL!!
+	 */
+	int			(*is_banned)(Client *client, Channel *channel, char *para, int checktype, char **msg, char **errormsg);
+} Extban;
+
+typedef struct {
+	char	flag;
+	ExtbanOptions options;
+	int			(*is_ok)(Client *, Channel *, char *para, int, int, int);
+	char *			(*conv_param)(char *);
+	int			(*is_banned)(Client *, Channel *, char *, int, char **, char **);
+} ExtbanInfo;
+
+
+typedef struct Command Command;
+struct Command {
+	Command *prev, *next;
+	RealCommand *cmd;
+};
+
+typedef struct Versionflag Versionflag;
+struct Versionflag {
+	Versionflag *prev, *next;
+	char flag;
+	ModuleChild *parents;
+};
+
+/* This type needs a forward declaration: */
+typedef struct MessageTagHandler MessageTagHandler;
+
+#define CLICAP_FLAGS_NONE               0x0
+#define CLICAP_FLAGS_ADVERTISE_ONLY     0x4
+
+typedef struct ClientCapability ClientCapability;
+struct ClientCapability {
+	ClientCapability *prev, *next;
+	char *name;                              /**< The name of the CAP */
+	long cap;                                /**< The acptr->user->proto we should set (if any, can be 0, like for sts) */
+	int flags;                               /**< A flag from CLICAP_FLAGS_* */
+	int (*visible)(Client *);               /**< Should the capability be visible? Note: parameter may be NULL. [optional] */
+	char *(*parameter)(Client *);           /**< CAP parameters. Note: parameter may be NULL. [optional] */
+	MessageTagHandler *mtag_handler;         /**< For reverse dependency */
+	Module *owner;                           /**< Module introducing this CAP. */
+	char unloaded;                           /**< Internal flag to indicate module is being unloaded */
+};
+
+typedef struct {
+	char *name;
+	int flags;
+	int (*visible)(Client *);
+	char *(*parameter)(Client *);
+} ClientCapabilityInfo;
+
+/** @defgroup MessagetagAPI Message tag API
+ * @{
+ */
+
+/** No special message-tag handler flags */
+#define MTAG_HANDLER_FLAGS_NONE			0x0
+/** This message-tag does not have a CAP REQ xx (eg: for "msgid") */
+#define MTAG_HANDLER_FLAGS_NO_CAP_NEEDED	0x1
+
+/** Message Tag Handler */
+struct MessageTagHandler {
+	MessageTagHandler *prev, *next;
+	char *name;                                 /**< The name of the message-tag */
+	int flags;                                  /**< A flag of MTAG_HANDLER_FLAGS_* */
+	int (*is_ok)(Client *, char *, char *);     /**< Verify syntax and access rights */
+	int (*can_send)(Client *);                  /**< Tag may be sent to this client (normally NULL!) */
+	Module *owner;                              /**< Module introducing this CAP. */
+	ClientCapability *clicap_handler;           /**< Client capability handler associated with this */
+	char unloaded;                              /**< Internal flag to indicate module is being unloaded */
+};
+
+/** The struct used to register a message tag handler.
+ * For documentation, see the MessageTagHandler struct.
+ */
+typedef struct {
+	char *name;
+	int flags;
+	int (*is_ok)(Client *, char *, char *);
+	int (*can_send)(Client *);
+	ClientCapability *clicap_handler;
+} MessageTagHandlerInfo;
+
+/** @} */
+
+/** Filter for history get requests */
+typedef struct HistoryFilter HistoryFilter;
+struct HistoryFilter {
+    int last_lines;
+    int last_seconds;
+};
+
+/** History Backend */
+typedef struct HistoryBackend HistoryBackend;
+struct HistoryBackend {
+	HistoryBackend *prev, *next;
+	char *name;                                   /**< The name of the history backend (eg: "mem") */
+	int (*history_set_limit)(char *object, int max_lines, long max_time); /**< Impose a limit on a history object */
+	int (*history_add)(char *object, MessageTag *mtags, char *line); /**< Add to history */
+	int (*history_request)(Client *acptr, char *object, HistoryFilter *filter);  /**< Request history */
+	int (*history_destroy)(char *object);  /**< Destroy history of this object completely */
+	Module *owner;                                /**< Module introducing this */
+	char unloaded;                                /**< Internal flag to indicate module is being unloaded */
+};
+
+/** The struct used to register a history backend.
+ * For documentation, see the History Backend struct above.
+ */
+typedef struct {
+	char *name;
+	int (*history_set_limit)(char *object, int max_lines, long max_time);
+	int (*history_add)(char *object, MessageTag *mtags, char *line);
+	int (*history_request)(Client *acptr, char *object, HistoryFilter *filter);
+	int (*history_destroy)(char *object);
+} HistoryBackendInfo;
+
+struct Hook {
+	Hook *prev, *next;
+	int priority;
+	int type;
+	union {
+		int (*intfunc)();
+		void (*voidfunc)();
+		char *(*pcharfunc)();
+	} func;
+	Module *owner;
+};
+
+struct Callback {
+	Callback *prev, *next;
+	short type;
+	union {
+		int (*intfunc)();
+		void (*voidfunc)();
+		char *(*pcharfunc)();
+	} func;
+	Module *owner;
+	char willberemoved; /* will be removed on next rehash? (eg the 'old'/'current' one) */
+};
+
+/* Definition of an efunction: a MANDATORY Extern Function (in a module),
+ * for things like do_join, join_channel, etc.
+ * The difference between callbacks and efunctions are:
+ * - efunctions are (usually) mandatory, while callbacks can be optional
+ * - efunctions are meant for internal usage, so 3rd party modules are
+ *   not allowed to add them.
+ * - all efunctions are declared as function pointers in modules.c
+ */
+struct Efunction {
+	Efunction *prev, *next;
+	short type;
+	union {
+		int (*intfunc)();
+		void (*voidfunc)();
+		void *(*pvoidfunc)();
+		char *(*pcharfunc)();
+	} func;
+	Module *owner;
+	char willberemoved; /* will be removed on next rehash? (eg the 'old'/'current' one) */
+};
+
+struct Hooktype {
+	short id;
+	char *string;
+	ModuleChild *parents;
+};
+
+typedef struct ISupport ISupport;
+struct ISupport {
+	ISupport *prev, *next;
+	char *token;
+	char *value;
+	Module *owner;
+};
+
+typedef struct ModuleObject {
+	struct ModuleObject *prev, *next;
+	ModuleObjectType type;
+	union {
+		Event *event;
+		Hook *hook;
+		Command *command;
+		Hooktype *hooktype;
+		Versionflag *versionflag;
+		Snomask *snomask;
+		Umode *umode;
+		CommandOverride *cmdoverride;
+		Extban *extban;
+		Callback *callback;
+		Efunction *efunction;
+		ISupport *isupport;
+		Cmode *cmode;
+		ModDataInfo *moddata;
+		OperClassValidator *validator;
+		ClientCapability *clicap;
+		MessageTagHandler *mtag;
+		HistoryBackend *history_backend;
+	} object;
+} ModuleObject;
+
+/*
+ * What we use to keep track internally of the modules
+*/
+
+#define MODERR_NOERROR 0
+#define MODERR_EXISTS  1
+#define MODERR_NOSPACE 2
+#define MODERR_INVALID 3
+#define MODERR_NOTFOUND 4
+
+extern unsigned int ModuleGetError(Module *module);
+extern const char *ModuleGetErrorStr(Module *module);
+extern unsigned int ModuleGetOptions(Module *module);
+extern unsigned int ModuleSetOptions(Module *module, unsigned int options, int action);
+
+struct Module
+{
+	struct Module *prev, *next;
+	ModuleHeader    *header; /* The module's header */
+#ifdef _WIN32
+	HMODULE dll;		/* Return value of LoadLibrary */
+#else
+	void	*dll;		/* Return value of dlopen */
+#endif	
+	unsigned char flags;    /* 8-bits for flags .. [<- this is misleading, there's mod->flags = .. everywhere] */
+	ModuleChild *children;
+	ModuleObject *objects;
+	ModuleInfo modinfo; /* Used to store handle info for module */
+	unsigned char options;
+	unsigned char errorcode;
+	char *tmp_file;
+	char *relpath;
+	unsigned long mod_sys_version;
+	unsigned int compiler_version;
+};
+/*
+ * Symbol table
+*/
+
+#define MOD_OPT_PERM		0x0001 /* Permanent module (not unloadable) */
+#define MOD_OPT_OFFICIAL	0x0002 /* Official module, do not set "tainted" */
+#define MOD_OPT_PERM_RELOADABLE	0x0004 /* Module is semi-permanent: it can be re-loaded but not un-loaded */
+#define MOD_OPT_GLOBAL		0x0008 /* Module is required to be loaded globally (i.e. across the entire network) */
+#define MOD_Dep(name, container,module) {#name, (vFP *) &container, module}
+
+/** Event structs */
+struct Event {
+	Event		*prev;		/**< Previous event (linked list) */
+	Event		*next;		/**< Next event (linked list) */
+	char		*name;		/**< Name of the event */
+	long		every_msec;	/**< How often we should run this event */
+	long		count;		/**< How many times this event should run (0 = infinite) */
+	vFP		event;		/**< Actual function to call */
+	void		*data;		/**< The data to pass in the function call */
+	struct timeval	last_run;	/**< Last time this event ran */
+	Module		*owner;		/**< To which module this event belongs */
+};
+
+#define EMOD_EVERY 0x0001
+#define EMOD_HOWMANY 0x0002
+#define EMOD_NAME 0x0004
+#define EMOD_EVENT 0x0008
+#define EMOD_DATA 0x0010
+
+/** event struct information, for EventMod() only - see Event for documentation */
+struct EventInfo {
+	int flags;
+	long count;
+	time_t every_msec;
+	char *name;
+	vFP event;
+	void *data;
+};
+
+
+extern MODVAR Hook		*Hooks[MAXHOOKTYPES];
+extern MODVAR Hooktype		Hooktypes[MAXCUSTOMHOOKS];
+extern MODVAR Callback *Callbacks[MAXCALLBACKS], *RCallbacks[MAXCALLBACKS];
+extern MODVAR ClientCapability *clicaps;
+
+extern Event *EventAdd(Module *module, char *name, vFP event, void *data, long every_msec, int count);
+extern Event  *EventDel(Event *event);
+extern Event *EventMarkDel(Event *event);
+extern Event *EventFind(char *name);
+extern int EventMod(Event *event, EventInfo *mods);
+extern void DoEvents(void);
+extern void EventStatus(Client *client);
+extern void SetupEvents(void);
+
+
+extern void    Module_Init(void);
+extern char    *Module_Create(char *path);
+extern char    *Module_TransformPath(char *path_);
+extern void    Init_all_testing_modules(void);
+extern void    Unload_all_loaded_modules(void);
+extern void    Unload_all_testing_modules(void);
+extern int     Module_Unload(char *name);
+extern vFP     Module_Sym(char *name);
+extern vFP     Module_SymX(char *name, Module **mptr);
+extern int	Module_free(Module *mod);
+
+#ifdef __OpenBSD__
+extern void *obsd_dlsym(void *handle, char *symbol);
+#endif
+
+#ifdef _WIN32
+extern const char *our_dlerror(void);
+#endif
+
+extern Versionflag *VersionflagAdd(Module *module, char flag);
+extern void VersionflagDel(Versionflag *vflag, Module *module);
+
+extern ISupport *ISupportAdd(Module *module, const char *token, const char *value);
+extern void ISupportSetValue(ISupport *isupport, const char *value);
+extern void ISupportDel(ISupport *isupport);
+extern ISupport *ISupportFind(const char *token);
+extern void ISupportSet(Module *module, const char *name, const char *value);
+extern void ISupportSetFmt(Module *module, const char *name, FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,3,4)));
+extern void ISupportDelByName(const char *name);
+
+extern ClientCapability *ClientCapabilityFind(const char *token, Client *client);
+extern ClientCapability *ClientCapabilityFindReal(const char *token);
+extern ClientCapability *ClientCapabilityAdd(Module *module, ClientCapabilityInfo *clicap_request, long *cap);
+extern void ClientCapabilityDel(ClientCapability *clicap);
+
+extern MessageTagHandler *MessageTagHandlerFind(const char *token);
+extern MessageTagHandler *MessageTagHandlerAdd(Module *module, MessageTagHandlerInfo *mreq);
+extern void MessageTagHandlerDel(MessageTagHandler *m);
+
+extern HistoryBackend *HistoryBackendFind(const char *name);
+extern HistoryBackend *HistoryBackendAdd(Module *module, HistoryBackendInfo *mreq);
+extern void HistoryBackendDel(HistoryBackend *m);
+
+#ifndef GCC_TYPECHECKING
+#define HookAdd(module, hooktype, priority, func) HookAddMain(module, hooktype, priority, func, NULL, NULL)
+#define HookAddVoid(module, hooktype, priority, func) HookAddMain(module, hooktype, priority, NULL, func, NULL)
+#define HookAddPChar(module, hooktype, priority, func) HookAddMain(module, hooktype, priority, NULL, NULL, func)
+#else
+#define HookAdd(module, hooktype, priority, func) \
+__extension__ ({ \
+	ValidateHooks(hooktype, func); \
+    HookAddMain(module, hooktype, priority, func, NULL, NULL); \
+})
+
+#define HookAddVoid(module, hooktype, priority, func) \
+__extension__ ({ \
+	ValidateHooks(hooktype, func); \
+    HookAddMain(module, hooktype, priority, NULL, func, NULL); \
+})
+
+#define HookAddPChar(module, hooktype, priority, func) \
+__extension__ ({ \
+	ValidateHooks(hooktype, func); \
+    HookAddMain(module, hooktype, priority, NULL, NULL, func); \
+})
+#endif /* GCC_TYPCHECKING */
+
+extern Hook	*HookAddMain(Module *module, int hooktype, int priority, int (*intfunc)(), void (*voidfunc)(), char *(*pcharfunc)());
+extern Hook	*HookDel(Hook *hook);
+
+extern Hooktype *HooktypeAdd(Module *module, char *string, int *type);
+extern void HooktypeDel(Hooktype *hooktype, Module *module);
+
+#define RunHook0(hooktype) do { Hook *h; for (h = Hooks[hooktype]; h; h = h->next)(*(h->func.intfunc))(); } while(0)
+#define RunHook(hooktype,x) do { Hook *h; for (h = Hooks[hooktype]; h; h = h->next) (*(h->func.intfunc))(x); } while(0)
+#define RunHookReturn(hooktype,x,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(x); \
+  if (retval retchk) return; \
+ } \
+}
+#define RunHookReturn2(hooktype,x,y,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(x,y); \
+  if (retval retchk) return; \
+ } \
+}
+#define RunHookReturn3(hooktype,x,y,z,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(x,y,z); \
+  if (retval retchk) return; \
+ } \
+}
+#define RunHookReturn4(hooktype,a,b,c,d,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(a,b,c,d); \
+  if (retval retchk) return; \
+ } \
+}
+#define RunHookReturnInt(hooktype,x,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(x); \
+  if (retval retchk) return retval; \
+ } \
+}
+#define RunHookReturnInt2(hooktype,x,y,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(x,y); \
+  if (retval retchk) return retval; \
+ } \
+}
+#define RunHookReturnInt3(hooktype,x,y,z,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(x,y,z); \
+  if (retval retchk) return retval; \
+ } \
+}
+#define RunHookReturnInt4(hooktype,a,b,c,d,retchk) \
+{ \
+ int retval; \
+ Hook *h; \
+ for (h = Hooks[hooktype]; h; h = h->next) \
+ { \
+  retval = (*(h->func.intfunc))(a,b,c,d); \
+  if (retval retchk) return retval; \
+ } \
+}
+
+#define RunHookReturnVoid(hooktype,x,ret) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) if((*(hook->func.intfunc))(x) ret) return; } while(0)
+#define RunHook2(hooktype,x,y) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(x,y); } while(0)
+#define RunHook3(hooktype,a,b,c) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(a,b,c); } while(0)
+#define RunHook4(hooktype,a,b,c,d) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(a,b,c,d); } while(0)
+#define RunHook5(hooktype,a,b,c,d,e) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(a,b,c,d,e); } while(0)
+#define RunHook6(hooktype,a,b,c,d,e,f) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(a,b,c,d,e,f); } while(0)
+#define RunHook7(hooktype,a,b,c,d,e,f,g) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(a,b,c,d,e,f,g); } while(0)
+#define RunHook8(hooktype,a,b,c,d,e,f,g,h) do { Hook *hook; for (hook = Hooks[hooktype]; hook; hook = hook->next) (*(hook->func.intfunc))(a,b,c,d,e,f,g,h); } while(0)
+
+#define CallbackAdd(cbtype, func) CallbackAddMain(NULL, cbtype, func, NULL, NULL)
+#define CallbackAddEx(module, cbtype, func) CallbackAddMain(module, cbtype, func, NULL, NULL)
+#define CallbackAddVoid(cbtype, func) CallbackAddMain(NULL, cbtype, NULL, func, NULL)
+#define CallbackAddVoidEx(module, cbtype, func) CallbackAddMain(module, cbtype, NULL, func, NULL)
+#define CallbackAddPChar(cbtype, func) CallbackAddMain(NULL, cbtype, NULL, NULL, func)
+#define CallbackAddPCharEx(module, cbtype, func) CallbackAddMain(module, cbtype, NULL, NULL, func)
+
+extern Callback	*CallbackAddMain(Module *module, int cbtype, int (*intfunc)(), void (*voidfunc)(), char *(*pcharfunc)());
+extern Callback	*CallbackDel(Callback *cb);
+
+#define EfunctionAdd(module, cbtype, func) EfunctionAddMain(module, cbtype, func, NULL, NULL, NULL)
+#define EfunctionAddVoid(module, cbtype, func) EfunctionAddMain(module, cbtype, NULL, func, NULL, NULL)
+#define EfunctionAddPVoid(module, cbtype, func) EfunctionAddMain(module, cbtype, NULL, NULL, func, NULL)
+#define EfunctionAddPChar(module, cbtype, func) EfunctionAddMain(module, cbtype, NULL, NULL, NULL, func)
+
+extern Efunction *EfunctionAddMain(Module *module, EfunctionType eftype, int (*intfunc)(), void (*voidfunc)(), void *(*pvoidfunc)(), char *(*pcharfunc)());
+extern Efunction *EfunctionDel(Efunction *cb);
+
+extern Command *CommandAdd(Module *module, char *cmd, CmdFunc func, unsigned char params, int flags);
+extern Command *AliasAdd(Module *module, char *cmd, AliasCmdFunc aliasfunc, unsigned char params, int flags);
+extern void CommandDel(Command *command);
+extern void CommandDelX(Command *command, RealCommand *cmd);
+extern int CommandExists(char *name);
+extern CommandOverride *CommandOverrideAdd(Module *module, char *cmd, OverrideCmdFunc func);
+extern CommandOverride *CommandOverrideAddEx(Module *module, char *name, int priority, OverrideCmdFunc func);
+extern void CommandOverrideDel(CommandOverride *ovr);
+extern void CallCommandOverride(CommandOverride *ovr, Client *client, MessageTag *mtags, int parc, char *parv[]);
+
+extern void moddata_free_client(Client *acptr);
+extern void moddata_free_local_client(Client *acptr);
+extern void moddata_free_channel(Channel *channel);
+extern void moddata_free_member(Member *m);
+extern void moddata_free_membership(Membership *m);
+extern ModDataInfo *findmoddata_byname(char *name, ModDataType type);
+extern int moddata_client_set(Client *acptr, char *varname, char *value);
+extern char *moddata_client_get(Client *acptr, char *varname);
+extern int moddata_local_client_set(Client *acptr, char *varname, char *value);
+extern char *moddata_local_client_get(Client *acptr, char *varname);
+
+extern int LoadPersistentPointerX(ModuleInfo *modinfo, char *varshortname, void **var, void (*free_variable)(ModData *m));
+#define LoadPersistentPointer(modinfo, var, free_variable) LoadPersistentPointerX(modinfo, #var, (void **)&var, free_variable)
+extern void SavePersistentPointerX(ModuleInfo *modinfo, char *varshortname, void *var);
+#define SavePersistentPointer(modinfo, var) SavePersistentPointerX(modinfo, #var, var)
+
+extern int LoadPersistentIntX(ModuleInfo *modinfo, char *varshortname, int *var);
+#define LoadPersistentInt(modinfo, var) LoadPersistentIntX(modinfo, #var, &var)
+extern void SavePersistentIntX(ModuleInfo *modinfo, char *varshortname, int var);
+#define SavePersistentInt(modinfo, var) SavePersistentIntX(modinfo, #var, var)
+
+extern int LoadPersistentLongX(ModuleInfo *modinfo, char *varshortname, long *var);
+#define LoadPersistentLong(modinfo, var) LoadPersistentIntX(modinfo, #var, &var)
+extern void SavePersistentLongX(ModuleInfo *modinfo, char *varshortname, long var);
+#define SavePersistentLong(modinfo, var) SavePersistentLongX(modinfo, #var, var)
+
+/* Hook types */
+#define HOOKTYPE_LOCAL_QUIT	1
+#define HOOKTYPE_LOCAL_NICKCHANGE 2
+#define HOOKTYPE_LOCAL_CONNECT 3
+#define HOOKTYPE_REHASHFLAG 4
+#define HOOKTYPE_PRE_LOCAL_PART 5
+#define HOOKTYPE_CONFIGPOSTTEST 6
+#define HOOKTYPE_REHASH 7
+#define HOOKTYPE_PRE_LOCAL_CONNECT 8
+#define HOOKTYPE_PRE_LOCAL_QUIT 9
+#define HOOKTYPE_SERVER_CONNECT 11
+#define HOOKTYPE_SERVER_QUIT 12
+#define HOOKTYPE_STATS 13
+#define HOOKTYPE_LOCAL_JOIN 14
+#define HOOKTYPE_CONFIGTEST 15
+#define HOOKTYPE_CONFIGRUN 16
+/* If you ever change the number of usermsg & chanmsg, notify Syzop first, kthx! ;p */
+#define HOOKTYPE_USERMSG 17
+#define HOOKTYPE_CHANMSG 18
+#define HOOKTYPE_LOCAL_PART 19
+#define HOOKTYPE_LOCAL_KICK 20
+#define HOOKTYPE_LOCAL_CHANMODE 21
+#define HOOKTYPE_LOCAL_TOPIC 22
+#define HOOKTYPE_LOCAL_OPER 23
+#define HOOKTYPE_UNKUSER_QUIT 24
+#define HOOKTYPE_LOCAL_PASS 25
+#define HOOKTYPE_REMOTE_CONNECT 26
+#define HOOKTYPE_REMOTE_QUIT 27
+#define HOOKTYPE_PRE_LOCAL_JOIN 28
+#define HOOKTYPE_PRE_LOCAL_KICK 29
+#define HOOKTYPE_PRE_LOCAL_TOPIC 30
+#define HOOKTYPE_REMOTE_NICKCHANGE 31
+#define HOOKTYPE_CHANNEL_CREATE 32
+#define HOOKTYPE_CHANNEL_DESTROY 33
+#define HOOKTYPE_REMOTE_CHANMODE 34
+#define HOOKTYPE_TKL_EXCEPT 35
+#define HOOKTYPE_UMODE_CHANGE 36
+#define HOOKTYPE_TOPIC 37
+#define HOOKTYPE_REHASH_COMPLETE 38
+#define HOOKTYPE_TKL_ADD 39
+#define HOOKTYPE_TKL_DEL 40
+#define HOOKTYPE_LOCAL_KILL 41
+#define HOOKTYPE_LOG 42
+#define HOOKTYPE_REMOTE_JOIN 43
+#define HOOKTYPE_REMOTE_PART 44
+#define HOOKTYPE_REMOTE_KICK 45
+#define HOOKTYPE_LOCAL_SPAMFILTER 46
+#define HOOKTYPE_SILENCED 47
+#define HOOKTYPE_POST_SERVER_CONNECT 48
+#define HOOKTYPE_RAWPACKET_IN 49
+#define HOOKTYPE_PACKET 51
+#define HOOKTYPE_HANDSHAKE 52
+#define HOOKTYPE_AWAY 53
+#define HOOKTYPE_INVITE 55
+#define HOOKTYPE_CAN_JOIN 56
+#define HOOKTYPE_CAN_SEND_TO_CHANNEL 57
+#define HOOKTYPE_CAN_KICK 58
+#define HOOKTYPE_FREE_CLIENT 59
+#define HOOKTYPE_FREE_USER 60
+#define HOOKTYPE_PRE_CHANMSG 61
+#define HOOKTYPE_KNOCK 63
+#define HOOKTYPE_MODECHAR_ADD 64
+#define HOOKTYPE_MODECHAR_DEL 65
+#define HOOKTYPE_CAN_JOIN_LIMITEXCEEDED 67
+#define HOOKTYPE_VISIBLE_IN_CHANNEL 68
+#define HOOKTYPE_PRE_LOCAL_CHANMODE 69
+#define HOOKTYPE_PRE_REMOTE_CHANMODE 70
+#define HOOKTYPE_JOIN_DATA 71
+#define HOOKTYPE_PRE_KNOCK 72
+#define HOOKTYPE_PRE_INVITE 73
+#define HOOKTYPE_OPER_INVITE_BAN 74
+#define HOOKTYPE_VIEW_TOPIC_OUTSIDE_CHANNEL 75
+#define HOOKTYPE_CHAN_PERMIT_NICK_CHANGE 76
+#define HOOKTYPE_IS_CHANNEL_SECURE 77
+#define HOOKTYPE_SEND_CHANNEL 78
+#define HOOKTYPE_CHANNEL_SYNCED 79
+#define HOOKTYPE_CAN_SAJOIN 80
+#define HOOKTYPE_WHOIS 81
+#define HOOKTYPE_CHECK_INIT 82
+#define HOOKTYPE_WHO_STATUS 83
+#define HOOKTYPE_MODE_DEOP 84
+#define HOOKTYPE_PRE_KILL 85
+#define HOOKTYPE_SEE_CHANNEL_IN_WHOIS 86
+#define HOOKTYPE_DCC_DENIED 87
+#define HOOKTYPE_SERVER_HANDSHAKE_OUT 88
+#define HOOKTYPE_SERVER_SYNCED	89
+#define HOOKTYPE_SECURE_CONNECT 90
+#define HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION 91
+#define HOOKTYPE_REQUIRE_SASL 92
+#define HOOKTYPE_SASL_CONTINUATION 93
+#define HOOKTYPE_SASL_RESULT 94
+#define HOOKTYPE_PLACE_HOST_BAN 95
+#define HOOKTYPE_FIND_TKLINE_MATCH 96
+#define HOOKTYPE_WELCOME 97
+#define HOOKTYPE_PRE_COMMAND 98
+#define HOOKTYPE_POST_COMMAND 99
+#define HOOKTYPE_NEW_MESSAGE 100
+#define HOOKTYPE_IS_HANDSHAKE_FINISHED 101
+#define HOOKTYPE_PRE_LOCAL_QUIT_CHAN 102
+#define HOOKTYPE_IDENT_LOOKUP 103
+#define HOOKTYPE_CONFIGRUN_EX 104
+#define HOOKTYPE_CAN_SEND_TO_USER 105
+#define HOOKTYPE_SERVER_SYNC 106
+#define HOOKTYPE_ACCOUNT_LOGIN 107
+
+/* Adding a new hook here?
+ * 1) Add the #define HOOKTYPE_.... with a new number
+ * 2) Add a hook prototype (see below)
+ * 3) Add type checking (even more below)
+ * 4) Document the hook at https://www.unrealircd.org/docs/Dev:Hook_API
+ */
+
+/* Hook prototypes */
+int hooktype_local_connect(Client *client);
+int hooktype_remote_connect(Client *client);
+int hooktype_server_connect(Client *client);
+int hooktype_server_sync(Client *client);
+int hooktype_post_server_connect(Client *client);
+char *hooktype_pre_local_quit(Client *client, char *comment);
+int hooktype_local_quit(Client *client, MessageTag *mtags, char *comment);
+int hooktype_remote_quit(Client *client, MessageTag *mtags, char *comment);
+int hooktype_unkuser_quit(Client *client, MessageTag *mtags, char *comment);
+int hooktype_pre_local_connect(Client *client);
+int hooktype_server_quit(Client *client, MessageTag *mtags);
+int hooktype_local_nickchange(Client *client, char *newnick);
+int hooktype_remote_nickchange(Client *client, char *newnick);
+int hooktype_can_join(Client *client, Channel *channel, char *key, char *parv[]);
+int hooktype_pre_local_join(Client *client, Channel *channel, char *parv[]);
+int hooktype_local_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[]);
+int hooktype_remote_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[]);
+char *hooktype_pre_local_part(Client *client, Channel *channel, char *comment);
+int hooktype_local_part(Client *client, Channel *channel, MessageTag *mtags, char *comment);
+int hooktype_remote_part(Client *client, Channel *channel, MessageTag *mtags, char *comment);
+char *hooktype_pre_local_kick(Client *client, Client *victim, Channel *channel, char *comment);
+int hooktype_can_kick(Client *client, Client *victim, Channel *channel, char *comment, long client_flags, long victim_flags, char **error);
+int hooktype_local_kick(Client *client, Client *victim, Channel *channel, MessageTag *mtags, char *comment);
+int hooktype_remote_kick(Client *client, Client *victim, Channel *channel, MessageTag *mtags, char *comment);
+char *hooktype_pre_usermsg(Client *client, Client *to, char *text, int notice);
+int hooktype_usermsg(Client *client, Client *to, MessageTag *mtags, char *text, int notice);
+int hooktype_can_send_to_channel(Client *client, Channel *channel, Membership *member, char **text, char **errmsg, int notice);
+int hooktype_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+int hooktype_pre_chanmsg(Client *client, Channel *channel, MessageTag *mtags, char *text, int notice);
+int hooktype_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice);
+char *hooktype_pre_local_topic(Client *client, Channel *channel, char *topic);
+int hooktype_local_topic(Client *client, Channel *channel, char *topic);
+int hooktype_topic(Client *client, Channel *channel, MessageTag *mtags, char *topic);
+int hooktype_pre_local_chanmode(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode);
+int hooktype_pre_remote_chanmode(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode);
+int hooktype_local_chanmode(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode);
+int hooktype_remote_chanmode(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode);
+int hooktype_modechar_del(Channel *channel, int modechar);
+int hooktype_modechar_add(Channel *channel, int modechar);
+int hooktype_away(Client *client, MessageTag *mtags, char *reason);
+int hooktype_pre_invite(Client *client, Client *acptr, Channel *channel, int *override);
+int hooktype_invite(Client *from, Client *to, Channel *channel, MessageTag *mtags);
+int hooktype_pre_knock(Client *client, Channel *channel);
+int hooktype_knock(Client *client, Channel *channel, MessageTag *mtags, char *comment);
+int hooktype_whois(Client *client, Client *target);
+int hooktype_who_status(Client *client, Client *target, Channel *channel, Member *member, char *status, int cansee);
+int hooktype_pre_kill(Client *client, Client *victim, char *killpath);
+int hooktype_local_kill(Client *client, Client *victim, char *comment);
+int hooktype_rehashflag(Client *client, char *str);
+int hooktype_configposttest(int *errors);
+int hooktype_rehash(void);
+int hooktype_stats(Client *client, char *str);
+int hooktype_configtest(ConfigFile *cfptr, ConfigEntry *ce, int section, int *errors);
+int hooktype_configrun(ConfigFile *cfptr, ConfigEntry *ce, int section);
+int hooktype_configrun_ex(ConfigFile *cfptr, ConfigEntry *ce, int section, void *ptr);
+int hooktype_local_oper(Client *client, int add);
+int hooktype_local_pass(Client *client, char *password);
+int hooktype_channel_create(Client *client, Channel *channel);
+int hooktype_channel_destroy(Channel *channel, int *should_destroy);
+int hooktype_tkl_except(Client *cptr, int ban_type);
+int hooktype_umode_change(Client *client, long setflags, long newflags);
+int hooktype_rehash_complete(void);
+int hooktype_tkl_add(Client *client, TKL *tkl);
+int hooktype_tkl_del(Client *client, TKL *tkl);
+int hooktype_log(int flags, char *timebuf, char *buf);
+int hooktype_local_spamfilter(Client *acptr, char *str, char *str_in, int type, char *target, TKL *tkl);
+int hooktype_silenced(Client *client, Client *to, int notice);
+int hooktype_rawpacket_in(Client *client, char *readbuf, int *length);
+int hooktype_packet(Client *from, Client *to, Client *intended_to, char **msg, int *length);
+int hooktype_handshake(Client *client);
+int hooktype_free_client(Client *acptr);
+int hooktype_free_user(Client *acptr);
+int hooktype_can_join_limitexceeded(Client *client, Channel *channel, char *key, char *parv[]);
+int hooktype_visible_in_channel(Client *client, Channel *channel);
+int hooktype_join_data(Client *who, Channel *channel);
+int hooktype_oper_invite_ban(Client *client, Channel *channel);
+int hooktype_view_topic_outside_channel(Client *client, Channel *channel);
+int hooktype_chan_permit_nick_change(Client *client, Channel *channel);
+int hooktype_is_channel_secure(Channel *channel);
+int hooktype_can_send_to_channel_secure(Client *client, Channel *channel);
+int hooktype_channel_synced(Channel *channel, int merge, int removetheirs, int nomode);
+int hooktype_can_sajoin(Client *target, Channel *channel, Client *client);
+int hooktype_check_init(Client *cptr, char *sockname, size_t size);
+int hooktype_mode_deop(Client *client, Client *victim, Channel *channel, u_int what, int modechar, long my_access, char **badmode);
+int hooktype_see_channel_in_whois(Client *client, Client *target, Channel *channel);
+int hooktype_dcc_denied(Client *client, char *target, char *realfile, char *displayfile, ConfigItem_deny_dcc *denydcc);
+int hooktype_server_handshake_out(Client *client);
+int hooktype_server_synced(Client *client);
+int hooktype_secure_connect(Client *client);
+int hooktype_can_bypass_channel_message_restriction(Client *client, Channel *channel, BypassChannelMessageRestrictionType bypass_type);
+int hooktype_require_sasl(Client *client, char *reason);
+int hooktype_sasl_continuation(Client *client, char *buf);
+int hooktype_sasl_result(Client *client, int success);
+int hooktype_place_host_ban(Client *client, int action, char *reason, long duration);
+int hooktype_find_tkline_match(Client *client, TKL *tk);
+int hooktype_welcome(Client *client, int after_numeric);
+int hooktype_pre_command(Client *from, MessageTag *mtags, char *buf);
+int hooktype_post_command(Client *from, MessageTag *mtags, char *buf);
+void hooktype_new_message(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature);
+int hooktype_is_handshake_finished(Client *acptr);
+char *hooktype_pre_local_quit_chan(Client *client, Channel *channel, char *comment);
+int hooktype_ident_lookup(Client *acptr);
+int hooktype_account_login(Client *client, MessageTag *mtags);
+
+#ifdef GCC_TYPECHECKING
+#define ValidateHook(validatefunc, func) __builtin_types_compatible_p(__typeof__(func), __typeof__(validatefunc))
+
+_UNREAL_ERROR(_hook_error_incompatible, "Incompatible hook function. Check arguments and return type of function.")
+
+#define ValidateHooks(hooktype, func) \
+    if (((hooktype == HOOKTYPE_LOCAL_QUIT) && !ValidateHook(hooktype_local_quit, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_NICKCHANGE) && !ValidateHook(hooktype_local_nickchange, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_CONNECT) && !ValidateHook(hooktype_local_connect, func)) || \
+        ((hooktype == HOOKTYPE_REHASHFLAG) && !ValidateHook(hooktype_rehashflag, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_PART) && !ValidateHook(hooktype_pre_local_part, func)) || \
+        ((hooktype == HOOKTYPE_CONFIGPOSTTEST) && !ValidateHook(hooktype_configposttest, func)) || \
+        ((hooktype == HOOKTYPE_REHASH) && !ValidateHook(hooktype_rehash, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_CONNECT) && !ValidateHook(hooktype_pre_local_connect, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_QUIT) && !ValidateHook(hooktype_pre_local_quit, func)) || \
+        ((hooktype == HOOKTYPE_SERVER_CONNECT) && !ValidateHook(hooktype_server_connect, func)) || \
+        ((hooktype == HOOKTYPE_SERVER_SYNC) && !ValidateHook(hooktype_server_sync, func)) || \
+        ((hooktype == HOOKTYPE_SERVER_QUIT) && !ValidateHook(hooktype_server_quit, func)) || \
+        ((hooktype == HOOKTYPE_STATS) && !ValidateHook(hooktype_stats, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_JOIN) && !ValidateHook(hooktype_local_join, func)) || \
+        ((hooktype == HOOKTYPE_CONFIGTEST) && !ValidateHook(hooktype_configtest, func)) || \
+        ((hooktype == HOOKTYPE_CONFIGRUN) && !ValidateHook(hooktype_configrun, func)) || \
+        ((hooktype == HOOKTYPE_USERMSG) && !ValidateHook(hooktype_usermsg, func)) || \
+        ((hooktype == HOOKTYPE_CHANMSG) && !ValidateHook(hooktype_chanmsg, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_PART) && !ValidateHook(hooktype_local_part, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_KICK) && !ValidateHook(hooktype_local_kick, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_CHANMODE) && !ValidateHook(hooktype_local_chanmode, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_TOPIC) && !ValidateHook(hooktype_local_topic, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_OPER) && !ValidateHook(hooktype_local_oper, func)) || \
+        ((hooktype == HOOKTYPE_UNKUSER_QUIT) && !ValidateHook(hooktype_unkuser_quit, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_PASS) && !ValidateHook(hooktype_local_pass, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_CONNECT) && !ValidateHook(hooktype_remote_connect, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_QUIT) && !ValidateHook(hooktype_remote_quit, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_JOIN) && !ValidateHook(hooktype_pre_local_join, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_KICK) && !ValidateHook(hooktype_pre_local_kick, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_TOPIC) && !ValidateHook(hooktype_pre_local_topic, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_NICKCHANGE) && !ValidateHook(hooktype_remote_nickchange, func)) || \
+        ((hooktype == HOOKTYPE_CHANNEL_CREATE) && !ValidateHook(hooktype_channel_create, func)) || \
+        ((hooktype == HOOKTYPE_CHANNEL_DESTROY) && !ValidateHook(hooktype_channel_destroy, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_CHANMODE) && !ValidateHook(hooktype_remote_chanmode, func)) || \
+        ((hooktype == HOOKTYPE_TKL_EXCEPT) && !ValidateHook(hooktype_tkl_except, func)) || \
+        ((hooktype == HOOKTYPE_UMODE_CHANGE) && !ValidateHook(hooktype_umode_change, func)) || \
+        ((hooktype == HOOKTYPE_TOPIC) && !ValidateHook(hooktype_topic, func)) || \
+        ((hooktype == HOOKTYPE_REHASH_COMPLETE) && !ValidateHook(hooktype_rehash_complete, func)) || \
+        ((hooktype == HOOKTYPE_TKL_ADD) && !ValidateHook(hooktype_tkl_add, func)) || \
+        ((hooktype == HOOKTYPE_TKL_DEL) && !ValidateHook(hooktype_tkl_del, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_KILL) && !ValidateHook(hooktype_local_kill, func)) || \
+        ((hooktype == HOOKTYPE_LOG) && !ValidateHook(hooktype_log, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_JOIN) && !ValidateHook(hooktype_remote_join, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_PART) && !ValidateHook(hooktype_remote_part, func)) || \
+        ((hooktype == HOOKTYPE_REMOTE_KICK) && !ValidateHook(hooktype_remote_kick, func)) || \
+        ((hooktype == HOOKTYPE_LOCAL_SPAMFILTER) && !ValidateHook(hooktype_local_spamfilter, func)) || \
+        ((hooktype == HOOKTYPE_SILENCED) && !ValidateHook(hooktype_silenced, func)) || \
+        ((hooktype == HOOKTYPE_POST_SERVER_CONNECT) && !ValidateHook(hooktype_post_server_connect, func)) || \
+        ((hooktype == HOOKTYPE_RAWPACKET_IN) && !ValidateHook(hooktype_rawpacket_in, func)) || \
+        ((hooktype == HOOKTYPE_PACKET) && !ValidateHook(hooktype_packet, func)) || \
+        ((hooktype == HOOKTYPE_HANDSHAKE) && !ValidateHook(hooktype_handshake, func)) || \
+        ((hooktype == HOOKTYPE_AWAY) && !ValidateHook(hooktype_away, func)) || \
+        ((hooktype == HOOKTYPE_INVITE) && !ValidateHook(hooktype_invite, func)) || \
+        ((hooktype == HOOKTYPE_CAN_JOIN) && !ValidateHook(hooktype_can_join, func)) || \
+        ((hooktype == HOOKTYPE_CAN_SEND_TO_CHANNEL) && !ValidateHook(hooktype_can_send_to_channel, func)) || \
+        ((hooktype == HOOKTYPE_CAN_SEND_TO_USER) && !ValidateHook(hooktype_can_send_to_user, func)) || \
+        ((hooktype == HOOKTYPE_CAN_KICK) && !ValidateHook(hooktype_can_kick, func)) || \
+        ((hooktype == HOOKTYPE_FREE_CLIENT) && !ValidateHook(hooktype_free_client, func)) || \
+        ((hooktype == HOOKTYPE_FREE_USER) && !ValidateHook(hooktype_free_user, func)) || \
+        ((hooktype == HOOKTYPE_PRE_CHANMSG) && !ValidateHook(hooktype_pre_chanmsg, func)) || \
+        ((hooktype == HOOKTYPE_KNOCK) && !ValidateHook(hooktype_knock, func)) || \
+        ((hooktype == HOOKTYPE_MODECHAR_ADD) && !ValidateHook(hooktype_modechar_add, func)) || \
+        ((hooktype == HOOKTYPE_MODECHAR_DEL) && !ValidateHook(hooktype_modechar_del, func)) || \
+        ((hooktype == HOOKTYPE_CAN_JOIN_LIMITEXCEEDED) && !ValidateHook(hooktype_can_join_limitexceeded, func)) || \
+        ((hooktype == HOOKTYPE_VISIBLE_IN_CHANNEL) && !ValidateHook(hooktype_visible_in_channel, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_CHANMODE) && !ValidateHook(hooktype_pre_local_chanmode, func)) || \
+        ((hooktype == HOOKTYPE_PRE_REMOTE_CHANMODE) && !ValidateHook(hooktype_pre_remote_chanmode, func)) || \
+        ((hooktype == HOOKTYPE_JOIN_DATA) && !ValidateHook(hooktype_join_data, func)) || \
+        ((hooktype == HOOKTYPE_PRE_KNOCK) && !ValidateHook(hooktype_pre_knock, func)) || \
+        ((hooktype == HOOKTYPE_PRE_INVITE) && !ValidateHook(hooktype_pre_invite, func)) || \
+        ((hooktype == HOOKTYPE_OPER_INVITE_BAN) && !ValidateHook(hooktype_oper_invite_ban, func)) || \
+        ((hooktype == HOOKTYPE_VIEW_TOPIC_OUTSIDE_CHANNEL) && !ValidateHook(hooktype_view_topic_outside_channel, func)) || \
+        ((hooktype == HOOKTYPE_CHAN_PERMIT_NICK_CHANGE) && !ValidateHook(hooktype_chan_permit_nick_change, func)) || \
+        ((hooktype == HOOKTYPE_IS_CHANNEL_SECURE) && !ValidateHook(hooktype_is_channel_secure, func)) || \
+        ((hooktype == HOOKTYPE_SEND_CHANNEL) && !ValidateHook(hooktype_can_send_to_channel_secure, func)) || \
+        ((hooktype == HOOKTYPE_CHANNEL_SYNCED) && !ValidateHook(hooktype_channel_synced, func)) || \
+        ((hooktype == HOOKTYPE_CAN_SAJOIN) && !ValidateHook(hooktype_can_sajoin, func)) || \
+        ((hooktype == HOOKTYPE_WHOIS) && !ValidateHook(hooktype_whois, func)) || \
+        ((hooktype == HOOKTYPE_CHECK_INIT) && !ValidateHook(hooktype_check_init, func)) || \
+        ((hooktype == HOOKTYPE_WHO_STATUS) && !ValidateHook(hooktype_who_status, func)) || \
+        ((hooktype == HOOKTYPE_MODE_DEOP) && !ValidateHook(hooktype_mode_deop, func)) || \
+        ((hooktype == HOOKTYPE_PRE_KILL) && !ValidateHook(hooktype_pre_kill, func)) || \
+        ((hooktype == HOOKTYPE_SEE_CHANNEL_IN_WHOIS) && !ValidateHook(hooktype_see_channel_in_whois, func)) || \
+        ((hooktype == HOOKTYPE_DCC_DENIED) && !ValidateHook(hooktype_dcc_denied, func)) || \
+        ((hooktype == HOOKTYPE_SERVER_HANDSHAKE_OUT) && !ValidateHook(hooktype_server_handshake_out, func)) || \
+        ((hooktype == HOOKTYPE_SERVER_SYNCED) && !ValidateHook(hooktype_server_synced, func)) || \
+        ((hooktype == HOOKTYPE_SECURE_CONNECT) && !ValidateHook(hooktype_secure_connect, func)) || \
+        ((hooktype == HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION) && !ValidateHook(hooktype_can_bypass_channel_message_restriction, func)) || \
+        ((hooktype == HOOKTYPE_REQUIRE_SASL) && !ValidateHook(hooktype_require_sasl, func)) || \
+        ((hooktype == HOOKTYPE_SASL_CONTINUATION) && !ValidateHook(hooktype_sasl_continuation, func)) || \
+        ((hooktype == HOOKTYPE_SASL_RESULT) && !ValidateHook(hooktype_sasl_result, func)) || \
+        ((hooktype == HOOKTYPE_PLACE_HOST_BAN) && !ValidateHook(hooktype_place_host_ban, func)) || \
+        ((hooktype == HOOKTYPE_FIND_TKLINE_MATCH) && !ValidateHook(hooktype_find_tkline_match, func)) || \
+        ((hooktype == HOOKTYPE_WELCOME) && !ValidateHook(hooktype_welcome, func)) || \
+        ((hooktype == HOOKTYPE_PRE_COMMAND) && !ValidateHook(hooktype_pre_command, func)) || \
+        ((hooktype == HOOKTYPE_POST_COMMAND) && !ValidateHook(hooktype_post_command, func)) || \
+        ((hooktype == HOOKTYPE_NEW_MESSAGE) && !ValidateHook(hooktype_new_message, func)) || \
+        ((hooktype == HOOKTYPE_IS_HANDSHAKE_FINISHED) && !ValidateHook(hooktype_is_handshake_finished, func)) || \
+        ((hooktype == HOOKTYPE_PRE_LOCAL_QUIT_CHAN) && !ValidateHook(hooktype_pre_local_quit_chan, func)) || \
+        ((hooktype == HOOKTYPE_IDENT_LOOKUP) && !ValidateHook(hooktype_ident_lookup, func)) || \
+        ((hooktype == HOOKTYPE_CONFIGRUN_EX) && !ValidateHook(hooktype_configrun_ex, func)) || \
+        ((hooktype == HOOKTYPE_ACCOUNT_LOGIN) && !ValidateHook(hooktype_account_login, func)) ) \
+        _hook_error_incompatible();
+#endif /* GCC_TYPECHECKING */
+
+/* Hook return values */
+#define HOOK_CONTINUE 0
+#define HOOK_ALLOW -1
+#define HOOK_DENY 1
+
+/* Callback types */
+#define CALLBACKTYPE_CLOAK 1
+#define CALLBACKTYPE_CLOAKKEYCSUM 2
+#define CALLBACKTYPE_CLOAK_EX 3
+#define CALLBACKTYPE_BLACKLIST_CHECK 4
+#define CALLBACKTYPE_REPUTATION_STARTTIME 5
+
+/* To add a new efunction, only if you are an UnrealIRCd coder:
+ * 1) Add a new entry here
+ * 2) Add the function in src/api-efunctions.c
+ * 3) Add the initalization in src/api-efunctions.c
+ * 4) Add the extern entry in include/h.h in the
+ *    section marked "Efuncs"
+ */
+/** Efunction types. */
+enum EfunctionType {
+	EFUNC_DO_JOIN=1,
+	EFUNC_JOIN_CHANNEL,
+	EFUNC_CAN_JOIN,
+	EFUNC_DO_MODE,
+	EFUNC_SET_MODE,
+	EFUNC_CMD_UMODE,
+	EFUNC_REGISTER_USER,
+	EFUNC_TKL_HASH,
+	EFUNC_TKL_TYPETOCHAR,
+	EFUNC_TKL_ADD_SERVERBAN,
+	EFUNC_TKL_DEL_LINE,
+	EFUNC_TKL_CHECK_LOCAL_REMOVE_SHUN,
+	EFUNC_TKL_EXPIRE,
+	EFUNC_TKL_CHECK_EXPIRE,
+	EFUNC_FIND_TKLINE_MATCH,
+	EFUNC_FIND_SHUN,
+	EFUNC_FIND_SPAMFILTER_USER,
+	EFUNC_FIND_QLINE,
+	EFUNC_FIND_TKLINE_MATCH_ZAP,
+	EFUNC_TKL_STATS,
+	EFUNC_TKL_SYNCH,
+	EFUNC_CMD_TKL,
+	EFUNC_PLACE_HOST_BAN,
+	EFUNC_DOSPAMFILTER,
+	EFUNC_DOSPAMFILTER_VIRUSCHAN,
+	EFUNC_FIND_TKLINE_MATCH_ZAP_EX,
+	EFUNC_SEND_LIST,
+	EFUNC_STRIPCOLORS,
+	EFUNC_STRIPCONTROLCODES,
+	EFUNC_SPAMFILTER_BUILD_USER_STRING,
+	EFUNC_SEND_PROTOCTL_SERVERS,
+	EFUNC_VERIFY_LINK,
+	EFUNC_SEND_SERVER_MESSAGE,
+	EFUNC_BROADCAST_MD_CLIENT,
+	EFUNC_BROADCAST_MD_CHANNEL,
+	EFUNC_BROADCAST_MD_MEMBER,
+	EFUNC_BROADCAST_MD_MEMBERSHIP,
+	EFUNC_CHECK_BANNED,
+	EFUNC_INTRODUCE_USER,
+	EFUNC_CHECK_DENY_VERSION,
+	EFUNC_BROADCAST_MD_CLIENT_CMD,
+	EFUNC_BROADCAST_MD_CHANNEL_CMD,
+	EFUNC_BROADCAST_MD_MEMBER_CMD,
+	EFUNC_BROADCAST_MD_MEMBERSHIP_CMD,
+	EFUNC_SEND_MODDATA_CLIENT,
+	EFUNC_SEND_MODDATA_CHANNEL,
+	EFUNC_SEND_MODDATA_MEMBERS,
+	EFUNC_BROADCAST_MODDATA_CLIENT,
+	EFUNC_MATCH_USER,
+	EFUNC_USERHOST_SAVE_CURRENT,
+	EFUNC_USERHOST_CHANGED,
+	EFUNC_SEND_JOIN_TO_LOCAL_USERS,
+	EFUNC_DO_NICK_NAME,
+	EFUNC_DO_REMOTE_NICK_NAME,
+	EFUNC_CHARSYS_GET_CURRENT_LANGUAGES,
+	EFUNC_BROADCAST_SINFO,
+	EFUNC_PARSE_MESSAGE_TAGS,
+	EFUNC_MTAGS_TO_STRING,
+	EFUNC_TKL_CHARTOTYPE,
+	EFUNC_TKL_TYPE_STRING,
+	EFUNC_CAN_SEND_TO_CHANNEL,
+	EFUNC_CAN_SEND_TO_USER,
+	EFUNC_BROADCAST_MD_GLOBALVAR,
+	EFUNC_BROADCAST_MD_GLOBALVAR_CMD,
+	EFUNC_TKL_IP_HASH,
+	EFUNC_TKL_IP_HASH_TYPE,
+	EFUNC_TKL_ADD_BANEXCEPTION,
+	EFUNC_TKL_ADD_NAMEBAN,
+	EFUNC_TKL_ADD_SPAMFILTER,
+	EFUNC_SENDNOTICE_TKL_ADD,
+	EFUNC_SENDNOTICE_TKL_DEL,
+	EFUNC_FREE_TKL,
+	EFUNC_FIND_TKL_SERVERBAN,
+	EFUNC_FIND_TKL_BANEXCEPTION,
+	EFUNC_FIND_TKL_NAMEBAN,
+	EFUNC_FIND_TKL_SPAMFILTER,
+	EFUNC_FIND_TKL_EXCEPTION,
+	EFUNC_ADD_SILENCE,
+	EFUNC_DEL_SILENCE,
+	EFUNC_IS_SILENCED,
+	EFUNC_LABELED_RESPONSE_SAVE_CONTEXT,
+	EFUNC_LABELED_RESPONSE_SET_CONTEXT,
+	EFUNC_LABELED_RESPONSE_FORCE_END,
+	EFUNC_KICK_USER,
+};
+
+/* Module flags */
+#define MODFLAG_NONE	0x0000
+#define MODFLAG_LOADED	0x0001 /* Fully loaded */
+#define MODFLAG_TESTING 0x0002 /* Not yet initialized */
+#define MODFLAG_INIT	0x0004 /* Initialized */
+#define MODFLAG_DELAYED 0x0008 /* Delayed unload */
+
+/* Module function return values */
+#define MOD_SUCCESS 0
+#define MOD_FAILED -1
+#define MOD_DELAY 2
+
+#define CONFIG_MAIN 1
+#define CONFIG_SET 2
+#define CONFIG_BAN 3
+#define CONFIG_EXCEPT 4
+#define CONFIG_DENY 5
+#define CONFIG_ALLOW 6
+#define CONFIG_CLOAKKEYS 7
+#define CONFIG_SET_ANTI_FLOOD 8
+#define CONFIG_REQUIRE 9
+#define CONFIG_LISTEN 10
+#define CONFIG_LISTEN_OPTIONS 11
+
+#define MOD_HEADER Mod_Header
+#define MOD_TEST() DLLFUNC int Mod_Test(ModuleInfo *modinfo)
+#define MOD_INIT() DLLFUNC int Mod_Init(ModuleInfo *modinfo)
+#define MOD_LOAD() DLLFUNC int Mod_Load(ModuleInfo *modinfo)
+#define MOD_UNLOAD() DLLFUNC int Mod_Unload(ModuleInfo *modinfo)
+
+#define CLOAK_KEYCRC	RCallbacks[CALLBACKTYPE_CLOAKKEYCSUM] != NULL ? RCallbacks[CALLBACKTYPE_CLOAKKEYCSUM]->func.pcharfunc() : "nil"
+
+#ifdef DYNAMIC_LINKING
+ #include "modversion.h"
+#endif
+
+#endif
+
diff --git a/include/modversion.h b/include/modversion.h
new file mode 100644
index 0000000..0de6b7c
--- /dev/null
+++ b/include/modversion.h
@@ -0,0 +1,68 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/modversion.h
+ *   (C) 2004-2005 Bram Matthys and The UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#include "version.h"
+
+/* What all this is for? Well, it's simple...
+ * Example: When someone compiles a module with ssl support, but the
+ * core was not compiled with ssl support, then the module will read
+ * things incorrect in the struct because the module sees an extra
+ * field half-way the struct but in the core that field does not exist,
+ * hence all data is shifted 4 bytes causing all kinds of odd crashes,
+ * memory corruption, and weird problems.
+ * This is an attempt to prevent this a bit, but there are a lot more
+ * options that cause binary incompatability (eg: changing nicklen),
+ * we just take the most common ones...
+ *
+ * NOTE: On win32 we allow ssl inconsistencies because we
+ *       explicitly use "padding" in the structs: we add a useless
+ *       placeholder so everything is still aligned correctly.
+ *       In the process of doing so, we waste several bytes per-user,
+ *       but this prevents (most) binary incompatability problems
+ *       making it easier for module coders to ship dll's.
+ */
+ #ifndef _WIN32
+  #define MYTOKEN_SSL "/SSL"
+ #else
+  #define MYTOKEN_SSL ""
+ #endif
+ #define MYTOKEN_NEWCHF "/NOCHF"
+
+#ifdef __GNUC__
+ #if defined(__GNUC_PATCHLEVEL__)
+  #define GCCVER ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8) + __GNUC_PATCHLEVEL__)
+ #else
+  #define GCCVER ((__GNUC__ << 16) + (__GNUC_MINOR__ << 8))
+ #endif
+#else
+ #define GCCVER 0
+#endif
+  
+
+#ifdef UNREALCORE
+  char our_mod_version[] = BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
+                               MYTOKEN_SSL MYTOKEN_NEWCHF;
+  unsigned int our_compiler_version = GCCVER;
+#else
+  DLLFUNC char Mod_Version[] = BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH6 PATCH7 PATCH8 PATCH9 \
+                               MYTOKEN_SSL MYTOKEN_NEWCHF;
+  DLLFUNC unsigned int compiler_version = GCCVER;
+#endif
diff --git a/include/msg.h b/include/msg.h
new file mode 100644
index 0000000..0b97314
--- /dev/null
+++ b/include/msg.h
@@ -0,0 +1,173 @@
+
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/msg.h
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#ifndef	__msg_include__
+#define __msg_include__
+
+#define MSG_PRIVATE	"PRIVMSG"	/* PRIV */
+#define MSG_WHOIS	"WHOIS"	/* WHOI */
+#define MSG_WHOWAS	"WHOWAS"	/* WHOW */
+#define MSG_USER	"USER"	/* USER */
+#define MSG_NICK	"NICK"	/* NICK */
+#define MSG_SERVER	"SERVER"	/* SERV */
+#define MSG_LIST	"LIST"	/* LIST */
+#define MSG_TOPIC	"TOPIC"	/* TOPI */
+#define MSG_INVITE	"INVITE"	/* INVI */
+#define MSG_VERSION	"VERSION"	/* VERS */
+#define MSG_QUIT	"QUIT"	/* QUIT */
+#define MSG_SQUIT	"SQUIT"	/* SQUI */
+#define MSG_KILL	"KILL"	/* KILL */
+#define MSG_INFO	"INFO"	/* INFO */
+#define MSG_LINKS	"LINKS"	/* LINK */
+#define MSG_SUMMON	"SUMMON"	/* SUMM */
+#define MSG_STATS	"STATS"	/* STAT */
+#define MSG_USERS	"USERS"	/* USER -> USRS */
+#define MSG_HELP	"HELP"	/* HELP */
+#define MSG_HELPOP	"HELPOP"	/* HELP */
+#define MSG_ERROR	"ERROR"	/* ERRO */
+#define MSG_AWAY	"AWAY"	/* AWAY */
+#define MSG_CONNECT	"CONNECT"	/* CONN */
+#define MSG_PING	"PING"	/* PING */
+#define MSG_PONG	"PONG"	/* PONG */
+#define MSG_OPER	"OPER"	/* OPER */
+#define MSG_PASS	"PASS"	/* PASS */
+#define MSG_WALLOPS	"WALLOPS"	/* WALL */
+#define MSG_TIME	"TIME"	/* TIME */
+#define MSG_NAMES	"NAMES"	/* NAME */
+#define MSG_ADMIN	"ADMIN"	/* ADMI */
+#define MSG_NOTICE	"NOTICE"	/* NOTI */
+#define MSG_JOIN	"JOIN"	/* JOIN */
+#define MSG_PART	"PART"	/* PART */
+#define MSG_LUSERS	"LUSERS"	/* LUSE */
+#define MSG_MOTD	"MOTD"	/* MOTD */
+#define MSG_MODE	"MODE"	/* MODE */
+#define MSG_KICK	"KICK"	/* KICK */
+#define MSG_SERVICE	"SERVICE"	/* SERV -> SRVI */
+#define MSG_USERHOST	"USERHOST"	/* USER -> USRH */
+#define MSG_ISON	"ISON"	/* ISON */
+#define	MSG_REHASH	"REHASH"	/* REHA */
+#define	MSG_RESTART	"RESTART"	/* REST */
+#define	MSG_CLOSE	"CLOSE"	/* CLOS */
+#define	MSG_DIE		"DIE"	/* DIE */
+#define	MSG_HASH	"HASH"	/* HASH */
+#define	MSG_DNS		"DNS"	/* DNS  -> DNSS */
+#define MSG_SILENCE	"SILENCE"	/* SILE */
+#define MSG_AKILL	"AKILL"	/* AKILL */
+#define MSG_KLINE	"KLINE"	/* KLINE */
+#define MSG_UNKLINE     "UNKLINE"	/* UNKLINE */
+#define MSG_RAKILL	"RAKILL"	/* RAKILL */
+#define MSG_GNOTICE	"GNOTICE"	/* GNOTICE */
+#define MSG_GOPER	"GOPER"	/* GOPER */
+#define MSG_GLOBOPS	"GLOBOPS"	/* GLOBOPS */
+#define MSG_LOCOPS	"LOCOPS"	/* LOCOPS */
+#define MSG_PROTOCTL	"PROTOCTL"	/* PROTOCTL */
+#define MSG_WATCH	"WATCH"	/* WATCH */
+#define MSG_TRACE	"TRACE"	/* TRAC */
+#define MSG_SQLINE	"SQLINE"	/* SQLINE */
+#define MSG_UNSQLINE	"UNSQLINE"	/* UNSQLINE */
+#define MSG_SVSNICK	"SVSNICK"	/* SVSNICK */
+#define MSG_SVSNOOP	"SVSNOOP"	/* SVSNOOP */
+#define MSG_IDENTIFY	"IDENTIFY"	/* IDENTIFY */
+#define MSG_SVSKILL	"SVSKILL"	/* SVSKILL */
+#define MSG_NICKSERV	"NICKSERV"	/* NICKSERV */
+#define MSG_NS		"NS"
+#define MSG_CHANSERV	"CHANSERV"	/* CHANSERV */
+#define MSG_CS		"CS"
+#define MSG_OPERSERV	"OPERSERV"	/* OPERSERV */
+#define MSG_OS		"OS"
+#define MSG_MEMOSERV	"MEMOSERV"	/* MEMOSERV */
+#define MSG_MS		"MS"
+#define MSG_SERVICES	"SERVICES"	/* SERVICES */
+#define MSG_SVSMODE	"SVSMODE"	/* SVSMODE */
+#define MSG_SAMODE	"SAMODE"	/* SAMODE */
+#define MSG_CHATOPS	"CHATOPS"	/* CHATOPS */
+#define MSG_ZLINE    	"ZLINE"	/* ZLINE */
+#define MSG_UNZLINE  	"UNZLINE"	/* UNZLINE */
+#define MSG_HELPSERV    "HELPSERV"	/* HELPSERV */
+#define MSG_HS		"HS"
+#define MSG_RULES       "RULES"	/* RULES */
+#define MSG_MAP         "MAP"	/* MAP */
+#define MSG_SVS2MODE    "SVS2MODE"	/* SVS2MODE */
+#define MSG_DALINFO     "DALINFO"	/* dalinfo */
+#define MSG_ADMINCHAT   "ADCHAT"	/* Admin chat */
+#define MSG_MKPASSWD	"MKPASSWD"	/* MKPASSWD */
+#define MSG_ADDLINE     "ADDLINE"	/* ADDLINE */
+#define MSG_GLINE	"GLINE"	/* The awesome g-line */
+#define MSG_SJOIN	"SJOIN"
+#define MSG_SETHOST 	"SETHOST"	/* sethost */
+#define MSG_NACHAT  	"NACHAT"	/* netadmin chat */
+#define MSG_SETIDENT    "SETIDENT"
+#define MSG_SETNAME	"SETNAME"	/* set GECOS */
+#define MSG_LAG		"LAG"	/* Lag detect */
+#define MSG_STATSERV	"STATSERV"	/* alias */
+#define MSG_KNOCK	"KNOCK"
+#define MSG_CREDITS 	"CREDITS"
+#define MSG_LICENSE 	"LICENSE"
+#define MSG_CHGHOST 	"CHGHOST"
+#define MSG_NETINFO 	"NETINFO"
+#define MSG_SENDUMODE 	"SENDUMODE"
+#define MSG_ADDMOTD 	"ADDMOTD"
+#define MSG_ADDOMOTD	"ADDOMOTD"
+#define MSG_SVSMOTD	"SVSMOTD"
+#define MSG_SMO 	"SMO"
+#define MSG_OPERMOTD 	"OPERMOTD"
+#define MSG_TSCTL 	"TSCTL"
+#define MSG_SVSJOIN 	"SVSJOIN"
+#define MSG_SAJOIN 	"SAJOIN"
+#define MSG_SVSPART 	"SVSPART"
+#define MSG_SAPART 	"SAPART"
+#define MSG_CHGIDENT 	"CHGIDENT"
+#define MSG_SWHOIS 	"SWHOIS"
+#define MSG_SVSO 	"SVSO"
+#define MSG_SVSFLINE 	"SVSFLINE"
+#define MSG_TKL		"TKL"
+#define MSG_VHOST 	"VHOST"
+#define MSG_BOTMOTD 	"BOTMOTD"
+#define MSG_REMGLINE	"REMGLINE"	/* remove g-line */
+
+#define MSG_UMODE2	"UMODE2"
+#define MSG_DCCDENY	"DCCDENY"
+#define MSG_UNDCCDENY   "UNDCCDENY"
+#define MSG_CHGNAME	"CHGNAME"
+#define MSG_SHUN	"SHUN"
+#define MSG_NEWJOIN 	"NEWJOIN"	/* For CR Java Chat */
+#define MSG_POST	"POST"
+#define MSG_INFOSERV 	"INFOSERV"
+#define MSG_IS		"IS"
+
+#define MSG_BOTSERV	"BOTSERV"
+
+#define MSG_CYCLE	"CYCLE"
+
+#define MSG_MODULE	"MODULE"
+/* BR and BT are in use */
+
+#define MSG_SENDSNO	"SENDSNO"
+
+#define MSG_EOS		"EOS"
+
+#define MSG_MLOCK	"MLOCK"
+
+#define MAXPARA    	15
+
+#endif
diff --git a/include/numeric.h b/include/numeric.h
new file mode 100644
index 0000000..fce4268
--- /dev/null
+++ b/include/numeric.h
@@ -0,0 +1,396 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/numeric.h
+ *   Copyright (C) 1990 Jarkko Oikarinen
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+/*
+ * Added numerics 600-799 as numeric_replies2[], we ran out
+ */
+
+/*
+ * Reserve numerics 000-099 for server-client connections where the client
+ * is local to the server. If any server is passed a numeric in this range
+ * from another server then it is remapped to 100-199.
+ */
+
+#define	RPL_WELCOME          001
+#define	RPL_YOURHOST         002
+#define	RPL_CREATED          003
+#define	RPL_MYINFO           004
+#define RPL_ISUPPORT	     005
+
+#define RPL_REDIR	     10
+#define RPL_YOURID           42
+
+#define RPL_REMOTEISUPPORT 105
+
+/*
+ * Errors are in the range from 400-599 currently and are grouped by what
+ * commands they come from.
+ */
+#define ERR_NOSUCHNICK       401
+#define ERR_NOSUCHSERVER     402
+#define ERR_NOSUCHCHANNEL    403
+#define ERR_CANNOTSENDTOCHAN 404
+#define ERR_TOOMANYCHANNELS  405
+#define ERR_WASNOSUCHNICK    406
+#define ERR_TOOMANYTARGETS   407
+#define ERR_NOSUCHSERVICE    408
+#define	ERR_NOORIGIN         409
+
+#define ERR_INVALIDCAPCMD    410
+
+#define ERR_NORECIPIENT      411
+#define ERR_NOTEXTTOSEND     412
+#define ERR_NOTOPLEVEL       413
+#define ERR_WILDTOPLEVEL     414
+#define ERR_TOOMANYMATCHES   416
+
+#define ERR_UNKNOWNCOMMAND   421
+#define	ERR_NOMOTD           422
+#define	ERR_NOADMININFO      423
+#define	ERR_FILEERROR        424
+#define ERR_NOOPERMOTD	     425
+#define ERR_TOOMANYAWAY	     429
+#define ERR_NONICKNAMEGIVEN  431
+#define ERR_ERRONEUSNICKNAME 432
+#define ERR_NICKNAMEINUSE    433
+#define ERR_NORULES          434
+#define ERR_SERVICECONFUSED  435
+#define	ERR_NICKCOLLISION    436
+#define ERR_BANNICKCHANGE    437
+#define ERR_NCHANGETOOFAST   438
+#define ERR_TARGETTOOFAST    439
+#define ERR_SERVICESDOWN     440
+
+#define ERR_USERNOTINCHANNEL 441
+#define ERR_NOTONCHANNEL     442
+#define	ERR_USERONCHANNEL    443
+#define ERR_NOLOGIN          444
+#define	ERR_SUMMONDISABLED   445
+#define ERR_USERSDISABLED    446
+#define ERR_NONICKCHANGE     447
+#define ERR_FORBIDDENCHANNEL 448
+
+
+#define ERR_NOTREGISTERED    451
+
+#define ERR_HOSTILENAME      455
+
+#define ERR_NOHIDING	     459
+#define ERR_NOTFORHALFOPS	 460
+#define ERR_NEEDMOREPARAMS   461
+#define ERR_ALREADYREGISTRED 462
+#define ERR_NOPERMFORHOST    463
+#define ERR_PASSWDMISMATCH   464
+#define ERR_YOUREBANNEDCREEP 465
+#define ERR_YOUWILLBEBANNED  466
+#define	ERR_KEYSET           467
+#define ERR_ONLYSERVERSCANCHANGE 468
+#define ERR_LINKSET	     469
+#define ERR_LINKCHANNEL	     470
+#define ERR_CHANNELISFULL    471
+#define ERR_UNKNOWNMODE      472
+#define ERR_INVITEONLYCHAN   473
+#define ERR_BANNEDFROMCHAN   474
+#define	ERR_BADCHANNELKEY    475
+#define	ERR_BADCHANMASK      476
+#define ERR_NEEDREGGEDNICK   477
+#define ERR_BANLISTFULL      478
+#define ERR_LINKFAIL	     479
+#define ERR_CANNOTKNOCK		 480
+
+#define ERR_NOPRIVILEGES     481
+#define ERR_CHANOPRIVSNEEDED 482
+#define	ERR_CANTKILLSERVER   483
+#define ERR_ATTACKDENY       484
+#define ERR_KILLDENY	     485
+
+#define ERR_NONONREG	     486
+#define ERR_NOTFORUSERS	    487
+
+#define ERR_SECUREONLYCHAN   489
+#define ERR_NOSWEAR	     490
+#define ERR_NOOPERHOST       491
+#define ERR_NOCTCP	     492
+
+#define ERR_CHANOWNPRIVNEEDED 499
+
+#define ERR_TOOMANYJOINS     500
+#define ERR_UMODEUNKNOWNFLAG 501
+#define ERR_USERSDONTMATCH   502
+
+#define ERR_SILELISTFULL     511
+#define ERR_TOOMANYWATCH     512
+#define ERR_NEEDPONG         513
+
+#define ERR_TOOMANYDCC       514
+
+#define ERR_DISABLED         517
+#define ERR_NOINVITE		 518
+#define ERR_ADMONLY			 519
+#define ERR_OPERONLY		 520
+#define ERR_LISTSYNTAX       521
+
+#define ERR_CANTSENDTOUSER	531
+/*
+ * Numberic replies from server commands.
+ * These are currently in the range 200-399.
+ */
+#define	RPL_NONE             300
+#define RPL_AWAY             301
+#define RPL_USERHOST         302
+#define RPL_ISON             303
+#define RPL_TEXT             304
+#define	RPL_UNAWAY           305
+#define	RPL_NOWAWAY          306
+#define RPL_WHOISREGNICK     307
+#define RPL_RULESSTART       308
+#define RPL_ENDOFRULES       309
+#define RPL_WHOISHELPOP      310	/* -Donwulff */
+
+#define RPL_WHOISUSER        311
+#define RPL_WHOISSERVER      312
+#define RPL_WHOISOPERATOR    313
+
+#define RPL_WHOWASUSER       314
+/* rpl_endofwho below (315) */
+#define	RPL_ENDOFWHOWAS      369
+
+#define RPL_WHOISCHANOP      316	/* redundant and not needed but reserved */
+#define RPL_WHOISIDLE        317
+
+#define RPL_ENDOFWHOIS       318
+#define RPL_WHOISCHANNELS    319
+#define RPL_WHOISSPECIAL     320
+#define RPL_LISTSTART        321
+#define RPL_LIST             322
+#define RPL_LISTEND          323
+#define RPL_CHANNELMODEIS    324
+#define RPL_CREATIONTIME     329
+
+#define RPL_WHOISLOGGEDIN    330	/* ircu/charybdis-family --nenolod */
+
+#define RPL_NOTOPIC          331
+#define RPL_TOPIC            332
+#define RPL_TOPICWHOTIME     333
+
+#define RPL_INVITELIST       336
+#define RPL_ENDOFINVITELIST  337
+
+#define RPL_LISTSYNTAX       334
+#define RPL_WHOISBOT	     335
+#define RPL_USERIP	     340
+#define RPL_INVITING         341
+#define	RPL_SUMMONING        342
+
+#define RPL_VERSION          351
+
+#define RPL_WHOREPLY         352
+#define RPL_ENDOFWHO         315
+#define RPL_NAMREPLY         353
+#define RPL_ENDOFNAMES       366
+#define RPL_INVEXLIST	     346
+#define RPL_ENDOFINVEXLIST   347
+
+#define RPL_EXLIST	     348
+#define RPL_ENDOFEXLIST      349
+#define RPL_KILLDONE         361
+#define	RPL_CLOSING          362
+#define RPL_CLOSEEND         363
+#define RPL_LINKS            364
+#define RPL_ENDOFLINKS       365
+/* rpl_endofnames above (366) */
+#define RPL_BANLIST          367
+#define RPL_ENDOFBANLIST     368
+/* rpl_endofwhowas above (369) */
+
+#define	RPL_INFO             371
+#define	RPL_MOTD             372
+#define	RPL_INFOSTART        373
+#define	RPL_ENDOFINFO        374
+#define	RPL_MOTDSTART        375
+#define	RPL_ENDOFMOTD        376
+
+#define RPL_WHOISHOST        378
+#define RPL_WHOISMODES       379
+#define RPL_YOUREOPER        381
+#define RPL_REHASHING        382
+#define RPL_YOURESERVICE     383
+#define RPL_MYPORTIS         384
+#define RPL_NOTOPERANYMORE   385
+#define RPL_QLIST			 386
+#define	RPL_ENDOFQLIST		 387
+#define	RPL_ALIST			 388
+#define	RPL_ENDOFALIST		 389
+
+#define RPL_TIME             391
+#define	RPL_USERSSTART       392
+#define	RPL_USERS            393
+#define	RPL_ENDOFUSERS       394
+#define	RPL_NOUSERS          395
+#define RPL_HOSTHIDDEN       396
+
+#define RPL_TRACELINK        200
+#define RPL_TRACECONNECTING  201
+#define RPL_TRACEHANDSHAKE   202
+#define RPL_TRACEUNKNOWN     203
+
+#define RPL_TRACEOPERATOR    204
+#define RPL_TRACEUSER        205
+#define RPL_TRACESERVER      206
+#define RPL_TRACESERVICE     207
+#define RPL_TRACENEWTYPE     208
+#define RPL_TRACECLASS       209
+
+#define RPL_STATSHELP	     210
+#define RPL_STATSLINKINFO    211
+#define RPL_STATSCOMMANDS    212
+#define RPL_STATSCLINE       213
+#define RPL_STATSOLDNLINE    214
+
+#define RPL_STATSILINE       215
+#define RPL_STATSKLINE       216
+#define RPL_STATSQLINE       217
+#define RPL_STATSYLINE       218
+#define RPL_ENDOFSTATS       219
+#define RPL_STATSBLINE	     220
+
+
+#define RPL_UMODEIS          221
+#define RPL_SQLINE_NICK      222
+#define RPL_STATSGLINE		 223
+#define RPL_STATSTLINE		 224
+#define RPL_STATSELINE	     225
+#define RPL_STATSNLINE	     226
+#define RPL_STATSVLINE	     227
+#define RPL_STATSBANVER	     228
+#define RPL_STATSSPAMF       229
+#define RPL_STATSEXCEPTTKL   230
+#define RPL_SERVICEINFO      231
+#define RPL_RULES            232
+#define	RPL_SERVICE          233
+#define RPL_SERVLIST         234
+#define RPL_SERVLISTEND      235
+
+#define	RPL_STATSLLINE       241
+#define	RPL_STATSUPTIME      242
+#define	RPL_STATSOLINE       243
+#define	RPL_STATSHLINE       244
+#define	RPL_STATSSLINE       245
+#define RPL_STATSXLINE	     247
+#define RPL_STATSULINE       248
+#define	RPL_STATSDEBUG	     249
+#define RPL_STATSCONN        250
+
+#define	RPL_LUSERCLIENT      251
+#define RPL_LUSEROP          252
+#define	RPL_LUSERUNKNOWN     253
+#define	RPL_LUSERCHANNELS    254
+#define	RPL_LUSERME          255
+#define	RPL_ADMINME          256
+#define	RPL_ADMINLOC1        257
+#define	RPL_ADMINLOC2        258
+#define	RPL_ADMINEMAIL       259
+
+#define	RPL_TRACELOG         261
+#define RPL_TRYAGAIN         263
+#define RPL_LOCALUSERS       265
+#define RPL_GLOBALUSERS      266
+
+#define RPL_SILELIST         271
+#define RPL_ENDOFSILELIST    272
+#define RPL_STATSDLINE       275
+#define RPL_WHOISCERTFP      276
+
+#define RPL_HELPHDR	     290
+#define RPL_HELPOP	     291
+#define RPL_HELPTLR	     292
+#define RPL_HELPHLP	     293
+#define RPL_HELPFWD	     294
+#define RPL_HELPIGN	     295
+
+
+/*
+ * New /MAP format.
+ */
+#define RPL_MAP              006
+#define RPL_MAPMORE          610
+#define RPL_MAPEND           007
+
+
+#define ERR_WHOSYNTAX 522
+#define ERR_WHOLIMEXCEED 523
+#define ERR_OPERSPVERIFY 524
+
+#define RPL_SNOMASK	     8
+
+/*
+ * Numberic replies from server commands.
+ * These are also in the range 600-799.
+ */
+
+#define RPL_REAWAY           597
+#define RPL_GONEAWAY         598
+#define RPL_NOTAWAY          599
+#define RPL_LOGON            600
+#define RPL_LOGOFF           601
+#define RPL_WATCHOFF         602
+#define RPL_WATCHSTAT        603
+#define RPL_NOWON            604
+#define RPL_NOWOFF           605
+#define RPL_WATCHLIST        606
+#define RPL_ENDOFWATCHLIST   607
+#define RPL_CLEARWATCH       608
+#define RPL_NOWISAWAY        609
+
+#define RPL_DCCSTATUS        617
+#define RPL_DCCLIST          618
+#define RPL_ENDOFDCCLIST     619
+#define RPL_DCCINFO          620
+
+#define RPL_DUMPING			 640
+#define RPL_DUMPRPL			 641
+#define RPL_EODUMP           642
+
+#define RPL_SPAMCMDFWD       659
+
+#define RPL_STARTTLS         670
+
+#define RPL_WHOISSECURE      671
+
+#define ERR_MLOCKRESTRICTED	742
+
+#define ERR_CANNOTDOCOMMAND 972
+#define ERR_CANNOTCHANGECHANMODE 974
+
+#define ERR_STARTTLS            691
+
+#define RPL_LOGGEDIN            900
+#define RPL_LOGGEDOUT           901
+#define ERR_NICKLOCKED          902
+
+#define RPL_SASLSUCCESS         903
+#define ERR_SASLFAIL            904
+#define ERR_SASLTOOLONG         905
+#define ERR_SASLABORTED         906
+#define ERR_SASLALREADY         907
+#define RPL_SASLMECHS           908
+
+#define ERR_NUMERICERR       999
diff --git a/include/openssl_hostname_validation.h b/include/openssl_hostname_validation.h
new file mode 100644
index 0000000..ead1846
--- /dev/null
+++ b/include/openssl_hostname_validation.h
@@ -0,0 +1,81 @@
+#ifndef HEADER_CURL_HOSTCHECK_H
+#define HEADER_CURL_HOSTCHECK_H
+/* Obtained from cURL
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+#define CURL_HOST_NOMATCH 0
+#define CURL_HOST_MATCH   1
+int Curl_cert_hostcheck(const char *match_pattern, const char *hostname);
+
+#endif /* HEADER_CURL_HOSTCHECK_H */
+
+
+/* Obtained from: https://github.com/iSECPartners/ssl-conservatory */
+
+/*
+Copyright (C) 2012, iSEC Partners.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+
+/*
+ * Helper functions to perform basic hostname validation using OpenSSL.
+ *
+ * Please read "everything-you-wanted-to-know-about-openssl.pdf" before
+ * attempting to use this code. This whitepaper describes how the code works,
+ * how it should be used, and what its limitations are.
+ *
+ * Author:  Alban Diquet
+ * License: See LICENSE
+ *
+ */
+
+typedef enum {
+        MatchFound,
+        MatchNotFound,
+        NoSANPresent,
+        MalformedCertificate,
+        Error
+} HostnameValidationResult;
+
+/**
+* Validates the server's identity by looking for the expected hostname in the
+* server's certificate. As described in RFC 6125, it first tries to find a match
+* in the Subject Alternative Name extension. If the extension is not present in
+* the certificate, it checks the Common Name instead.
+*
+* Returns MatchFound if a match was found.
+* Returns MatchNotFound if no matches were found.
+* Returns MalformedCertificate if any of the hostnames had a NUL character embedded in it.
+* Returns Error if there was an error.
+*/
+HostnameValidationResult validate_hostname(const char *hostname, const X509 *server_cert);
diff --git a/include/proto.h b/include/proto.h
new file mode 100644
index 0000000..037d6e6
--- /dev/null
+++ b/include/proto.h
@@ -0,0 +1,68 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/proto.h
+ *      (C) Dominick Meglio <codemastr@unrealircd.com> 2000
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef proto_h
+#define proto_h
+/* lusers.c */
+extern void init_irccounts(void);
+
+/* match.c */
+extern char *collapse(char *pattern);
+
+/* scache.c */
+extern void clear_scache_hash_table(void);
+
+/* send.c */
+extern void sendto_one(Client *, MessageTag *mtags, FORMAT_STRING(const char *), ...) __attribute__((format(printf,3,4)));
+extern void sendto_realops(FORMAT_STRING(const char *pattern), ...) __attribute__((format(printf,1,2)));
+
+/* ircd.c */
+extern EVENT(garbage_collect);
+extern EVENT(loop_event);
+extern EVENT(check_pings);
+extern EVENT(handshake_timeout);
+extern EVENT(check_deadsockets);
+extern EVENT(try_connections);
+/* support.c */
+extern char *my_itoa(int i);
+
+/* s_serv.c */
+extern void load_tunefile(void);
+extern EVENT(save_tunefile);
+extern void read_motd(const char *filename, MOTDFile *motd);
+
+/* s_user.c */
+extern int target_limit_exceeded(Client *client, void *target, const char *name);
+extern void make_umodestr(void);
+extern char *get_usermode_string(Client *acptr);
+
+/* s_misc.c */
+extern char *convert_time(time_t ltime);
+
+/* whowas.c */
+extern void initwhowas(void);
+
+/* uid.c */
+extern void uid_init(void);
+extern const char *uid_get(void);
+
+#endif /* proto_h */
diff --git a/include/resource.h b/include/resource.h
new file mode 100644
index 0000000..fc7ab1e
--- /dev/null
+++ b/include/resource.h
@@ -0,0 +1,59 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by GENERIC.RC
+// $Id$
+#define IDC_USERID                      1051
+#define IDC_REALNAME                    1052
+#define IDC_PNICK                       1053
+#define IDC_ANICK                       1054
+#define IDC_SERVERLIST                  1057
+#define IDC_NEWSERVER                   1058
+#define IDC_EDITSERVER                  1059
+#define IDC_IRCDCONF                    1059
+#define IDC_DELSERVER                   1060
+#define IDC_SHOW_GLOBOPS                1060
+#define IDC_SHOW_WALLOPS                1061
+#define IDC_SHOW_HELPOPS                1062
+#define IDC_SHOW_SERVNOTICE             1063
+#define IDC_INFOTEXT                    1063
+#define IDM_OPEN                        40001
+#define IDM_SAVE                        40002
+#define IDM_SAVEAS                      40003
+#define IDM_EXIT                        40004
+#define IDM_ABOUT                       40005
+#define IDM_WINDOWCHILD                 40006
+#define IDM_REHASH                      40007
+#define IDM_OPTIONS                     40008
+#define	IDM_CREDITS						40009
+#define IDM_DF							40010
+#define IDM_LICENSE						40011
+#define IDM_DBGOFF                      41099
+#define IDM_DBGFATAL                    41100
+#define IDM_DBGERROR                    41101
+#define IDM_DBGNOTICE                   41103
+#define IDM_DBGDNS                      41104
+#define IDM_DBGINFO                     41105
+#define IDM_DBGNUM                      41106
+#define IDM_DBGSEND                     41107
+#define IDM_DBGDEBUG                    41108
+#define IDM_DBGMALLOC                   41109
+#define IDM_DBGLIST                     41110
+#define IDM_POPUP                       50000
+#define IDC_STATIC                      -1
+#define IDM_IRCDRULES					65530
+#define IDM_IRCDMOTD					65531
+#define IDC_VERSION                     65532
+#define IDM_SETUP                       65536
+#define IDM_IRCDCONF                    65535
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        113
+#define _APS_NEXT_COMMAND_VALUE         40011
+#define _APS_NEXT_CONTROL_VALUE         1064
+#define _APS_NEXT_SYMED_VALUE           104
+#endif
+#endif
diff --git a/include/setup.h.in b/include/setup.h.in
new file mode 100644
index 0000000..492bf43
--- /dev/null
+++ b/include/setup.h.in
@@ -0,0 +1,219 @@
+/* include/setup.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define the directory where the unrealircd binary is located */
+#undef BINDIR
+
+/* Specify the build directory */
+#undef BUILDDIR
+
+/* Define the location of the cached remote include files */
+#undef CACHEDIR
+
+/* Define the location of the configuration files */
+#undef CONFDIR
+
+/* Define the location of permanent data files */
+#undef DATADIR
+
+/* The default permissions for configuration files. Set to 0 to prevent
+   unrealircd from calling chmod() on the files. */
+#undef DEFAULT_PERMISSIONS
+
+/* Define the location of the documentation */
+#undef DOCDIR
+
+/* Define if you have getrusage */
+#undef GETRUSAGE_2
+
+/* Define if you have the <glob.h> header file. */
+#undef GLOBH
+
+/* Define if ssl library has SSL_CTX_set1_curves_list */
+#undef HAS_SSL_CTX_SET1_CURVES_LIST
+
+/* Define if ssl library has SSL_CTX_set_min_proto_version */
+#undef HAS_SSL_CTX_SET_MIN_PROTO_VERSION
+
+/* Define if you have crypt */
+#undef HAVE_CRYPT
+
+/* Define if you have epoll */
+#undef HAVE_EPOLL
+
+/* Define to 1 if you have the `epoll_create' function. */
+#undef HAVE_EPOLL_CREATE
+
+/* Define to 1 if you have the `epoll_ctl' function. */
+#undef HAVE_EPOLL_CTL
+
+/* Define to 1 if you have the `epoll_wait' function. */
+#undef HAVE_EPOLL_WAIT
+
+/* Define to 1 if you have the `explicit_bzero' function. */
+#undef HAVE_EXPLICIT_BZERO
+
+/* Define to 1 if you have the `getrusage' function. */
+#undef HAVE_GETRUSAGE
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `kevent' function. */
+#undef HAVE_KEVENT
+
+/* Define to 1 if you have the `kqueue' function. */
+#undef HAVE_KQUEUE
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `poll' function. */
+#undef HAVE_POLL
+
+/* Define if you have PS_STRINGS */
+#undef HAVE_PSSTRINGS
+
+/* Define if you have pstat */
+#undef HAVE_PSTAT
+
+/* Define if you have POSIX threads libraries and header files. */
+#undef HAVE_PTHREAD
+
+/* Have PTHREAD_PRIO_INHERIT. */
+#undef HAVE_PTHREAD_PRIO_INHERIT
+
+/* Define if you have setproctitle */
+#undef HAVE_SETPROCTITLE
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strlcat' function. */
+#undef HAVE_STRLCAT
+
+/* Define to 1 if you have the `strlcpy' function. */
+#undef HAVE_STRLCPY
+
+/* Define to 1 if you have the `strlncat' function. */
+#undef HAVE_STRLNCAT
+
+/* Define to 1 if you have the `syslog' function. */
+#undef HAVE_SYSLOG
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the `times' function. */
+#undef HAVE_TIMES
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define if you want modes shown in /list */
+#undef LIST_SHOW_MODES
+
+/* Define the location of the log files */
+#undef LOGDIR
+
+/* Set to the maximum number of connections you want */
+#undef MAXCONNECTIONS_REQUEST
+
+/* Define the location of the modules */
+#undef MODULESDIR
+
+/* Set to the nickname history length you want */
+#undef NICKNAMEHISTORYLENGTH
+
+/* Define if you want OperOverride disabled */
+#undef NO_OPEROVERRIDE
+
+/* Define if you want opers to have to use /invite to join +s/+p channels */
+#undef OPEROVERRIDE_VERIFY
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define the location of permanent data files */
+#undef PERMDATADIR
+
+/* Define the path of the pid file */
+#undef PIDFILE
+
+/* Define if you want +a/+q prefixes */
+#undef PREFIX_AQ
+
+/* Define the location of private libraries */
+#undef PRIVATELIBDIR
+
+/* Define to necessary symbol if this constant uses a non-standard name on
+   your system. */
+#undef PTHREAD_CREATE_JOINABLE
+
+/* Define if you have the <sys/rusage.h> header file. */
+#undef RUSAGEH
+
+/* Define the directory where the unrealircd start stop scripts is located */
+#undef SCRIPTDIR
+
+/* Link... statically(?) (defining this macro will probably cause the build
+   tofail) */
+#undef STATIC_LINKING
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define if you have the <sys/syslog.h> header file. */
+#undef SYSSYSLOGH
+
+/* Define if you have times */
+#undef TIMES_2
+
+/* Define the location of private temporary files */
+#undef TMPDIR
+
+/* Define if your system prepends an underscore to symbols */
+#undef UNDERSCORE
+
+/* Generation version number (e.g.: X for X.Y.Z) */
+#undef UNREAL_VERSION_GENERATION
+
+/* Major version number (e.g.: Y for X.Y.Z) */
+#undef UNREAL_VERSION_MAJOR
+
+/* Minor version number (e.g.: Z for X.Y.Z) */
+#undef UNREAL_VERSION_MINOR
+
+/* Version suffix such as a beta marker or release candidate marker. (e.g.:
+   -rcX for unrealircd-3.2.9-rcX) */
+#undef UNREAL_VERSION_SUFFIX
+
+/* Define if you have libcurl installed to get remote includes and MOTD
+   support */
+#undef USE_LIBCURL
diff --git a/include/struct.h b/include/struct.h
new file mode 100644
index 0000000..458c30c
--- /dev/null
+++ b/include/struct.h
@@ -0,0 +1,2159 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, include/struct.h
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 
+ *   $Id$
+ */
+
+#ifndef	__struct_include__
+#define __struct_include__
+
+#include "config.h"
+#include "sys.h"
+/* need to include ssl stuff here coz otherwise you get
+ * conflicting types with isalnum/isalpha/etc @ redhat. -- Syzop
+ */
+#define OPENSSL_NO_KRB5
+#include <openssl/rsa.h>       /* SSL stuff */
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>    
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/md5.h>
+#include <openssl/ripemd.h>
+#include "common.h"
+#include "sys.h"
+#include <stdio.h>
+#include <sys/types.h>
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stddef.h>
+#endif
+
+#ifdef HAVE_SYSLOG
+# include <syslog.h>
+# ifdef SYSSYSLOGH
+#  include <sys/syslog.h>
+# endif
+#endif
+#define PCRE2_CODE_UNIT_WIDTH 8
+#include "pcre2.h"
+
+#include "channel.h"
+
+typedef struct LoopStruct LoopStruct;
+typedef struct TKL TKL;
+typedef struct Spamfilter Spamfilter;
+typedef struct ServerBan ServerBan;
+typedef struct BanException BanException;
+typedef struct NameBan NameBan;
+typedef struct SpamExcept SpamExcept;
+typedef struct ConditionalConfig ConditionalConfig;
+typedef struct ConfigEntry ConfigEntry;
+typedef struct ConfigFile ConfigFile;
+typedef struct ConfigFlag ConfigFlag;
+typedef struct ConfigFlag_except ConfigFlag_except;
+typedef struct ConfigFlag_ban ConfigFlag_ban;
+typedef struct ConfigFlag_tld ConfigFlag_tld;
+typedef struct ConfigItem ConfigItem;
+typedef struct ConfigItem_me ConfigItem_me;
+typedef struct ConfigItem_files ConfigItem_files;
+typedef struct ConfigItem_admin ConfigItem_admin;
+typedef struct ConfigItem_class ConfigItem_class;
+typedef struct ConfigItem_oper ConfigItem_oper;
+typedef struct ConfigItem_operclass ConfigItem_operclass;
+typedef struct ConfigItem_mask ConfigItem_mask;
+typedef struct ConfigItem_drpass ConfigItem_drpass;
+typedef struct ConfigItem_ulines ConfigItem_ulines;
+typedef struct ConfigItem_tld ConfigItem_tld;
+typedef struct ConfigItem_listen ConfigItem_listen;
+typedef struct ConfigItem_sni ConfigItem_sni;
+typedef struct ConfigItem_allow ConfigItem_allow;
+typedef struct ConfigFlag_allow ConfigFlag_allow;
+typedef struct ConfigItem_allow_channel ConfigItem_allow_channel;
+typedef struct ConfigItem_allow_dcc ConfigItem_allow_dcc;
+typedef struct ConfigItem_vhost ConfigItem_vhost;
+typedef struct ConfigItem_except ConfigItem_except;
+typedef struct ConfigItem_link	ConfigItem_link;
+typedef struct ConfigItem_ban ConfigItem_ban;
+typedef struct ConfigItem_deny_dcc ConfigItem_deny_dcc;
+typedef struct ConfigItem_deny_link ConfigItem_deny_link;
+typedef struct ConfigItem_deny_channel ConfigItem_deny_channel;
+typedef struct ConfigItem_deny_version ConfigItem_deny_version;
+typedef struct ConfigItem_log ConfigItem_log;
+typedef struct ConfigItem_unknown ConfigItem_unknown;
+typedef struct ConfigItem_unknown_ext ConfigItem_unknown_ext;
+typedef struct ConfigItem_alias ConfigItem_alias;
+typedef struct ConfigItem_alias_format ConfigItem_alias_format;
+typedef struct ConfigItem_include ConfigItem_include;
+typedef struct ConfigItem_blacklist_module ConfigItem_blacklist_module;
+typedef struct ConfigItem_help ConfigItem_help;
+typedef struct ConfigItem_offchans ConfigItem_offchans;
+typedef struct ListStruct ListStruct;
+typedef struct ListStructPrio ListStructPrio;
+
+#define CFG_TIME 0x0001
+#define CFG_SIZE 0x0002
+#define CFG_YESNO 0x0004
+
+typedef struct Watch Watch;
+typedef struct Client Client;
+typedef struct LocalClient LocalClient;
+typedef struct Channel Channel;
+typedef struct User ClientUser;
+typedef struct Server Server;
+typedef struct Link Link;
+typedef struct Ban Ban;
+typedef struct Mode Mode;
+typedef struct MessageTag MessageTag;
+typedef struct MOTDFile MOTDFile; /* represents a whole MOTD, including remote MOTD support info */
+typedef struct MOTDLine MOTDLine; /* one line of a MOTD stored as a linked list */
+#ifdef USE_LIBCURL
+typedef struct MOTDDownload MOTDDownload; /* used to coordinate download of a remote MOTD */
+#endif
+
+typedef struct RealCommand RealCommand;
+typedef struct CommandOverride CommandOverride;
+typedef struct Member Member;
+typedef struct Membership Membership;
+
+typedef enum OperClassEntryType { OPERCLASSENTRY_ALLOW=1, OPERCLASSENTRY_DENY=2} OperClassEntryType;
+
+typedef enum OperPermission { OPER_ALLOW=1, OPER_DENY=0} OperPermission;
+
+struct OperClassValidator;
+typedef struct OperClassValidator OperClassValidator;
+typedef struct OperClassACLPath OperClassACLPath;
+typedef struct OperClass OperClass;
+typedef struct OperClassACL OperClassACL;
+typedef struct OperClassACLEntry OperClassACLEntry;
+typedef struct OperClassACLEntryVar OperClassACLEntryVar;
+typedef struct OperClassCheckParams OperClassCheckParams;
+
+typedef OperPermission (*OperClassEntryEvalCallback)(OperClassACLEntryVar* variables,OperClassCheckParams* params);
+
+#ifndef VMSP
+#include "dbuf.h"		/* THIS REALLY SHOULDN'T BE HERE!!! --msa */
+#endif
+
+#define	HOSTLEN		63	/* Length of hostname.  Updated to         */
+				/* comply with RFC1123                     */
+
+#define	NICKLEN		30
+#define	USERLEN		10
+#define	REALLEN	 	50
+#define SVIDLEN		30
+#define MAXTOPICLEN	360	/* absolute maximum permitted topic length (above this = potential desync) */
+#define MAXAWAYLEN	360	/* absolute maximum permitted away length (above this = potential desync) */
+#define MAXKICKLEN	360	/* absolute maximum kick length (above this = only cutoff danger) */
+#define MAXQUITLEN	395	/* absolute maximum quit length (above this = only cutoff danger) */
+#define	CHANNELLEN	32
+#define	PASSWDLEN 	256	/* some insane large limit (previously: 20, 32, 48) */
+#define	KEYLEN		23
+#define LINKLEN		32
+#define	BUFSIZE		512	/* WARNING: *DONT* CHANGE THIS!!!! */
+#define READBUFSIZE	8192	/* for the read buffer */
+#define	MAXRECIPIENTS 	20
+#define	MAXSILELENGTH	NICKLEN+USERLEN+HOSTLEN+10
+#define IDLEN		10
+#define SIDLEN           3
+#define SWHOISLEN	256
+#define UMODETABLESZ (sizeof(long) * 8)
+#define MAXCCUSERS		20 /* Maximum for set::anti-flood::max-concurrent-conversations */
+#define BATCHLEN	22
+
+/*
+ * Watch it - Don't change this unless you also change the ERR_TOOMANYWATCH
+ * and PROTOCOL_SUPPORTED settings.
+ */
+#define MAXWATCH	128
+
+#define	USERHOST_REPLYLEN	(NICKLEN+HOSTLEN+USERLEN+5)
+
+/* NOTE: this must be down here so the stuff from struct.h IT uses works */
+#include "whowas.h"
+
+/* Logging types */
+#define LOG_ERROR 0x0001
+#define LOG_KILL  0x0002
+#define LOG_TKL   0x0004
+#define LOG_KLINE 0x0008
+#define LOG_CLIENT 0x0010
+#define LOG_SERVER 0x0020
+#define LOG_OPER   0x0040
+#define LOG_SACMDS 0x0080
+#define LOG_CHGCMDS 0x0100
+#define LOG_OVERRIDE 0x0200
+#define LOG_SPAMFILTER 0x0400
+#define LOG_DBG    0x0800 /* fixme */
+
+/*
+** 'offsetof' is defined in ANSI-C. The following definition
+** is not absolutely portable (I have been told), but so far
+** it has worked on all machines I have needed it. The type
+** should be size_t but...  --msa
+*/
+#ifndef offsetof
+#define	offsetof(t,m) (int)((&((t *)0L)->m))
+#endif
+
+#define	elementsof(x) (sizeof(x)/sizeof(x[0]))
+
+/* Calculate the size of an array */
+#define ARRAY_SIZEOF(x) (sizeof((x))/sizeof((x)[0]))
+
+/*
+** flags for bootup options (command line flags)
+*/
+#define	BOOT_DEBUG	1
+#define	BOOT_TTY	2
+#define BOOT_NOFORK     4
+
+/* Length of the key that you feed into siphash_generate_key()
+ * DO NOT CHANGE THIS as the siphash code depends on it.
+ */
+#define SIPHASH_KEY_LENGTH 16
+
+/** This specifies the current client status or the client type - see @link ClientStatus @endlink in particular.
+ * You may think "server" or "client" are the only choices here, but there are many more
+ * such as states where the user is in the middle of an SSL/TLS handshake.
+ * @defgroup ClientStatuses Client statuses / types
+ * @{
+ */
+typedef enum ClientStatus {
+	CLIENT_STATUS_LOG			= -7,	/**< Client is a log file */
+	CLIENT_STATUS_TLS_STARTTLS_HANDSHAKE	= -8,	/**< Client is doing a STARTTLS handshake */
+	CLIENT_STATUS_CONNECTING		= -6,	/**< Client is an outgoing connect */
+	CLIENT_STATUS_TLS_CONNECT_HANDSHAKE	= -5,	/**< Client is doing an SSL/TLS handshake - outgoing connection */
+	CLIENT_STATUS_TLS_ACCEPT_HANDSHAKE	= -4,	/**< Client is doing an SSL/TLS handshake - incoming connection */
+	CLIENT_STATUS_HANDSHAKE			= -3,	/**< Client is doing a server handshake - outgoing connection */
+	CLIENT_STATUS_ME			= -2,	/**< Client is &me (this server) */
+	CLIENT_STATUS_UNKNOWN			= -1,	/**< Client is doing a hanshake. May become a server or user later, we don't know yet */
+	CLIENT_STATUS_SERVER			= 0,	/**< Client is a server (fully authenticated) */
+	CLIENT_STATUS_USER			= 1,	/**< Client is a user (fully authenticated) */
+} ClientStatus;
+
+#define	MyConnect(x)			((x)->local)			/**< Is a locally connected client (server or user) */
+#define	MyUser(x)			(MyConnect(x) && IsUser(x))	/**< Is a locally connected user */
+#define	IsUser(x)	((x)->status == CLIENT_STATUS_USER)	/**< Is a user that has completed the connection handshake */
+#define	IsRegistered(x)		((x)->status >= CLIENT_STATUS_SERVER)	/**< Client has completed the connection handshake (user or server) */
+#define	IsConnecting(x)		((x)->status == CLIENT_STATUS_CONNECTING)	/**< Is an outgoing connect to another server */
+#define	IsHandshake(x)		((x)->status == CLIENT_STATUS_HANDSHAKE)	/**< Is doing a handshake (while connecting to another server) */
+#define	IsMe(x)			((x)->status == CLIENT_STATUS_ME)	/**< This is true for &me */
+/** Client is not fully registered yet. May become a user or a server, we don't know yet. */
+#define	IsUnknown(x)		(((x)->status == CLIENT_STATUS_UNKNOWN) || ((x)->status == CLIENT_STATUS_TLS_STARTTLS_HANDSHAKE))	
+#define	IsServer(x)		((x)->status == CLIENT_STATUS_SERVER)	/**< Is a server that has completed the connection handshake */
+#define	IsLog(x)		((x)->status == CLIENT_STATUS_LOG)	/**< Is a log file, not a user or server */
+#define IsStartTLSHandshake(x)	((x)->status == CLIENT_STATUS_TLS_STARTTLS_HANDSHAKE)	/**< Currently doing a STARTTLS handshake */
+#define IsTLSAcceptHandshake(x)	((x)->status == CLIENT_STATUS_TLS_ACCEPT_HANDSHAKE)	/**< Currently doing a TLS handshake - incoming */
+#define IsTLSConnectHandshake(x)	((x)->status == CLIENT_STATUS_TLS_CONNECT_HANDSHAKE)	/**< Currently doing a TLS handshake - outgoing */
+#define IsTLSHandshake(x) (IsTLSAcceptHandshake(x) || IsTLSConnectHandshake(x) | IsStartTLSHandshake(x))	/**< Currently doing a TLS handshake (incoming/outgoing/STARTTLS) */
+
+#define SetStartTLSHandshake(x)	((x)->status = CLIENT_STATUS_TLS_STARTTLS_HANDSHAKE)
+#define SetTLSAcceptHandshake(x)	((x)->status = CLIENT_STATUS_TLS_ACCEPT_HANDSHAKE)
+#define SetTLSConnectHandshake(x)	((x)->status = CLIENT_STATUS_TLS_CONNECT_HANDSHAKE)
+#define	SetConnecting(x)	((x)->status = CLIENT_STATUS_CONNECTING)
+#define	SetHandshake(x)		((x)->status = CLIENT_STATUS_HANDSHAKE)
+#define	SetMe(x)		((x)->status = CLIENT_STATUS_ME)
+#define	SetUnknown(x)		((x)->status = CLIENT_STATUS_UNKNOWN)
+#define	SetServer(x)		((x)->status = CLIENT_STATUS_SERVER)
+#define	SetUser(x)		((x)->status = CLIENT_STATUS_USER)
+#define	SetLog(x)		((x)->status = CLIENT_STATUS_LOG)
+
+/* @} */
+
+/** Used for checking certain properties of clients, such as IsSecure() and IsULine().
+ * @defgroup ClientFlags Client flags
+ * @{
+ */
+#define	CLIENT_FLAG_PINGSENT		0x00000001	/**< PING sent, no reply yet */
+#define	CLIENT_FLAG_DEAD		0x00000002	/**< Client is dead: already quit/exited and removed from all lists -- Remaining part will soon be freed in main loop */
+#define	CLIENT_FLAG_DEADSOCKET		0x00000004	/**< Local socket is dead but otherwise the client still exists fully -- Will soon exit in main loop */
+#define	CLIENT_FLAG_KILLED		0x00000008	/**< Prevents "QUIT" from being sent for this */
+#define CLIENT_FLAG_IPV6		0x00000010	/**< Connection is using IPv6 */
+#define CLIENT_FLAG_OUTGOING		0x00000020	/**< Outgoing connection (do not touch cptr->listener->clients) */
+#define	CLIENT_FLAG_CLOSING		0x00000040	/**< Set when closing to suppress errors */
+#define	CLIENT_FLAG_LISTEN		0x00000080	/**< Used to mark clients which we listen() on */
+#define	CLIENT_FLAG_DNSLOOKUP		0x00000100	/**< Client is doing a DNS lookup */
+#define	CLIENT_FLAG_IDENTLOOKUP		0x00000200	/**< Client is doing an Ident lookup (RFC931) */
+#define	CLIENT_FLAG_IDENTLOOKUPSENT	0x00000400	/**< Set if we havent writen to ident server */
+#define	CLIENT_FLAG_LOCALHOST		0x00000800	/**< Set for localhost clients */
+#define	CLIENT_FLAG_IDENTSUCCESS	0x00001000	/**< Successful ident lookup achieved */
+#define	CLIENT_FLAG_USEIDENT		0x00002000	/**< The allow { } block says we should use the ident (if available) */
+#define CLIENT_FLAG_NEXTCALL		0x00004000	/**< Next call (don't ask...) */
+#define CLIENT_FLAG_ULINE		0x00008000	/**< User/server is considered U-lined (eg: services) */
+#define CLIENT_FLAG_SQUIT		0x00010000	/**< Server has been /SQUIT by an oper */
+#define CLIENT_FLAG_PROTOCTL		0x00020000	/**< Received at least 1 PROTOCTL message */
+#define CLIENT_FLAG_EAUTH		0x00040000	/**< Server authenticated via PROTOCTL EAUTH */
+#define CLIENT_FLAG_NETINFO		0x00080000	/**< Received a NETINFO message */
+#define CLIENT_FLAG_QUARANTINE		0x00100000	/**< Quarantined server (don't allow ircops on this server) */
+#define CLIENT_FLAG_DCCNOTICE		0x00200000	/**< Has the user seen a notice on how to use DCCALLOW already? */
+#define CLIENT_FLAG_SHUNNED		0x00400000	/**< Connection is shunned (user cannot execute any commands) */
+#define CLIENT_FLAG_VIRUS		0x00800000	/**< Tagged by spamfilter as a virus */
+#define CLIENT_FLAG_TLS			0x01000000	/**< Connection is using SSL/TLS */
+#define CLIENT_FLAG_NOFAKELAG		0x02000000	/**< Exemption from fake lag */
+#define CLIENT_FLAG_DCCBLOCK		0x04000000	/**< Block all DCC send requests */
+#define CLIENT_FLAG_MAP			0x08000000	/**< Show this entry in /MAP (only used in map module) */
+#define CLIENT_FLAG_PINGWARN		0x10000000	/**< Server ping warning (remote server slow with responding to PINGs) */
+/** @} */
+
+#define SNO_DEFOPER "+kscfvGqobS"
+#define SNO_DEFUSER "+ks"
+
+#define SEND_UMODES (SendUmodes)
+#define ALL_UMODES (AllUmodes)
+/* SEND_UMODES and ALL_UMODES are now handled by umode_get/umode_lget/umode_gget -- Syzop. */
+
+#define	CLIENT_FLAG_ID	(CLIENT_FLAG_USEIDENT|CLIENT_FLAG_IDENTSUCCESS)
+
+/* PROTO_*: Server protocol extensions (acptr->local->proto).
+ * Note that client protocol extensions have been moved
+ * to the ClientCapability API which uses acptr->local->caps.
+ */
+#define PROTO_VL	0x000040	/* Negotiated VL protocol */
+#define PROTO_VHP	0x000100	/* Send hostnames in NICKv2 even if not sethosted */
+#define PROTO_CLK	0x001000	/* Send cloaked host in the NICK command (regardless of +x/-x) */
+#define PROTO_MLOCK	0x002000	/* server supports MLOCK */
+#define PROTO_EXTSWHOIS 0x004000	/* extended SWHOIS support */
+#define PROTO_SJSBY	0x008000	/* SJOIN setby information (TS and nick) */
+#define PROTO_MTAGS	0x010000	/* Support message tags and big buffers */
+
+/* For client capabilities: */
+/** HasCapabilityFast() checks for a token if you know exactly which bit to check */
+#define HasCapabilityFast(cptr, val) ((cptr)->local->caps & (val))
+/** HasCapability() checks for a token by name and is slightly slower */
+#define HasCapability(cptr, token) ((cptr)->local->caps & ClientCapabilityBit(token))
+#define SetCapabilityFast(cptr, val)  do { (cptr)->local->caps |= (val); } while(0)
+#define ClearCapabilityFast(cptr, val)  do { (cptr)->local->caps &= ~(val); } while(0)
+
+/* Usermode and snomask macros: */
+#define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
+#define	IsOper(x)		((x)->umodes & UMODE_OPER)
+#define	IsInvisible(x)		((x)->umodes & UMODE_INVISIBLE)
+#define IsARegNick(x)		((x)->umodes & (UMODE_REGNICK))
+#define IsRegNick(x)		((x)->umodes & UMODE_REGNICK)
+#define	SendWallops(x)		(!IsMe(x) && IsUser(x) && ((x)->umodes & UMODE_WALLOP))
+#define IsHidden(x)             ((x)->umodes & UMODE_HIDE)
+#define IsSetHost(x)		((x)->umodes & UMODE_SETHOST)
+#define IsHideOper(x)		((x)->umodes & UMODE_HIDEOPER)
+#define	SetOper(x)		((x)->umodes |= UMODE_OPER)
+#define	SetInvisible(x)		((x)->umodes |= UMODE_INVISIBLE)
+#define	SetWallops(x)  		((x)->umodes |= UMODE_WALLOP)
+#define SetRegNick(x)		((x)->umodes & UMODE_REGNICK)
+#define SetHidden(x)            ((x)->umodes |= UMODE_HIDE)
+#define SetHideOper(x)		((x)->umodes |= UMODE_HIDEOPER)
+#define IsSecureConnect(x)	((x)->umodes & UMODE_SECURE)
+#define	ClearOper(x)		((x)->umodes &= ~UMODE_OPER)
+#define	ClearInvisible(x)	((x)->umodes &= ~UMODE_INVISIBLE)
+#define	ClearWallops(x)		((x)->umodes &= ~UMODE_WALLOP)
+#define ClearHidden(x)          ((x)->umodes &= ~UMODE_HIDE)
+#define ClearHideOper(x)	((x)->umodes &= ~UMODE_HIDEOPER)
+
+/* Snomask macros: */
+#define	SendServNotice(x)	(((x)->user) && ((x)->user->snomask & SNO_SNOTICE))
+#define IsKillsF(x)		((x)->user->snomask & SNO_KILLS)
+#define IsClientF(x)		((x)->user->snomask & SNO_CLIENT)
+#define IsFloodF(x)		((x)->user->snomask & SNO_FLOOD)
+#define IsEyes(x)		((x)->user->snomask & SNO_EYES)
+#define SetKillsF(x)		((x)->user->snomask |= SNO_KILLS)
+#define SetClientF(x)		((x)->user->snomask |= SNO_CLIENT)
+#define SetFloodF(x)		((x)->user->snomask |= SNO_FLOOD)
+#define SetEyes(x)		((x)->user->snomask |= SNO_EYES)
+#define ClearKillsF(x)		((x)->user->snomask &= ~SNO_KILLS)
+#define ClearClientF(x)		((x)->user->snomask &= ~SNO_CLIENT)
+#define ClearFloodF(x)		((x)->user->snomask &= ~SNO_FLOOD)
+#define ClearEyes(x)		((x)->user->snomask &= ~SNO_EYES)
+
+
+/* Client flags macros: to check for via IsXX(),
+ * to set via SetXX() and to clear the flag via ClearXX()
+ */
+/**
+ * @addtogroup ClientFlags
+ * @{
+ */
+#define IsIdentLookup(x)		((x)->flags & CLIENT_FLAG_IDENTLOOKUP)	/**< Is doing Ident lookups */
+#define IsClosing(x)			((x)->flags & CLIENT_FLAG_CLOSING)	/**< Is closing the connection */
+#define IsDCCBlock(x)			((x)->flags & CLIENT_FLAG_DCCBLOCK)
+#define IsDCCNotice(x)			((x)->flags & CLIENT_FLAG_DCCNOTICE)
+#define IsDead(x)			((x)->flags & CLIENT_FLAG_DEAD)
+#define IsDeadSocket(x)			((x)->flags & CLIENT_FLAG_DEADSOCKET)
+#define IsUseIdent(x)			((x)->flags & CLIENT_FLAG_USEIDENT)
+#define IsDNSLookup(x)			((x)->flags & CLIENT_FLAG_DNSLOOKUP)
+#define IsEAuth(x)			((x)->flags & CLIENT_FLAG_EAUTH)
+#define IsIdentSuccess(x)		((x)->flags & CLIENT_FLAG_IDENTSUCCESS)
+#define IsIPV6(x)			((x)->flags & CLIENT_FLAG_IPV6)
+#define IsKilled(x)			((x)->flags & CLIENT_FLAG_KILLED)
+#define IsListening(x)			((x)->flags & CLIENT_FLAG_LISTEN)
+#define IsLocalhost(x)			((x)->flags & CLIENT_FLAG_LOCALHOST)
+#define IsMap(x)			((x)->flags & CLIENT_FLAG_MAP)
+#define IsNextCall(x)			((x)->flags & CLIENT_FLAG_NEXTCALL)
+#define IsNetInfo(x)			((x)->flags & CLIENT_FLAG_NETINFO)
+#define IsNoFakeLag(x)			((x)->flags & CLIENT_FLAG_NOFAKELAG)
+#define IsOutgoing(x)			((x)->flags & CLIENT_FLAG_OUTGOING)
+#define IsPingSent(x)			((x)->flags & CLIENT_FLAG_PINGSENT)
+#define IsPingWarning(x)		((x)->flags & CLIENT_FLAG_PINGWARN)
+#define IsProtoctlReceived(x)		((x)->flags & CLIENT_FLAG_PROTOCTL)
+#define IsQuarantined(x)		((x)->flags & CLIENT_FLAG_QUARANTINE)
+#define IsShunned(x)			((x)->flags & CLIENT_FLAG_SHUNNED)
+#define IsSQuit(x)			((x)->flags & CLIENT_FLAG_SQUIT)
+#define IsTLS(x)			((x)->flags & CLIENT_FLAG_TLS)
+#define IsSecure(x)			((x)->flags & CLIENT_FLAG_TLS)
+#define IsULine(x)			((x)->flags & CLIENT_FLAG_ULINE)
+#define IsVirus(x)			((x)->flags & CLIENT_FLAG_VIRUS)
+#define IsIdentLookupSent(x)		((x)->flags & CLIENT_FLAG_IDENTLOOKUPSENT)
+#define SetIdentLookup(x)		do { (x)->flags |= CLIENT_FLAG_IDENTLOOKUP; } while(0)
+#define SetClosing(x)			do { (x)->flags |= CLIENT_FLAG_CLOSING; } while(0)
+#define SetDCCBlock(x)			do { (x)->flags |= CLIENT_FLAG_DCCBLOCK; } while(0)
+#define SetDCCNotice(x)			do { (x)->flags |= CLIENT_FLAG_DCCNOTICE; } while(0)
+#define SetDead(x)			do { (x)->flags |= CLIENT_FLAG_DEAD; } while(0)
+#define SetDeadSocket(x)		do { (x)->flags |= CLIENT_FLAG_DEADSOCKET; } while(0)
+#define SetUseIdent(x)			do { (x)->flags |= CLIENT_FLAG_USEIDENT; } while(0)
+#define SetDNSLookup(x)			do { (x)->flags |= CLIENT_FLAG_DNSLOOKUP; } while(0)
+#define SetEAuth(x)			do { (x)->flags |= CLIENT_FLAG_EAUTH; } while(0)
+#define SetIdentSuccess(x)		do { (x)->flags |= CLIENT_FLAG_IDENTSUCCESS; } while(0)
+#define SetIPV6(x)			do { (x)->flags |= CLIENT_FLAG_IPV6; } while(0)
+#define SetKilled(x)			do { (x)->flags |= CLIENT_FLAG_KILLED; } while(0)
+#define SetListening(x)			do { (x)->flags |= CLIENT_FLAG_LISTEN; } while(0)
+#define SetLocalhost(x)			do { (x)->flags |= CLIENT_FLAG_LOCALHOST; } while(0)
+#define SetMap(x)			do { (x)->flags |= CLIENT_FLAG_MAP; } while(0)
+#define SetNextCall(x)			do { (x)->flags |= CLIENT_FLAG_NEXTCALL; } while(0)
+#define SetNetInfo(x)			do { (x)->flags |= CLIENT_FLAG_NETINFO; } while(0)
+#define SetNoFakeLag(x)			do { (x)->flags |= CLIENT_FLAG_NOFAKELAG; } while(0)
+#define SetOutgoing(x)			do { (x)->flags |= CLIENT_FLAG_OUTGOING; } while(0)
+#define SetPingSent(x)			do { (x)->flags |= CLIENT_FLAG_PINGSENT; } while(0)
+#define SetPingWarning(x)		do { (x)->flags |= CLIENT_FLAG_PINGWARN; } while(0)
+#define SetProtoctlReceived(x)		do { (x)->flags |= CLIENT_FLAG_PROTOCTL; } while(0)
+#define SetQuarantined(x)		do { (x)->flags |= CLIENT_FLAG_QUARANTINE; } while(0)
+#define SetShunned(x)			do { (x)->flags |= CLIENT_FLAG_SHUNNED; } while(0)
+#define SetSQuit(x)			do { (x)->flags |= CLIENT_FLAG_SQUIT; } while(0)
+#define SetTLS(x)			do { (x)->flags |= CLIENT_FLAG_TLS; } while(0)
+#define SetULine(x)			do { (x)->flags |= CLIENT_FLAG_ULINE; } while(0)
+#define SetVirus(x)			do { (x)->flags |= CLIENT_FLAG_VIRUS; } while(0)
+#define SetIdentLookupSent(x)		do { (x)->flags |= CLIENT_FLAG_IDENTLOOKUPSENT; } while(0)
+#define ClearIdentLookup(x)		do { (x)->flags &= ~CLIENT_FLAG_IDENTLOOKUP; } while(0)
+#define ClearClosing(x)			do { (x)->flags &= ~CLIENT_FLAG_CLOSING; } while(0)
+#define ClearDCCBlock(x)		do { (x)->flags &= ~CLIENT_FLAG_DCCBLOCK; } while(0)
+#define ClearDCCNotice(x)		do { (x)->flags &= ~CLIENT_FLAG_DCCNOTICE; } while(0)
+#define ClearDead(x)			do { (x)->flags &= ~CLIENT_FLAG_DEAD; } while(0)
+#define ClearDeadSocket(x)		do { (x)->flags &= ~CLIENT_FLAG_DEADSOCKET; } while(0)
+#define ClearUseIdent(x)		do { (x)->flags &= ~CLIENT_FLAG_USEIDENT; } while(0)
+#define ClearDNSLookup(x)		do { (x)->flags &= ~CLIENT_FLAG_DNSLOOKUP; } while(0)
+#define ClearEAuth(x)			do { (x)->flags &= ~CLIENT_FLAG_EAUTH; } while(0)
+#define ClearIdentSuccess(x)		do { (x)->flags &= ~CLIENT_FLAG_IDENTSUCCESS; } while(0)
+#define ClearIPV6(x)			do { (x)->flags &= ~CLIENT_FLAG_IPV6; } while(0)
+#define ClearKilled(x)			do { (x)->flags &= ~CLIENT_FLAG_KILLED; } while(0)
+#define ClearListening(x)		do { (x)->flags &= ~CLIENT_FLAG_LISTEN; } while(0)
+#define ClearLocalhost(x)		do { (x)->flags &= ~CLIENT_FLAG_LOCALHOST; } while(0)
+#define ClearMap(x)			do { (x)->flags &= ~CLIENT_FLAG_MAP; } while(0)
+#define ClearNextCall(x)		do { (x)->flags &= ~CLIENT_FLAG_NEXTCALL; } while(0)
+#define ClearNetInfo(x)			do { (x)->flags &= ~CLIENT_FLAG_NETINFO; } while(0)
+#define ClearNoFakeLag(x)		do { (x)->flags &= ~CLIENT_FLAG_NOFAKELAG; } while(0)
+#define ClearOutgoing(x)		do { (x)->flags &= ~CLIENT_FLAG_OUTGOING; } while(0)
+#define ClearPingSent(x)		do { (x)->flags &= ~CLIENT_FLAG_PINGSENT; } while(0)
+#define ClearPingWarning(x)		do { (x)->flags &= ~CLIENT_FLAG_PINGWARN; } while(0)
+#define ClearProtoctlReceived(x)	do { (x)->flags &= ~CLIENT_FLAG_PROTOCTL; } while(0)
+#define ClearQuarantined(x)		do { (x)->flags &= ~CLIENT_FLAG_QUARANTINE; } while(0)
+#define ClearShunned(x)			do { (x)->flags &= ~CLIENT_FLAG_SHUNNED; } while(0)
+#define ClearSQuit(x)			do { (x)->flags &= ~CLIENT_FLAG_SQUIT; } while(0)
+#define ClearTLS(x)			do { (x)->flags &= ~CLIENT_FLAG_TLS; } while(0)
+#define ClearULine(x)			do { (x)->flags &= ~CLIENT_FLAG_ULINE; } while(0)
+#define ClearVirus(x)			do { (x)->flags &= ~CLIENT_FLAG_VIRUS; } while(0)
+#define ClearIdentLookupSent(x)		do { (x)->flags &= ~CLIENT_FLAG_IDENTLOOKUPSENT; } while(0)
+/* @} */
+
+
+/* Others that access client structs: */
+#define	IsNotSpoof(x)	((x)->local->nospoof == 0)
+#define GetHost(x)	(IsHidden(x) ? (x)->user->virthost : (x)->user->realhost)
+#define GetIP(x)	(x->ip ? x->ip : "255.255.255.255")
+#define IsLoggedIn(x)	(IsRegNick(x) || (x->user && (*x->user->svid != '*') && !isdigit(*x->user->svid))) /* registered nick (+r) or just logged into services (may be -r) */
+#define IsSynched(x)	(x->serv->flags.synced)
+#define IsServerSent(x) (x->serv && x->serv->flags.server_sent)
+
+/* PROTOCTL (Server protocol) stuff */
+#ifndef DEBUGMODE
+#define CHECKSERVERPROTO(x,y)	(((x)->local->proto & y) == y)
+#else
+#define CHECKSERVERPROTO(x,y) (checkprotoflags(x, y, __FILE__, __LINE__))
+#endif
+
+#define SupportVL(x)		(CHECKSERVERPROTO(x, PROTO_VL))
+#define SupportSJSBY(x)		(CHECKSERVERPROTO(x, PROTO_SJSBY))
+#define SupportVHP(x)		(CHECKSERVERPROTO(x, PROTO_VHP))
+#define SupportCLK(x)		(CHECKSERVERPROTO(x, PROTO_CLK))
+#define SupportMTAGS(x)		(CHECKSERVERPROTO(x, PROTO_MTAGS))
+
+#define SetVL(x)		((x)->local->proto |= PROTO_VL)
+#define SetSJSBY(x)		((x)->local->proto |= PROTO_SJSBY)
+#define SetVHP(x)		((x)->local->proto |= PROTO_VHP)
+#define SetCLK(x)		((x)->local->proto |= PROTO_CLK)
+#define SetMTAGS(x)		((x)->local->proto |= PROTO_MTAGS)
+
+/*
+ * defined debugging levels
+ */
+#define	DEBUG_FATAL  0
+#define	DEBUG_ERROR  1		/* report_error() and other errors that are found */
+#define	DEBUG_NOTICE 3
+#define	DEBUG_DNS    4		/* used by all DNS related routines - a *lot* */
+#define	DEBUG_INFO   5		/* general usful info */
+#define	DEBUG_NUM    6		/* numerics */
+#define	DEBUG_SEND   7		/* everything that is sent out */
+#define	DEBUG_DEBUG  8		/* anything to do with debugging, ie unimportant :) */
+#define	DEBUG_MALLOC 9		/* malloc/free calls */
+#define	DEBUG_LIST  10		/* debug list use */
+
+/*
+ * defines for curses in client
+ */
+#define	DUMMY_TERM	0
+#define	CURSES_TERM	1
+#define	TERMCAP_TERM	2
+
+/* Dcc deny types (see src/s_extra.c) */
+#define DCCDENY_HARD	0
+#define DCCDENY_SOFT	1
+
+/* Linked list dcc flags */
+#define DCC_LINK_ME		1 /* My dcc allow */
+#define DCC_LINK_REMOTE	2 /* I need to remove dccallows from these clients when I die */
+
+/** Union for moddata objects */
+typedef union ModData ModData;
+union ModData
+{
+        int i;
+        long l;
+        char *str;
+        void *ptr;
+};
+
+#ifndef _WIN32
+ #define CHECK_LIST_ENTRY(list)		if (offsetof(typeof(*list),prev) != offsetof(ListStruct,prev)) \
+					{ \
+						ircd_log(LOG_ERROR, "[BUG] %s:%d: List operation on struct with incorrect order (->prev must be 1st struct member)", __FILE__, __LINE__); \
+						abort(); \
+					} \
+					if (offsetof(typeof(*list),next) != offsetof(ListStruct,next)) \
+					{ \
+						ircd_log(LOG_ERROR, "[BUG] %s:%d: List operation on struct with incorrect order (->next must be 2nd struct member))", __FILE__, __LINE__); \
+						abort(); \
+					}
+#else
+ #define CHECK_LIST_ENTRY(list)		/* not available on Windows, typeof() not reliable */
+#endif
+
+#ifndef _WIN32
+ #define CHECK_PRIO_LIST_ENTRY(list)	if (offsetof(typeof(*list),prev) != offsetof(ListStructPrio,prev)) \
+					{ \
+						ircd_log(LOG_ERROR, "[BUG] %s:%d: List operation on struct with incorrect order (->prev must be 1st struct member)", __FILE__, __LINE__); \
+						abort(); \
+					} \
+					if (offsetof(typeof(*list),next) != offsetof(ListStructPrio,next)) \
+					{ \
+						ircd_log(LOG_ERROR, "[BUG] %s:%d: List operation on struct with incorrect order (->next must be 2nd struct member))", __FILE__, __LINE__); \
+						abort(); \
+					} \
+					if (offsetof(typeof(*list),priority) != offsetof(ListStructPrio,priority)) \
+					{ \
+						ircd_log(LOG_ERROR, "[BUG] %s:%d: List operation on struct with incorrect order (->priority must be 3rd struct member))", __FILE__, __LINE__); \
+						abort(); \
+					}
+#else
+ #define CHECK_PRIO_LIST_ENTRY(list)	/* not available on Windows, typeof() not reliable */
+#endif
+
+#define CHECK_NULL_LIST_ITEM(item)	if ((item)->prev || (item)->next) \
+					{ \
+						ircd_log(LOG_ERROR, "[BUG] %s:%d: List operation on item with non-NULL 'prev' or 'next' -- are you adding to a list twice?", __FILE__, __LINE__); \
+						abort(); \
+					}
+
+/** These are the generic list functions that are used all around in UnrealIRCd.
+ * @defgroup ListFunctions List functions
+ * @{
+ */
+
+/** Generic linked list HEAD */
+struct ListStruct {
+	ListStruct *prev, *next;
+};
+
+/** Generic linked list HEAD with priority */
+struct ListStructPrio {
+	ListStructPrio *prev, *next;
+	int priority;
+};
+
+/** Add an item to a standard linked list (in the front)
+ */
+#define AddListItem(item,list)		do { \
+						CHECK_LIST_ENTRY(list) \
+						CHECK_LIST_ENTRY(item) \
+						CHECK_NULL_LIST_ITEM(item) \
+						add_ListItem((ListStruct *)item, (ListStruct **)&list); \
+					} while(0)
+
+/** Append an item to a standard linked list (at the back)
+*/
+#define AppendListItem(item,list)	do { \
+						CHECK_LIST_ENTRY(list) \
+						CHECK_LIST_ENTRY(item) \
+						CHECK_NULL_LIST_ITEM(item) \
+						append_ListItem((ListStruct *)item, (ListStruct **)&list); \
+					} while(0)
+
+/** Delete an item from a standard linked list
+*/
+#define DelListItem(item,list)		do { \
+						CHECK_LIST_ENTRY(list) \
+						CHECK_LIST_ENTRY(item) \
+						del_ListItem((ListStruct *)item, (ListStruct **)&list); \
+					} while(0)
+
+/** Add an item to a standard linked list - UNCHECKED function, only use if absolutely necessary!
+*/
+#define AddListItemUnchecked(item,list)	add_ListItem((ListStruct *)item, (ListStruct **)&list)
+/** Append an item to a standard linked list - UNCHECKED function, only use if absolutely necessary!
+*/
+#define AppendListItemUnchecked(item,list) append_ListItem((ListStruct *)item, (ListStruct **)&list)
+/** Delete an item from a standard linked list - UNCHECKED function, only use if absolutely necessary!
+*/
+#define DelListItemUnchecked(item,list) del_ListItem((ListStruct *)item, (ListStruct **)&list)
+
+#define AddListItemPrio(item,list,prio)	do { \
+						CHECK_PRIO_LIST_ENTRY(list) \
+						CHECK_PRIO_LIST_ENTRY(item) \
+						CHECK_NULL_LIST_ITEM(item) \
+						add_ListItemPrio((ListStructPrio *)item, (ListStructPrio **)&list, prio); \
+					} while(0)
+
+#define DelListItemPrio(item,list,prio)	do { \
+						CHECK_PRIO_LIST_ENTRY(list) \
+						CHECK_PRIO_LIST_ENTRY(item) \
+						del_ListItem((ListStruct *)item, (ListStruct **)&list); \
+					} while(0)
+
+typedef struct NameList NameList;
+/** Generic linked list where each entry has a name which you can use.
+ * Use this if you simply want to have a list of entries
+ * that only have a name and no other properties.
+ *
+ * Use the following functions to add, find and delete entries:
+ * add_name_list(), find_name_list(), del_name_list(), free_entire_name_list()
+ */
+struct NameList {
+	NameList *prev, *next;
+	char name[1];
+};
+
+/** Free an entire NameList */
+#define free_entire_name_list(list) do { _free_entire_name_list(list); list = NULL; } while(0)
+/** Add an entry to a NameList */
+#define add_name_list(list, str)  _add_name_list(&list, str)
+/** Delete an entry from a NameList - AND free it */
+#define del_name_list(list, str)  _del_name_list(&list, str)
+
+/** @} */
+
+typedef struct MultiLine MultiLine;
+/** Multi-line list.
+ * @see addmultiline(), freemultiline(), sendnotice_multiline()
+ */
+struct MultiLine {
+	MultiLine *prev, *next;
+	char *line;
+};
+
+#ifdef USE_LIBCURL
+struct MOTDDownload
+{
+	MOTDFile *themotd;
+};
+#endif /* USE_LIBCURL */
+
+struct MOTDFile 
+{
+	struct MOTDLine *lines;
+	struct tm last_modified; /* store the last modification time */
+
+#ifdef USE_LIBCURL
+	/*
+	  This pointer is used to communicate with an asynchronous MOTD
+	  download. The problem is that a download may take 10 seconds or
+	  more to complete and, in that time, the IRCd could be rehashed.
+	  This would mean that TLD blocks are reallocated and thus the
+	  aMotd structs would be free()d in the meantime.
+
+	  To prevent such a situation from leading to a segfault, we
+	  introduce this remote control pointer. It works like this:
+	  1. read_motd() is called with a URL. A new MOTDDownload is
+	     allocated and the pointer is placed here. This pointer is
+	     also passed to the asynchrnous download handler.
+	  2.a. The download is completed and read_motd_async_downloaded()
+	       is called with the same pointer. From this function, this pointer
+	       if free()d. No other code may free() the pointer. Not even free_motd().
+	    OR
+	  2.b. The user rehashes the IRCd before the download is completed.
+	       free_motd() is called, which sets motd_download->themotd to NULL
+	       to signal to read_motd_async_downloaded() that it should ignore
+	       the download. read_motd_async_downloaded() is eventually called
+	       and frees motd_download.
+	 */
+	struct MOTDDownload *motd_download;
+#endif /* USE_LIBCURL */
+};
+
+struct MOTDLine {
+	char *line;
+	struct MOTDLine *next;
+};
+
+struct LoopStruct {
+	unsigned do_garbage_collect : 1;
+	unsigned config_test : 1;
+	unsigned ircd_booted : 1;
+	unsigned ircd_forked : 1;
+	unsigned do_bancheck : 1; /* perform *line bancheck? */
+	unsigned do_bancheck_spamf_user : 1; /* perform 'user' spamfilter bancheck */
+	unsigned do_bancheck_spamf_away : 1; /* perform 'away' spamfilter bancheck */
+	unsigned ircd_rehashing : 1;
+	unsigned tainted : 1;
+	Client *rehash_save_cptr, *rehash_save_client;
+	int rehash_save_sig;
+	void (*boot_function)();
+};
+
+/** Matching types for Match.type */
+typedef enum {
+	MATCH_SIMPLE=1, /**< Simple pattern with * and ? */
+	MATCH_PCRE_REGEX=2, /**< PCRE2 Perl-like regex (new) */
+} MatchType;
+
+/** Match struct, which allows various matching styles, see MATCH_* */
+typedef struct Match {
+	char *str; /**< Text of the glob/regex/whatever. Always set. */
+	MatchType type;
+	union {
+		pcre2_code *pcre2_expr; /**< PCRE2 Perl-like Regex */
+	} ext;
+} Match;
+
+typedef struct Whowas {
+	int  hashv;
+	char *name;
+	char *username;
+	char *hostname;
+	char *virthost;
+	char *servername;
+	char *realname;
+	long umodes;
+	time_t   logoff;
+	struct Client *online;	/* Pointer to new nickname for chasing or NULL */
+	struct Whowas *next;	/* for hash table... */
+	struct Whowas *prev;	/* for hash table... */
+	struct Whowas *cnext;	/* for client struct linked list */
+	struct Whowas *cprev;	/* for client struct linked list */
+} aWhowas;
+
+typedef struct SWhois SWhois;
+struct SWhois {
+	SWhois *prev, *next;
+	int priority;
+	char *line;
+	char *setby;
+};
+
+/** The command API - used by modules and the core.
+ * @defgroup CommandAPI Command API
+ * @{
+ */
+/** Command can be called by unregistered users (still in handshake) */
+#define CMD_UNREGISTERED	0x0001
+/** Command can be called by users (either directly connected, or remote) */
+#define CMD_USER		0x0002
+/** Command can be called by servers */
+#define CMD_SERVER		0x0004
+/** Command can be used by shunned users (only very few commands need this) */
+#define CMD_SHUN		0x0008
+/** Command will NOT add fake lag (extremely rare, use with care) */
+#define CMD_NOLAG		0x0010
+/** Command is actually an alias */
+#define CMD_ALIAS		0x0020
+/** Command will reset the idle time (only for PRIVMSG) */
+#define CMD_RESETIDLE		0x0040
+/** Command can be used by virus tagged users (only very few commands) */
+#define CMD_VIRUS		0x0080
+/** Command requires IRCOp privileges */
+#define CMD_OPER		0x0200
+
+/** Command function - used by all command handlers.
+ * This is used in the code like <pre>CMD_FUNC(cmd_yourcmd)</pre> as a function definition.
+ * @param cptr        The client direction pointer.
+ * @param client        The source client pointer (you usually need this one).
+ * @param recv_mtags  Received message tags for this command.
+ * @param parc        Parameter count *plus* 1.
+ * @param parv        Parameter values.
+ * @note  Slightly confusing, but parc will be 2 if 1 parameter was provided.
+ *        It is two because parv will still have 2 elements, parv[1] will be your first parameter,
+ *        and parv[2] will be NULL.
+ *        Note that reading parv[parc] and beyond is OUT OF BOUNDS and will cause a crash.
+ *        E.g. parv[3] in the above example is out of bounds.
+ */
+#define CMD_FUNC(x) void (x) (Client *client, MessageTag *recv_mtags, int parc, char *parv[])
+/* @} */
+
+/** Command override function - used by all command override handlers.
+ * This is used in the code like <pre>CMD_OVERRIDE_FUNC(ovr_somecmd)</pre> as a function definition.
+ * @param ovr         The command override structure.
+ * @param cptr        The client direction pointer.
+ * @param client        The source client pointer (you usually need this one).
+ * @param recv_mtags  Received message tags for this command.
+ * @param parc        Parameter count *plus* 1.
+ * @param parv        Parameter values.
+ * @note  Slightly confusing, but parc will be 2 if 1 parameter was provided.
+ *        It is two because parv will still have 2 elements, parv[1] will be your first parameter,
+ *        and parv[2] will be NULL.
+ *        Note that reading parv[parc] and beyond is OUT OF BOUNDS and will cause a crash.
+ *        E.g. parv[3] in the above example.
+ */
+#define CMD_OVERRIDE_FUNC(x) void (x)(CommandOverride *ovr, Client *client, MessageTag *recv_mtags, int parc, char *parv[])
+
+
+
+typedef void (*CmdFunc)(Client *client, MessageTag *mtags, int parc, char *parv[]);
+typedef void (*AliasCmdFunc)(Client *client, MessageTag *mtags, int parc, char *parv[], char *cmd);
+typedef void (*OverrideCmdFunc)(CommandOverride *ovr, Client *client, MessageTag *mtags, int parc, char *parv[]);
+
+
+/* tkl:
+ *   TKL_KILL|TKL_GLOBAL 	= Global K-Line (GLINE)
+ *   TKL_ZAP|TKL_GLOBAL		= Global Z-Line (ZLINE)
+ *   TKL_KILL			= Local K-Line
+ *   TKL_ZAP			= Local Z-Line
+ */
+#define TKL_KILL		0x00000001
+#define TKL_ZAP			0x00000002
+#define TKL_GLOBAL		0x00000004
+#define TKL_SHUN		0x00000008
+#define TKL_SPAMF		0x00000020
+#define TKL_NAME		0x00000040
+#define TKL_EXCEPTION		0x00000080
+/* these are not real tkl types, but only used for exceptions: */
+#define TKL_BLACKLIST		0x0001000
+#define TKL_CONNECT_FLOOD	0x0002000
+#define TKL_MAXPERIP		0x0004000
+#define TKL_UNKNOWN_DATA_FLOOD	0x0008000
+#define TKL_ANTIRANDOM          0x0010000
+#define TKL_ANTIMIXEDUTF8       0x0020000
+#define TKL_BAN_VERSION         0x0040000
+
+#define TKLIsServerBan(tkl)		((tkl)->type & (TKL_KILL|TKL_ZAP|TKL_SHUN))
+#define TKLIsServerBanType(tpe)		((tpe) & (TKL_KILL|TKL_ZAP|TKL_SHUN))
+#define TKLIsSpamfilter(tkl)		((tkl)->type & TKL_SPAMF)
+#define TKLIsSpamfilterType(tpe)	((tpe) & TKL_SPAMF)
+#define TKLIsNameBan(tkl)		((tkl)->type & TKL_NAME)
+#define TKLIsNameBanType(tpe)		((tpe) & TKL_NAME)
+#define TKLIsBanException(tkl)		((tkl)->type & TKL_EXCEPTION)
+#define TKLIsBanExceptionType(tpe)	((tpe) & TKL_EXCEPTION)
+
+#define SPAMF_CHANMSG		0x0001 /* c */
+#define SPAMF_USERMSG		0x0002 /* p */
+#define SPAMF_USERNOTICE	0x0004 /* n */
+#define SPAMF_CHANNOTICE	0x0008 /* N */
+#define SPAMF_PART			0x0010 /* P */
+#define SPAMF_QUIT			0x0020 /* q */
+#define SPAMF_DCC			0x0040 /* d */
+#define SPAMF_USER			0x0080 /* u */
+#define SPAMF_AWAY			0x0100 /* a */
+#define SPAMF_TOPIC			0x0200 /* t */
+
+/* Other flags only for function calls: */
+#define SPAMFLAG_NOWARN		0x0001
+
+/* Ban actions. These must be ordered by severity (!) */
+typedef enum BanAction {
+	BAN_ACT_GZLINE		=1100,
+	BAN_ACT_GLINE		=1000,
+	BAN_ACT_SOFT_GLINE	= 950,
+	BAN_ACT_ZLINE		= 900,
+	BAN_ACT_KLINE		= 800,
+	BAN_ACT_SOFT_KLINE	= 850,
+	BAN_ACT_SHUN		= 700,
+	BAN_ACT_SOFT_SHUN	= 650,
+	BAN_ACT_KILL		= 600,
+	BAN_ACT_SOFT_KILL	= 550,
+	BAN_ACT_TEMPSHUN	= 500,
+	BAN_ACT_SOFT_TEMPSHUN	= 450,
+	BAN_ACT_VIRUSCHAN	= 400,
+	BAN_ACT_SOFT_VIRUSCHAN	= 350,
+	BAN_ACT_DCCBLOCK	= 300,
+	BAN_ACT_SOFT_DCCBLOCK	= 250,
+	BAN_ACT_BLOCK		= 200,
+	BAN_ACT_SOFT_BLOCK	= 150,
+	BAN_ACT_WARN		= 100,
+	BAN_ACT_SOFT_WARN	=  50,
+} BanAction;
+
+#define IsSoftBanAction(x)   ((x == BAN_ACT_SOFT_GLINE) || (x == BAN_ACT_SOFT_KLINE) || \
+                              (x == BAN_ACT_SOFT_SHUN) || (x == BAN_ACT_SOFT_KILL) || \
+                              (x == BAN_ACT_SOFT_TEMPSHUN) || (x == BAN_ACT_SOFT_VIRUSCHAN) || \
+                              (x == BAN_ACT_SOFT_DCCBLOCK) || (x == BAN_ACT_SOFT_BLOCK) || \
+                              (x == BAN_ACT_SOFT_WARN))
+
+
+/** Server ban sub-struct of TKL entry (KLINE/GLINE/ZLINE/GZLINE/SHUN) */
+struct ServerBan {
+	char *usermask; /**< User mask */
+	char *hostmask; /**< Host mask */
+	unsigned short subtype; /**< See TKL_SUBTYPE_* */
+	char *reason; /**< Reason */
+};
+
+/* Name ban sub-struct of TKL entry (QLINE) */
+struct NameBan {
+	char hold; /**< nickname hold is used by services */
+	char *name; /**< the nick or channel that is banned */
+	char *reason; /**< Reason */
+};
+
+/** Spamfilter sub-struct of TKL entry (Spamfilter) */
+struct Spamfilter {
+	unsigned short target;
+	BanAction action; /**< Ban action, see BAN_ACT* */
+	Match *match; /**< Spamfilter matcher */
+	char *tkl_reason; /**< Reason to use for bans placed by this spamfilter, escaped by unreal_encodespace(). */
+	time_t tkl_duration; /**< Duration of bans placed by this spamfilter */
+};
+
+/** Ban exception sub-struct of TKL entry (ELINE) */
+struct BanException {
+	char *usermask; /**< User mask */
+	char *hostmask; /**< Host mask */
+	unsigned short subtype; /**< See TKL_SUBTYPE_* */
+	char *bantypes; /**< Exception types */
+	char *reason; /**< Reason */
+};
+
+
+#define TKL_SUBTYPE_NONE	0x0000
+#define TKL_SUBTYPE_SOFT	0x0001 /* (require SASL) */
+
+#define TKL_FLAG_CONFIG		0x0001 /* Entry from configuration file. Cannot be removed by using commands. */
+
+/** A TKL entry, such as a KLINE, GLINE, Spamfilter, QLINE, Exception, .. */
+struct TKL {
+	TKL *prev, *next;
+	unsigned int type; /**< TKL type. One of TKL_*, such as TKL_KILL|TKL_GLOBAL for gline */
+	unsigned short flags; /**< One of TKL_FLAG_*, such as TKL_FLAG_CONFIG */
+	char *set_by; /**< By who was this entry added */
+	time_t set_at; /**< When this entry was added */
+	time_t expire_at; /**< When this entry will expire */
+	union {
+		Spamfilter *spamfilter;
+		ServerBan *serverban;
+		NameBan *nameban;
+		BanException *banexception;
+	} ptr;
+};
+
+/** A spamfilter except entry */
+struct SpamExcept {
+	SpamExcept *prev, *next;
+	char name[1];
+};
+
+/** IRC Counts, used for /LUSERS */
+typedef struct IRCCounts IRCCounts;
+struct IRCCounts {
+	int  clients;		/* total */
+	int  invisible;		/* invisible */
+	unsigned short  servers;		/* servers */
+	int  operators;		/* operators */
+	int  unknown;		/* unknown local connections */
+	int  channels;		/* channels */
+	int  me_clients;	/* my clients */
+	unsigned short  me_servers;	/* my servers */
+	int  me_max;		/* local max */
+	int  global_max;	/* global max */
+};
+
+/** The /LUSERS stats information */
+extern MODVAR IRCCounts irccounts;
+
+#include "modules.h"
+
+/** A "real" command (internal interface, not for modules) */
+struct RealCommand {
+	RealCommand		*prev, *next;
+	char 			*cmd;
+	CmdFunc			func;
+	AliasCmdFunc		aliasfunc;
+	int			flags;
+	unsigned int    	count;
+	unsigned		parameters : 5;
+	unsigned long   	bytes;
+	Module 			*owner;
+	RealCommand		*friend; /* cmd if token, token if cmd */
+	CommandOverride		*overriders;
+#ifdef DEBUGMODE
+	unsigned long 		lticks;
+	unsigned long 		rticks;
+#endif
+};
+
+/** A command override */
+struct CommandOverride {
+	CommandOverride		*prev, *next;
+	int			priority;
+	Module			*owner;
+	RealCommand		*command;
+	OverrideCmdFunc		func;
+};
+
+extern MODVAR Umode *Usermode_Table;
+extern MODVAR short	 Usermode_highest;
+
+extern MODVAR Snomask *Snomask_Table;
+extern MODVAR short Snomask_highest;
+
+extern MODVAR Cmode *Channelmode_Table;
+extern MODVAR unsigned short Channelmode_highest;
+
+extern Umode *UmodeAdd(Module *module, char ch, int options, int unset_on_deoper, int (*allowed)(Client *client, int what), long *mode);
+extern void UmodeDel(Umode *umode);
+
+extern Snomask *SnomaskAdd(Module *module, char ch, int (*allowed)(Client *client, int what), long *mode);
+extern void SnomaskDel(Snomask *sno);
+
+extern Cmode *CmodeAdd(Module *reserved, CmodeInfo req, Cmode_t *mode);
+extern void CmodeDel(Cmode *cmode);
+
+extern void moddata_init(void);
+extern ModDataInfo *ModDataAdd(Module *module, ModDataInfo req);
+extern void ModDataDel(ModDataInfo *md);
+extern void unload_all_unused_moddata(void);
+
+#define LISTENER_NORMAL		0x000001
+#define LISTENER_CLIENTSONLY	0x000002
+#define LISTENER_SERVERSONLY	0x000004
+#define LISTENER_TLS		0x000010
+#define LISTENER_BOUND		0x000020
+#define LISTENER_DEFER_ACCEPT	0x000040
+
+#define IsServersOnlyListener(x)	((x) && ((x)->options & LISTENER_SERVERSONLY))
+
+#define CONNECT_TLS		0x000001
+//0x000002 unused (was ziplinks)
+#define CONNECT_AUTO		0x000004
+#define CONNECT_QUARANTINE	0x000008
+#define CONNECT_NODNSCACHE	0x000010
+#define CONNECT_NOHOSTCHECK	0x000020
+#define CONNECT_INSECURE	0x000040
+
+#define TLSFLAG_FAILIFNOCERT 	0x1
+#define TLSFLAG_NOSTARTTLS	0x8
+#define TLSFLAG_DISABLECLIENTCERT 0x10
+
+/** This shows the Client struct (any client), the User struct (a user), Server (a server) that are commonly accessed both in the core and by 3rd party coders.
+ * @defgroup CommonStructs Common structs
+ * @{
+ */
+
+/** A client on this or a remote server - can be a user, server, unknown, etc..
+ */
+struct Client {
+	struct list_head client_node;		/**< For global client list (client_list) */
+	struct list_head lclient_node;		/**< For local client list (lclient_list) */
+	struct list_head special_node;		/**< For special lists (server || unknown || oper) */
+	LocalClient *local;			/**< Additional information regarding locally connected clients */
+	ClientUser *user;			/**< Additional information, if this client is a user */
+	Server *serv;				/**< Additional information, if this is a server */
+	ClientStatus status;			/**< Client status, one of CLIENT_STATUS_* */
+	struct list_head client_hash;		/**< For name hash table (clientTable) */
+	char name[HOSTLEN + 1];			/**< Unique name of the client: nickname for users, hostname for servers */
+	time_t lastnick;			/**< Timestamp on nick */
+	long flags;				/**< Client flags (one or more of CLIENT_FLAG_*) */
+	long umodes;				/**< Client usermodes (if user) */
+	Client *direction;			/**< Direction from which this client originated.
+	                                             This always points to a directly connected server or &me.
+	                                             It is never NULL */
+	unsigned char hopcount;			/**< Number of servers to this, 0 means local client */
+	char ident[USERLEN + 1];		/**< Ident of the user, if available. Otherwise set to "unknown". */
+	char info[REALLEN + 1];			/**< Additional client information text. For users this is gecos/realname */
+	char id[IDLEN + 1];			/**< Unique ID: SID or UID */
+	struct list_head id_hash;		/**< For UID/SID hash table (idTable) */
+	Client *srvptr;				/**< Server on where this client is connected to (can be &me) */
+	char *ip;				/**< IP address of user or server (never NULL) */
+	ModData moddata[MODDATA_MAX_CLIENT];	/**< Client attached module data, used by the ModData system */
+};
+
+/** Local client information, use client->local to access these (see also @link Client @endlink).
+ */
+struct LocalClient {
+	int fd;				/**< File descriptor, can be <0 if socket has been closed already. */
+	SSL *ssl;			/**< OpenSSL/LibreSSL struct for SSL/TLS connection */
+	time_t since;			/**< Time when user will next be allowed to send something (actually since<currenttime+10) */
+	time_t firsttime;		/**< Time user was created (connected on IRC) */
+	time_t lasttime;		/**< Last time any message was received */
+	dbuf sendQ;			/**< Outgoing send queue (data to be sent) */
+	dbuf recvQ;			/**< Incoming receive queue (incoming data yet to be parsed) */
+	ConfigItem_class *class;	/**< The class { } block associated to this client */
+	int proto;			/**< PROTOCTL options */
+	long caps;			/**< User: enabled capabilities (via CAP command) */
+	time_t nexttarget;		/**< Next time that a new target will be allowed (msg/notice/invite) */
+	u_char targets[MAXCCUSERS];	/**< Hash values of targets for target limiting */
+	ConfigItem_listen *listener;	/**< If this client IsListening() then this is the listener configuration attached to it */
+	long serial;			/**< Current serial number for send.c functions (to avoid sending duplicate messages) */
+	time_t nextnick;		/**< Time the next nick change will be allowed */
+	time_t last;			/**< Last time a RESETIDLE message was received (PRIVMSG) */
+	long sendM;			/**< Statistics: protocol messages send */
+	long sendK;			/**< Statistics: total k-bytes send */
+	long receiveM;			/**< Statistics: protocol messages received */
+	long receiveK;			/**< Statistics: total k-bytes received */
+	u_short sendB;			/**< Statistics: counters to count upto 1-k lots of bytes */
+	u_short receiveB;		/**< Statistics: sent and received (???) */
+	short lastsq;			/**< # of 2k blocks when sendqueued called last */
+	Link *watch;			/**< Watch notification list (WATCH) for this user */
+	u_short watches;		/**< Number of entries in the watch list */
+	ModData moddata[MODDATA_MAX_LOCAL_CLIENT];	/**< LocalClient attached module data, used by the ModData system */
+#ifdef DEBUGMODE
+	time_t cputime;			/**< Something with debugging (why is this a time_t? TODO) */
+#endif
+	char *error_str;		/**< Quit reason set by dead_socket() in case of socket/buffer error, later used by exit_client() */
+	char sasl_agent[NICKLEN + 1];	/**< SASL: SASL Agent the user is interacting with */
+	unsigned char sasl_out;		/**< SASL: Number of outgoing sasl messages */
+	unsigned char sasl_complete;	/**< SASL: >0 if SASL authentication was successful */
+	time_t sasl_sent_time;		/**< SASL: 0 or the time that the (last) AUTHENTICATE command has been sent */
+	char *sni_servername;		/**< Servername as sent by client via SNI (Server Name Indication) in SSL/TLS, otherwise NULL */
+	int cap_protocol;		/**< CAP protocol in use. At least 300 for any CAP capable client. 302 for 3.2, etc.. */
+	uint32_t nospoof;		/**< Anti-spoofing random number (used in user handshake PING/PONG) */
+	char *passwd;			/**< Password used during connect, if any (freed once connected and set to NULL) */
+	int authfd;			/**< File descriptor for ident checking (RFC931) */
+	int identbufcnt;		/**< Counter for 'ident' reading code */
+	struct hostent *hostp;		/**< Host record for this client (used by DNS code) */
+	char sockhost[HOSTLEN + 1];	/**< Hostname from the socket */
+	u_short port;			/**< Remote TCP port of client */
+};
+
+/** User information (persons, not servers), you use client->user to access these (see also @link Client @endlink).
+ */
+struct User {
+	Membership *channel;		/**< Channels that the user is in (linked list) */
+	Link *invited;			/**< Channels has the user been invited to (linked list) */
+	Link *dccallow;			/**< DCCALLOW list (linked list) */
+	char *away;			/**< AWAY message, or NULL if not away */
+	char svid[SVIDLEN + 1];		/**< Unique value assigned by services (SVID) */
+	unsigned short joined;		/**< Number of channels joined */
+	char username[USERLEN + 1];	/**< Username, the user portion in nick!user@host. */
+	char realhost[HOSTLEN + 1];	/**< Realhost, the real host of the user (IP or hostname) - usually this is not shown to other users */
+	char cloakedhost[HOSTLEN + 1];	/**< Cloaked host - generated by cloaking algorithm */
+	char *virthost;			/**< Virtual host - when user has user mode +x this is the active host */
+	char *server;			/**< Server name the user is on (?) */
+	SWhois *swhois;			/**< Special "additional" WHOIS entries such as "a Network Administrator" */
+	aWhowas *whowas;		/**< Something for whowas :D :D */
+	int snomask;			/**< Server Notice Mask (snomask) - only for IRCOps */
+	char *operlogin;		/**< Which oper { } block was used to oper up, otherwise NULL - used by oper::maxlogins */
+	struct {
+		time_t nick_t;		/**< For set::anti-flood::nick-flood: time */
+		time_t away_t;		/**< For set::anti-flood::away-flood: time */
+		time_t knock_t;		/**< For set::anti-flood::knock-flood: time */
+		time_t invite_t;	/**< For set::anti-flood::invite-flood: time */
+		unsigned char nick_c;	/**< For set::anti-flood::nick-flood: counter */
+		unsigned char away_c;	/**< For set::anti-flood::away-flood: counter */
+		unsigned char knock_c;	/**< For set::anti-flood::knock-flood: counter */
+		unsigned char invite_c;	/**< For set::anti-flood::invite-flood: counter */
+	} flood;			/**< Anti-flood counters */
+	time_t lastaway;		/**< Last time the user went AWAY */
+};
+
+/** Server information (local servers and remote servers), you use client->serv to access these (see also @link Client @endlink).
+ */
+struct Server {
+	char *up;			/**< Name of uplink for this server */
+	char by[NICKLEN + 1];		/**< Uhhhh - who activated this connection - AGAIN? */
+	ConfigItem_link *conf;		/**< link { } block associated with this server, or NULL */
+	time_t timestamp;		/**< Remotely determined connect try time */
+	long users;			/**< Number of users on this server */
+	time_t boottime;		/**< Startup time of server (boot time) */
+	struct {
+		unsigned synced:1;	/**< Server synchronization finished? (3.2beta18+) */
+		unsigned server_sent:1;	/**< SERVER message sent to this link? (for outgoing links) */
+	} flags;
+	struct {
+		char *usermodes;	/**< Usermodes that this server knows about */
+		char *chanmodes[4];	/**< Channel modes that this server knows (in 4 groups, like CHANMODES= in ISUPPORT/005) */
+		int protocol;		/**< Link-protocol version */
+		char *software;		/**< Name of the software (eg: unrealircd-X.Y.Z) */
+		char *nickchars;	/**< Nick character sets active on this server) */
+	} features;
+};
+
+/* @} */
+
+struct MessageTag {
+	MessageTag *prev, *next;
+	char *name;
+	char *value;
+};
+
+typedef struct NameValueList NameValueList;
+struct NameValueList {
+	NameValueList *prev, *next;
+	char *name;
+	char *value;
+};
+
+/* conf preprocessor */
+typedef enum PreprocessorItem {
+	PREPROCESSOR_ERROR		= 0,
+	PREPROCESSOR_DEFINE		= 1,
+	PREPROCESSOR_IF			= 2,
+	PREPROCESSOR_ENDIF		= 3
+} PreprocessorItem;
+
+typedef enum PreprocessorPhase {
+	PREPROCESSOR_PHASE_INITIAL	= 1,
+	PREPROCESSOR_PHASE_MODULE	= 2
+} PreprocessorPhase;
+
+typedef enum AuthenticationType {
+	AUTHTYPE_INVALID		= -1,
+	AUTHTYPE_PLAINTEXT		= 0,
+	AUTHTYPE_TLS_CLIENTCERT		= 1,
+	AUTHTYPE_TLS_CLIENTCERTFP	= 2,
+	AUTHTYPE_SPKIFP			= 3,
+	AUTHTYPE_UNIXCRYPT		= 4,
+	AUTHTYPE_BCRYPT			= 5,
+	AUTHTYPE_ARGON2			= 6,
+} AuthenticationType;
+
+typedef struct AuthConfig AuthConfig;
+/** Authentication Configuration - this can be a password or
+ * other authentication method that was parsed from the
+ * configuration file.
+ */
+struct AuthConfig {
+	AuthenticationType	type;  /**< Type of data, one of AUTHTYPE_* */
+	char			*data; /**< Data associated with this record */
+};
+
+#ifndef HAVE_CRYPT
+#define crypt DES_crypt
+#endif
+
+/*
+ * conf2 stuff -stskeeps
+*/
+
+typedef enum ConfigIfCondition { IF_DEFINED=1, IF_VALUE=2, IF_MODULE=3} ConfigIfCondition;
+
+struct ConditionalConfig
+{
+	ConditionalConfig *prev, *next;
+	int priority; /**< Preprocessor level. Starts with 1, then 2, 3, .. */
+	ConfigIfCondition condition; /**< See ConfigIfCondition, one of: IF_* */
+	int negative; /**< For ! conditions */
+	char *name; /**< Name of the variable or module */
+	char *opt; /**< Only for IF_VALUE */
+};
+
+struct ConfigFile
+{
+        char            *cf_filename;
+        ConfigEntry     *cf_entries;
+        ConfigFile     *cf_next;
+};
+
+struct ConfigEntry
+{
+        ConfigFile	*ce_fileptr;
+        int 	 	ce_varlinenum, ce_fileposstart, ce_fileposend, ce_sectlinenum;
+        char 		*ce_varname, *ce_vardata;
+        ConfigEntry     *ce_entries, *ce_prevlevel, *ce_next;
+        ConditionalConfig *ce_cond;
+};
+
+struct ConfigFlag 
+{
+	unsigned	temporary : 1;
+	unsigned	permanent : 1;
+};
+
+/* configflag specialized for except socks/ban -Stskeeps */
+
+struct ConfigFlag_except
+{
+	unsigned	temporary : 1;
+	unsigned	type	  : 4;
+};
+
+struct ConfigFlag_ban
+{
+	unsigned	temporary : 1;
+	unsigned	type	  : 4;
+	unsigned	type2	  : 2;
+};
+
+struct ConfigFlag_tld
+{
+	unsigned	temporary : 1;
+	unsigned	motdptr   : 1;
+	unsigned	ruleclient  : 1;
+};
+
+#define CONF_BAN_SERVER          1
+#define CONF_BAN_VERSION         2
+#define CONF_BAN_REALNAME        3
+
+#define CONF_BAN_TYPE_CONF	0
+#define CONF_BAN_TYPE_AKILL	1
+#define CONF_BAN_TYPE_TEMPORARY 2
+
+#define CRULE_ALL		0
+#define CRULE_AUTO		1
+
+struct ConfigItem {
+	ConfigItem *prev, *next;
+	ConfigFlag flag;
+};
+
+struct ConfigItem_me {
+	char	   *name, *info, *sid;
+};
+
+struct ConfigItem_files {
+	char	*motd_file, *rules_file, *smotd_file;
+	char	*botmotd_file, *opermotd_file, *svsmotd_file;
+	char	*pid_file, *tune_file;
+};
+
+struct ConfigItem_admin {
+	ConfigItem_admin *prev, *next;
+	ConfigFlag flag;
+	char	   *line; 
+};
+
+#define CLASS_OPT_NOFAKELAG		0x1
+
+struct ConfigItem_class {
+	ConfigItem_class *prev, *next;
+	ConfigFlag flag;
+	char	   *name;
+	int	   pingfreq, connfreq, maxclients, sendq, recvq, clients;
+	int xrefcount; /* EXTRA reference count, 'clients' also acts as a reference count but
+	                * link blocks also refer to classes so a 2nd ref. count was needed.
+	                */
+	unsigned int options;
+};
+
+struct ConfigFlag_allow {
+	unsigned	noident :1;
+	unsigned	useip :1;
+	unsigned	tls :1;
+};
+
+struct ConfigItem_allow {
+	ConfigItem_allow	*prev, *next;
+	ConfigFlag			flag;
+	char				*ip, *hostname, *server;
+	AuthConfig		*auth;	
+	unsigned short		maxperip;
+	int					port;
+	ConfigItem_class	*class;
+	ConfigFlag_allow	flags;
+	unsigned short ipv6_clone_mask;
+};
+
+struct OperClassACLPath
+{
+	OperClassACLPath *prev,*next;
+	char *identifier;
+};
+
+struct OperClassACLEntryVar
+{
+        OperClassACLEntryVar *prev,*next;
+        char *name;
+        char *value;
+};
+
+struct OperClassACLEntry
+{
+        OperClassACLEntry *prev,*next;
+        OperClassACLEntryVar *variables;
+        OperClassEntryType type;
+};
+
+struct OperClassACL
+{
+        OperClassACL *prev,*next;
+        char *name;
+        OperClassACLEntry *entries;
+        OperClassACL *acls;
+};
+
+struct OperClass
+{
+        char *ISA;
+        char *name;
+        OperClassACL *acls;
+};
+
+struct OperClassCheckParams
+{
+        Client *client;
+        Client *victim;
+        Channel *channel;
+        void *extra;
+};
+
+struct ConfigItem_operclass {
+	ConfigItem_operclass *prev, *next;
+	OperClass *classStruct;
+};
+
+struct ConfigItem_oper {
+	ConfigItem_oper *prev, *next;
+	ConfigFlag flag;
+	char *name, *snomask;
+	SWhois *swhois;
+	AuthConfig *auth;
+	char *operclass;
+	ConfigItem_class *class;
+	ConfigItem_mask *mask;
+	unsigned long modes, require_modes;
+	char *vhost;
+	int maxlogins;
+};
+
+/** The SSL/TLS options that are used in set::tls and otherblocks::tls-options.
+ * NOTE: If you add something here then you must also update the
+ *       conf_tlsblock() function in s_conf.c to have it inherited
+ *       from set::tls to the other config blocks!
+ */
+typedef struct TLSOptions TLSOptions;
+struct TLSOptions {
+	char *certificate_file;
+	char *key_file;
+	char *dh_file;
+	char *trusted_ca_file;
+	unsigned int protocols;
+	char *ciphers;
+	char *ciphersuites;
+	char *ecdh_curves;
+	char *outdated_protocols;
+	char *outdated_ciphers;
+	long options;
+	int renegotiate_bytes;
+	int renegotiate_timeout;
+	int sts_port;
+	long sts_duration;
+	int sts_preload;
+};
+
+struct ConfigItem_mask {
+	ConfigItem_mask *prev, *next;
+	ConfigFlag flag;
+	char *mask;
+};
+
+struct ConfigItem_drpass {
+	AuthConfig	 *restartauth;
+	AuthConfig	 *dieauth;
+};
+
+struct ConfigItem_ulines {
+	ConfigItem_ulines  *prev, *next;
+	ConfigFlag 	 flag;
+	char 		 *servername;
+};
+
+#define TLD_TLS		0x1
+#define TLD_REMOTE	0x2
+
+struct ConfigItem_tld {
+	ConfigItem_tld 	*prev, *next;
+	ConfigFlag_tld 	flag;
+	char 		*mask, *channel;
+	char 		*motd_file, *rules_file, *smotd_file;
+	char 		*botmotd_file, *opermotd_file;
+	MOTDFile	rules, motd, smotd, botmotd, opermotd;
+	u_short		options;
+};
+
+struct ConfigItem_listen {
+	ConfigItem_listen *prev, *next;
+	ConfigFlag flag;
+	char *ip;
+	int port;
+	int options, clients;
+	int fd;
+	int ipv6;
+	SSL_CTX *ssl_ctx;
+	TLSOptions *tls_options;
+	int websocket_options; /* should be in module, but lazy */
+};
+
+struct ConfigItem_sni {
+	ConfigItem_sni *prev, *next;
+	ConfigFlag flag;
+	char *name;
+	SSL_CTX *ssl_ctx;
+	TLSOptions *tls_options;
+};
+
+struct ConfigItem_vhost {
+	ConfigItem_vhost 	*prev, *next;
+	ConfigFlag 	flag;
+	ConfigItem_mask *mask;
+	char		*login, *virthost, *virtuser;
+	SWhois *swhois;
+	AuthConfig	*auth;
+};
+
+struct ConfigItem_link {
+	ConfigItem_link	*prev, *next;
+	ConfigFlag	flag;
+	/* config options: */
+	char *servername; /**< Name of the server ('link <servername> { }') */
+	struct {
+		ConfigItem_mask *mask; /**< incoming mask(s) to accept */
+	} incoming;
+	struct {
+		char *bind_ip; /**< Our IP to bind to when doing the connect */
+		char *hostname; /**< Hostname or IP to connect to */
+		int port; /**< Port to connect to */
+		int options; /**< Connect options like tls or autoconnect */
+	} outgoing;
+	AuthConfig *auth; /**< authentication method (eg: password) */
+	char *hub; /**< Hub mask */
+	char *leaf; /**< Leaf mask */
+	int leaf_depth; /**< Leaf depth */
+	ConfigItem_class *class; /**< Class the server should use */
+	int options; /**< Generic options such as quarantine */
+	int verify_certificate;
+	/* internal: */
+	int	refcount; /**< Reference counter (used so we know if the struct may be freed) */
+	time_t hold; /**< For how long the server is "on hold" for outgoing connects (why?) */
+	char *connect_ip; /**< actual IP to use for outgoing connect (filled in after host is resolved) */
+	SSL_CTX *ssl_ctx; /**< SSL Context for outgoing connection (optional) */
+	TLSOptions *tls_options; /**< SSL Options for outgoing connection (optional) */
+};
+
+struct ConfigItem_except {
+	ConfigItem_except      *prev, *next;
+	ConfigFlag_except      flag;
+	int type;
+	char		*mask;
+};
+
+struct ConfigItem_ban {
+	ConfigItem_ban	*prev, *next;
+	ConfigFlag_ban	flag;
+	char			*mask, *reason;
+	unsigned short action;
+};
+
+struct ConfigItem_deny_dcc {
+	ConfigItem_deny_dcc		*prev, *next;
+	ConfigFlag_ban		flag;
+	char			*filename, *reason;
+};
+
+struct ConfigItem_deny_link {
+	ConfigItem_deny_link *prev, *next;
+	ConfigFlag_except flag;
+	char *mask, *rule, *prettyrule;
+};
+
+struct ConfigItem_deny_version {
+	ConfigItem_deny_version	*prev, *next;
+	ConfigFlag		flag;
+	char 			*mask, *version, *flags;
+};
+
+struct ConfigItem_deny_channel {
+	ConfigItem_deny_channel		*prev, *next;
+	ConfigFlag		flag;
+	char			*channel, *reason, *redirect, *class;
+	unsigned char	warn;
+	ConfigItem_mask *mask;
+};
+
+struct ConfigItem_allow_channel {
+	ConfigItem_allow_channel		*prev, *next;
+	ConfigFlag		flag;
+	char			*channel, *class;
+	ConfigItem_mask *mask;
+};
+
+struct ConfigItem_allow_dcc {
+	ConfigItem_allow_dcc		*prev, *next;
+	ConfigFlag_ban	flag;
+	char			*filename;
+};
+
+struct ConfigItem_log {
+	ConfigItem_log *prev, *next;
+	ConfigFlag flag;
+	char *file;
+	long maxsize;
+	int  flags;
+	int  logfd;
+};
+
+struct ConfigItem_unknown {
+	ConfigItem_unknown *prev, *next;
+	ConfigFlag flag;
+	ConfigEntry *ce;
+};
+
+struct ConfigItem_unknown_ext {
+	ConfigItem_unknown_ext *prev, *next;
+	ConfigFlag flag;
+	char *ce_varname, *ce_vardata;
+	ConfigFile      *ce_fileptr;
+	int             ce_varlinenum;
+	ConfigEntry     *ce_entries;
+};
+
+
+typedef enum { 
+	ALIAS_SERVICES=1, ALIAS_STATS, ALIAS_NORMAL, ALIAS_COMMAND, ALIAS_CHANNEL, ALIAS_REAL
+} AliasType;
+
+struct ConfigItem_alias {
+	ConfigItem_alias *prev, *next;
+	ConfigFlag flag;
+	ConfigItem_alias_format *format;
+	char *alias, *nick;
+	AliasType type;
+	unsigned int spamfilter:1;
+};
+
+struct ConfigItem_alias_format {
+	ConfigItem_alias_format *prev, *next;
+	ConfigFlag flag;
+	char *nick;
+	AliasType type;
+	char *format, *parameters;
+	Match *expr;
+};
+
+/**
+ * In a rehash scenario, conf_include will contain all of the included
+ * configs that are actually in use. It also will contain includes
+ * that are being processed so that the configuration may be updated.
+ * INCLUDE_NOTLOADED is set on all of the config files that are being
+ * loaded and unset on already-loaded files. See
+ * unload_loaded_includes() and load_includes().
+ */
+#define INCLUDE_NOTLOADED  0x1
+#define INCLUDE_REMOTE     0x2
+#define INCLUDE_DLQUEUED   0x4
+/**
+ * Marks that an include was loaded without error. This seems to
+ * overlap with the INCLUDE_NOTLOADED meaning(?). --binki
+ */
+#define INCLUDE_USED       0x8
+	
+struct ConfigItem_include {
+	ConfigItem_include *prev, *next;
+	ConfigFlag_ban flag;
+	char *file;
+#ifdef USE_LIBCURL
+	char *url;
+	char *errorbuf;
+#endif
+	char *included_from;
+	int included_from_line;
+};
+
+struct ConfigItem_blacklist_module {
+	ConfigItem_blacklist_module *prev, *next;
+	char *name;
+};
+
+struct ConfigItem_help {
+	ConfigItem_help *prev, *next;
+	ConfigFlag flag;
+	char *command;
+	MOTDLine *text;
+};
+
+struct ConfigItem_offchans {
+	ConfigItem_offchans *prev, *next;
+	char chname[CHANNELLEN+1];
+	char *topic;
+};
+
+
+#define HM_HOST 1
+#define HM_IPV4 2
+#define HM_IPV6 3
+
+#define SETTER_NICK 0
+#define SETTER_NICK_USER_HOST 1
+
+/*
+ * statistics structures
+ */
+typedef struct IRCStatistics IRCStatistics;
+struct IRCStatistics {
+	unsigned int is_cl;	/* number of client connections */
+	unsigned int is_sv;	/* number of server connections */
+	unsigned int is_ni;	/* connection but no idea who it was */
+	unsigned short is_cbs;	/* bytes sent to clients */
+	unsigned short is_cbr;	/* bytes received to clients */
+	unsigned short is_sbs;	/* bytes sent to servers */
+	unsigned short is_sbr;	/* bytes received to servers */
+	unsigned long is_cks;	/* k-bytes sent to clients */
+	unsigned long is_ckr;	/* k-bytes received to clients */
+	unsigned long is_sks;	/* k-bytes sent to servers */
+	unsigned long is_skr;	/* k-bytes received to servers */
+	time_t is_cti;		/* time spent connected by clients */
+	time_t is_sti;		/* time spent connected by servers */
+	unsigned int is_ac;	/* connections accepted */
+	unsigned int is_ref;	/* accepts refused */
+	unsigned int is_unco;	/* unknown commands */
+	unsigned int is_wrdi;	/* command going in wrong direction */
+	unsigned int is_unpf;	/* unknown prefix */
+	unsigned int is_empt;	/* empty message */
+	unsigned int is_num;	/* numeric message */
+	unsigned int is_kill;	/* number of kills generated on collisions */
+	unsigned int is_fake;	/* MODE 'fakes' */
+	unsigned int is_asuc;	/* successful auth requests */
+	unsigned int is_abad;	/* bad auth requests */
+	unsigned int is_udp;	/* packets recv'd on udp port */
+	unsigned int is_loc;	/* local connections made */
+};
+
+typedef struct MemoryInfo {
+	unsigned int classes;
+	unsigned long classesmem;
+} MemoryInfo;
+
+#define EXTCMODETABLESZ 32
+
+/* Number of maximum paramter modes to allow.
+ * Don't set it unnecessarily high.. we only use k, l, L, j and f at the moment.
+ */
+#define MAXPARAMMODES 16
+
+/** Channel Mode.
+ * NOTE: you normally don't access these struct members directly.
+ * For simple checking if a mode is set, use has_channel_mode()
+ * Otherwise, see the extended channel modes API, CmodeAdd(), etc.
+ */
+struct Mode {
+	long mode;				/**< Core modes set on this channel (one of MODE_*) */
+	Cmode_t extmode;			/**< Other ("extended") channel modes set on this channel */
+	void *extmodeparams[MAXPARAMMODES+1];	/**< Parameters for extended channel modes */
+	int  limit;				/**< The +l limit in effect (eg: 40), if any - otherwise 0 */
+	char key[KEYLEN + 1];			/**< The +k key in effect (eg: secret), if any - otherwise NULL */
+};
+
+/* Used for notify-hash buckets... -Donwulff */
+
+struct Watch {
+	Watch *hnext;
+	time_t lasttime;
+	Link *watch;
+	char nick[1];
+};
+
+/** General link structure used for certain chains (watch list, invite list, dccallow).
+ * Note that these always require you to use the make_link() and free_link() functions.
+ * Do not combine with other alloc/free functions!!
+ */
+struct Link {
+	struct Link *next;
+	int flags;
+	union {
+		Client *client;
+		Channel *channel;
+		Watch *wptr;
+		/* there used to be 'char *cp' here too,
+		 * but in such a case you better use NameList
+		 * instead of Link!
+		 */
+	} value;
+};
+
+/**
+ * @addtogroup CommonStructs
+ * @{
+ */
+
+/** A channel on IRC */
+struct Channel {
+	struct Channel *nextch;			/**< Next channel in linked list (channel) */
+	struct Channel *prevch;			/**< Previous channel in linked list (channel) */
+	struct Channel *hnextch;		/**< Next channel in hash table */
+	Mode mode;				/**< Channel Mode set on this channel */
+	time_t creationtime;			/**< When the channel was first created */
+	char *topic;				/**< Channel TOPIC */
+	char *topic_nick;			/**< Person (or server) who set the TOPIC */
+	time_t topic_time;			/**< Time at which the topic was last set */
+	int users;				/**< Number of users in the channel */
+	Member *members;			/**< List of channel members (users in the channel) */
+	Link *invites;				/**< List of outstanding /INVITE's from ops */
+	Ban *banlist;				/**< List of bans (+b) */
+	Ban *exlist;				/**< List of ban exceptions (+e) */
+	Ban *invexlist;				/**< List of invite exceptions (+I) */
+	char *mode_lock;			/**< Mode lock (MLOCK) applied to channel - usually by Services */
+	ModData moddata[MODDATA_MAX_CHANNEL];	/**< Channel attached module data, used by the ModData system */
+	char chname[1];				/**< Channel name */
+};
+
+/** user/channel member struct (channel->members).
+ * This is Member which is used in the linked list channel->members for each channel.
+ * There is also Membership which is used in client->user->channels (see Membership for that).
+ * Both must be kept synchronized 100% at all times.
+ */
+struct Member
+{
+	struct Member *next;				/**< Next entry in list */
+	Client	      *client;				/**< The client */
+	int		flags;				/**< The access of the user on this channel (one or more of CHFL_*) */
+	ModData moddata[MODDATA_MAX_MEMBER];		/** Member attached module data, used by the ModData system */
+};
+
+/** user/channel membership struct (client->user->channels).
+ * This is Membership which is used in the linked list client->user->channels for each user.
+ * There is also Member which is used in channel->members (see Member for that).
+ * Both must be kept synchronized 100% at all times.
+ */
+struct Membership
+{
+	struct Membership 	*next;			/**< Next entry in list */
+	struct Channel		*channel;			/**< The channel */
+	int			flags;			/**< The access of the user on this channel (one or more of CHFL_*) */
+	ModData moddata[MODDATA_MAX_MEMBERSHIP];	/**< Membership attached module data, used by the ModData system */
+};
+
+/** @} */
+
+/** A ban, exempt or invite exception entry */
+struct Ban {
+	struct Ban *next;	/**< Next entry in list */
+	char *banstr;		/**< The string (eg: *!*@*.example.org) */
+	char *who;		/**< Person or server who set the entry (eg: Nick) */
+	time_t when;		/**< When the entry was added */
+};
+
+/*
+** Channel Related macros follow
+*/
+
+/* Channel related flags */
+#ifdef PREFIX_AQ
+ #define CHFL_CHANOP_OR_HIGHER (CHFL_CHANOP|CHFL_CHANADMIN|CHFL_CHANOWNER)
+ #define CHFL_HALFOP_OR_HIGHER (CHFL_CHANOWNER|CHFL_CHANADMIN|CHFL_CHANOP|CHFL_HALFOP)
+#else
+ #define CHFL_CHANOP_OR_HIGHER (CHFL_CHANOP)
+ #define CHFL_HALFOP_OR_HIGHER (CHFL_CHANOP|CHFL_HALFOP)
+#endif
+
+/** Channel flags (privileges) of users on a channel.
+ * This is used by Member and Membership (m->flags) to indicate the access rights of a user in a channel.
+ * Also used by SJOIN and MODE to set some flags while a JOIN or MODE is in process.
+ * @defgroup ChannelFlags Channel access flags
+ * @{
+ */
+/** Is channel owner (+q) */
+#define is_chanowner(cptr,channel) (get_access(cptr,channel) & CHFL_CHANOWNER)
+/** Is channel admin (+a) */
+#define is_chanadmin(cptr,channel) (get_access(cptr,channel) & CHFL_CHANADMIN)
+/** Is channel operator or higher (+o/+a/+q) */
+#define is_chan_op(cptr,channel) (get_access(cptr,channel) & CHFL_CHANOP_OR_HIGHER)
+/** Is some kind of channel op (+h/+o/+a/+q) */
+#define is_skochanop(cptr,channel) (get_access(cptr,channel) & CHFL_HALFOP_OR_HIGHER)
+/** Is half-op (+h) */
+#define is_half_op(cptr,channel) (get_access(cptr,channel) & CHFL_HALFOP)
+/** Has voice (+v) */
+#define has_voice(cptr,channel) (get_access(cptr,channel) & CHFL_VOICE)
+/* Important:
+ * Do not blindly change the values of CHFL_* as they must match the
+ * ones in MODE_*. I already screwed this up twice. -- Syzop
+ * Obviously these should be decoupled in a code cleanup.
+ */
+#define	CHFL_CHANOP     0x0001	/**< Channel operator (+o) */
+#define	CHFL_VOICE      0x0002	/**< Voice (+v, can speak through bans and +m) */
+#define	CHFL_DEOPPED	0x0004	/**< De-oped by a server (temporary state) */
+#define CHFL_CHANOWNER	0x0040	/**< Channel owner (+q) */
+#define CHFL_CHANADMIN	0x0080	/**< Channel admin (+a) */
+#define CHFL_HALFOP	0x0100	/**< Channel halfop (+h) */
+#define	CHFL_BAN     	0x0200	/**< Channel ban (+b) - not a real flag, only used in sjoin.c */
+#define CHFL_EXCEPT	0x0400	/**< Channel except (+e) - not a real flag, only used in sjoin.c */
+#define CHFL_INVEX	0x0800  /**< Channel invite exception (+I) - not a real flag, only used in sjoin.c */
+/** @} */
+
+#define CHFL_REJOINING	0x8000  /* used internally by rejoin_* */
+
+#define	CHFL_OVERLAP    (CHFL_CHANOWNER|CHFL_CHANADMIN|CHFL_CHANOP|CHFL_VOICE|CHFL_HALFOP)
+
+/* Channel macros */
+/* Don't blindly change these MODE_* values, see comment 20 lines up! */
+#define	MODE_CHANOP		CHFL_CHANOP
+#define	MODE_VOICE		CHFL_VOICE
+#define	MODE_PRIVATE		0x0004
+#define	MODE_SECRET		0x0008
+#define	MODE_MODERATED  	0x0010
+#define	MODE_TOPICLIMIT 	0x0020
+#define MODE_CHANOWNER		0x0040
+#define MODE_CHANADMIN		0x0080
+#define	MODE_HALFOP		0x0100
+#define MODE_EXCEPT		0x0200
+#define	MODE_BAN		0x0400
+#define	MODE_INVITEONLY 	0x0800
+#define	MODE_NOPRIVMSGS 	0x1000
+#define	MODE_KEY		0x2000
+#define	MODE_LIMIT		0x4000
+#define MODE_RGSTR		0x8000
+#define MODE_INVEX		0x8000000
+
+/*
+ * mode flags which take another parameter (With PARAmeterS)
+ */
+#define	MODE_WPARAS (MODE_HALFOP|MODE_CHANOP|MODE_VOICE|MODE_CHANOWNER|MODE_CHANADMIN|MODE_BAN|MODE_KEY|MODE_LIMIT|MODE_EXCEPT|MODE_INVEX)
+/*
+ * Undefined here, these are used in conjunction with the above modes in
+ * the source.
+#define	MODE_DEL       0x200000000
+#define	MODE_ADD       0x400000000
+ */
+
+#define	HoldChannel(x)		(!(x))
+/* name invisible */
+#define	SecretChannel(x)	((x) && ((x)->mode.mode & MODE_SECRET))
+/* channel not shown but names are */
+#define	HiddenChannel(x)	((x) && ((x)->mode.mode & MODE_PRIVATE))
+/* channel visible */
+#define	ShowChannel(v,c)	(PubChannel(c) || IsMember((v),(c)))
+#define	PubChannel(x)		((!x) || ((x)->mode.mode &\
+				 (MODE_PRIVATE | MODE_SECRET)) == 0)
+
+#define	IsChannelName(name) ((name) && (*(name) == '#'))
+
+#define IsMember(blah,chan) ((blah && blah->user && \
+                find_membership_link((blah->user)->channel, chan)) ? 1 : 0)
+
+
+/* Misc macros */
+
+#define	BadPtr(x) (!(x) || (*(x) == '\0'))
+
+/** Is valid character in nick? [not for external usage, use do_check_nickname instead!] */
+#define isvalid(c)   (char_atribs[(u_char)(c)]&ALLOWN)
+
+
+#define TStime() (timeofday)
+
+/* used in SetMode() in channel.c and cmd_umode() in s_msg.c */
+
+#define	MODE_NULL      0
+#define	MODE_ADD       0x40000000
+#define	MODE_DEL       0x20000000
+
+/* return values for hunt_server() */
+
+#define	HUNTED_NOSUCH	(-1)	/* if the hunted server is not found */
+#define	HUNTED_ISME	0	/* if this server should execute the command */
+#define	HUNTED_PASS	1	/* if message passed onwards successfully */
+
+/* used when sending to #mask or $mask */
+
+#define	MATCH_SERVER  1
+#define	MATCH_HOST    2
+
+/* misc variable externs */
+
+extern MODVAR char *version, *infotext[], *dalinfotext[], *unrealcredits[], *unrealinfo[];
+extern MODVAR char *generation, *creation;
+extern MODVAR char *gnulicense[];
+/* misc defines */
+
+#define	COMMA		","
+
+#define isexcept void
+
+extern MODVAR SSL_CTX *ctx;
+extern MODVAR SSL_CTX *ctx_server;
+extern MODVAR SSL_CTX *ctx_client;
+
+extern SSL_METHOD *meth;
+extern int early_init_ssl();
+extern int init_ssl();
+extern int ssl_handshake(Client *);   /* Handshake the accpeted con.*/
+extern int ssl_client_handshake(Client *, ConfigItem_link *); /* and the initiated con.*/
+extern int ircd_SSL_accept(Client *acptr, int fd);
+extern int ircd_SSL_connect(Client *acptr, int fd);
+extern int SSL_smart_shutdown(SSL *ssl);
+extern void ircd_SSL_client_handshake(int, int, void *);
+extern void SSL_set_nonblocking(SSL *s);
+extern SSL_CTX *init_ctx(TLSOptions *tlsoptions, int server);
+
+#define TLS_PROTOCOL_TLSV1		0x0001
+#define TLS_PROTOCOL_TLSV1_1	0x0002
+#define TLS_PROTOCOL_TLSV1_2	0x0004
+#define TLS_PROTOCOL_TLSV1_3	0x0008
+
+#define TLS_PROTOCOL_ALL		0xffff
+
+struct ThrottlingBucket
+{
+	struct ThrottlingBucket *prev, *next;
+	char *ip;
+	time_t since;
+	char count;
+};
+
+typedef struct CoreChannelModeTable CoreChannelModeTable;
+struct CoreChannelModeTable {
+	long mode;			/**< Mode value (which bit will be set) */
+	char flag;			/**< Mode letter (eg: 't') */
+	unsigned halfop : 1;		/**< May halfop set this mode? 1/0 */
+	unsigned parameters : 1;	/**< Mode requires a parameter? 1/0 */
+};
+
+/** Parse channel mode */
+typedef struct ParseMode ParseMode;
+struct ParseMode {
+	int what;
+	char modechar;
+	char *param;
+	Cmode *extm;
+	char *modebuf; /* curr pos */
+	char *parabuf; /* curr pos */
+	char buf[512]; /* internal parse buffer */
+};
+
+typedef struct PendingServer PendingServer;
+struct PendingServer {
+	PendingServer *prev, *next;
+	char sid[IDLEN+1];
+};
+
+typedef struct PendingNet PendingNet;
+struct PendingNet {
+	PendingNet *prev, *next; /* Previous and next in list */
+	Client *client; /**< Client to which these servers belong */
+	PendingServer *servers; /**< The list of servers connected to the client */
+};
+
+extern void init_throttling();
+extern struct ThrottlingBucket *find_throttling_bucket(Client *);
+extern void add_throttling_bucket(Client *);
+extern int throttle_can_connect(Client *);
+
+typedef struct MaxTarget MaxTarget;
+struct MaxTarget {
+	MaxTarget *prev, *next;
+	char *cmd;
+	int limit;
+};
+#define MAXTARGETS_MAX	1000000 /* used for 'max' */
+
+#define VERIFY_OPERCOUNT(clnt,tag) { if (irccounts.operators < 0) verify_opercount(clnt,tag); } while(0)
+
+#define MARK_AS_OFFICIAL_MODULE(modinf)	do { if (modinf && modinf->handle) ModuleSetOptions(modinfo->handle, MOD_OPT_OFFICIAL, 1);  } while(0)
+#define MARK_AS_GLOBAL_MODULE(modinf)	do { if (modinf && modinf->handle) ModuleSetOptions(modinfo->handle, MOD_OPT_GLOBAL, 1);  } while(0)
+
+/* old.. please don't use anymore */
+#define CHANOPPFX "@"
+
+/* used for is_banned type field: */
+#define BANCHK_JOIN		0	/* checking if a ban forbids the person from joining */
+#define BANCHK_MSG		1	/* checking if a ban forbids the person from sending messages */
+#define BANCHK_NICK		2	/* checking if a ban forbids the person from changing his/her nick */
+#define BANCHK_LEAVE_MSG	3	/* checking if a ban forbids the person from leaving a message in PART or QUIT */
+#define BANCHK_TKL		4	/* called from a server ban routine, or other match_user() usage */
+
+#define TKLISTLEN		26
+#define TKLIPHASHLEN1		4
+#define TKLIPHASHLEN2		1021
+
+#define MATCH_CHECK_IP              0x0001
+#define MATCH_CHECK_REAL_HOST       0x0002
+#define MATCH_CHECK_CLOAKED_HOST    0x0004
+#define MATCH_CHECK_VISIBLE_HOST    0x0008
+#define MATCH_CHECK_EXTENDED        0x0010
+
+#define MATCH_CHECK_ALL             (MATCH_CHECK_IP|MATCH_CHECK_REAL_HOST|MATCH_CHECK_CLOAKED_HOST|MATCH_CHECK_VISIBLE_HOST|MATCH_CHECK_EXTENDED)
+#define MATCH_CHECK_REAL            (MATCH_CHECK_IP|MATCH_CHECK_REAL_HOST|MATCH_CHECK_EXTENDED)
+
+#define MATCH_MASK_IS_UHOST         0x1000
+#define MATCH_MASK_IS_HOST          0x2000
+
+#define MATCH_USE_IDENT             0x0100
+
+typedef enum {
+	POLICY_ALLOW=1,
+	POLICY_WARN=2,
+	POLICY_DENY=3
+} Policy;
+
+#define NO_EXIT_CLIENT	99
+
+/*-- badwords --*/
+
+#define MAX_MATCH       1
+#define MAX_WORDLEN	64
+
+#define PATTERN		"\\w*%s\\w*"
+#define REPLACEWORD	"<censored>"
+
+#define BADW_TYPE_INVALID 0x0
+#define BADW_TYPE_FAST    0x1
+#define BADW_TYPE_FAST_L  0x2
+#define BADW_TYPE_FAST_R  0x4
+#define BADW_TYPE_REGEX   0x8
+
+#define BADWORD_REPLACE 1
+#define BADWORD_BLOCK 2
+
+typedef struct ConfigItem_badword ConfigItem_badword;
+
+struct ConfigItem_badword {
+	ConfigItem_badword      *prev, *next;
+	ConfigFlag	flag;
+	char		*word, *replace;
+	unsigned short	type;
+	char		action;
+	pcre2_code	*pcre2_expr;
+};
+
+/*-- end of badwords --*/
+
+/* Flags for 'sendflags' in 'sendto_channel' */
+#define SEND_LOCAL	0x1
+#define SEND_REMOTE	0x2
+#define SEND_ALL	(SEND_LOCAL|SEND_REMOTE)
+#define SKIP_DEAF	0x4
+#define SKIP_CTCP	0x8
+
+#endif /* __struct_include__ */
+
+#include "dynconf.h"
diff --git a/include/sys.h b/include/sys.h
new file mode 100644
index 0000000..f651330
--- /dev/null
+++ b/include/sys.h
@@ -0,0 +1,227 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, include/sys.h
+ *   Copyright (C) 1990 University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   
+ *   $Id$
+ */
+
+#ifndef	__sys_include__
+#define __sys_include__
+
+/* PATH_MAX */
+#include <limits.h>
+
+#ifdef ISC202
+#include <net/errno.h>
+#else
+#include <errno.h>
+#endif
+#include "setup.h"
+#include <stdio.h>
+#include <sys/types.h>
+#ifndef _WIN32
+#include <sys/param.h>
+#else
+#include <stdarg.h>
+#include <process.h>
+#endif
+#include <stdlib.h>
+#ifndef _WIN32
+#include <unistd.h>
+#include <strings.h>
+#include <sys/resource.h>
+#endif
+
+/* get intptr_t if the system provides it -- otherwise, ./configure will define it for us */
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#else
+#ifdef HAVE_INTTYPES_H
+#include <inttypes.h>
+#endif /* HAVE_INTTYPES_H */
+#endif /* HAVE_STDINT_H */
+
+#ifdef SSL
+#include <openssl/ssl.h>
+#endif
+#ifndef _WIN32
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#endif
+
+#ifndef _WIN32
+#include <sys/time.h>
+#endif
+#include <time.h>
+
+#ifndef _WIN32
+#include <sys/wait.h>
+#ifndef WEXITSTATUS
+#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
+#endif
+#ifndef WIFEXITED
+#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
+#endif
+#endif
+
+/*
+ * Different name on NetBSD, FreeBSD, and BSDI
+ */
+#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__bsdi__) || defined(__linux__) || defined(__APPLE__)
+#define dn_skipname  __dn_skipname
+#endif
+
+/*
+ * Mac OS X Tiger Support (Intel Only)
+ */
+#if defined(macosx) || defined(__APPLE__)
+#define OSXTIGER
+#endif
+
+#ifndef _WIN32
+extern void dummy();
+#endif
+
+#ifdef	NO_U_TYPES
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+typedef unsigned long u_long;
+typedef unsigned int u_int;
+#endif
+
+#ifdef _WIN32
+#define MYOSNAME OSName
+extern char OSName[256];
+#define PATH_MAX MAX_PATH
+#define getpid _getpid
+#else
+#define MYOSNAME getosname()
+#endif
+
+#define MYDUMMY_SIZE 128
+
+/*
+ * Socket, File, and Error portability macros
+ */
+#ifndef _WIN32
+#define SET_ERRNO(x) errno = x
+#define READ_SOCK(fd, buf, len) read((fd), (buf), (len))
+#define WRITE_SOCK(fd, buf, len) write((fd), (buf), (len))
+#define CLOSE_SOCK(fd) close(fd)
+#define IOCTL(x, y, z) ioctl((x), (y), (z))
+#define ERRNO errno
+#define STRERROR(x) strerror(x)
+
+/* error constant portability */
+#define P_EMFILE        EMFILE
+#define P_ENOBUFS       ENOBUFS
+#define P_EWOULDBLOCK   EWOULDBLOCK
+#define P_EAGAIN        EAGAIN
+#define P_EINPROGRESS   EINPROGRESS
+#define P_EWORKING		EINPROGRESS
+#define P_EINTR         EINTR
+#define P_ETIMEDOUT     ETIMEDOUT
+#define P_ENOTSOCK	ENOTSOCK
+#define P_EIO		EIO
+#define P_ECONNABORTED	ECONNABORTED
+#define P_ECONNRESET	ECONNRESET
+#define P_ENOTCONN	ENOTCONN
+#define P_EMSGSIZE	EMSGSIZE
+#else
+/* WIN32 */
+
+#define NETDB_INTERNAL  -1  /* see errno */
+#define NETDB_SUCCESS   0   /* no problem */
+
+/* IO and Error portability macros */
+#define READ_SOCK(fd, buf, len) recv((fd), (buf), (len), 0)
+#define WRITE_SOCK(fd, buf, len) send((fd), (buf), (len), 0)
+#define CLOSE_SOCK(fd) closesocket(fd)
+#define IOCTL(x, y, z) ioctlsocket((x), (y), (z))
+#define ERRNO WSAGetLastError()
+#define STRERROR(x) sock_strerror(x)
+#define SET_ERRNO(x) WSASetLastError(x)
+/* Error constant portability */
+#define P_EMFILE        WSAEMFILE
+#define P_ENOBUFS       WSAENOBUFS
+#define P_EWOULDBLOCK   WSAEWOULDBLOCK
+#define P_EAGAIN        WSAEWOULDBLOCK
+#define P_EINPROGRESS   WSAEINPROGRESS
+#define P_EWORKING		WSAEWOULDBLOCK
+#define P_EINTR         WSAEINTR
+#define P_ETIMEDOUT     WSAETIMEDOUT
+#define P_ENOTSOCK	WSAENOTSOCK
+#define P_EIO		EIO
+#define P_ECONNABORTED	WSAECONNABORTED
+#define P_ECONNRESET	WSAECONNRESET
+#define P_ENOTCONN	WSAENOTCONN
+#define P_EMSGSIZE	WSAEMSGSIZE
+#endif
+
+#ifndef __GNUC__
+#define __attribute__(x) /* nothing */
+#endif
+
+#undef FORMAT_STRING
+#if _MSC_VER >= 1400
+# include <sal.h>
+# if _MSC_VER > 1400
+#  define FORMAT_STRING(p) _Printf_format_string_ p
+# else
+#  define FORMAT_STRING(p) __format_string p
+# endif /* FORMAT_STRING */
+#else
+# define FORMAT_STRING(p) p
+#endif /* _MSC_VER */
+
+/* A normal abort() on windows causes the crucial stack frame to be missing
+ * from the stack trace, IOTW: you don't see where abort() was called!
+ * It's silly but this works:
+ */
+#ifdef _WIN32
+ #define abort()  do { char *crash = NULL; *crash = 'x'; exit(1); } while(0)
+#endif
+
+#ifndef SOMAXCONN
+# define LISTEN_SIZE	(5)
+#else
+# define LISTEN_SIZE	(SOMAXCONN)
+#endif
+
+/*
+ * Try and find the correct name to use with getrlimit() for setting the max.
+ * number of files allowed to be open by this process.
+ */
+#ifdef RLIMIT_FDMAX
+# define RLIMIT_FD_MAX   RLIMIT_FDMAX
+#else
+# ifdef RLIMIT_NOFILE
+#  define RLIMIT_FD_MAX RLIMIT_NOFILE
+# else
+#  ifdef RLIMIT_OPEN_MAX
+#   define RLIMIT_FD_MAX RLIMIT_OPEN_MAX
+#  else
+#   undef RLIMIT_FD_MAX
+#  endif
+# endif
+#endif
+
+#endif /* __sys_include__ */
diff --git a/include/types.h b/include/types.h
new file mode 100644
index 0000000..1db1e34
--- /dev/null
+++ b/include/types.h
@@ -0,0 +1,43 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, include/types.h
+ *   (C) 2003 The UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef TYPES_H
+#define TYPES_H
+
+typedef void                    (*vFP)();       /* Void function pointer */
+typedef int                     (*iFP)();       /* Integer function pointer */
+typedef char                    (*cFP)();       /* char * function pointer */
+
+#ifndef MODVAR
+ #if defined(MODULE_COMPILE) && defined(_WIN32)
+  #define MODVAR __declspec(dllimport)
+ #else
+  #define MODVAR
+ #endif
+#endif
+
+#ifndef MODFUNC
+ #ifdef _WIN32
+  #define MODFUNC __declspec(dllexport)
+ #else
+  #define MODFUNC
+ #endif
+#endif
+
+#endif
diff --git a/include/unrealircd.h b/include/unrealircd.h
new file mode 100644
index 0000000..3ef4440
--- /dev/null
+++ b/include/unrealircd.h
@@ -0,0 +1,37 @@
+/** Standard include for all UnrealIRCd modules.
+ * This should normally provide all of UnrealIRCd's functionality
+ * (that is publicly exposed anyway).
+ */
+#include "config.h"
+#include <assert.h>
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "numeric.h"
+#include "msg.h"
+#include "mempool.h"
+#include "proto.h"
+#include "channel.h"
+#include <time.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <string.h>
+#ifdef GLOBH
+ #include <glob.h>
+#endif
+#ifdef _WIN32
+ #include <io.h>
+ #include <sys/timeb.h>
+ #undef GLOBH
+#else
+ #include <sys/resource.h>
+ #include <utime.h>
+#endif
+#include <fcntl.h>
+#include <signal.h>
+#include "h.h"
+#include "url.h"
+#include "version.h"
+#ifdef USE_LIBCURL
+ #include <curl/curl.h>
+#endif
diff --git a/include/url.h b/include/url.h
new file mode 100644
index 0000000..63584b0
--- /dev/null
+++ b/include/url.h
@@ -0,0 +1,13 @@
+#ifndef URL_H
+#define URL_H
+#include "types.h"
+
+int MODFUNC url_is_valid(const char *);
+extern const char MODFUNC *displayurl(const char *url);
+char MODFUNC *url_getfilename(const char *url);
+char MODFUNC *download_file(const char *, char **);
+void MODFUNC download_file_async(const char *, time_t, vFP, void *callback_data);
+void MODFUNC url_do_transfers_async(void);
+void MODFUNC url_init(void);
+
+#endif
diff --git a/include/version.h b/include/version.h
new file mode 100644
index 0000000..55badd4
--- /dev/null
+++ b/include/version.h
@@ -0,0 +1,72 @@
+/*
+**
+** version.h
+** UnrealIRCd
+** $Id$
+*/
+#ifndef __versioninclude
+#define __versioninclude 1
+
+/*
+ * Utility macros to convert version number constants to strings.
+ * Delayed expansion requires two macros to work. See:
+ *
+ * $ info '(cpp) Stringification'
+ */
+#define _macro_to_str(n) #n
+#define macro_to_str(n) _macro_to_str(n)
+
+
+/* 
+ * Mark of settings
+ */
+#ifdef DEBUGMODE
+#define DEBUGMODESET "+(debug)"
+#else
+#define DEBUGMODESET ""
+#endif
+ /**/
+#ifdef DEBUG
+#define DEBUGSET "(Debug)"
+#else
+#define DEBUGSET ""
+#endif
+     /**/
+#define COMPILEINFO DEBUGMODESET DEBUGSET
+
+/* Version info follows
+ * Please be sure to update ALL fields when changing the version.
+ * Also don't forget to bump the protocol version every release.
+ */
+
+/**
+ * The following code concerns UNREAL_VERSION_GENERATION,
+ * UNREAL_VERSION_MAJOR, and UNREAL_VERSION_MINOR.
+ *
+ * These UNREAL_VERSION_* macros can be used so (3rd party) modules
+ * can easily distinguish versions.
+ *
+ * They are set during ./configure, so update ./configure.ac's AC_INIT
+ * line upon a new release.
+ */
+
+/** Year + week of the year (ISO week number, with Monday as first day of week)
+ * Can be useful if the above 3 versionids are insufficient for you (eg: you want to support CVS).
+ * This is updated automatically on the CVS server every Monday. so don't touch it.
+ */
+#define UNREAL_VERSION_TIME	202001
+
+#define UnrealProtocol 		5002
+#define PATCH1  		macro_to_str(UNREAL_VERSION_GENERATION)
+#define PATCH2  		"." macro_to_str(UNREAL_VERSION_MAJOR)
+#define PATCH3  		"." macro_to_str(UNREAL_VERSION_MINOR)
+#define PATCH4  		UNREAL_VERSION_SUFFIX
+#define PATCH5  		""
+#define PATCH6  		""
+#define PATCH7  		""
+#define PATCH8  		COMPILEINFO
+#define PATCH9  		""
+/* release header */
+#define Rh BASE_VERSION
+#define VERSIONONLY		PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7
+#endif /* __versioninclude */
diff --git a/include/whowas.h b/include/whowas.h
new file mode 100644
index 0000000..f639f89
--- /dev/null
+++ b/include/whowas.h
@@ -0,0 +1,71 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, include/whowas.h
+ *   Copyright (C) 1990  Markku Savela
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/*
+ * from original rcs 
+ * $ Id: whowas.h,v 6.1 1991/07/04 21:04:39 gruner stable gruner $
+ *
+ * $ Log: whowas.h,v $
+ * Revision 6.1  1991/07/04  21:04:39  gruner
+ * Revision 2.6.1 [released]
+ *
+ * Revision 6.0  1991/07/04  18:05:08  gruner
+ * frozen beta revision 2.6.1
+ *
+ * th+hybrid rcs version
+ * $Id$
+ */
+
+#ifndef	__whowas_include__
+#define __whowas_include__
+
+/*
+** add_history
+**	Add the currently defined name of the client to history.
+**	usually called before changing to a new name (nick).
+**	Client must be a fully registered user (specifically,
+**	the user structure must have been allocated).
+*/
+void add_history(Client *, int);
+
+/*
+** off_history
+**	This must be called when the client structure is about to
+**	be released. History mechanism keeps pointers to client
+**	structures and it must know when they cease to exist. This
+**	also implicitly calls AddHistory.
+*/
+void off_history(Client *);
+
+/*
+** get_history
+**	Return the current client that was using the given
+**	nickname within the timelimit. Returns NULL, if no
+**	one found...
+*/
+Client *get_history(char *, time_t);
+					/* Nick name */
+					/* Time limit in seconds */
+
+/*
+** for debugging...counts related structures stored in whowas array.
+*/
+void count_whowas_memory(int *, u_long *);
+
+#endif /* __whowas_include__ */
diff --git a/include/windows/setup.h b/include/windows/setup.h
new file mode 100644
index 0000000..0b86df7
--- /dev/null
+++ b/include/windows/setup.h
@@ -0,0 +1,72 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, include/win32/setup.h
+ *   Copyright (C) 1999 Carsten Munk
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *   $Id$
+ */
+
+#ifndef __setup_include__
+#define __setup_include__
+
+#undef  SYSSYSLOGH
+#define NOINDEX
+#undef  TIMES_2
+#undef  GETRUSAGE_2
+#define CONFDIR "conf"
+#define MODULESDIR "modules"
+#define LOGDIR "logs"
+#define PERMDATADIR "data"
+#define CACHEDIR "cache"
+#define TMPDIR "tmp"
+#define PIDFILE PERMDATADIR"/unrealircd.pid"
+#define NO_U_TYPES
+#define NEED_U_INT32_T
+#define PREFIX_AQ
+#define LIST_SHOW_MODES
+#define strcasecmp _stricmp
+#define strncasecmp _strnicmp
+#define HAVE_EXPLICIT_BZERO
+#define explicit_bzero(a,b) SecureZeroMemory(a,b)
+
+/* mode_t: Needed in s_conf.c for the third argument of open(3p).
+ * Should be an int because of http://msdn.microsoft.com/en-us/library/z0kc8e3z(VS.71).aspx
+ */
+#define mode_t int
+
+/* We don't use any of the wincrypt stuff and this silences
+ * a warning emitted by LibreSSL:
+ */
+#define NOCRYPT
+
+/* We require Windows 7 or later */
+#define NTDDI_VERSION 0x06010000
+#define _WIN32_WINNT 0x0601
+
+/* Generation version number (e.g.: 3 for Unreal3*) */
+#define UNREAL_VERSION_GENERATION 5
+
+/* Major version number (e.g.: 2 for Unreal3.2*) */
+#define UNREAL_VERSION_MAJOR 0
+
+/* Minor version number (e.g.: 1 for Unreal3.2.1) */
+#define UNREAL_VERSION_MINOR 3
+
+/* Version suffix such as a beta marker or release candidate marker. (e.g.:
+   -rcX for unrealircd-3.2.9-rcX) */
+#define UNREAL_VERSION_SUFFIX ".1"
+
+#endif
diff --git a/src/Makefile.in b/src/Makefile.in
new file mode 100644
index 0000000..29508bc
--- /dev/null
+++ b/src/Makefile.in
@@ -0,0 +1,246 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/Makefile
+#*   Copyright (C) 1990 Jarkko Oikarinen
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*   
+#*   $Id$
+#*/
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+OBJS=dns.o auth.o channel.o crule.o dbuf.o \
+	fdlist.o hash.o ircd.o ircsprintf.o list.o \
+	match.o modules.o parse.o mempool.o operclass.o \
+	conf_preprocessor.o conf.o debug.o dispatch.o numeric.o \
+	misc.o serv.o aliases.o socket.o \
+	tls.o user.o scache.o send.o support.o \
+	version.o whowas.o random.o api-usermode.o api-channelmode.o \
+	api-moddata.o api-extban.o api-isupport.o api-command.o \
+	api-clicap.o api-messagetag.o api-history-backend.o api-efunctions.o \
+	api-event.o \
+	crypt_blowfish.o updconf.o crashreport.o modulemanager.o \
+	utf8.o \
+	openssl_hostname_validation.o $(URL)
+
+SRC=$(OBJS:%.o=%.c)
+
+# Flags specific for the ircd binary (and it's object files)...
+# .. but NOT for modules.
+BINCFLAGS=@HARDEN_BINCFLAGS@
+BINLDFLAGS=@DYNAMIC_LDFLAGS@ @HARDEN_BINLDFLAGS@
+
+INCLUDES = ../include/channel.h \
+	../include/common.h ../include/config.h ../include/dbuf.h \
+	../include/dynconf.h ../include/fdlist.h ../include/h.h \
+	../include/ircsprintf.h \
+	../include/license.h \
+	../include/modules.h ../include/modversion.h ../include/msg.h \
+	../include/numeric.h ../include/proto.h \
+	../include/resource.h ../include/setup.h \
+	../include/struct.h ../include/sys.h \
+	../include/types.h ../include/url.h \
+	../include/version.h ../include/whowas.h \
+	../include/openssl_hostname_validation.h
+
+all: build
+
+build:
+	# Force build of 'ircd', before we start building any modules:
+	$(MAKE) ircd
+	$(MAKE) mods
+
+custommodule:
+	+cd modules/third; $(MAKE) MODULEFILE=$(MODULEFILE) 'EXLIBS=$(EXLIBS)' custommodule
+
+ircd: $(OBJS)
+	$(CC) $(CFLAGS) $(BINCFLAGS) $(CRYPTOLIB) -o ircd $(OBJS) $(LDFLAGS) $(BINLDFLAGS) $(IRCDLIBS) $(CRYPTOLIB)
+
+mods:
+	@if [ ! -r include ] ; then \
+		ln -s ../include include; \
+	fi
+	@if [ ! -r modules ] ; then \
+		echo "You havent done cvs update -P -d"; \
+	fi
+	+cd modules; $(MAKE) all
+
+version.c: version.c.SH
+	$(SHELL) version.c.SH
+
+version.o: version.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c version.c
+
+parse.o: parse.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c parse.c
+
+socket.o: socket.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c socket.c
+
+dispatch.o: dispatch.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c dispatch.c
+
+dbuf.o: dbuf.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c dbuf.c
+
+auth.o: auth.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c auth.c
+
+send.o: send.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c send.c
+
+tls.o: tls.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c tls.c
+
+match.o: match.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c match.c
+
+modules.o: modules.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c modules.c
+
+mempool.o: mempool.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c mempool.c
+
+support.o: support.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c support.c
+
+userload.o: userload.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c userload.c
+
+aliases.o: aliases.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c aliases.c
+
+clean:
+	$(RM) -f *.o *.so *~ core ircd version.c; \
+	cd modules; make clean
+
+cleandir: clean
+
+depend:
+	makedepend -I${INCLUDEDIR} ${SRC}
+
+channel.o: channel.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c channel.c
+
+ircd.o: ircd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c ircd.c
+
+list.o: list.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c list.c
+
+dns.o: dns.c $(INCLUDES) ../include/dns.h
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c dns.c
+
+fdlist.o: fdlist.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c fdlist.c
+
+conf_preprocessor.o: conf_preprocessor.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c conf_preprocessor.c
+
+conf.o: conf.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c conf.c
+
+debug.o: debug.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c debug.c
+
+numeric.o: numeric.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c numeric.c
+
+misc.o: misc.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c misc.c
+
+scache.o: scache.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c scache.c
+
+ircsprintf.o: ircsprintf.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c ircsprintf.c
+
+user.o: user.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c user.c
+
+serv.o: serv.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c serv.c
+
+whowas.o: whowas.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c whowas.c
+
+hash.o: hash.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c hash.c
+
+crule.o: crule.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c crule.c
+
+random.o: random.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c random.c
+
+operclass.o: operclass.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c operclass.c
+
+api-usermode.o: api-usermode.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-usermode.c
+
+api-event.o: api-event.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-event.c
+
+api-channelmode.o: api-channelmode.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-channelmode.c
+
+api-moddata.o: api-moddata.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-moddata.c
+
+api-extban.o: api-extban.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-extban.c
+
+api-command.o: api-command.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-command.c
+
+api-isupport.o: api-isupport.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-isupport.c
+
+api-clicap.o: api-clicap.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-clicap.c
+
+api-messagetag.o: api-messagetag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-messagetag.c
+
+api-history-backend.o: api-history-backend.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-history-backend.c
+
+api-efunctions.o: api-efunctions.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c api-efunctions.c
+
+crypt_blowfish.o: crypt_blowfish.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c crypt_blowfish.c
+
+updconf.o: updconf.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c updconf.c
+
+crashreport.o: crashreport.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c crashreport.c
+
+modulemanager.o: modulemanager.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c modulemanager.c
+
+utf8.o: utf8.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c utf8.c
+
+openssl_hostname_validation.o: openssl_hostname_validation.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c openssl_hostname_validation.c
+
+url.o: url.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(BINCFLAGS) -c url.c
+
+# DO NOT DELETE THIS LINE -- make depend depends on it.
+
diff --git a/src/aliases.c b/src/aliases.c
new file mode 100644
index 0000000..860e95b
--- /dev/null
+++ b/src/aliases.c
@@ -0,0 +1,287 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/aliases.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Function to return a group of tokens -- codemastr */
+void strrangetok(char *in, char *out, char tok, short first, short last) {
+	int i = 0, tokcount = 0, j = 0;
+	first--;
+	last--;
+	while(in[i]) {
+		if (in[i] == tok) {
+			tokcount++;
+			if (tokcount == first)
+				i++;
+		}
+		if (tokcount >= first && (tokcount <= last || last == -1)) {
+			out[j] = in[i];
+			j++;
+		}
+		i++;
+	}
+	out[j] = 0;
+}			
+
+/* cmd_alias is a special type of command, it has an extra argument 'cmd'. */
+static int recursive_alias = 0;
+
+void cmd_alias(Client *client, MessageTag *mtags, int parc, char *parv[], char *cmd)
+{
+	ConfigItem_alias *alias;
+	Client *acptr;
+	int ret;
+
+	if (!(alias = find_alias(cmd))) 
+	{
+		sendto_one(client, NULL, ":%s %d %s %s :Unknown command",
+			me.name, ERR_UNKNOWNCOMMAND, client->name, cmd);
+		return;
+	}
+	
+	/* If it isn't an ALIAS_COMMAND, we require a paramter ... We check ALIAS_COMMAND LATER */
+	if (alias->type != ALIAS_COMMAND && (parc < 2 || *parv[1] == '\0'))
+	{
+		sendnumeric(client, ERR_NOTEXTTOSEND);
+		return;
+	}
+
+	if (alias->type == ALIAS_SERVICES) 
+	{
+		if (SERVICES_NAME && (acptr = find_person(alias->nick, NULL)))
+		{
+			if (alias->spamfilter && match_spamfilter(client, parv[1], SPAMF_USERMSG, alias->nick, 0, NULL))
+				return;
+			sendto_one(acptr, NULL, ":%s PRIVMSG %s@%s :%s", client->name,
+				alias->nick, SERVICES_NAME, parv[1]);
+		}
+		else
+			sendnumeric(client, ERR_SERVICESDOWN, alias->nick);
+	}
+	else if (alias->type == ALIAS_STATS) 
+	{
+		if (STATS_SERVER && (acptr = find_person(alias->nick, NULL)))
+		{
+			if (alias->spamfilter && match_spamfilter(client, parv[1], SPAMF_USERMSG, alias->nick, 0, NULL))
+				return;
+			sendto_one(acptr, NULL, ":%s PRIVMSG %s@%s :%s", client->name,
+				alias->nick, STATS_SERVER, parv[1]);
+		}
+		else
+			sendnumeric(client, ERR_SERVICESDOWN, alias->nick);
+	}
+	else if (alias->type == ALIAS_NORMAL) 
+	{
+		if ((acptr = find_person(alias->nick, NULL))) 
+		{
+			if (alias->spamfilter && match_spamfilter(client, parv[1], SPAMF_USERMSG, alias->nick, 0, NULL))
+				return;
+			if (MyUser(acptr))
+				sendto_one(acptr, NULL, ":%s!%s@%s PRIVMSG %s :%s", client->name, 
+					client->user->username, GetHost(client),
+					alias->nick, parv[1]);
+			else
+				sendto_one(acptr, NULL, ":%s PRIVMSG %s :%s", client->name,
+					alias->nick, parv[1]);
+		}
+		else
+			sendnumeric(client, ERR_NOSUCHNICK, alias->nick);
+	}
+	else if (alias->type == ALIAS_CHANNEL)
+	{
+		Channel *channel;
+		if ((channel = find_channel(alias->nick, NULL)))
+		{
+			char *msg = parv[1];
+			char *errmsg = NULL;
+			if (can_send_to_channel(client, channel, &msg, &errmsg, 0))
+			{
+				if (alias->spamfilter && match_spamfilter(client, parv[1], SPAMF_CHANMSG, channel->chname, 0, NULL))
+					return;
+				new_message(client, NULL, &mtags);
+				sendto_channel(channel, client, client->direction,
+				               PREFIX_ALL, 0, SEND_ALL|SKIP_DEAF, mtags,
+				               ":%s PRIVMSG %s :%s",
+				               client->name, channel->chname, parv[1]);
+				free_message_tags(mtags);
+				return;
+			}
+		}
+		sendnumeric(client, ERR_CANNOTDOCOMMAND,
+				cmd, "You may not use this command at this time");
+	}
+	else if (alias->type == ALIAS_COMMAND) 
+	{
+		ConfigItem_alias_format *format;
+		char *ptr = "";
+
+		if (!(parc < 2 || *parv[1] == '\0'))
+			ptr = parv[1]; 
+
+		for (format = alias->format; format; format = format->next)
+		{
+			if (unreal_match(format->expr, ptr))
+			{
+				/* Parse the parameters */
+				int i = 0, j = 0, k = 1;
+				char output[1024], current[1024];
+				char nums[4];
+
+				memset(current, 0, sizeof(current));
+				memset(output, 0, sizeof(output));
+
+				while(format->parameters[i] && j < 500) 
+				{
+					k = 0;
+					if (format->parameters[i] == '%') 
+					{
+						i++;
+						if (format->parameters[i] == '%') 
+							output[j++] = '%';
+						else if (isdigit(format->parameters[i])) 
+						{
+							for(; isdigit(format->parameters[i]) && k < 2; i++, k++) {
+								nums[k] = format->parameters[i];
+							}
+							nums[k] = 0;
+							i--;
+							if (format->parameters[i+1] == '-') {
+								strrangetok(ptr, current, ' ', atoi(nums),0);
+								i++;
+							}
+							else 
+								strrangetok(ptr, current, ' ', atoi(nums), atoi(nums));
+							if (!*current)
+								continue;
+							if (j + strlen(current)+1 >= 500)
+								break;
+							strlcat(output, current, sizeof output);
+							j += strlen(current);
+							
+						}
+						else if (format->parameters[i] == 'n' ||
+							 format->parameters[i] == 'N')
+						{
+							strlcat(output, client->name, sizeof output);
+							j += strlen(client->name);
+						}
+						else 
+						{
+							output[j++] = '%';
+							output[j++] = format->parameters[i];
+						}
+						i++;
+						continue;
+					}
+					output[j++] = format->parameters[i++];
+				}
+				output[j] = 0;
+				/* Now check to make sure we have something to send */
+				if (strlen(output) == 0)
+				{
+					sendnumeric(client, ERR_NEEDMOREPARAMS, cmd);
+					return;
+				}
+				
+				if (format->type == ALIAS_SERVICES) 
+				{
+					if (SERVICES_NAME && (acptr = find_person(format->nick, NULL)))
+					{
+						if (alias->spamfilter && match_spamfilter(client, output, SPAMF_USERMSG, format->nick, 0, NULL))
+							return;
+						sendto_one(acptr, NULL, ":%s PRIVMSG %s@%s :%s", client->name,
+							format->nick, SERVICES_NAME, output);
+					} else
+						sendnumeric(client, ERR_SERVICESDOWN, format->nick);
+				}
+				else if (format->type == ALIAS_STATS) 
+				{
+					if (STATS_SERVER && (acptr = find_person(format->nick, NULL)))
+					{
+						if (alias->spamfilter && match_spamfilter(client, output, SPAMF_USERMSG, format->nick, 0, NULL))
+							return;
+						sendto_one(acptr, NULL, ":%s PRIVMSG %s@%s :%s", client->name,
+							format->nick, STATS_SERVER, output);
+					} else
+						sendnumeric(client, ERR_SERVICESDOWN, format->nick);
+				}
+				else if (format->type == ALIAS_NORMAL) 
+				{
+					if ((acptr = find_person(format->nick, NULL))) 
+					{
+						if (alias->spamfilter && match_spamfilter(client, output, SPAMF_USERMSG, format->nick, 0, NULL))
+							return;
+						if (MyUser(acptr))
+							sendto_one(acptr, NULL, ":%s!%s@%s PRIVMSG %s :%s", client->name, 
+							client->user->username, IsHidden(client) ? client->user->virthost : client->user->realhost,
+							format->nick, output);
+						else
+							sendto_one(acptr, NULL, ":%s PRIVMSG %s :%s", client->name,
+								format->nick, output);
+					}
+					else
+						sendnumeric(client, ERR_NOSUCHNICK, format->nick);
+				}
+				else if (format->type == ALIAS_CHANNEL)
+				{
+					Channel *channel;
+					if ((channel = find_channel(format->nick, NULL)))
+					{
+						char *msg = output;
+						char *errmsg = NULL;
+						if (!can_send_to_channel(client, channel, &msg, &errmsg, 0))
+						{
+							if (alias->spamfilter && match_spamfilter(client, output, SPAMF_CHANMSG, channel->chname, 0, NULL))
+								return;
+							new_message(client, NULL, &mtags);
+							sendto_channel(channel, client, client->direction,
+							               PREFIX_ALL, 0, SEND_ALL|SKIP_DEAF, mtags,
+							               ":%s PRIVMSG %s :%s",
+							               client->name, channel->chname, parv[1]);
+							free_message_tags(mtags);
+							return;
+						}
+					}
+					sendnumeric(client, ERR_CANNOTDOCOMMAND, cmd, 
+						"You may not use this command at this time");
+				}
+				else if (format->type == ALIAS_REAL)
+				{
+					int ret;
+					char mybuf[500];
+					
+					snprintf(mybuf, sizeof(mybuf), "%s %s", format->nick, output);
+
+					if (recursive_alias)
+					{
+						sendnumeric(client, ERR_CANNOTDOCOMMAND, cmd, "You may not use this command at this time -- recursion");
+						return;
+					}
+
+					recursive_alias = 1;
+					parse(client, mybuf, strlen(mybuf));
+					recursive_alias = 0;
+
+					return;
+				}
+				break;
+			}
+		}
+	}
+}
diff --git a/src/api-channelmode.c b/src/api-channelmode.c
new file mode 100644
index 0000000..a655dd7
--- /dev/null
+++ b/src/api-channelmode.c
@@ -0,0 +1,549 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, src/api-channelmode.c
+ *   (C) 2003-2007 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief The channel mode API used by modules.
+ */
+
+#include "unrealircd.h"
+
+/** This is the extended channel mode API
+ * @defgroup ChannelModeAPI Channel mode API
+ * @{
+ */
+
+/** Table with details on each channel mode handler */
+Cmode *Channelmode_Table = NULL;
+/** Highest index in Channelmode_Table */
+unsigned short Channelmode_highest = 0;
+
+/** @} */
+
+/** Channel parameter to slot# mapping - used by GETPARAMSLOT() macro */
+MODVAR unsigned char param_to_slot_mapping[256];
+/** Extended channel modes in use - used by ISUPPORT/005 numeric only */
+char extchmstr[4][64];
+
+/* Private functions (forward declaration) and variables */
+static void make_cmodestr(void);
+static char previous_chanmodes[256];
+static Cmode *ParamTable[MAXPARAMMODES+1];
+static void unload_extcmode_commit(Cmode *cmode);
+
+/** Create the strings that are used for CHANMODES=a,b,c,d in numeric 005 */
+void make_extcmodestr()
+{
+	char *p;
+	int i;
+	
+	extchmstr[0][0] = extchmstr[1][0] = extchmstr[2][0] = extchmstr[3][0] = '\0';
+	
+	/* type 1: lists (like b/e) */
+	/* [NOT IMPLEMENTED IN EXTCMODES] */
+
+	/* type 2: 1 par to set/unset (has .unset_with_param) */
+	p = extchmstr[1];
+	for (i=0; i <= Channelmode_highest; i++)
+		if (Channelmode_Table[i].paracount && Channelmode_Table[i].flag &&
+		    Channelmode_Table[i].unset_with_param)
+			*p++ = Channelmode_Table[i].flag;
+	*p = '\0';
+
+	/* type 3: 1 param to set, 0 params to unset (does not have .unset_with_param) */
+	p = extchmstr[2];
+	for (i=0; i <= Channelmode_highest; i++)
+		if (Channelmode_Table[i].paracount && Channelmode_Table[i].flag &&
+		    !Channelmode_Table[i].unset_with_param)
+			*p++ = Channelmode_Table[i].flag;
+	*p = '\0';
+	
+	/* type 4: paramless modes */
+	p = extchmstr[3];
+	for (i=0; i <= Channelmode_highest; i++)
+		if (!Channelmode_Table[i].paracount && Channelmode_Table[i].flag)
+			*p++ = Channelmode_Table[i].flag;
+	*p = '\0';
+}
+
+/** Create the string that is used in numeric 004 */
+static void make_cmodestr(void)
+{
+	char *p = &cmodestring[0];
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+	int i;
+	while (tab->mode != 0x0)
+	{
+		*p = tab->flag;
+		p++;
+		tab++;
+	}
+	for (i=0; i <= Channelmode_highest; i++)
+		if (Channelmode_Table[i].flag)
+			*p++ = Channelmode_Table[i].flag;
+	*p = '\0';
+}
+
+/** Check for changes - if any are detected, we broadcast the change */
+void extcmodes_check_for_changes(void)
+{
+	char chanmodes[256];
+	ISupport *isup;
+
+	make_cmodestr();
+	make_extcmodestr();
+
+	snprintf(chanmodes, sizeof(chanmodes), "%s%s", CHPAR1, EXPAR1);
+	safe_strdup(me.serv->features.chanmodes[0], chanmodes);
+	snprintf(chanmodes, sizeof(chanmodes), "%s%s", CHPAR2, EXPAR2);
+	safe_strdup(me.serv->features.chanmodes[1], chanmodes);
+	snprintf(chanmodes, sizeof(chanmodes), "%s%s", CHPAR3, EXPAR3);
+	safe_strdup(me.serv->features.chanmodes[2], chanmodes);
+	snprintf(chanmodes, sizeof(chanmodes), "%s%s", CHPAR4, EXPAR4);
+	safe_strdup(me.serv->features.chanmodes[3], chanmodes);
+
+	ircsnprintf(chanmodes, sizeof(chanmodes), "%s,%s,%s,%s",
+	            me.serv->features.chanmodes[0],
+	            me.serv->features.chanmodes[1],
+	            me.serv->features.chanmodes[2],
+	            me.serv->features.chanmodes[3]);
+
+	isup = ISupportFind("CHANMODES");
+	if (!isup)
+	{
+		strlcpy(previous_chanmodes, chanmodes, sizeof(previous_chanmodes));
+		return; /* not booted yet. then we are done here. */
+	}
+	
+	ISupportSetValue(isup, chanmodes);
+	
+	if (*previous_chanmodes && strcmp(chanmodes, previous_chanmodes))
+	{
+		ircd_log(LOG_ERROR, "Channel modes changed at runtime: %s -> %s",
+			previous_chanmodes, chanmodes);
+		sendto_realops("Channel modes changed at runtime: %s -> %s",
+			previous_chanmodes, chanmodes);
+		/* Broadcast change to all (locally connected) servers */
+		sendto_server(NULL, 0, 0, NULL, "PROTOCTL CHANMODES=%s", chanmodes);
+	}
+
+	strlcpy(previous_chanmodes, chanmodes, sizeof(previous_chanmodes));
+}
+
+/** Initialize the extended channel modes system */
+void extcmode_init(void)
+{
+	Cmode_t val = 1;
+	int	i;
+	Channelmode_Table = safe_alloc(sizeof(Cmode) * EXTCMODETABLESZ);
+	for (i = 0; i < EXTCMODETABLESZ; i++)
+	{
+		Channelmode_Table[i].mode = val;
+		val *= 2;
+	}
+	Channelmode_highest = 0;
+	memset(&extchmstr, 0, sizeof(extchmstr));
+	memset(&param_to_slot_mapping, 0, sizeof(param_to_slot_mapping));
+	*previous_chanmodes = '\0';
+}
+
+/** Update letter->slot mapping and slot->handler mapping */
+void extcmode_para_addslot(Cmode *c, int slot)
+{
+	if ((slot < 0) || (slot > MAXPARAMMODES))
+		abort();
+	c->slot = slot;
+	ParamTable[slot] = c;
+	param_to_slot_mapping[c->flag] = slot;
+}
+
+/** Update letter->slot mapping and slot->handler mapping */
+void extcmode_para_delslot(Cmode *c, int slot)
+{
+	if ((slot < 0) || (slot > MAXPARAMMODES))
+		abort();
+	ParamTable[slot] = NULL;
+	param_to_slot_mapping[c->flag] = 0;
+}
+
+/** @defgroup ChannelModeAPI Channel mode API
+ * @{
+ */
+
+/** Register a new channel mode (Channel mode API).
+ * @param module	The module requesting this channel mode (usually: modinfo->handle)
+ * @param req		Details of the channel mode request
+ * @param mode		Store the mode value (bit) here on success
+ * @returns the newly created channel mode, or NULL in case of error.
+ */
+Cmode *CmodeAdd(Module *module, CmodeInfo req, Cmode_t *mode)
+{
+	short i = 0, j = 0;
+	int paraslot = -1;
+	int existing = 0;
+
+	while (i < EXTCMODETABLESZ)
+	{
+		if (!Channelmode_Table[i].flag)
+			break;
+		else if (Channelmode_Table[i].flag == req.flag)
+		{
+			if (Channelmode_Table[i].unloaded)
+			{
+				Channelmode_Table[i].unloaded = 0;
+				existing = 1;
+				break;
+			} else {
+				if (module)
+					module->errorcode = MODERR_EXISTS;
+				return NULL;
+			}
+		}
+		i++;
+	}
+	if (i == EXTCMODETABLESZ)
+	{
+		Debug((DEBUG_DEBUG, "CmodeAdd failed, no space"));
+		if (module)
+			module->errorcode = MODERR_NOSPACE;
+		return NULL;
+	}
+
+	if (req.paracount == 1)
+	{
+		if (existing)
+		{
+			/* Re-use parameter slot of the module with the same modechar that is unloading */
+			paraslot = Channelmode_Table[i].slot;
+		}
+		else
+		{
+			/* Allocate a new one */
+			for (paraslot = 0; ParamTable[paraslot]; paraslot++)
+			{
+				if (paraslot == MAXPARAMMODES - 1)
+				{
+					Debug((DEBUG_DEBUG, "CmodeAdd failed, no space for parameter"));
+					if (module)
+						module->errorcode = MODERR_NOSPACE;
+					return NULL;
+				}
+			}
+		}
+	}
+
+	*mode = Channelmode_Table[i].mode;
+	/* Update extended channel mode table highest */
+	Channelmode_Table[i].flag = req.flag;
+	Channelmode_Table[i].paracount = req.paracount;
+	Channelmode_Table[i].is_ok = req.is_ok;
+	Channelmode_Table[i].put_param = req.put_param;
+	Channelmode_Table[i].get_param = req.get_param;
+	Channelmode_Table[i].conv_param = req.conv_param;
+	Channelmode_Table[i].free_param = req.free_param;
+	Channelmode_Table[i].dup_struct = req.dup_struct;
+	Channelmode_Table[i].sjoin_check = req.sjoin_check;
+	Channelmode_Table[i].local = req.local;
+	Channelmode_Table[i].unset_with_param = req.unset_with_param;
+	Channelmode_Table[i].owner = module;
+	Channelmode_Table[i].unloaded = 0;
+	
+	for (j = 0; j < EXTCMODETABLESZ; j++)
+		if (Channelmode_Table[j].flag)
+			if (j > Channelmode_highest)
+				Channelmode_highest = j;
+
+        if (Channelmode_Table[i].paracount == 1)
+                extcmode_para_addslot(&Channelmode_Table[i], paraslot);
+                
+	if (module)
+	{
+		ModuleObject *cmodeobj = safe_alloc(sizeof(ModuleObject));
+		cmodeobj->object.cmode = &Channelmode_Table[i];
+		cmodeobj->type = MOBJ_CMODE;
+		AddListItem(cmodeobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	return &(Channelmode_Table[i]);
+}
+
+/** Delete a previously registered channel mode - not called by modules.
+ * For modules this is done automatically on unload, no need to call this explicitly.
+ */
+void CmodeDel(Cmode *cmode)
+{
+	if (cmode->owner)
+	{
+		ModuleObject *cmodeobj;
+		for (cmodeobj = cmode->owner->objects; cmodeobj; cmodeobj = cmodeobj->next) {
+			if (cmodeobj->type == MOBJ_CMODE && cmodeobj->object.cmode == cmode) {
+				DelListItem(cmodeobj, cmode->owner->objects);
+				safe_free(cmodeobj);
+				break;
+			}
+		}
+		cmode->owner = NULL;
+	}
+	if (loop.ircd_rehashing)
+		cmode->unloaded = 1;
+	else
+		unload_extcmode_commit(cmode);
+
+}
+
+/** @} */
+
+/** After a channel mode is deregistered for sure, unload it completely.
+ * This is done after a REHASH when no new module has registered the mode.
+ * Then we can unload it for good. This also sends MODE -.. out etc.
+ */
+static void unload_extcmode_commit(Cmode *cmode)
+{
+	Channel *channel;
+
+	if (!cmode)
+		return;	
+
+	/* Unset channel mode and send MODE to everyone */
+
+	if (cmode->paracount == 0)
+	{
+		/* Paramless mode, easy */
+		for (channel = channels; channel; channel = channel->nextch)
+		{
+			if (channel->mode.extmode & cmode->mode)
+			{
+				MessageTag *mtags = NULL;
+
+				new_message(&me, NULL, &mtags);
+				sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
+					       ":%s MODE %s -%c",
+					       me.name, channel->chname, cmode->flag);
+				sendto_server(NULL, 0, 0, mtags,
+					":%s MODE %s -%c 0",
+					me.id, channel->chname, cmode->flag);
+				free_message_tags(mtags);
+
+				channel->mode.extmode &= ~cmode->mode;
+			}
+		}
+	} else
+	{
+		/* Parameter mode, more complicated */
+		for (channel = channels; channel; channel = channel->nextch)
+		{
+			if (channel->mode.extmode & cmode->mode)
+			{
+				MessageTag *mtags = NULL;
+
+				new_message(&me, NULL, &mtags);
+				if (cmode->unset_with_param)
+				{
+					char *param = cmode->get_param(GETPARASTRUCT(channel, cmode->flag));
+					sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
+						       ":%s MODE %s -%c %s",
+						       me.name, channel->chname, cmode->flag, param);
+					sendto_server(NULL, 0, 0, mtags,
+						":%s MODE %s -%c %s 0",
+						me.id, channel->chname, cmode->flag, param);
+				} else {
+					sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
+						       ":%s MODE %s -%c",
+						       me.name, channel->chname, cmode->flag);
+					sendto_server(NULL, 0, 0, mtags,
+						":%s MODE %s -%c 0",
+						me.id, channel->chname, cmode->flag);
+				}
+				free_message_tags(mtags);
+
+				cmode->free_param(GETPARASTRUCT(channel, cmode->flag));
+				channel->mode.extmode &= ~cmode->mode;
+			}
+		}
+		extcmode_para_delslot(cmode, cmode->slot);
+	}
+
+	cmode->flag = '\0';
+}
+
+/** Unload all unused channel modes after a REHASH */
+void unload_all_unused_extcmodes(void)
+{
+	int i;
+
+	for (i = 0; i < EXTCMODETABLESZ; i++)
+		if (Channelmode_Table[i].flag && Channelmode_Table[i].unloaded)
+		{
+			unload_extcmode_commit(&Channelmode_Table[i]);
+		}
+
+}
+
+/** @defgroup ChannelModeAPI Channel mode API
+ * @{
+ */
+
+/** Get parameter for a channel mode.
+ * @param channel	The channel
+ * @param mode		The mode character (eg: 'f')
+ */
+char *cm_getparameter(Channel *channel, char mode)
+{
+	return GETPARAMHANDLERBYLETTER(mode)->get_param(GETPARASTRUCT(channel, mode));
+}
+
+/** Set parameter for a channel mode.
+ * @param channel	The channel
+ * @param mode		The mode character (eg: 'f')
+ * @param str		The parameter string
+ * @note Module users should not use this function directly, it is only used by MODE and SJOIN.
+ */
+void cm_putparameter(Channel *channel, char mode, char *str)
+{
+	GETPARASTRUCT(channel, mode) = GETPARAMHANDLERBYLETTER(mode)->put_param(GETPARASTRUCT(channel, mode), str);
+}
+
+/** Free a channel mode parameter.
+ * @param channel	The channel
+ * @param mode		The mode character (eg: 'f')
+ */
+void cm_freeparameter(Channel *channel, char mode)
+{
+	GETPARAMHANDLERBYLETTER(mode)->free_param(GETPARASTRUCT(channel, mode));
+	GETPARASTRUCT(channel, mode) = NULL;
+}
+
+/** Get parameter for a channel mode - special version for SJOIN.
+ * This version doesn't take a channel, but a mode.extmodeparams.
+ * It is only used by SJOIN and should not be used in 3rd party modules.
+ * @param p	The list, eg oldmode.extmodeparams
+ * @param mode	The mode letter
+ */
+char *cm_getparameter_ex(void **p, char mode)
+{
+	return GETPARAMHANDLERBYLETTER(mode)->get_param(GETPARASTRUCTEX(p, mode));
+}
+
+/** Set parameter for a channel mode - special version for SJOIN.
+ * This version doesn't take a channel, but a mode.extmodeparams.
+ * It is only used by SJOIN and should not be used in 3rd party modules.
+ * @param p	The list, eg oldmode.extmodeparams
+ * @param mode	The mode letter
+ * @param str	The mode parameter string to set
+ */
+void cm_putparameter_ex(void **p, char mode, char *str)
+{
+	GETPARASTRUCTEX(p, mode) = GETPARAMHANDLERBYLETTER(mode)->put_param(GETPARASTRUCTEX(p, mode), str);
+}
+
+/** Default handler for - require channel operator or higher (+o/+a/+q)
+ * @param client	The client issueing the MODE
+ * @param channel	The channel
+ * @param mode		The mode letter (eg: 'f')
+ * @param para		The parameter, if any (can be NULL)
+ * @param checkt	The check type, one of .....
+ * @param what		MODE_ADD / MODE_DEL (???)
+ * @returns EX_ALLOW or EX_DENY
+ */
+int extcmode_default_requirechop(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	if (IsUser(client) && is_chan_op(client, channel))
+		return EX_ALLOW;
+	if (checkt == EXCHK_ACCESS_ERR) /* can only be due to being halfop */
+		sendnumeric(client, ERR_NOTFORHALFOPS, mode);
+	return EX_DENY;
+}
+
+/** Default handler for - require halfop or higher (+h/+o/+a/+q)
+ * @param client	The client issueing the MODE
+ * @param channel	The channel
+ * @param mode		The mode letter (eg: 'f')
+ * @param para		The parameter, if any (can be NULL)
+ * @param checkt	The check type, one of .....
+ * @param what		MODE_ADD / MODE_DEL (???)
+ * @returns EX_ALLOW or EX_DENY
+ */
+int extcmode_default_requirehalfop(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	if (IsUser(client) && (is_chan_op(client, channel) || is_half_op(client, channel)))
+		return EX_ALLOW;
+	return EX_DENY;
+}
+
+/** Duplicate all channel mode parameters - only used by SJOIN.
+ * @param xi	Input list
+ * @param xi	Output list
+ */
+void extcmode_duplicate_paramlist(void **xi, void **xo)
+{
+	int i;
+	Cmode *handler;
+	void *inx;
+
+	for (i = 0; i < MAXPARAMMODES; i++)
+	{
+		handler = CMP_GETHANDLERBYSLOT(i);
+		if (!handler)
+			continue; /* nothing there.. */
+		inx = xi[handler->slot]; /* paramter data of input is here */
+		if (!inx)
+			continue; /* not set */
+		xo[handler->slot] = handler->dup_struct(inx); /* call dup_struct with that input and set the output param to that */
+	}
+}
+
+/** Free all channel mode parameters - only used by SJOIN.
+ * @param ar	The list
+ */
+void extcmode_free_paramlist(void **ar)
+{
+	int i;
+	Cmode *handler;
+
+	for (i = 0; i < MAXPARAMMODES; i++)
+	{
+		handler = GETPARAMHANDLERBYSLOT(i);
+		if (!handler)
+			continue; /* nothing here... */
+		handler->free_param(ar[handler->slot]);
+		ar[handler->slot] = NULL;
+	}
+}
+
+/** @} */
+
+/** Internal function: returns 1 if the specified module has 1 or more extended channel modes registered */
+int module_has_extcmode_param_mode(Module *mod)
+{
+	int i = 0;
+
+	while (i < EXTCMODETABLESZ)
+	{
+		if ((Channelmode_Table[i].flag) &&
+		    (Channelmode_Table[i].owner == mod) &&
+		    (Channelmode_Table[i].paracount))
+		{
+			return 1;
+		}
+		i++;
+	}
+	return 0;
+}
diff --git a/src/api-clicap.c b/src/api-clicap.c
new file mode 100644
index 0000000..ea0a190
--- /dev/null
+++ b/src/api-clicap.c
@@ -0,0 +1,372 @@
+/************************************************************************
+ *   UnrealIRCd - Unreal Internet Relay Chat Daemon - src/api-clicap.c
+ *   (c) 2015- Bram Matthys and The UnrealIRCd team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+MODVAR ClientCapability *clicaps = NULL; /* List of client capabilities */
+
+void clicap_init(void)
+{
+}
+
+/**
+ * Returns an clicap handle based on the given token name.
+ *
+ * @param token The clicap token to search for.
+ * @return Returns the handle to the clicap token if it was found,
+ *         otherwise NULL is returned.
+ */
+ClientCapability *ClientCapabilityFindReal(const char *token)
+{
+	ClientCapability *clicap;
+
+	for (clicap = clicaps; clicap; clicap = clicap->next)
+	{
+		if (!strcasecmp(token, clicap->name))
+			return clicap;
+	}
+
+	return NULL;
+}
+
+/**
+ * Returns an clicap handle based on the given token name.
+ *
+ * @param token The clicap token to search for.
+ * @return Returns the handle to the clicap token if it was found,
+ *         otherwise NULL is returned.
+ */
+ClientCapability *ClientCapabilityFind(const char *token, Client *client)
+{
+	ClientCapability *clicap;
+
+	for (clicap = clicaps; clicap; clicap = clicap->next)
+	{
+		if (!strcasecmp(token, clicap->name))
+		{
+			if (clicap->visible && !clicap->visible(client))
+				return NULL; /* hidden */
+			return clicap;
+		}
+	}
+	return NULL;
+}
+
+/** Find the bit that will be set if 'token' is enabled */
+long ClientCapabilityBit(const char *token)
+{
+	ClientCapability *clicap = ClientCapabilityFindReal(token);
+
+#ifdef DEBUGMODE
+	if (!clicap)
+	{
+		ircd_log(LOG_ERROR, "WARNING: ClientCapabilityBit(): unknown token '%s'", token);
+	}
+#endif
+
+	return clicap ? clicap->cap : 0L;
+}
+
+void SetCapability(Client *client, const char *token)
+{
+	client->local->caps |= ClientCapabilityBit(token);
+}
+
+void ClearCapability(Client *client, const char *token)
+{
+	client->local->caps &= ~(ClientCapabilityBit(token));
+}
+
+long clicap_allocate_cap(void)
+{
+	long v = 1;
+	ClientCapability *clicap;
+
+	for (v=1; v < 2147483648; v = v * 2)
+	{
+		unsigned char found = 0;
+		for (clicap = clicaps; clicap; clicap = clicap->next)
+		{
+			if (clicap->cap == v)
+			{
+				found = 1;
+				break;
+			}
+		}
+		if (!found)
+			return v; /* free bit found */
+	}
+
+	return 0;
+}
+
+/**
+ * Adds a new clicap token.
+ *
+ * @param module The module which owns this token.
+ * @param clicap_request The details of the requested token, handlers, etc.
+ * @param cap The assigned capability bit.
+ * @return Returns the handle to the new token if successful, otherwise NULL.
+ *         The module's error code contains specific information about the
+ *         error.
+ */
+ClientCapability *ClientCapabilityAdd(Module *module, ClientCapabilityInfo *clicap_request, long *cap)
+{
+	ClientCapability *clicap;
+	int exists = 0;
+
+	if (cap)
+		*cap = 0; /* Initialize early */
+
+	clicap = ClientCapabilityFindReal(clicap_request->name);
+	if (clicap)
+	{
+		exists = 1;
+		if (clicap->unloaded)
+		{
+			clicap->unloaded = 0;
+		} else {
+			if (module)
+				module->errorcode = MODERR_EXISTS;
+			return NULL;
+		}
+	} else {
+		long v = 0;
+
+		/* Allocate a bit, but only if the module needs it.
+		 * (some clicaps are advertise-only and never gets set,
+		 *  hence they don't need a bit allocated to them)
+		 */
+		if (cap != NULL)
+		{
+			v = clicap_allocate_cap();
+			if (v == 0)
+			{
+				sendto_realops("ClientCapabilityAdd: out of space!!!");
+				ircd_log(LOG_ERROR, "ClientCapabilityAdd: out of space!!!");
+				if (module)
+					module->errorcode = MODERR_NOSPACE;
+				return NULL;
+			}
+		}
+		/* New client capability */
+		clicap = safe_alloc(sizeof(ClientCapability));
+		safe_strdup(clicap->name, clicap_request->name);
+		clicap->cap = v;
+	}
+	/* Add or update the following fields: */
+	clicap->owner = module;
+	clicap->flags = clicap_request->flags;
+	clicap->visible = clicap_request->visible;
+	clicap->parameter = clicap_request->parameter;
+
+	if (!exists)
+		AddListItem(clicap, clicaps);
+
+	if (clicap->cap && !cap)
+		abort(); /* module API call error */
+
+	if (cap)
+		*cap = clicap->cap;
+
+	if (module)
+	{
+		ModuleObject *clicapobj = safe_alloc(sizeof(ModuleObject));
+		clicapobj->object.clicap = clicap;
+		clicapobj->type = MOBJ_CLICAP;
+		AddListItem(clicapobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+
+	return clicap;
+}
+
+void unload_clicap_commit(ClientCapability *clicap)
+{
+	/* This is an unusual operation, I think we should log it. */
+	ircd_log(LOG_ERROR, "Unloading client capability '%s'", clicap->name);
+	sendto_realops("Unloading client capability '%s'", clicap->name);
+
+	/* NOTE: Stripping the CAP from local clients is done
+	 * in clicap_post_rehash(), so not here.
+	 */
+
+	/* A message tag handler may depend on us, remove it */
+	/* NOTE: This assumes there is a 0:1 or 1:1 relationship between
+	 *       the two, but in theory there could be multiple message tags
+	 *       introduced by 1 capability. Ah well, we'll cross that
+	 *       bridge when we come to it ;)
+	 */
+	if (clicap->mtag_handler)
+		clicap->mtag_handler->clicap_handler = NULL;
+
+	/* Destroy the capability */
+	DelListItem(clicap, clicaps);
+	safe_free(clicap->name);
+	safe_free(clicap);
+}
+/**
+ * Removes the specified clicap token.
+ *
+ * @param clicap The token to remove.
+ */
+void ClientCapabilityDel(ClientCapability *clicap)
+{
+	if (clicap->owner)
+	{
+		ModuleObject *mobj;
+		for (mobj = clicap->owner->objects; mobj; mobj = mobj->next) {
+			if (mobj->type == MOBJ_CLICAP && mobj->object.clicap == clicap) {
+				DelListItem(mobj, clicap->owner->objects);
+				safe_free(mobj);
+				break;
+			}
+		}
+		clicap->owner = NULL;
+	}
+
+	if (loop.ircd_rehashing)
+		clicap->unloaded = 1;
+	else
+		unload_clicap_commit(clicap);
+}
+
+void unload_all_unused_caps(void)
+{
+	ClientCapability *clicap, *clicap_next;
+
+	for (clicap = clicaps; clicap; clicap = clicap_next)
+	{
+		clicap_next = clicap->next;
+		if (clicap->unloaded)
+			unload_clicap_commit(clicap);
+	}
+}
+
+#define MAXCLICAPS 64
+static char *old_caps[MAXCLICAPS]; /**< List of old CAP names - used for /rehash */
+int old_caps_proto[MAXCLICAPS]; /**< List of old CAP protocol values - used for /rehash */
+
+/** Called before REHASH. This saves the list of cap names and protocol values */
+void clicap_pre_rehash(void)
+{
+	ClientCapability *clicap;
+	int i = 0;
+
+	memset(&old_caps, 0, sizeof(old_caps));
+
+	for (clicap = clicaps; clicap; clicap = clicap->next)
+	{
+		if (i == MAXCLICAPS)
+		{
+			ircd_log(LOG_ERROR, "More than %d caps loaded - what???", MAXCLICAPS);
+			break;
+		}
+		safe_strdup(old_caps[i], clicap->name);
+		old_caps_proto[i] = clicap->cap;
+		i++;
+	}
+}
+
+/** Clear 'proto' protocol for all users */
+void clear_cap_for_users(long cap)
+{
+	Client *client;
+
+	if (cap == 0)
+		return;
+
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		client->local->caps &= ~cap;
+	}
+	list_for_each_entry(client, &unknown_list, lclient_node)
+	{
+		client->local->caps &= ~cap;
+	}
+}
+
+/** Called after REHASH. This will deal with:
+ * 1. Clearing flags for caps that are deleted
+ * 2. Sending any CAP DEL
+ * 3. Sending any CAP NEW
+ */
+void clicap_post_rehash(void)
+{
+	ClientCapability *clicap;
+	char *name;
+	int i;
+	int found;
+
+	if (!loop.ircd_rehashing)
+		return; /* First boot */
+
+	/* Let's deal with CAP DEL first:
+	 * Go through the old caps and see what's missing now.
+	 */
+	for (i = 0; old_caps[i]; i++)
+	{
+		name = old_caps[i];
+		found = 0;
+		for (clicap = clicaps; clicap; clicap = clicap->next)
+		{
+			if (!strcmp(clicap->name, name))
+			{
+				found = 1;
+				break;
+			}
+		}
+		if (!found)
+		{
+			/* Broadcast CAP DEL to local users */
+			send_cap_notify(0, name);
+			clear_cap_for_users(old_caps_proto[i]);
+		}
+	}
+
+	/* Now deal with CAP ADD:
+	 * Go through the new caps and see if it was missing from old caps.
+	 */
+	for (clicap = clicaps; clicap; clicap = clicap->next)
+	{
+		name = clicap->name;
+		found = 0;
+		for (i = 0; old_caps[i]; i++)
+		{
+			if (!strcmp(old_caps[i], name))
+			{
+				found = 1;
+				break;
+			}
+		}
+
+		if (!found)
+		{
+			/* Broadcast CAP NEW to local users */
+			send_cap_notify(1, name);
+		}
+	}
+
+	/* Now free the old caps. */
+	for (i = 0; old_caps[i]; i++)
+		safe_free(old_caps[i]);
+}
diff --git a/src/api-command.c b/src/api-command.c
new file mode 100644
index 0000000..e32b5c7
--- /dev/null
+++ b/src/api-command.c
@@ -0,0 +1,285 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, src/api-command.c
+ *   Copyright (C) 2004 Dominick Meglio and The UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Command API - both for modules and the core
+ */
+#include "unrealircd.h"
+
+/* Forward declarations */
+static Command *CommandAddInternal(Module *module, char *cmd, CmdFunc func, AliasCmdFunc aliasfunc, unsigned char params, int flags);
+static RealCommand *add_Command_backend(char *cmd);
+
+/** @defgroup CommandAPI Command API
+ * @{
+ */
+
+/** Returns 1 if the specified command exists
+ */
+int CommandExists(char *name)
+{
+	RealCommand *p;
+	
+	for (p = CommandHash[toupper(*name)]; p; p = p->next)
+	{
+		if (!strcasecmp(p->cmd, name))
+			return 1;
+	}
+
+	return 0;
+}
+
+/** Register a new command.
+ * @param module	The module (usually modinfo->handle)
+ * @param cmd		The command name (eg: "SOMECMD")
+ * @param func		The command handler function
+ * @param params	Number of parameters or MAXPARA
+ * @param flags		Who may execute this command - one or more CMD_* flags
+ * @returns The newly registered command, or NULL in case of error (eg: already exist)
+ */
+Command *CommandAdd(Module *module, char *cmd, CmdFunc func, unsigned char params, int flags)
+{
+	if (flags & CMD_ALIAS)
+	{
+		config_error("Command '%s' used CommandAdd() to add a command alias, "
+		             "but should have used AliasAdd() instead. "
+		             "Old 3rd party module %s? Check for updates!",
+		             cmd,
+		             module ? module->header->name : "");
+		return NULL;
+	}
+	return CommandAddInternal(module, cmd, func, NULL, params, flags);
+}
+
+/** Register a new alias.
+ * @param module	The module (usually modinfo->handle)
+ * @param cmd		The alias name (eg: "SOMECMD")
+ * @param func		The alias handler function
+ * @param params	Number of parameters or MAXPARA
+ * @param flags		Who may execute this command - one or more CMD_* flags
+ * @returns The newly registered command (alias), or NULL in case of error (eg: already exist)
+ */
+Command *AliasAdd(Module *module, char *cmd, AliasCmdFunc aliasfunc, unsigned char params, int flags)
+{
+	if (!(flags & CMD_ALIAS))
+		flags |= CMD_ALIAS;
+	return CommandAddInternal(module, cmd, NULL, aliasfunc, params, flags);
+}
+
+/** @} */
+
+static Command *CommandAddInternal(Module *module, char *cmd, CmdFunc func, AliasCmdFunc aliasfunc, unsigned char params, int flags)
+{
+	Command *command = NULL;
+	RealCommand *c;
+
+	if (find_command_simple(cmd))
+	{
+		if (module)
+			module->errorcode = MODERR_EXISTS;
+		return NULL;
+	}
+	
+	if (!flags)
+	{
+		config_error("CommandAdd(): Could not add command '%s': flags are 0", cmd);
+		if (module)
+			module->errorcode = MODERR_INVALID;
+		return NULL;
+	}
+	
+	c = add_Command_backend(cmd);
+	c->parameters = (params > MAXPARA) ? MAXPARA : params;
+	c->flags = flags;
+	c->func = func;
+	c->aliasfunc = aliasfunc;
+
+	if (module)
+	{
+		ModuleObject *cmdobj = safe_alloc(sizeof(ModuleObject));
+		command = safe_alloc(sizeof(Command));
+		command->cmd = c;
+		command->cmd->owner = module;
+		command->cmd->friend = NULL;
+		cmdobj->object.command = command;
+		cmdobj->type = MOBJ_COMMAND;
+		AddListItem(cmdobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+
+	return command;
+}
+
+/** Delete a command - only used internally.
+ * @param command	The command (can be NULL)
+ * @param cmd		The "real" command
+ */
+void CommandDelX(Command *command, RealCommand *cmd)
+{
+	CommandOverride *ovr, *ovrnext;
+
+	DelListItem(cmd, CommandHash[toupper(*cmd->cmd)]);
+	if (command && cmd->owner)
+	{
+		ModuleObject *cmdobj;
+		for (cmdobj = cmd->owner->objects; cmdobj; cmdobj = cmdobj->next)
+		{
+			if (cmdobj->type == MOBJ_COMMAND && cmdobj->object.command == command)
+			{
+				DelListItem(cmdobj,cmd->owner->objects);
+				safe_free(cmdobj);
+				break;
+			}
+		}
+	}
+	for (ovr = cmd->overriders; ovr; ovr = ovrnext)
+	{
+		ovrnext = ovr->next;
+		CommandOverrideDel(ovr);
+	}
+	safe_free(cmd->cmd);
+	safe_free(cmd);
+	if (command)
+		safe_free(command);
+}
+
+/** De-register a command - not called by modules, only internally.
+ * For modules this is done automatically.
+ */
+void CommandDel(Command *command)
+{
+	CommandDelX(command, command->cmd);
+}
+
+/** @defgroup CommandAPI Command API
+ * @{
+ */
+
+/** Calls the specified command for the user, as if it was received
+ * that way on IRC.
+ * @param client	Client that is the source.
+ * @param mtags		Message tags for this command (or NULL).
+ * @param cmd		Command to run, eg "JOIN".
+ * @param parc		Parameter count plus 1.
+ * @param parv		Parameter array.
+ * @note Make sure you terminate the last parv[] parameter with NULL,
+ *       this can easily be forgotten, but certain functions depend on it,
+ *       you risk crashes otherwise.
+ * @note Once do_cmd() has returned, be sure to check IsDead(client) to
+ *       see if the client has been killed. This may happen due to various
+ *       reasons, including spamfilter kicking in or some other security
+ *       measure.
+ * @note Do not pass insane parameters. The combined size of all parameters
+ *       should not exceed 510 bytes, since that is what all code expects.
+ *       Similarly, you should not exceed MAXPARA for parc.
+ * @note If mtags is NULL then new message tags are created for the command
+ *       (and destroyed before return).
+ */
+void do_cmd(Client *client, MessageTag *mtags, char *cmd, int parc, char *parv[])
+{
+	RealCommand *cmptr;
+
+	cmptr = find_command_simple(cmd);
+	if (cmptr)
+	{
+		int gen_mtags = (mtags == NULL) ? 1 : 0;
+		if (gen_mtags)
+			new_message(client, NULL, &mtags);
+		(*cmptr->func) (client, mtags, parc, parv);
+		if (gen_mtags)
+			free_message_tags(mtags);
+	}
+}
+
+/** @} */
+
+/**** This is the "real command" API *****
+ * Perhaps one day we will merge the two, if possible.
+ */
+
+RealCommand *CommandHash[256]; /* one per letter */
+
+/** Initialize the command API - executed on startup.
+ * This also registers some core functions.
+ */
+void init_CommandHash(void)
+{
+	memset(CommandHash, 0, sizeof(CommandHash));
+	CommandAdd(NULL, MSG_ERROR, cmd_error, MAXPARA, CMD_UNREGISTERED|CMD_SERVER);
+	CommandAdd(NULL, MSG_VERSION, cmd_version, MAXPARA, CMD_UNREGISTERED|CMD_USER|CMD_SERVER);
+	CommandAdd(NULL, MSG_INFO, cmd_info, MAXPARA, CMD_USER);
+	CommandAdd(NULL, MSG_DNS, cmd_dns, MAXPARA, CMD_USER);
+	CommandAdd(NULL, MSG_REHASH, cmd_rehash, MAXPARA, CMD_USER|CMD_SERVER);
+	CommandAdd(NULL, MSG_RESTART, cmd_restart, 2, CMD_USER);
+	CommandAdd(NULL, MSG_DIE, cmd_die, MAXPARA, CMD_USER);
+	CommandAdd(NULL, MSG_CREDITS, cmd_credits, MAXPARA, CMD_USER);
+	CommandAdd(NULL, MSG_LICENSE, cmd_license, MAXPARA, CMD_USER);
+	CommandAdd(NULL, MSG_MODULE, cmd_module, MAXPARA, CMD_USER);
+}
+
+static RealCommand *add_Command_backend(char *cmd)
+{
+	RealCommand *c = safe_alloc(sizeof(RealCommand));
+
+	safe_strdup(c->cmd, cmd);
+
+	/* Add in hash with hash value = first byte */
+	AddListItem(c, CommandHash[toupper(*cmd)]);
+
+	return c;
+}
+
+/** @defgroup CommandAPI Command API
+ * @{
+ */
+
+/** Find a command by name and flags */
+RealCommand *find_command(char *cmd, int flags)
+{
+	RealCommand *p;
+	for (p = CommandHash[toupper(*cmd)]; p; p = p->next) {
+		if ((flags & CMD_UNREGISTERED) && !(p->flags & CMD_UNREGISTERED))
+			continue;
+		if ((flags & CMD_SHUN) && !(p->flags & CMD_SHUN))
+			continue;
+		if ((flags & CMD_VIRUS) && !(p->flags & CMD_VIRUS))
+			continue;
+		if ((flags & CMD_ALIAS) && !(p->flags & CMD_ALIAS))
+			continue;
+		if (!strcasecmp(p->cmd, cmd))
+			return p;
+	}
+	return NULL;
+}
+
+/** Find a command by name (no access rights check) */
+RealCommand *find_command_simple(char *cmd)
+{
+	RealCommand *c;
+
+	for (c = CommandHash[toupper(*cmd)]; c; c = c->next)
+	{
+		if (!strcasecmp(c->cmd, cmd))
+				return c;
+	}
+
+	return NULL;
+}
+
+/** @} */
diff --git a/src/api-efunctions.c b/src/api-efunctions.c
new file mode 100644
index 0000000..ad7ec0a
--- /dev/null
+++ b/src/api-efunctions.c
@@ -0,0 +1,366 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, src/api-efunctions.c
+ *   (C) 2003-2019 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Types */
+typedef struct {
+	char *name;
+	void **funcptr;
+	void *deffunc;
+} EfunctionsList;
+
+/* Variables */
+static Efunction *Efunctions[MAXEFUNCTIONS]; /* Efunction objects (used for rehashing) */
+static EfunctionsList efunction_table[MAXEFUNCTIONS];
+
+/* Efuncs */
+void (*do_join)(Client *client, int parc, char *parv[]);
+void (*join_channel)(Channel *channel, Client *client, MessageTag *mtags, int flags);
+int (*can_join)(Client *client, Channel *channel, char *key, char *parv[]);
+void (*do_mode)(Channel *channel, Client *client, MessageTag *mtags, int parc, char *parv[], time_t sendts, int samode);
+void (*set_mode)(Channel *channel, Client *client, int parc, char *parv[], u_int *pcount,
+    char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], int bounce);
+void (*cmd_umode)(Client *client, MessageTag *mtags, int parc, char *parv[]);
+int (*register_user)(Client *client, char *nick, char *username, char *umode, char *virthost, char *ip);
+int (*tkl_hash)(unsigned int c);
+char (*tkl_typetochar)(int type);
+int (*tkl_chartotype)(char c);
+char *(*tkl_type_string)(TKL *tk);
+TKL *(*tkl_add_serverban)(int type, char *usermask, char *hostmask, char *reason, char *setby,
+                              time_t expire_at, time_t set_at, int soft, int flags);
+TKL *(*tkl_add_nameban)(int type, char *name, int hold, char *reason, char *setby,
+                            time_t expire_at, time_t set_at, int flags);
+TKL *(*tkl_add_spamfilter)(int type, unsigned short target, unsigned short action, Match *match, char *setby,
+                               time_t expire_at, time_t set_at,
+                               time_t spamf_tkl_duration, char *spamf_tkl_reason,
+                               int flags);
+TKL *(*tkl_add_banexception)(int type, char *usermask, char *hostmask, char *reason, char *set_by,
+                                time_t expire_at, time_t set_at, int soft, char *bantypes, int flags);
+TKL *(*tkl_del_line)(TKL *tkl);
+void (*tkl_check_local_remove_shun)(TKL *tmp);
+int (*find_tkline_match)(Client *client, int skip_soft);
+int (*find_shun)(Client *client);
+int(*find_spamfilter_user)(Client *client, int flags);
+TKL *(*find_qline)(Client *client, char *nick, int *ishold);
+TKL *(*find_tkline_match_zap)(Client *client);
+void (*tkl_stats)(Client *client, int type, char *para);
+void (*tkl_sync)(Client *client);
+void (*cmd_tkl)(Client *client, MessageTag *mtags, int parc, char *parv[]);
+int (*place_host_ban)(Client *client, BanAction action, char *reason, long duration);
+int (*match_spamfilter)(Client *client, char *str_in, int type, char *target, int flags, TKL **rettk);
+int (*join_viruschan)(Client *client, TKL *tk, int type);
+unsigned char *(*StripColors)(unsigned char *text);
+const char *(*StripControlCodes)(unsigned char *text);
+void (*spamfilter_build_user_string)(char *buf, char *nick, Client *client);
+void (*send_protoctl_servers)(Client *client, int response);
+int (*verify_link)(Client *client, char *servername, ConfigItem_link **link_out);
+void (*introduce_user)(Client *to, Client *client);
+void (*send_server_message)(Client *client);
+void (*broadcast_md_client)(ModDataInfo *mdi, Client *client, ModData *md);
+void (*broadcast_md_channel)(ModDataInfo *mdi, Channel *channel, ModData *md);
+void (*broadcast_md_member)(ModDataInfo *mdi, Channel *channel, Member *m, ModData *md);
+void (*broadcast_md_membership)(ModDataInfo *mdi, Client *client, Membership *m, ModData *md);
+int (*check_banned)(Client *client, int exitflags);
+int (*check_deny_version)(Client *client, char *software, int protocol, char *flags);
+void (*broadcast_md_client_cmd)(Client *except, Client *sender, Client *acptr, char *varname, char *value);
+void (*broadcast_md_channel_cmd)(Client *except, Client *sender, Channel *channel, char *varname, char *value);
+void (*broadcast_md_member_cmd)(Client *except, Client *sender, Channel *channel, Client *acptr, char *varname, char *value);
+void (*broadcast_md_membership_cmd)(Client *except, Client *sender, Client *acptr, Channel *channel, char *varname, char *value);
+void (*send_moddata_client)(Client *srv, Client *client);
+void (*send_moddata_channel)(Client *srv, Channel *channel);
+void (*send_moddata_members)(Client *srv);
+void (*broadcast_moddata_client)(Client *client);
+int (*match_user)(char *rmask, Client *client, int options);
+void (*userhost_changed)(Client *client);
+void (*userhost_save_current)(Client *client);
+void (*send_join_to_local_users)(Client *client, Channel *channel, MessageTag *mtags);
+int (*do_nick_name)(char *nick);
+int (*do_remote_nick_name)(char *nick);
+char *(*charsys_get_current_languages)(void);
+void (*broadcast_sinfo)(Client *client, Client *to, Client *except);
+void (*parse_message_tags)(Client *client, char **str, MessageTag **mtag_list);
+char *(*mtags_to_string)(MessageTag *m, Client *client);
+int (*can_send_to_channel)(Client *client, Channel *channel, char **msgtext, char **errmsg, int notice);
+void (*broadcast_md_globalvar)(ModDataInfo *mdi, ModData *md);
+void (*broadcast_md_globalvar_cmd)(Client *except, Client *sender, char *varname, char *value);
+int (*tkl_ip_hash)(char *ip);
+int (*tkl_ip_hash_type)(int type);
+void (*sendnotice_tkl_del)(char *removed_by, TKL *tkl);
+void (*sendnotice_tkl_add)(TKL *tkl);
+void (*free_tkl)(TKL *tkl);
+TKL *(*find_tkl_serverban)(int type, char *usermask, char *hostmask, int softban);
+TKL *(*find_tkl_banexception)(int type, char *usermask, char *hostmask, int softban);
+TKL *(*find_tkl_nameban)(int type, char *name, int hold);
+TKL *(*find_tkl_spamfilter)(int type, char *match_string, unsigned short action, unsigned short target);
+int (*find_tkl_exception)(int ban_type, Client *client);
+int (*is_silenced)(Client *client, Client *acptr);
+int (*del_silence)(Client *client, const char *mask);
+int (*add_silence)(Client *client, const char *mask, int senderr);
+void *(*labeled_response_save_context)(void);
+void (*labeled_response_set_context)(void *ctx);
+void (*labeled_response_force_end)(void);
+void (*kick_user)(MessageTag *mtags, Channel *channel, Client *client, Client *victim, char *comment);
+
+Efunction *EfunctionAddMain(Module *module, EfunctionType eftype, int (*func)(), void (*vfunc)(), void *(*pvfunc)(), char *(*cfunc)())
+{
+	Efunction *p;
+
+	if (!module || !(module->options & MOD_OPT_OFFICIAL))
+	{
+		if (module)
+			module->errorcode = MODERR_INVALID;
+		return NULL;
+	}
+	
+	p = safe_alloc(sizeof(Efunction));
+	if (func)
+		p->func.intfunc = func;
+	if (vfunc)
+		p->func.voidfunc = vfunc;
+	if (pvfunc)
+		p->func.pvoidfunc = pvfunc;
+	if (cfunc)
+		p->func.pcharfunc = cfunc;
+	p->type = eftype;
+	p->owner = module;
+	AddListItem(p, Efunctions[eftype]);
+	if (module)
+	{
+		ModuleObject *cbobj = safe_alloc(sizeof(ModuleObject));
+		cbobj->object.efunction = p;
+		cbobj->type = MOBJ_EFUNCTION;
+		AddListItem(cbobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	return p;
+}
+
+Efunction *EfunctionDel(Efunction *cb)
+{
+	Efunction *p, *q;
+
+	for (p = Efunctions[cb->type]; p; p = p->next)
+	{
+		if (p == cb)
+		{
+			q = p->next;
+			DelListItem(p, Efunctions[cb->type]);
+			if (*efunction_table[cb->type].funcptr == p)
+				*efunction_table[cb->type].funcptr = NULL;
+			if (p->owner)
+			{
+				ModuleObject *cbobj;
+				for (cbobj = p->owner->objects; cbobj; cbobj = cbobj->next)
+				{
+					if ((cbobj->type == MOBJ_EFUNCTION) && (cbobj->object.efunction == p))
+					{
+						DelListItem(cbobj, cb->owner->objects);
+						safe_free(cbobj);
+						break;
+					}
+				}
+			}
+			safe_free(p);
+			return q;
+		}
+	}
+	return NULL;
+}
+
+static int num_efunctions(EfunctionType eftype)
+{
+	Efunction *e;
+	int cnt = 0;
+
+#ifdef DEBUGMODE
+	if ((eftype < 0) || (eftype >= MAXEFUNCTIONS))
+		abort();
+#endif
+
+	for (e = Efunctions[eftype]; e; e = e->next)
+		if (!e->willberemoved)
+			cnt++;
+			
+	return cnt;
+}
+
+
+/** Ensure that all efunctions are present. */
+int efunctions_check(void)
+{
+	int i, n, errors=0;
+
+	for (i=0; i < MAXEFUNCTIONS; i++)
+		if (efunction_table[i].name)
+		{
+			n = num_efunctions(i);
+			if ((n != 1) && (errors > 10))
+			{
+				config_error("[--efunction errors truncated to prevent flooding--]");
+				break;
+			}
+			if ((n < 1) && !efunction_table[i].deffunc)
+			{
+				config_error("ERROR: efunction '%s' not found, you probably did not "
+				             "load all required modules! (hint: see modules.default.conf)",
+				             efunction_table[i].name);
+				errors++;
+			} else
+			if (n > 1)
+			{
+				config_error("ERROR: efunction '%s' was found %d times, perhaps you "
+				             "loaded a module multiple times??",
+				             efunction_table[i].name, n);
+				errors++;
+			}
+		}
+	return errors ? -1 : 0;
+}
+
+void efunctions_switchover(void)
+{
+	Efunction *e;
+	int i;
+
+	/* Now set the real efunction, and tag the new one
+	 * as 'willberemoved' if needed.
+	 */
+
+	for (i=0; i < MAXEFUNCTIONS; i++)
+	{
+		int found = 0;
+		for (e = Efunctions[i]; e; e = e->next)
+		{
+			if (e->willberemoved)
+				continue;
+			if (!efunction_table[i].funcptr)
+			{
+				ircd_log(LOG_ERROR, "[BUG] efunctions_switchover(): someone forgot to initialize the function table for efunc %d", i);
+				abort();
+			}
+			*efunction_table[i].funcptr = e->func.voidfunc;  /* This is the new one. */
+			if (!(e->owner->options & MOD_OPT_PERM))
+				e->willberemoved = 1;
+			found = 1;
+			break;
+		}
+		if (!found)
+		{
+			if (efunction_table[i].deffunc)
+				*efunction_table[i].funcptr = efunction_table[i].deffunc;
+		}
+	}
+}
+
+#define efunc_init_function(what, func, default_func) efunc_init_function_(what, #func, (void *)&func, default_func)
+
+void efunc_init_function_(EfunctionType what, char *name, void *func, void *default_func)
+{
+	safe_strdup(efunction_table[what].name, name);
+	efunction_table[what].funcptr = func;
+	efunction_table[what].deffunc = default_func;
+}
+
+void efunctions_init(void)
+{
+	memset(&efunction_table, 0, sizeof(efunction_table));
+	efunc_init_function(EFUNC_DO_JOIN, do_join, NULL);
+	efunc_init_function(EFUNC_JOIN_CHANNEL, join_channel, NULL);
+	efunc_init_function(EFUNC_CAN_JOIN, can_join, NULL);
+	efunc_init_function(EFUNC_DO_MODE, do_mode, NULL);
+	efunc_init_function(EFUNC_SET_MODE, set_mode, NULL);
+	efunc_init_function(EFUNC_CMD_UMODE, cmd_umode, NULL);
+	efunc_init_function(EFUNC_REGISTER_USER, register_user, NULL);
+	efunc_init_function(EFUNC_TKL_HASH, tkl_hash, NULL);
+	efunc_init_function(EFUNC_TKL_TYPETOCHAR, tkl_typetochar, NULL);
+	efunc_init_function(EFUNC_TKL_ADD_SERVERBAN, tkl_add_serverban, NULL);
+	efunc_init_function(EFUNC_TKL_ADD_BANEXCEPTION, tkl_add_banexception, NULL);
+	efunc_init_function(EFUNC_TKL_DEL_LINE, tkl_del_line, NULL);
+	efunc_init_function(EFUNC_TKL_CHECK_LOCAL_REMOVE_SHUN, tkl_check_local_remove_shun, NULL);
+	efunc_init_function(EFUNC_FIND_TKLINE_MATCH, find_tkline_match, NULL);
+	efunc_init_function(EFUNC_FIND_SHUN, find_shun, NULL);
+	efunc_init_function(EFUNC_FIND_SPAMFILTER_USER, find_spamfilter_user, NULL);
+	efunc_init_function(EFUNC_FIND_QLINE, find_qline, NULL);
+	efunc_init_function(EFUNC_FIND_TKLINE_MATCH_ZAP, find_tkline_match_zap, NULL);
+	efunc_init_function(EFUNC_TKL_STATS, tkl_stats, NULL);
+	efunc_init_function(EFUNC_TKL_SYNCH, tkl_sync, NULL);
+	efunc_init_function(EFUNC_CMD_TKL, cmd_tkl, NULL);
+	efunc_init_function(EFUNC_PLACE_HOST_BAN, place_host_ban, NULL);
+	efunc_init_function(EFUNC_DOSPAMFILTER, match_spamfilter, NULL);
+	efunc_init_function(EFUNC_DOSPAMFILTER_VIRUSCHAN, join_viruschan, NULL);
+	efunc_init_function(EFUNC_STRIPCOLORS, StripColors, NULL);
+	efunc_init_function(EFUNC_STRIPCONTROLCODES, StripControlCodes, NULL);
+	efunc_init_function(EFUNC_SPAMFILTER_BUILD_USER_STRING, spamfilter_build_user_string, NULL);
+	efunc_init_function(EFUNC_SEND_PROTOCTL_SERVERS, send_protoctl_servers, NULL);
+	efunc_init_function(EFUNC_VERIFY_LINK, verify_link, NULL);
+	efunc_init_function(EFUNC_SEND_SERVER_MESSAGE, send_server_message, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_CLIENT, broadcast_md_client, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_CHANNEL, broadcast_md_channel, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_MEMBER, broadcast_md_member, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_MEMBERSHIP, broadcast_md_membership, NULL);
+	efunc_init_function(EFUNC_CHECK_BANNED, check_banned, NULL);
+	efunc_init_function(EFUNC_INTRODUCE_USER, introduce_user, NULL);
+	efunc_init_function(EFUNC_CHECK_DENY_VERSION, check_deny_version, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_CLIENT_CMD, broadcast_md_client_cmd, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_CHANNEL_CMD, broadcast_md_channel_cmd, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_MEMBER_CMD, broadcast_md_member_cmd, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_MEMBERSHIP_CMD, broadcast_md_membership_cmd, NULL);
+	efunc_init_function(EFUNC_SEND_MODDATA_CLIENT, send_moddata_client, NULL);
+	efunc_init_function(EFUNC_SEND_MODDATA_CHANNEL, send_moddata_channel, NULL);
+	efunc_init_function(EFUNC_SEND_MODDATA_MEMBERS, send_moddata_members, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MODDATA_CLIENT, broadcast_moddata_client, NULL);
+	efunc_init_function(EFUNC_MATCH_USER, match_user, NULL);
+	efunc_init_function(EFUNC_USERHOST_SAVE_CURRENT, userhost_save_current, NULL);
+	efunc_init_function(EFUNC_USERHOST_CHANGED, userhost_changed, NULL);
+	efunc_init_function(EFUNC_SEND_JOIN_TO_LOCAL_USERS, send_join_to_local_users, NULL);
+	efunc_init_function(EFUNC_DO_NICK_NAME, do_nick_name, NULL);
+	efunc_init_function(EFUNC_DO_REMOTE_NICK_NAME, do_remote_nick_name, NULL);
+	efunc_init_function(EFUNC_CHARSYS_GET_CURRENT_LANGUAGES, charsys_get_current_languages, NULL);
+	efunc_init_function(EFUNC_BROADCAST_SINFO, broadcast_sinfo, NULL);
+	efunc_init_function(EFUNC_PARSE_MESSAGE_TAGS, parse_message_tags, &parse_message_tags_default_handler);
+	efunc_init_function(EFUNC_MTAGS_TO_STRING, mtags_to_string, &mtags_to_string_default_handler);
+	efunc_init_function(EFUNC_TKL_CHARTOTYPE, tkl_chartotype, NULL);
+	efunc_init_function(EFUNC_TKL_TYPE_STRING, tkl_type_string, NULL);
+	efunc_init_function(EFUNC_CAN_SEND_TO_CHANNEL, can_send_to_channel, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_GLOBALVAR, broadcast_md_globalvar, NULL);
+	efunc_init_function(EFUNC_BROADCAST_MD_GLOBALVAR_CMD, broadcast_md_globalvar_cmd, NULL);
+	efunc_init_function(EFUNC_TKL_IP_HASH, tkl_ip_hash, NULL);
+	efunc_init_function(EFUNC_TKL_IP_HASH_TYPE, tkl_ip_hash_type, NULL);
+	efunc_init_function(EFUNC_TKL_ADD_NAMEBAN, tkl_add_nameban, NULL);
+	efunc_init_function(EFUNC_TKL_ADD_SPAMFILTER, tkl_add_spamfilter, NULL);
+	efunc_init_function(EFUNC_SENDNOTICE_TKL_ADD, sendnotice_tkl_add, NULL);
+	efunc_init_function(EFUNC_SENDNOTICE_TKL_DEL, sendnotice_tkl_del, NULL);
+	efunc_init_function(EFUNC_FREE_TKL, free_tkl, NULL);
+	efunc_init_function(EFUNC_FIND_TKL_SERVERBAN, find_tkl_serverban, NULL);
+	efunc_init_function(EFUNC_FIND_TKL_BANEXCEPTION, find_tkl_banexception, NULL);
+	efunc_init_function(EFUNC_FIND_TKL_NAMEBAN, find_tkl_nameban, NULL);
+	efunc_init_function(EFUNC_FIND_TKL_SPAMFILTER, find_tkl_spamfilter, NULL);
+	efunc_init_function(EFUNC_FIND_TKL_EXCEPTION, find_tkl_exception, NULL);
+	efunc_init_function(EFUNC_ADD_SILENCE, add_silence, add_silence_default_handler);
+	efunc_init_function(EFUNC_DEL_SILENCE, del_silence, del_silence_default_handler);
+	efunc_init_function(EFUNC_IS_SILENCED, is_silenced, is_silenced_default_handler);
+	efunc_init_function(EFUNC_LABELED_RESPONSE_SAVE_CONTEXT, labeled_response_save_context, labeled_response_save_context_default_handler);
+	efunc_init_function(EFUNC_LABELED_RESPONSE_SET_CONTEXT, labeled_response_set_context, labeled_response_set_context_default_handler);
+	efunc_init_function(EFUNC_LABELED_RESPONSE_FORCE_END, labeled_response_force_end, labeled_response_force_end_default_handler);
+	efunc_init_function(EFUNC_KICK_USER, kick_user, NULL);
+}
diff --git a/src/api-event.c b/src/api-event.c
new file mode 100644
index 0000000..6dcb888
--- /dev/null
+++ b/src/api-event.c
@@ -0,0 +1,211 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, api-event.c
+ *   (C) 2001- Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *   and the UnrealIRCd team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ID_Copyright("(C) Carsten Munk 2001");
+
+MODVAR Event *events = NULL;
+
+extern EVENT(unrealdns_removeoldrecords);
+
+/** Add an event, a function that will run at regular intervals.
+ * @param module	Module that this event belongs to
+ * @param name		Name of the event
+ * @param event		The EVENT(function) to be called
+ * @param data		The data to be passed to the function (or just NULL)
+ * @param every_msec	Every <this> milliseconds the event will be called, but see notes.
+ * @param count		After how many times we should stop calling this even (0 = infinite times)
+ * @returns an Event struct
+ * @note  UnrealIRCd will try to call the event every 'every_msec' milliseconds.
+ *        However, in case of low traffic the minimum time is at least SOCKETLOOP_MAX_DELAY
+ *        which is 250ms at the time of writing. Also, we reject any value below 100 msecs.
+ *        The actual calling time will not be quicker than the specified every_msec but
+ *        can be later, in case of high load, in very extreme cases even up to 1000 or 2000
+ *        msec later but that would be very unusual. Just saying, it's not a guarantee..
+ */
+Event *EventAdd(Module *module, char *name, vFP event, void *data, long every_msec, int count)
+{
+	Event *newevent;
+
+	if (!name || (every_msec < 0) || (count < 0) || !event)
+	{
+		if (module)
+			module->errorcode = MODERR_INVALID;
+		return NULL;
+	}
+
+	if ((every_msec < 100) && (count == 0))
+	{
+		ircd_log(LOG_ERROR, "[BUG] EventAdd() '%s' from module '%s' with suspiciously low every_msec value (%ld). "
+		                    "Note that it is in milliseconds now (1000 = 1 second)!",
+		                    name,
+		                    module ? module->header->name : "???",
+		                    every_msec);
+		every_msec = 100;
+	}
+
+	newevent = safe_alloc(sizeof(Event));
+	safe_strdup(newevent->name, name);
+	newevent->count = count;
+	newevent->every_msec = every_msec;
+	newevent->event = event;
+	newevent->data = data;
+	newevent->last_run.tv_sec = timeofday_tv.tv_sec;
+	newevent->last_run.tv_usec = timeofday_tv.tv_usec;
+	newevent->owner = module;
+	AddListItem(newevent,events);
+	if (module)
+	{
+		ModuleObject *eventobj = safe_alloc(sizeof(ModuleObject));
+		eventobj->object.event = newevent;
+		eventobj->type = MOBJ_EVENT;
+		AddListItem(eventobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	return newevent;
+	
+}
+
+Event *EventMarkDel(Event *event)
+{
+	event->count = -1;
+	return event;
+}
+
+Event *EventDel(Event *event)
+{
+	Event *p, *q;
+	for (p = events; p; p = p->next)
+	{
+		if (p == event)
+		{
+			q = p->next;
+			safe_free(p->name);
+			DelListItem(p, events);
+			if (p->owner)
+			{
+				ModuleObject *eventobjs;
+				for (eventobjs = p->owner->objects; eventobjs; eventobjs = eventobjs->next)
+				{
+					if (eventobjs->type == MOBJ_EVENT && eventobjs->object.event == p)
+					{
+						DelListItem(eventobjs, p->owner->objects);
+						safe_free(eventobjs);
+						break;
+					}
+				}
+			}
+			safe_free(p);
+			return q;		
+		}
+	}
+	return NULL;
+}
+
+Event *EventFind(char *name)
+{
+	Event *eventptr;
+
+	for (eventptr = events; eventptr; eventptr = eventptr->next)
+		if (!strcmp(eventptr->name, name))
+			return (eventptr);
+	return NULL;
+}
+
+int EventMod(Event *event, EventInfo *mods)
+{
+	if (!event || !mods)
+	{
+		if (event && event->owner)
+			event->owner->errorcode = MODERR_INVALID;
+		return -1;
+	}
+
+	if (mods->flags & EMOD_EVERY)
+	{
+		if (mods->every_msec < 100)
+		{
+			ircd_log(LOG_ERROR, "[BUG] EventMod() for '%s' from module '%s' with suspiciously low every_msec value (%lld). "
+					    "Note that it is in milliseconds now (1000 = 1 second)!",
+					    event->name,
+					    event->owner ? event->owner->header->name : "???",
+					    (long long)mods->every_msec);
+			mods->every_msec = 100;
+		}
+
+		event->every_msec = mods->every_msec;
+	}
+	if (mods->flags & EMOD_HOWMANY)
+		event->count = mods->count;
+	if (mods->flags & EMOD_NAME)
+		safe_strdup(event->name, mods->name);
+	if (mods->flags & EMOD_EVENT)
+		event->event = mods->event;
+	if (mods->flags & EMOD_DATA)
+		event->data = mods->data;
+	if (event->owner)
+		event->owner->errorcode = MODERR_NOERROR;
+	return 0;
+}
+
+void DoEvents(void)
+{
+	Event *e, *e_next;
+
+	for (e = events; e; e = e_next)
+	{
+		e_next = e->next;
+		if (e->count == -1)
+		{
+			EventDel(e);
+			continue;
+		}
+		if ((e->every_msec == 0) || minimum_msec_since_last_run(&e->last_run, e->every_msec))
+		{
+			(*e->event)(e->data);
+			if (e->count > 0)
+			{
+				e->count--;
+				if (e->count == 0)
+				{
+					EventDel(e);
+					continue;
+				}
+			}
+		}
+	}
+}
+
+void SetupEvents(void)
+{
+	/* Start events */
+	EventAdd(NULL, "tunefile", save_tunefile, NULL, 300*1000, 0);
+	EventAdd(NULL, "garbage", garbage_collect, NULL, GARBAGE_COLLECT_EVERY*1000, 0);
+	EventAdd(NULL, "loop", loop_event, NULL, 1000, 0);
+	EventAdd(NULL, "unrealdns_removeoldrecords", unrealdns_removeoldrecords, NULL, 15000, 0);
+	EventAdd(NULL, "check_pings", check_pings, NULL, 1000, 0);
+	EventAdd(NULL, "check_deadsockets", check_deadsockets, NULL, 1000, 0);
+	EventAdd(NULL, "handshake_timeout", handshake_timeout, NULL, 1000, 0);
+	EventAdd(NULL, "try_connections", try_connections, NULL, 2000, 0);
+}
diff --git a/src/api-extban.c b/src/api-extban.c
new file mode 100644
index 0000000..fdf7f8b
--- /dev/null
+++ b/src/api-extban.c
@@ -0,0 +1,299 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, api-extban.c
+ *   (C) 2003 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+Extban MODVAR ExtBan_Table[EXTBANTABLESZ]; /* this should be fastest */
+unsigned MODVAR short ExtBan_highest = 0;
+
+void set_isupport_extban(void)
+{
+	int i;
+	char extbanstr[EXTBANTABLESZ+1], *m;
+
+	m = extbanstr;
+	for (i = 0; i <= ExtBan_highest; i++)
+	{
+		if (ExtBan_Table[i].flag)
+			*m++ = ExtBan_Table[i].flag;
+	}
+	*m = 0;
+	ISupportSetFmt(NULL, "EXTBAN", "~,%s", extbanstr);
+}
+
+Extban *findmod_by_bantype(char c)
+{
+int i;
+
+	for (i=0; i <= ExtBan_highest; i++)
+		if (ExtBan_Table[i].flag == c)
+			return &ExtBan_Table[i];
+
+	 return NULL;
+}
+
+Extban *ExtbanAdd(Module *module, ExtbanInfo req)
+{
+	int slot;
+
+	if (findmod_by_bantype(req.flag))
+	{
+		if (module)
+			module->errorcode = MODERR_EXISTS;
+		return NULL; 
+	}
+
+	/* TODO: perhaps some sanity checking on a-zA-Z0-9? */
+	for (slot = 0; slot < EXTBANTABLESZ; slot++)
+		if (ExtBan_Table[slot].flag == '\0')
+			break;
+	if (slot >= EXTBANTABLESZ - 1)
+	{
+		if (module)
+			module->errorcode = MODERR_NOSPACE;
+		return NULL;
+	}
+	ExtBan_Table[slot].flag = req.flag;
+	ExtBan_Table[slot].is_ok = req.is_ok;
+	ExtBan_Table[slot].conv_param = req.conv_param;
+	ExtBan_Table[slot].is_banned = req.is_banned;
+	ExtBan_Table[slot].owner = module;
+	ExtBan_Table[slot].options = req.options;
+	if (module)
+	{
+		ModuleObject *banobj = safe_alloc(sizeof(ModuleObject));
+		banobj->object.extban = &ExtBan_Table[slot];
+		banobj->type = MOBJ_EXTBAN;
+		AddListItem(banobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	ExtBan_highest = slot;
+	set_isupport_extban();
+	return &ExtBan_Table[slot];
+}
+
+void ExtbanDel(Extban *eb)
+{
+	/* Just zero it all away.. */
+
+	if (eb->owner)
+	{
+		ModuleObject *banobj;
+		for (banobj = eb->owner->objects; banobj; banobj = banobj->next)
+		{
+			if (banobj->type == MOBJ_EXTBAN && banobj->object.extban == eb)
+			{
+				DelListItem(banobj, eb->owner->objects);
+				safe_free(banobj);
+				break;
+			}
+		}
+	}
+	memset(eb, 0, sizeof(Extban));
+	set_isupport_extban();
+	/* Hmm do we want to go trough all chans and remove the bans?
+	 * I would say 'no' because perhaps we are just reloading,
+	 * and else.. well... screw them?
+	 */
+}
+
+/* NOTE: the routines below can safely assume the ban has at
+ * least the '~t:' part (t=type). -- Syzop
+ */
+
+/** General is_ok for n!u@h stuff that also deals with recursive extbans.
+ */
+int extban_is_ok_nuh_extban(Client *client, Channel* channel, char *para, int checkt, int what, int what2)
+{
+	char *mask = (para + 3);
+	Extban *p = NULL;
+	int isok;
+	static int extban_is_ok_recursion = 0;
+
+	/* Mostly copied from clean_ban_mask - but note MyUser checks aren't needed here: extban->is_ok() according to cmd_mode isn't called for nonlocal. */
+	if (is_extended_ban(mask))
+	{
+		if (extban_is_ok_recursion)
+			return 0; /* Fail: more than one stacked extban */
+
+		if ((checkt == EXBCHK_PARAM) && RESTRICT_EXTENDEDBANS && !ValidatePermissionsForPath("immune:restrict-extendedbans",client,NULL,channel,NULL))
+		{
+			/* Test if this specific extban has been disabled.
+			 * (We can be sure RESTRICT_EXTENDEDBANS is not *. Else this extended ban wouldn't be happening at all.)
+			 */
+			if (strchr(RESTRICT_EXTENDEDBANS, mask[1]))
+			{
+				sendnotice(client, "Setting/removing of extended bantypes '%s' has been disabled.", RESTRICT_EXTENDEDBANS);
+				return 0; /* Fail */
+			}
+		}
+		p = findmod_by_bantype(mask[1]);
+		if (!p)
+		{
+			if (what == MODE_DEL)
+			{
+				return 1; /* Always allow killing unknowns. */
+			}
+			return 0; /* Don't add unknown extbans. */
+		}
+		/* Now we have to ask the stacked extban if it's ok. */
+		if (p->is_ok)
+		{
+			extban_is_ok_recursion++;
+			isok = p->is_ok(client, channel, mask, checkt, what, what2);
+			extban_is_ok_recursion--;
+			return isok;
+		}
+	}
+	return 1; /* Either not an extban, or extban has NULL is_ok. Good to go. */
+}
+
+/** Some kind of general conv_param routine,
+ * to ensure the parameter is nick!user@host.
+ * most of the code is just copied from clean_ban_mask.
+ */
+char *extban_conv_param_nuh(char *para)
+{
+	char *cp, *user, *host, *mask, *ret = NULL;
+	static char retbuf[USERLEN + NICKLEN + HOSTLEN + 32];
+	char tmpbuf[USERLEN + NICKLEN + HOSTLEN + 32];
+	char pfix[8];
+
+	if (strlen(para)<3)
+		return NULL; /* normally impossible */
+
+	strlcpy(tmpbuf, para, sizeof(retbuf));
+	mask = tmpbuf + 3;
+	strlcpy(pfix, tmpbuf, mask - tmpbuf + 1);
+
+	if (!*mask)
+		return NULL; /* empty extban */
+	if ((*mask == '~') && !strchr(mask, '@'))
+		return NULL; /* not a user@host ban, too confusing. */
+	if ((user = strchr((cp = mask), '!')))
+		*user++ = '\0';
+	if ((host = strrchr(user ? user : cp, '@')))
+	{
+		*host++ = '\0';
+		if (!user)
+			ret = make_nick_user_host(NULL, trim_str(cp,USERLEN), trim_str(host,HOSTLEN));
+	}
+	else if (!user && strchr(cp, '.'))
+		ret = make_nick_user_host(NULL, NULL, trim_str(cp,HOSTLEN));
+	if (!ret)
+		ret = make_nick_user_host(trim_str(cp,NICKLEN), trim_str(user,USERLEN), trim_str(host,HOSTLEN));
+
+	ircsnprintf(retbuf, sizeof(retbuf), "%s%s", pfix, ret);
+	return retbuf;
+}
+
+/** conv_param to deal with stacked extbans.
+ */
+char *extban_conv_param_nuh_or_extban(char *para)
+{
+#if (USERLEN + NICKLEN + HOSTLEN + 32) > 256
+ #error "wtf?"
+#endif
+	static char retbuf[256];
+	static char printbuf[256];
+	char *mask;
+	char tmpbuf[USERLEN + NICKLEN + HOSTLEN + 32];
+	char bantype = para[1];
+	char *ret = NULL;
+	Extban *p = NULL;
+	static int extban_recursion = 0;
+
+	if ((strlen(para)>3) && is_extended_ban(para+3))
+	{
+		/* We're dealing with a stacked extended ban.
+		 * Rules:
+		 * 1) You can only stack once, so: ~x:~y:something and not ~x:~y:~z...
+		 * 2) The first item must be an action modifier, such as ~q/~n/~j
+		 * 3) The second item may never be an action modifier, nor have the
+		 *    EXTBOPT_NOSTACKCHILD flag set (for things like a textban).
+		 */
+		 
+		/* Rule #1. Yes the recursion check is also in extban_is_ok_nuh_extban,
+		 * but it's possible to get here without the is_ok() function ever
+		 * being called (think: non-local client). And no, don't delete it
+		 * there either. It needs to be in BOTH places. -- Syzop
+		 */
+		if (extban_recursion)
+			return NULL;
+
+		/* Rule #2 */
+		p = findmod_by_bantype(para[1]);
+		if (p && !(p->options & EXTBOPT_ACTMODIFIER))
+		{
+			/* Rule #2 violation */
+			return NULL;
+		}
+		
+		strlcpy(tmpbuf, para, sizeof(tmpbuf));
+		mask = tmpbuf + 3;
+		/* Already did restrict-extended bans check. */
+		p = findmod_by_bantype(mask[1]);
+		if (!p)
+		{
+			/* Handling unknown bantypes in is_ok. Assume that it's ok here. */
+			return para;
+		}
+		if ((p->options & EXTBOPT_ACTMODIFIER) || (p->options & EXTBOPT_NOSTACKCHILD))
+		{
+			/* Rule #3 violation */
+			return NULL;
+		}
+		
+		if (p->conv_param)
+		{
+			extban_recursion++;
+			ret = p->conv_param(mask);
+			extban_recursion--;
+			if (ret)
+			{
+				/*
+				 * If bans are stacked, then we have to use two buffers
+				 * to prevent ircsnprintf() from going into a loop.
+				 */
+				ircsnprintf(printbuf, sizeof(printbuf), "~%c:%s", bantype, ret); /* Make sure our extban prefix sticks. */
+				memcpy(retbuf, printbuf, sizeof(retbuf));
+				return retbuf;
+			}
+			else
+			{
+				return NULL; /* Fail. */
+			}
+		}
+		/* I honestly don't know what the deal is with the 80 char cap in clean_ban_mask is about. So I'm leaving it out here. -- aquanight */
+		/* I don't know why it's 80, but I like a limit anyway. A ban of 500 characters can never be good... -- Syzop */
+		if (strlen(para) > 80)
+		{
+			strlcpy(retbuf, para, 128);
+			return retbuf;
+		}
+		return para;
+	}
+	else
+	{
+		return extban_conv_param_nuh(para);
+	}
+}
diff --git a/src/api-history-backend.c b/src/api-history-backend.c
new file mode 100644
index 0000000..f6eba60
--- /dev/null
+++ b/src/api-history-backend.c
@@ -0,0 +1,197 @@
+/************************************************************************
+ * UnrealIRCd - Unreal Internet Relay Chat Daemon - src/api-history-backend.c
+ * (c) 2019- Bram Matthys and The UnrealIRCd team
+ *
+ * See file AUTHORS in IRC package for additional names of
+ * the programmers. 
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+MODVAR HistoryBackend *historybackends = NULL; /**< List of registered history backends */
+
+void history_backend_init(void)
+{
+}
+
+/**
+ * Returns a history backend based on the given token name.
+ *
+ * @param name The name of the history backend.
+ * @return Returns the handle to the history backend,
+ *         or NULL if not found.
+ */
+HistoryBackend *HistoryBackendFind(const char *name)
+{
+	HistoryBackend *m;
+
+	for (m = historybackends; m; m = m->next)
+	{
+		if (!strcasecmp(name, m->name))
+			return m;
+	}
+	return NULL;
+}
+
+/**
+ * Adds a new history backend.
+ *
+ * @param module The module which provides this history backend.
+ * @param mreq   The details of the request such as token name, access check handler, etc.
+ * @return Returns the handle to the new token if successful, otherwise NULL.
+ *         The module's error code contains specific information about the
+ *         error.
+ */
+HistoryBackend *HistoryBackendAdd(Module *module, HistoryBackendInfo *mreq)
+{
+	HistoryBackend *m;
+	int exists = 0;
+
+	if (!mreq->history_add || !mreq->history_request ||
+	    !mreq->history_destroy || !mreq->history_set_limit)
+	{
+		if (module)
+			module->errorcode = MODERR_INVALID;
+		ircd_log(LOG_ERROR, "HistoryBackendAdd(): missing a handler for add/del/request/destroy/set_limit");
+		return NULL;
+	}
+	m = HistoryBackendFind(mreq->name);
+	if (m)
+	{
+		exists = 1;
+		if (m->unloaded)
+		{
+			m->unloaded = 0;
+		} else {
+			if (module)
+				module->errorcode = MODERR_EXISTS;
+			return NULL;
+		}
+	} else {
+		/* New history backend */
+		m = safe_alloc(sizeof(HistoryBackend));
+		safe_strdup(m->name, mreq->name);
+	}
+
+	/* Add or update the following fields: */
+	m->owner = module;
+	m->history_add = mreq->history_add;
+	m->history_request = mreq->history_request;
+	m->history_destroy = mreq->history_destroy;
+	m->history_set_limit = mreq->history_set_limit;
+
+	if (!exists)
+		AddListItem(m, historybackends);
+
+	if (module)
+	{
+		ModuleObject *mobj = safe_alloc(sizeof(ModuleObject));
+		mobj->type = MOBJ_HISTORY_BACKEND;
+		mobj->object.history_backend = m;
+		AddListItem(mobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+
+	return m;
+}
+
+void unload_history_backend_commit(HistoryBackend *m)
+{
+	/* Destroy the object */
+	DelListItem(m, historybackends);
+	safe_free(m->name);
+	safe_free(m);
+}
+
+/**
+ * Removes the specified history backend.
+ *
+ * @param m The history backend to remove.
+ */
+void HistoryBackendDel(HistoryBackend *m)
+{
+	if (m->owner)
+	{
+		ModuleObject *mobj;
+		for (mobj = m->owner->objects; mobj; mobj = mobj->next) {
+			if (mobj->type == MOBJ_HISTORY_BACKEND && mobj->object.history_backend == m)
+			{
+				DelListItem(mobj, m->owner->objects);
+				safe_free(mobj);
+				break;
+			}
+		}
+		m->owner = NULL;
+	}
+
+	if (loop.ircd_rehashing)
+		m->unloaded = 1;
+	else
+		unload_history_backend_commit(m);
+}
+
+void unload_all_unused_history_backends(void)
+{
+	HistoryBackend *m, *m_next;
+
+	for (m = historybackends; m; m = m_next)
+	{
+		m_next = m->next;
+		if (m->unloaded)
+			unload_history_backend_commit(m);
+	}
+}
+
+int history_add(char *object, MessageTag *mtags, char *line)
+{
+	HistoryBackend *hb;
+
+	for (hb = historybackends; hb; hb=hb->next)
+		hb->history_add(object, mtags, line);
+
+	return 1;
+}
+
+int history_request(Client *client, char *object, HistoryFilter *filter)
+{
+	HistoryBackend *hb;
+
+	for (hb = historybackends; hb; hb=hb->next)
+		hb->history_request(client, object, filter);
+
+	return 1;
+}
+
+int history_destroy(char *object)
+{
+	HistoryBackend *hb;
+
+	for (hb = historybackends; hb; hb=hb->next)
+		hb->history_destroy(object);
+
+	return 1;
+}
+
+int history_set_limit(char *object, int max_lines, long max_t)
+{
+	HistoryBackend *hb;
+
+	for (hb = historybackends; hb; hb=hb->next)
+		hb->history_set_limit(object, max_lines, max_t);
+
+	return 1;
+}
diff --git a/src/api-isupport.c b/src/api-isupport.c
new file mode 100644
index 0000000..a378e5b
--- /dev/null
+++ b/src/api-isupport.c
@@ -0,0 +1,335 @@
+/************************************************************************
+ *   UnrealIRCd - Unreal Internet Relay Chat Daemon - src/api-isupport.c
+ *   (c) 2004 Dominick Meglio and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ISupport *ISupports; /* List of ISUPPORT (005) tokens */
+#define MAXISUPPORTLINES 10
+
+MODVAR char *ISupportStrings[MAXISUPPORTLINES+1];
+
+void isupport_add_sorted(ISupport *is);
+void make_isupportstrings(void);
+
+/** Easier way to set a 005 name or name=value.
+ * @param name   Name of the 005 token
+ * @param value  Value of the 005 token (or NULL)
+ * @note  The 'name' 005 token will be overwritten if it already exists.
+ *        The 'value' may be NULL, in which case if there was a value
+ *        it will be unset.
+ */
+void ISupportSet(Module *module, const char *name, const char *value)
+{
+	ISupport *is = ISupportFind(name);
+	if (!is)
+		is = ISupportAdd(module, name, value);
+	ISupportSetValue(is, value);
+}
+
+/** Easy way to set a 005 name=value with printf style formatting.
+ * @param name     Name of the 005 token
+ * @param pattern  Value pattern for the 005 token (or NULL)
+ * @param ...      Any variables needed for 'pattern'.
+ * @note  The 'name' 005 token will be overwritten if it already exists.
+ *        The 'pattern' may be NULL, in which case if there was a value
+ *        it will be unset.
+ */
+void ISupportSetFmt(Module *module, const char *name, const char *pattern, ...)
+{
+	const char *value = NULL;
+	char buf[256];
+	va_list vl;
+
+	if (pattern)
+	{
+		va_start(vl, pattern);
+		ircvsnprintf(buf, sizeof(buf), pattern, vl);
+		va_end(vl);
+		value = buf;
+	}
+	ISupportSet(module, name, value);
+}
+
+void ISupportDelByName(const char *name)
+{
+	ISupport *is = ISupportFind(name);
+	if (is)
+		ISupportDel(is);
+}
+
+extern void set_isupport_extban(void);
+extern void set_isupport_targmax(void);
+
+/**
+ * Initializes the builtin isupport tokens.
+ */
+void isupport_init(void)
+{
+	ISupportSet(NULL, "INVEX", NULL);
+	ISupportSet(NULL, "EXCEPTS", NULL);
+#ifdef PREFIX_AQ
+	ISupportSet(NULL, "STATUSMSG", "~&@%+");
+#else
+	ISupportSet(NULL, "STATUSMSG", "@%+");
+#endif
+	ISupportSet(NULL, "ELIST", "MNUCT");
+	ISupportSet(NULL, "CASEMAPPING", "ascii");
+	ISupportSet(NULL, "NETWORK", ircnet005);
+	ISupportSetFmt(NULL, "CHANMODES",
+	               CHPAR1 "%s," CHPAR2 "%s," CHPAR3 "%s," CHPAR4 "%s",
+	               EXPAR1, EXPAR2, EXPAR3, EXPAR4);
+	ISupportSet(NULL, "PREFIX", CHPFIX);
+	ISupportSet(NULL, "CHANTYPES", "#");
+	ISupportSetFmt(NULL, "MODES", "%d", MAXMODEPARAMS);
+	ISupportSetFmt(NULL, "SILENCE", "%d", SILENCE_LIMIT);
+	if (WATCH_AWAY_NOTIFICATION)
+		ISupportSet(NULL, "WATCHOPTS", "A");
+	else
+		ISupportDelByName("WATCHOPTS");
+	ISupportSetFmt(NULL, "WATCH", "%d", MAXWATCH);
+	ISupportSet(NULL, "WALLCHOPS", NULL);
+	ISupportSetFmt(NULL, "AWAYLEN", "%d", iConf.away_length);
+	ISupportSetFmt(NULL, "KICKLEN", "%d", iConf.kick_length);
+	ISupportSetFmt(NULL, "TOPICLEN", "%d", iConf.topic_length);
+	ISupportSetFmt(NULL, "QUITLEN", "%d", iConf.quit_length);
+	ISupportSetFmt(NULL, "CHANNELLEN", "%d", CHANNELLEN);
+	ISupportSetFmt(NULL, "MINNICKLEN", "%d", iConf.min_nick_length);
+	ISupportSetFmt(NULL, "NICKLEN", "%d", iConf.nick_length);
+	ISupportSetFmt(NULL, "MAXNICKLEN", "%d", NICKLEN);
+	ISupportSetFmt(NULL, "MAXLIST", "b:%d,e:%d,I:%d", MAXBANS, MAXBANS, MAXBANS);
+	ISupportSetFmt(NULL, "CHANLIMIT", "#:%d", MAXCHANNELSPERUSER);
+	ISupportSetFmt(NULL, "MAXCHANNELS", "%d", MAXCHANNELSPERUSER);
+	ISupportSet(NULL, "HCN", NULL);
+	ISupportSet(NULL, "SAFELIST", NULL);
+	ISupportSet(NULL, "NAMESX", NULL);
+	if (UHNAMES_ENABLED)
+		ISupportSet(NULL, "UHNAMES", NULL);
+	else
+		ISupportDelByName("UHNAMES");
+	ISupportSet(NULL, "DEAF", "d");
+	set_isupport_extban(); /* EXTBAN=xyz */
+	set_isupport_targmax(); /* TARGMAX=... */
+}
+
+/**
+ * Sets or changes the value of an existing isupport token.
+ *
+ * @param isupport The pointer to the isupport handle.
+ * @param value    The new value of the token (NULL indicates no value).
+ */
+void ISupportSetValue(ISupport *isupport, const char *value)
+{
+	safe_strdup(isupport->value, value);
+	make_isupportstrings();
+}
+
+/**
+ * Returns an isupport handle based on the given token name.
+ *
+ * @param token The isupport token to search for.
+ * @return Returns the handle to the isupport token if it was found,
+ *         otherwise NULL is returned.
+ */
+ISupport *ISupportFind(const char *token)
+{
+	ISupport *isupport;
+
+	for (isupport = ISupports; isupport; isupport = isupport->next)
+	{
+		if (!strcasecmp(token, isupport->token))
+			return isupport;
+	}
+	return NULL;
+}
+
+/**
+ * Adds a new isupport token.
+ *
+ * @param module The module which owns this token.
+ * @param token  The name of the token to create.
+ * @param value  The value of the token (NULL indicates no value).
+ * @return Returns the handle to the new token if successful, otherwise NULL.
+ *         The module's error code contains specific information about the
+ *         error.
+ */
+ISupport *ISupportAdd(Module *module, const char *token, const char *value)
+{
+	ISupport *isupport;
+	const char *c;
+
+	if (ISupportFind(token))
+	{
+		if (module)
+			module->errorcode = MODERR_EXISTS;
+		return NULL;
+	}
+	/* draft-brocklesby-irc-isupport:
+	 * token = a-zA-Z0-9 and 20 or less characters
+	 * value = ASCII 0x21 - 0x7E
+	 */
+	for (c = token; c && *c; c++)
+	{
+		if (!isalnum(*c))
+		{
+			if (module)
+				module->errorcode = MODERR_INVALID;
+			return NULL;
+		}
+	}
+	if (!token || !*token || c-token > 20)
+	{
+		if (module)
+			module->errorcode = MODERR_INVALID;
+		return NULL;
+	}
+	for (c = value; c && *c; c++)
+	{
+		if (*c < '!' || *c > '~')
+		{
+			if (module)
+				module->errorcode = MODERR_INVALID;
+			return NULL;
+		}
+	}
+
+	isupport = safe_alloc(sizeof(ISupport));
+	isupport->owner = module;
+	safe_strdup(isupport->token, token);
+	if (value)
+		safe_strdup(isupport->value, value);
+	isupport_add_sorted(isupport);
+	make_isupportstrings();
+	if (module)
+	{
+		ModuleObject *isupportobj = safe_alloc(sizeof(ModuleObject));
+		isupportobj->object.isupport = isupport;
+		isupportobj->type = MOBJ_ISUPPORT;
+		AddListItem(isupportobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	return isupport;
+}
+
+/**
+ * Removes the specified isupport token.
+ *
+ * @param isupport The token to remove.
+ */
+void ISupportDel(ISupport *isupport)
+{
+	DelListItem(isupport, ISupports);
+	if (isupport->owner)
+	{
+		ModuleObject *mo;
+		for (mo = isupport->owner->objects; mo; mo = mo->next)
+		{
+			if (mo->type == MOBJ_ISUPPORT && mo->object.isupport == isupport)
+			{
+				DelListItem(mo, isupport->owner->objects);
+				safe_free(mo);
+				break;
+			}
+		}
+	}
+	safe_free(isupport->token);
+	safe_free(isupport->value);
+	safe_free(isupport);
+	make_isupportstrings();
+}
+
+/**
+ * Builds isupport token strings.
+ * Respects both the 13 token limit and the 512 buffer limit.
+ */
+void make_isupportstrings(void)
+{
+	int i;
+#define ISUPPORTLEN BUFSIZE-HOSTLEN-NICKLEN-39
+	int bufsize = ISUPPORTLEN;
+	int tokcnt = 0;
+	ISupport *isupport;
+	char tmp[ISUPPORTLEN];
+
+	/* Free any previous strings */
+	for (i = 0; ISupportStrings[i]; i++)
+		safe_free(ISupportStrings[i]);
+
+	i = 0;
+	ISupportStrings[i] = safe_alloc(bufsize+1);
+
+	for (isupport = ISupports; isupport; isupport = isupport->next)
+	{
+		if (isupport->value)
+			snprintf(tmp, sizeof(tmp), "%s=%s", isupport->token, isupport->value);
+		else
+			strlcpy(tmp, isupport->token, sizeof(tmp));
+
+		tokcnt++;
+		if ((strlen(ISupportStrings[i]) + strlen(tmp) + 1 >= ISUPPORTLEN) || (tokcnt == 13))
+		{
+			/* No room or max tokens reached: start a new buffer */
+			ISupportStrings[++i] = safe_alloc(bufsize+1);
+			tokcnt = 1;
+			if (i == MAXISUPPORTLINES)
+				abort(); /* should never happen anyway */
+		}
+
+		if (*ISupportStrings[i])
+			strlcat(ISupportStrings[i], " ", ISUPPORTLEN);
+		strlcat(ISupportStrings[i], tmp, ISUPPORTLEN);
+	}
+}
+
+void isupport_add_sorted(ISupport *n)
+{
+	ISupport *e;
+
+	if (!ISupports)
+	{
+		ISupports = n;
+		return;
+	}
+
+	for (e = ISupports; e; e = e->next)
+	{
+		if (strcmp(n->token, e->token) < 0)
+		{
+			/* Insert us before */
+			if (e->prev)
+				e->prev->next = n;
+			else
+				ISupports = n; /* new head */
+			n->prev = e->prev;
+
+			n->next = e;
+			e->prev = n;
+			return;
+		}
+		if (!e->next)
+		{
+			/* Append us at end */
+			e->next = n;
+			n->prev = e;
+			return;
+		}
+	}
+}
diff --git a/src/api-messagetag.c b/src/api-messagetag.c
new file mode 100644
index 0000000..458c5cf
--- /dev/null
+++ b/src/api-messagetag.c
@@ -0,0 +1,176 @@
+/************************************************************************
+ *   UnrealIRCd - Unreal Internet Relay Chat Daemon - src/api-mtag.c
+ *   (c) 2019- Bram Matthys and The UnrealIRCd team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Message tag API
+ */
+#include "unrealircd.h"
+
+/** This is the message tags API (message-tags)
+ * @defgroup MessagetagAPI Message tag API
+ * @{
+ */
+
+/** List of message tag handlers */
+MODVAR MessageTagHandler *mtaghandlers = NULL;
+
+/* Forward declarations */
+static void unload_mtag_handler_commit(MessageTagHandler *m);
+
+/** Adds a new message tag handler.
+ * @param module The module which owns this message-tag handler.
+ * @param mreq   The details of the request such as which message tag, the handler, etc.
+ * @return Returns the handle to the new token if successful, otherwise NULL.
+ *         The module's error code contains specific information about the
+ *         error.
+ */
+MessageTagHandler *MessageTagHandlerAdd(Module *module, MessageTagHandlerInfo *mreq)
+{
+	MessageTagHandler *m;
+
+	/* Some consistency checks to avoid a headache for module devs later on: */
+	if ((mreq->flags & MTAG_HANDLER_FLAGS_NO_CAP_NEEDED) && mreq->clicap_handler)
+	{
+		ircd_log(LOG_ERROR, "MessageTagHandlerAdd(): .flags is set to MTAG_HANDLER_FLAGS_NO_CAP_NEEDED "
+		                    "but a .clicap_handler is passed as well. These options are mutually "
+		                    "exclusive, choose one or the other.");
+		abort();
+	} else if (!(mreq->flags & MTAG_HANDLER_FLAGS_NO_CAP_NEEDED) && !mreq->clicap_handler)
+	{
+		ircd_log(LOG_ERROR, "MessageTagHandlerAdd(): no .clicap_handler is passed. If the "
+		                    "message tag really does not require a cap then you must "
+		                    "set .flags to MTAG_HANDLER_FLAGS_NO_CAP_NEEDED");
+		abort();
+	}
+
+	m = MessageTagHandlerFind(mreq->name);
+	if (m)
+	{
+		if (m->unloaded)
+		{
+			m->unloaded = 0;
+		} else {
+			if (module)
+				module->errorcode = MODERR_EXISTS;
+			return NULL;
+		}
+	} else {
+		/* New message tag handler */
+		m = safe_alloc(sizeof(MessageTagHandler));
+		safe_strdup(m->name, mreq->name);
+		AddListItem(m, mtaghandlers);
+	}
+	/* Add or update the following fields: */
+	m->owner = module;
+	m->flags = mreq->flags;
+	m->is_ok = mreq->is_ok;
+	m->can_send = mreq->can_send;
+	m->clicap_handler = mreq->clicap_handler;
+
+	/* Update reverse dependency (if any) */
+	if (m->clicap_handler)
+		m->clicap_handler->mtag_handler = m;
+
+	if (module)
+	{
+		ModuleObject *mobj = safe_alloc(sizeof(ModuleObject));
+		mobj->type = MOBJ_MTAG;
+		mobj->object.mtag = m;
+		AddListItem(mobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+
+	return m;
+}
+
+/** Returns the message tag handler for the given name.
+ * @param name The message-tag name to search for.
+ * @return Returns the handle to the message tag handler,
+ *         or NULL if not found.
+ */
+MessageTagHandler *MessageTagHandlerFind(const char *name)
+{
+	MessageTagHandler *m;
+
+	for (m = mtaghandlers; m; m = m->next)
+	{
+		if (!strcasecmp(name, m->name))
+			return m;
+	}
+	return NULL;
+}
+
+/** Remove the specified message tag handler - modules should not call this.
+ * This is done automatically for modules on unload, so is only called internally.
+ * @param m The message tag handler to remove.
+ */
+void MessageTagHandlerDel(MessageTagHandler *m)
+{
+	if (m->owner)
+	{
+		ModuleObject *mobj;
+		for (mobj = m->owner->objects; mobj; mobj = mobj->next) {
+			if (mobj->type == MOBJ_MTAG && mobj->object.mtag == m)
+			{
+				DelListItem(mobj, m->owner->objects);
+				safe_free(mobj);
+				break;
+			}
+		}
+		m->owner = NULL;
+	}
+
+	if (loop.ircd_rehashing)
+		m->unloaded = 1;
+	else
+		unload_mtag_handler_commit(m);
+}
+
+/** @} */
+
+static void unload_mtag_handler_commit(MessageTagHandler *m)
+{
+	/* This is an unusual operation, I think we should log it. */
+	ircd_log(LOG_ERROR, "Unloading message-tag handler for '%s'", m->name);
+	sendto_realops("Unloading message-tag handler for '%s'", m->name);
+
+	/* Remove reverse dependency, if any */
+	if (m->clicap_handler)
+		m->clicap_handler->mtag_handler = NULL;
+
+	/* Destroy the object */
+	DelListItem(m, mtaghandlers);
+	safe_free(m->name);
+	safe_free(m);
+}
+
+void unload_all_unused_mtag_handlers(void)
+{
+	MessageTagHandler *m, *m_next;
+
+	for (m = mtaghandlers; m; m = m_next)
+	{
+		m_next = m->next;
+		if (m->unloaded)
+			unload_mtag_handler_commit(m);
+	}
+}
diff --git a/src/api-moddata.c b/src/api-moddata.c
new file mode 100644
index 0000000..0ec86e5
--- /dev/null
+++ b/src/api-moddata.c
@@ -0,0 +1,465 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, src/api-moddata.c
+ *   (C) 2003-2019 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+MODVAR ModDataInfo *MDInfo = NULL;
+
+MODVAR ModData local_variable_moddata[MODDATA_MAX_LOCAL_VARIABLE];
+MODVAR ModData global_variable_moddata[MODDATA_MAX_GLOBAL_VARIABLE];
+
+ModDataInfo *ModDataAdd(Module *module, ModDataInfo req)
+{
+	int slotav = 0; /* highest available slot */
+	ModDataInfo *m;
+	int new_struct = 0;
+	
+	/* Hunt for highest available slot */
+	for (m = MDInfo; m ; m = m->next)
+		if (m->type == req.type)
+		{
+			/* Does an entry already exist with this name? */
+			if (!strcmp(m->name, req.name))
+			{
+				/* If old module is unloading (so reloading), then OK to take this slot */
+				if (m->unloaded)
+				{
+					slotav = m->slot;
+					m->unloaded = 0;
+					goto moddataadd_isok;
+				}
+				/* Otherwise, name collision */
+				if (module)
+					module->errorcode = MODERR_EXISTS;
+				return NULL;
+			}
+			/* Update next available slot */
+			slotav = MAX(slotav, m->slot+1);
+		}
+
+	/* Now check if we are within bounds (if we really have a free slot available) */
+	if (((req.type == MODDATATYPE_LOCAL_VARIABLE) && (slotav >= MODDATA_MAX_LOCAL_VARIABLE)) ||
+	    ((req.type == MODDATATYPE_GLOBAL_VARIABLE) && (slotav >= MODDATA_MAX_GLOBAL_VARIABLE)) ||
+	    ((req.type == MODDATATYPE_CLIENT) && (slotav >= MODDATA_MAX_CLIENT)) ||
+	    ((req.type == MODDATATYPE_LOCAL_CLIENT) && (slotav >= MODDATA_MAX_LOCAL_CLIENT)) ||
+	    ((req.type == MODDATATYPE_CHANNEL) && (slotav >= MODDATA_MAX_CHANNEL)) ||
+	    ((req.type == MODDATATYPE_MEMBER) && (slotav >= MODDATA_MAX_MEMBER)) ||
+	    ((req.type == MODDATATYPE_MEMBERSHIP) && (slotav >= MODDATA_MAX_MEMBERSHIP)))
+	{
+		if (module)
+			module->errorcode = MODERR_NOSPACE;
+		return NULL;
+	}
+
+	new_struct = 1;
+	m = safe_alloc(sizeof(ModDataInfo));
+	safe_strdup(m->name, req.name);
+	m->slot = slotav;
+	m->type = req.type;
+moddataadd_isok:
+	m->free = req.free;
+	m->serialize = req.serialize;
+	m->unserialize = req.unserialize;
+	m->sync = req.sync;
+	m->owner = module;
+	
+	if (new_struct)
+		AddListItem(m, MDInfo);
+
+	if (module)
+	{
+		ModuleObject *mobj = safe_alloc(sizeof(ModuleObject));
+		mobj->object.moddata = m;
+		mobj->type = MOBJ_MODDATA;
+		AddListItem(mobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	
+	return m;
+}
+
+void moddata_free_client(Client *client)
+{
+	ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if (md->type == MODDATATYPE_CLIENT)
+		{
+			if (md->free && moddata_client(client, md).ptr)
+				md->free(&moddata_client(client, md));
+		}
+
+	memset(client->moddata, 0, sizeof(client->moddata));
+}
+
+void moddata_free_local_client(Client *client)
+{
+	ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if (md->type == MODDATATYPE_LOCAL_CLIENT)
+		{
+			if (md->free && moddata_local_client(client, md).ptr)
+				md->free(&moddata_local_client(client, md));
+		}
+
+	memset(client->moddata, 0, sizeof(client->moddata));
+}
+
+// FIXME: this is never called
+void moddata_free_channel(Channel *channel)
+{
+	ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if (md->type == MODDATATYPE_CHANNEL)
+		{
+			if (md->free && moddata_channel(channel, md).ptr)
+				md->free(&moddata_channel(channel, md));
+		}
+
+	memset(channel->moddata, 0, sizeof(channel->moddata));
+}
+
+void moddata_free_member(Member *m)
+{
+	ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if (md->type == MODDATATYPE_MEMBER)
+		{
+			if (md->free && moddata_member(m, md).ptr)
+				md->free(&moddata_member(m, md));
+		}
+
+	memset(m->moddata, 0, sizeof(m->moddata));
+}
+
+void moddata_free_membership(Membership *m)
+{
+ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if (md->type == MODDATATYPE_MEMBERSHIP)
+		{
+			if (md->free && moddata_membership(m, md).ptr)
+				md->free(&moddata_membership(m, md));
+		}
+
+	memset(m->moddata, 0, sizeof(m->moddata));
+}
+
+/** Actually free all the ModData from all objects */
+void unload_moddata_commit(ModDataInfo *md)
+{
+	switch(md->type)
+	{
+		case MODDATATYPE_LOCAL_VARIABLE:
+			if (md->free && moddata_local_variable(md).ptr)
+				md->free(&moddata_local_variable(md));
+			memset(&moddata_local_variable(md), 0, sizeof(ModData));
+			break;
+		case MODDATATYPE_GLOBAL_VARIABLE:
+			if (md->free && moddata_global_variable(md).ptr)
+				md->free(&moddata_global_variable(md));
+			memset(&moddata_global_variable(md), 0, sizeof(ModData));
+			break;
+		case MODDATATYPE_CLIENT:
+		{
+			Client *client;
+			list_for_each_entry(client, &client_list, client_node)
+			{
+				if (md->free && moddata_client(client, md).ptr)
+					md->free(&moddata_client(client, md));
+				memset(&moddata_client(client, md), 0, sizeof(ModData));
+			}
+			break;
+		}
+		case MODDATATYPE_LOCAL_CLIENT:
+		{
+			Client *client;
+			list_for_each_entry(client, &lclient_list, lclient_node)
+			{
+				if (md->free && moddata_local_client(client, md).ptr)
+					md->free(&moddata_local_client(client, md));
+				memset(&moddata_local_client(client, md), 0, sizeof(ModData));
+			}
+			break;
+		}
+		case MODDATATYPE_CHANNEL:
+		{
+			Channel *channel;
+			for (channel = channels; channel; channel=channel->nextch)
+			{
+				if (md->free && moddata_channel(channel, md).ptr)
+					md->free(&moddata_channel(channel, md));
+				memset(&moddata_channel(channel, md), 0, sizeof(ModData));
+			}
+			break;
+		}
+		case MODDATATYPE_MEMBER:
+		{
+			Channel *channel;
+			Member *m;
+			for (channel = channels; channel; channel=channel->nextch)
+			{
+				for (m = channel->members; m; m = m->next)
+				{
+					if (md->free && moddata_member(m, md).ptr)
+						md->free(&moddata_member(m, md));
+					memset(&moddata_member(m, md), 0, sizeof(ModData));
+				}
+			}
+			break;
+		}
+		case MODDATATYPE_MEMBERSHIP:
+		{
+			Client *client;
+			Membership *m;
+			list_for_each_entry(client, &lclient_list, lclient_node)
+			{
+				if (!client->user)
+					continue;
+				for (m = client->user->channel; m; m = m->next)
+				{
+					if (md->free && moddata_membership(m, md).ptr)
+						md->free(&moddata_membership(m, md));
+					memset(&moddata_membership(m, md), 0, sizeof(ModData));
+				}
+			}
+			break;
+		}
+	}
+	
+	DelListItem(md, MDInfo);
+	safe_free(md->name);
+	safe_free(md);
+}
+
+void ModDataDel(ModDataInfo *md)
+{
+	/* Delete the reference to us first */
+	if (md->owner)
+	{
+		ModuleObject *mdobj;
+		for (mdobj = md->owner->objects; mdobj; mdobj = mdobj->next)
+		{
+			if ((mdobj->type == MOBJ_MODDATA) && (mdobj->object.moddata == md))
+			{
+				DelListItem(mdobj, md->owner->objects);
+				safe_free(mdobj);
+				break;
+			}
+		}
+		md->owner = NULL;
+	}
+
+	if (loop.ircd_rehashing)
+		md->unloaded = 1;
+	else
+		unload_moddata_commit(md);
+}
+
+void unload_all_unused_moddata(void)
+{
+ModDataInfo *md, *md_next;
+
+	for (md = MDInfo; md; md = md_next)
+	{
+		md_next = md->next;
+		if (md->unloaded)
+			unload_moddata_commit(md);
+	}
+}
+
+ModDataInfo *findmoddata_byname(char *name, ModDataType type)
+{
+ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if ((md->type == type) && !strcmp(name, md->name))
+			return md;
+
+	return NULL;
+}
+
+int module_has_moddata(Module *mod)
+{
+	ModDataInfo *md;
+
+	for (md = MDInfo; md; md = md->next)
+		if (md->owner == mod)
+			return 1;
+
+	return 0;
+}
+
+/** Set ModData for client (via variable name, string value) */
+int moddata_client_set(Client *client, char *varname, char *value)
+{
+	ModDataInfo *md;
+
+	md = findmoddata_byname(varname, MODDATATYPE_CLIENT);
+
+	if (!md)
+		return 0;
+
+	if (value)
+	{
+		/* SET */
+		md->unserialize(value, &moddata_client(client, md));
+	}
+	else
+	{
+		/* UNSET */
+		md->free(&moddata_client(client, md));
+		memset(&moddata_client(client, md), 0, sizeof(ModData));
+	}
+
+	/* If 'sync' field is set and the client is not in pre-registered
+	 * state then broadcast the new setting.
+	 */
+	if (md->sync && (IsUser(client) || IsServer(client) || IsMe(client)))
+		broadcast_md_client_cmd(NULL, &me, client, md->name, value);
+
+	return 1;
+}
+
+/** Get ModData for client (via variable name) */
+char *moddata_client_get(Client *client, char *varname)
+{
+	ModDataInfo *md;
+
+	md = findmoddata_byname(varname, MODDATATYPE_CLIENT);
+
+	if (!md)
+		return NULL;
+
+	return md->serialize(&moddata_client(client, md)); /* can be NULL */
+}
+
+/** Set ModData for LocalClient (via variable name, string value) */
+int moddata_local_client_set(Client *client, char *varname, char *value)
+{
+	ModDataInfo *md;
+
+	if (!MyConnect(client))
+		abort();
+
+	md = findmoddata_byname(varname, MODDATATYPE_LOCAL_CLIENT);
+
+	if (!md)
+		return 0;
+
+	if (value)
+	{
+		/* SET */
+		md->unserialize(value, &moddata_local_client(client, md));
+	}
+	else
+	{
+		/* UNSET */
+		md->free(&moddata_local_client(client, md));
+		memset(&moddata_local_client(client, md), 0, sizeof(ModData));
+	}
+
+	/* If 'sync' field is set and the client is not in pre-registered
+	 * state then broadcast the new setting.
+	 */
+	if (md->sync && (IsUser(client) || IsServer(client) || IsMe(client)))
+		broadcast_md_client_cmd(NULL, &me, client, md->name, value);
+
+	return 1;
+}
+
+/** Get ModData for LocalClient (via variable name) */
+char *moddata_local_client_get(Client *client, char *varname)
+{
+	ModDataInfo *md;
+
+	if (!MyConnect(client))
+		abort();
+
+	md = findmoddata_byname(varname, MODDATATYPE_LOCAL_CLIENT);
+
+	if (!md)
+		return NULL;
+
+	return md->serialize(&moddata_local_client(client, md)); /* can be NULL */
+}
+
+/** Set local variable moddata (via variable name, string value) */
+int moddata_local_variable_set(char *varname, char *value)
+{
+	ModDataInfo *md;
+
+	md = findmoddata_byname(varname, MODDATATYPE_LOCAL_VARIABLE);
+
+	if (!md)
+		return 0;
+
+	if (value)
+	{
+		/* SET */
+		md->unserialize(value, &moddata_local_variable(md));
+	}
+	else
+	{
+		/* UNSET */
+		md->free(&moddata_local_variable(md));
+		memset(&moddata_local_variable(md), 0, sizeof(ModData));
+	}
+
+	return 1;
+}
+
+/** Set global variable moddata (via variable name, string value) */
+int moddata_global_variable_set(char *varname, char *value)
+{
+	ModDataInfo *md;
+
+	md = findmoddata_byname(varname, MODDATATYPE_GLOBAL_VARIABLE);
+
+	if (!md)
+		return 0;
+
+	if (value)
+	{
+		/* SET */
+		md->unserialize(value, &moddata_global_variable(md));
+	}
+	else
+	{
+		/* UNSET */
+		md->free(&moddata_global_variable(md));
+		memset(&moddata_global_variable(md), 0, sizeof(ModData));
+	}
+
+	if (md->sync)
+		broadcast_md_globalvar_cmd(NULL, &me, md->name, value);
+
+	return 1;
+}
+
+/* The rest of the MD related functions, the send/receive functions,
+ * are in src/modules/md.c
+ */
diff --git a/src/api-usermode.c b/src/api-usermode.c
new file mode 100644
index 0000000..cdecac5
--- /dev/null
+++ b/src/api-usermode.c
@@ -0,0 +1,507 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, src/api-usermode.c
+ *   (C) 1999-2000 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+char umodestring[UMODETABLESZ+1];
+
+Umode *Usermode_Table = NULL;
+short	 Usermode_highest = 0;
+
+Snomask *Snomask_Table = NULL;
+short	 Snomask_highest = 0;
+
+/* client->umodes (32 bits): 26 used, 6 free */
+long UMODE_INVISIBLE = 0L;     /* makes user invisible */
+long UMODE_OPER = 0L;          /* Operator */
+long UMODE_WALLOP = 0L;        /* send wallops to them */
+long UMODE_REGNICK = 0L;       /* Nick set by services as registered */
+long UMODE_SERVNOTICE = 0L;    /* server notices such as kill */
+long UMODE_HIDE = 0L;          /* Hide from Nukes */
+long UMODE_SECURE = 0L;        /* User is a secure connect */
+long UMODE_DEAF = 0L;          /* Deaf */
+long UMODE_HIDEOPER = 0L;      /* Hide oper mode */
+long UMODE_SETHOST = 0L;       /* Used sethost */
+long UMODE_HIDLE = 0L;         /* Hides the idle time of opers */
+
+long SNO_KILLS = 0L;
+long SNO_CLIENT = 0L;
+long SNO_FLOOD = 0L;
+long SNO_FCLIENT = 0L;
+long SNO_JUNK = 0L;
+long SNO_VHOST = 0L;
+long SNO_EYES = 0L;
+long SNO_TKL = 0L;
+long SNO_NICKCHANGE = 0L;
+long SNO_FNICKCHANGE = 0L;
+long SNO_QLINE = 0L;
+long SNO_SPAMF = 0L;
+long SNO_SNOTICE = 0L;
+long SNO_OPER = 0L;
+
+long AllUmodes;		/* All umodes */
+long SendUmodes;	/* All umodes which are sent to other servers (global umodes) */
+
+void	umode_init(void)
+{
+	long val = 1;
+	int	i;
+	Usermode_Table = safe_alloc(sizeof(Umode) * UMODETABLESZ);
+	for (i = 0; i < UMODETABLESZ; i++)
+	{
+		Usermode_Table[i].mode = val;
+		val *= 2;
+	}
+	Usermode_highest = 0;
+
+	Snomask_Table = safe_alloc(sizeof(Snomask) * UMODETABLESZ);
+	val = 1;
+	for (i = 0; i < UMODETABLESZ; i++)
+	{
+		Snomask_Table[i].mode = val;
+		val *= 2;
+	}
+	Snomask_highest = 0;
+
+	/* Set up modes */
+	UmodeAdd(NULL, 'i', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_INVISIBLE);
+	UmodeAdd(NULL, 'o', UMODE_GLOBAL, 1, umode_allow_opers, &UMODE_OPER);
+	UmodeAdd(NULL, 'w', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_WALLOP);
+	UmodeAdd(NULL, 'r', UMODE_GLOBAL, 0, umode_allow_none, &UMODE_REGNICK);
+	UmodeAdd(NULL, 's', UMODE_LOCAL, 0, umode_allow_all, &UMODE_SERVNOTICE);
+	UmodeAdd(NULL, 'x', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_HIDE);
+	UmodeAdd(NULL, 'z', UMODE_GLOBAL, 0, umode_allow_none, &UMODE_SECURE);
+	UmodeAdd(NULL, 'd', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_DEAF);
+	UmodeAdd(NULL, 'H', UMODE_GLOBAL, 1, umode_allow_opers, &UMODE_HIDEOPER);
+	UmodeAdd(NULL, 't', UMODE_GLOBAL, 0, umode_allow_unset, &UMODE_SETHOST);
+	UmodeAdd(NULL, 'I', UMODE_GLOBAL, 1, umode_allow_opers, &UMODE_HIDLE);
+	SnomaskAdd(NULL, 'k', umode_allow_opers, &SNO_KILLS);
+	SnomaskAdd(NULL, 'c', umode_allow_opers, &SNO_CLIENT);
+	SnomaskAdd(NULL, 'f', umode_allow_opers, &SNO_FLOOD);
+	SnomaskAdd(NULL, 'F', umode_allow_opers, &SNO_FCLIENT);
+	SnomaskAdd(NULL, 'j', umode_allow_opers, &SNO_JUNK);
+	SnomaskAdd(NULL, 'v', umode_allow_opers, &SNO_VHOST);
+	SnomaskAdd(NULL, 'e', umode_allow_opers, &SNO_EYES);
+	SnomaskAdd(NULL, 'G', umode_allow_opers, &SNO_TKL);
+	SnomaskAdd(NULL, 'n', umode_allow_opers, &SNO_NICKCHANGE);
+	SnomaskAdd(NULL, 'N', umode_allow_opers, &SNO_FNICKCHANGE);
+	SnomaskAdd(NULL, 'q', umode_allow_opers, &SNO_QLINE);
+	SnomaskAdd(NULL, 'S', umode_allow_opers, &SNO_SPAMF);
+	SnomaskAdd(NULL, 's', umode_allow_opers, &SNO_SNOTICE);
+	SnomaskAdd(NULL, 'o', umode_allow_opers, &SNO_OPER);
+}
+
+void make_umodestr(void)
+{
+	int i;
+	char *m;
+
+	m = umodestring;
+	for (i = 0; i <= Usermode_highest; i++)
+	{
+		if (Usermode_Table[i].flag)
+			*m++ = Usermode_Table[i].flag;
+	}
+	*m = '\0';
+}
+
+static char previous_umodestring[256];
+
+void umodes_check_for_changes(void)
+{
+	make_umodestr();
+	safe_strdup(me.serv->features.usermodes, umodestring);
+
+	if (!*previous_umodestring)
+	{
+		strlcpy(previous_umodestring, umodestring, sizeof(previous_umodestring));
+		return; /* not booted yet. then we are done here. */
+	}
+
+	if (*previous_umodestring && strcmp(umodestring, previous_umodestring))
+	{
+		ircd_log(LOG_ERROR, "User modes changed at runtime: %s -> %s",
+			previous_umodestring, umodestring);
+		sendto_realops("User modes changed at runtime: %s -> %s",
+			previous_umodestring, umodestring);
+		/* Broadcast change to all (locally connected) servers */
+		sendto_server(NULL, 0, 0, NULL, "PROTOCTL USERMODES=%s", umodestring);
+	}
+
+	strlcpy(previous_umodestring, umodestring, sizeof(previous_umodestring));
+}
+
+/* UmodeAdd:
+ * Add a usermode with character 'ch', if global is set to 1 the usermode is global
+ * (sent to other servers) otherwise it's a local usermode
+ */
+Umode *UmodeAdd(Module *module, char ch, int global, int unset_on_deoper, int (*allowed)(Client *client, int what), long *mode)
+{
+	short	 i = 0;
+	short	 j = 0;
+	short 	 save = -1;
+	while (i < UMODETABLESZ)
+	{
+		if (!Usermode_Table[i].flag && save == -1)
+			save = i;
+		else if (Usermode_Table[i].flag == ch)
+		{
+			if (Usermode_Table[i].unloaded)
+			{
+				save = i;
+				Usermode_Table[i].unloaded = 0;
+				break;
+			}
+			else
+			{
+				if (module)
+					module->errorcode = MODERR_EXISTS;
+				return NULL;
+			}
+		}
+		i++;
+	}
+	i = save;
+	if (i != UMODETABLESZ)
+	{
+		Usermode_Table[i].flag = ch;
+		Usermode_Table[i].allowed = allowed;
+		Usermode_Table[i].unset_on_deoper = unset_on_deoper;
+		Debug((DEBUG_DEBUG, "UmodeAdd(%c) returning %04lx",
+			ch, Usermode_Table[i].mode));
+		/* Update usermode table highest */
+		for (j = 0; j < UMODETABLESZ; j++)
+			if (Usermode_Table[i].flag)
+				if (i > Usermode_highest)
+					Usermode_highest = i;
+		make_umodestr();
+		AllUmodes |= Usermode_Table[i].mode;
+		if (global)
+			SendUmodes |= Usermode_Table[i].mode;
+		*mode = Usermode_Table[i].mode;
+		Usermode_Table[i].owner = module;
+		if (module)
+		{
+			ModuleObject *umodeobj = safe_alloc(sizeof(ModuleObject));
+			umodeobj->object.umode = &(Usermode_Table[i]);
+			umodeobj->type = MOBJ_UMODE;
+			AddListItem(umodeobj, module->objects);
+			module->errorcode = MODERR_NOERROR;
+		}
+		return &(Usermode_Table[i]);
+	}
+	else
+	{
+		Debug((DEBUG_DEBUG, "UmodeAdd failed, no space"));
+		if (module)
+			module->errorcode = MODERR_NOSPACE;
+		return NULL;
+	}
+}
+
+
+void UmodeDel(Umode *umode)
+{
+	if (loop.ircd_rehashing)
+		umode->unloaded = 1;
+	else	
+	{
+		Client *client;
+		list_for_each_entry(client, &client_list, client_node)
+		{
+			long oldumode = 0;
+			if (!IsUser(client))
+				continue;
+			oldumode = client->umodes;
+			client->umodes &= ~umode->mode;
+			if (MyUser(client))
+				send_umode_out(client, 1, oldumode);
+		}
+		umode->flag = '\0';
+		AllUmodes &= ~(umode->mode);
+		SendUmodes &= ~(umode->mode);
+		make_umodestr();
+	}
+
+	if (umode->owner) {
+		ModuleObject *umodeobj;
+		for (umodeobj = umode->owner->objects; umodeobj; umodeobj = umodeobj->next) {
+			if (umodeobj->type == MOBJ_UMODE && umodeobj->object.umode == umode) {
+				DelListItem(umodeobj, umode->owner->objects);
+				safe_free(umodeobj);
+				break;
+			}
+		}
+		umode->owner = NULL;
+	}
+	return;
+}
+
+Snomask *SnomaskAdd(Module *module, char ch, int (*allowed)(Client *client, int what), long *mode)
+{
+	short	 i = 0;
+	short	 j = 0;
+	short 	 save = -1;
+	while (i < UMODETABLESZ)
+	{
+		if (!Snomask_Table[i].flag && save == -1)
+			save = i;
+		else if (Snomask_Table[i].flag == ch)
+		{
+			if (Snomask_Table[i].unloaded)
+			{
+				save = i;
+				Snomask_Table[i].unloaded = 0;
+				break;
+			}
+			else
+			{
+				if (module)
+					module->errorcode = MODERR_EXISTS;
+				return NULL;
+			}
+		}
+		i++;
+	}
+	i = save;
+	if (i != UMODETABLESZ)
+	{
+		Snomask_Table[i].flag = ch;
+		Snomask_Table[i].allowed = allowed;
+		/* Update usermode table highest */
+		for (j = 0; j < UMODETABLESZ; j++)
+			if (Snomask_Table[i].flag)
+				if (i > Snomask_highest)
+					Snomask_highest = i;
+		*mode = Snomask_Table[i].mode;
+		Snomask_Table[i].owner = module;
+		if (module)
+		{
+			ModuleObject *snoobj = safe_alloc(sizeof(ModuleObject));
+			snoobj->object.snomask = &(Snomask_Table[i]);
+			snoobj->type = MOBJ_SNOMASK;
+			AddListItem(snoobj, module->objects);
+			module->errorcode = MODERR_NOERROR;
+		}
+		return &(Snomask_Table[i]);
+	}
+	else
+	{
+		Debug((DEBUG_DEBUG, "SnomaskAdd failed, no space"));
+		*mode = 0;
+		if (module)
+			module->errorcode = MODERR_NOSPACE;
+		return NULL;
+	}
+}
+
+void SnomaskDel(Snomask *sno)
+{
+	if (loop.ircd_rehashing)
+		sno->unloaded = 1;
+	else	
+	{
+		Client *client;
+
+		list_for_each_entry(client, &lclient_list, lclient_node)
+		{
+			long oldsno;
+			if (!client || !IsUser(client))
+				continue;
+			oldsno = client->user->snomask;
+			client->user->snomask &= ~sno->mode;
+			if (oldsno != client->user->snomask)
+				sendnumeric(client, RPL_SNOMASK, get_snomask_string_raw(client->user->snomask));
+		}
+
+		sno->flag = '\0';
+	}
+	if (sno->owner) {
+		ModuleObject *snoobj;
+		for (snoobj = sno->owner->objects; snoobj; snoobj = snoobj->next) {
+			if (snoobj->type == MOBJ_SNOMASK && snoobj->object.snomask == sno) {
+				DelListItem(snoobj, sno->owner->objects);
+				safe_free(snoobj);
+				break;
+			}
+		}
+		sno->owner = NULL;
+	}
+	return;
+}
+
+int umode_allow_all(Client *client, int what)
+{
+	return 1;
+}
+
+int umode_allow_unset(Client *client, int what)
+{
+	if (!MyUser(client))
+		return 1;
+	if (what == MODE_DEL)
+		return 1;
+	return 0;
+}
+
+int umode_allow_none(Client *client, int what)
+{
+	if (MyUser(client))
+		return 0;
+	return 1;
+}
+
+int umode_allow_opers(Client *client, int what)
+{
+	if (MyUser(client))
+		return IsOper(client) ? 1 : 0;
+	else
+		return 1;
+}
+
+void unload_all_unused_umodes(void)
+{
+	long removed_umode = 0;
+	int i;
+	Client *client;
+	for (i = 0; i < UMODETABLESZ; i++)
+	{
+		if (Usermode_Table[i].unloaded)
+			removed_umode |= Usermode_Table[i].mode;
+	}
+	if (!removed_umode) /* Nothing was unloaded */
+		return;
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		long oldumode = 0;
+		if (!IsUser(client))
+			continue;
+		oldumode = client->umodes;
+		client->umodes &= ~(removed_umode);
+		if (MyUser(client))
+			send_umode_out(client, 1, oldumode);
+	}
+	for (i = 0; i < UMODETABLESZ; i++)
+	{
+		if (Usermode_Table[i].unloaded)
+		{
+			AllUmodes &= ~(Usermode_Table[i].mode);
+			SendUmodes &= ~(Usermode_Table[i].mode);
+			Usermode_Table[i].flag = '\0';
+			Usermode_Table[i].unloaded = 0;
+		}
+	}
+	make_umodestr();
+}
+
+void unload_all_unused_snomasks(void)
+{
+	Client *client;
+	long removed_sno = 0;
+	int i;
+
+	for (i = 0; i < UMODETABLESZ; i++)
+	{
+		if (Snomask_Table[i].unloaded)
+		{
+			removed_sno |= Snomask_Table[i].mode;
+			Snomask_Table[i].flag = '\0';
+			Snomask_Table[i].unloaded = 0;
+		}
+	}
+	if (!removed_sno) /* Nothing was unloaded */
+		return;
+
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		long oldsno;
+		if (!client || !IsUser(client))
+			continue;
+		oldsno = client->user->snomask;
+		client->user->snomask &= ~(removed_sno);
+		if (oldsno != client->user->snomask)
+			sendnumeric(client, RPL_SNOMASK, get_snomask_string_raw(client->user->snomask));
+	}
+}
+
+/**
+ * This function removes any oper-only snomasks when the user is no
+ * longer an IRC Operator.
+ * This used to be a bit more complex but nowadays we just erase all
+ * snomasks since all of them are IRCOp-only. Easy.
+ */
+void remove_oper_snomasks(Client *client)
+{
+	client->user->snomask = 0;
+}
+
+/*
+ * This function removes any oper-only user modes from the user.
+ * You may also want to call remove_oper_snomasks(), see above.
+ */
+void remove_oper_modes(Client *client)
+{
+int i;
+
+	for (i = 0; i <= Usermode_highest; i++)
+	{
+		if (!Usermode_Table[i].flag)
+			continue;
+		if (Usermode_Table[i].unset_on_deoper)
+			client->umodes &= ~Usermode_Table[i].mode;
+	}
+}
+
+void remove_oper_privileges(Client *client, int broadcast_mode_change)
+{
+	long oldumodes = client->umodes;
+	remove_oper_modes(client);
+	remove_oper_snomasks(client);
+	if (broadcast_mode_change && (client->umodes != oldumodes))
+		send_umode_out(client, 1, oldumodes);
+	if (MyUser(client)) /* only do if it's our client, remote servers will send a SWHOIS cmd */
+		swhois_delete(client, "oper", "*", &me, NULL);
+}
+
+/** Return long integer mode for a user mode character (eg: 'x' -> 0x10) */
+long find_user_mode(char flag)
+{
+	int i;
+
+	for (i = 0; i < UMODETABLESZ; i++)
+	{
+		if ((Usermode_Table[i].flag == flag) && !(Usermode_Table[i].unloaded))
+			return Usermode_Table[i].mode;
+	}
+	return 0;
+}
+
+/** Returns 1 if user has this user mode set and 0 if not */
+int has_user_mode(Client *client, char mode)
+{
+	long m = find_user_mode(mode);
+
+	if (client->umodes & m)
+		return 1; /* Yes, user has this mode */
+
+	return 0; /* Mode does not exist or not set */
+}
diff --git a/src/auth.c b/src/auth.c
new file mode 100644
index 0000000..d7f3300
--- /dev/null
+++ b/src/auth.c
@@ -0,0 +1,567 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/auth.c
+ *   (C) 2001 Carsten V. Munk (stskeeps@tspre.org)
+ *   (C) 2003-2019 Bram Matthys (syzop@vulnscan.org) and the UnrealIRCd team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+#include "crypt_blowfish.h"
+#include <argon2.h>
+
+typedef struct AuthTypeList AuthTypeList;
+struct AuthTypeList {
+	char			*name;
+	AuthenticationType	type;
+};
+
+/** The list of authentication types that we support. */
+AuthTypeList MODVAR AuthTypeLists[] = {
+	{"plain",           AUTHTYPE_PLAINTEXT},
+	{"plaintext",       AUTHTYPE_PLAINTEXT},
+	{"crypt",           AUTHTYPE_UNIXCRYPT},
+	{"unixcrypt",       AUTHTYPE_UNIXCRYPT},
+	{"bcrypt",          AUTHTYPE_BCRYPT},
+	{"cert",            AUTHTYPE_TLS_CLIENTCERT},
+	{"sslclientcert",   AUTHTYPE_TLS_CLIENTCERT},
+	{"tlsclientcert",   AUTHTYPE_TLS_CLIENTCERT},
+	{"certfp",          AUTHTYPE_TLS_CLIENTCERTFP},
+	{"sslclientcertfp", AUTHTYPE_TLS_CLIENTCERTFP},
+	{"tlsclientcertfp", AUTHTYPE_TLS_CLIENTCERTFP},
+	{"spkifp",          AUTHTYPE_SPKIFP},
+	{"argon2",          AUTHTYPE_ARGON2},
+	{NULL,              0}
+};
+
+/* Helper function for Auth_AutoDetectHashType() */
+static int parsepass(char *str, char **salt, char **hash)
+{
+	static char saltbuf[512], hashbuf[512];
+	char *p;
+	int max;
+
+	/* Syntax: $<salt>$<hash> */
+	if (*str != '$')
+		return 0;
+	p = strchr(str+1, '$');
+	if (!p || (p == str+1) || !p[1])
+		return 0;
+
+	max = p - str;
+	if (max > sizeof(saltbuf))
+		max = sizeof(saltbuf);
+	strlcpy(saltbuf, str+1, max);
+	strlcpy(hashbuf, p+1, sizeof(hashbuf));
+	*salt = saltbuf;
+	*hash = hashbuf;
+	return 1;
+}
+
+/** Auto detect hash type for input hash 'hash'.
+ * Will fallback to AUTHTYPE_PLAINTEXT when not found (or invalid).
+ */
+int Auth_AutoDetectHashType(char *hash)
+{
+	static char hashbuf[256];
+	char *saltstr, *hashstr;
+	int bits;
+
+	if (!strchr(hash, '$'))
+	{
+		/* SHA256 SSL fingerprint perhaps?
+		 * These are exactly 64 bytes (00112233..etc..) or 95 bytes (00:11:22:33:etc) in size.
+		 */
+		if ((strlen(hash) == 64) || (strlen(hash) == 95))
+		{
+			char *p;
+			char *hexchars = "0123456789abcdefABCDEF";
+			for (p = hash; *p; p++)
+				if ((*p != ':') && !strchr(hexchars, *p))
+					return AUTHTYPE_PLAINTEXT; /* not hex and not colon */
+
+			return AUTHTYPE_TLS_CLIENTCERTFP;
+		}
+
+		if (strlen(hash) == 44)
+		{
+			char *p;
+			char *b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+			for (p = hash; *p; p++)
+				if (!strchr(b64chars, *p))
+					return AUTHTYPE_PLAINTEXT; /* not base64 */
+
+			return AUTHTYPE_SPKIFP;
+		}
+	}
+
+	if ((*hash != '$') || !strchr(hash+1, '$'))
+		return AUTHTYPE_PLAINTEXT;
+
+	if (!strncmp(hash, "$2a$", 4) || !strncmp(hash, "$2b$", 4) || !strncmp(hash, "$2y$", 4))
+		return AUTHTYPE_BCRYPT;
+
+	if (!strncmp(hash, "$argon2", 7))
+		return AUTHTYPE_ARGON2;
+
+	/* Now handle UnrealIRCd-style password hashes.. */
+	if (parsepass(hash, &saltstr, &hashstr) == 0)
+		return AUTHTYPE_PLAINTEXT; /* old method (pre-3.2.1) or could not detect, fallback. */
+
+	bits = b64_decode(hashstr, hashbuf, sizeof(hashbuf)) * 8;
+	if (bits <= 0)
+		return AUTHTYPE_UNIXCRYPT; /* decode failed. likely some other crypt() type. */
+
+	/* else it's likely some other crypt() type */
+	return AUTHTYPE_UNIXCRYPT;
+}
+
+
+/** Find authentication type for 'hash' and explicit type 'type'.
+ * @param hash   The password hash (may be NULL if you are creating a password)
+ * @param type   An explicit type. In that case we will search by this type, rather
+ *               than trying to determine the type on the 'hash' parameter.
+ *               Or leave NULL, then we use hash autodetection.
+ */
+AuthenticationType Auth_FindType(char *hash, char *type)
+{
+	if (type)
+	{
+		AuthTypeList *e = AuthTypeLists;
+		while (e->name)
+		{
+			if (!mycmp(e->name, type))
+				return e->type;
+			e++;
+		}
+		return AUTHTYPE_INVALID; /* Not found */
+	}
+
+	if (hash)
+		return Auth_AutoDetectHashType(hash);
+
+	return AUTHTYPE_INVALID; /* both 'hash' and 'type' are NULL */
+}
+
+/** Check the syntax of an authentication block.
+ * This is a block like: password "data" { type; };
+ * in the configuration file.
+*/
+int Auth_CheckError(ConfigEntry *ce)
+{
+	AuthenticationType type = AUTHTYPE_PLAINTEXT;
+	X509 *x509_filecert = NULL;
+	FILE *x509_f = NULL;
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: authentication module failure: missing parameter",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return -1;
+	}
+	if (ce->ce_entries && ce->ce_entries->ce_next)
+	{
+		config_error("%s:%i: you may not have multiple authentication methods",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return -1;
+	}
+
+	type = Auth_FindType(ce->ce_vardata, ce->ce_entries ? ce->ce_entries->ce_varname : NULL);
+	if (type == -1)
+	{
+		config_error("%s:%i: authentication module failure: %s is not an implemented/enabled authentication method",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_entries->ce_varname);
+		return -1;
+	}
+
+	switch (type)
+	{
+		case AUTHTYPE_UNIXCRYPT:
+			/* If our data is like 1 or none, we just let em through .. */
+			if (strlen(ce->ce_vardata) < 2)
+			{
+				config_error("%s:%i: authentication module failure: AUTHTYPE_UNIXCRYPT: no salt (crypt strings will always be >2 in length)",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+				return -1;
+			}
+			break;
+		case AUTHTYPE_TLS_CLIENTCERT:
+			convert_to_absolute_path(&ce->ce_vardata, CONFDIR);
+			if (!(x509_f = fopen(ce->ce_vardata, "r")))
+			{
+				config_error("%s:%i: authentication module failure: AUTHTYPE_TLS_CLIENTCERT: error opening file %s: %s",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum, ce->ce_vardata, strerror(errno));
+				return -1;
+			}
+			x509_filecert = PEM_read_X509(x509_f, NULL, NULL, NULL);
+			fclose(x509_f);
+			if (!x509_filecert)
+			{
+				config_error("%s:%i: authentication module failure: AUTHTYPE_TLS_CLIENTCERT: PEM_read_X509 errored in file %s (format error?)",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum, ce->ce_vardata);
+				return -1;
+			}
+			X509_free(x509_filecert);
+			break;
+		default: ;
+	}
+
+	/* Unix crypt is a bit more complicated: most types are outright 'bad',
+	 * while other types have reasonable security similar to 'bcrypt'.
+	 * To be honest these people should probably use 'argon2' since it's
+	 * a lot better. Then again, warning about this when it's still such
+	 * a common hashing method (now, in 2018) may be a bit overzealous.
+	 * So: not warning about crypt types $5/$6 which use SHA256/SHA512
+	 * with normally at least 5000 rounds (unless deliberately weakened
+	 * by the user).
+	 */
+	if ((type == AUTHTYPE_UNIXCRYPT) && strncmp(ce->ce_vardata, "$5", 2) &&
+	    strncmp(ce->ce_vardata, "$6", 2) && !strstr(ce->ce_vardata, "$rounds"))
+	{
+		config_warn("%s:%i: Using simple crypt for authentication is not recommended. "
+		            "Consider using the more secure auth-type 'argon2' instead. "
+		            "See https://www.unrealircd.org/docs/Authentication_types for the complete list.",
+                            ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		/* do not return, not an error. */
+	}
+	if ((type == AUTHTYPE_PLAINTEXT) && (strlen(ce->ce_vardata) > PASSWDLEN))
+	{
+		config_error("%s:%i: passwords length may not exceed %d",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum, PASSWDLEN);
+		return -1;
+	}
+	return 1;
+}
+
+/** Convert an authentication block from the configuration file
+ * into an AuthConfig structure so it can be used at runtime.
+ */
+AuthConfig *AuthBlockToAuthConfig(ConfigEntry *ce)
+{
+	AuthenticationType type = AUTHTYPE_PLAINTEXT;
+	AuthConfig *as = NULL;
+
+	type = Auth_FindType(ce->ce_vardata, ce->ce_entries ? ce->ce_entries->ce_varname : NULL);
+	if (type == AUTHTYPE_INVALID)
+		type = AUTHTYPE_PLAINTEXT;
+
+	as = safe_alloc(sizeof(AuthConfig));
+	safe_strdup(as->data, ce->ce_vardata);
+	as->type = type;
+	return as;
+}
+
+/** Free an AuthConfig struct */
+void Auth_FreeAuthConfig(AuthConfig *as)
+{
+	if (as)
+	{
+		safe_free(as->data);
+		safe_free(as);
+	}
+}
+
+/* RAW salt length (before b64_encode) to use in /MKPASSWD
+ * and REAL salt length (after b64_encode, including terminating nul),
+ * used for reserving memory.
+ */
+#define RAWSALTLEN		6
+#define REALSALTLEN		12
+
+static int authcheck_argon2(Client *client, AuthConfig *as, char *para)
+{
+	argon2_type hashtype;
+
+	if (!para)
+		return 0;
+
+	/* Find out the hashtype. Why do we need to do this, why is this
+	 * not in the library or irrelevant by using some generic function?
+	 */
+	if (!strncmp(as->data, "$argon2id", 9))
+		hashtype = Argon2_id;
+	else if (!strncmp(as->data, "$argon2i", 8))
+		hashtype = Argon2_i;
+	else if (!strncmp(as->data, "$argon2d", 8))
+		hashtype = Argon2_d;
+	else
+		return 0; /* unknown argon2 type */
+
+	if (argon2_verify(as->data, para, strlen(para), hashtype) == ARGON2_OK)
+		return 1; /* MATCH */
+
+	return 0; /* NO MATCH or error */
+}
+
+static int authcheck_bcrypt(Client *client, AuthConfig *as, char *para)
+{
+	char data[512]; /* NOTE: only 64 required by BF_crypt() */
+	char *str;
+
+	if (!para)
+		return 0;
+
+	memset(data, 0, sizeof(data));
+	str = _crypt_blowfish_rn(para, as->data, data, sizeof(data));
+
+	if (!str)
+		return 0; /* ERROR / INVALID HASH */
+
+	if (!strcmp(str, as->data))
+		return 1; /* MATCH */
+
+	return 0; /* NO MATCH */
+}
+
+static int authcheck_tls_clientcert(Client *client, AuthConfig *as, char *para)
+{
+	X509 *x509_clientcert = NULL;
+	X509 *x509_filecert = NULL;
+	FILE *x509_f = NULL;
+
+	if (!client->local->ssl)
+		return 0;
+	x509_clientcert = SSL_get_peer_certificate(client->local->ssl);
+	if (!x509_clientcert)
+		return 0;
+	if (!(x509_f = fopen(as->data, "r")))
+	{
+		X509_free(x509_clientcert);
+		return 0;
+	}
+	x509_filecert = PEM_read_X509(x509_f, NULL, NULL, NULL);
+	fclose(x509_f);
+	if (!x509_filecert)
+	{
+		X509_free(x509_clientcert);
+		return 0;
+	}
+	if (X509_cmp(x509_filecert, x509_clientcert) != 0)
+	{
+		X509_free(x509_clientcert);
+		X509_free(x509_filecert);
+		return 0;
+	}
+	X509_free(x509_clientcert);
+	X509_free(x509_filecert);
+	return 1;
+}
+
+static int authcheck_tls_clientcert_fingerprint(Client *client, AuthConfig *as, char *para)
+{
+	int i, k;
+	char hexcolon[EVP_MAX_MD_SIZE * 3 + 1];
+	char *fp;
+
+	if (!client->local->ssl)
+		return 0;
+
+	fp = moddata_client_get(client, "certfp");
+	if (!fp)
+		return 0;
+
+	/* Make a colon version so that we keep in line with
+	 * previous versions, based on Nath's patch -dboyz
+	 */
+	k=0;
+	for (i=0; i<strlen(fp); i++)
+	{
+		if (i != 0 && i % 2 == 0)
+			hexcolon[k++] = ':';
+		hexcolon[k++] = fp[i];
+	}
+	hexcolon[k] = '\0';
+
+	if (strcasecmp(as->data, hexcolon) && strcasecmp(as->data, fp))
+		return 0;
+
+	return 1;
+}
+
+static int authcheck_spkifp(Client *client, AuthConfig *as, char *para)
+{
+	char *fp = spki_fingerprint(client);
+
+	if (!fp)
+		return 0; /* auth failed: not SSL (or other failure) */
+
+	if (strcasecmp(as->data, fp))
+		return 0; /* auth failed: mismatch */
+
+	return 1; /* SUCCESS */
+}
+
+
+/*
+ * client MUST be a local client
+ * as is what it will be compared with
+ * para will used in coordination with the auth type	
+*/
+
+/** Check authentication, such as a password against the
+ * provided AuthConfig (which was parsed from the configuration
+ * file earlier).
+ * @param client    The client.
+ * @param as      The authentication config.
+ * @param para    The provided parameter (NULL allowed)
+ * @returns 1 if passed, 0 if incorrect (eg: invalid password)
+ * @note
+ * - The return value was different in versions before UnrealIRCd 5.0.0!
+ * - In older versions a NULL 'as' was treated as an allow, now it's deny.
+ */
+int Auth_Check(Client *client, AuthConfig *as, char *para)
+{
+	extern char *crypt();
+	char *res;
+
+	if (!as || !as->data)
+		return 0; /* Should not happen, but better be safe.. */
+
+	switch (as->type)
+	{
+		case AUTHTYPE_PLAINTEXT:
+			if (!para)
+				return 0;
+			if (!strcmp(as->data, "changemeplease") && !strcmp(para, as->data))
+			{
+				sendto_realops("Rejecting default password 'changemeplease'. "
+				               "Please change the password in the configuration file.");
+				return 0;
+			}
+			/* plain text compare */
+			if (!strcmp(para, as->data))
+				return 1;
+			return 0;
+
+		case AUTHTYPE_ARGON2:
+			return authcheck_argon2(client, as, para);
+
+		case AUTHTYPE_BCRYPT:
+			return authcheck_bcrypt(client, as, para);
+
+		case AUTHTYPE_UNIXCRYPT:
+			if (!para)
+				return 0;
+			res = crypt(para, as->data);
+			if (res && !strcmp(res, as->data))
+				return 1;
+			return 0;
+
+		case AUTHTYPE_TLS_CLIENTCERT:
+			return authcheck_tls_clientcert(client, as, para);
+
+		case AUTHTYPE_TLS_CLIENTCERTFP:
+			return authcheck_tls_clientcert_fingerprint(client, as, para);
+
+		case AUTHTYPE_SPKIFP:
+			return authcheck_spkifp(client, as, para);
+
+		case AUTHTYPE_INVALID:
+			return 0; /* Should never happen */
+	}
+	return 0;
+}
+
+#define UNREALIRCD_ARGON2_DEFAULT_TIME_COST             3
+#define UNREALIRCD_ARGON2_DEFAULT_MEMORY_COST           8192
+#define UNREALIRCD_ARGON2_DEFAULT_PARALLELISM_COST      2
+#define UNREALIRCD_ARGON2_DEFAULT_HASH_LENGTH           32
+#define UNREALIRCD_ARGON2_DEFAULT_SALT_LENGTH           (128/8)
+
+static char *mkpass_argon2(char *para)
+{
+	static char buf[512];
+	char salt[UNREALIRCD_ARGON2_DEFAULT_SALT_LENGTH];
+	int ret, i;
+
+	if (!para)
+		return NULL;
+
+	/* Initialize salt */
+	for (i=0; i < sizeof(salt); i++)
+		salt[i] = getrandom8();
+
+	*buf = '\0';
+
+	ret = argon2id_hash_encoded(UNREALIRCD_ARGON2_DEFAULT_TIME_COST,
+	                            UNREALIRCD_ARGON2_DEFAULT_MEMORY_COST,
+	                            UNREALIRCD_ARGON2_DEFAULT_PARALLELISM_COST,
+	                            para,
+	                            strlen(para),
+	                            salt,
+	                            sizeof(salt),
+	                            UNREALIRCD_ARGON2_DEFAULT_HASH_LENGTH,
+	                            buf,
+	                            sizeof(buf));
+
+	if (ret != ARGON2_OK)
+		return NULL; /* internal error */
+
+	return buf;
+}
+
+static char *mkpass_bcrypt(char *para)
+{
+	static char buf[128];
+	char data[512]; /* NOTE: only 64 required by BF_crypt() */
+	char salt[64];
+	char random_data[32];
+	char *str;
+	char *saltstr;
+	int i;
+
+	if (!para)
+		return NULL;
+
+	memset(data, 0, sizeof(data));
+
+	for (i=0; i<sizeof(random_data); i++)
+		random_data[i] = getrandom8();
+
+	saltstr = _crypt_gensalt_blowfish_rn("$2y", 9, random_data, sizeof(random_data), salt, sizeof(salt));
+	if (!saltstr)
+		return NULL;
+
+	str = _crypt_blowfish_rn(para, saltstr, data, sizeof(data));
+
+	if (!str)
+		return NULL; /* INTERNAL ERROR */
+
+	strlcpy(buf, str, sizeof(buf));
+	return buf;
+}
+
+/** Create a hashed password for the specified string.
+ * @param type  One of AUTHTYPE_*, eg AUTHTYPE_ARGON2.
+ * @param text  The password in plaintext.
+ * @returns The hashed password.
+ */
+char *Auth_Hash(AuthenticationType type, char *text)
+{
+	switch (type)
+	{
+		case AUTHTYPE_PLAINTEXT:
+			return text;
+
+		case AUTHTYPE_ARGON2:
+			return mkpass_argon2(text);
+
+		case AUTHTYPE_BCRYPT:
+			return mkpass_bcrypt(text);
+
+		default:
+			return NULL;
+	}
+}
diff --git a/src/buildmod b/src/buildmod
new file mode 100755
index 0000000..6fdfe22
--- /dev/null
+++ b/src/buildmod
@@ -0,0 +1,19 @@
+#!/bin/sh
+echo ""
+echo "Checking for updates for third party modules..."
+# We can't use the "unrealircd" script, since possibly the ircd
+# has not been installed to it's final location.. yet.
+# So this is basically "unrealircd module upgrade --no-install":
+../../ircd -m upgrade --no-install
+echo ""
+echo "Building all third party modules..."
+for x in *.c
+do
+if [ "$x" != "*.c" ]; then
+	x="`echo $x|sed 's/\.c//'`"
+	if [ ! -f $x.so -o $x.c -nt $x.so ]; then
+		echo "Building 3rd party module $x..."
+		make custommodule MODULEFILE=$x || (echo "*****"; echo "Building 3rd party module $x failed."; echo "Contact the module author of the $x module (not the UnrealIRCd team), or simply delete the $PWD/$x.c file"; echo "*****"; exit 1)
+	fi
+fi
+done
diff --git a/src/channel.c b/src/channel.c
new file mode 100644
index 0000000..a2ce652
--- /dev/null
+++ b/src/channel.c
@@ -0,0 +1,1367 @@
+/* Unreal Internet Relay Chat Daemon, src/channel.c
+ * (C) Copyright 1990 Jarkko Oikarinen and
+ *                    University of Oulu, Co Center
+ * (C) Copyright 1999-present The UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Various important (common) channel functions.
+ */
+
+#include "unrealircd.h"
+
+/** Lazy way to signal an OperOverride MODE */
+long opermode = 0;
+/** Lazy way to signal an SAJOIN MODE */
+long sajoinmode = 0;
+/** List of all channels on the server */
+Channel *channels = NULL;
+
+/* some buffers for rebuilding channel/nick lists with comma's */
+static char buf[BUFSIZE];
+/** Mode buffer (eg: "+sntkl") */
+MODVAR char modebuf[BUFSIZE];
+/** Parameter buffer (eg: "key 123") */
+MODVAR char parabuf[BUFSIZE];
+
+/** This describes the letters, modes and options for core channel modes.
+ * These are +ntmispklr and also the list modes +vhoaq and +beI.
+ */
+CoreChannelModeTable corechannelmodetable[] = {
+	{MODE_LIMIT, 'l', 1, 1},
+	{MODE_VOICE, 'v', 1, 1},
+	{MODE_HALFOP, 'h', 0, 1},
+	{MODE_CHANOP, 'o', 0, 1},
+	{MODE_PRIVATE, 'p', 0, 0},
+	{MODE_SECRET, 's', 0, 0},
+	{MODE_MODERATED, 'm', 1, 0},
+	{MODE_NOPRIVMSGS, 'n', 1, 0},
+	{MODE_TOPICLIMIT, 't', 1, 0},
+	{MODE_INVITEONLY, 'i', 1, 0},
+	{MODE_KEY, 'k', 1, 1},
+	{MODE_RGSTR, 'r', 0, 0},
+	{MODE_CHANADMIN, 'a', 0, 1},
+	{MODE_CHANOWNER, 'q', 0, 1},
+	{MODE_BAN, 'b', 1, 1},
+	{MODE_EXCEPT, 'e', 1, 1},	/* exception ban */
+	{MODE_INVEX, 'I', 1, 1},	/* invite-only exception */
+	{0x0, 0x0, 0x0, 0x0}
+};
+
+/** The advertised supported channel modes in the 004 numeric */
+char cmodestring[512];
+
+/* Some forward declarations */
+char *clean_ban_mask(char *, int, Client *);
+void channel_modes(Client *client, char *mbuf, char *pbuf, size_t mbuf_size, size_t pbuf_size, Channel *channel);
+int sub1_from_channel(Channel *);
+void del_invite(Client *, Channel *);
+
+/** Returns 1 if the IRCOp can override or is a remote connection */
+inline int op_can_override(char *acl, Client *client,Channel *channel,void* extra)
+{
+#ifndef NO_OPEROVERRIDE
+	if (MyUser(client) && !(ValidatePermissionsForPath(acl,client,NULL,channel,extra)))
+		return 0;
+	return 1;
+#else
+	return 0;
+#endif
+}
+
+/** Returns 1 if a half-op can set this channel mode */
+int Halfop_mode(long mode)
+{
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+
+	while (tab->mode != 0x0)
+	{
+		if (tab->mode == mode)
+			return (tab->halfop == 1 ? TRUE : FALSE);
+		tab++;
+	}
+	return TRUE;
+}
+
+
+/** Returns the length (entry count) of a +beI list */
+static int list_length(Link *lp)
+{
+	int  count = 0;
+
+	for (; lp; lp = lp->next)
+		count++;
+	return count;
+}
+
+/** Find client in a Member linked list (eg: channel->members) */
+Member *find_member_link(Member *lp, Client *ptr)
+{
+	if (ptr)
+	{
+		while (lp)
+		{
+			if (lp->client == ptr)
+				return (lp);
+			lp = lp->next;
+		}
+	}
+	return NULL;
+}
+
+/** Find channel in a Membership linked list (eg: client->user->channel) */
+Membership *find_membership_link(Membership *lp, Channel *ptr)
+{
+	if (ptr)
+		while (lp)
+		{
+			if (lp->channel == ptr)
+				return (lp);
+			lp = lp->next;
+		}
+	return NULL;
+}
+
+/** Allocate and return an empty Member struct */
+static Member *make_member(void)
+{
+	Member *lp;
+	unsigned int	i;
+
+	if (freemember == NULL)
+	{
+		for (i = 1; i <= (4072/sizeof(Member)); ++i)
+		{
+			lp = safe_alloc(sizeof(Member));
+			lp->client = NULL;
+			lp->flags = 0;
+			lp->next = freemember;
+			freemember = lp;
+		}
+	}
+	lp = freemember;
+	freemember = freemember->next;
+	lp->next = NULL;
+	return lp;
+}
+
+/** Free a Member struct */
+static void free_member(Member *lp)
+{
+	if (!lp)
+		return;
+	moddata_free_member(lp);
+	memset(lp, 0, sizeof(Member));
+	lp->next = freemember;
+	lp->client = NULL;
+	lp->flags = 0;
+	freemember = lp;
+}
+
+/** Allocate and return an empty Membership struct */
+static Membership *make_membership(void)
+{
+	Membership *m = NULL;
+	unsigned int	i;
+
+	if (freemembership == NULL)
+	{
+		for (i = 1; i <= (4072/sizeof(Membership)); i++)
+		{
+			m = safe_alloc(sizeof(Membership));
+			m->next = freemembership;
+			freemembership = m;
+		}
+		m = freemembership;
+		freemembership = m->next;
+	}
+	else
+	{
+		m = freemembership;
+		freemembership = freemembership->next;
+	}
+	memset(m, 0, sizeof(Membership));
+	return m;
+}
+
+/** Free a Membership struct */
+static void free_membership(Membership *m)
+{
+	if (m)
+	{
+		moddata_free_membership(m);
+		memset(m, 0, sizeof(Membership));
+		m->next = freemembership;
+		freemembership = m;
+	}
+}
+
+/** Find a client by nickname, hunt for older nick names if not found.
+ * This can be handy, for example for /KILL nick, if 'nick' keeps
+ * nick-changing and you are slow with typing.
+ * @param client	The requestor
+ * @param user		The nick name (or server name)
+ * @param chasing	This will be set to 1 if the client was found
+ *			only after searching through the nick history.
+ * @returns The client (if found) or NULL (if not found).
+ */
+Client *find_chasing(Client *client, char *user, int *chasing)
+{
+	Client *who = find_client(user, NULL);
+
+	if (chasing)
+		*chasing = 0;
+	if (who)
+	{
+		if (!IsServer(who))
+			return who;
+		else
+			return NULL;
+	}
+	if (!(who = get_history(user, (long)KILLCHASETIMELIMIT)))
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, user);
+		return NULL;
+	}
+	if (chasing)
+		*chasing = 1;
+	if (!IsServer(who))
+		return who;
+	else return NULL;
+}
+
+/** Return 1 if the bans are identical, taking into account special handling for extbans */
+int identical_ban(char *one, char *two)
+{
+	if (is_extended_ban(one))
+	{
+		/* compare the first 3 characters case-sensitive and if identical then compare
+		 * the remainder of the string case-insensitive.
+		 */
+		if (!strncmp(one, two, 3) && !strcasecmp(one+3, two+3))
+			return 1;
+	} else {
+		if (!mycmp(one, two))
+			return 1;
+	}
+	return 0;
+}
+
+/** Add a listmode (+beI) with the specified banid to
+ *  the specified channel. (Extended version with
+ *  set by nick and set on timestamp)
+ */
+int add_listmode_ex(Ban **list, Client *client, Channel *channel, char *banid, char *setby, time_t seton)
+{
+	Ban *ban;
+	int cnt = 0, len;
+	int do_not_add = 0;
+
+	if (MyUser(client))
+		collapse(banid);
+
+	len = strlen(banid);
+	if (!*list && ((len > MAXBANLENGTH) || (MAXBANS < 1)))
+	{
+		if (MyUser(client))
+		{
+			/* Only send the error to local clients */
+			sendnumeric(client, ERR_BANLISTFULL, channel->chname, banid);
+		}
+		do_not_add = 1;
+	}
+	for (ban = *list; ban; ban = ban->next)
+	{
+		len += strlen(ban->banstr);
+		/* Check MAXBANLENGTH / MAXBANS only for local clients
+		 * and 'me' (for +b's set during +f).
+		 */
+		if ((MyUser(client) || IsMe(client)) && ((len > MAXBANLENGTH) || (++cnt >= MAXBANS)))
+		{
+			do_not_add = 1;
+		}
+		if (identical_ban(ban->banstr, banid))
+			break; /* update existing ban (potentially) */
+	}
+
+	/* Create a new ban if needed */
+	if (!ban)
+	{
+		if (do_not_add)
+		{
+			/* The banlist is full and trying to add a new ban.
+			 * This is not permitted.
+			 */
+			if (MyUser(client))
+			{
+				/* Only send the error to local clients */
+				sendnumeric(client, ERR_BANLISTFULL, channel->chname, banid);
+			}
+			return -1;
+		}
+		ban = make_ban();
+		ban->next = *list;
+		*list = ban;
+	}
+
+	if ((ban->when > 0) && (seton >= ban->when))
+	{
+		/* Trying to add the same ban while an older version
+		 * or identical version of the ban already exists.
+		 */
+		return -1;
+	}
+
+	/* Update/set if this ban is new or older than existing one */
+	safe_strdup(ban->banstr, banid); /* cAsE may differ, use oldest version of it */
+	safe_strdup(ban->who, setby);
+	ban->when = seton;
+	return 0;
+}
+
+/** Add a listmode (+beI) with the specified banid to
+ *  the specified channel. (Simplified version)
+ */
+int add_listmode(Ban **list, Client *client, Channel *channel, char *banid)
+{
+	char *setby = client->name;
+	char nuhbuf[NICKLEN+USERLEN+HOSTLEN+4];
+
+	if (IsUser(client) && (iConf.ban_setter == SETTER_NICK_USER_HOST))
+		setby = make_nick_user_host_r(nuhbuf, client->name, client->user->username, GetHost(client));
+
+	return add_listmode_ex(list, client, channel, banid, setby, TStime());
+}
+
+/** Delete a listmode (+beI) from a channel that matches the specified banid.
+ */
+int del_listmode(Ban **list, Channel *channel, char *banid)
+{
+	Ban **ban;
+	Ban *tmp;
+
+	if (!banid)
+		return -1;
+	for (ban = list; *ban; ban = &((*ban)->next))
+	{
+		if (identical_ban(banid, (*ban)->banstr))
+		{
+			tmp = *ban;
+			*ban = tmp->next;
+			safe_free(tmp->banstr);
+			safe_free(tmp->who);
+			free_ban(tmp);
+			return 0;
+		}
+	}
+	return -1;
+}
+
+/** is_banned - Check if a user is banned on a channel.
+ * @param client   Client to check (can be remote client)
+ * @param channel  Channel to check
+ * @param type   Type of ban to check for (BANCHK_*)
+ * @param msg    Message, only for some BANCHK_* types, otherwise NULL
+ * @param errmsg Error message returned, could be NULL (which does not
+ *               indicate absence of an error).
+ * @returns      A pointer to the ban struct if banned, otherwise NULL.
+ * @comments     Simple wrapper for is_banned_with_nick()
+ */
+inline Ban *is_banned(Client *client, Channel *channel, int type, char **msg, char **errmsg)
+{
+	return is_banned_with_nick(client, channel, type, NULL, msg, errmsg);
+}
+
+/** ban_check_mask - Checks if the user matches the specified n!u@h mask -or- run an extended ban.
+ * @param client         Client to check (can be remote client)
+ * @param channel        Channel to check
+ * @param banstr       Mask string to check user
+ * @param type         Type of ban to check for (BANCHK_*)
+ * @param msg          Message, only for some BANCHK_* types, otherwise NULL.
+ * @param errmsg       Error message, could be NULL
+ * @param no_extbans   0 to check extbans, nonzero to disable extban checking.
+ * @returns            Nonzero if the mask/extban succeeds. Zero if it doesn't.
+ * @comments           This is basically extracting the mask and extban check from is_banned_with_nick, but with being a bit more strict in what an extban is.
+ *                     Strange things could happen if this is called outside standard ban checking.
+ */
+inline int ban_check_mask(Client *client, Channel *channel, char *banstr, int type, char **msg, char **errmsg, int no_extbans)
+{
+	Extban *extban = NULL;
+	if (!no_extbans && is_extended_ban(banstr))
+	{
+		/* Is an extended ban. */
+		extban = findmod_by_bantype(banstr[1]);
+		if (!extban)
+		{
+			return 0;
+		}
+		else
+		{
+			return extban->is_banned(client, channel, banstr, type, msg, errmsg);
+		}
+	}
+	else
+	{
+		/* Is a n!u@h mask. */
+		return match_user(banstr, client, MATCH_CHECK_ALL);
+	}
+}
+
+/** is_banned_with_nick - Check if a user is banned on a channel.
+ * @param client   Client to check (can be remote client)
+ * @param channel  Channel to check
+ * @param type   Type of ban to check for (BANCHK_*)
+ * @param nick   Nick of the user (or NULL, to default to client->name)
+ * @param msg    Message, only for some BANCHK_* types, otherwise NULL
+ * @returns      A pointer to the ban struct if banned, otherwise NULL.
+ */
+Ban *is_banned_with_nick(Client *client, Channel *channel, int type, char *nick, char **msg, char **errmsg)
+{
+	Ban *ban, *ex;
+	char savednick[NICKLEN+1];
+
+	/* It's not really doable to pass 'nick' to all the ban layers,
+	 * including extbans (with stacking) and so on. Or at least not
+	 * without breaking several module API's.
+	 * So, instead, we temporarily set 'client->name' to 'nick' and
+	 * restore it to the orginal value at the end of this function.
+	 * This is possible because all these layers never send a message
+	 * to 'client' and only indicate success/failure.
+	 * Note that all this ONLY happens if is_banned_with_nick() is called
+	 * with a non-NULL nick. That doesn't happen much. In UnrealIRCd
+	 * only in case of '/NICK newnick'. This fixes #5165.
+	 */
+	if (nick)
+	{
+		strlcpy(savednick, client->name, sizeof(savednick));
+		strlcpy(client->name, nick, sizeof(client->name));
+	}
+
+	/* We check +b first, if a +b is found we then see if there is a +e.
+	 * If a +e was found we return NULL, if not, we return the ban.
+	 */
+
+	for (ban = channel->banlist; ban; ban = ban->next)
+	{
+		if (ban_check_mask(client, channel, ban->banstr, type, msg, errmsg, 0))
+			break;
+	}
+
+	if (ban)
+	{
+		/* Ban found, now check for +e */
+		for (ex = channel->exlist; ex; ex = ex->next)
+		{
+			if (ban_check_mask(client, channel, ex->banstr, type, msg, errmsg, 0))
+			{
+				/* except matched */
+				ban = NULL;
+				break;
+			}
+		}
+		/* user is not on except, 'ban' stays non-NULL. */
+	}
+
+	if (nick)
+	{
+		/* Restore the nick */
+		strlcpy(client->name, savednick, sizeof(client->name));
+	}
+
+	return ban;
+}
+
+/** Add user to the channel.
+ * This adds both the Member struct to the channel->members linked list
+ * and also the Membership struct to the client->user->channel linked list.
+ * @note This does NOT send the JOIN, it only does the linked list stuff.
+ */
+void add_user_to_channel(Channel *channel, Client *who, int flags)
+{
+	Member *m;
+	Membership *mb;
+
+	if (who->user)
+	{
+		m = make_member();
+		m->client = who;
+		m->flags = flags;
+		m->next = channel->members;
+		channel->members = m;
+		channel->users++;
+
+		mb = make_membership();
+		mb->channel = channel;
+		mb->next = who->user->channel;
+		mb->flags = flags;
+		who->user->channel = mb;
+		who->user->joined++;
+		RunHook2(HOOKTYPE_JOIN_DATA, who, channel);
+	}
+}
+
+/** Remove the user from the channel.
+ * This doesn't send any PART etc. It does the free'ing of
+ * membership etc. It will also DESTROY the channel if the
+ * user was the last user (and the channel is not +P),
+ * via sub1_from_channel(), that is.
+ */
+int remove_user_from_channel(Client *client, Channel *channel)
+{
+	Member **m;
+	Member *m2;
+	Membership **mb;
+	Membership *mb2;
+
+	/* Update channel->members list */
+	for (m = &channel->members; (m2 = *m); m = &m2->next)
+	{
+		if (m2->client == client)
+		{
+			*m = m2->next;
+			free_member(m2);
+			break;
+		}
+	}
+
+	/* Update client->user->channel list */
+	for (mb = &client->user->channel; (mb2 = *mb); mb = &mb2->next)
+	{
+		if (mb2->channel == channel)
+		{
+			*mb = mb2->next;
+			free_membership(mb2);
+			break;
+		}
+	}
+
+	/* Update user record to reflect 1 less joined */
+	client->user->joined--;
+
+	/* Now sub1_from_channel() will deal with the channel record
+	 * and destroy the channel if needed.
+	 */
+	return sub1_from_channel(channel);
+}
+
+/** Get channel access flags (CHFL_*) for a client in a channel.
+ * @param client	The client
+ * @param channel	The channel
+ * @returns One or more of CHFL_* (eg: CHFL_CHANOP|CHFL_CHANADMIN)
+ * @note If the user is not found, then 0 is returned.
+ *       If the user has no access rights, then 0 is returned as well.
+ */
+long get_access(Client *client, Channel *channel)
+{
+	Membership *lp;
+	if (channel && IsUser(client))
+		if ((lp = find_membership_link(client->user->channel, channel)))
+			return lp->flags;
+	return 0;
+}
+
+/** Returns 1 if channel has this channel mode set and 0 if not */
+int has_channel_mode(Channel *channel, char mode)
+{
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+	int i;
+
+	/* Extended channel modes */
+	for (i=0; i <= Channelmode_highest; i++)
+	{
+		if ((Channelmode_Table[i].flag == mode) && (channel->mode.extmode & Channelmode_Table[i].mode))
+			return 1;
+	}
+
+	/* Built-in channel modes */
+	while (tab->mode != 0x0)
+	{
+		if ((channel->mode.mode & tab->mode) && (tab->flag == mode))
+			return 1;
+		tab++;
+	}
+
+	/* Special handling for +l (needed??) */
+	if (channel->mode.limit && (mode == 'l'))
+		return 1;
+
+	/* Special handling for +k (needed??) */
+	if (channel->mode.key[0] && (mode == 'k'))
+		return 1;
+
+	return 0; /* Not found */
+}
+
+/** Get the extended channel mode 'bit' value (eg: 0x20) by character (eg: 'Z') */
+Cmode_t get_extmode_bitbychar(char m)
+{
+        int extm;
+        for (extm=0; extm <= Channelmode_highest; extm++)
+        {
+                if (Channelmode_Table[extm].flag == m)
+                        return Channelmode_Table[extm].mode;
+        }
+        return 0;
+}
+
+/** Get the extended channel mode character (eg: 'Z') by the 'bit' value (eg: 0x20) */
+long get_mode_bitbychar(char m)
+{
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+
+	while(tab->mode != 0x0)
+	{
+		if (tab->flag == m)
+			return tab->mode;
+		tab++;;
+	}
+	return 0;
+}
+
+/** Write the "simple" list of channel modes for channel channel onto buffer mbuf with the parameters in pbuf.
+ */
+/* TODO: this function has many security issues and needs an audit, maybe even a recode */
+void channel_modes(Client *client, char *mbuf, char *pbuf, size_t mbuf_size, size_t pbuf_size, Channel *channel)
+{
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+	int ismember;
+	int i;
+
+	if (!(mbuf_size && pbuf_size)) return;
+
+	ismember = (IsMember(client, channel) || IsServer(client) || IsMe(client) || IsULine(client)) ? 1 : 0;
+
+	*pbuf = '\0';
+
+	*mbuf++ = '+';
+	mbuf_size--;
+	/* Paramless first */
+	while (mbuf_size && tab->mode != 0x0)
+	{
+		if ((channel->mode.mode & tab->mode))
+			if (!tab->parameters) {
+				*mbuf++ = tab->flag;
+				mbuf_size--;
+			}
+		tab++;
+	}
+	for (i=0; i <= Channelmode_highest; i++)
+	{
+		if (!mbuf_size) break;
+		if (Channelmode_Table[i].flag && !Channelmode_Table[i].paracount &&
+		    (channel->mode.extmode & Channelmode_Table[i].mode)) {
+			*mbuf++ = Channelmode_Table[i].flag;
+			mbuf_size--;
+		}
+	}
+	if (channel->mode.limit)
+	{
+		if (mbuf_size) {
+			*mbuf++ = 'l';
+			mbuf_size--;
+		}
+		if (ismember) {
+			ircsnprintf(pbuf, pbuf_size, "%d ", channel->mode.limit);
+			pbuf_size-=strlen(pbuf);
+			pbuf+=strlen(pbuf);
+		}
+	}
+	if (*channel->mode.key)
+	{
+		if (mbuf_size) {
+			*mbuf++ = 'k';
+			mbuf_size--;
+		}
+		if (ismember && pbuf_size) {
+			ircsnprintf(pbuf, pbuf_size, "%s ", channel->mode.key);
+			pbuf_size-=strlen(pbuf);
+			pbuf+=strlen(pbuf);
+		}
+	}
+
+	for (i=0; i <= Channelmode_highest; i++)
+	{
+		if (Channelmode_Table[i].flag && Channelmode_Table[i].paracount &&
+		    (channel->mode.extmode & Channelmode_Table[i].mode)) {
+		        char flag = Channelmode_Table[i].flag;
+			if (mbuf_size) {
+				*mbuf++ = flag;
+				mbuf_size--;
+			}
+			if (ismember)
+			{
+				ircsnprintf(pbuf, pbuf_size, "%s ", cm_getparameter(channel, flag));
+				pbuf_size-=strlen(pbuf);
+				pbuf+=strlen(pbuf);
+			}
+		}
+	}
+
+	/* Remove the trailing space from the parameters -- codemastr */
+	if (*pbuf) pbuf[strlen(pbuf)-1]=0;
+
+	if (!mbuf_size) mbuf--;
+	*mbuf++ = '\0';
+	return;
+}
+
+/** Make a pretty mask from the input string - only used by SILENCE
+ */
+char *pretty_mask(char *mask)
+{
+	char *cp;
+	char *user;
+	char *host;
+
+	if ((user = strchr((cp = mask), '!')))
+		*user++ = '\0';
+	if ((host = strrchr(user ? user : cp, '@')))
+	{
+		*host++ = '\0';
+		if (!user)
+			return make_nick_user_host(NULL, cp, host);
+	}
+	else if (!user && strchr(cp, '.'))
+		return make_nick_user_host(NULL, NULL, cp);
+	return make_nick_user_host(cp, user, host);
+}
+
+/** Trim a string - rather than cutting it off sharply, this adds a * at the end.
+ * So "toolong" becomes "toolon*"
+ */
+char *trim_str(char *str, int len)
+{
+	int l;
+	if (!str)
+		return NULL;
+	if ((l = strlen(str)) > len)
+	{
+		str += l - len;
+		*str = '*';
+	}
+	return str;
+}
+
+/** Make a proper ban mask.
+ * This takes user input (eg: "nick") and converts it to a mask suitable
+ * in the +beI lists (eg: "nick!*@*"). It also deals with extended bans,
+ * in which case it will call the extban->conv_param() function.
+ * @param mask		The ban mask
+ * @param what		MODE_DEL or MODE_ADD
+ * @param client	The client adding/removing this ban mask
+ * @returns pointer to correct banmask or NULL in case of error
+ * @note A pointer is returned to a static buffer, which is overwritten
+ *       on next clean_ban_mask or make_nick_user_host call.
+ */
+char *clean_ban_mask(char *mask, int what, Client *client)
+{
+	char *cp, *x;
+	char *user;
+	char *host;
+	Extban *p;
+	static char maskbuf[512];
+
+	/* Work on a copy */
+	strlcpy(maskbuf, mask, sizeof(maskbuf));
+	mask = maskbuf;
+
+	cp = strchr(mask, ' ');
+	if (cp)
+		*cp = '\0';
+
+	/* Strip any ':' at beginning since that would cause a desync */
+	for (; (*mask && (*mask == ':')); mask++);
+	if (!*mask)
+		return NULL;
+
+	/* Forbid ASCII <= 32 in all bans */
+	for (x = mask; *x; x++)
+		if (*x <= ' ')
+			return NULL;
+
+	/* Extended ban? */
+	if (is_extended_ban(mask))
+	{
+		if (RESTRICT_EXTENDEDBANS && MyUser(client) && !ValidatePermissionsForPath("immune:restrict-extendedbans",client,NULL,NULL,NULL))
+		{
+			if (!strcmp(RESTRICT_EXTENDEDBANS, "*"))
+			{
+				sendnotice(client, "Setting/removing of extended bans has been disabled");
+				return NULL;
+			}
+			if (strchr(RESTRICT_EXTENDEDBANS, mask[1]))
+			{
+				sendnotice(client, "Setting/removing of extended bantypes '%s' has been disabled",
+					RESTRICT_EXTENDEDBANS);
+				return NULL;
+			}
+		}
+		p = findmod_by_bantype(mask[1]);
+		if (!p)
+		{
+			/* extended bantype not supported, what to do?
+			 * Here are the rules:
+			 * - if from a remote client/server: allow it (easy upgrading,
+			 *   no desync)
+			 * - if from a local client trying to REMOVE the extban,
+			 *   allow it too (so you don't get "unremovable" extbans).
+			 */
+			if (!MyUser(client) || (what == MODE_DEL))
+				return mask; /* allow it */
+			return NULL; /* reject */
+		}
+		if (p->conv_param)
+			return p->conv_param(mask);
+		/* else, do some basic sanity checks and cut it off at 80 bytes */
+		if ((mask[1] != ':') || (mask[2] == '\0'))
+		    return NULL; /* require a ":<char>" after extban type */
+		if (strlen(mask) > 80)
+			mask[80] = '\0';
+		return mask;
+	}
+
+	if ((*mask == '~') && !strchr(mask, '@'))
+		return NULL; /* not an extended ban and not a ~user@host ban either. */
+
+	if ((user = strchr((cp = mask), '!')))
+		*user++ = '\0';
+	if ((host = strrchr(user ? user : cp, '@')))
+	{
+		*host++ = '\0';
+
+		if (!user)
+			return make_nick_user_host(NULL, trim_str(cp,USERLEN), trim_str(host,HOSTLEN));
+	}
+	else if (!user && strchr(cp, '.'))
+		return make_nick_user_host(NULL, NULL, trim_str(cp,HOSTLEN));
+	return make_nick_user_host(trim_str(cp,NICKLEN), trim_str(user,USERLEN), trim_str(host,HOSTLEN));
+}
+
+/** Check if 'client' matches an invite exception (+I) on 'channel' */
+int find_invex(Channel *channel, Client *client)
+{
+	Ban *inv;
+
+	for (inv = channel->invexlist; inv; inv = inv->next)
+		if (ban_check_mask(client, channel, inv->banstr, BANCHK_JOIN, NULL, NULL, 0))
+			return 1;
+
+	return 0;
+}
+
+/** Remove unwanted characters from channel name.
+ * You must call this before creating a new channel,
+ * eg in case of /JOIN.
+ */
+int valid_channelname(const char *cname)
+{
+	const char *p;
+
+	/* Channel name must start with a dash */
+	if (*cname != '#')
+		return 0;
+
+	if (strlen(cname) > CHANNELLEN)
+		return 0;
+
+	if ((iConf.allowed_channelchars == ALLOWED_CHANNELCHARS_ANY) || !iConf.allowed_channelchars)
+	{
+		/* The default up to and including UnrealIRCd 4 */
+		for (p = cname; *p; p++)
+		{
+			if (*p < 33 || *p == ',' || *p == ':')
+				return 0;
+		}
+	} else
+	if (iConf.allowed_channelchars == ALLOWED_CHANNELCHARS_ASCII)
+	{
+		/* The strict setting: only allow ASCII 32-128, except some chars */
+		for (p = cname; *p; p++)
+		{
+			if (*p < 33 || *p == ',' || *p == ':' || *p > 127)
+				return 0;
+		}
+	} else
+	if (iConf.allowed_channelchars == ALLOWED_CHANNELCHARS_UTF8)
+	{
+		/* Only allow UTF8, and also disallow some chars */
+		for (p = cname; *p; p++)
+		{
+			if (*p < 33 || *p == ',' || *p == ':')
+				return 0;
+		}
+		/* And run it through the UTF8 validator */
+		if (!unrl_utf8_validate(cname, (const char **)&p))
+			return 0;
+	} else
+	{
+		/* Impossible */
+		abort();
+	}
+	return 1; /* Valid */
+}
+
+/** Get existing channel 'chname' or create a new one.
+ * @param client	User creating or searching this channel
+ * @param chname	Channel name
+ * @param flag		If set to 'CREATE' then the channel is
+ *			created if it does not exist.
+ * @returns Pointer to channel (new or existing).
+ * @note Be sure to call valid_channelname() first before
+ *       you blindly call this function!
+ */
+Channel *get_channel(Client *client, char *chname, int flag)
+{
+	Channel *channel;
+	int  len;
+
+	if (BadPtr(chname))
+		return NULL;
+
+	len = strlen(chname);
+	if (MyUser(client) && len > CHANNELLEN)
+	{
+		len = CHANNELLEN;
+		*(chname + CHANNELLEN) = '\0';
+	}
+	if ((channel = find_channel(chname, NULL)))
+		return (channel);
+	if (flag == CREATE)
+	{
+		channel = safe_alloc(sizeof(Channel) + len);
+		strlcpy(channel->chname, chname, len + 1);
+		if (channels)
+			channels->prevch = channel;
+		channel->topic = NULL;
+		channel->topic_nick = NULL;
+		channel->prevch = NULL;
+		channel->nextch = channels;
+		channel->creationtime = MyUser(client) ? TStime() : 0;
+		channels = channel;
+		add_to_channel_hash_table(chname, channel);
+		irccounts.channels++;
+		RunHook2(HOOKTYPE_CHANNEL_CREATE, client, channel);
+	}
+	return channel;
+}
+
+/** Register an invite from someone to a channel - so they can bypass +i etc.
+ * @param from		The person sending the invite
+ * @param to		The person who is invited to join
+ * @param channel	The channel
+ * @param mtags		Message tags associated with this INVITE command
+ */
+void add_invite(Client *from, Client *to, Channel *channel, MessageTag *mtags)
+{
+	Link *inv, *tmp;
+
+	del_invite(to, channel);
+	/* If too many invite entries then delete the oldest one */
+	if (list_length(to->user->invited) >= MAXCHANNELSPERUSER)
+	{
+		for (tmp = to->user->invited; tmp->next; tmp = tmp->next)
+			;
+		del_invite(to, tmp->value.channel);
+
+	}
+	/* We get pissy over too many invites per channel as well now,
+	 * since otherwise mass-inviters could take up some major
+	 * resources -Donwulff
+	 */
+	if (list_length(channel->invites) >= MAXCHANNELSPERUSER)
+	{
+		for (tmp = channel->invites; tmp->next; tmp = tmp->next)
+			;
+		del_invite(tmp->value.client, channel);
+	}
+	/*
+	 * add client to the beginning of the channel invite list
+	 */
+	inv = make_link();
+	inv->value.client = to;
+	inv->next = channel->invites;
+	channel->invites = inv;
+	/*
+	 * add channel to the beginning of the client invite list
+	 */
+	inv = make_link();
+	inv->value.channel = channel;
+	inv->next = to->user->invited;
+	to->user->invited = inv;
+
+	RunHook4(HOOKTYPE_INVITE, from, to, channel, mtags);
+}
+
+/** Delete a previous invite of someone to a channel.
+ * @param client	The client who was invited
+ * @param channel	The channel to which the person was invited
+ */
+void del_invite(Client *client, Channel *channel)
+{
+	Link **inv, *tmp;
+
+	for (inv = &(channel->invites); (tmp = *inv); inv = &tmp->next)
+		if (tmp->value.client == client)
+		{
+			*inv = tmp->next;
+			free_link(tmp);
+			break;
+		}
+
+	for (inv = &(client->user->invited); (tmp = *inv); inv = &tmp->next)
+		if (tmp->value.channel == channel)
+		{
+			*inv = tmp->next;
+			free_link(tmp);
+			break;
+		}
+}
+
+/** Subtract one user from channel i. Free the channel if it became empty.
+ * @param channel The channel
+ * @returns 1 if the channel was freed, 0 if the channel still exists.
+ */
+int sub1_from_channel(Channel *channel)
+{
+	Ban *ban;
+	Link *lp;
+	int should_destroy = 1;
+
+	--channel->users;
+	if (channel->users > 0)
+		return 0;
+
+	/* No users in the channel anymore */
+	channel->users = 0; /* to be sure */
+
+	/* If the channel is +P then this hook will actually stop destruction. */
+	RunHook2(HOOKTYPE_CHANNEL_DESTROY, channel, &should_destroy);
+	if (!should_destroy)
+		return 0;
+
+	/* We are now going to destroy the channel.
+	 * But first we will destroy all kinds of references and lists...
+	 */
+
+	while ((lp = channel->invites))
+		del_invite(lp->value.client, channel);
+
+	while (channel->banlist)
+	{
+		ban = channel->banlist;
+		channel->banlist = ban->next;
+		safe_free(ban->banstr);
+		safe_free(ban->who);
+		free_ban(ban);
+	}
+	while (channel->exlist)
+	{
+		ban = channel->exlist;
+		channel->exlist = ban->next;
+		safe_free(ban->banstr);
+		safe_free(ban->who);
+		free_ban(ban);
+	}
+	while (channel->invexlist)
+	{
+		ban = channel->invexlist;
+		channel->invexlist = ban->next;
+		safe_free(ban->banstr);
+		safe_free(ban->who);
+		free_ban(ban);
+	}
+
+	/* free extcmode params */
+	extcmode_free_paramlist(channel->mode.extmodeparams);
+
+	safe_free(channel->mode_lock);
+	safe_free(channel->topic);
+	safe_free(channel->topic_nick);
+
+	if (channel->prevch)
+		channel->prevch->nextch = channel->nextch;
+	else
+		channels = channel->nextch;
+
+	if (channel->nextch)
+		channel->nextch->prevch = channel->prevch;
+	del_from_channel_hash_table(channel->chname, channel);
+
+	irccounts.channels--;
+	safe_free(channel);
+	return 1;
+}
+
+/** Set channel mode lock on the channel, these are modes that users cannot change.
+ * @param client	The client or server issueing the MLOCK
+ * @param channel	The channel that will be MLOCK'ed
+ * @param newmlock	The MLOCK string: list of mode characters that are locked
+ */
+void set_channel_mlock(Client *client, Channel *channel, const char *newmlock, int propagate)
+{
+	safe_strdup(channel->mode_lock, newmlock);
+
+	if (propagate)
+	{
+		sendto_server(client, 0, 0, NULL, ":%s MLOCK %lld %s :%s",
+			      client->id, (long long)channel->creationtime, channel->chname,
+			      BadPtr(channel->mode_lock) ? "" : channel->mode_lock);
+	}
+}
+
+/** Parse a channelmode line.
+ * @in pm A ParseMode struct, used to return values and to maintain internal state.
+ * @in modebuf_in Buffer pointing to mode characters (eg: +snk-l)
+ * @in parabuf_in Buffer pointing to all parameters (eg: key 123)
+ * @retval Returns 1 if we have valid data to return, 0 if at end of mode line.
+ * @section ex1 Example:
+ * @code
+ * ParseMode pm;
+ * int ret;
+ * for (ret = parse_chanmode(&pm, modebuf, parabuf); ret; ret = parse_chanmode(&pm, NULL, NULL))
+ * {
+ *         ircd_log(LOG_ERROR, "Got %c%c %s",
+ *                  pm.what == MODE_ADD ? '+' : '-',
+ *                  pm.modechar,
+ *                  pm.param ? pm.param : "");
+ * }
+ * @endcode
+ */
+int parse_chanmode(ParseMode *pm, char *modebuf_in, char *parabuf_in)
+{
+	if (modebuf_in)
+	{
+		/* Initialize */
+		memset(pm, 0, sizeof(ParseMode));
+		pm->modebuf = modebuf_in;
+		pm->parabuf = parabuf_in;
+		pm->what = MODE_ADD;
+	}
+
+	while(1)
+	{
+		if (*pm->modebuf == '\0')
+			return 0;
+		else if (*pm->modebuf == '+')
+		{
+			pm->what = MODE_ADD;
+			pm->modebuf++;
+			continue;
+		}
+		else if (*pm->modebuf == '-')
+		{
+			pm->what = MODE_DEL;
+			pm->modebuf++;
+			continue;
+		}
+		else
+		{
+			CoreChannelModeTable *tab = &corechannelmodetable[0];
+			int i;
+			int eatparam = 0;
+
+			/* Set some defaults */
+			pm->extm = NULL;
+			pm->modechar = *pm->modebuf;
+			pm->param = NULL;
+
+			while (tab->mode != 0x0)
+			{
+				if (tab->flag == *pm->modebuf)
+					break;
+				tab++;
+			}
+
+			if (tab->mode)
+			{
+				/* INTERNAL MODE */
+				if (tab->parameters)
+				{
+					if ((pm->what == MODE_DEL) && (tab->flag == 'l'))
+						eatparam = 0; /* -l is special: no parameter required */
+					else
+						eatparam = 1; /* all other internal parameter modes do require a parameter on unset */
+				}
+			} else {
+				/* EXTENDED CHANNEL MODE */
+				int found = 0;
+				for (i=0; i <= Channelmode_highest; i++)
+					if (Channelmode_Table[i].flag == *pm->modebuf)
+					{
+						found = 1;
+						break;
+					}
+				if (!found)
+				{
+					/* Not found. Will be ignored, just move on.. */
+					pm->modebuf++;
+					continue;
+				}
+				pm->extm = &Channelmode_Table[i];
+				if (Channelmode_Table[i].paracount == 1)
+				{
+					if (pm->what == MODE_ADD)
+						eatparam = 1;
+					else if (Channelmode_Table[i].unset_with_param)
+						eatparam = 1;
+					/* else 0 (if MODE_DEL && !unset_with_param) */
+				}
+			}
+
+			if (eatparam)
+			{
+				/* Hungry.. */
+				if (pm->parabuf && *pm->parabuf)
+				{
+					char *start, *end;
+					for (; *pm->parabuf == ' '; pm->parabuf++); /* skip whitespace */
+					start = pm->parabuf;
+					if (*pm->parabuf == '\0')
+					{
+						pm->modebuf++;
+						continue; /* invalid, got mode but no parameter available */
+					}
+					end = strchr(start, ' ');
+					/* copy start .. end (where end may be null, then just copy all) */
+					if (end)
+					{
+						pm->parabuf = end + 1; /* point to next param, or \0 */
+						if (end - start + 1 > sizeof(pm->buf))
+							end = start + sizeof(pm->buf); /* 'never' reached */
+						strlcpy(pm->buf, start, end - start + 1);
+					}
+					else
+					{
+						strlcpy(pm->buf, start, sizeof(pm->buf));
+						pm->parabuf = pm->parabuf + strlen(pm->parabuf); /* point to \0 at end */
+					}
+					pm->param = pm->buf;
+				} else {
+					pm->modebuf++;
+					continue; /* invalid, got mode but no parameter available */
+				}
+			}
+		}
+		pm->modebuf++; /* advance pointer */
+		return 1;
+	}
+}
+
+/** Returns 1 if both clients are at least in 1 same channel */
+int has_common_channels(Client *c1, Client *c2)
+{
+	Membership *lp;
+
+	for (lp = c1->user->channel; lp; lp = lp->next)
+	{
+		if (IsMember(c2, lp->channel) && user_can_see_member(c1, c2, lp->channel))
+			return 1;
+	}
+	return 0;
+}
+
+/** Returns 1 if user 'user' can see channel member 'target'.
+ * This may return 0 if the user is 'invisible' due to mode +D rules.
+ * NOTE: Membership is unchecked, assumed membership of both.
+ */
+int user_can_see_member(Client *user, Client *target, Channel *channel)
+{
+	Hook *h;
+	int j = 0;
+
+	if (user == target)
+		return 1;
+
+	for (h = Hooks[HOOKTYPE_VISIBLE_IN_CHANNEL]; h; h = h->next)
+	{
+		j = (*(h->func.intfunc))(target,channel);
+		if (j != 0)
+			break;
+	}
+
+	/* We must ensure that user is allowed to "see" target */
+	if (j != 0 && !(is_skochanop(target, channel) || has_voice(target,channel)) && !is_skochanop(user, channel))
+		return 0;
+
+	return 1;
+}
+
+/** Returns 1 if user 'target' is invisible in channel 'channel'.
+ * This may return 0 if the user is 'invisible' due to mode +D rules.
+ */
+int invisible_user_in_channel(Client *target, Channel *channel)
+{
+	Hook *h;
+	int j = 0;
+
+	for (h = Hooks[HOOKTYPE_VISIBLE_IN_CHANNEL]; h; h = h->next)
+	{
+		j = (*(h->func.intfunc))(target,channel);
+		if (j != 0)
+			break;
+	}
+
+	/* We must ensure that user is allowed to "see" target */
+	if (j != 0 && !(is_skochanop(target, channel) || has_voice(target,channel)))
+		return 1;
+
+	return 0;
+}
+
+/** Send a message to the user that (s)he is using an invalid channel name.
+ * This is usually called after an if (MyUser(client) && !valid_channelname(name)).
+ * @param client      The client to send the message to.
+ * @param channelname The (invalid) channel that the user tried to join.
+ */
+void send_invalid_channelname(Client *client, char *channelname)
+{
+	char *reason;
+
+	if (*channelname != '#')
+	{
+		reason = "Channel name must start with a hash mark (#)";
+	} else
+	if (strlen(channelname) > CHANNELLEN)
+	{
+		reason = "Channel name is too long";
+	} else {
+		switch(iConf.allowed_channelchars)
+		{
+			case ALLOWED_CHANNELCHARS_ASCII:
+				reason = "Channel name contains illegal characters (must be ASCII)";
+				break;
+			case ALLOWED_CHANNELCHARS_UTF8:
+				reason = "Channel name contains illegal characters (must be valid UTF8)";
+				break;
+			case ALLOWED_CHANNELCHARS_ANY:
+			default:
+				reason = "Channel name contains illegal characters";
+		}
+	}
+
+	sendnumeric(client, ERR_FORBIDDENCHANNEL, channelname, reason);
+}
+
+/** Is the provided string possibly an extended ban?
+ * Note that it still may not exist, it just tests the first part.
+ */
+int is_extended_ban(const char *str)
+{
+	if ((str[0] == '~') && (str[1] != '\0') && (str[2] == ':'))
+		return 1;
+	return 0;
+}
diff --git a/src/conf.c b/src/conf.c
new file mode 100644
index 0000000..e65ebee
--- /dev/null
+++ b/src/conf.c
@@ -0,0 +1,10569 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/conf.c
+ *   (C) 1998-2000 Chris Behrens & Fred Jacobs (comstud, moogle)
+ *   (C) 2000-2002 Carsten V. Munk and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/*
+ * Some typedefs..
+*/
+typedef struct ConfigCommand ConfigCommand;
+struct ConfigCommand
+{
+	char	*name;
+	int	(*conffunc)(ConfigFile *conf, ConfigEntry *ce);
+	int 	(*testfunc)(ConfigFile *conf, ConfigEntry *ce);
+};
+
+typedef struct NameValue NameValue;
+struct NameValue
+{
+	long	flag;
+	char	*name;
+};
+
+
+/* Config commands */
+
+static int	_conf_admin		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_me		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_files		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_oper		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_operclass		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_class		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_drpass		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_ulines		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_include		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_tld		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_listen		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_allow		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_except		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_vhost		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_link		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_ban		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_set		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_deny		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_deny_link		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_deny_channel	(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_deny_version	(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_require		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_allow_channel	(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_loadmodule	(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_log		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_alias		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_help		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_offchans		(ConfigFile *conf, ConfigEntry *ce);
+static int	_conf_sni			(ConfigFile *conf, ConfigEntry *ce);
+
+/*
+ * Validation commands
+*/
+
+static int	_test_admin		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_me		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_files		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_oper		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_operclass		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_class		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_drpass		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_ulines		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_include		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_tld		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_listen		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_allow		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_except		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_vhost		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_link		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_ban		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_require		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_set		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_deny		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_allow_channel	(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_loadmodule	(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_blacklist_module	(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_log		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_alias		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_help		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_offchans		(ConfigFile *conf, ConfigEntry *ce);
+static int	_test_sni			(ConfigFile *conf, ConfigEntry *ce);
+
+/* This MUST be alphabetized */
+static ConfigCommand _ConfigCommands[] = {
+	{ "admin", 		_conf_admin,		_test_admin 	},
+	{ "alias",		_conf_alias,		_test_alias	},
+	{ "allow",		_conf_allow,		_test_allow	},
+	{ "ban", 		_conf_ban,		_test_ban	},
+	{ "blacklist-module",	NULL,		 	NULL },
+	{ "class", 		_conf_class,		_test_class	},
+	{ "deny",		_conf_deny,		_test_deny	},
+	{ "drpass",		_conf_drpass,		_test_drpass	},
+	{ "except",		_conf_except,		_test_except	},
+	{ "files",		_conf_files,		_test_files	},
+	{ "help",		_conf_help,		_test_help	},
+	{ "include",		NULL,	  		_test_include	},
+	{ "link", 		_conf_link,		_test_link	},
+	{ "listen", 		_conf_listen,		_test_listen	},
+	{ "loadmodule",		NULL,		 	_test_loadmodule},
+	{ "log",		_conf_log,		_test_log	},
+	{ "me", 		_conf_me,		_test_me	},
+	{ "official-channels", 	_conf_offchans,		_test_offchans	},
+	{ "oper", 		_conf_oper,		_test_oper	},
+	{ "operclass",		_conf_operclass,	_test_operclass	},
+	{ "require", 		_conf_require,		_test_require	},
+	{ "set",		_conf_set,		_test_set	},
+	{ "sni",		_conf_sni,		_test_sni	},
+	{ "tld",		_conf_tld,		_test_tld	},
+	{ "ulines",		_conf_ulines,		_test_ulines	},
+	{ "vhost", 		_conf_vhost,		_test_vhost	},
+};
+
+/* This MUST be alphabetized */
+static NameValue _ListenerFlags[] = {
+	{ LISTENER_CLIENTSONLY,  "clientsonly"},
+	{ LISTENER_DEFER_ACCEPT, "defer-accept"},
+	{ LISTENER_SERVERSONLY,  "serversonly"},
+	{ LISTENER_TLS, 	 "ssl"},
+	{ LISTENER_NORMAL, 	 "standard"},
+	{ LISTENER_TLS, 	 "tls"},
+};
+
+/* This MUST be alphabetized */
+static NameValue _LinkFlags[] = {
+	{ CONNECT_AUTO,	"autoconnect" },
+	{ CONNECT_INSECURE,	"insecure" },
+	{ CONNECT_QUARANTINE, "quarantine"},
+	{ CONNECT_TLS, "ssl" },
+	{ CONNECT_TLS, "tls" },
+};
+
+/* This MUST be alphabetized */
+static NameValue _LogFlags[] = {
+	{ LOG_CHGCMDS, "chg-commands" },
+	{ LOG_CLIENT, "connects" },
+	{ LOG_ERROR, "errors" },
+	{ LOG_KILL, "kills" },
+	{ LOG_KLINE, "kline" },
+	{ LOG_OPER, "oper" },
+	{ LOG_OVERRIDE, "oper-override" },
+	{ LOG_SACMDS, "sadmin-commands" },
+	{ LOG_SERVER, "server-connects" },
+	{ LOG_SPAMFILTER, "spamfilter" },
+	{ LOG_TKL, "tkl" },
+};
+
+/* This MUST be alphabetized */
+static NameValue _TLSFlags[] = {
+	{ TLSFLAG_FAILIFNOCERT, "fail-if-no-clientcert" },
+	{ TLSFLAG_DISABLECLIENTCERT, "no-client-certificate" },
+	{ TLSFLAG_NOSTARTTLS, "no-starttls" },
+};
+
+struct {
+	unsigned conf_me : 1;
+	unsigned conf_admin : 1;
+	unsigned conf_listen : 1;
+} requiredstuff;
+struct {
+	int min, max;
+} nicklengths;
+struct SetCheck settings;
+/*
+ * Utilities
+*/
+
+void	port_range(char *string, int *start, int *end);
+long	config_checkval(char *value, unsigned short flags);
+
+/*
+ * Parser
+*/
+
+ConfigFile		*config_load(char *filename, char *displayname);
+void			config_free(ConfigFile *cfptr);
+ConfigFile		*config_parse_with_offset(char *filename, char *confdata, unsigned int line_offset);
+ConfigFile	 	*config_parse(char *filename, char *confdata);
+ConfigEntry		*config_find_entry(ConfigEntry *ce, char *name);
+
+extern void add_entropy_configfile(struct stat *st, char *buf);
+extern void unload_all_unused_snomasks(void);
+extern void unload_all_unused_umodes(void);
+extern void unload_all_unused_extcmodes(void);
+extern void unload_all_unused_caps(void);
+extern void unload_all_unused_history_backends(void);
+
+int reloadable_perm_module_unloaded(void);
+
+int tls_tests(void);
+
+/* Conf sub-sub-functions */
+void test_tlsblock(ConfigFile *conf, ConfigEntry *cep, int *totalerrors);
+void conf_tlsblock(ConfigFile *conf, ConfigEntry *cep, TLSOptions *tlsoptions);
+void free_tls_options(TLSOptions *tlsoptions);
+
+/*
+ * Config parser (IRCd)
+*/
+int			init_conf(char *rootconf, int rehash);
+int			load_conf(char *filename, const char *original_path);
+void			config_rehash();
+int			config_run();
+/*
+ * Configuration linked lists
+*/
+ConfigItem_me		*conf_me = NULL;
+ConfigItem_files	*conf_files = NULL;
+ConfigItem_class 	*conf_class = NULL;
+ConfigItem_class	*default_class = NULL;
+ConfigItem_admin 	*conf_admin = NULL;
+ConfigItem_admin	*conf_admin_tail = NULL;
+ConfigItem_drpass	*conf_drpass = NULL;
+ConfigItem_ulines	*conf_ulines = NULL;
+ConfigItem_tld		*conf_tld = NULL;
+ConfigItem_oper		*conf_oper = NULL;
+ConfigItem_operclass	*conf_operclass = NULL;
+ConfigItem_listen	*conf_listen = NULL;
+ConfigItem_sni		*conf_sni = NULL;
+ConfigItem_allow	*conf_allow = NULL;
+ConfigItem_except	*conf_except = NULL;
+ConfigItem_vhost	*conf_vhost = NULL;
+ConfigItem_link		*conf_link = NULL;
+ConfigItem_ban		*conf_ban = NULL;
+ConfigItem_deny_channel *conf_deny_channel = NULL;
+ConfigItem_allow_channel *conf_allow_channel = NULL;
+ConfigItem_deny_link	*conf_deny_link = NULL;
+ConfigItem_deny_version *conf_deny_version = NULL;
+ConfigItem_log		*conf_log = NULL;
+ConfigItem_alias	*conf_alias = NULL;
+ConfigItem_include	*conf_include = NULL;
+ConfigItem_blacklist_module	*conf_blacklist_module = NULL;
+ConfigItem_help		*conf_help = NULL;
+ConfigItem_offchans	*conf_offchans = NULL;
+
+MODVAR Configuration		iConf;
+MODVAR Configuration		tempiConf;
+MODVAR ConfigFile		*conf = NULL;
+extern NameValueList *config_defines;
+MODVAR int ipv6_disabled = 0;
+MODVAR Client *remote_rehash_client = NULL;
+
+MODVAR int			config_error_flag = 0;
+int			config_verbose = 0;
+
+MODVAR int need_34_upgrade = 0;
+int need_operclass_permissions_upgrade = 0;
+int have_tls_listeners = 0;
+char *port_6667_ip = NULL;
+
+void add_include(const char *filename, const char *included_from, int included_from_line);
+#ifdef USE_LIBCURL
+void add_remote_include(const char *, const char *, int, const char *, const char *included_from, int included_from_line);
+void update_remote_include(ConfigItem_include *inc, const char *file, int, const char *errorbuf);
+int remote_include(ConfigEntry *ce);
+#endif
+void unload_notloaded_includes(void);
+void load_includes(void);
+void unload_loaded_includes(void);
+int rehash_internal(Client *client, int sig);
+int is_blacklisted_module(char *name);
+
+/** Return the printable string of a 'cep' location, such as set::something::xyz */
+char *config_var(ConfigEntry *cep)
+{
+	static char buf[256];
+	ConfigEntry *e;
+	char *elem[16];
+	int numel = 0, i;
+
+	if (!cep)
+		return "";
+
+	buf[0] = '\0';
+
+	/* First, walk back to the top */
+	for (e = cep; e; e = e->ce_prevlevel)
+	{
+		elem[numel++] = e->ce_varname;
+		if (numel == 15)
+			break;
+	}
+
+	/* Now construct the xxx::yyy::zzz string */
+	for (i = numel-1; i >= 0; i--)
+	{
+		strlcat(buf, elem[i], sizeof(buf));
+		if (i > 0)
+			strlcat(buf, "::", sizeof(buf));
+	}
+
+	return buf;
+}
+
+void port_range(char *string, int *start, int *end)
+{
+	char *c = strchr(string, '-');
+	if (!c)
+	{
+		int tmp = atoi(string);
+		*start = tmp;
+		*end = tmp;
+		return;
+	}
+	*c = '\0';
+	*start = atoi(string);
+	*end = atoi((c+1));
+	*c = '-';
+}
+
+/** Parses '5:60s' config values.
+ * orig: original string
+ * times: pointer to int, first value (before the :)
+ * period: pointer to int, second value (after the :) in seconds
+ * RETURNS: 0 for parse error, 1 if ok.
+ * REMARK: times&period should be ints!
+ */
+int config_parse_flood(char *orig, int *times, int *period)
+{
+char *x;
+
+	*times = *period = 0;
+	x = strchr(orig, ':');
+	/* 'blah', ':blah', '1:' */
+	if (!x || (x == orig) || (*(x+1) == '\0'))
+		return 0;
+
+	*x = '\0';
+	*times = atoi(orig);
+	*period = config_checkval(x+1, CFG_TIME);
+	*x = ':'; /* restore */
+	return 1;
+}
+
+long config_checkval(char *orig, unsigned short flags) {
+	char *value = raw_strdup(orig);
+	char *text;
+	long ret = 0;
+
+	if (flags == CFG_YESNO) {
+		for (text = value; *text; text++) {
+			if (!isalnum(*text))
+				continue;
+			if (tolower(*text) == 'y' || (tolower(*text) == 'o' &&
+			    tolower(*(text+1)) == 'n') || *text == '1' || tolower(*text) == 't') {
+				ret = 1;
+				break;
+			}
+		}
+	}
+	else if (flags == CFG_SIZE) {
+		int mfactor = 1;
+		char *sz;
+		for (text = value; *text; text++) {
+			if (isalpha(*text)) {
+				if (tolower(*text) == 'k')
+					mfactor = 1024;
+				else if (tolower(*text) == 'm')
+					mfactor = 1048576;
+				else if (tolower(*text) == 'g')
+					mfactor = 1073741824;
+				else
+					mfactor = 1;
+				sz = text;
+				while (isalpha(*text))
+					text++;
+
+				*sz = 0;
+				while (sz-- > value && *sz) {
+					if (isspace(*sz))
+						*sz = 0;
+					if (!isdigit(*sz))
+						break;
+				}
+				ret += atoi(sz+1)*mfactor;
+				if (*text == '\0') {
+					text++;
+					break;
+				}
+			}
+		}
+		mfactor = 1;
+		sz = text;
+		sz--; /* -1 because we are PAST the end of the string */
+		while (sz-- > value) {
+			if (isspace(*sz))
+				*sz = 0;
+			if (!isdigit(*sz))
+				break;
+		}
+		ret += atoi(sz+1)*mfactor;
+	}
+	else if (flags == CFG_TIME) {
+		int mfactor = 1;
+		char *sz;
+		for (text = value; *text; text++) {
+			if (isalpha(*text)) {
+				if (tolower(*text) == 'w')
+					mfactor = 604800;
+				else if (tolower(*text) == 'd')
+					mfactor = 86400;
+				else if (tolower(*text) == 'h')
+					mfactor = 3600;
+				else if (tolower(*text) == 'm')
+					mfactor = 60;
+				else
+					mfactor = 1;
+				sz = text;
+				while (isalpha(*text))
+					text++;
+
+				*sz = 0;
+				while (sz-- > value && *sz) {
+					if (isspace(*sz))
+						*sz = 0;
+					if (!isdigit(*sz))
+						break;
+				}
+				ret += atoi(sz+1)*mfactor;
+				if (*text == '\0') {
+					text++;
+					break;
+				}
+			}
+		}
+		mfactor = 1;
+		sz = text;
+		sz--; /* -1 because we are PAST the end of the string */
+		while (sz-- > value) {
+			if (isspace(*sz))
+				*sz = 0;
+			if (!isdigit(*sz))
+				break;
+		}
+		ret += atoi(sz+1)*mfactor;
+	}
+	safe_free(value);
+	return ret;
+}
+
+/** Free configuration setting for set::modes-on-join */
+void free_conf_channelmodes(struct ChMode *store)
+{
+	int i;
+
+	store->mode = 0;
+	store->extmodes = 0;
+	for (i = 0; i < EXTCMODETABLESZ; i++)
+		safe_free(store->extparams[i]);
+}
+
+/* Set configuration, used for set::modes-on-join */
+void conf_channelmodes(char *modes, struct ChMode *store, int warn)
+{
+	CoreChannelModeTable *tab;
+	char *params = strchr(modes, ' ');
+	char *parambuf = NULL;
+	char *param = NULL;
+	char *save = NULL;
+
+	warn = 0; // warn is broken
+
+	/* Free existing parameters first (no inheritance) */
+	free_conf_channelmodes(store);
+
+	if (params)
+	{
+		params++;
+		safe_strdup(parambuf, params);
+		param = strtoken(&save, parambuf, " ");
+	}
+
+	for (; *modes && *modes != ' '; modes++)
+	{
+		if (*modes == '+')
+			continue;
+		if (*modes == '-')
+		/* When a channel is created it has no modes, so just ignore if the
+		 * user asks us to unset anything -- codemastr
+		 */
+		{
+			while (*modes && *modes != '+')
+				modes++;
+			continue;
+		}
+		for (tab = &corechannelmodetable[0]; tab->mode; tab++)
+		{
+			if (tab->flag == *modes)
+			{
+				if (tab->parameters)
+				{
+					/* INCOMPATIBLE */
+					break;
+				}
+				store->mode |= tab->mode;
+				break;
+			}
+		}
+		/* Try extcmodes */
+		if (!tab->mode)
+		{
+			int i;
+			for (i=0; i <= Channelmode_highest; i++)
+			{
+				if (!(Channelmode_Table[i].flag))
+					continue;
+				if (*modes == Channelmode_Table[i].flag)
+				{
+					if (Channelmode_Table[i].paracount)
+					{
+						if (!param)
+							break;
+						param = Channelmode_Table[i].conv_param(param, NULL);
+						if (!param)
+							break; /* invalid parameter fmt, do not set mode. */
+						store->extparams[i] = raw_strdup(param);
+						/* Get next parameter */
+						param = strtoken(&save, NULL, " ");
+					}
+					store->extmodes |= Channelmode_Table[i].mode;
+					break;
+				}
+			}
+		}
+	}
+	safe_free(parambuf);
+}
+
+void chmode_str(struct ChMode *modes, char *mbuf, char *pbuf, size_t mbuf_size, size_t pbuf_size)
+{
+	CoreChannelModeTable *tab;
+	int i;
+
+	if (!(mbuf_size && pbuf_size))
+		return;
+
+	*pbuf = 0;
+	*mbuf++ = '+';
+	if (--mbuf_size == 0) return;
+	for (tab = &corechannelmodetable[0]; tab->mode; tab++)
+	{
+		if (modes->mode & tab->mode)
+		{
+			if (!tab->parameters)
+			{
+				*mbuf++ = tab->flag;
+				if (!--mbuf_size)
+				{
+					*--mbuf=0;
+					break;
+				}
+			}
+		}
+	}
+	for (i=0; i <= Channelmode_highest; i++)
+	{
+		if (!(Channelmode_Table[i].flag))
+			continue;
+
+		if (modes->extmodes & Channelmode_Table[i].mode)
+		{
+			if (mbuf_size)
+			{
+				*mbuf++ = Channelmode_Table[i].flag;
+				if (!--mbuf_size)
+				{
+					*--mbuf=0;
+					break;
+				}
+			}
+			if (Channelmode_Table[i].paracount)
+			{
+				strlcat(pbuf, modes->extparams[i], pbuf_size);
+				strlcat(pbuf, " ", pbuf_size);
+			}
+		}
+	}
+	*mbuf=0;
+}
+
+int channellevel_to_int(char *s)
+{
+	/* Requested at http://bugs.unrealircd.org/view.php?id=3852 */
+	if (!strcmp(s, "none"))
+		return CHFL_DEOPPED;
+	if (!strcmp(s, "voice"))
+		return CHFL_VOICE;
+	if (!strcmp(s, "halfop"))
+		return CHFL_HALFOP;
+	if (!strcmp(s, "op") || !strcmp(s, "chanop"))
+		return CHFL_CHANOP;
+	if (!strcmp(s, "protect") || !strcmp(s, "chanprot"))
+#ifdef PREFIX_AQ
+		return CHFL_CHANADMIN;
+#else
+		return CHFL_CHANOP|CHFL_CHANADMIN;
+#endif
+	if (!strcmp(s, "owner") || !strcmp(s, "chanowner"))
+#ifdef PREFIX_AQ
+		return CHFL_CHANOWNER;
+#else
+		return CHFL_CHANOP|CHFL_CHANOWNER;
+#endif
+
+	return 0; /* unknown or unsupported */
+}
+
+/* Channel flag (eg: CHFL_CHANOWNER) to SJOIN symbol (eg: *).
+ * WARNING: Do not confuse SJOIN symbols with prefixes in /NAMES!
+ */
+char *chfl_to_sjoin_symbol(int s)
+{
+	switch(s)
+	{
+		case CHFL_VOICE:
+			return "+";
+		case CHFL_HALFOP:
+			return "%";
+		case CHFL_CHANOP:
+			return "@";
+		case CHFL_CHANADMIN:
+#ifdef PREFIX_AQ
+			return "~";
+#else
+			return "~@";
+#endif
+		case CHFL_CHANOWNER:
+#ifdef PREFIX_AQ
+			return "*";
+#else
+			return "*@";
+#endif
+		case CHFL_DEOPPED:
+		default:
+			return "";
+	}
+	/* NOT REACHED */
+}
+
+char chfl_to_chanmode(int s)
+{
+	switch(s)
+	{
+		case CHFL_VOICE:
+			return 'v';
+		case CHFL_HALFOP:
+			return 'h';
+		case CHFL_CHANOP:
+			return 'o';
+		case CHFL_CHANADMIN:
+			return 'a';
+		case CHFL_CHANOWNER:
+			return 'q';
+		case CHFL_DEOPPED:
+		default:
+			return '\0';
+	}
+	/* NOT REACHED */
+}
+
+Policy policy_strtoval(char *s)
+{
+	if (!s)
+		return 0;
+
+	if (!strcmp(s, "allow"))
+		return POLICY_ALLOW;
+
+	if (!strcmp(s, "warn"))
+		return POLICY_WARN;
+
+	if (!strcmp(s, "deny"))
+		return POLICY_DENY;
+
+	return 0;
+}
+
+char *policy_valtostr(Policy policy)
+{
+	if (policy == POLICY_ALLOW)
+		return "allow";
+	if (policy == POLICY_WARN)
+		return "warn";
+	if (policy == POLICY_DENY)
+		return "deny";
+	return "???";
+}
+
+char policy_valtochar(Policy policy)
+{
+	if (policy == POLICY_ALLOW)
+		return 'a';
+	if (policy == POLICY_WARN)
+		return 'w';
+	if (policy == POLICY_DENY)
+		return 'd';
+	return '?';
+}
+
+AllowedChannelChars allowed_channelchars_strtoval(char *str)
+{
+	if (!strcmp(str, "ascii"))
+		return ALLOWED_CHANNELCHARS_ASCII;
+	else if (!strcmp(str, "utf8"))
+		return ALLOWED_CHANNELCHARS_UTF8;
+	else if (!strcmp(str, "any"))
+		return ALLOWED_CHANNELCHARS_ANY;
+	return 0;
+}
+
+char *allowed_channelchars_valtostr(AllowedChannelChars v)
+{
+	switch(v)
+	{
+		case ALLOWED_CHANNELCHARS_ASCII:
+			return "ascii";
+		case ALLOWED_CHANNELCHARS_UTF8:
+			return "utf8";
+		case ALLOWED_CHANNELCHARS_ANY:
+			return "any";
+		default:
+			/* Not possible */
+			abort();
+			return "NOTREACHED"; /* Windows.. */
+	}
+}
+
+/* Used for set::automatic-ban-target and set::manual-ban-target */
+BanTarget ban_target_strtoval(char *str)
+{
+	if (!strcmp(str, "ip"))
+		return BAN_TARGET_IP;
+	else if (!strcmp(str, "userip"))
+		return BAN_TARGET_USERIP;
+	else if (!strcmp(str, "host"))
+		return BAN_TARGET_HOST;
+	else if (!strcmp(str, "userhost"))
+		return BAN_TARGET_USERHOST;
+	else if (!strcmp(str, "account"))
+		return BAN_TARGET_ACCOUNT;
+	else if (!strcmp(str, "certfp"))
+		return BAN_TARGET_CERTFP;
+	return 0; /* invalid */
+}
+
+/* Used for set::automatic-ban-target and set::manual-ban-target */
+char *ban_target_valtostr(BanTarget v)
+{
+	switch(v)
+	{
+		case BAN_TARGET_IP:
+			return "ip";
+		case BAN_TARGET_USERIP:
+			return "userip";
+		case BAN_TARGET_HOST:
+			return "host";
+		case BAN_TARGET_USERHOST:
+			return "userhost";
+		case BAN_TARGET_ACCOUNT:
+			return "account";
+		case BAN_TARGET_CERTFP:
+			return "certfp";
+		default:
+			return "???";
+	}
+}
+
+ConfigFile *config_load(char *filename, char *displayname)
+{
+	struct stat sb;
+	int			fd;
+	int			ret;
+	char		*buf = NULL;
+	ConfigFile	*cfptr;
+
+	if (!displayname)
+		displayname = filename;
+
+#ifndef _WIN32
+	fd = open(filename, O_RDONLY);
+#else
+	fd = open(filename, O_RDONLY|O_BINARY);
+#endif
+	if (fd == -1)
+	{
+		config_error("Couldn't open \"%s\": %s\n", filename, strerror(errno));
+		return NULL;
+	}
+	if (fstat(fd, &sb) == -1)
+	{
+		config_error("Couldn't fstat \"%s\": %s\n", filename, strerror(errno));
+		close(fd);
+		return NULL;
+	}
+	if (!sb.st_size)
+	{
+		/* Workaround for empty files */
+		cfptr = config_parse(filename, " ");
+		close(fd);
+		return cfptr;
+	}
+	buf = safe_alloc(sb.st_size+1);
+	if (buf == NULL)
+	{
+		config_error("Out of memory trying to load \"%s\"\n", filename);
+		close(fd);
+		return NULL;
+	}
+	ret = read(fd, buf, sb.st_size);
+	if (ret != sb.st_size)
+	{
+		config_error("Error reading \"%s\": %s\n", filename,
+			ret == -1 ? strerror(errno) : strerror(EFAULT));
+		safe_free(buf);
+		close(fd);
+		return NULL;
+	}
+	/* Just me or could this cause memory corrupted when ret <0 ? */
+	buf[ret] = '\0';
+	close(fd);
+	add_entropy_configfile(&sb, buf);
+	cfptr = config_parse(displayname, buf);
+	safe_free(buf);
+	return cfptr;
+}
+
+void config_free(ConfigFile *cfptr)
+{
+	ConfigFile	*nptr;
+
+	for(;cfptr;cfptr=nptr)
+	{
+		nptr = cfptr->cf_next;
+		if (cfptr->cf_entries)
+			config_entry_free_all(cfptr->cf_entries);
+		safe_free(cfptr->cf_filename);
+		safe_free(cfptr);
+	}
+}
+
+/** Remove quotes so that 'hello \"all\" \\ lala' becomes 'hello "all" \ lala' */
+void unreal_del_quotes(char *i)
+{
+	char *o;
+
+	for (o = i; *i; i++)
+	{
+		if (*i == '\\')
+		{
+			if ((i[1] == '\\') || (i[1] == '"'))
+			{
+				i++; /* skip original \ */
+				if (*i == '\0')
+					break;
+			}
+		}
+		*o++ = *i;
+	}
+	*o = '\0';
+}
+
+/** Add quotes to a line, eg some"thing becomes some\"thing - extended version */
+int unreal_add_quotes_r(char *i, char *o, size_t len)
+{
+	if (len == 0)
+		return 0;
+	
+	len--; /* reserve room for nul byte */
+
+	if (len == 0)
+	{
+		*o = '\0';
+		return 0;
+	}
+	
+	for (; *i; i++)
+	{
+		if ((*i == '"') || (*i == '\\')) /* only " and \ need to be quoted */
+		{
+			if (len < 2)
+				break;
+			*o++ = '\\';
+			*o++ = *i;
+			len -= 2;
+		} else
+		{
+			if (len == 0)
+				break;
+			*o++ = *i;
+			len--;
+		}
+	}
+	*o = '\0';
+	
+	return 1;
+}	
+
+/** Add quotes to a line, eg some"thing becomes some\"thing */
+char *unreal_add_quotes(char *str)
+{
+	static char qbuf[2048];
+	
+	*qbuf = '\0';
+	unreal_add_quotes_r(str, qbuf, sizeof(qbuf));
+	return qbuf;
+}
+
+ConfigFile *config_parse(char *filename, char *confdata){
+	return config_parse_with_offset(filename, confdata, 0);
+}
+
+/* This is the internal parser, made by Chris Behrens & Fred Jacobs <2005.
+ * Enhanced (or mutilated) by Bram Matthys over the years (2015-2019).
+ */
+ConfigFile *config_parse_with_offset(char *filename, char *confdata, unsigned int line_offset)
+{
+	char		*ptr;
+	char		*start;
+	int		linenumber = 1+line_offset;
+	int errors = 0;
+	int n;
+	ConfigEntry	*curce;
+	ConfigEntry	**lastce;
+	ConfigEntry	*cursection;
+	ConfigFile	*curcf;
+	int preprocessor_level = 0;
+	ConditionalConfig *cc, *cc_list = NULL;
+
+	curcf = safe_alloc(sizeof(ConfigFile));
+	safe_strdup(curcf->cf_filename, filename);
+	lastce = &(curcf->cf_entries);
+	curce = NULL;
+	cursection = NULL;
+	/* Replace \r's with spaces .. ugly ugly -Stskeeps */
+	for (ptr=confdata; *ptr; ptr++)
+		if (*ptr == '\r')
+			*ptr = ' ';
+
+	for(ptr=confdata;*ptr;ptr++)
+	{
+		switch(*ptr)
+		{
+			case ';':
+				if (!curce)
+				{
+					config_status("%s:%i Ignoring extra semicolon\n",
+						filename, linenumber);
+					break;
+				}
+				*lastce = curce;
+				lastce = &(curce->ce_next);
+				curce->ce_fileposend = (ptr - confdata);
+				curce = NULL;
+				break;
+			case '{':
+				if (!curce)
+				{
+					config_error("%s:%i: New section start detected on line %d but the section has no name. "
+					             "Sections should start with a name like 'oper {' or 'set {'.",
+							filename, linenumber, linenumber);
+					errors++;
+					continue;
+				}
+				else if (curce->ce_entries)
+				{
+					config_error("%s:%i: New section start but previous section did not end properly. "
+					             "Check line %d and the line(s) before, you are likely missing a '};' there.\n",
+							filename, linenumber, linenumber);
+					errors++;
+					continue;
+				}
+				curce->ce_sectlinenum = linenumber;
+				lastce = &(curce->ce_entries);
+				cursection = curce;
+				curce = NULL;
+				break;
+			case '}':
+				if (curce)
+				{
+					config_error("%s:%i: Missing semicolon (';') before close brace. Check line %d and the line(s) before.\n",
+						filename, linenumber, linenumber);
+					config_entry_free_all(curce);
+					config_free(curcf);
+					errors++;
+					return NULL;
+				}
+				else if (!cursection)
+				{
+					config_error("%s:%i: You have a close brace ('};') too many. "
+					              "Check line %d AND the lines above it from the previous block.\n",
+						filename, linenumber, linenumber);
+					errors++;
+					continue;
+				}
+				curce = cursection;
+				cursection->ce_fileposend = (ptr - confdata);
+				cursection = cursection->ce_prevlevel;
+				if (!cursection)
+					lastce = &(curcf->cf_entries);
+				else
+					lastce = &(cursection->ce_entries);
+				for(;*lastce;lastce = &((*lastce)->ce_next))
+					continue;
+				if (*(ptr+1) != ';')
+				{
+					/* Simulate closing ; so you can get away with } instead of ugly }; */
+					*lastce = curce;
+					lastce = &(curce->ce_next);
+					curce->ce_fileposend = (ptr - confdata);
+					curce = NULL;
+				}
+				break;
+			case '#':
+				ptr++;
+				while(*ptr && (*ptr != '\n'))
+					 ptr++;
+				if (!*ptr)
+					break;
+				ptr--;
+				continue;
+			case '/':
+				if (*(ptr+1) == '/')
+				{
+					ptr += 2;
+					while(*ptr && (*ptr != '\n'))
+						ptr++;
+					if (!*ptr)
+						break;
+					ptr--; /* grab the \n on next loop thru */
+					continue;
+				}
+				else if (*(ptr+1) == '*')
+				{
+					int commentstart = linenumber;
+
+					for(ptr+=2;*ptr;ptr++)
+					{
+						if (*ptr == '\n')
+						{
+							linenumber++;
+						} else
+						if ((*ptr == '*') && (*(ptr+1) == '/'))
+						{
+							ptr++;
+							break;
+						}
+					}
+					if (!*ptr)
+					{
+						config_error("%s:%i Comment on line %d does not end\n",
+							filename, commentstart, commentstart);
+						errors++;
+						config_entry_free_all(curce);
+						config_free(curcf);
+						return NULL;
+					}
+				}
+				break;
+			case '\"':
+				if (curce && curce->ce_varlinenum != linenumber && cursection)
+				{
+					config_error("%s:%i: Missing semicolon (';') at end of line. "
+					             "Line %d must end with a ; character\n",
+						filename, curce->ce_varlinenum, curce->ce_varlinenum);
+					errors++;
+
+					*lastce = curce;
+					lastce = &(curce->ce_next);
+					curce->ce_fileposend = (ptr - confdata);
+					curce = NULL;
+				}
+
+				start = ++ptr;
+				for(;*ptr;ptr++)
+				{
+					if (*ptr == '\\')
+					{
+						if ((ptr[1] == '\\') || (ptr[1] == '"'))
+						{
+							/* \\ or \" in config file (escaped) */
+							ptr++; /* skip */
+							continue;
+						}
+					}
+					else if ((*ptr == '\"') || (*ptr == '\n'))
+						break;
+				}
+				if (!*ptr || (*ptr == '\n'))
+				{
+					config_error("%s:%i: Unterminated quote found\n",
+							filename, linenumber);
+					errors++;
+					config_entry_free_all(curce);
+					config_free(curcf);
+					return NULL;
+				}
+				if (curce)
+				{
+					if (curce->ce_vardata)
+					{
+						config_error("%s:%i: Extra data detected. Perhaps missing a ';' or one too many?\n",
+							filename, linenumber);
+						errors++;
+					}
+					else
+					{
+						safe_strldup(curce->ce_vardata, start, ptr-start+1);
+						preprocessor_replace_defines(&curce->ce_vardata, curce);
+						unreal_del_quotes(curce->ce_vardata);
+					}
+				}
+				else
+				{
+					curce = safe_alloc(sizeof(ConfigEntry));
+					curce->ce_varlinenum = linenumber;
+					curce->ce_fileptr = curcf;
+					curce->ce_prevlevel = cursection;
+					curce->ce_fileposstart = (start - confdata);
+					safe_strldup(curce->ce_varname, start, ptr-start+1);
+					preprocessor_replace_defines(&curce->ce_varname, curce);
+					unreal_del_quotes(curce->ce_varname);
+					preprocessor_cc_duplicate_list(cc_list, &curce->ce_cond);
+				}
+				break;
+			case '\n':
+				linenumber++;
+				/* fall through */
+			case '\t':
+			case ' ':
+			case '=':
+			case '\r':
+				break;
+			case '@':
+				/* Preprocessor item, such as @if, @define, etc. */
+				start = ptr;
+				for (;*ptr; ptr++)
+				{
+					if (*ptr == '\n')
+						break;
+				}
+				cc = NULL;
+				n = parse_preprocessor_item(start, ptr, filename, linenumber, &cc);
+				linenumber++;
+				if (n == PREPROCESSOR_IF)
+				{
+					preprocessor_level++;
+					cc->priority = preprocessor_level;
+					AddListItem(cc, cc_list);
+				} else
+				if (n == PREPROCESSOR_ENDIF)
+				{
+					if (preprocessor_level == 0)
+					{
+						config_error("%s:%i: @endif unexpected. There was no preciding unclosed @if.",
+							filename, linenumber);
+						errors++;
+					}
+					preprocessor_cc_free_level(&cc_list, preprocessor_level);
+					preprocessor_level--;
+				} else
+				if (n == PREPROCESSOR_ERROR)
+				{
+					errors++;
+					goto breakout;
+				}
+
+				if (!*ptr)
+					goto breakout; /* special case, since we don't want the for loop to ptr++ */
+
+				break;
+			default:
+				if ((*ptr == '*') && (*(ptr+1) == '/'))
+				{
+					config_status("%s:%i: Ignoring extra end comment\n",
+						filename, linenumber);
+					config_status("WARNING: Starting with UnrealIRCd 4.2.1 a /*-style comment stops as soon as the first */ is encountered. "
+					              "See https://www.unrealircd.org/docs/FAQ#Nesting_comments for more information.");
+					ptr++;
+					break;
+				}
+				start = ptr;
+				for(;*ptr;ptr++)
+				{
+					if ((*ptr == ' ') || (*ptr == '=') || (*ptr == '\t') || (*ptr == '\n') || (*ptr == ';'))
+						break;
+				}
+				if (!*ptr)
+				{
+					if (curce)
+						config_error("%s: End of file reached but directive or block at line %i did not end properly. "
+									 "Perhaps a missing ; (semicolon) somewhere?\n",
+							filename, curce->ce_varlinenum);
+					else if (cursection)
+						config_error("%s: End of file reached but the section which starts at line %i did never end properly. "
+									 "Perhaps a missing }; ?\n",
+								filename, cursection->ce_sectlinenum);
+					else
+						config_error("%s: Unexpected end of file. Some line or block did not end properly. "
+						             "Look for any missing } and };\n", filename);
+					errors++;
+					config_entry_free_all(curce);
+					config_free(curcf);
+					return NULL;
+				}
+				if (curce)
+				{
+					if (curce->ce_vardata)
+					{
+						config_error("%s:%i: Extra data detected. Check for a missing ; character at or around line %d\n",
+							filename, linenumber, linenumber-1);
+						errors++;
+					}
+					else
+					{
+						safe_strldup(curce->ce_vardata, start, ptr-start+1);
+						preprocessor_replace_defines(&curce->ce_vardata, curce);
+					}
+				}
+				else
+				{
+					curce = safe_alloc(sizeof(ConfigEntry));
+					memset(curce, 0, sizeof(ConfigEntry));
+					curce->ce_varlinenum = linenumber;
+					curce->ce_fileptr = curcf;
+					curce->ce_prevlevel = cursection;
+					curce->ce_fileposstart = (start - confdata);
+					safe_strldup(curce->ce_varname, start, ptr-start+1);
+					preprocessor_replace_defines(&curce->ce_varname, curce);
+					if (curce->ce_cond)
+						abort(); // hmm this can be reached? FIXME!
+					preprocessor_cc_duplicate_list(cc_list, &curce->ce_cond);
+				}
+				if ((*ptr == ';') || (*ptr == '\n'))
+					ptr--;
+				break;
+		} /* switch */
+		if (!*ptr) /* This IS possible. -- Syzop */
+			break;
+	} /* for */
+breakout:
+	if (curce)
+	{
+		config_error("%s: End of file reached but directive or block at line %i did not end properly. "
+		             "Perhaps a missing ; (semicolon) somewhere?\n",
+			filename, curce->ce_varlinenum);
+		errors++;
+		config_entry_free_all(curce);
+	}
+	else if (cursection)
+	{
+		config_error("%s: End of file reached but the section which starts at line %i did never end properly. "
+		             "Perhaps a missing }; ?\n",
+				filename, cursection->ce_sectlinenum);
+		errors++;
+	}
+
+	if (errors)
+	{
+		config_free(curcf);
+		return NULL;
+	}
+	return curcf;
+}
+
+/** Free a ConfigEntry struct, all it's children, and all it's next entries.
+ * Consider calling config_entry_free() instead of this one.. or at least
+ * check which one of the two you actually need ;)
+ */
+void config_entry_free_all(ConfigEntry *ce)
+{
+	ConfigEntry	*nptr;
+
+	for(;ce;ce=nptr)
+	{
+		nptr = ce->ce_next;
+		if (ce->ce_entries)
+			config_entry_free_all(ce->ce_entries);
+		safe_free(ce->ce_varname);
+		safe_free(ce->ce_vardata);
+		if (ce->ce_cond)
+			preprocessor_cc_free_list(ce->ce_cond);
+		safe_free(ce);
+	}
+}
+
+/** Free a specific ConfigEntry struct (and it's children).
+ * Caller must ensure that the entry is not in the linked list anymore.
+ */
+void config_entry_free(ConfigEntry *ce)
+{
+	if (ce->ce_entries)
+		config_entry_free_all(ce->ce_entries);
+	safe_free(ce->ce_varname);
+	safe_free(ce->ce_vardata);
+	if (ce->ce_cond)
+		preprocessor_cc_free_list(ce->ce_cond);
+	safe_free(ce);
+}
+
+ConfigEntry *config_find_entry(ConfigEntry *ce, char *name)
+{
+	ConfigEntry *cep;
+
+	for (cep = ce; cep; cep = cep->ce_next)
+		if (cep->ce_varname && !strcmp(cep->ce_varname, name))
+			break;
+	return cep;
+}
+
+void config_error(FORMAT_STRING(const char *format), ...)
+{
+	va_list		ap;
+	char		buffer[1024];
+	char		*ptr;
+
+	va_start(ap, format);
+	vsnprintf(buffer, sizeof(buffer), format, ap);
+	va_end(ap);
+	if ((ptr = strchr(buffer, '\n')) != NULL)
+		*ptr = '\0';
+#ifdef _WIN32
+	if (!loop.ircd_booted)
+		win_log("[error] %s", buffer);
+#endif
+	ircd_log(LOG_ERROR, "config error: %s", buffer);
+	sendto_realops("error: %s", buffer);
+	if (remote_rehash_client)
+		sendnotice(remote_rehash_client, "error: %s", buffer);
+	/* We cannot live with this */
+	config_error_flag = 1;
+}
+
+void config_error_missing(const char *filename, int line, const char *entry)
+{
+	config_error("%s:%d: %s is missing", filename, line, entry);
+}
+
+void config_error_unknown(const char *filename, int line, const char *block,
+	const char *entry)
+{
+	config_error("%s:%d: Unknown directive '%s::%s'", filename, line, block, entry);
+}
+
+void config_error_unknownflag(const char *filename, int line, const char *block,
+	const char *entry)
+{
+	config_error("%s:%d: Unknown %s flag '%s'", filename, line, block, entry);
+}
+
+void config_error_unknownopt(const char *filename, int line, const char *block,
+	const char *entry)
+{
+	config_error("%s:%d: Unknown %s option '%s'", filename, line, block, entry);
+}
+
+void config_error_noname(const char *filename, int line, const char *block)
+{
+	config_error("%s:%d: %s block has no name", filename, line, block);
+}
+
+void config_error_blank(const char *filename, int line, const char *block)
+{
+	config_error("%s:%d: Blank %s entry", filename, line, block);
+}
+
+void config_error_empty(const char *filename, int line, const char *block,
+	const char *entry)
+{
+	config_error("%s:%d: %s::%s specified without a value",
+		filename, line, block, entry);
+}
+
+void config_status(FORMAT_STRING(const char *format), ...)
+{
+	va_list		ap;
+	char		buffer[1024];
+	char		*ptr;
+
+	va_start(ap, format);
+	vsnprintf(buffer, 1023, format, ap);
+	va_end(ap);
+	if ((ptr = strchr(buffer, '\n')) != NULL)
+		*ptr = '\0';
+#ifdef _WIN32
+	if (!loop.ircd_booted)
+		win_log("* %s", buffer);
+#endif
+	ircd_log(LOG_ERROR, "%s", buffer);
+	sendto_realops("%s", buffer);
+	if (remote_rehash_client)
+		sendnotice(remote_rehash_client, "%s", buffer);
+}
+
+void config_warn(FORMAT_STRING(const char *format), ...)
+{
+	va_list		ap;
+	char		buffer[1024];
+	char		*ptr;
+
+	va_start(ap, format);
+	vsnprintf(buffer, 1023, format, ap);
+	va_end(ap);
+	if ((ptr = strchr(buffer, '\n')) != NULL)
+		*ptr = '\0';
+#ifdef _WIN32
+	if (!loop.ircd_booted)
+		win_log("[warning] %s", buffer);
+#endif
+	ircd_log(LOG_ERROR, "[warning] %s", buffer);
+	sendto_realops("[warning] %s", buffer);
+	if (remote_rehash_client)
+		sendnotice(remote_rehash_client, "[warning] %s", buffer);
+}
+
+void config_warn_duplicate(const char *filename, int line, const char *entry)
+{
+	config_warn("%s:%d: Duplicate %s directive", filename, line, entry);
+}
+
+/* returns 1 if the test fails */
+int config_test_openfile(ConfigEntry *cep, int flags, mode_t mode, const char *entry, int fatal, int allow_url)
+{
+	int fd;
+
+	if(!cep->ce_vardata)
+	{
+		if(fatal)
+			config_error("%s:%i: %s: <no file specified>: no file specified",
+				     cep->ce_fileptr->cf_filename,
+				     cep->ce_varlinenum,
+				     entry);
+		else
+
+			config_warn("%s:%i: %s: <no file specified>: no file specified",
+				    cep->ce_fileptr->cf_filename,
+				    cep->ce_varlinenum,
+				    entry);
+		return 1;
+	}
+
+	/* There's not much checking that can be done for asynchronously downloaded files */
+#ifdef USE_LIBCURL
+	if(url_is_valid(cep->ce_vardata))
+	{
+		if(allow_url)
+			return 0;
+
+		/* but we can check if a URL is used wrongly :-) */
+		config_warn("%s:%i: %s: %s: URL used where not allowed",
+			    cep->ce_fileptr->cf_filename,
+			    cep->ce_varlinenum,
+			    entry, cep->ce_vardata);
+		if(fatal)
+			return 1;
+		else
+			return 0;
+	}
+#else
+	if (strstr(cep->ce_vardata, "://"))
+	{
+		config_error("%s:%d: %s: UnrealIRCd was not compiled with remote includes support "
+		             "so you cannot use URLs here.",
+		             cep->ce_fileptr->cf_filename,
+		             cep->ce_varlinenum,
+		             entry);
+		return 1;
+	}
+#endif /* USE_LIBCURL */
+
+	/*
+	 * Make sure that files are created with the correct mode. This is
+	 * because we don't feel like unlink()ing them...which would require
+	 * stat()ing them to make sure that we don't delete existing ones
+	 * and that we deal with all of the bugs that come with complexity.
+	 * The only files we may be creating are the tunefile and pidfile so far.
+	 */
+	if(flags & O_CREAT)
+		fd = open(cep->ce_vardata, flags, mode);
+	else
+		fd = open(cep->ce_vardata, flags);
+	if(fd == -1)
+	{
+		if(fatal)
+			config_error("%s:%i: %s: %s: %s",
+				     cep->ce_fileptr->cf_filename,
+				     cep->ce_varlinenum,
+				     entry,
+				     cep->ce_vardata,
+				     strerror(errno));
+		else
+			config_warn("%s:%i: %s: %s: %s",
+				     cep->ce_fileptr->cf_filename,
+				     cep->ce_varlinenum,
+				     entry,
+				     cep->ce_vardata,
+				     strerror(errno));
+		return 1;
+	}
+	close(fd);
+	return 0;
+}
+
+void config_progress(FORMAT_STRING(const char *format), ...)
+{
+	va_list		ap;
+	char		buffer[1024];
+	char		*ptr;
+
+	va_start(ap, format);
+	vsnprintf(buffer, 1023, format, ap);
+	va_end(ap);
+	if ((ptr = strchr(buffer, '\n')) != NULL)
+		*ptr = '\0';
+#ifdef _WIN32
+	if (!loop.ircd_booted)
+		win_log("* %s", buffer);
+#endif
+	sendto_realops("%s", buffer);
+}
+
+int config_is_blankorempty(ConfigEntry *cep, const char *block)
+{
+	if (!cep->ce_vardata)
+	{
+		config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum, block,
+			cep->ce_varname);
+		return 1;
+	}
+	return 0;
+}
+
+ConfigCommand *config_binary_search(char *cmd) {
+	int start = 0;
+	int stop = ARRAY_SIZEOF(_ConfigCommands)-1;
+	int mid;
+	while (start <= stop) {
+		mid = (start+stop)/2;
+		if (smycmp(cmd,_ConfigCommands[mid].name) < 0) {
+			stop = mid-1;
+		}
+		else if (strcmp(cmd,_ConfigCommands[mid].name) == 0) {
+			return &_ConfigCommands[mid];
+		}
+		else
+			start = mid+1;
+	}
+	return NULL;
+}
+
+void	free_iConf(Configuration *i)
+{
+	safe_free(i->dns_bindip);
+	safe_free(i->link_bindip);
+	safe_free(i->kline_address);
+	safe_free(i->gline_address);
+	safe_free(i->oper_snomask);
+	safe_free(i->auto_join_chans);
+	safe_free(i->oper_auto_join_chans);
+	safe_free(i->allow_user_stats);
+	// allow_user_stats_ext is freed elsewhere
+	safe_free(i->egd_path);
+	safe_free(i->static_quit);
+	safe_free(i->static_part);
+	free_tls_options(i->tls_options);
+	i->tls_options = NULL;
+	safe_free(i->tls_options);
+	safe_free(i->plaintext_policy_user_message);
+	safe_free(i->plaintext_policy_oper_message);
+	safe_free(i->outdated_tls_policy_user_message);
+	safe_free(i->outdated_tls_policy_oper_message);
+	safe_free(i->restrict_usermodes);
+	safe_free(i->restrict_channelmodes);
+	safe_free(i->restrict_extendedbans);
+	safe_free(i->channel_command_prefix);
+	safe_free(i->spamfilter_ban_reason);
+	safe_free(i->spamfilter_virus_help_channel);
+	// spamexcept is freed elsewhere
+	safe_free(i->spamexcept_line);
+	safe_free(i->reject_message_too_many_connections);
+	safe_free(i->reject_message_server_full);
+	safe_free(i->reject_message_unauthorized);
+	safe_free(i->reject_message_kline);
+	safe_free(i->reject_message_gline);
+	// network struct:
+	safe_free(i->network.x_ircnetwork);
+	safe_free(i->network.x_ircnet005);
+	safe_free(i->network.x_defserv);
+	safe_free(i->network.x_services_name);
+	safe_free(i->network.x_hidden_host);
+	safe_free(i->network.x_prefix_quit);
+	safe_free(i->network.x_helpchan);
+	safe_free(i->network.x_stats_server);
+	safe_free(i->network.x_sasl_server);
+}
+
+int	config_test();
+
+void config_setdefaultsettings(Configuration *i)
+{
+	char tmp[512];
+
+	i->unknown_flood_amount = 4;
+	i->unknown_flood_bantime = 600;
+	safe_strdup(i->oper_snomask, SNO_DEFOPER);
+	i->ident_read_timeout = 7;
+	i->ident_connect_timeout = 3;
+	i->nick_count = 3; i->nick_period = 60; /* NICK flood protection: max 3 per 60s */
+	i->away_count = 4; i->away_period = 120; /* AWAY flood protection: max 4 per 120s */
+	i->invite_count = 4; i->invite_period = 60; /* INVITE flood protection: max 4 per 60s */
+	i->knock_count = 4; i->knock_period = 120; /* KNOCK protection: max 4 per 120s */
+	i->throttle_count = 3; i->throttle_period = 60; /* throttle protection: max 3 per 60s */
+	i->ban_version_tkl_time = 86400; /* 1d */
+	i->spamfilter_ban_time = 86400; /* 1d */
+	safe_strdup(i->spamfilter_ban_reason, "Spam/advertising");
+	safe_strdup(i->spamfilter_virus_help_channel, "#help");
+	i->spamfilter_detectslow_warn = 250;
+	i->spamfilter_detectslow_fatal = 500;
+	i->spamfilter_stop_on_first_match = 1;
+	i->maxchannelsperuser = 10;
+	i->maxdccallow = 10;
+	safe_strdup(i->channel_command_prefix, "`!.");
+	conf_channelmodes("+nt", &i->modes_on_join, 0);
+	i->check_target_nick_bans = 1;
+	i->maxbans = 60;
+	i->maxbanlength = 2048;
+	i->level_on_join = CHFL_CHANOP;
+	i->watch_away_notification = 1;
+	i->uhnames = 1;
+	i->ping_cookie = 1;
+	i->ping_warning = 15; /* default ping warning notices 15 seconds */
+	i->default_ipv6_clone_mask = 64;
+	nicklengths.min = i->min_nick_length = 0; /* 0 means no minimum required */
+	nicklengths.max = i->nick_length = NICKLEN;
+	i->topic_length = 360;
+	i->away_length = 307;
+	i->kick_length = 307;
+	i->quit_length = 307;
+	safe_strdup(i->link_bindip, "*");
+	safe_strdup(i->network.x_hidden_host, "Clk");
+	if (!ipv6_capable())
+		DISABLE_IPV6 = 1;
+	safe_strdup(i->network.x_prefix_quit, "Quit");
+	i->max_unknown_connections_per_ip = 3;
+	i->handshake_timeout = 30;
+	i->sasl_timeout = 15;
+	i->handshake_delay = -1;
+	i->broadcast_channel_messages = BROADCAST_CHANNEL_MESSAGES_AUTO;
+
+	/* SSL/TLS options */
+	i->tls_options = safe_alloc(sizeof(TLSOptions));
+	snprintf(tmp, sizeof(tmp), "%s/tls/server.cert.pem", CONFDIR);
+	safe_strdup(i->tls_options->certificate_file, tmp);
+	snprintf(tmp, sizeof(tmp), "%s/tls/server.key.pem", CONFDIR);
+	safe_strdup(i->tls_options->key_file, tmp);
+	snprintf(tmp, sizeof(tmp), "%s/tls/curl-ca-bundle.crt", CONFDIR);
+	safe_strdup(i->tls_options->trusted_ca_file, tmp);
+	safe_strdup(i->tls_options->ciphers, UNREALIRCD_DEFAULT_CIPHERS);
+	safe_strdup(i->tls_options->ciphersuites, UNREALIRCD_DEFAULT_CIPHERSUITES);
+	i->tls_options->protocols = TLS_PROTOCOL_ALL;
+#ifdef HAS_SSL_CTX_SET1_CURVES_LIST
+	safe_strdup(i->tls_options->ecdh_curves, UNREALIRCD_DEFAULT_ECDH_CURVES);
+#endif
+	safe_strdup(i->tls_options->outdated_protocols, "TLSv1,TLSv1.1");
+	/* the following may look strange but "AES*" matches all
+	 * AES ciphersuites that do not have Forward Secrecy.
+	 * Any decent client using AES will use ECDHE-xx-AES.
+	 */
+	safe_strdup(i->tls_options->outdated_ciphers, "AES*,RC4*,DES*");
+
+	i->plaintext_policy_user = POLICY_ALLOW;
+	i->plaintext_policy_oper = POLICY_DENY;
+	i->plaintext_policy_server = POLICY_DENY;
+
+	i->outdated_tls_policy_user = POLICY_WARN;
+	i->outdated_tls_policy_oper = POLICY_DENY;
+	i->outdated_tls_policy_server = POLICY_DENY;
+
+	safe_strdup(i->reject_message_too_many_connections, "Too many connections from your IP");
+	safe_strdup(i->reject_message_server_full, "This server is full");
+	safe_strdup(i->reject_message_unauthorized, "You are not authorized to connect to this server");
+	safe_strdup(i->reject_message_kline, "You are not welcome on this server. $bantype: $banreason. Email $klineaddr for more information.");
+	safe_strdup(i->reject_message_gline, "You are not welcome on this network. $bantype: $banreason. Email $glineaddr for more information.");
+
+	i->topic_setter = SETTER_NICK;
+	i->ban_setter = SETTER_NICK;
+	i->ban_setter_sync = 1;
+
+	i->max_concurrent_conversations_users = 10;
+	i->max_concurrent_conversations_new_user_every = 15;
+
+	i->allowed_channelchars = ALLOWED_CHANNELCHARS_UTF8;
+
+	i->automatic_ban_target = BAN_TARGET_IP;
+	i->manual_ban_target = BAN_TARGET_HOST;
+}
+
+static void make_default_logblock(void)
+{
+	ConfigItem_log *ca = safe_alloc(sizeof(ConfigItem_log));
+
+	config_status("No log { } block found -- using default: errors will be logged to 'ircd.log'");
+
+	safe_strdup(ca->file, "ircd.log");
+	convert_to_absolute_path(&ca->file, LOGDIR);
+	ca->flags |= LOG_ERROR;
+	ca->logfd = -1;
+	AddListItem(ca, conf_log);
+}
+
+/** Similar to config_setdefaultsettings but this one is applied *AFTER*
+ * the entire configuration has been ran (sometimes this is the only way it can be done..).
+ * NOTE: iConf is thus already populated with (non-default) values. Only overwrite if necessary!
+ */
+void postconf_defaults(void)
+{
+	TKL *tk;
+	char *encoded;
+
+	if (!iConf.plaintext_policy_user_message)
+	{
+		/* The message depends on whether it's reject or warn.. */
+		if (iConf.plaintext_policy_user == POLICY_DENY)
+			safe_strdup(iConf.plaintext_policy_user_message, "Insecure connection. Please reconnect using SSL/TLS.");
+		else if (iConf.plaintext_policy_user == POLICY_WARN)
+			safe_strdup(iConf.plaintext_policy_user_message, "WARNING: Insecure connection. Please consider using SSL/TLS.");
+	}
+
+	if (!iConf.plaintext_policy_oper_message)
+	{
+		/* The message depends on whether it's reject or warn.. */
+		if (iConf.plaintext_policy_oper == POLICY_DENY)
+			safe_strdup(iConf.plaintext_policy_oper_message, "You need to use a secure connection (SSL/TLS) in order to /OPER.");
+		else if (iConf.plaintext_policy_oper == POLICY_WARN)
+			safe_strdup(iConf.plaintext_policy_oper_message, "WARNING: You /OPER'ed up from an insecure connection. Please consider using SSL/TLS.");
+	}
+
+	if (!iConf.outdated_tls_policy_user_message)
+	{
+		/* The message depends on whether it's reject or warn.. */
+		if (iConf.outdated_tls_policy_user == POLICY_DENY)
+			safe_strdup(iConf.outdated_tls_policy_user_message, "Your IRC client is using an outdated SSL/TLS protocol or ciphersuite ($protocol-$cipher). Please upgrade your IRC client.");
+		else if (iConf.outdated_tls_policy_user == POLICY_WARN)
+			safe_strdup(iConf.outdated_tls_policy_user_message, "WARNING: Your IRC client is using an outdated SSL/TLS protocol or ciphersuite ($protocol-$cipher). Please upgrade your IRC client.");
+	}
+
+	if (!iConf.outdated_tls_policy_oper_message)
+	{
+		/* The message depends on whether it's reject or warn.. */
+		if (iConf.outdated_tls_policy_oper == POLICY_DENY)
+			safe_strdup(iConf.outdated_tls_policy_oper_message, "Your IRC client is using an outdated SSL/TLS protocol or ciphersuite ($protocol-$cipher). Please upgrade your IRC client.");
+		else if (iConf.outdated_tls_policy_oper == POLICY_WARN)
+			safe_strdup(iConf.outdated_tls_policy_oper_message, "WARNING: Your IRC client is using an outdated SSL/TLS protocol or ciphersuite ($protocol-$cipher). Please upgrade your IRC client.");
+	}
+
+	/* We got a chicken-and-egg problem here.. antries added without reason or ban-time
+	 * field should use the config default (set::spamfilter::ban-reason/ban-time) but
+	 * this isn't (or might not) be known yet when parsing spamfilter entries..
+	 * so we do a VERY UGLY mass replace here.. unless someone else has a better idea.
+	 */
+
+	encoded = unreal_encodespace(SPAMFILTER_BAN_REASON);
+	if (!encoded)
+		abort(); /* hack to trace 'impossible' bug... */
+	// FIXME: remove this stuff with ~server~, why not just use -config-
+	//        which is more meaningful.
+	for (tk = tklines[tkl_hash('q')]; tk; tk = tk->next)
+	{
+		if (tk->type != TKL_NAME)
+			continue;
+		if (!tk->set_by)
+		{
+			if (me.name[0] != '\0')
+				safe_strdup(tk->set_by, me.name);
+			else
+				safe_strdup(tk->set_by, conf_me->name ? conf_me->name : "~server~");
+		}
+	}
+
+	for (tk = tklines[tkl_hash('f')]; tk; tk = tk->next)
+	{
+		if (tk->type != TKL_SPAMF)
+			continue; /* global entry or something else.. */
+		if (!strcmp(tk->ptr.spamfilter->tkl_reason, "<internally added by ircd>"))
+		{
+			safe_strdup(tk->ptr.spamfilter->tkl_reason, encoded);
+			tk->ptr.spamfilter->tkl_duration = SPAMFILTER_BAN_TIME;
+		}
+		/* This one is even more ugly, but our config crap is VERY confusing :[ */
+		if (!tk->set_by)
+		{
+			if (me.name[0] != '\0')
+				safe_strdup(tk->set_by, me.name);
+			else
+				safe_strdup(tk->set_by, conf_me->name ? conf_me->name : "~server~");
+		}
+	}
+
+	if (!conf_log)
+		make_default_logblock();
+}
+
+void postconf_fixes(void)
+{
+	/* If set::topic-setter is set to "nick-user-host" then the
+	 * maximum topic length becomes shorter.
+	 */
+	if ((iConf.topic_setter == SETTER_NICK_USER_HOST) &&
+	    (iConf.topic_length > 340))
+	{
+		config_warn("set::topic-length adjusted from %d to 340, which is the maximum because "
+		            "set::topic-setter is set to 'nick-user-host'.", iConf.topic_length);
+		iConf.topic_length = 340;
+	}
+}
+
+/* Needed for set::options::allow-part-if-shunned,
+ * we can't just make it CMD_SHUN and do a ALLOW_PART_IF_SHUNNED in
+ * cmd_part itself because that will also block internal calls (like sapart). -- Syzop
+ */
+static void do_weird_shun_stuff()
+{
+RealCommand *cmptr;
+
+	if ((cmptr = find_command_simple("PART")))
+	{
+		if (ALLOW_PART_IF_SHUNNED)
+			cmptr->flags |= CMD_SHUN;
+		else
+			cmptr->flags &= ~CMD_SHUN;
+	}
+}
+
+/** Various things that are done at the very end after the configuration file
+ * has been read and almost all values have been set. This is to deal with
+ * things like adding a default log { } block if there is none and that kind
+ * of things.
+ * This function is called by init_conf(), both on boot and on rehash.
+ */
+void postconf(void)
+{
+	postconf_defaults();
+	postconf_fixes();
+	do_weird_shun_stuff();
+	isupport_init(); /* for all the 005 values that changed.. */
+}
+
+int isanyserverlinked(void)
+{
+	return !list_empty(&server_list);
+}
+
+void applymeblock(void)
+{
+	if (!conf_me)
+		return; /* uh-huh? */
+
+	/* Info text may always change, just wouldn't show up on other servers, that's all.. */
+	strlcpy(me.info, conf_me->info, sizeof(me.info));
+
+	/* Name can only be set once (on boot) */
+	if (!*me.name)
+		strlcpy(me.name, conf_me->name, sizeof(me.name));
+	else if (strcmp(me.name, conf_me->name))
+	{
+		config_warn("You changed the servername (me::name). "
+		            "This change will NOT be effective unless you restart the IRC Server.");
+	}
+
+	if (!*me.id)
+		strlcpy(me.id, conf_me->sid, sizeof(me.id));
+}
+
+void upgrade_conf_to_34(void)
+{
+	config_error("******************************************************************");
+	config_error("This *seems* an UnrealIRCd 3.2.x configuration file.");
+
+#ifdef _WIN32
+	if (!IsService)
+		config_error("In next screen you will be prompted to automatically upgrade the configuration file(s).");
+	else
+	{
+		config_error("We offer a configuration file converter to convert 3.2.x conf's to 4.x, however this "
+		             "is not available when running as a service. If you want to use it, make UnrealIRCd "
+		             "run in GUI mode by running 'unreal uninstall'. Then start UnrealIRCd.exe and when "
+		             "it prompts you to convert the configuration click 'Yes'. Check if UnrealIRCd boots properly. "
+		             "Once everything is looking good you can run 'unreal install' to make UnrealIRCd run "
+		             "as a service again."); /* TODO: make this unnecessary :D */
+	}
+#else
+	config_error("To upgrade it to the new 4.x format, run: ./unrealircd upgrade-conf");
+#endif
+
+	config_error("******************************************************************");
+	/* TODO: win32 may require a different error */
+}
+
+/** Reset config tests (before running the config test) */
+void config_test_reset(void)
+{
+}
+
+/** Run config test and all post config tests. */
+int config_test_all(void)
+{
+	if ((config_test() < 0) || (callbacks_check() < 0) || (efunctions_check() < 0) ||
+	    reloadable_perm_module_unloaded() || !tls_tests())
+	{
+		return 0;
+	}
+
+	special_delayed_unloading();
+
+	return 1;
+}
+
+/** Process all loadmodule directives in all includes.
+ * This was previously done at the same time as 'include' was called but
+ * that was too early now that we have blacklist-module, so moved here.
+ * @retval 1 on success, 0 on any failed loadmodule directive.
+ */
+int config_loadmodules(void)
+{
+	ConfigFile *cfptr;
+	ConfigEntry *ce;
+	ConfigItem_blacklist_module *blm, *blm_next;
+
+	int fatal_ret = 0, ret;
+
+	for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
+	{
+		if (config_verbose > 1)
+			config_status("Testing %s", cfptr->cf_filename);
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+		{
+			if (!strcmp(ce->ce_varname, "loadmodule"))
+			{
+				if (ce->ce_cond)
+				{
+					config_error("%s:%d: Currently you cannot have a 'loadmodule' statement "
+						     "within an @if block, sorry.",
+						     ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+					return 0;
+				}
+				ret = _conf_loadmodule(cfptr, ce);
+				if (ret < fatal_ret)
+					fatal_ret = ret; /* lowest wins */
+			}
+		}
+	}
+
+	/* Let's free the blacklist-module list here as well */
+	for (blm = conf_blacklist_module; blm; blm = blm_next)
+	{
+		blm_next = blm->next;
+		safe_free(blm->name);
+		safe_free(blm);
+	}
+	conf_blacklist_module = NULL;
+	/* End of freeing code */
+
+	/* If any loadmodule returned a fatal (-1) error code then we return fail status (0) */
+	if (fatal_ret < 0)
+		return 0; /* FAIL */
+	return 1; /* SUCCESS */
+}
+
+int	init_conf(char *rootconf, int rehash)
+{
+	char *old_pid_file = NULL;
+
+	config_status("Loading IRCd configuration..");
+	if (conf)
+	{
+		config_error("%s:%i - Someone forgot to clean up", __FILE__, __LINE__);
+		return -1;
+	}
+	memset(&tempiConf, 0, sizeof(iConf));
+	memset(&settings, 0, sizeof(settings));
+	memset(&requiredstuff, 0, sizeof(requiredstuff));
+	memset(&nicklengths, 0, sizeof(nicklengths));
+	config_setdefaultsettings(&tempiConf);
+	clicap_pre_rehash();
+	free_config_defines();
+	/*
+	 * the rootconf must be listed in the conf_include for include
+	 * recursion prevention code and sanity checking code to be
+	 * made happy :-). Think of it as us implicitly making an
+	 * in-memory config file that looks like:
+	 *
+	 * include "unrealircd.conf";
+	 */
+	add_include(rootconf, "[thin air]", -1);
+	if ((load_conf(rootconf, rootconf) > 0) && config_loadmodules())
+	{
+		preprocessor_resolve_conditionals_all(PREPROCESSOR_PHASE_MODULE);
+		config_test_reset();
+		if (!config_test_all())
+		{
+			config_error("IRCd configuration failed to pass testing");
+#ifdef _WIN32
+			if (!rehash)
+				win_error();
+#endif
+			Unload_all_testing_modules();
+			unload_notloaded_includes();
+			config_free(conf);
+			conf = NULL;
+			free_iConf(&tempiConf);
+			return -1;
+		}
+		callbacks_switchover();
+		efunctions_switchover();
+		set_targmax_defaults();
+		if (rehash)
+		{
+			Hook *h;
+			safe_strdup(old_pid_file, conf_files->pid_file);
+			unrealdns_delasyncconnects();
+			config_rehash();
+			Unload_all_loaded_modules();
+
+			/* Notify permanent modules of the rehash */
+			for (h = Hooks[HOOKTYPE_REHASH]; h; h = h->next)
+		        {
+				if (!h->owner)
+					continue;
+				if (!(h->owner->options & MOD_OPT_PERM))
+					continue;
+				(*(h->func.intfunc))();
+			}
+			unload_loaded_includes();
+		}
+		load_includes();
+		Init_all_testing_modules();
+		if (config_run() < 0)
+		{
+			config_error("Bad case of config errors. Server will now die. This really shouldn't happen");
+#ifdef _WIN32
+			if (!rehash)
+				win_error();
+#endif
+			abort();
+		}
+		applymeblock();
+		if (old_pid_file && strcmp(old_pid_file, conf_files->pid_file))
+		{
+			sendto_ops("pidfile is being rewritten to %s, please delete %s",
+				   conf_files->pid_file,
+				   old_pid_file);
+			write_pidfile();
+		}
+		safe_free(old_pid_file);
+	}
+	else
+	{
+		config_error("IRCd configuration failed to load");
+		Unload_all_testing_modules();
+		unload_notloaded_includes();
+		config_free(conf);
+		conf = NULL;
+		free_iConf(&tempiConf);
+#ifdef _WIN32
+		if (!rehash)
+			win_error();
+#endif
+		return -1;
+	}
+	config_free(conf);
+	conf = NULL;
+	if (rehash)
+	{
+		module_loadall();
+		RunHook0(HOOKTYPE_REHASH_COMPLETE);
+	}
+	postconf();
+	config_status("Configuration loaded.");
+	clicap_post_rehash();
+	return 0;
+}
+
+/**
+ * Processes filename as part of the IRCd's configuration.
+ *
+ * One _must_ call add_include() or add_remote_include() before
+ * calling load_conf(). This way, include recursion may be detected
+ * and reported to the user as an error instead of causing the IRCd to
+ * hang in an infinite recursion, eat up memory, and eventually
+ * overflow its stack ;-). (reported by warg).
+ *
+ * This function will set INCLUDE_USED on the config_include list
+ * entry if the config file loaded without error.
+ *
+ * @param filename the file where the conf may be read from
+ * @param original_path the path or URL used to refer to this file.
+ *        (mostly to support remote includes' URIs for recursive include detection).
+ * @return 1 on success, a negative number on error
+ */
+int	load_conf(char *filename, const char *original_path)
+{
+	ConfigFile 	*cfptr, *cfptr2, **cfptr3;
+	ConfigEntry 	*ce;
+	ConfigItem_include *inc, *my_inc;
+	int ret;
+	int counter;
+
+	if (config_verbose > 0)
+		config_status("Loading config file %s ..", filename);
+
+	need_34_upgrade = 0;
+	need_operclass_permissions_upgrade = 0;
+
+	/*
+	 * Check if we're accidentally including a file a second
+	 * time. We should expect to find one entry in this list: the
+	 * entry for our current file.
+	 */
+	counter = 0;
+	my_inc = NULL;
+	for (inc = conf_include; inc; inc = inc->next)
+	{
+		/*
+		 * ignore files which were part of a _previous_
+		 * successful rehash.
+		 */
+		if (!(inc->flag.type & INCLUDE_NOTLOADED))
+			continue;
+
+		if (!counter)
+			my_inc = inc;
+
+		if (!strcmp(filename, inc->file))
+		{
+			counter ++;
+			continue;
+		}
+#ifdef _WIN32
+		if (!strcasecmp(filename, inc->file))
+		{
+			counter ++;
+			continue;
+		}
+#endif
+#ifdef USE_LIBCURL
+		if (inc->url && !strcmp(original_path, inc->url))
+		{
+			counter ++;
+			continue;
+		}
+#endif
+	}
+	if (counter < 1 || !my_inc)
+	{
+		/*
+		 * The following is simply for debugging/[sanity
+		 * checking]. To make sure that functions call
+		 * add_include() or add_remote_include() before
+		 * calling us.
+		 */
+		config_error("I don't have a record for %s being included."
+			     " Perhaps someone forgot to call add_include()?",
+			     filename);
+		abort();
+	}
+	if (counter > 1 || my_inc->flag.type & INCLUDE_USED)
+	{
+		config_error("%s:%d:include: Config file %s has been loaded before %d time."
+			     " You may include each file only once.",
+			     my_inc->included_from, my_inc->included_from_line,
+			     filename, counter - 1);
+		return -1;
+	}
+	/* end include recursion checking code */
+
+	if ((cfptr = config_load(filename, NULL)))
+	{
+		for (cfptr3 = &conf, cfptr2 = conf; cfptr2; cfptr2 = cfptr2->cf_next)
+			cfptr3 = &cfptr2->cf_next;
+		*cfptr3 = cfptr;
+
+		if (config_verbose > 1)
+			config_status("Loading module blacklist in %s", filename);
+
+		preprocessor_resolve_conditionals_ce(&cfptr->cf_entries, PREPROCESSOR_PHASE_INITIAL);
+
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+			if (!strcmp(ce->ce_varname, "blacklist-module"))
+				 _test_blacklist_module(cfptr, ce);
+
+		/* Load modules */
+		if (config_verbose > 1)
+			config_status("Loading modules in %s", filename);
+		if (need_34_upgrade)
+			upgrade_conf_to_34();
+
+		/* Load includes */
+		if (config_verbose > 1)
+			config_status("Searching through %s for include files..", filename);
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+			if (!strcmp(ce->ce_varname, "include"))
+			{
+				if (ce->ce_cond)
+				{
+					config_error("%s:%d: Currently you cannot have an 'include' statement "
+					             "within an @if block, sorry. However, you CAN do it the other "
+					             "way around, that is: put the @if within the included file itself.",
+					             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+					return -1;
+				}
+				ret = _conf_include(cfptr, ce);
+				if (need_34_upgrade)
+					upgrade_conf_to_34();
+				if (ret < 0)
+					return ret;
+			}
+		my_inc->flag.type |= INCLUDE_USED;
+		return 1;
+	}
+	else
+	{
+		config_error("Could not load config file %s", filename);
+#ifdef _WIN32
+		if (!strcmp(filename, "conf/unrealircd.conf"))
+		{
+			if (file_exists("unrealircd.conf"))
+			{
+				config_error("Note that 'unrealircd.conf' now belongs in the 'conf' subdirectory! (So move it to there)");
+			} else {
+				config_error("New to UnrealIRCd? Be sure to read https://www.unrealircd.org/docs/Installing_%%28Windows%%29");
+			}
+		}
+#endif
+		return -1;
+	}
+}
+
+/** Remove all TKL's that were added by the config file(s).
+ * This is done after config passed testing and right before
+ * adding the (new) entries.
+ */
+void remove_config_tkls(void)
+{
+	TKL *tk, *tk_next;
+	int index, index2;
+
+	/* IP hashed TKL list */
+	for (index = 0; index < TKLIPHASHLEN1; index++)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			for (tk = tklines_ip_hash[index][index2]; tk; tk = tk_next)
+			{
+				tk_next = tk->next;
+				if (tk->flags & TKL_FLAG_CONFIG)
+					tkl_del_line(tk);
+			}
+		}
+	}
+
+	/* Generic TKL list */
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tk = tklines[index]; tk; tk = tk_next)
+		{
+			tk_next = tk->next;
+			if (tk->flags & TKL_FLAG_CONFIG)
+				tkl_del_line(tk);
+		}
+	}
+}
+
+void	config_rehash()
+{
+	ConfigItem_oper			*oper_ptr;
+	ConfigItem_class 		*class_ptr;
+	ConfigItem_ulines 		*uline_ptr;
+	ConfigItem_allow 		*allow_ptr;
+	ConfigItem_except 		*except_ptr;
+	ConfigItem_ban 			*ban_ptr;
+	ConfigItem_link 		*link_ptr;
+	ConfigItem_listen	 	*listen_ptr;
+	ConfigItem_tld			*tld_ptr;
+	ConfigItem_vhost		*vhost_ptr;
+	ConfigItem_deny_link		*deny_link_ptr;
+	ConfigItem_deny_channel		*deny_channel_ptr;
+	ConfigItem_allow_channel	*allow_channel_ptr;
+	ConfigItem_admin		*admin_ptr;
+	ConfigItem_deny_version		*deny_version_ptr;
+	ConfigItem_log			*log_ptr;
+	ConfigItem_alias		*alias_ptr;
+	ConfigItem_help			*help_ptr;
+	ConfigItem_offchans		*of_ptr;
+	ConfigItem_sni			*sni;
+	OperStat 			*os_ptr;
+	ListStruct 	*next, *next2;
+	SpamExcept *spamex_ptr;
+
+	USE_BAN_VERSION = 0;
+
+	for (admin_ptr = conf_admin; admin_ptr; admin_ptr = (ConfigItem_admin *)next)
+	{
+		next = (ListStruct *)admin_ptr->next;
+		safe_free(admin_ptr->line);
+		DelListItem(admin_ptr, conf_admin);
+		safe_free(admin_ptr);
+	}
+
+	for (oper_ptr = conf_oper; oper_ptr; oper_ptr = (ConfigItem_oper *)next)
+	{
+		SWhois *s, *s_next;
+		next = (ListStruct *)oper_ptr->next;
+		safe_free(oper_ptr->name);
+		safe_free(oper_ptr->snomask);
+		safe_free(oper_ptr->operclass);
+		safe_free(oper_ptr->vhost);
+		Auth_FreeAuthConfig(oper_ptr->auth);
+		unreal_delete_masks(oper_ptr->mask);
+		DelListItem(oper_ptr, conf_oper);
+		for (s = oper_ptr->swhois; s; s = s_next)
+		{
+			s_next = s->next;
+			safe_free(s->line);
+			safe_free(s->setby);
+			safe_free(s);
+		}
+		safe_free(oper_ptr);
+	}
+
+	for (link_ptr = conf_link; link_ptr; link_ptr = (ConfigItem_link *) next)
+	{
+		next = (ListStruct *)link_ptr->next;
+		if (link_ptr->refcount == 0)
+		{
+			Debug((DEBUG_ERROR, "s_conf: deleting block %s (refcount 0)", link_ptr->servername));
+			delete_linkblock(link_ptr);
+		}
+		else
+		{
+			Debug((DEBUG_ERROR, "s_conf: marking block %s (refcount %d) as temporary",
+				link_ptr->servername, link_ptr->refcount));
+			link_ptr->flag.temporary = 1;
+		}
+	}
+	for (class_ptr = conf_class; class_ptr; class_ptr = (ConfigItem_class *) next)
+	{
+		next = (ListStruct *)class_ptr->next;
+		if (class_ptr->flag.permanent == 1)
+			continue;
+		class_ptr->flag.temporary = 1;
+		/* We'll wipe it out when it has no clients */
+		if (!class_ptr->clients && !class_ptr->xrefcount)
+		{
+			delete_classblock(class_ptr);
+		}
+	}
+	for (uline_ptr = conf_ulines; uline_ptr; uline_ptr = (ConfigItem_ulines *) next)
+	{
+		next = (ListStruct *)uline_ptr->next;
+		/* We'll wipe it out when it has no clients */
+		safe_free(uline_ptr->servername);
+		DelListItem(uline_ptr, conf_ulines);
+		safe_free(uline_ptr);
+	}
+	for (allow_ptr = conf_allow; allow_ptr; allow_ptr = (ConfigItem_allow *) next)
+	{
+		next = (ListStruct *)allow_ptr->next;
+		safe_free(allow_ptr->ip);
+		safe_free(allow_ptr->hostname);
+		Auth_FreeAuthConfig(allow_ptr->auth);
+		DelListItem(allow_ptr, conf_allow);
+		safe_free(allow_ptr);
+	}
+	for (except_ptr = conf_except; except_ptr; except_ptr = (ConfigItem_except *) next)
+	{
+		next = (ListStruct *)except_ptr->next;
+		safe_free(except_ptr->mask);
+		DelListItem(except_ptr, conf_except);
+		safe_free(except_ptr);
+	}
+	/* Free ban realname { }, ban server { } and ban version { } */
+	for (ban_ptr = conf_ban; ban_ptr; ban_ptr = (ConfigItem_ban *) next)
+	{
+		next = (ListStruct *)ban_ptr->next;
+		if (ban_ptr->flag.type2 == CONF_BAN_TYPE_CONF || ban_ptr->flag.type2 == CONF_BAN_TYPE_TEMPORARY)
+		{
+			safe_free(ban_ptr->mask);
+			safe_free(ban_ptr->reason);
+			DelListItem(ban_ptr, conf_ban);
+			safe_free(ban_ptr);
+		}
+	}
+	for (listen_ptr = conf_listen; listen_ptr; listen_ptr = listen_ptr->next)
+	{
+		listen_ptr->flag.temporary = 1;
+	}
+	for (tld_ptr = conf_tld; tld_ptr; tld_ptr = (ConfigItem_tld *) next)
+	{
+		next = (ListStruct *)tld_ptr->next;
+		safe_free(tld_ptr->motd_file);
+		safe_free(tld_ptr->rules_file);
+		safe_free(tld_ptr->smotd_file);
+		safe_free(tld_ptr->opermotd_file);
+		safe_free(tld_ptr->botmotd_file);
+
+		free_motd(&tld_ptr->motd);
+		free_motd(&tld_ptr->rules);
+		free_motd(&tld_ptr->smotd);
+		free_motd(&tld_ptr->opermotd);
+		free_motd(&tld_ptr->botmotd);
+
+		DelListItem(tld_ptr, conf_tld);
+		safe_free(tld_ptr);
+	}
+	for (vhost_ptr = conf_vhost; vhost_ptr; vhost_ptr = (ConfigItem_vhost *) next)
+	{
+		SWhois *s, *s_next;
+
+		next = (ListStruct *)vhost_ptr->next;
+
+		safe_free(vhost_ptr->login);
+		Auth_FreeAuthConfig(vhost_ptr->auth);
+		safe_free(vhost_ptr->virthost);
+		safe_free(vhost_ptr->virtuser);
+		unreal_delete_masks(vhost_ptr->mask);
+		for (s = vhost_ptr->swhois; s; s = s_next)
+		{
+			s_next = s->next;
+			safe_free(s->line);
+			safe_free(s->setby);
+			safe_free(s);
+		}
+		DelListItem(vhost_ptr, conf_vhost);
+		safe_free(vhost_ptr);
+	}
+
+	remove_config_tkls();
+
+	for (deny_link_ptr = conf_deny_link; deny_link_ptr; deny_link_ptr = (ConfigItem_deny_link *) next) {
+		next = (ListStruct *)deny_link_ptr->next;
+		safe_free(deny_link_ptr->prettyrule);
+		safe_free(deny_link_ptr->mask);
+		crule_free(&deny_link_ptr->rule);
+		DelListItem(deny_link_ptr, conf_deny_link);
+		safe_free(deny_link_ptr);
+	}
+	for (deny_version_ptr = conf_deny_version; deny_version_ptr; deny_version_ptr = (ConfigItem_deny_version *) next) {
+		next = (ListStruct *)deny_version_ptr->next;
+		safe_free(deny_version_ptr->mask);
+		safe_free(deny_version_ptr->version);
+		safe_free(deny_version_ptr->flags);
+		DelListItem(deny_version_ptr, conf_deny_version);
+		safe_free(deny_version_ptr);
+	}
+	for (deny_channel_ptr = conf_deny_channel; deny_channel_ptr; deny_channel_ptr = (ConfigItem_deny_channel *) next)
+	{
+		next = (ListStruct *)deny_channel_ptr->next;
+		safe_free(deny_channel_ptr->redirect);
+		safe_free(deny_channel_ptr->channel);
+		safe_free(deny_channel_ptr->reason);
+		safe_free(deny_channel_ptr->class);
+		DelListItem(deny_channel_ptr, conf_deny_channel);
+		unreal_delete_masks(deny_channel_ptr->mask);
+		safe_free(deny_channel_ptr);
+	}
+
+	for (allow_channel_ptr = conf_allow_channel; allow_channel_ptr; allow_channel_ptr = (ConfigItem_allow_channel *) next)
+	{
+		next = (ListStruct *)allow_channel_ptr->next;
+		safe_free(allow_channel_ptr->channel);
+		safe_free(allow_channel_ptr->class);
+		DelListItem(allow_channel_ptr, conf_allow_channel);
+		unreal_delete_masks(allow_channel_ptr->mask);
+		safe_free(allow_channel_ptr);
+	}
+
+	if (conf_drpass)
+	{
+		Auth_FreeAuthConfig(conf_drpass->restartauth);
+		conf_drpass->restartauth = NULL;
+		Auth_FreeAuthConfig(conf_drpass->dieauth);
+		conf_drpass->dieauth = NULL;
+		safe_free(conf_drpass);
+	}
+	for (log_ptr = conf_log; log_ptr; log_ptr = (ConfigItem_log *)next) {
+		next = (ListStruct *)log_ptr->next;
+		if (log_ptr->logfd != -1)
+			fd_close(log_ptr->logfd);
+		safe_free(log_ptr->file);
+		DelListItem(log_ptr, conf_log);
+		safe_free(log_ptr);
+	}
+	for (alias_ptr = conf_alias; alias_ptr; alias_ptr = (ConfigItem_alias *)next) {
+		RealCommand *cmptr = find_command(alias_ptr->alias, 0);
+		ConfigItem_alias_format *fmt;
+		next = (ListStruct *)alias_ptr->next;
+		safe_free(alias_ptr->nick);
+		if (cmptr)
+			CommandDelX(NULL, cmptr);
+		safe_free(alias_ptr->alias);
+		if (alias_ptr->format && (alias_ptr->type == ALIAS_COMMAND)) {
+			for (fmt = (ConfigItem_alias_format *) alias_ptr->format; fmt; fmt = (ConfigItem_alias_format *) next2)
+			{
+				next2 = (ListStruct *)fmt->next;
+				safe_free(fmt->format);
+				safe_free(fmt->nick);
+				safe_free(fmt->parameters);
+				unreal_delete_match(fmt->expr);
+				DelListItem(fmt, alias_ptr->format);
+				safe_free(fmt);
+			}
+		}
+		DelListItem(alias_ptr, conf_alias);
+		safe_free(alias_ptr);
+	}
+	for (help_ptr = conf_help; help_ptr; help_ptr = (ConfigItem_help *)next) {
+		MOTDLine *text;
+		next = (ListStruct *)help_ptr->next;
+		safe_free(help_ptr->command);
+		while (help_ptr->text) {
+			text = help_ptr->text->next;
+			safe_free(help_ptr->text->line);
+			safe_free(help_ptr->text);
+			help_ptr->text = text;
+		}
+		DelListItem(help_ptr, conf_help);
+		safe_free(help_ptr);
+	}
+	for (os_ptr = iConf.allow_user_stats_ext; os_ptr; os_ptr = (OperStat *)next)
+	{
+		next = (ListStruct *)os_ptr->next;
+		safe_free(os_ptr->flag);
+		safe_free(os_ptr);
+	}
+	iConf.allow_user_stats_ext = NULL;
+	for (spamex_ptr = iConf.spamexcept; spamex_ptr; spamex_ptr = (SpamExcept *)next)
+	{
+		next = (ListStruct *)spamex_ptr->next;
+		safe_free(spamex_ptr);
+	}
+	iConf.spamexcept = NULL;
+	for (of_ptr = conf_offchans; of_ptr; of_ptr = (ConfigItem_offchans *)next)
+	{
+		next = (ListStruct *)of_ptr->next;
+		safe_free(of_ptr->topic);
+		safe_free(of_ptr);
+	}
+	conf_offchans = NULL;
+
+	/* Free sni { } blocks */
+	for (sni = conf_sni; sni; sni = (ConfigItem_sni *)next)
+	{
+	    next = (ListStruct *)sni->next;
+	    SSL_CTX_free(sni->ssl_ctx);
+	    free_tls_options(sni->tls_options);
+	    safe_free(sni->name);
+	    safe_free(sni);
+	}
+	conf_sni = NULL;
+
+	free_conf_channelmodes(&iConf.modes_on_join);
+
+	/*
+	  reset conf_files -- should this be in its own function? no, because
+	  it's only used here
+	 */
+	safe_free(conf_files->motd_file);
+	safe_free(conf_files->smotd_file);
+	safe_free(conf_files->opermotd_file);
+	safe_free(conf_files->svsmotd_file);
+	safe_free(conf_files->botmotd_file);
+	safe_free(conf_files->rules_file);
+	safe_free(conf_files->pid_file);
+	safe_free(conf_files->tune_file);
+	/*
+	   Don't free conf_files->pid_file here; the old value is used to determine if
+	   the pidfile location has changed and write_pidfile() needs to be called
+	   again.
+	*/
+	safe_free(conf_files);
+	conf_files = NULL;
+}
+
+int	config_post_test()
+{
+#define Error(x) { config_error((x)); errors++; }
+	int 	errors = 0;
+	Hook *h;
+
+	if (!requiredstuff.conf_me)
+		Error("me {} block is missing");
+	if (!requiredstuff.conf_admin)
+		Error("admin {} block is missing");
+	if (!requiredstuff.conf_listen)
+		Error("listen {} block is missing");
+	if (!settings.has_kline_address)
+		Error("set::kline-address is missing");
+	if (!settings.has_default_server)
+		Error("set::default-server is missing");
+	if (!settings.has_network_name)
+		Error("set::network-name is missing");
+	if (!settings.has_help_channel)
+		Error("set::help-channel is missing");
+	if (nicklengths.min > nicklengths.max)
+		Error("set::nick-length is smaller than set::min-nick-length");
+
+	for (h = Hooks[HOOKTYPE_CONFIGPOSTTEST]; h; h = h->next)
+	{
+		int value, errs = 0;
+		if (h->owner && !(h->owner->flags & MODFLAG_TESTING) &&
+		                !(h->owner->options & MOD_OPT_PERM))
+			continue;
+		value = (*(h->func.intfunc))(&errs);
+		if (value == -1)
+		{
+			errors += errs;
+			break;
+		}
+		if (value == -2)
+			errors += errs;
+	}
+	return errors;
+}
+
+int	config_run()
+{
+	ConfigEntry 	*ce;
+	ConfigFile	*cfptr;
+	ConfigCommand	*cc;
+	int		errors = 0;
+	Hook *h;
+	ConfigItem_allow *allow;
+
+	/* Stage 1: set block first */
+	for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
+	{
+		if (config_verbose > 1)
+			config_status("Running %s", cfptr->cf_filename);
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+		{
+			if (!strcmp(ce->ce_varname, "set"))
+			{
+				if (_conf_set(cfptr, ce) < 0)
+					errors++;
+			}
+		}
+	}
+
+	/* Stage 2: now class blocks */
+	for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
+	{
+		if (config_verbose > 1)
+			config_status("Running %s", cfptr->cf_filename);
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+		{
+			if (!strcmp(ce->ce_varname, "class"))
+			{
+				if (_conf_class(cfptr, ce) < 0)
+					errors++;
+			}
+		}
+	}
+
+	/* Stage 3: now all the rest */
+	for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
+	{
+		if (config_verbose > 1)
+			config_status("Running %s", cfptr->cf_filename);
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+		{
+			if (!strcmp(ce->ce_varname, "set") || !strcmp(ce->ce_varname, "class"))
+				continue; // already processed
+
+			if ((cc = config_binary_search(ce->ce_varname))) {
+				if ((cc->conffunc) && (cc->conffunc(cfptr, ce) < 0))
+					errors++;
+			}
+			else
+			{
+				int value;
+				for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+				{
+					value = (*(h->func.intfunc))(cfptr,ce,CONFIG_MAIN);
+					if (value == 1)
+						break;
+				}
+			}
+		}
+	}
+
+	/*
+	 * transfer default values from set::ipv6_clones_mask into
+	 * each individual allow block. If other similar things like
+	 * this stack up here, perhaps this shoul be moved to another
+	 * function.
+	 */
+	for(allow = conf_allow; allow; allow = allow->next)
+		if(!allow->ipv6_clone_mask)
+			allow->ipv6_clone_mask = tempiConf.default_ipv6_clone_mask;
+
+	/* ^^^ TODO: due to the two-stage model now we can do it in conf_allow again
+	 *     and remove it here.
+	 */
+
+	close_unbound_listeners();
+	listen_cleanup();
+	close_unbound_listeners();
+	loop.do_bancheck = 1;
+	free_iConf(&iConf);
+	memcpy(&iConf, &tempiConf, sizeof(iConf));
+	memset(&tempiConf, 0, sizeof(tempiConf));
+	update_throttling_timer_settings();
+
+	/* initialize conf_files with defaults if the block isn't set: */
+	if(!conf_files)
+	  _conf_files(NULL, NULL);
+
+	if (errors > 0)
+	{
+		config_error("%i fatal errors encountered", errors);
+	}
+	return (errors > 0 ? -1 : 1);
+}
+
+
+NameValue *config_binary_flags_search(NameValue *table, char *cmd, int size) {
+	int start = 0;
+	int stop = size-1;
+	int mid;
+	while (start <= stop) {
+		mid = (start+stop)/2;
+
+		if (smycmp(cmd,table[mid].name) < 0) {
+			stop = mid-1;
+		}
+		else if (strcmp(cmd,table[mid].name) == 0) {
+			return &(table[mid]);
+		}
+		else
+			start = mid+1;
+	}
+	return NULL;
+}
+
+int	config_test()
+{
+	ConfigEntry 	*ce;
+	ConfigFile	*cfptr;
+	ConfigCommand	*cc;
+	int		errors = 0;
+	Hook *h;
+
+	need_34_upgrade = 0;
+
+	for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
+	{
+		if (config_verbose > 1)
+			config_status("Testing %s", cfptr->cf_filename);
+		/* First test the set { } block */
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+		{
+			if (!strcmp(ce->ce_varname, "set"))
+				errors += _test_set(cfptr, ce);
+		}
+		/* Now test all the rest */
+		for (ce = cfptr->cf_entries; ce; ce = ce->ce_next)
+		{
+			/* These are already processed, so skip them here.. */
+			if (!strcmp(ce->ce_varname, "set"))
+				continue;
+			if ((cc = config_binary_search(ce->ce_varname))) {
+				if (cc->testfunc)
+					errors += (cc->testfunc(cfptr, ce));
+			}
+			else
+			{
+				int used = 0;
+				for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+				{
+					int value, errs = 0;
+					if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+					    && !(h->owner->options & MOD_OPT_PERM))
+
+
+						continue;
+					value = (*(h->func.intfunc))(cfptr,ce,CONFIG_MAIN,&errs);
+					if (value == 2)
+						used = 1;
+					if (value == 1)
+					{
+						used = 1;
+						break;
+					}
+					if (value == -1)
+					{
+						used = 1;
+						errors += errs;
+						break;
+					}
+					if (value == -2)
+					{
+						used = 1;
+						errors += errs;
+					}
+
+				}
+				if (!used)
+				{
+					config_error("%s:%i: unknown directive %s",
+						ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+						ce->ce_varname);
+					errors++;
+					if (strchr(ce->ce_varname, ':'))
+					{
+						config_error("You cannot use :: in a directive, you have to write them out. "
+						             "For example 'set::anti-flood::nick-flood 3:60' needs to be written as: "
+						             "set { anti-flood { nick-flood 3:60; } }");
+						config_error("See also https://www.unrealircd.org/docs/Set_block#Syntax_used_in_this_documentation");
+					}
+				}
+			}
+		}
+	}
+	errors += config_post_test();
+	if (errors > 0)
+	{
+		config_error("%i errors encountered", errors);
+	}
+
+	if (need_34_upgrade)
+	{
+		upgrade_conf_to_34();
+	}
+	return (errors > 0 ? -1 : 1);
+}
+
+/*
+ * Service functions
+*/
+
+ConfigItem_alias *find_alias(char *name)
+{
+	ConfigItem_alias *e;
+
+	if (!name)
+		return NULL;
+
+	for (e = conf_alias; e; e = e->next)
+	{
+		if (!strcasecmp(e->alias, name))
+			return e;
+	}
+	return NULL;
+}
+
+ConfigItem_class *find_class(char *name)
+{
+	ConfigItem_class *e;
+
+	if (!name)
+		return NULL;
+
+	for (e = conf_class; e; e = e->next)
+	{
+		if (!strcmp(name, e->name))
+			return e;
+	}
+	return NULL;
+}
+
+
+ConfigItem_oper	*find_oper(char *name)
+{
+	ConfigItem_oper	*e;
+
+	if (!name)
+		return NULL;
+
+	for (e = conf_oper; e; e = e->next)
+	{
+		if (!strcmp(name, e->name))
+			return e;
+	}
+	return NULL;
+}
+
+ConfigItem_operclass *find_operclass(char *name)
+{
+	ConfigItem_operclass *e;
+
+	if (!name)
+		return NULL;
+
+	for (e = conf_operclass; e; e = e->next)
+	{
+		if (!strcmp(name,e->classStruct->name))
+			return e;
+	}
+	return NULL;
+}
+
+int count_oper_sessions(char *name)
+{
+	int count = 0;
+	Client *client;
+
+	list_for_each_entry(client, &oper_list, special_node)
+	{
+		if (client->user->operlogin != NULL && !strcmp(client->user->operlogin, name))
+			count++;
+	}
+
+	return count;
+}
+
+ConfigItem_listen *find_listen(char *ipmask, int port, int ipv6)
+{
+	ConfigItem_listen *e;
+
+	if (!ipmask)
+		return NULL;
+
+	for (e = conf_listen; e; e = e->next)
+		if ((e->ipv6 == ipv6) && (e->port == port) && !strcmp(e->ip, ipmask))
+			return e;
+
+	return NULL;
+}
+
+/** Find an SNI match.
+ * @param name The hostname to look for (eg: irc.xyz.com).
+ */
+ConfigItem_sni *find_sni(char *name)
+{
+	ConfigItem_sni *e;
+
+	if (!name)
+		return NULL;
+
+	for (e = conf_sni; e; e = e->next)
+	{
+        if (match_simple(e->name, name))
+            return e;
+	}
+	return NULL;
+}
+
+ConfigItem_ulines *find_uline(char *host)
+{
+	ConfigItem_ulines *ulines;
+
+	if (!host)
+		return NULL;
+
+	for(ulines = conf_ulines; ulines; ulines = ulines->next)
+	{
+		if (!strcasecmp(host, ulines->servername))
+			return ulines;
+	}
+	return NULL;
+}
+
+
+ConfigItem_except *find_except(Client *client, short type)
+{
+	ConfigItem_except *excepts;
+
+	for(excepts = conf_except; excepts; excepts = excepts->next)
+	{
+		if (excepts->flag.type == type)
+		{
+			if (match_user(excepts->mask, client, MATCH_CHECK_REAL))
+				return excepts;
+		}
+	}
+	return NULL;
+}
+
+ConfigItem_tld *find_tld(Client *client)
+{
+	ConfigItem_tld *tld;
+
+	for (tld = conf_tld; tld; tld = tld->next)
+	{
+		if (match_user(tld->mask, client, MATCH_CHECK_REAL))
+		{
+			if ((tld->options & TLD_TLS) && !IsSecureConnect(client))
+				continue;
+			if ((tld->options & TLD_REMOTE) && MyUser(client))
+				continue;
+			return tld;
+		}
+	}
+
+	return NULL;
+}
+
+
+ConfigItem_link *find_link(char *servername, Client *client)
+{
+	ConfigItem_link	*link;
+
+	for (link = conf_link; link; link = link->next)
+	{
+		if (match_simple(link->servername, servername) && unreal_mask_match(client, link->incoming.mask))
+		{
+		    return link;
+		}
+	}
+	return NULL;
+}
+
+/** Find a ban of type CONF_BAN_*, which is currently only
+ * CONF_BAN_SERVER, CONF_BAN_VERSION and CONF_BAN_REALNAME
+ */
+ConfigItem_ban *find_ban(Client *client, char *host, short type)
+{
+	ConfigItem_ban *ban;
+
+	for (ban = conf_ban; ban; ban = ban->next)
+	{
+		if (ban->flag.type == type)
+		{
+			if (client)
+			{
+				if (match_user(ban->mask, client, MATCH_CHECK_REAL))
+					return ban;
+			}
+			else if (match_simple(ban->mask, host))
+				return ban;
+		}
+	}
+	return NULL;
+}
+
+/** Find a ban of type CONF_BAN_*, which is currently only
+ * CONF_BAN_SERVER, CONF_BAN_VERSION and CONF_BAN_REALNAME
+ * This is the extended version, only used by cmd_svsnline.
+ */
+ConfigItem_ban 	*find_banEx(Client *client, char *host, short type, short type2)
+{
+	ConfigItem_ban *ban;
+
+	for (ban = conf_ban; ban; ban = ban->next)
+	{
+		if ((ban->flag.type == type) && (ban->flag.type2 == type2))
+		{
+			if (client)
+			{
+				if (match_user(ban->mask, client, MATCH_CHECK_REAL))
+					return ban;
+			}
+			else if (match_simple(ban->mask, host))
+				return ban;
+		}
+	}
+	return NULL;
+}
+
+ConfigItem_vhost *find_vhost(char *name)
+{
+	ConfigItem_vhost *vhost;
+
+	for (vhost = conf_vhost; vhost; vhost = vhost->next)
+	{
+		if (!strcmp(name, vhost->login))
+			return vhost;
+	}
+
+	return NULL;
+}
+
+
+/** returns NULL if allowed and struct if denied */
+ConfigItem_deny_channel *find_channel_allowed(Client *client, char *name)
+{
+	ConfigItem_deny_channel *dchannel;
+	ConfigItem_allow_channel *achannel;
+
+	for (dchannel = conf_deny_channel; dchannel; dchannel = dchannel->next)
+	{
+		if (match_simple(dchannel->channel, name))
+		{
+			if (dchannel->class && strcmp(client->local->class->name, dchannel->class))
+				continue;
+			if (dchannel->mask && !unreal_mask_match(client, dchannel->mask))
+				continue;
+			break; /* MATCH deny channel { } */
+		}
+	}
+
+	if (dchannel)
+	{
+		/* Check exceptions... ('allow channel') */
+		for (achannel = conf_allow_channel; achannel; achannel = achannel->next)
+		{
+			if (match_simple(achannel->channel, name))
+			{
+				if (achannel->class && strcmp(client->local->class->name, achannel->class))
+					continue;
+				if (achannel->mask && !unreal_mask_match(client, achannel->mask))
+					continue;
+				break; /* MATCH allow channel { } */
+			}
+		}
+		if (achannel)
+			return NULL; /* Matches an 'allow channel' - so not forbidden */
+		else
+			return dchannel;
+	}
+	return NULL;
+}
+
+void init_dynconf(void)
+{
+	memset(&iConf, 0, sizeof(iConf));
+	memset(&tempiConf, 0, sizeof(iConf));
+}
+
+char *pretty_time_val(long timeval)
+{
+	static char buf[512];
+
+	if (timeval == 0)
+		return "0";
+
+	buf[0] = 0;
+
+	if (timeval/86400)
+		snprintf(buf, sizeof(buf), "%ld day%s ", timeval/86400, timeval/86400 != 1 ? "s" : "");
+	if ((timeval/3600) % 24)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%ld hour%s ", (timeval/3600)%24, (timeval/3600)%24 != 1 ? "s" : "");
+	if ((timeval/60)%60)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%ld minute%s ", (timeval/60)%60, (timeval/60)%60 != 1 ? "s" : "");
+	if ((timeval%60))
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%ld second%s", timeval%60, timeval%60 != 1 ? "s" : "");
+	/* Strip space at the end (if any) */
+	if (*buf && (buf[strlen(buf)-1] == ' '))
+		buf[strlen(buf)-1] = '\0';
+	return buf;
+}
+
+/* This converts a relative path to an absolute path, but only if necessary. */
+void convert_to_absolute_path(char **path, char *reldir)
+{
+	char *s;
+
+	if (!*path || !**path)
+		return; /* NULL or empty */
+
+	if (strstr(*path, "://"))
+		return; /* URL: don't touch */
+
+	if ((**path == '/') || (**path == '\\'))
+		return; /* already absolute path */
+
+	if (!strncmp(*path, reldir, strlen(reldir)))
+		return; /* already contains reldir */
+
+	s = safe_alloc(strlen(reldir) + strlen(*path) + 2);
+	sprintf(s, "%s/%s", reldir, *path); /* safe, see line above */
+	safe_free(*path);
+	*path = s;
+}
+
+/* Similar to convert_to_absolute_path() but returns a duplicated string.
+ * Don't forget to free!
+ */
+char *convert_to_absolute_path_duplicate(char *path, char *reldir)
+{
+	char *xpath = strdup(path);
+	convert_to_absolute_path(&xpath, reldir);
+	return xpath;
+}
+
+/*
+ * Actual config parser funcs
+*/
+
+int	_conf_include(ConfigFile *conf, ConfigEntry *ce)
+{
+	int	ret = 0;
+#ifdef GLOBH
+	glob_t files;
+	int i;
+#elif defined(_WIN32)
+	HANDLE hFind;
+	WIN32_FIND_DATA FindData;
+	char cPath[MAX_PATH], *cSlash = NULL, *path;
+#endif
+	if (!ce->ce_vardata)
+	{
+		config_status("%s:%i: include: no filename given",
+			ce->ce_fileptr->cf_filename,
+			ce->ce_varlinenum);
+		return -1;
+	}
+
+	if (!strcmp(ce->ce_vardata, "help.conf"))
+		need_34_upgrade = 1;
+
+	convert_to_absolute_path(&ce->ce_vardata, CONFDIR);
+
+#ifdef USE_LIBCURL
+	if (url_is_valid(ce->ce_vardata))
+		return remote_include(ce);
+#else
+	if (strstr(ce->ce_vardata, "://"))
+	{
+		config_error("%s:%d: URL specified: %s",
+		             ce->ce_fileptr->cf_filename,
+		             ce->ce_varlinenum,
+		             ce->ce_vardata);
+		config_error("UnrealIRCd was not compiled with remote includes support "
+		             "so you cannot use URLs. You are suggested to re-run ./Config "
+		             "and answer YES to the question about remote includes.");
+		return -1;
+	}
+#endif
+#if !defined(_WIN32) && !defined(_AMIGA) && !defined(OSXTIGER) && DEFAULT_PERMISSIONS != 0
+	(void)chmod(ce->ce_vardata, DEFAULT_PERMISSIONS);
+#endif
+#ifdef GLOBH
+#if defined(__OpenBSD__) && defined(GLOB_LIMIT)
+	glob(ce->ce_vardata, GLOB_NOSORT|GLOB_NOCHECK|GLOB_LIMIT, NULL, &files);
+#else
+	glob(ce->ce_vardata, GLOB_NOSORT|GLOB_NOCHECK, NULL, &files);
+#endif
+	if (!files.gl_pathc) {
+		globfree(&files);
+		config_status("%s:%i: include %s: invalid file given",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_vardata);
+		return -1;
+	}
+	for (i = 0; i < files.gl_pathc; i++) {
+		add_include(files.gl_pathv[i], ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		ret = load_conf(files.gl_pathv[i], files.gl_pathv[i]);
+		if (ret < 0)
+		{
+			globfree(&files);
+			return ret;
+		}
+	}
+	globfree(&files);
+#elif defined(_WIN32)
+	memset(cPath, 0, MAX_PATH);
+	if (strchr(ce->ce_vardata, '/') || strchr(ce->ce_vardata, '\\')) {
+		strlcpy(cPath,ce->ce_vardata,MAX_PATH);
+		cSlash=cPath+strlen(cPath);
+		while(*cSlash != '\\' && *cSlash != '/' && cSlash > cPath)
+			cSlash--;
+		*(cSlash+1)=0;
+	}
+	if ( (hFind = FindFirstFile(ce->ce_vardata, &FindData)) == INVALID_HANDLE_VALUE )
+	{
+		config_status("%s:%i: include %s: invalid file given",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_vardata);
+		return -1;
+	}
+	if (cPath) {
+		path = safe_alloc(strlen(cPath) + strlen(FindData.cFileName)+1);
+		strcpy(path, cPath);
+		strcat(path, FindData.cFileName);
+
+		add_include(path, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		ret = load_conf(path, path);
+		safe_free(path);
+
+	}
+	else
+	{
+		add_include(FindData.cFileName, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		ret = load_conf(FindData.cFileName, FindData.cFileName);
+	}
+	if (ret < 0)
+	{
+		FindClose(hFind);
+		return ret;
+	}
+
+	ret = 0;
+	while (FindNextFile(hFind, &FindData) != 0) {
+		if (cPath) {
+			path = safe_alloc(strlen(cPath) + strlen(FindData.cFileName)+1);
+			strcpy(path,cPath);
+			strcat(path,FindData.cFileName);
+
+			add_include(path, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+			ret = load_conf(path, path);
+			safe_free(path);
+			if (ret < 0)
+				break;
+		}
+		else
+		{
+			add_include(FindData.cFileName, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+			ret = load_conf(FindData.cFileName, FindData.cFileName);
+		}
+	}
+	FindClose(hFind);
+	if (ret < 0)
+		return ret;
+#else
+	add_include(ce->ce_vardata, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+	ret = load_conf(ce->ce_vardata, ce->ce_vardata);
+	return ret;
+#endif
+	return 1;
+}
+
+int	_test_include(ConfigFile *conf, ConfigEntry *ce)
+{
+	return 0;
+}
+
+int	_conf_admin(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigItem_admin *ca;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		ca = safe_alloc(sizeof(ConfigItem_admin));
+		if (!conf_admin)
+			conf_admin_tail = ca;
+		safe_strdup(ca->line, cep->ce_varname);
+		AddListItem(ca, conf_admin);
+	}
+	return 1;
+}
+
+int	_test_admin(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int 	    errors = 0;
+
+	if (requiredstuff.conf_admin)
+	{
+		config_warn_duplicate(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "admin");
+		return 0;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (strlen(cep->ce_varname) > 500)
+		{
+			config_error("%s:%i: oversized data in admin block",
+				cep->ce_fileptr->cf_filename,
+				cep->ce_varlinenum);
+			errors++;
+			continue;
+		}
+	}
+	requiredstuff.conf_admin = 1;
+	return errors;
+}
+
+int	_conf_me(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+
+	if (!conf_me)
+		conf_me = safe_alloc(sizeof(ConfigItem_me));
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "name"))
+		{
+			safe_strdup(conf_me->name, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "info"))
+		{
+			safe_strdup(conf_me->info, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "sid"))
+		{
+			safe_strdup(conf_me->sid, cep->ce_vardata);
+		}
+	}
+	return 1;
+}
+
+int	_test_me(ConfigFile *conf, ConfigEntry *ce)
+{
+	char has_name = 0, has_info = 0, has_sid = 0;
+	ConfigEntry *cep;
+	int	    errors = 0;
+
+	if (requiredstuff.conf_me)
+	{
+		config_warn_duplicate(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "me");
+		return 0;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "me"))
+			continue;
+
+		/* me::name */
+		if (!strcmp(cep->ce_varname, "name"))
+		{
+			if (has_name)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "me::name");
+				continue;
+			}
+			has_name = 1;
+			if (!strchr(cep->ce_vardata, '.'))
+			{
+				config_error("%s:%i: illegal me::name, must be fully qualified hostname",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum);
+				errors++;
+			}
+			if (!valid_host(cep->ce_vardata))
+			{
+				config_error("%s:%i: illegal me::name contains invalid character(s) [only a-z, 0-9, _, -, . are allowed]",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum);
+				errors++;
+			}
+			if (strlen(cep->ce_vardata) > HOSTLEN)
+			{
+				config_error("%s:%i: illegal me::name, must be less or equal to %i characters",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, HOSTLEN);
+				errors++;
+			}
+		}
+		/* me::info */
+		else if (!strcmp(cep->ce_varname, "info"))
+		{
+			char *p;
+			char valid = 0;
+			if (has_info)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "me::info");
+				continue;
+			}
+			has_info = 1;
+			if (strlen(cep->ce_vardata) > (REALLEN-1))
+			{
+				config_error("%s:%i: too long me::info, must be max. %i characters",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					REALLEN-1);
+				errors++;
+			}
+
+			/* Valid me::info? Any data except spaces is ok */
+			for (p=cep->ce_vardata; *p; p++)
+			{
+				if (*p != ' ')
+				{
+					valid = 1;
+					break;
+				}
+			}
+			if (!valid)
+			{
+				config_error("%s:%i: empty me::info, should be a server description.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "numeric"))
+		{
+			config_error("%s:%i: me::numeric has been removed, you must now specify a Server ID (SID) instead. "
+			             "Edit your configuration file and change 'numeric' to 'sid' and make up "
+			             "a server id of exactly 3 characters, starting with a digit, eg: \"001\" or \"0AB\".",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "sid"))
+		{
+			if (has_sid)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "me::sid");
+				continue;
+			}
+			has_sid = 1;
+
+			if (!valid_sid(cep->ce_vardata))
+			{
+				config_error("%s:%i: me::sid must be 3 characters long, begin with a number, "
+				             "and the 2nd and 3rd character must be a number or uppercase letter. "
+				             "Example: \"001\" and \"0AB\" is good. \"AAA\" and \"0ab\" are bad. ",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+
+			if (!isdigit(*cep->ce_vardata))
+			{
+				config_error("%s:%i: me::sid must be 3 characters long and begin with a number",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		/* Unknown entry */
+		else
+		{
+			config_error_unknown(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"me", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_name)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "me::name");
+		errors++;
+	}
+	if (!has_info)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "me::info");
+		errors++;
+	}
+	if (!has_sid)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "me::sid");
+		errors++;
+	}
+	requiredstuff.conf_me = 1;
+	return errors;
+}
+
+/*
+ * The files {} block
+ */
+int	_conf_files(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+
+	if (!conf_files)
+	{
+		conf_files = safe_alloc(sizeof(ConfigItem_files));
+
+		/* set defaults */
+		safe_strdup(conf_files->motd_file, MPATH);
+		safe_strdup(conf_files->rules_file, RPATH);
+		safe_strdup(conf_files->smotd_file, SMPATH);
+		safe_strdup(conf_files->botmotd_file, BPATH);
+		safe_strdup(conf_files->opermotd_file, OPATH);
+		safe_strdup(conf_files->svsmotd_file, VPATH);
+
+		safe_strdup(conf_files->pid_file, IRCD_PIDFILE);
+		safe_strdup(conf_files->tune_file, IRCDTUNE);
+
+		/* we let actual files get read in later by the motd caching mechanism */
+	}
+	/*
+	 * hack to allow initialization of conf_files (above) when there is no files block in
+	 * CPATH. The caller calls _conf_files(NULL, NULL); to do this. We return here because
+	 * the for loop's initialization of cep would segfault otherwise. We return 1 because
+	 * if config_run() calls us with a NULL ce, it's got a bug...but we can't detect that.
+	 */
+	if(!ce)
+	  return 1;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "motd"))
+			safe_strdup(conf_files->motd_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "shortmotd"))
+			safe_strdup(conf_files->smotd_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "opermotd"))
+			safe_strdup(conf_files->opermotd_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "svsmotd"))
+			safe_strdup(conf_files->svsmotd_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "botmotd"))
+			safe_strdup(conf_files->botmotd_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "rules"))
+			safe_strdup(conf_files->rules_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "tunefile"))
+			safe_strdup(conf_files->tune_file, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "pidfile"))
+			safe_strdup(conf_files->pid_file, cep->ce_vardata);
+	}
+	return 1;
+}
+
+int	_test_files(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int	    errors = 0;
+	char has_motd = 0, has_smotd = 0, has_rules = 0;
+	char has_botmotd = 0, has_opermotd = 0, has_svsmotd = 0;
+	char has_pidfile = 0, has_tunefile = 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		/* files::motd */
+		if (!strcmp(cep->ce_varname, "motd"))
+		{
+			if (has_motd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::motd");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			config_test_openfile(cep, O_RDONLY, 0, "files::motd", 0, 1);
+			has_motd = 1;
+		}
+		/* files::smotd */
+		else if (!strcmp(cep->ce_varname, "shortmotd"))
+		{
+			if (has_smotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::shortmotd");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			config_test_openfile(cep, O_RDONLY, 0, "files::shortmotd", 0, 1);
+			has_smotd = 1;
+		}
+		/* files::rules */
+		else if (!strcmp(cep->ce_varname, "rules"))
+		{
+			if (has_rules)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::rules");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			config_test_openfile(cep, O_RDONLY, 0, "files::rules", 0, 1);
+			has_rules = 1;
+		}
+		/* files::botmotd */
+		else if (!strcmp(cep->ce_varname, "botmotd"))
+		{
+			if (has_botmotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::botmotd");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			config_test_openfile(cep, O_RDONLY, 0, "files::botmotd", 0, 1);
+			has_botmotd = 1;
+		}
+		/* files::opermotd */
+		else if (!strcmp(cep->ce_varname, "opermotd"))
+		{
+			if (has_opermotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::opermotd");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			config_test_openfile(cep, O_RDONLY, 0, "files::opermotd", 0, 1);
+			has_opermotd = 1;
+		}
+		/* files::svsmotd
+		 * This config stuff should somehow be inside of modules/svsmotd.c!!!... right?
+		 */
+		else if (!strcmp(cep->ce_varname, "svsmotd"))
+		{
+			if (has_svsmotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::svsmotd");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			/* svsmotd can't be a URL because we have to be able to write to it */
+			config_test_openfile(cep, O_RDONLY, 0, "files::svsmotd", 0, 0);
+			has_svsmotd = 1;
+		}
+		/* files::pidfile */
+		else if (!strcmp(cep->ce_varname, "pidfile"))
+		{
+			if (has_pidfile)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::pidfile");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, PERMDATADIR);
+			errors += config_test_openfile(cep, O_WRONLY | O_CREAT, 0600, "files::pidfile", 1, 0);
+			has_pidfile = 1;
+		}
+		/* files::tunefile */
+		else if (!strcmp(cep->ce_varname, "tunefile"))
+		{
+			if (has_tunefile)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "files::tunefile");
+				continue;
+			}
+			convert_to_absolute_path(&cep->ce_vardata, PERMDATADIR);
+			errors += config_test_openfile(cep, O_RDWR | O_CREAT, 0600, "files::tunefile", 1, 0);
+			has_tunefile = 1;
+		}
+		/* <random directive here> */
+		else
+		{
+			config_error("%s:%d: Unknown directive: \"%s\" in files {}", cep->ce_fileptr->cf_filename,
+				     cep->ce_varlinenum, cep->ce_varname);
+			errors ++;
+		}
+	}
+	return errors;
+}
+
+/*
+ * The operclass {} block parser
+ */
+
+OperClassACLEntry* _conf_parseACLEntry(ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	OperClassACLEntry *entry = NULL;
+	entry = safe_alloc(sizeof(OperClassACLEntry));
+
+	if (!strcmp(ce->ce_varname,"allow"))
+		entry->type = OPERCLASSENTRY_ALLOW;
+	else
+		entry->type = OPERCLASSENTRY_DENY;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		OperClassACLEntryVar *var = safe_alloc(sizeof(OperClassACLEntryVar));
+		safe_strdup(var->name, cep->ce_varname);
+		if (cep->ce_vardata)
+		{
+			safe_strdup(var->value, cep->ce_vardata);
+		}
+		AddListItem(var,entry->variables);
+	}
+
+	return entry;
+}
+
+OperClassACL* _conf_parseACL(char *name, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	OperClassACL *acl = NULL;
+
+	acl = safe_alloc(sizeof(OperClassACL));
+	safe_strdup(acl->name, name);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "deny") || !strcmp(cep->ce_varname, "allow"))
+		{
+			OperClassACLEntry *entry = _conf_parseACLEntry(cep);
+			AddListItem(entry,acl->entries);
+		}
+		else {
+			OperClassACL *subAcl = _conf_parseACL(cep->ce_varname,cep);
+			AddListItem(subAcl,acl->acls);
+		}
+	}
+
+	return acl;
+}
+
+int	_conf_operclass(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigEntry *cepp;
+	ConfigItem_operclass *operClass = NULL;
+	operClass = safe_alloc(sizeof(ConfigItem_operclass));
+	operClass->classStruct = safe_alloc(sizeof(OperClass));
+	safe_strdup(operClass->classStruct->name, ce->ce_vardata);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "parent"))
+		{
+			safe_strdup(operClass->classStruct->ISA, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "permissions"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				OperClassACL *acl = _conf_parseACL(cepp->ce_varname,cepp);
+				AddListItem(acl,operClass->classStruct->acls);
+			}
+		}
+	}
+
+	AddListItem(operClass, conf_operclass);
+	return 1;
+}
+
+void new_permissions_system(ConfigFile *conf, ConfigEntry *ce)
+{
+	if (need_operclass_permissions_upgrade)
+		return; /* error already shown */
+
+	config_error("%s:%i: UnrealIRCd 4.2.1 and higher have a new operclass permissions system.",
+	             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+	config_error("Please see https://www.unrealircd.org/docs/FAQ#New_operclass_permissions");
+	config_error("(additional errors regarding this are suppressed)");
+	/*
+	config_error("First of all, operclass::privileges has been renamed to operclass::permissions.");
+	config_error("However, the permissions themselves have also been changed. You cannot simply "
+	             "rename 'privileges' to 'permissions' and be done with it! ");
+	config_error("See https://www.unrealircd.org/docs/Operclass_permissions for the new list of permissions.");
+	config_error("Or just use the default operclasses from operclass.default.conf, then no need to change anything."); */
+	need_operclass_permissions_upgrade = 1;
+}
+
+int 	_test_operclass(ConfigFile *conf, ConfigEntry *ce)
+{
+	char has_permissions = 0, has_parent = 0;
+	ConfigEntry *cep;
+	int	errors = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error_noname(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "operclass");
+		errors++;
+	}
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "parent"))
+		{
+			if (has_parent)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "operclass::parent");
+				continue;
+			}
+			has_parent = 1;
+			continue;
+		} else
+		if (!strcmp(cep->ce_varname, "permissions"))
+		{
+			if (has_permissions)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+				cep->ce_varlinenum, "oper::permissions");
+				continue;
+			}
+			has_permissions = 1;
+			continue;
+		} else
+		if (!strcmp(cep->ce_varname, "privileges"))
+		{
+			new_permissions_system(conf, cep);
+			errors++;
+			return errors;
+		} else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename,
+				cep->ce_varlinenum, "operclass", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	if (!has_permissions)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"oper::permissions");
+		errors++;
+	}
+
+	return errors;
+}
+
+/*
+ * The oper {} block parser
+*/
+
+int	_conf_oper(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigEntry *cepp;
+	ConfigItem_oper *oper = NULL;
+
+	oper =  safe_alloc(sizeof(ConfigItem_oper));
+	safe_strdup(oper->name, ce->ce_vardata);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "operclass"))
+			safe_strdup(oper->operclass, cep->ce_vardata);
+		if (!strcmp(cep->ce_varname, "password"))
+			oper->auth = AuthBlockToAuthConfig(cep);
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			oper->class = find_class(cep->ce_vardata);
+			if (!oper->class || (oper->class->flag.temporary == 1))
+			{
+				config_status("%s:%i: illegal oper::class, unknown class '%s' using default of class 'default'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata);
+				oper->class = default_class;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "swhois"))
+		{
+			SWhois *s;
+			if (cep->ce_entries)
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					s = safe_alloc(sizeof(SWhois));
+					safe_strdup(s->line, cepp->ce_varname);
+					safe_strdup(s->setby, "oper");
+					AddListItem(s, oper->swhois);
+				}
+			} else
+			if (cep->ce_vardata)
+			{
+				s = safe_alloc(sizeof(SWhois));
+				safe_strdup(s->line, cep->ce_vardata);
+				safe_strdup(s->setby, "oper");
+				AddListItem(s, oper->swhois);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "snomask"))
+		{
+			safe_strdup(oper->snomask, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "modes"))
+		{
+			oper->modes = set_usermode(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "require-modes"))
+		{
+			oper->require_modes = set_usermode(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "maxlogins"))
+		{
+			oper->maxlogins = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "mask"))
+		{
+			unreal_add_masks(&oper->mask, cep);
+		}
+		else if (!strcmp(cep->ce_varname, "vhost"))
+		{
+			safe_strdup(oper->vhost, cep->ce_vardata);
+		}
+	}
+	AddListItem(oper, conf_oper);
+	return 1;
+}
+
+int	_test_oper(ConfigFile *conf, ConfigEntry *ce)
+{
+	char has_class = 0, has_password = 0, has_snomask = 0;
+	char has_modes = 0, has_require_modes = 0, has_mask = 0, has_maxlogins = 0;
+	char has_operclass = 0, has_vhost = 0;
+	ConfigEntry *cep;
+	int errors = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error_noname(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "oper");
+		errors++;
+	}
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		/* Regular variables */
+		if (!cep->ce_entries)
+		{
+			if (config_is_blankorempty(cep, "oper"))
+			{
+				errors++;
+				continue;
+			}
+			/* oper::password */
+			if (!strcmp(cep->ce_varname, "password"))
+			{
+				if (has_password)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::password");
+					continue;
+				}
+				has_password = 1;
+				if (Auth_CheckError(cep) < 0)
+					errors++;
+
+				if (ce->ce_vardata && cep->ce_vardata &&
+					!strcmp(ce->ce_vardata, "bobsmith") &&
+					!strcmp(cep->ce_vardata, "test"))
+				{
+					config_error("%s:%i: please change the the name and password of the "
+								 "default 'bobsmith' oper block",
+								 ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+					errors++;
+				}
+				continue;
+			}
+			/* oper::operclass */
+			else if (!strcmp(cep->ce_varname, "operclass"))
+			{
+				if (has_operclass)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "oper::operclass");
+					continue;
+				}
+				has_operclass = 1;
+				continue;
+			}
+			/* oper::class */
+			else if (!strcmp(cep->ce_varname, "class"))
+			{
+				if (has_class)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::class");
+					continue;
+				}
+				has_class = 1;
+			}
+			/* oper::swhois */
+			else if (!strcmp(cep->ce_varname, "swhois"))
+			{
+			}
+			/* oper::vhost */
+			else if (!strcmp(cep->ce_varname, "vhost"))
+			{
+				if (has_vhost)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::vhost");
+					continue;
+				}
+				has_vhost = 1;
+			}
+			/* oper::snomask */
+			else if (!strcmp(cep->ce_varname, "snomask"))
+			{
+				if (has_snomask)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::snomask");
+					continue;
+				}
+				has_snomask = 1;
+			}
+			/* oper::modes */
+			else if (!strcmp(cep->ce_varname, "modes"))
+			{
+				char *p;
+				for (p = cep->ce_vardata; *p; p++)
+					if (strchr("orzS", *p))
+					{
+						config_error("%s:%i: oper::modes may not include mode '%c'",
+							cep->ce_fileptr->cf_filename, cep->ce_varlinenum, *p);
+						errors++;
+					}
+				if (has_modes)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::modes");
+					continue;
+				}
+				has_modes = 1;
+			}
+			/* oper::require-modes */
+			else if (!strcmp(cep->ce_varname, "require-modes"))
+			{
+				char *p;
+				for (p = cep->ce_vardata; *p; p++)
+					if (strchr("o", *p))
+					{
+						config_warn("%s:%i: oper::require-modes probably shouldn't include mode '%c'",
+							cep->ce_fileptr->cf_filename, cep->ce_varlinenum, *p);
+					}
+				if (has_require_modes)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::require-modes");
+					continue;
+				}
+				has_require_modes = 1;
+			}
+			/* oper::maxlogins */
+			else if (!strcmp(cep->ce_varname, "maxlogins"))
+			{
+				int l;
+
+				if (has_maxlogins)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::maxlogins");
+					continue;
+				}
+				has_maxlogins = 1;
+
+				l = atoi(cep->ce_vardata);
+				if ((l < 0) || (l > 5000))
+				{
+					config_error("%s:%i: oper::maxlogins: value out of range (%d) should be 0-5000",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, l);
+					errors++;
+					continue;
+				}
+			}
+			/* oper::flags */
+			else if (!strcmp(cep->ce_varname, "flags"))
+			{
+				config_error("%s:%i: oper::flags no longer exists. UnrealIRCd 4 uses a new style oper block.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				need_34_upgrade = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "mask"))
+			{
+				if (cep->ce_vardata || cep->ce_entries)
+					has_mask = 1;
+			}
+			else
+			{
+				config_error_unknown(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "oper", cep->ce_varname);
+				errors++;
+				continue;
+			}
+		}
+		/* Sections */
+		else
+		{
+			/* oper::flags {} */
+			if (!strcmp(cep->ce_varname, "flags"))
+			{
+				config_error("%s:%i: oper::flags no longer exists. UnrealIRCd 4 uses a new style oper block.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				need_34_upgrade = 1;
+				continue;
+			}
+			/* oper::from {} */
+			else if (!strcmp(cep->ce_varname, "from"))
+			{
+				config_error("%s:%i: oper::from::userhost is now called oper::mask",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				need_34_upgrade = 1;
+				continue;
+			}
+			else if (!strcmp(cep->ce_varname, "swhois"))
+			{
+				/* ok */
+			}
+			else if (!strcmp(cep->ce_varname, "mask"))
+			{
+				if (cep->ce_vardata || cep->ce_entries)
+					has_mask = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "password"))
+			{
+				if (has_password)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "oper::password");
+					continue;
+				}
+				has_password = 1;
+				if (Auth_CheckError(cep) < 0)
+					errors++;
+			}
+			else
+			{
+				config_error_unknown(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "oper", cep->ce_varname);
+				errors++;
+				continue;
+			}
+		}
+	}
+	if (!has_password)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"oper::password");
+		errors++;
+	}
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"oper::mask");
+		errors++;
+	}
+	if (!has_class)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"oper::class");
+		errors++;
+	}
+	if (!has_operclass)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"oper::operclass");
+		need_34_upgrade = 1;
+		errors++;
+	}
+
+	return errors;
+
+}
+
+/*
+ * The class {} block parser
+*/
+int	_conf_class(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cep2;
+	ConfigItem_class *class;
+	unsigned char isnew = 0;
+
+	if (!(class = find_class(ce->ce_vardata)))
+	{
+		class = safe_alloc(sizeof(ConfigItem_class));
+		safe_strdup(class->name, ce->ce_vardata);
+		isnew = 1;
+	}
+	else
+	{
+		isnew = 0;
+		class->flag.temporary = 0;
+		class->options = 0; /* RESET OPTIONS */
+	}
+	safe_strdup(class->name, ce->ce_vardata);
+
+	class->connfreq = 15; /* default */
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "pingfreq"))
+			class->pingfreq = config_checkval(cep->ce_vardata,CFG_TIME);
+		else if (!strcmp(cep->ce_varname, "connfreq"))
+			class->connfreq = config_checkval(cep->ce_vardata,CFG_TIME);
+		else if (!strcmp(cep->ce_varname, "maxclients"))
+			class->maxclients = atol(cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "sendq"))
+			class->sendq = config_checkval(cep->ce_vardata,CFG_SIZE);
+		else if (!strcmp(cep->ce_varname, "recvq"))
+			class->recvq = config_checkval(cep->ce_vardata,CFG_SIZE);
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+				if (!strcmp(cep2->ce_varname, "nofakelag"))
+					class->options |= CLASS_OPT_NOFAKELAG;
+		}
+	}
+	if (isnew)
+		AddListItem(class, conf_class);
+	return 1;
+}
+
+int	_test_class(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry 	*cep, *cep2;
+	int		errors = 0;
+	char has_pingfreq = 0, has_connfreq = 0, has_maxclients = 0, has_sendq = 0;
+	char has_recvq = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error_noname(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "class");
+		return 1;
+	}
+	if (!strcasecmp(ce->ce_vardata, "default"))
+	{
+		config_error("%s:%d: Class cannot be named 'default', this class name is reserved for internal use.",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "options"))
+		{
+			for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+			{
+#ifdef FAKELAG_CONFIGURABLE
+				if (!strcmp(cep2->ce_varname, "nofakelag"))
+					;
+				else
+#endif
+				{
+					config_error("%s:%d: Unknown option '%s' in class::options",
+						cep2->ce_fileptr->cf_filename, cep2->ce_varlinenum, cep2->ce_varname);
+					errors++;
+				}
+			}
+		}
+		else if (config_is_blankorempty(cep, "class"))
+		{
+			errors++;
+			continue;
+		}
+		/* class::pingfreq */
+		else if (!strcmp(cep->ce_varname, "pingfreq"))
+		{
+			int v = config_checkval(cep->ce_vardata,CFG_TIME);
+			if (has_pingfreq)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "class::pingfreq");
+				continue;
+			}
+			has_pingfreq = 1;
+			if ((v < 30) || (v > 600))
+			{
+				config_error("%s:%i: class::pingfreq should be a reasonable value (30-600)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+		}
+		/* class::maxclients */
+		else if (!strcmp(cep->ce_varname, "maxclients"))
+		{
+			long l;
+			if (has_maxclients)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "class::maxclients");
+				continue;
+			}
+			has_maxclients = 1;
+			l = atol(cep->ce_vardata);
+			if ((l < 1) || (l > 1000000))
+			{
+				config_error("%s:%i: class::maxclients with illegal value",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		/* class::connfreq */
+		else if (!strcmp(cep->ce_varname, "connfreq"))
+		{
+			long l;
+			if (has_connfreq)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "class::connfreq");
+				continue;
+			}
+			has_connfreq = 1;
+			l = config_checkval(cep->ce_vardata,CFG_TIME);
+			if ((l < 5) || (l > 604800))
+			{
+				config_error("%s:%i: class::connfreq with illegal value (must be >5 and <7d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		/* class::sendq */
+		else if (!strcmp(cep->ce_varname, "sendq"))
+		{
+			long l;
+			if (has_sendq)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "class::sendq");
+				continue;
+			}
+			has_sendq = 1;
+			l = config_checkval(cep->ce_vardata,CFG_SIZE);
+			if ((l <= 0) || (l > 2000000000))
+			{
+				config_error("%s:%i: class::sendq with illegal value",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		/* class::recvq */
+		else if (!strcmp(cep->ce_varname, "recvq"))
+		{
+			long l;
+			if (has_recvq)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "class::recvq");
+				continue;
+			}
+			has_recvq = 1;
+			l = config_checkval(cep->ce_vardata,CFG_SIZE);
+			if ((l < 512) || (l > 32768))
+			{
+				config_error("%s:%i: class::recvq with illegal value (must be >512 and <32k)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		/* Unknown */
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"class", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+	if (!has_pingfreq)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"class::pingfreq");
+		errors++;
+	}
+	if (!has_maxclients)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"class::maxclients");
+		errors++;
+	}
+	if (!has_sendq)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"class::sendq");
+		errors++;
+	}
+
+	return errors;
+}
+
+int     _conf_drpass(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+
+	if (!conf_drpass)
+	{
+		conf_drpass =  safe_alloc(sizeof(ConfigItem_drpass));
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "restart"))
+		{
+			if (conf_drpass->restartauth)
+				Auth_FreeAuthConfig(conf_drpass->restartauth);
+
+			conf_drpass->restartauth = AuthBlockToAuthConfig(cep);
+		}
+		else if (!strcmp(cep->ce_varname, "die"))
+		{
+			if (conf_drpass->dieauth)
+				Auth_FreeAuthConfig(conf_drpass->dieauth);
+
+			conf_drpass->dieauth = AuthBlockToAuthConfig(cep);
+		}
+	}
+	return 1;
+}
+
+int     _test_drpass(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int errors = 0;
+	char has_restart = 0, has_die = 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "drpass"))
+		{
+			errors++;
+			continue;
+		}
+		/* drpass::restart */
+		if (!strcmp(cep->ce_varname, "restart"))
+		{
+			if (has_restart)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "drpass::restart");
+				continue;
+			}
+			has_restart = 1;
+			if (Auth_CheckError(cep) < 0)
+				errors++;
+			continue;
+		}
+		/* drpass::die */
+		else if (!strcmp(cep->ce_varname, "die"))
+		{
+			if (has_die)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "drpass::die");
+				continue;
+			}
+			has_die = 1;
+			if (Auth_CheckError(cep) < 0)
+				errors++;
+			continue;
+		}
+		/* Unknown */
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"drpass", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+	return errors;
+}
+
+/*
+ * The ulines {} block parser
+*/
+int	_conf_ulines(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigItem_ulines *ca;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		ca = safe_alloc(sizeof(ConfigItem_ulines));
+		safe_strdup(ca->servername, cep->ce_varname);
+		AddListItem(ca, conf_ulines);
+	}
+	return 1;
+}
+
+int	_test_ulines(ConfigFile *conf, ConfigEntry *ce)
+{
+	/* No check needed */
+	return 0;
+}
+
+int     _conf_tld(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigItem_tld *ca;
+
+	ca = safe_alloc(sizeof(ConfigItem_tld));
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+			safe_strdup(ca->mask, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "motd"))
+		{
+			safe_strdup(ca->motd_file, cep->ce_vardata);
+			read_motd(cep->ce_vardata, &ca->motd);
+		}
+		else if (!strcmp(cep->ce_varname, "shortmotd"))
+		{
+			safe_strdup(ca->smotd_file, cep->ce_vardata);
+			read_motd(cep->ce_vardata, &ca->smotd);
+		}
+		else if (!strcmp(cep->ce_varname, "opermotd"))
+		{
+			safe_strdup(ca->opermotd_file, cep->ce_vardata);
+			read_motd(cep->ce_vardata, &ca->opermotd);
+		}
+		else if (!strcmp(cep->ce_varname, "botmotd"))
+		{
+			safe_strdup(ca->botmotd_file, cep->ce_vardata);
+			read_motd(cep->ce_vardata, &ca->botmotd);
+		}
+		else if (!strcmp(cep->ce_varname, "rules"))
+		{
+			safe_strdup(ca->rules_file, cep->ce_vardata);
+			read_motd(cep->ce_vardata, &ca->rules);
+		}
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			ConfigEntry *cepp;
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "ssl") || !strcmp(cepp->ce_varname, "tls"))
+					ca->options |= TLD_TLS;
+				else if (!strcmp(cepp->ce_varname, "remote"))
+					ca->options |= TLD_REMOTE;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "channel"))
+			safe_strdup(ca->channel, cep->ce_vardata);
+	}
+	AddListItem(ca, conf_tld);
+	return 1;
+}
+
+int     _test_tld(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int	    errors = 0;
+	int	    fd = -1;
+	char has_mask = 0, has_motd = 0, has_rules = 0, has_shortmotd = 0, has_channel = 0;
+	char has_opermotd = 0, has_botmotd = 0, has_options = 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata && strcmp(cep->ce_varname, "options"))
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"tld", cep->ce_varname);
+			errors++;
+			continue;
+		}
+		/* tld::mask */
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (has_mask)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::mask");
+				continue;
+			}
+			has_mask = 1;
+		}
+		/* tld::motd */
+		else if (!strcmp(cep->ce_varname, "motd"))
+		{
+			if (has_motd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::motd");
+				continue;
+			}
+			has_motd = 1;
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			if (((fd = open(cep->ce_vardata, O_RDONLY)) == -1))
+			{
+				config_error("%s:%i: tld::motd: %s: %s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata, strerror(errno));
+				errors++;
+			}
+			else
+				close(fd);
+		}
+		/* tld::rules */
+		else if (!strcmp(cep->ce_varname, "rules"))
+		{
+			if (has_rules)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::rules");
+				continue;
+			}
+			has_rules = 1;
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			if (((fd = open(cep->ce_vardata, O_RDONLY)) == -1))
+			{
+				config_error("%s:%i: tld::rules: %s: %s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata, strerror(errno));
+				errors++;
+			}
+			else
+				close(fd);
+		}
+		/* tld::channel */
+		else if (!strcmp(cep->ce_varname, "channel"))
+		{
+			if (has_channel)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::channel");
+				continue;
+			}
+			has_channel = 1;
+		}
+		/* tld::shortmotd */
+		else if (!strcmp(cep->ce_varname, "shortmotd"))
+		{
+			if (has_shortmotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::shortmotd");
+				continue;
+			}
+			has_shortmotd = 1;
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			if (((fd = open(cep->ce_vardata, O_RDONLY)) == -1))
+			{
+				config_error("%s:%i: tld::shortmotd: %s: %s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata, strerror(errno));
+				errors++;
+			}
+			else
+				close(fd);
+		}
+		/* tld::opermotd */
+		else if (!strcmp(cep->ce_varname, "opermotd"))
+		{
+			if (has_opermotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::opermotd");
+				continue;
+			}
+			has_opermotd = 1;
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			if (((fd = open(cep->ce_vardata, O_RDONLY)) == -1))
+			{
+				config_error("%s:%i: tld::opermotd: %s: %s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata, strerror(errno));
+				errors++;
+			}
+			else
+				close(fd);
+		}
+		/* tld::botmotd */
+		else if (!strcmp(cep->ce_varname, "botmotd"))
+		{
+			if (has_botmotd)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::botmotd");
+				continue;
+			}
+			has_botmotd = 1;
+			convert_to_absolute_path(&cep->ce_vardata, CONFDIR);
+			if (((fd = open(cep->ce_vardata, O_RDONLY)) == -1))
+			{
+				config_error("%s:%i: tld::botmotd: %s: %s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata, strerror(errno));
+				errors++;
+			}
+			else
+				close(fd);
+		}
+		/* tld::options */
+		else if (!strcmp(cep->ce_varname, "options")) {
+			ConfigEntry *cep2;
+
+			if (has_options)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "tld::options");
+				continue;
+			}
+			has_options = 1;
+
+			for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+			{
+				if (strcmp(cep2->ce_varname, "ssl") &&
+				    strcmp(cep2->ce_varname, "tls") &&
+				    strcmp(cep2->ce_varname, "remote"))
+				{
+					config_error_unknownopt(cep2->ce_fileptr->cf_filename,
+						cep2->ce_varlinenum, "tld", cep2->ce_varname);
+					errors++;
+				}
+			}
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"tld", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"tld::mask");
+		errors++;
+	}
+	if (!has_motd)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"tld::motd");
+		errors++;
+	}
+	if (!has_rules)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"tld::rules");
+		errors++;
+	}
+	return errors;
+}
+
+int	_conf_listen(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigEntry *cepp;
+	ConfigEntry *tlsconfig = NULL;
+	ConfigItem_listen *listen = NULL;
+	char *ip = NULL;
+	int start=0, end=0, port, isnew;
+	int tmpflags =0;
+	Hook *h;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "ip"))
+		{
+			ip = cep->ce_vardata;
+		} else
+		if (!strcmp(cep->ce_varname, "port"))
+		{
+			port_range(cep->ce_vardata, &start, &end);
+			if ((start < 0) || (start > 65535) || (end < 0) || (end > 65535))
+				return -1; /* this is already validated in _test_listen, but okay.. */
+		} else
+		if (!strcmp(cep->ce_varname, "options"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				NameValue *ofp;
+				if ((ofp = config_binary_flags_search(_ListenerFlags, cepp->ce_varname, ARRAY_SIZEOF(_ListenerFlags))))
+				{
+					tmpflags |= ofp->flag;
+				} else {
+					for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+					{
+						int value = (*(h->func.intfunc))(conf, cepp, CONFIG_LISTEN_OPTIONS);
+						if (value == 1)
+							break;
+					}
+				}
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "ssl-options") || !strcmp(cep->ce_varname, "tls-options"))
+		{
+			tlsconfig = cep;
+		} else
+		{
+			for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+			{
+				int value = (*(h->func.intfunc))(conf, cep, CONFIG_LISTEN);
+				if (value == 1)
+					break;
+			}
+		}
+	}
+	for (port = start; port <= end; port++)
+	{
+		/* First deal with IPv4 */
+		if (!strchr(ip, ':'))
+		{
+			if (!(listen = find_listen(ip, port, 0)))
+			{
+				listen = safe_alloc(sizeof(ConfigItem_listen));
+				safe_strdup(listen->ip, ip);
+				listen->port = port;
+				listen->fd = -1;
+				listen->ipv6 = 0;
+				isnew = 1;
+			} else
+				isnew = 0;
+
+			if (listen->options & LISTENER_BOUND)
+				tmpflags |= LISTENER_BOUND;
+
+			listen->options = tmpflags;
+			if (isnew)
+				AddListItem(listen, conf_listen);
+			listen->flag.temporary = 0;
+
+			if (listen->ssl_ctx)
+			{
+				SSL_CTX_free(listen->ssl_ctx);
+				listen->ssl_ctx = NULL;
+			}
+
+			if (listen->tls_options)
+			{
+				free_tls_options(listen->tls_options);
+				listen->tls_options = NULL;
+			}
+
+			if (tlsconfig)
+			{
+				listen->tls_options = safe_alloc(sizeof(TLSOptions));
+				conf_tlsblock(conf, tlsconfig, listen->tls_options);
+				listen->ssl_ctx = init_ctx(listen->tls_options, 1);
+			}
+
+			/* For modules that hook CONFIG_LISTEN and CONFIG_LISTEN_OPTIONS.
+			 * Yeah, ugly we have this here..
+			 * and again about 100 lines down too.
+			 */
+			for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			{
+				if (!strcmp(cep->ce_varname, "ip"))
+					;
+				else if (!strcmp(cep->ce_varname, "port"))
+					;
+				else if (!strcmp(cep->ce_varname, "options"))
+				{
+					for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					{
+						NameValue *ofp;
+						if (!config_binary_flags_search(_ListenerFlags, cepp->ce_varname, ARRAY_SIZEOF(_ListenerFlags)))
+						{
+							for (h = Hooks[HOOKTYPE_CONFIGRUN_EX]; h; h = h->next)
+							{
+								int value = (*(h->func.intfunc))(conf, cepp, CONFIG_LISTEN_OPTIONS, listen);
+								if (value == 1)
+									break;
+							}
+						}
+					}
+				} else
+				if (!strcmp(cep->ce_varname, "ssl-options") || !strcmp(cep->ce_varname, "tls-options"))
+					;
+				else
+				{
+					for (h = Hooks[HOOKTYPE_CONFIGRUN_EX]; h; h = h->next)
+					{
+						int value = (*(h->func.intfunc))(conf, cep, CONFIG_LISTEN, listen);
+						if (value == 1)
+							break;
+					}
+				}
+			}
+		}
+
+		/* Then deal with IPv6 (if available/enabled) */
+		if (!DISABLE_IPV6)
+		{
+			if (strchr(ip, ':') || (*ip == '*'))
+			{
+				if (!(listen = find_listen(ip, port, 1)))
+				{
+					listen = safe_alloc(sizeof(ConfigItem_listen));
+					safe_strdup(listen->ip, ip);
+					listen->port = port;
+					listen->fd = -1;
+					listen->ipv6 = 1;
+					isnew = 1;
+				} else
+					isnew = 0;
+
+				if (listen->options & LISTENER_BOUND)
+					tmpflags |= LISTENER_BOUND;
+
+				listen->options = tmpflags;
+				if (isnew)
+					AddListItem(listen, conf_listen);
+				listen->flag.temporary = 0;
+
+				if (listen->ssl_ctx)
+				{
+					SSL_CTX_free(listen->ssl_ctx);
+					listen->ssl_ctx = NULL;
+				}
+
+				if (listen->tls_options)
+				{
+					free_tls_options(listen->tls_options);
+					listen->tls_options = NULL;
+				}
+
+				if (tlsconfig)
+				{
+					listen->tls_options = safe_alloc(sizeof(TLSOptions));
+					conf_tlsblock(conf, tlsconfig, listen->tls_options);
+					listen->ssl_ctx = init_ctx(listen->tls_options, 1);
+				}
+				/* For modules that hook CONFIG_LISTEN and CONFIG_LISTEN_OPTIONS.
+				 * Yeah, ugly we have this here..
+				 */
+				for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+				{
+					if (!strcmp(cep->ce_varname, "ip"))
+						;
+					else if (!strcmp(cep->ce_varname, "port"))
+						;
+					else if (!strcmp(cep->ce_varname, "options"))
+					{
+						for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+						{
+							NameValue *ofp;
+							if (!config_binary_flags_search(_ListenerFlags, cepp->ce_varname, ARRAY_SIZEOF(_ListenerFlags)))
+							{
+								for (h = Hooks[HOOKTYPE_CONFIGRUN_EX]; h; h = h->next)
+								{
+									int value = (*(h->func.intfunc))(conf, cepp, CONFIG_LISTEN_OPTIONS, listen);
+									if (value == 1)
+										break;
+								}
+							}
+						}
+					} else
+					if (!strcmp(cep->ce_varname, "ssl-options") || !strcmp(cep->ce_varname, "tls-options"))
+						;
+					else
+					{
+						for (h = Hooks[HOOKTYPE_CONFIGRUN_EX]; h; h = h->next)
+						{
+							int value = (*(h->func.intfunc))(conf, cep, CONFIG_LISTEN, listen);
+							if (value == 1)
+								break;
+						}
+					}
+				}
+			}
+		}
+	}
+	return 1;
+}
+
+int	_test_listen(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigEntry *cepp;
+	int errors = 0;
+	char has_ip = 0, has_port = 0, has_options = 0, port_6667 = 0;
+	char *ip = NULL;
+	Hook *h;
+
+	if (ce->ce_vardata)
+	{
+		config_error("%s:%i: listen block has a new syntax, see https://www.unrealircd.org/docs/Listen_block",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+
+		need_34_upgrade = 1;
+		return 1;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		int used_by_module = 0;
+
+		/* First, check if a module knows about this listen::something */
+		for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+		{
+			int value, errs = 0;
+			if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+			    && !(h->owner->options & MOD_OPT_PERM))
+			{
+				continue;
+			}
+			value = (*(h->func.intfunc))(conf, cep, CONFIG_LISTEN, &errs);
+			if (value == 2)
+				used_by_module = 1;
+			if (value == 1)
+			{
+				used_by_module = 1;
+				break;
+			}
+			if (value == -1)
+			{
+				used_by_module = 1;
+				errors += errs;
+				break;
+			}
+			if (value == -2)
+			{
+				used_by_module = 1;
+				errors += errs;
+			}
+		}
+		if (!strcmp(cep->ce_varname, "options"))
+		{
+			if (has_options)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "listen::options");
+				continue;
+			}
+			has_options = 1;
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				NameValue *ofp;
+				if (!(ofp = config_binary_flags_search(_ListenerFlags, cepp->ce_varname, ARRAY_SIZEOF(_ListenerFlags))))
+				{
+					/* Check if a module knows about this listen::options::something */
+					int used_by_module = 0;
+					for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+					{
+						int value, errs = 0;
+						if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+						    && !(h->owner->options & MOD_OPT_PERM))
+						{
+							continue;
+						}
+						value = (*(h->func.intfunc))(conf, cepp, CONFIG_LISTEN_OPTIONS, &errs);
+						if (value == 2)
+							used_by_module = 1;
+						if (value == 1)
+						{
+							used_by_module = 1;
+							break;
+						}
+						if (value == -1)
+						{
+							used_by_module = 1;
+							errors += errs;
+							break;
+						}
+						if (value == -2)
+						{
+							used_by_module = 1;
+							errors += errs;
+						}
+					}
+					if (!used_by_module)
+					{
+						config_error_unknownopt(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum, "listen::options", cepp->ce_varname);
+						errors++;
+						continue;
+					}
+				}
+				if (!strcmp(cepp->ce_varname, "ssl") || !strcmp(cepp->ce_varname, "tls"))
+					have_tls_listeners = 1; /* for ssl config test */
+			}
+		}
+		else
+		if (!strcmp(cep->ce_varname, "ssl-options") || !strcmp(cep->ce_varname, "tls-options"))
+		{
+			test_tlsblock(conf, cep, &errors);
+		}
+		else
+		if (!cep->ce_vardata)
+		{
+			if (!used_by_module)
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "listen", cep->ce_varname);
+				errors++;
+			}
+			continue; /* always */
+		} else
+		if (!strcmp(cep->ce_varname, "ip"))
+		{
+			has_ip = 1;
+
+			if (strcmp(cep->ce_vardata, "*") && !is_valid_ip(cep->ce_vardata))
+			{
+				config_error("%s:%i: listen: illegal listen::ip (%s). Must be either '*' or contain a valid IP.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				return 1;
+			}
+			ip = cep->ce_vardata;
+		} else
+		if (!strcmp(cep->ce_varname, "host"))
+		{
+			config_error("%s:%i: listen: unknown option listen::host, did you mean listen::ip?",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+		} else
+		if (!strcmp(cep->ce_varname, "port"))
+		{
+			int start = 0, end = 0;
+
+			has_port = 1;
+
+			port_range(cep->ce_vardata, &start, &end);
+			if (start == end)
+			{
+				if ((start < 1) || (start > 65535))
+				{
+					config_error("%s:%i: listen: illegal port (must be 1..65535)",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					return 1;
+				}
+			}
+			else
+			{
+				if (end < start)
+				{
+					config_error("%s:%i: listen: illegal port range end value is less than starting value",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					return 1;
+				}
+				if (end - start >= 100)
+				{
+					config_error("%s:%i: listen: you requested port %d-%d, that's %d ports "
+						"(and thus consumes %d sockets) this is probably not what you want.",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, start, end,
+						end - start + 1, end - start + 1);
+					return 1;
+				}
+				if ((start < 1) || (start > 65535) || (end < 1) || (end > 65535))
+				{
+					config_error("%s:%i: listen: illegal port range values must be between 1 and 65535",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					return 1;
+				}
+			}
+
+			if ((6667 >= start) && (6667 <= end))
+				port_6667 = 1;
+		} else
+		{
+			if (!used_by_module)
+			{
+				config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					"listen", cep->ce_varname);
+				errors++;
+			}
+			continue; /* always */
+		}
+	}
+
+	if (!has_ip)
+	{
+		config_error("%s:%d: listen block requires an listen::ip",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	if (!has_port)
+	{
+		config_error("%s:%d: listen block requires an listen::port",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	if (port_6667)
+		safe_strdup(port_6667_ip, ip);
+
+	requiredstuff.conf_listen = 1;
+	return errors;
+}
+
+
+int	_conf_allow(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	ConfigItem_allow *allow;
+	Hook *h;
+
+	if (ce->ce_vardata)
+	{
+		if (!strcmp(ce->ce_vardata, "channel"))
+			return (_conf_allow_channel(conf, ce));
+		else
+		{
+			int value;
+			for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+			{
+				value = (*(h->func.intfunc))(conf,ce,CONFIG_ALLOW);
+				if (value == 1)
+					break;
+			}
+			return 0;
+		}
+	}
+	allow = safe_alloc(sizeof(ConfigItem_allow));
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "ip"))
+		{
+			safe_strdup(allow->ip, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "hostname"))
+			safe_strdup(allow->hostname, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "password"))
+			allow->auth = AuthBlockToAuthConfig(cep);
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			allow->class = find_class(cep->ce_vardata);
+			if (!allow->class || (allow->class->flag.temporary == 1))
+			{
+				config_status("%s:%i: illegal allow::class, unknown class '%s' using default of class 'default'",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum,
+					cep->ce_vardata);
+					allow->class = default_class;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "maxperip"))
+			allow->maxperip = atoi(cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "redirect-server"))
+			safe_strdup(allow->server, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "redirect-port"))
+			allow->port = atoi(cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "ipv6-clone-mask"))
+		{
+			/*
+			 * If this item isn't set explicitly by the
+			 * user, the value will temporarily be
+			 * zero. Defaults are applied in config_run().
+			 */
+			allow->ipv6_clone_mask = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "noident"))
+					allow->flags.noident = 1;
+				else if (!strcmp(cepp->ce_varname, "useip"))
+					allow->flags.useip = 1;
+				else if (!strcmp(cepp->ce_varname, "ssl") || !strcmp(cepp->ce_varname, "tls"))
+					allow->flags.tls = 1;
+			}
+		}
+	}
+
+	if (!allow->hostname)
+		safe_strdup(allow->hostname, "*@NOMATCH");
+
+	if (!allow->ip)
+		safe_strdup(allow->ip, "*@NOMATCH");
+
+	AddListItem(allow, conf_allow);
+	return 1;
+}
+
+int	_test_allow(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	int		errors = 0;
+	Hook *h;
+	char has_ip = 0, has_hostname = 0, has_maxperip = 0, has_password = 0, has_class = 0;
+	char has_redirectserver = 0, has_redirectport = 0, has_options = 0;
+	int hostname_possible_silliness = 0;
+
+	if (ce->ce_vardata)
+	{
+		if (!strcmp(ce->ce_vardata, "channel"))
+			return (_test_allow_channel(conf, ce));
+		else
+		{
+			int used = 0;
+			for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+			{
+				int value, errs = 0;
+				if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+				    && !(h->owner->options & MOD_OPT_PERM))
+					continue;
+				value = (*(h->func.intfunc))(conf,ce,CONFIG_ALLOW,&errs);
+				if (value == 2)
+					used = 1;
+				if (value == 1)
+				{
+					used = 1;
+					break;
+				}
+				if (value == -1)
+				{
+					used = 1;
+					errors += errs;
+					break;
+				}
+				if (value == -2)
+				{
+					used = 1;
+					errors += errs;
+				}
+			}
+			if (!used) {
+				config_error("%s:%i: allow item with unknown type",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+				return 1;
+			}
+			return errors;
+		}
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (strcmp(cep->ce_varname, "options") && config_is_blankorempty(cep, "allow"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "ip"))
+		{
+			if (has_ip)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::ip");
+				continue;
+			}
+			has_ip = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "maxperip"))
+		{
+			int v = atoi(cep->ce_vardata);
+			if (has_maxperip)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::maxperip");
+				continue;
+			}
+			has_maxperip = 1;
+			if ((v <= 0) || (v > 65535))
+			{
+				config_error("%s:%i: allow::maxperip with illegal value (must be 1-65535)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ipv6-clone-mask"))
+		{
+			/* keep this in sync with _test_set() */
+			int ipv6mask;
+			ipv6mask = atoi(cep->ce_vardata);
+			if (ipv6mask == 0)
+			{
+				config_error("%s:%d: allow::ipv6-clone-mask given a value of zero. This cannnot be correct, as it would treat all IPv6 hosts as one host.",
+					     cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+			if (ipv6mask > 128)
+			{
+				config_error("%s:%d: set::default-ipv6-clone-mask was set to %d. The maximum value is 128.",
+					     cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					     ipv6mask);
+				errors++;
+			}
+			if (ipv6mask <= 32)
+			{
+				config_warn("%s:%d: allow::ipv6-clone-mask was given a very small value.",
+					    cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "hostname"))
+		{
+			if (has_hostname)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::hostname");
+				continue;
+			}
+			has_hostname = 1;
+			if (!strcmp(cep->ce_vardata, "*@*") || !strcmp(cep->ce_vardata, "*"))
+				hostname_possible_silliness = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			if (has_password)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::password");
+				continue;
+			}
+			has_password = 1;
+			/* some auth check stuff? */
+			if (Auth_CheckError(cep) < 0)
+				errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			if (has_class)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::class");
+				continue;
+			}
+			has_class = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "redirect-server"))
+		{
+			if (has_redirectserver)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::redirect-server");
+				continue;
+			}
+			has_redirectserver = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "redirect-port"))
+		{
+			if (has_redirectport)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::redirect-port");
+				continue;
+			}
+			has_redirectport = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			if (has_options)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow::options");
+				continue;
+			}
+			has_options = 1;
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "noident"))
+				{}
+				else if (!strcmp(cepp->ce_varname, "useip"))
+				{}
+				else if (!strcmp(cepp->ce_varname, "ssl") || !strcmp(cepp->ce_varname, "tls"))
+				{}
+				else if (!strcmp(cepp->ce_varname, "sasl"))
+				{
+					config_error("%s:%d: The option allow::options::sasl no longer exists. "
+					             "Please use a require authentication { } block instead, which "
+					             "is more flexible and provides the same functionality. See "
+					             "https://www.unrealircd.org/docs/Require_authentication_block",
+					             cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+					errors++;
+				}
+				else
+				{
+					config_error_unknownopt(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "allow", cepp->ce_varname);
+					errors++;
+				}
+			}
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"allow", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	if (!has_ip && !has_hostname)
+	{
+		config_error("%s:%d: allow block needs an allow::ip or allow::hostname",
+				 ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	if (has_ip && has_hostname)
+	{
+		config_warn("%s:%d: allow block has both allow::ip and allow::hostname which is no longer permitted.",
+		            ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		need_34_upgrade = 1;
+	} else
+	if (hostname_possible_silliness)
+	{
+		config_warn("%s:%d: allow block contains 'hostname *;'. This means means that users "
+		            "without a valid hostname (unresolved IP's) will be unable to connect. "
+		            "You most likely want to use 'ip *;' instead.",
+		            ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+	}
+
+	if (!has_class)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"allow::class");
+		errors++;
+	}
+
+	if (!has_maxperip)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"allow::maxperip");
+		errors++;
+	}
+	return errors;
+}
+
+int	_conf_allow_channel(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigItem_allow_channel 	*allow = NULL;
+	ConfigEntry 	    	*cep;
+	char *class = NULL;
+	ConfigEntry *mask = NULL;
+
+	/* First, search for ::class, if any */
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "class"))
+			class = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "mask"))
+			mask = cep;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "channel"))
+		{
+			/* This way, we permit multiple ::channel items in one allow block */
+			allow = safe_alloc(sizeof(ConfigItem_allow_channel));
+			safe_strdup(allow->channel, cep->ce_vardata);
+			if (class)
+				safe_strdup(allow->class, class);
+			if (mask)
+				unreal_add_masks(&allow->mask, mask);
+			AddListItem(allow, conf_allow_channel);
+		}
+	}
+	return 1;
+}
+
+int	_test_allow_channel(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry		*cep;
+	int			errors = 0;
+	char			has_channel = 0, has_class = 0;
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "allow channel"))
+		{
+			errors++;
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "channel"))
+		{
+			has_channel = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+
+			if (has_class)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow channel::class");
+				continue;
+			}
+			has_class = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "mask"))
+		{
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"allow channel", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_channel)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"allow channel::channel");
+		errors++;
+	}
+	return errors;
+}
+
+int _conf_except(ConfigFile *conf, ConfigEntry *ce)
+{
+	Hook *h;
+	int value;
+
+	for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+	{
+		value = (*(h->func.intfunc))(conf,ce,CONFIG_EXCEPT);
+		if (value == 1)
+			break;
+	}
+
+	return 1;
+}
+
+int _test_except(ConfigFile *conf, ConfigEntry *ce)
+{
+	int errors = 0;
+	Hook *h;
+	int used = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: except without type",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+
+	if (!strcmp(ce->ce_vardata, "tkl"))
+	{
+		config_warn("%s:%i: except tkl { } is now called except ban { }. "
+		            "Simply rename the block from 'except tkl' to 'except ban' "
+		            "to get rid of this warning.",
+		            ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		safe_strdup(ce->ce_vardata, "ban"); /* awww */
+	}
+
+	for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+	{
+		int value, errs = 0;
+		if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+		    && !(h->owner->options & MOD_OPT_PERM))
+			continue;
+		value = (*(h->func.intfunc))(conf,ce,CONFIG_EXCEPT,&errs);
+		if (value == 2)
+			used = 1;
+		if (value == 1)
+		{
+			used = 1;
+			break;
+		}
+		if (value == -1)
+		{
+			used = 1;
+			errors += errs;
+			break;
+		}
+		if (value == -2)
+		{
+			used = 1;
+			errors += errs;
+		}
+	}
+
+	if (!used)
+	{
+		config_error("%s:%i: unknown except type %s",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_vardata);
+		return 1;
+	}
+
+	return errors;
+}
+
+/*
+ * vhost {} block parser
+*/
+int	_conf_vhost(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigItem_vhost *vhost;
+	ConfigEntry *cep, *cepp;
+	vhost = safe_alloc(sizeof(ConfigItem_vhost));
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "vhost"))
+		{
+			char *user, *host;
+			user = strtok(cep->ce_vardata, "@");
+			host = strtok(NULL, "");
+			if (!host)
+				safe_strdup(vhost->virthost, user);
+			else
+			{
+				safe_strdup(vhost->virtuser, user);
+				safe_strdup(vhost->virthost, host);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "login"))
+			safe_strdup(vhost->login, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "password"))
+			vhost->auth = AuthBlockToAuthConfig(cep);
+		else if (!strcmp(cep->ce_varname, "mask"))
+		{
+			unreal_add_masks(&vhost->mask, cep);
+		}
+		else if (!strcmp(cep->ce_varname, "swhois"))
+		{
+			SWhois *s;
+			if (cep->ce_entries)
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					s = safe_alloc(sizeof(SWhois));
+					safe_strdup(s->line, cepp->ce_varname);
+					safe_strdup(s->setby, "vhost");
+					AddListItem(s, vhost->swhois);
+				}
+			} else
+			if (cep->ce_vardata)
+			{
+				s = safe_alloc(sizeof(SWhois));
+				safe_strdup(s->line, cep->ce_vardata);
+				safe_strdup(s->setby, "vhost");
+				AddListItem(s, vhost->swhois);
+			}
+		}
+	}
+	AddListItem(vhost, conf_vhost);
+	return 1;
+}
+
+int	_test_vhost(ConfigFile *conf, ConfigEntry *ce)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+	char has_vhost = 0, has_login = 0, has_password = 0, has_mask = 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "vhost"))
+		{
+			char *at, *tmp, *host;
+			if (has_vhost)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "vhost::vhost");
+				continue;
+			}
+			has_vhost = 1;
+			if (!cep->ce_vardata)
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "vhost", "vhost");
+				errors++;
+				continue;
+			}
+			if ((at = strchr(cep->ce_vardata, '@')))
+			{
+				for (tmp = cep->ce_vardata; tmp != at; tmp++)
+				{
+					if (*tmp == '~' && tmp == cep->ce_vardata)
+						continue;
+					if (!isallowed(*tmp))
+						break;
+				}
+				if (tmp != at)
+				{
+					config_error("%s:%i: vhost::vhost contains an invalid ident",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					errors++;
+				}
+				host = at+1;
+			}
+			else
+				host = cep->ce_vardata;
+			if (!*host)
+			{
+				config_error("%s:%i: vhost::vhost does not have a host set",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+			else
+			{
+				if (!valid_host(host))
+				{
+					config_error("%s:%i: vhost::vhost contains an invalid host",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					errors++;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "login"))
+		{
+			if (has_login)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "vhost::login");
+			}
+			has_login = 1;
+			if (!cep->ce_vardata)
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "vhost", "login");
+				errors++;
+				continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			if (has_password)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "vhost::password");
+			}
+			has_password = 1;
+			if (!cep->ce_vardata)
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "vhost", "password");
+				errors++;
+				continue;
+			}
+			if (Auth_CheckError(cep) < 0)
+				errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "from"))
+		{
+			config_error("%s:%i: vhost::from::userhost is now called oper::mask",
+						 cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+			need_34_upgrade = 1;
+			continue;
+		}
+		else if (!strcmp(cep->ce_varname, "mask"))
+		{
+			has_mask = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "swhois"))
+		{
+			/* multiple is ok */
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"vhost", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_vhost)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"vhost::vhost");
+		errors++;
+	}
+	if (!has_login)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"vhost::login");
+		errors++;
+
+	}
+	if (!has_password)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"vhost::password");
+		errors++;
+	}
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"vhost::mask");
+		errors++;
+	}
+	// TODO: 3.2.x -> 4.x upgrading hints
+	return errors;
+}
+
+int	_test_sni(ConfigFile *conf, ConfigEntry *ce)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: sni block needs a name, eg: sni irc.xyz.com {",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "ssl-options") || !strcmp(cep->ce_varname, "tls-options"))
+		{
+			test_tlsblock(conf, cep, &errors);
+		} else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"sni", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	return errors;
+}
+
+int	_conf_sni(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigEntry *tlsconfig = NULL;
+	char *name;
+	ConfigItem_sni *sni = NULL;
+
+	name = ce->ce_vardata;
+	if (!name)
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "ssl-options") || !strcmp(cep->ce_varname, "tls-options"))
+		{
+			tlsconfig = cep;
+		}
+	}
+
+	if (!tlsconfig)
+		return 0;
+
+	sni = safe_alloc(sizeof(ConfigItem_listen));
+	safe_strdup(sni->name, name);
+	sni->tls_options = safe_alloc(sizeof(TLSOptions));
+	conf_tlsblock(conf, tlsconfig, sni->tls_options);
+	sni->ssl_ctx = init_ctx(sni->tls_options, 1);
+	AddListItem(sni, conf_sni);
+
+	return 1;
+}
+
+int     _conf_help(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigItem_help *ca;
+	MOTDLine *last = NULL, *temp;
+	ca = safe_alloc(sizeof(ConfigItem_help));
+
+	if (!ce->ce_vardata)
+		ca->command = NULL;
+	else
+		safe_strdup(ca->command, ce->ce_vardata);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		temp = safe_alloc(sizeof(MOTDLine));
+		safe_strdup(temp->line, cep->ce_varname);
+		temp->next = NULL;
+		if (!last)
+			ca->text = temp;
+		else
+			last->next = temp;
+		last = temp;
+	}
+	AddListItem(ca, conf_help);
+	return 1;
+
+}
+
+int _test_help(ConfigFile *conf, ConfigEntry *ce) {
+	int errors = 0;
+	ConfigEntry *cep;
+	if (!ce->ce_entries)
+	{
+		config_error("%s:%i: empty help block",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (strlen(cep->ce_varname) > 500)
+		{
+			config_error("%s:%i: oversized help item",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+			errors++;
+			continue;
+		}
+	}
+	return errors;
+}
+
+int     _conf_log(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	ConfigItem_log *ca;
+	NameValue *ofp = NULL;
+
+	ca = safe_alloc(sizeof(ConfigItem_log));
+	ca->logfd = -1;
+	safe_strdup(ca->file, ce->ce_vardata);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "maxsize"))
+		{
+			ca->maxsize = config_checkval(cep->ce_vardata,CFG_SIZE);
+		}
+		else if (!strcmp(cep->ce_varname, "flags"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if ((ofp = config_binary_flags_search(_LogFlags, cepp->ce_varname, ARRAY_SIZEOF(_LogFlags))))
+					ca->flags |= ofp->flag;
+			}
+		}
+	}
+	AddListItem(ca, conf_log);
+	return 1;
+
+}
+
+int _test_log(ConfigFile *conf, ConfigEntry *ce) {
+	int fd, errors = 0;
+	ConfigEntry *cep, *cepp;
+	char has_flags = 0, has_maxsize = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: log block without filename",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	if (!ce->ce_entries)
+	{
+		config_error("%s:%i: empty log block",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+
+	/* Convert to absolute path (if needed) unless it's "syslog" */
+	if (strcmp(ce->ce_vardata, "syslog"))
+		convert_to_absolute_path(&ce->ce_vardata, LOGDIR);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "flags"))
+		{
+			if (has_flags)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "log::flags");
+				continue;
+			}
+			has_flags = 1;
+			if (!cep->ce_entries)
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "log", cep->ce_varname);
+				errors++;
+				continue;
+			}
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!config_binary_flags_search(_LogFlags, cepp->ce_varname, ARRAY_SIZEOF(_LogFlags)))
+				{
+					config_error_unknownflag(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "log", cepp->ce_varname);
+					errors++;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "maxsize"))
+		{
+			if (has_maxsize)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "log::maxsize");
+				continue;
+			}
+			has_maxsize = 1;
+			if (!cep->ce_vardata)
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "log", cep->ce_varname);
+				errors++;
+			}
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"log", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+	if (!has_flags)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"log::flags");
+		errors++;
+	}
+	if ((fd = fd_fileopen(ce->ce_vardata, O_WRONLY|O_CREAT)) == -1)
+	{
+		config_error("%s:%i: Couldn't open logfile (%s) for writing: %s",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_vardata, strerror(errno));
+		errors++;
+	}
+	else
+		fd_close(fd);
+
+	return errors;
+}
+
+int	_conf_link(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp, *ceppp;
+	ConfigItem_link *link = NULL;
+	NameValue *ofp;
+
+	link = safe_alloc(sizeof(ConfigItem_link));
+	safe_strdup(link->servername, ce->ce_vardata);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "incoming"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "mask"))
+				{
+					unreal_add_masks(&link->incoming.mask, cepp);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "outgoing"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "bind-ip"))
+					safe_strdup(link->outgoing.bind_ip, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "hostname"))
+					safe_strdup(link->outgoing.hostname, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "port"))
+					link->outgoing.port = atoi(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "options"))
+				{
+					/* TODO: options still need to be split */
+					link->outgoing.options = 0;
+					for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+					{
+						if ((ofp = config_binary_flags_search(_LinkFlags, ceppp->ce_varname, ARRAY_SIZEOF(_LinkFlags))))
+							link->outgoing.options |= ofp->flag;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "ssl-options") || !strcmp(cepp->ce_varname, "tls-options"))
+				{
+					link->tls_options = safe_alloc(sizeof(TLSOptions));
+					conf_tlsblock(conf, cepp, link->tls_options);
+					link->ssl_ctx = init_ctx(link->tls_options, 0);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "password"))
+			link->auth = AuthBlockToAuthConfig(cep);
+		else if (!strcmp(cep->ce_varname, "hub"))
+			safe_strdup(link->hub, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "leaf"))
+			safe_strdup(link->leaf, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "leaf-depth") || !strcmp(cep->ce_varname, "leafdepth"))
+			link->leaf_depth = atoi(cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			link->class = find_class(cep->ce_vardata);
+			if (!link->class || (link->class->flag.temporary == 1))
+			{
+				config_status("%s:%i: illegal link::class, unknown class '%s' using default of class 'default'",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum,
+					cep->ce_vardata);
+				link->class = default_class;
+			}
+			link->class->xrefcount++;
+		}
+		else if (!strcmp(cep->ce_varname, "verify-certificate"))
+		{
+			link->verify_certificate = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			link->options = 0;
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if ((ofp = config_binary_flags_search(_LinkFlags, cepp->ce_varname, ARRAY_SIZEOF(_LinkFlags))))
+					link->options |= ofp->flag;
+			}
+		}
+	}
+
+	/* The default is 'hub *', unless you specify leaf or hub manually. */
+	if (!link->hub && !link->leaf)
+		safe_strdup(link->hub, "*");
+
+	AddListItem(link, conf_link);
+	return 0;
+}
+
+/** Helper function for erroring on duplicate items.
+ * TODO: make even more friendy for dev's?
+ */
+int config_detect_duplicate(int *var, ConfigEntry *ce, int *errors)
+{
+	if (*var)
+	{
+		config_error("%s:%d: Duplicate %s directive",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_varname);
+		(*errors)++;
+		return 1;
+	} else {
+		*var = 1;
+	}
+	return 0;
+}
+
+int	_test_link(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp, *ceppp;
+	int errors = 0;
+
+	int has_incoming = 0, has_incoming_mask = 0, has_outgoing = 0;
+	int has_outgoing_bind_ip = 0, has_outgoing_hostname = 0, has_outgoing_port = 0;
+	int has_outgoing_options = 0, has_hub = 0, has_leaf = 0, has_leaf_depth = 0;
+	int has_password = 0, has_class = 0, has_options = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: link without servername. Expected: link servername { ... }",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+
+	}
+
+	if (!strchr(ce->ce_vardata, '.'))
+	{
+		config_error("%s:%i: link: bogus server name. Expected: link servername { ... }",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "incoming"))
+		{
+			config_detect_duplicate(&has_incoming, cep, &errors);
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "mask"))
+				{
+					if (cepp->ce_vardata || cepp->ce_entries)
+						has_incoming_mask = 1;
+					else
+					if (config_is_blankorempty(cepp, "link::incoming"))
+					{
+						errors++;
+						continue;
+					}
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "outgoing"))
+		{
+			config_detect_duplicate(&has_outgoing, cep, &errors);
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "bind-ip"))
+				{
+					if (config_is_blankorempty(cepp, "link::outgoing"))
+					{
+						errors++;
+						continue;
+					}
+					config_detect_duplicate(&has_outgoing_bind_ip, cepp, &errors);
+					// todo: ipv4 vs ipv6
+				}
+				else if (!strcmp(cepp->ce_varname, "hostname"))
+				{
+					if (config_is_blankorempty(cepp, "link::outgoing"))
+					{
+						errors++;
+						continue;
+					}
+					config_detect_duplicate(&has_outgoing_hostname, cepp, &errors);
+					if (strchr(cepp->ce_vardata, '*') || strchr(cepp->ce_vardata, '?'))
+					{
+						config_error("%s:%i: hostname in link::outgoing(!) cannot contain wildcards",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "port"))
+				{
+					if (config_is_blankorempty(cepp, "link::outgoing"))
+					{
+						errors++;
+						continue;
+					}
+					config_detect_duplicate(&has_outgoing_port, cepp, &errors);
+				}
+				else if (!strcmp(cepp->ce_varname, "options"))
+				{
+					config_detect_duplicate(&has_outgoing_options, cepp, &errors);
+					for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+					{
+						if (!strcmp(ceppp->ce_varname, "autoconnect"))
+							;
+						else if (!strcmp(ceppp->ce_varname, "ssl") || !strcmp(ceppp->ce_varname, "tls"))
+							;
+						else if (!strcmp(ceppp->ce_varname, "insecure"))
+							;
+						else
+						{
+							config_error_unknownopt(ceppp->ce_fileptr->cf_filename,
+								ceppp->ce_varlinenum, "link::outgoing", ceppp->ce_varname);
+							errors++;
+						}
+						// TODO: validate more options (?) and use list rather than code here...
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "ssl-options") || !strcmp(cepp->ce_varname, "tls-options"))
+				{
+					test_tlsblock(conf, cepp, &errors);
+				}
+				else
+				{
+					config_error("%s:%d: Unknown directive '%s'",
+					             cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+					             config_var(cepp));
+					errors++;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			config_detect_duplicate(&has_password, cep, &errors);
+			if (Auth_CheckError(cep) < 0)
+			{
+				errors++;
+			} else {
+				AuthConfig *auth = AuthBlockToAuthConfig(cep);
+				/* hm. would be nicer if handled @auth-system I think. ah well.. */
+				if ((auth->type != AUTHTYPE_PLAINTEXT) && (auth->type != AUTHTYPE_TLS_CLIENTCERT) &&
+				    (auth->type != AUTHTYPE_TLS_CLIENTCERTFP) && (auth->type != AUTHTYPE_SPKIFP))
+				{
+					config_error("%s:%i: password in link block should be plaintext OR should be the "
+					             "SSL or SPKI fingerprint of the remote link (=better)",
+					             /* TODO: mention some faq or wiki item for more information */
+					             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					errors++;
+				}
+				Auth_FreeAuthConfig(auth);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "hub"))
+		{
+			if (config_is_blankorempty(cep, "link"))
+			{
+				errors++;
+				continue;
+			}
+			config_detect_duplicate(&has_hub, cep, &errors);
+		}
+		else if (!strcmp(cep->ce_varname, "leaf"))
+		{
+			if (config_is_blankorempty(cep, "link"))
+			{
+				errors++;
+				continue;
+			}
+			config_detect_duplicate(&has_leaf, cep, &errors);
+		}
+		else if (!strcmp(cep->ce_varname, "leaf-depth") || !strcmp(cep->ce_varname, "leafdepth"))
+		{
+			if (config_is_blankorempty(cep, "link"))
+			{
+				errors++;
+				continue;
+			}
+			config_detect_duplicate(&has_leaf_depth, cep, &errors);
+		}
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			if (config_is_blankorempty(cep, "link"))
+			{
+				errors++;
+				continue;
+			}
+			config_detect_duplicate(&has_class, cep, &errors);
+		}
+		else if (!strcmp(cep->ce_varname, "ciphers"))
+		{
+			config_error("%s:%d: link::ciphers has been moved to link::outgoing::ssl-options::ciphers, "
+			             "see https://www.unrealircd.org/docs/FAQ#link::ciphers_no_longer_works",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "verify-certificate"))
+		{
+			if (config_is_blankorempty(cep, "link"))
+			{
+				errors++;
+				continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			config_detect_duplicate(&has_options, cep, &errors);
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "quarantine"))
+					;
+				else
+				{
+					config_error("%s:%d: link::options only has one possible option ('quarantine', rarely used). "
+					             "Option '%s' is unrecognized. "
+					             "Perhaps you meant to set an outgoing option in link::outgoing::options instead?",
+					             cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname);
+					errors++;
+				}
+			}
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename,
+			    cep->ce_varlinenum, "link", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	if (!has_incoming && !has_outgoing)
+	{
+		config_error("%s:%d: link block needs at least an incoming or outgoing section.",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+		need_34_upgrade = 1;
+	}
+
+	if (has_incoming)
+	{
+		/* If we have an incoming sub-block then we need at least 'mask' and 'password' */
+		if (!has_incoming_mask)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "link::incoming::mask");
+			errors++;
+		}
+	}
+
+	if (has_outgoing)
+	{
+		/* If we have an outgoing sub-block then we need at least a hostname and port */
+		if (!has_outgoing_hostname)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "link::outgoing::hostname");
+			errors++;
+		}
+		if (!has_outgoing_port)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "link::outgoing::port");
+			errors++;
+		}
+	}
+
+	/* The only other generic options that are required are 'class' and 'password' */
+	if (!has_password)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum, "link::password");
+		errors++;
+	}
+	if (!has_class)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"link::class");
+		errors++;
+	}
+
+	return errors;
+}
+
+int     _conf_ban(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ConfigItem_ban *ca;
+	Hook *h;
+
+	ca = safe_alloc(sizeof(ConfigItem_ban));
+	if (!strcmp(ce->ce_vardata, "realname"))
+		ca->flag.type = CONF_BAN_REALNAME;
+	else if (!strcmp(ce->ce_vardata, "server"))
+		ca->flag.type = CONF_BAN_SERVER;
+	else if (!strcmp(ce->ce_vardata, "version"))
+	{
+		ca->flag.type = CONF_BAN_VERSION;
+		tempiConf.use_ban_version = 1; /* enable CTCP VERSION on connect */
+	}
+	else {
+		int value;
+		safe_free(ca); /* ca isn't used, modules have their own list. */
+		for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+		{
+			value = (*(h->func.intfunc))(conf,ce,CONFIG_BAN);
+			if (value == 1)
+				break;
+		}
+		return 0;
+	}
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			safe_strdup(ca->mask, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+			safe_strdup(ca->reason, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "action"))
+			ca ->action = banact_stringtoval(cep->ce_vardata);
+	}
+	AddListItem(ca, conf_ban);
+	return 0;
+}
+
+int     _test_ban(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int	    errors = 0;
+	Hook *h;
+	char type = 0;
+	char has_mask = 0, has_action = 0, has_reason = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: ban without type",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	else if (!strcmp(ce->ce_vardata, "server"))
+	{}
+	else if (!strcmp(ce->ce_vardata, "realname"))
+	{}
+	else if (!strcmp(ce->ce_vardata, "version"))
+		type = 'v';
+	else
+	{
+		int used = 0;
+		for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+		{
+			int value, errs = 0;
+			if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+			    && !(h->owner->options & MOD_OPT_PERM))
+				continue;
+			value = (*(h->func.intfunc))(conf,ce,CONFIG_BAN, &errs);
+			if (value == 2)
+				used = 1;
+			if (value == 1)
+			{
+				used = 1;
+				break;
+			}
+			if (value == -1)
+			{
+				used = 1;
+				errors += errs;
+				break;
+			}
+			if (value == -2)
+			{
+				used = 1;
+				errors += errs;
+			}
+		}
+		if (!used) {
+			config_error("%s:%i: unknown ban type %s",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				ce->ce_vardata);
+			return 1;
+		}
+		return errors;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "ban"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (has_mask)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "ban::mask");
+				continue;
+			}
+			has_mask = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			if (has_reason)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "ban::reason");
+				continue;
+			}
+			has_reason = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (has_action)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "ban::action");
+			}
+			has_action = 1;
+			if (!banact_stringtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: ban::action has unknown action type '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata);
+				errors++;
+			}
+		}
+	}
+
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"ban::mask");
+		errors++;
+	}
+	if (!has_reason)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"ban::reason");
+		errors++;
+	}
+	if (has_action && type != 'v')
+	{
+		config_error("%s:%d: ban::action specified even though type is not 'version'",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+	return errors;
+}
+
+int _conf_require(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	Hook *h;
+	char *usermask = NULL;
+	char *hostmask = NULL;
+	char *reason = NULL;
+
+	if (strcmp(ce->ce_vardata, "authentication") && strcmp(ce->ce_vardata, "sasl"))
+	{
+		/* Some other block... run modules... */
+		int value;
+		for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+		{
+			value = (*(h->func.intfunc))(conf,ce,CONFIG_REQUIRE);
+			if (value == 1)
+				break;
+		}
+		return 0;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			char buf[512], *p;
+			strlcpy(buf, cep->ce_vardata, sizeof(buf));
+			p = strchr(buf, '@');
+			if (p)
+			{
+				*p++ = '\0';
+				safe_strdup(usermask, buf);
+				safe_strdup(hostmask, p);
+			} else {
+				safe_strdup(hostmask, cep->ce_vardata);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+			safe_strdup(reason, cep->ce_vardata);
+	}
+
+	if (!usermask)
+		safe_strdup(usermask, "*");
+
+	if (!reason)
+		safe_strdup(reason, "-");
+
+	tkl_add_serverban(TKL_KILL, usermask, hostmask, reason, "-config-", 0, TStime(), 1, TKL_FLAG_CONFIG);
+	safe_free(usermask);
+	safe_free(hostmask);
+	safe_free(reason);
+	return 0;
+}
+
+int _test_require(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int errors = 0;
+	Hook *h;
+	char has_mask = 0, has_reason = 0;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: require without type, did you mean 'require authentication'?",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	if (!strcmp(ce->ce_vardata, "authentication"))
+	{}
+	else if (!strcmp(ce->ce_vardata, "sasl"))
+	{
+		config_warn("%s:%i: the 'require sasl' block is now called 'require authentication'",
+		            ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+	}
+	else
+	{
+		int used = 0;
+		for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+		{
+			int value, errs = 0;
+			if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+			    && !(h->owner->options & MOD_OPT_PERM))
+				continue;
+			value = (*(h->func.intfunc))(conf,ce,CONFIG_REQUIRE, &errs);
+			if (value == 2)
+				used = 1;
+			if (value == 1)
+			{
+				used = 1;
+				break;
+			}
+			if (value == -1)
+			{
+				used = 1;
+				errors += errs;
+				break;
+			}
+			if (value == -2)
+			{
+				used = 1;
+				errors += errs;
+			}
+		}
+		if (!used) {
+			config_error("%s:%i: unknown require type '%s'",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				ce->ce_vardata);
+			return 1;
+		}
+		return errors;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "require"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (has_mask)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "require::mask");
+				continue;
+			}
+			has_mask = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			if (has_reason)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "require::reason");
+				continue;
+			}
+			has_reason = 1;
+		}
+	}
+
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"require::mask");
+		errors++;
+	}
+	if (!has_reason)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"require::reason");
+		errors++;
+	}
+	return errors;
+}
+
+#define CheckNull(x) if ((!(x)->ce_vardata) || (!(*((x)->ce_vardata)))) { config_error("%s:%i: missing parameter", (x)->ce_fileptr->cf_filename, (x)->ce_varlinenum); errors++; continue; }
+#define CheckNullAllowEmpty(x) if ((!(x)->ce_vardata)) { config_error("%s:%i: missing parameter", (x)->ce_fileptr->cf_filename, (x)->ce_varlinenum); errors++; continue; }
+#define CheckDuplicate(cep, name, display) if (settings.has_##name) { config_warn_duplicate((cep)->ce_fileptr->cf_filename, cep->ce_varlinenum, "set::" display); continue; } else settings.has_##name = 1
+
+void test_tlsblock(ConfigFile *conf, ConfigEntry *cep, int *totalerrors)
+{
+	ConfigEntry *cepp, *ceppp;
+	int errors = 0;
+
+	for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+	{
+		if (!strcmp(cepp->ce_varname, "renegotiate-timeout"))
+		{
+		}
+		else if (!strcmp(cepp->ce_varname, "renegotiate-bytes"))
+		{
+		}
+		else if (!strcmp(cepp->ce_varname, "ciphers") || !strcmp(cepp->ce_varname, "server-cipher-list"))
+		{
+			CheckNull(cepp);
+		}
+		else if (!strcmp(cepp->ce_varname, "ciphersuites"))
+		{
+			CheckNull(cepp);
+		}
+		else if (!strcmp(cepp->ce_varname, "ecdh-curves"))
+		{
+			CheckNull(cepp);
+#ifndef HAS_SSL_CTX_SET1_CURVES_LIST
+			config_error("ecdh-curves specified but your OpenSSL/LibreSSL library does not "
+			             "support setting curves manually by name. Either upgrade to a "
+			             "newer library version or remove the 'ecdh-curves' directive "
+			             "from your configuration file");
+			errors++;
+#endif
+		}
+		else if (!strcmp(cepp->ce_varname, "protocols"))
+		{
+			char copy[512], *p, *name;
+			int v = 0;
+			int option;
+			char modifier;
+
+			CheckNull(cepp);
+			strlcpy(copy, cepp->ce_vardata, sizeof(copy));
+			for (name = strtoken(&p, copy, ","); name; name = strtoken(&p, NULL, ","))
+			{
+				modifier = '\0';
+				option = 0;
+
+				if ((*name == '+') || (*name == '-'))
+				{
+					modifier = *name;
+					name++;
+				}
+
+				if (!strcasecmp(name, "All"))
+					option = TLS_PROTOCOL_ALL;
+				else if (!strcasecmp(name, "TLSv1"))
+					option = TLS_PROTOCOL_TLSV1;
+				else if (!strcasecmp(name, "TLSv1.1"))
+					option = TLS_PROTOCOL_TLSV1_1;
+				else if (!strcasecmp(name, "TLSv1.2"))
+					option = TLS_PROTOCOL_TLSV1_2;
+				else if (!strcasecmp(name, "TLSv1.3"))
+					option = TLS_PROTOCOL_TLSV1_3;
+				else
+				{
+#ifdef SSL_OP_NO_TLSv1_3
+					config_warn("%s:%i: %s: unknown protocol '%s'. "
+								 "Valid protocols are: TLSv1,TLSv1.1,TLSv1.2,TLSv1.3",
+								 cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, config_var(cepp), name);
+#else
+					config_warn("%s:%i: %s: unknown protocol '%s'. "
+								 "Valid protocols are: TLSv1,TLSv1.1,TLSv1.2",
+								 cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, config_var(cepp), name);
+#endif
+				}
+
+				if (option)
+				{
+					if (modifier == '\0')
+						v = option;
+					else if (modifier == '+')
+						v |= option;
+					else if (modifier == '-')
+						v &= ~option;
+				}
+			}
+			if (v == 0)
+			{
+				config_error("%s:%i: %s: no protocols enabled. Hint: set at least TLSv1.2",
+					cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, config_var(cepp));
+				errors++;
+			}
+		}
+		else if (!strcmp(cepp->ce_varname, "certificate") ||
+		         !strcmp(cepp->ce_varname, "dh") ||
+		         !strcmp(cepp->ce_varname, "key") ||
+		         !strcmp(cepp->ce_varname, "trusted-ca-file"))
+		{
+			char *path;
+			CheckNull(cepp);
+			path = convert_to_absolute_path_duplicate(cepp->ce_vardata, CONFDIR);
+			if (!file_exists(path))
+			{
+				config_error("%s:%i: %s: could not open '%s': %s",
+					cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, config_var(cepp),
+					path, strerror(errno));
+				safe_free(path);
+				errors++;
+			}
+			safe_free(path);
+		}
+		else if (!strcmp(cepp->ce_varname, "outdated-protocols"))
+		{
+			char copy[512], *p, *name;
+			int v = 0;
+			int option;
+			char modifier;
+
+			CheckNull(cepp);
+			strlcpy(copy, cepp->ce_vardata, sizeof(copy));
+			for (name = strtoken(&p, copy, ","); name; name = strtoken(&p, NULL, ","))
+			{
+				if (!strcasecmp(name, "All"))
+					;
+				else if (!strcasecmp(name, "TLSv1"))
+					;
+				else if (!strcasecmp(name, "TLSv1.1"))
+					;
+				else if (!strcasecmp(name, "TLSv1.2"))
+					;
+				else if (!strcasecmp(name, "TLSv1.3"))
+					;
+				else
+				{
+#ifdef SSL_OP_NO_TLSv1_3
+					config_warn("%s:%i: %s: unknown protocol '%s'. "
+								 "Valid protocols are: TLSv1,TLSv1.1,TLSv1.2,TLSv1.3",
+								 cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, config_var(cepp), name);
+#else
+					config_warn("%s:%i: %s: unknown protocol '%s'. "
+								 "Valid protocols are: TLSv1,TLSv1.1,TLSv1.2",
+								 cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, config_var(cepp), name);
+#endif
+		                }
+			}
+		}
+		else if (!strcmp(cepp->ce_varname, "outdated-ciphers"))
+		{
+			CheckNull(cepp);
+		}
+		else if (!strcmp(cepp->ce_varname, "options"))
+		{
+			for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+				if (!config_binary_flags_search(_TLSFlags, ceppp->ce_varname, ARRAY_SIZEOF(_TLSFlags)))
+				{
+					config_error("%s:%i: unknown SSL/TLS option '%s'",
+							 ceppp->ce_fileptr->cf_filename,
+							 ceppp->ce_varlinenum, ceppp->ce_varname);
+					errors ++;
+				}
+		}
+		else if (!strcmp(cepp->ce_varname, "sts-policy"))
+		{
+			int has_port = 0;
+			int has_duration = 0;
+
+			for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+			{
+				if (!strcmp(ceppp->ce_varname, "port"))
+				{
+					int port;
+					CheckNull(ceppp);
+					port = atoi(ceppp->ce_vardata);
+					if ((port < 1) || (port > 65535))
+					{
+						config_error("%s:%i: invalid port number specified in sts-policy::port (%d)",
+						             ceppp->ce_fileptr->cf_filename, ceppp->ce_varlinenum, port);
+						errors++;
+					}
+					has_port = 1;
+				}
+				else if (!strcmp(ceppp->ce_varname, "duration"))
+				{
+					long duration;
+					CheckNull(ceppp);
+					duration = config_checkval(ceppp->ce_vardata, CFG_TIME);
+					if (duration < 1)
+					{
+						config_error("%s:%i: invalid duration specified in sts-policy::duration (%ld seconds)",
+						             ceppp->ce_fileptr->cf_filename, ceppp->ce_varlinenum, duration);
+						errors++;
+					}
+					has_duration = 1;
+				}
+				else if (!strcmp(ceppp->ce_varname, "preload"))
+				{
+					CheckNull(ceppp);
+				}
+			}
+			if (!has_port)
+			{
+				config_error("%s:%i: sts-policy block without port",
+				             cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+				errors++;
+			}
+			if (!has_duration)
+			{
+				config_error("%s:%i: sts-policy block without duration",
+				             cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+				errors++;
+			}
+		}
+		else
+		{
+			config_error("%s:%i: unknown directive %s",
+				cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+				config_var(cepp));
+			errors++;
+		}
+	}
+
+	*totalerrors += errors;
+}
+
+void free_tls_options(TLSOptions *tlsoptions)
+{
+	if (!tlsoptions)
+		return;
+
+	safe_free(tlsoptions->certificate_file);
+	safe_free(tlsoptions->key_file);
+	safe_free(tlsoptions->dh_file);
+	safe_free(tlsoptions->trusted_ca_file);
+	safe_free(tlsoptions->ciphers);
+	safe_free(tlsoptions->ciphersuites);
+	safe_free(tlsoptions->ecdh_curves);
+	safe_free(tlsoptions->outdated_protocols);
+	safe_free(tlsoptions->outdated_ciphers);
+	memset(tlsoptions, 0, sizeof(TLSOptions));
+	safe_free(tlsoptions);
+}
+
+void conf_tlsblock(ConfigFile *conf, ConfigEntry *cep, TLSOptions *tlsoptions)
+{
+	ConfigEntry *cepp, *ceppp;
+	NameValue *ofl;
+
+	/* First, inherit settings from set::options::tls */
+	if (tlsoptions != tempiConf.tls_options)
+	{
+		safe_strdup(tlsoptions->certificate_file, tempiConf.tls_options->certificate_file);
+		safe_strdup(tlsoptions->key_file, tempiConf.tls_options->key_file);
+		safe_strdup(tlsoptions->dh_file, tempiConf.tls_options->dh_file);
+		safe_strdup(tlsoptions->trusted_ca_file, tempiConf.tls_options->trusted_ca_file);
+		tlsoptions->protocols = tempiConf.tls_options->protocols;
+		safe_strdup(tlsoptions->ciphers, tempiConf.tls_options->ciphers);
+		safe_strdup(tlsoptions->ciphersuites, tempiConf.tls_options->ciphersuites);
+		safe_strdup(tlsoptions->ecdh_curves, tempiConf.tls_options->ecdh_curves);
+		safe_strdup(tlsoptions->outdated_protocols, tempiConf.tls_options->outdated_protocols);
+		safe_strdup(tlsoptions->outdated_ciphers, tempiConf.tls_options->outdated_ciphers);
+		tlsoptions->options = tempiConf.tls_options->options;
+		tlsoptions->renegotiate_bytes = tempiConf.tls_options->renegotiate_bytes;
+		tlsoptions->renegotiate_timeout = tempiConf.tls_options->renegotiate_timeout;
+		tlsoptions->sts_port = tempiConf.tls_options->sts_port;
+		tlsoptions->sts_duration = tempiConf.tls_options->sts_duration;
+		tlsoptions->sts_preload = tempiConf.tls_options->sts_preload;
+	}
+
+	/* Now process the options */
+	for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+	{
+		if (!strcmp(cepp->ce_varname, "ciphers") || !strcmp(cepp->ce_varname, "server-cipher-list"))
+		{
+			safe_strdup(tlsoptions->ciphers, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "ciphersuites"))
+		{
+			safe_strdup(tlsoptions->ciphersuites, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "ecdh-curves"))
+		{
+			safe_strdup(tlsoptions->ecdh_curves, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "protocols"))
+		{
+			char copy[512], *p, *name;
+			int option;
+			char modifier;
+
+			strlcpy(copy, cepp->ce_vardata, sizeof(copy));
+			tlsoptions->protocols = 0;
+			for (name = strtoken(&p, copy, ","); name; name = strtoken(&p, NULL, ","))
+			{
+				modifier = '\0';
+				option = 0;
+
+				if ((*name == '+') || (*name == '-'))
+				{
+					modifier = *name;
+					name++;
+				}
+
+				if (!strcasecmp(name, "All"))
+					option = TLS_PROTOCOL_ALL;
+				else if (!strcasecmp(name, "TLSv1"))
+					option = TLS_PROTOCOL_TLSV1;
+				else if (!strcasecmp(name, "TLSv1.1"))
+					option = TLS_PROTOCOL_TLSV1_1;
+				else if (!strcasecmp(name, "TLSv1.2"))
+					option = TLS_PROTOCOL_TLSV1_2;
+				else if (!strcasecmp(name, "TLSv1.3"))
+					option = TLS_PROTOCOL_TLSV1_3;
+
+				if (option)
+				{
+					if (modifier == '\0')
+						tlsoptions->protocols = option;
+					else if (modifier == '+')
+						tlsoptions->protocols |= option;
+					else if (modifier == '-')
+						tlsoptions->protocols &= ~option;
+				}
+			}
+		}
+		else if (!strcmp(cepp->ce_varname, "dh"))
+		{
+			convert_to_absolute_path(&cepp->ce_vardata, CONFDIR);
+		}
+		else if (!strcmp(cepp->ce_varname, "certificate"))
+		{
+			convert_to_absolute_path(&cepp->ce_vardata, CONFDIR);
+			safe_strdup(tlsoptions->certificate_file, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "key"))
+		{
+			convert_to_absolute_path(&cepp->ce_vardata, CONFDIR);
+			safe_strdup(tlsoptions->key_file, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "trusted-ca-file"))
+		{
+			convert_to_absolute_path(&cepp->ce_vardata, CONFDIR);
+			safe_strdup(tlsoptions->trusted_ca_file, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "outdated-protocols"))
+		{
+			safe_strdup(tlsoptions->outdated_protocols, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "outdated-ciphers"))
+		{
+			safe_strdup(tlsoptions->outdated_ciphers, cepp->ce_vardata);
+		}
+		else if (!strcmp(cepp->ce_varname, "renegotiate-bytes"))
+		{
+			tlsoptions->renegotiate_bytes = config_checkval(cepp->ce_vardata, CFG_SIZE);
+		}
+		else if (!strcmp(cepp->ce_varname, "renegotiate-timeout"))
+		{
+			tlsoptions->renegotiate_timeout = config_checkval(cepp->ce_vardata, CFG_TIME);
+		}
+		else if (!strcmp(cepp->ce_varname, "options"))
+		{
+			tlsoptions->options = 0;
+			for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+			{
+				ofl = config_binary_flags_search(_TLSFlags, ceppp->ce_varname, ARRAY_SIZEOF(_TLSFlags));
+				if (ofl) /* this should always be true */
+					tlsoptions->options |= ofl->flag;
+			}
+		}
+		else if (!strcmp(cepp->ce_varname, "sts-policy"))
+		{
+			/* We do not inherit ::sts-policy if there is a specific block for this one... */
+			tlsoptions->sts_port = 0;
+			tlsoptions->sts_duration = 0;
+			tlsoptions->sts_preload = 0;
+			for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+			{
+				if (!strcmp(ceppp->ce_varname, "port"))
+					tlsoptions->sts_port = atoi(ceppp->ce_vardata);
+				else if (!strcmp(ceppp->ce_varname, "duration"))
+					tlsoptions->sts_duration = config_checkval(ceppp->ce_vardata, CFG_TIME);
+				else if (!strcmp(ceppp->ce_varname, "preload"))
+					tlsoptions->sts_preload = config_checkval(ceppp->ce_vardata, CFG_YESNO);
+			}
+		}
+	}
+}
+
+int	_conf_set(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp, *ceppp;
+	Hook *h;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "kline-address")) {
+			safe_strdup(tempiConf.kline_address, cep->ce_vardata);
+		}
+		if (!strcmp(cep->ce_varname, "gline-address")) {
+			safe_strdup(tempiConf.gline_address, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "modes-on-connect")) {
+			tempiConf.conn_modes = (long) set_usermode(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "modes-on-oper")) {
+			tempiConf.oper_modes = (long) set_usermode(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "modes-on-join")) {
+			conf_channelmodes(cep->ce_vardata, &tempiConf.modes_on_join, 0);
+		}
+		else if (!strcmp(cep->ce_varname, "snomask-on-oper")) {
+			safe_strdup(tempiConf.oper_snomask, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "level-on-join")) {
+			tempiConf.level_on_join = channellevel_to_int(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "static-quit")) {
+			safe_strdup(tempiConf.static_quit, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "static-part")) {
+			safe_strdup(tempiConf.static_part, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "who-limit")) {
+			tempiConf.who_limit = atol(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "maxbans")) {
+			tempiConf.maxbans = atol(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "maxbanlength")) {
+			tempiConf.maxbanlength = atol(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "silence-limit")) {
+			tempiConf.silence_limit = atol(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "auto-join")) {
+			safe_strdup(tempiConf.auto_join_chans, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "oper-auto-join")) {
+			safe_strdup(tempiConf.oper_auto_join_chans, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "check-target-nick-bans")) {
+			tempiConf.check_target_nick_bans = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "ping-cookie")) {
+			tempiConf.ping_cookie = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "watch-away-notification")) {
+			tempiConf.watch_away_notification = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "uhnames")) {
+			tempiConf.uhnames = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "allow-userhost-change")) {
+			if (!strcasecmp(cep->ce_vardata, "always"))
+				tempiConf.userhost_allowed = UHALLOW_ALWAYS;
+			else if (!strcasecmp(cep->ce_vardata, "never"))
+				tempiConf.userhost_allowed = UHALLOW_NEVER;
+			else if (!strcasecmp(cep->ce_vardata, "not-on-channels"))
+				tempiConf.userhost_allowed = UHALLOW_NOCHANS;
+			else
+				tempiConf.userhost_allowed = UHALLOW_REJOIN;
+		}
+		else if (!strcmp(cep->ce_varname, "channel-command-prefix")) {
+			safe_strdup(tempiConf.channel_command_prefix, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "restrict-usermodes")) {
+			int i;
+			char *p = safe_alloc(strlen(cep->ce_vardata) + 1), *x = p;
+			/* The data should be something like 'Gw' or something,
+			 * but just in case users use '+Gw' then ignore the + (and -).
+			 */
+			for (i=0; i < strlen(cep->ce_vardata); i++)
+				if ((cep->ce_vardata[i] != '+') && (cep->ce_vardata[i] != '-'))
+					*x++ = cep->ce_vardata[i];
+			*x = '\0';
+			tempiConf.restrict_usermodes = p;
+		}
+		else if (!strcmp(cep->ce_varname, "restrict-channelmodes")) {
+			int i;
+			char *p = safe_alloc(strlen(cep->ce_vardata) + 1), *x = p;
+			/* The data should be something like 'GL' or something,
+			 * but just in case users use '+GL' then ignore the + (and -).
+			 */
+			for (i=0; i < strlen(cep->ce_vardata); i++)
+				if ((cep->ce_vardata[i] != '+') && (cep->ce_vardata[i] != '-'))
+					*x++ = cep->ce_vardata[i];
+			*x = '\0';
+			tempiConf.restrict_channelmodes = p;
+		}
+		else if (!strcmp(cep->ce_varname, "restrict-extendedbans")) {
+			safe_strdup(tempiConf.restrict_extendedbans, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "anti-spam-quit-message-time")) {
+			tempiConf.anti_spam_quit_message_time = config_checkval(cep->ce_vardata,CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "allow-user-stats")) {
+			if (!cep->ce_entries)
+			{
+				safe_strdup(tempiConf.allow_user_stats, cep->ce_vardata);
+			}
+			else
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					OperStat *os = safe_alloc(sizeof(OperStat));
+					safe_strdup(os->flag, cepp->ce_varname);
+					AddListItem(os, tempiConf.allow_user_stats_ext);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "maxchannelsperuser")) {
+			tempiConf.maxchannelsperuser = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "ping-warning")) {
+			tempiConf.ping_warning = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "maxdccallow")) {
+			tempiConf.maxdccallow = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "max-targets-per-command"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				int v;
+				if (!strcmp(cepp->ce_vardata, "max"))
+					v = MAXTARGETS_MAX;
+				else
+					v = atoi(cepp->ce_vardata);
+				setmaxtargets(cepp->ce_varname, v);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "network-name")) {
+			char *tmp;
+			safe_strdup(tempiConf.network.x_ircnetwork, cep->ce_vardata);
+			for (tmp = cep->ce_vardata; *cep->ce_vardata; cep->ce_vardata++) {
+				if (*cep->ce_vardata == ' ')
+					*cep->ce_vardata='-';
+			}
+			safe_strdup(tempiConf.network.x_ircnet005, tmp);
+			cep->ce_vardata = tmp;
+		}
+		else if (!strcmp(cep->ce_varname, "default-server")) {
+			safe_strdup(tempiConf.network.x_defserv, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "services-server")) {
+			safe_strdup(tempiConf.network.x_services_name, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "sasl-server")) {
+			safe_strdup(tempiConf.network.x_sasl_server, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "stats-server")) {
+			safe_strdup(tempiConf.network.x_stats_server, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "help-channel")) {
+			safe_strdup(tempiConf.network.x_helpchan, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "hiddenhost-prefix")) {
+			safe_strdup(tempiConf.network.x_hidden_host, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "hide-ban-reason")) {
+			tempiConf.hide_ban_reason = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "prefix-quit")) {
+			if (!strcmp(cep->ce_vardata, "0") || !strcmp(cep->ce_vardata, "no"))
+				safe_free(tempiConf.network.x_prefix_quit);
+			else
+				safe_strdup(tempiConf.network.x_prefix_quit, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "link")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "bind-ip")) {
+					safe_strdup(tempiConf.link_bindip, cepp->ce_vardata);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "dns")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "bind-ip")) {
+					safe_strdup(tempiConf.dns_bindip, cepp->ce_vardata);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "anti-flood")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "unknown-flood-bantime"))
+					tempiConf.unknown_flood_bantime = config_checkval(cepp->ce_vardata,CFG_TIME);
+				else if (!strcmp(cepp->ce_varname, "unknown-flood-amount"))
+					tempiConf.unknown_flood_amount = atol(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "away-count"))
+					tempiConf.away_count = atol(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "away-period"))
+					tempiConf.away_period = config_checkval(cepp->ce_vardata, CFG_TIME);
+				else if (!strcmp(cepp->ce_varname, "away-flood"))
+				{
+					int cnt, period;
+					config_parse_flood(cepp->ce_vardata, &cnt, &period);
+					tempiConf.away_count = cnt;
+					tempiConf.away_period = period;
+				}
+				else if (!strcmp(cepp->ce_varname, "nick-flood"))
+				{
+					int cnt, period;
+					config_parse_flood(cepp->ce_vardata, &cnt, &period);
+					tempiConf.nick_count = cnt;
+					tempiConf.nick_period = period;
+				}
+				else if (!strcmp(cepp->ce_varname, "away-flood"))
+				{
+					int cnt, period;
+					config_parse_flood(cepp->ce_vardata, &cnt, &period);
+					tempiConf.away_count = cnt;
+					tempiConf.away_period = period;
+				}
+				else if (!strcmp(cepp->ce_varname, "invite-flood"))
+				{
+					int cnt, period;
+					config_parse_flood(cepp->ce_vardata, &cnt, &period);
+					tempiConf.invite_count = cnt;
+					tempiConf.invite_period = period;
+				}
+				else if (!strcmp(cepp->ce_varname, "knock-flood"))
+				{
+					int cnt, period;
+					config_parse_flood(cepp->ce_vardata, &cnt, &period);
+					tempiConf.knock_count = cnt;
+					tempiConf.knock_period = period;
+				}
+				else if (!strcmp(cepp->ce_varname, "connect-flood"))
+				{
+					int cnt, period;
+					config_parse_flood(cepp->ce_vardata, &cnt, &period);
+					tempiConf.throttle_count = cnt;
+					tempiConf.throttle_period = period;
+				}
+				if (!strcmp(cepp->ce_varname, "max-concurrent-conversations"))
+				{
+					for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+					{
+						if (!strcmp(ceppp->ce_varname, "users"))
+						{
+							tempiConf.max_concurrent_conversations_users = atoi(ceppp->ce_vardata);
+						} else
+						if (!strcmp(ceppp->ce_varname, "new-user-every"))
+						{
+							tempiConf.max_concurrent_conversations_new_user_every = config_checkval(ceppp->ce_vardata, CFG_TIME);
+						}
+					}
+				}
+				else
+				{
+					for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+					{
+						int value = (*(h->func.intfunc))(conf,cepp,CONFIG_SET_ANTI_FLOOD);
+						if (value == 1)
+							break;
+					}
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "options")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "hide-ulines")) {
+					tempiConf.hide_ulines = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "flat-map")) {
+					tempiConf.flat_map = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "show-opermotd")) {
+					tempiConf.som = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "identd-check")) {
+					tempiConf.ident_check = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "fail-oper-warn")) {
+					tempiConf.fail_oper_warn = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "show-connect-info")) {
+					tempiConf.show_connect_info = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "no-connect-tls-info")) {
+					tempiConf.no_connect_tls_info = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "dont-resolve")) {
+					tempiConf.dont_resolve = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "mkpasswd-for-everyone")) {
+					tempiConf.mkpasswd_for_everyone = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "allow-insane-bans")) {
+					tempiConf.allow_insane_bans = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "allow-part-if-shunned")) {
+					tempiConf.allow_part_if_shunned = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "disable-cap")) {
+					tempiConf.disable_cap = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "disable-ipv6")) {
+					/* other code handles this */
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "cloak-keys"))
+		{
+			for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+			{
+				int value;
+				value = (*(h->func.intfunc))(conf, cep, CONFIG_CLOAKKEYS);
+				if (value == 1)
+					break;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ident"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "connect-timeout"))
+					tempiConf.ident_connect_timeout = config_checkval(cepp->ce_vardata,CFG_TIME);
+				if (!strcmp(cepp->ce_varname, "read-timeout"))
+					tempiConf.ident_read_timeout = config_checkval(cepp->ce_vardata,CFG_TIME);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "spamfilter"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "ban-time"))
+					tempiConf.spamfilter_ban_time = config_checkval(cepp->ce_vardata,CFG_TIME);
+				else if (!strcmp(cepp->ce_varname, "ban-reason"))
+					safe_strdup(tempiConf.spamfilter_ban_reason, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "virus-help-channel"))
+					safe_strdup(tempiConf.spamfilter_virus_help_channel, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "virus-help-channel-deny"))
+					tempiConf.spamfilter_vchan_deny = config_checkval(cepp->ce_vardata,CFG_YESNO);
+				else if (!strcmp(cepp->ce_varname, "except"))
+				{
+					char *name, *p;
+					SpamExcept *e;
+					safe_strdup(tempiConf.spamexcept_line, cepp->ce_vardata);
+					for (name = strtoken(&p, cepp->ce_vardata, ","); name; name = strtoken(&p, NULL, ","))
+					{
+						if (*name == ' ')
+							name++;
+						if (*name)
+						{
+							e = safe_alloc(sizeof(SpamExcept) + strlen(name));
+							strcpy(e->name, name);
+							AddListItem(e, tempiConf.spamexcept);
+						}
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "detect-slow-warn"))
+				{
+					tempiConf.spamfilter_detectslow_warn = atol(cepp->ce_vardata);
+				}
+				else if (!strcmp(cepp->ce_varname, "detect-slow-fatal"))
+				{
+					tempiConf.spamfilter_detectslow_fatal = atol(cepp->ce_vardata);
+				}
+				else if (!strcmp(cepp->ce_varname, "stop-on-first-match"))
+				{
+					tempiConf.spamfilter_stop_on_first_match = config_checkval(cepp->ce_vardata, CFG_YESNO);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "default-bantime"))
+		{
+			tempiConf.default_bantime = config_checkval(cep->ce_vardata,CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "ban-version-tkl-time"))
+		{
+			tempiConf.ban_version_tkl_time = config_checkval(cep->ce_vardata,CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "min-nick-length")) {
+			int v = atoi(cep->ce_vardata);
+			tempiConf.min_nick_length = v;
+		}
+		else if (!strcmp(cep->ce_varname, "nick-length")) {
+			int v = atoi(cep->ce_vardata);
+			tempiConf.nick_length = v;
+		}
+		else if (!strcmp(cep->ce_varname, "topic-length")) {
+			int v = atoi(cep->ce_vardata);
+			tempiConf.topic_length = v;
+		}
+		else if (!strcmp(cep->ce_varname, "away-length")) {
+			int v = atoi(cep->ce_vardata);
+			tempiConf.away_length = v;
+		}
+		else if (!strcmp(cep->ce_varname, "kick-length")) {
+			int v = atoi(cep->ce_vardata);
+			tempiConf.kick_length = v;
+		}
+		else if (!strcmp(cep->ce_varname, "quit-length")) {
+			int v = atoi(cep->ce_vardata);
+			tempiConf.quit_length = v;
+		}
+		else if (!strcmp(cep->ce_varname, "ssl") || !strcmp(cep->ce_varname, "tls")) {
+			/* no need to alloc tempiConf.tls_options since config_defaults() already ensures it exists */
+			conf_tlsblock(conf, cep, tempiConf.tls_options);
+		}
+		else if (!strcmp(cep->ce_varname, "plaintext-policy"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "user"))
+					tempiConf.plaintext_policy_user = policy_strtoval(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "oper"))
+					tempiConf.plaintext_policy_oper = policy_strtoval(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "server"))
+					tempiConf.plaintext_policy_server = policy_strtoval(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "user-message"))
+					safe_strdup(tempiConf.plaintext_policy_user_message, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "oper-message"))
+					safe_strdup(tempiConf.plaintext_policy_oper_message, cepp->ce_vardata);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "outdated-tls-policy"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "user"))
+					tempiConf.outdated_tls_policy_user = policy_strtoval(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "oper"))
+					tempiConf.outdated_tls_policy_oper = policy_strtoval(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "server"))
+					tempiConf.outdated_tls_policy_server = policy_strtoval(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "user-message"))
+					safe_strdup(tempiConf.outdated_tls_policy_user_message, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "oper-message"))
+					safe_strdup(tempiConf.outdated_tls_policy_oper_message, cepp->ce_vardata);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "default-ipv6-clone-mask"))
+		{
+			tempiConf.default_ipv6_clone_mask = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "hide-list")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "deny-channel"))
+				{
+					tempiConf.hide_list = 1;
+					/* if we would expand this later then change this to a bitmask or struct or whatever */
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "max-unknown-connections-per-ip"))
+		{
+			tempiConf.max_unknown_connections_per_ip = atoi(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "handshake-timeout"))
+		{
+			tempiConf.handshake_timeout = config_checkval(cep->ce_vardata, CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "sasl-timeout"))
+		{
+			tempiConf.sasl_timeout = config_checkval(cep->ce_vardata, CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "handshake-delay"))
+		{
+			tempiConf.handshake_delay = config_checkval(cep->ce_vardata, CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "automatic-ban-target"))
+		{
+			tempiConf.automatic_ban_target = ban_target_strtoval(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "manual-ban-target"))
+		{
+			tempiConf.manual_ban_target = ban_target_strtoval(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "reject-message"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "too-many-connections"))
+					safe_strdup(tempiConf.reject_message_too_many_connections, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "server-full"))
+					safe_strdup(tempiConf.reject_message_server_full, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "unauthorized"))
+					safe_strdup(tempiConf.reject_message_unauthorized, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "kline"))
+					safe_strdup(tempiConf.reject_message_kline, cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "gline"))
+					safe_strdup(tempiConf.reject_message_gline, cepp->ce_vardata);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "topic-setter"))
+		{
+			if (!strcmp(cep->ce_vardata, "nick"))
+				tempiConf.topic_setter = SETTER_NICK;
+			else if (!strcmp(cep->ce_vardata, "nick-user-host"))
+				tempiConf.topic_setter = SETTER_NICK_USER_HOST;
+		}
+		else if (!strcmp(cep->ce_varname, "ban-setter"))
+		{
+			if (!strcmp(cep->ce_vardata, "nick"))
+				tempiConf.ban_setter = SETTER_NICK;
+			else if (!strcmp(cep->ce_vardata, "nick-user-host"))
+				tempiConf.ban_setter = SETTER_NICK_USER_HOST;
+		}
+		else if (!strcmp(cep->ce_varname, "ban-setter-sync") || !strcmp(cep->ce_varname, "ban-setter-synch"))
+		{
+			tempiConf.ban_setter_sync = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "part-instead-of-quit-on-comment-change"))
+		{
+			tempiConf.part_instead_of_quit_on_comment_change = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "broadcast-channel-messages"))
+		{
+			if (!strcmp(cep->ce_vardata, "auto"))
+				tempiConf.broadcast_channel_messages = BROADCAST_CHANNEL_MESSAGES_AUTO;
+			else if (!strcmp(cep->ce_vardata, "always"))
+				tempiConf.broadcast_channel_messages = BROADCAST_CHANNEL_MESSAGES_ALWAYS;
+			else if (!strcmp(cep->ce_vardata, "never"))
+				tempiConf.broadcast_channel_messages = BROADCAST_CHANNEL_MESSAGES_NEVER;
+		}
+		else if (!strcmp(cep->ce_varname, "allowed-channelchars"))
+		{
+			if (!strcmp(cep->ce_vardata, "ascii"))
+				tempiConf.allowed_channelchars = ALLOWED_CHANNELCHARS_ASCII;
+			else if (!strcmp(cep->ce_vardata, "utf8"))
+				tempiConf.allowed_channelchars = ALLOWED_CHANNELCHARS_UTF8;
+			else if (!strcmp(cep->ce_vardata, "any"))
+				tempiConf.allowed_channelchars = ALLOWED_CHANNELCHARS_ANY;
+		}
+		else
+		{
+			int value;
+			for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+			{
+				value = (*(h->func.intfunc))(conf,cep,CONFIG_SET);
+				if (value == 1)
+					break;
+			}
+		}
+	}
+	return 0;
+}
+
+int	_test_set(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp, *ceppp;
+	int tempi;
+	int errors = 0;
+	Hook *h;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "kline-address")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, kline_address, "kline-address");
+			if (!strchr(cep->ce_vardata, '@') && !strchr(cep->ce_vardata, ':'))
+			{
+				config_error("%s:%i: set::kline-address must be an e-mail or an URL",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+			else if (match_simple("*@unrealircd.com", cep->ce_vardata) || match_simple("*@unrealircd.org",cep->ce_vardata) || match_simple("unreal-*@lists.sourceforge.net",cep->ce_vardata))
+			{
+				config_error("%s:%i: set::kline-address may not be an UnrealIRCd Team address",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++; continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "gline-address")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, gline_address, "gline-address");
+			if (!strchr(cep->ce_vardata, '@') && !strchr(cep->ce_vardata, ':'))
+			{
+				config_error("%s:%i: set::gline-address must be an e-mail or an URL",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+			else if (match_simple("*@unrealircd.com", cep->ce_vardata) || match_simple("*@unrealircd.org",cep->ce_vardata) || match_simple("unreal-*@lists.sourceforge.net",cep->ce_vardata))
+			{
+				config_error("%s:%i: set::gline-address may not be an UnrealIRCd Team address",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++; continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "modes-on-connect")) {
+			char *p;
+			CheckNull(cep);
+			CheckDuplicate(cep, modes_on_connect, "modes-on-connect");
+			for (p = cep->ce_vardata; *p; p++)
+				if (strchr("orzSHqtW", *p))
+				{
+					config_error("%s:%i: set::modes-on-connect may not include mode '%c'",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, *p);
+					errors++;
+				}
+			set_usermode(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "modes-on-join")) {
+			char *c;
+			struct ChMode temp;
+			memset(&temp, 0, sizeof(temp));
+			CheckNull(cep);
+			CheckDuplicate(cep, modes_on_join, "modes-on-join");
+			for (c = cep->ce_vardata; *c; c++)
+			{
+				if (*c == ' ')
+					break; /* don't check the parameter ;p */
+				switch (*c)
+				{
+					case 'q':
+					case 'a':
+					case 'o':
+					case 'h':
+					case 'v':
+					case 'b':
+					case 'e':
+					case 'I':
+					case 'k':
+					case 'l':
+						config_error("%s:%i: set::modes-on-join may not contain +%c",
+							cep->ce_fileptr->cf_filename, cep->ce_varlinenum, *c);
+						errors++;
+						break;
+				}
+			}
+			conf_channelmodes(cep->ce_vardata, &temp, 1);
+			if (temp.mode & MODE_SECRET && temp.mode & MODE_PRIVATE)
+			{
+				config_error("%s:%i: set::modes-on-join has both +s and +p",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+
+		}
+		else if (!strcmp(cep->ce_varname, "modes-on-oper")) {
+			char *p;
+			CheckNull(cep);
+			CheckDuplicate(cep, modes_on_oper, "modes-on-oper");
+			for (p = cep->ce_vardata; *p; p++)
+				if (strchr("orzS", *p))
+				{
+					config_error("%s:%i: set::modes-on-oper may not include mode '%c'",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, *p);
+					errors++;
+				}
+			set_usermode(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "snomask-on-oper")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, snomask_on_oper, "snomask-on-oper");
+		}
+		else if (!strcmp(cep->ce_varname, "level-on-join")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, level_on_join, "level-on-join");
+			if (!channellevel_to_int(cep->ce_vardata))
+			{
+				config_error("%s:%i: set::level-on-join: unknown value '%s', should be one of: none, voice, halfop, op, protect, owner",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "static-quit")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, static_quit, "static-quit");
+		}
+		else if (!strcmp(cep->ce_varname, "static-part")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, static_part, "static-part");
+		}
+		else if (!strcmp(cep->ce_varname, "who-limit")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, who_limit, "who-limit");
+		}
+		else if (!strcmp(cep->ce_varname, "maxbans")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, maxbans, "maxbans");
+		}
+		else if (!strcmp(cep->ce_varname, "maxbanlength")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, maxbanlength, "maxbanlength");
+		}
+		else if (!strcmp(cep->ce_varname, "silence-limit")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, silence_limit, "silence-limit");
+		}
+		else if (!strcmp(cep->ce_varname, "auto-join")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, auto_join, "auto-join");
+		}
+		else if (!strcmp(cep->ce_varname, "oper-auto-join")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, oper_auto_join, "oper-auto-join");
+		}
+		else if (!strcmp(cep->ce_varname, "check-target-nick-bans")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, check_target_nick_bans, "check-target-nick-bans");
+		}
+		else if (!strcmp(cep->ce_varname, "pingpong-warning")) {
+			config_error("%s:%i: set::pingpong-warning no longer exists (the warning is always off)",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			need_34_upgrade = 1;
+			errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "ping-cookie")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, ping_cookie, "ping-cookie");
+		}
+		else if (!strcmp(cep->ce_varname, "watch-away-notification")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, watch_away_notification, "watch-away-notification");
+		}
+		else if (!strcmp(cep->ce_varname, "uhnames")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, uhnames, "uhnames");
+		}
+		else if (!strcmp(cep->ce_varname, "channel-command-prefix")) {
+			CheckNullAllowEmpty(cep);
+			CheckDuplicate(cep, channel_command_prefix, "channel-command-prefix");
+		}
+		else if (!strcmp(cep->ce_varname, "allow-userhost-change")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, allow_userhost_change, "allow-userhost-change");
+			if (strcasecmp(cep->ce_vardata, "always") &&
+			    strcasecmp(cep->ce_vardata, "never") &&
+			    strcasecmp(cep->ce_vardata, "not-on-channels") &&
+			    strcasecmp(cep->ce_vardata, "force-rejoin"))
+			{
+				config_error("%s:%i: set::allow-userhost-change is invalid",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "anti-spam-quit-message-time")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, anti_spam_quit_message_time, "anti-spam-quit-message-time");
+		}
+		else if (!strcmp(cep->ce_varname, "oper-only-stats"))
+		{
+			config_warn("%s:%d: We no longer use a blacklist for stats (set::oper-only-stats) but "
+			             "have a whitelist now instead (set::allow-user-stats). ",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			config_warn("Simply delete the oper-only-stats line from your configuration file %s around line %d to get rid of this warning",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			continue;
+		}
+		else if (!strcmp(cep->ce_varname, "allow-user-stats"))
+		{
+			CheckDuplicate(cep, allow_user_stats, "allow-user-stats");
+			if (!cep->ce_entries)
+			{
+				CheckNull(cep);
+			}
+			else
+			{
+				/* TODO: check the entries for existence?
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+				} */
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "maxchannelsperuser")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, maxchannelsperuser, "maxchannelsperuser");
+			tempi = atoi(cep->ce_vardata);
+			if (tempi < 1)
+			{
+				config_error("%s:%i: set::maxchannelsperuser must be > 0",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ping-warning")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, ping_warning, "ping-warning");
+			tempi = atoi(cep->ce_vardata);
+			/* it is pointless to allow setting higher than 170 */
+			if (tempi > 170)
+			{
+				config_error("%s:%i: set::ping-warning must be < 170",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "maxdccallow")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, maxdccallow, "maxdccallow");
+		}
+		else if (!strcmp(cep->ce_varname, "max-targets-per-command"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				CheckNull(cepp);
+				if (!strcasecmp(cepp->ce_varname, "NAMES") || !strcasecmp(cepp->ce_varname, "WHOWAS"))
+				{
+					if (atoi(cepp->ce_vardata) != 1)
+					{
+						config_error("%s:%i: set::max-targets-per-command::%s: "
+						             "this command is hardcoded at a maximum of 1 "
+						             "and cannot be configured to accept more.",
+						             cepp->ce_fileptr->cf_filename,
+						             cepp->ce_varlinenum,
+						             cepp->ce_varname);
+						errors++;
+					}
+				} else
+				if (!strcasecmp(cepp->ce_varname, "USERHOST") ||
+				    !strcasecmp(cepp->ce_varname, "USERIP") ||
+				    !strcasecmp(cepp->ce_varname, "ISON") ||
+				    !strcasecmp(cepp->ce_varname, "WATCH"))
+				{
+					if (strcmp(cepp->ce_vardata, "max"))
+					{
+						config_error("%s:%i: set::max-targets-per-command::%s: "
+						             "this command is hardcoded at a maximum of 'max' "
+						             "and cannot be changed. This because it is "
+						             "highly discouraged to change it.",
+						             cepp->ce_fileptr->cf_filename,
+						             cepp->ce_varlinenum,
+						             cepp->ce_varname);
+						errors++;
+					}
+				}
+				/* Now check the value syntax in general: */
+				if (strcmp(cepp->ce_vardata, "max")) /* anything other than 'max'.. */
+				{
+					int v = atoi(cepp->ce_vardata);
+					if ((v < 1) || (v > 20))
+					{
+						config_error("%s:%i: set::max-targets-per-command::%s: "
+						             "value should be 1-20 or 'max'",
+						             cepp->ce_fileptr->cf_filename,
+						             cepp->ce_varlinenum,
+						             cepp->ce_varname);
+						errors++;
+					}
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "network-name")) {
+			char *p;
+			CheckNull(cep);
+			CheckDuplicate(cep, network_name, "network-name");
+			for (p = cep->ce_vardata; *p; p++)
+				if ((*p < ' ') || (*p > '~'))
+				{
+					config_error("%s:%i: set::network-name can only contain ASCII characters 33-126. Invalid character = '%c'",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, *p);
+					errors++;
+					break;
+				}
+		}
+		else if (!strcmp(cep->ce_varname, "default-server")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, default_server, "default-server");
+		}
+		else if (!strcmp(cep->ce_varname, "services-server")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, services_server, "services-server");
+		}
+		else if (!strcmp(cep->ce_varname, "sasl-server")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, sasl_server, "sasl-server");
+		}
+		else if (!strcmp(cep->ce_varname, "stats-server")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, stats_server, "stats-server");
+		}
+		else if (!strcmp(cep->ce_varname, "help-channel")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, help_channel, "help-channel");
+		}
+		else if (!strcmp(cep->ce_varname, "hiddenhost-prefix")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, hiddenhost_prefix, "hiddenhost-prefix");
+			if (strchr(cep->ce_vardata, ' ') || (*cep->ce_vardata == ':'))
+			{
+				config_error("%s:%i: set::hiddenhost-prefix must not contain spaces or be prefixed with ':'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+				continue;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "prefix-quit")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, prefix_quit, "prefix-quit");
+		}
+		else if (!strcmp(cep->ce_varname, "hide-ban-reason")) {
+			CheckNull(cep);
+			CheckDuplicate(cep, hide_ban_reason, "hide-ban-reason");
+		}
+		else if (!strcmp(cep->ce_varname, "restrict-usermodes"))
+		{
+			CheckNull(cep);
+			CheckDuplicate(cep, restrict_usermodes, "restrict-usermodes");
+			if (cep->ce_varname) {
+				int warn = 0;
+				char *p;
+				for (p = cep->ce_vardata; *p; p++)
+					if ((*p == '+') || (*p == '-'))
+						warn = 1;
+				if (warn) {
+					config_status("%s:%i: warning: set::restrict-usermodes: should only contain modechars, no + or -.\n",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "restrict-channelmodes"))
+		{
+			CheckNull(cep);
+			CheckDuplicate(cep, restrict_channelmodes, "restrict-channelmodes");
+			if (cep->ce_varname) {
+				int warn = 0;
+				char *p;
+				for (p = cep->ce_vardata; *p; p++)
+					if ((*p == '+') || (*p == '-'))
+						warn = 1;
+				if (warn) {
+					config_status("%s:%i: warning: set::restrict-channelmodes: should only contain modechars, no + or -.\n",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "restrict-extendedbans"))
+		{
+			CheckDuplicate(cep, restrict_extendedbans, "restrict-extendedbans");
+			CheckNull(cep);
+		}
+		else if (!strcmp(cep->ce_varname, "link")) {
+					for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+						CheckNull(cepp);
+						if (!strcmp(cepp->ce_varname, "bind-ip")) {
+							CheckDuplicate(cepp, link_bind_ip, "link::bind-ip");
+							if (strcmp(cepp->ce_vardata, "*"))
+							{
+								if (!is_valid_ip(cepp->ce_vardata))
+								{
+									config_error("%s:%i: set::link::bind-ip (%s) is not a valid IP",
+										cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+										cepp->ce_vardata);
+									errors++;
+									continue;
+								}
+							}
+						}
+					}
+		}
+		else if (!strcmp(cep->ce_varname, "dns")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "nameserver") ||
+				    !strcmp(cepp->ce_varname, "timeout") ||
+				    !strcmp(cepp->ce_varname, "retries"))
+				{
+					config_error("%s:%i: set::dns::%s no longer exist in UnrealIRCd 4. "
+					             "Please remove it from your configuration file.",
+						cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname);
+					errors++;
+				} else
+				if (!strcmp(cepp->ce_varname, "bind-ip")) {
+					CheckDuplicate(cepp, dns_bind_ip, "dns::bind-ip");
+					if (strcmp(cepp->ce_vardata, "*"))
+					{
+						if (!is_valid_ip(cepp->ce_vardata))
+						{
+							config_error("%s:%i: set::dns::bind-ip (%s) is not a valid IP",
+								cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+								cepp->ce_vardata);
+							errors++;
+							continue;
+						}
+					}
+				}
+				else
+				{
+					config_error_unknownopt(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::dns",
+						cepp->ce_varname);
+						errors++;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "throttle")) {
+			config_error("%s:%i: set::throttle has been renamed. you now use "
+			             "set::anti-flood::connect-flood <connections>:<period>. "
+			             "Or just remove the throttle block and you get the default "
+			             "of 3 per 60 seconds.",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+			need_34_upgrade = 1;
+			continue;
+		}
+		else if (!strcmp(cep->ce_varname, "anti-flood")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "max-concurrent-conversations"))
+				{
+					for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+					{
+						CheckNull(ceppp);
+						if (!strcmp(ceppp->ce_varname, "users"))
+						{
+							int v = atoi(ceppp->ce_vardata);
+							if ((v < 1) || (v > MAXCCUSERS))
+							{
+								config_error("%s:%i: set::anti-flood::max-concurrent-conversations::users: "
+								             "value should be between 1 and %d",
+								             ceppp->ce_fileptr->cf_filename, ceppp->ce_varlinenum, MAXCCUSERS);
+								errors++;
+							}
+						} else
+						if (!strcmp(ceppp->ce_varname, "new-user-every"))
+						{
+							long v = config_checkval(ceppp->ce_vardata, CFG_TIME);
+							if ((v < 1) || (v > 120))
+							{
+								config_error("%s:%i: set::anti-flood::max-concurrent-conversations::new-user-every: "
+								             "value should be between 1 and 120 seconds",
+								             ceppp->ce_fileptr->cf_filename, ceppp->ce_varlinenum);
+								errors++;
+							}
+						} else
+						{
+							config_error_unknownopt(ceppp->ce_fileptr->cf_filename,
+								ceppp->ce_varlinenum, "set::anti-flood",
+								ceppp->ce_varname);
+							errors++;
+						}
+					}
+					continue; /* required here, due to checknull directly below */
+				}
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "unknown-flood-bantime"))
+				{
+					CheckDuplicate(cepp, anti_flood_unknown_flood_bantime, "anti-flood::unknown-flood-bantime");
+				}
+				else if (!strcmp(cepp->ce_varname, "unknown-flood-amount")) {
+					CheckDuplicate(cepp, anti_flood_unknown_flood_amount, "anti-flood::unknown-flood-amount");
+				}
+				else if (!strcmp(cepp->ce_varname, "away-count")) {
+					int temp = atol(cepp->ce_vardata);
+					CheckDuplicate(cepp, anti_flood_away_count, "anti-flood::away-count");
+					if (temp < 1 || temp > 255)
+					{
+						config_error("%s:%i: set::anti-flood::away-count must be between 1 and 255",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "away-period")) {
+					int temp = config_checkval(cepp->ce_vardata, CFG_TIME);
+					CheckDuplicate(cepp, anti_flood_away_period, "anti-flood::away-period");
+					if (temp < 10)
+					{
+						config_error("%s:%i: set::anti-flood::away-period must be greater than 9",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "away-flood"))
+				{
+					int cnt, period;
+					if (settings.has_anti_flood_away_period)
+					{
+						config_warn("%s:%d: set::anti-flood::away-flood overrides set::anti-flood::away-period",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						continue;
+					}
+					if (settings.has_anti_flood_away_count)
+					{
+						config_warn("%s:%d: set::anti-flood::away-flood overrides set::anti-flood::away-count",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						continue;
+					}
+					settings.has_anti_flood_away_period = 1;
+					settings.has_anti_flood_away_count = 1;
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 255) || (period < 10))
+					{
+						config_error("%s:%i: set::anti-flood::away-flood error. Syntax is '<count>:<period>' (eg 5:60), "
+						             "count should be 1-255, period should be greater than 9",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "nick-flood"))
+				{
+					int cnt, period;
+					CheckDuplicate(cepp, anti_flood_nick_flood, "anti-flood::nick-flood");
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 255) || (period < 5))
+					{
+						config_error("%s:%i: set::anti-flood::nick-flood error. Syntax is '<count>:<period>' (eg 5:60), "
+						             "count should be 1-255, period should be greater than 4",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "invite-flood"))
+				{
+					int cnt, period;
+					CheckDuplicate(cepp, anti_flood_invite_flood, "anti-flood::invite-flood");
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 255) || (period < 5))
+					{
+						config_error("%s:%i: set::anti-flood::invite-flood error. Syntax is '<count>:<period>' (eg 5:60), "
+						             "count should be 1-255, period should be greater than 4",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "knock-flood"))
+				{
+					int cnt, period;
+					CheckDuplicate(cepp, anti_flood_knock_flood, "anti-flood::knock-flood");
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 255) || (period < 5))
+					{
+						config_error("%s:%i: set::anti-flood::knock-flood error. Syntax is '<count>:<period>' (eg 5:60), "
+						             "count should be 1-255, period should be greater than 4",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "connect-flood"))
+				{
+					int cnt, period;
+					CheckDuplicate(cepp, anti_flood_connect_flood, "anti-flood::connect-flood");
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 255) || (period < 1) || (period > 3600))
+					{
+						config_error("%s:%i: set::anti-flood::connect-flood: Syntax is '<count>:<period>' (eg 5:60), "
+						             "count should be 1-255, period should be 1-3600",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else
+				{
+					/* hmm.. I don't like this method. but I just quickly copied it from CONFIG_ALLOW for now... */
+					int used = 0;
+					Hook *h;
+					for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+					{
+						int value, errs = 0;
+						if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+							&& !(h->owner->options & MOD_OPT_PERM))
+							continue;
+						value = (*(h->func.intfunc))(conf,cepp,CONFIG_SET_ANTI_FLOOD,&errs);
+						if (value == 2)
+							used = 1;
+						if (value == 1)
+						{
+							used = 1;
+							break;
+						}
+						if (value == -1)
+						{
+							used = 1;
+							errors += errs;
+							break;
+						}
+						if (value == -2)
+						{
+							used = 1;
+							errors += errs;
+						}
+					}
+					if (!used)
+					{
+						config_error_unknownopt(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum, "set::anti-flood",
+							cepp->ce_varname);
+						errors++;
+					}
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "options")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "hide-ulines"))
+				{
+					CheckDuplicate(cepp, options_hide_ulines, "options::hide-ulines");
+				}
+				else if (!strcmp(cepp->ce_varname, "flat-map")) {
+					CheckDuplicate(cepp, options_flat_map, "options::flat-map");
+				}
+				else if (!strcmp(cepp->ce_varname, "show-opermotd")) {
+					CheckDuplicate(cepp, options_show_opermotd, "options::show-opermotd");
+				}
+				else if (!strcmp(cepp->ce_varname, "identd-check")) {
+					CheckDuplicate(cepp, options_identd_check, "options::identd-check");
+				}
+				else if (!strcmp(cepp->ce_varname, "fail-oper-warn")) {
+					CheckDuplicate(cepp, options_fail_oper_warn, "options::fail-oper-warn");
+				}
+				else if (!strcmp(cepp->ce_varname, "show-connect-info")) {
+					CheckDuplicate(cepp, options_show_connect_info, "options::show-connect-info");
+				}
+				else if (!strcmp(cepp->ce_varname, "no-connect-tls-info")) {
+					CheckDuplicate(cepp, options_no_connect_tls_info, "options::no-connect-tls-info");
+				}
+				else if (!strcmp(cepp->ce_varname, "dont-resolve")) {
+					CheckDuplicate(cepp, options_dont_resolve, "options::dont-resolve");
+				}
+				else if (!strcmp(cepp->ce_varname, "mkpasswd-for-everyone")) {
+					CheckDuplicate(cepp, options_mkpasswd_for_everyone, "options::mkpasswd-for-everyone");
+				}
+				else if (!strcmp(cepp->ce_varname, "allow-insane-bans")) {
+					CheckDuplicate(cepp, options_allow_insane_bans, "options::allow-insane-bans");
+				}
+				else if (!strcmp(cepp->ce_varname, "allow-part-if-shunned")) {
+					CheckDuplicate(cepp, options_allow_part_if_shunned, "options::allow-part-if-shunned");
+				}
+				else if (!strcmp(cepp->ce_varname, "disable-cap")) {
+					CheckDuplicate(cepp, options_disable_cap, "options::disable-cap");
+				}
+				else if (!strcmp(cepp->ce_varname, "disable-ipv6")) {
+					CheckDuplicate(cepp, options_disable_ipv6, "options::disable-ipv6");
+					DISABLE_IPV6 = 1; /* ugly ugly. needs to be done here because at conf runtime is too late. */
+				}
+				else
+				{
+					config_error_unknownopt(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::options",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "hosts")) {
+			config_error("%s:%i: set::hosts has been removed in UnrealIRCd 4. You can use oper::vhost now.",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+			need_34_upgrade = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "cloak-keys"))
+		{
+			CheckDuplicate(cep, cloak_keys, "cloak-keys");
+			for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+			{
+				int value, errs = 0;
+				if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+				    && !(h->owner->options & MOD_OPT_PERM))
+					continue;
+				value = (*(h->func.intfunc))(conf, cep, CONFIG_CLOAKKEYS, &errs);
+
+				if (value == 1)
+					break;
+				if (value == -1)
+				{
+					errors += errs;
+					break;
+				}
+				if (value == -2)
+					errors += errs;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ident")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				int is_ok = 0;
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "connect-timeout"))
+				{
+					is_ok = 1;
+					CheckDuplicate(cepp, ident_connect_timeout, "ident::connect-timeout");
+				}
+				else if (!strcmp(cepp->ce_varname, "read-timeout"))
+				{
+					is_ok = 1;
+					CheckDuplicate(cepp, ident_read_timeout, "ident::read-timeout");
+				}
+				if (is_ok)
+				{
+					int v = config_checkval(cepp->ce_vardata,CFG_TIME);
+					if ((v > 60) || (v < 1))
+					{
+						config_error("%s:%i: set::ident::%s value out of range (%d), should be between 1 and 60.",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname, v);
+						errors++;
+						continue;
+					}
+				} else {
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::ident",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "timesync") || !strcmp(cep->ce_varname, "timesynch"))
+		{
+			config_warn("%s:%i: Timesync support has been removed from UnrealIRCd. "
+			            "Please remove any set::timesync blocks you may have.",
+			            cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			config_warn("Use the time synchronization feature of your OS/distro instead!");
+		}
+		else if (!strcmp(cep->ce_varname, "spamfilter")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "ban-time"))
+				{
+					long x;
+					CheckDuplicate(cepp, spamfilter_ban_time, "spamfilter::ban-time");
+					x = config_checkval(cepp->ce_vardata,CFG_TIME);
+					if ((x < 0) > (x > 2000000000))
+					{
+						config_error("%s:%i: set::spamfilter:ban-time: value '%ld' out of range",
+							cep->ce_fileptr->cf_filename, cep->ce_varlinenum, x);
+						errors++;
+						continue;
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "ban-reason"))
+				{
+					CheckDuplicate(cepp, spamfilter_ban_reason, "spamfilter::ban-reason");
+
+				}
+				else if (!strcmp(cepp->ce_varname, "virus-help-channel"))
+				{
+					CheckDuplicate(cepp, spamfilter_virus_help_channel, "spamfilter::virus-help-channel");
+					if ((cepp->ce_vardata[0] != '#') || (strlen(cepp->ce_vardata) > CHANNELLEN))
+					{
+						config_error("%s:%i: set::spamfilter:virus-help-channel: "
+						             "specified channelname is too long or contains invalid characters (%s)",
+						             cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+						             cepp->ce_vardata);
+						errors++;
+						continue;
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "virus-help-channel-deny"))
+				{
+					CheckDuplicate(cepp, spamfilter_virus_help_channel_deny, "spamfilter::virus-help-channel-deny");
+				} else
+				if (!strcmp(cepp->ce_varname, "except"))
+				{
+					CheckDuplicate(cepp, spamfilter_except, "spamfilter::except");
+				} else
+#ifdef SPAMFILTER_DETECTSLOW
+				if (!strcmp(cepp->ce_varname, "detect-slow-warn"))
+				{
+				} else
+				if (!strcmp(cepp->ce_varname, "detect-slow-fatal"))
+				{
+				} else
+#endif
+				if (!strcmp(cepp->ce_varname, "stop-on-first-match"))
+				{
+				} else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::spamfilter",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+/* TODO: FIX THIS */
+		else if (!strcmp(cep->ce_varname, "default-bantime"))
+		{
+			long x;
+			CheckDuplicate(cep, default_bantime, "default-bantime");
+			CheckNull(cep);
+			x = config_checkval(cep->ce_vardata,CFG_TIME);
+			if ((x < 0) > (x > 2000000000))
+			{
+				config_error("%s:%i: set::default-bantime: value '%ld' out of range",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, x);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ban-version-tkl-time")) {
+			long x;
+			CheckDuplicate(cep, ban_version_tkl_time, "ban-version-tkl-time");
+			CheckNull(cep);
+			x = config_checkval(cep->ce_vardata,CFG_TIME);
+			if ((x < 0) > (x > 2000000000))
+			{
+				config_error("%s:%i: set::ban-version-tkl-time: value '%ld' out of range",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, x);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "min-nick-length")) {
+			int v;
+			CheckDuplicate(cep, min_nick_length, "min-nick-length");
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if ((v <= 0) || (v > NICKLEN))
+			{
+				config_error("%s:%i: set::min-nick-length: value '%d' out of range (should be 1-%d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v, NICKLEN);
+				errors++;
+			}
+			else
+				nicklengths.min = v;
+		}
+		else if (!strcmp(cep->ce_varname, "nick-length")) {
+			int v;
+			CheckDuplicate(cep, nick_length, "nick-length");
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if ((v <= 0) || (v > NICKLEN))
+			{
+				config_error("%s:%i: set::nick-length: value '%d' out of range (should be 1-%d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v, NICKLEN);
+				errors++;
+			}
+			else
+				nicklengths.max = v;
+		}
+		else if (!strcmp(cep->ce_varname, "topic-length")) {
+			int v;
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if ((v <= 0) || (v > MAXTOPICLEN))
+			{
+				config_error("%s:%i: set::topic-length: value '%d' out of range (should be 1-%d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v, MAXTOPICLEN);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "away-length")) {
+			int v;
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if ((v <= 0) || (v > MAXAWAYLEN))
+			{
+				config_error("%s:%i: set::away-length: value '%d' out of range (should be 1-%d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v, MAXAWAYLEN);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "kick-length")) {
+			int v;
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if ((v <= 0) || (v > MAXKICKLEN))
+			{
+				config_error("%s:%i: set::kick-length: value '%d' out of range (should be 1-%d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v, MAXKICKLEN);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "quit-length")) {
+			int v;
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if ((v <= 0) || (v > MAXQUITLEN))
+			{
+				config_error("%s:%i: set::quit-length: value '%d' out of range (should be 1-%d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v, MAXQUITLEN);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ssl") || !strcmp(cep->ce_varname, "tls")) {
+			test_tlsblock(conf, cep, &errors);
+		}
+		else if (!strcmp(cep->ce_varname, "plaintext-policy"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "user") ||
+					!strcmp(cepp->ce_varname, "oper") ||
+					!strcmp(cepp->ce_varname, "server"))
+				{
+					Policy policy;
+					CheckNull(cepp);
+					policy = policy_strtoval(cepp->ce_vardata);
+					if (!policy)
+					{
+						config_error("%s:%i: set::plaintext-policy::%s: needs to be one of: 'allow', 'warn' or 'reject'",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname);
+						errors++;
+					}
+				} else if (!strcmp(cepp->ce_varname, "user-message") ||
+				           !strcmp(cepp->ce_varname, "oper-message"))
+				{
+					CheckNull(cepp);
+				} else {
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::plaintext-policy",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "outdated-tls-policy"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "user") ||
+					!strcmp(cepp->ce_varname, "oper") ||
+					!strcmp(cepp->ce_varname, "server"))
+				{
+					Policy policy;
+					CheckNull(cepp);
+					policy = policy_strtoval(cepp->ce_vardata);
+					if (!policy)
+					{
+						config_error("%s:%i: set::outdated-tls-policy::%s: needs to be one of: 'allow', 'warn' or 'reject'",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname);
+						errors++;
+					}
+				} else if (!strcmp(cepp->ce_varname, "user-message") ||
+				           !strcmp(cepp->ce_varname, "oper-message"))
+				{
+					CheckNull(cepp);
+				} else {
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::outdated-tls-policy",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "default-ipv6-clone-mask"))
+		{
+			/* keep this in sync with _test_allow() */
+			int ipv6mask;
+			ipv6mask = atoi(cep->ce_vardata);
+			if (ipv6mask == 0)
+			{
+				config_error("%s:%d: set::default-ipv6-clone-mask given a value of zero. This cannnot be correct, as it would treat all IPv6 hosts as one host.",
+					     cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+			if (ipv6mask > 128)
+			{
+				config_error("%s:%d: set::default-ipv6-clone-mask was set to %d. The maximum value is 128.",
+					     cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					     ipv6mask);
+				errors++;
+			}
+			if (ipv6mask <= 32)
+			{
+				config_warn("%s:%d: set::default-ipv6-clone-mask was given a very small value.",
+					    cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "hide-list")) {
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "deny-channel"))
+				{
+				} else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::hide-list",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "max-unknown-connections-per-ip")) {
+			int v;
+			CheckNull(cep);
+			v = atoi(cep->ce_vardata);
+			if (v < 1)
+			{
+				config_error("%s:%i: set::max-unknown-connections-per-ip: value should be at least 1.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "handshake-timeout")) {
+			int v;
+			CheckNull(cep);
+			v = config_checkval(cep->ce_vardata, CFG_TIME);
+			if (v < 5)
+			{
+				config_error("%s:%i: set::handshake-timeout: value should be at least 5 seconds.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "sasl-timeout")) {
+			int v;
+			CheckNull(cep);
+			v = config_checkval(cep->ce_vardata, CFG_TIME);
+			if (v < 5)
+			{
+				config_error("%s:%i: set::sasl-timeout: value should be at least 5 seconds.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "handshake-delay"))
+		{
+			int v;
+			CheckNull(cep);
+			v = config_checkval(cep->ce_vardata, CFG_TIME);
+			if (v >= 10)
+			{
+				config_error("%s:%i: set::handshake-delay: value should be less than 10 seconds.",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ban-include-username"))
+		{
+			config_error("%s:%i: set::ban-include-username is no longer supported. "
+			             "Use set { automatic-ban-target userip; }; instead.",
+			             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			config_error("See https://www.unrealircd.org/docs/Set_block#set::automatic-ban-target "
+			             "for more information and options.");
+			errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "automatic-ban-target"))
+		{
+			CheckNull(cep);
+			if (!ban_target_strtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: set::automatic-ban-target: value '%s' is not recognized. "
+				             "See https://www.unrealircd.org/docs/Set_block#set::automatic-ban-target",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "manual-ban-target"))
+		{
+			CheckNull(cep);
+			if (!ban_target_strtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: set::manual-ban-target: value '%s' is not recognized. "
+				             "See https://www.unrealircd.org/docs/Set_block#set::manual-ban-target",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "reject-message"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "password-mismatch"))
+					;
+				else if (!strcmp(cepp->ce_varname, "too-many-connections"))
+					;
+				else if (!strcmp(cepp->ce_varname, "server-full"))
+					;
+				else if (!strcmp(cepp->ce_varname, "unauthorized"))
+					;
+				else if (!strcmp(cepp->ce_varname, "kline"))
+					;
+				else if (!strcmp(cepp->ce_varname, "gline"))
+					;
+				else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::reject-message",
+						cepp->ce_varname);
+					errors++;
+					continue;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "topic-setter"))
+		{
+			CheckNull(cep);
+			if (strcmp(cep->ce_vardata, "nick") && strcmp(cep->ce_vardata, "nick-user-host"))
+			{
+				config_error("%s:%i: set::topic-setter: value should be 'nick' or 'nick-user-host'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ban-setter"))
+		{
+			CheckNull(cep);
+			if (strcmp(cep->ce_vardata, "nick") && strcmp(cep->ce_vardata, "nick-user-host"))
+			{
+				config_error("%s:%i: set::ban-setter: value should be 'nick' or 'nick-user-host'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ban-setter-sync") || !strcmp(cep->ce_varname, "ban-setter-synch"))
+		{
+			CheckNull(cep);
+		}
+		else if (!strcmp(cep->ce_varname, "part-instead-of-quit-on-comment-change"))
+		{
+			CheckNull(cep);
+		}
+		else if (!strcmp(cep->ce_varname, "broadcast-channel-messages"))
+		{
+			CheckNull(cep);
+			if (strcmp(cep->ce_vardata, "auto") &&
+			    strcmp(cep->ce_vardata, "always") &&
+			    strcmp(cep->ce_vardata, "never"))
+			{
+				config_error("%s:%i: set::broadcast-channel-messages: value should be 'auto', 'always' or 'never'",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "allowed-channelchars"))
+		{
+			CheckNull(cep);
+			if (strcmp(cep->ce_vardata, "ascii") &&
+			    strcmp(cep->ce_vardata, "utf8") &&
+			    strcmp(cep->ce_vardata, "any"))
+			{
+				config_error("%s:%i: set::allowed-channelchars: value should be one of: 'ascii', 'utf8' or 'any'",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else
+		{
+			int used = 0;
+			for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+			{
+				int value, errs = 0;
+				if (h->owner && !(h->owner->flags & MODFLAG_TESTING) &&
+				                !(h->owner->options & MOD_OPT_PERM))
+					continue;
+				value = (*(h->func.intfunc))(conf,cep,CONFIG_SET, &errs);
+				if (value == 2)
+					used = 1;
+				if (value == 1)
+				{
+					used = 1;
+					break;
+				}
+				if (value == -1)
+				{
+					used = 1;
+					errors += errs;
+					break;
+				}
+				if (value == -2)
+				{
+					used = 1;
+					errors += errs;
+				}
+			}
+			if (!used) {
+				config_error("%s:%i: unknown directive set::%s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_varname);
+				errors++;
+			}
+		}
+	}
+	return errors;
+}
+
+int	_conf_loadmodule(ConfigFile *conf, ConfigEntry *ce)
+{
+	char *ret;
+	if (!ce->ce_vardata)
+	{
+		config_status("%s:%i: loadmodule without filename",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return -1;
+	}
+	if (strstr(ce->ce_vardata, "commands.so") || strstr(ce->ce_vardata, "commands.dll"))
+	{
+		config_error("%s:%i: You are trying to load the 'commands' module, this is no longer supported. "
+		             "Fix this by editing your configuration file: remove the loadmodule line for commands and add the following line instead: "
+		             "include \"modules.default.conf\";",
+		             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		need_34_upgrade = 1;
+		return -1;
+	}
+	if (strstr(ce->ce_vardata, "modules/cloak") && !strcmp(conf->cf_filename, "modules.conf"))
+	{
+		config_error("You seem to have an include for 'modules.conf'.");
+		config_error("If you have this because you are upgrading from 3.4-alpha3 to");
+		config_error("UnrealIRCd 4 then please change the include \"modules.conf\";");
+		config_error("into an include \"modules.default.conf\"; (probably in your");
+		config_error("conf/unrealircd.conf). Yeah, we changed the file name.");
+		// TODO ^: silly win32 wrapping prevents this from being displayed otherwise. PLZ FIX! !
+		/* let it continue to load anyway? */
+	}
+
+	if (is_blacklisted_module(ce->ce_vardata))
+	{
+		/* config_warn("%s:%i: Module '%s' is blacklisted, not loading",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum, ce->ce_vardata); */
+		return 1;
+	}
+
+	if ((ret = Module_Create(ce->ce_vardata))) {
+		config_status("%s:%i: loadmodule %s: failed to load: %s",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_vardata, ret);
+		return -1;
+	}
+	return 1;
+}
+
+int	_test_loadmodule(ConfigFile *conf, ConfigEntry *ce)
+{
+	return 0;
+}
+
+int	_test_blacklist_module(ConfigFile *conf, ConfigEntry *ce)
+{
+	char *path;
+	ConfigItem_blacklist_module *m;
+
+	if (!ce->ce_vardata)
+	{
+		config_status("%s:%i: blacklist-module: no module name given to blacklist",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return -1;
+	}
+
+	path = Module_TransformPath(ce->ce_vardata);
+
+	/* Is it a good idea to warn about this?
+	 * Yes, the user may have made a typo, thinking (s)he blacklisted something
+	 *      but due to the typo the blacklist-module is not effective.
+	 *  No, the user may have blacklisted a bunch of modules of which not all may
+	 *      be installed at the time.
+	 * Hmmmmmm.
+	 */
+	if (!file_exists(path))
+	{
+		config_warn("%s:%i: blacklist-module for '%s' but module does not exist anyway",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum, ce->ce_vardata);
+		/* fallthrough */
+	}
+
+	m = safe_alloc(sizeof(ConfigItem_blacklist_module));
+	safe_strdup(m->name, ce->ce_vardata);
+	AddListItem(m, conf_blacklist_module);
+
+	return 0;
+}
+
+int is_blacklisted_module(char *name)
+{
+	char *path = Module_TransformPath(name);
+	ConfigItem_blacklist_module *m;
+
+	for (m = conf_blacklist_module; m; m = m->next)
+		if (!strcasecmp(m->name, name) || !strcasecmp(m->name, path))
+			return 1;
+
+	return 0;
+}
+
+void start_listeners(void)
+{
+	ConfigItem_listen *listenptr;
+	int failed = 0, ports_bound = 0;
+	char boundmsg_ipv4[512], boundmsg_ipv6[512];
+
+	*boundmsg_ipv4 = *boundmsg_ipv6 = '\0';
+
+	for (listenptr = conf_listen; listenptr; listenptr = listenptr->next)
+	{
+		/* Try to bind to any ports that are not yet bound and not marked as temporary */
+		if (!(listenptr->options & LISTENER_BOUND) && !listenptr->flag.temporary)
+		{
+			if (add_listener(listenptr) == -1)
+			{
+				ircd_log(LOG_ERROR, "Failed to bind to %s:%i", listenptr->ip, listenptr->port);
+				failed = 1;
+			} else {
+				if (loop.ircd_booted)
+				{
+					ircd_log(LOG_ERROR, "UnrealIRCd is now also listening on %s:%d (%s)%s",
+						listenptr->ip, listenptr->port,
+						listenptr->ipv6 ? "IPv6" : "IPv4",
+						listenptr->options & LISTENER_TLS ? " (SSL/TLS)" : "");
+				} else {
+					if (listenptr->ipv6)
+						snprintf(boundmsg_ipv6+strlen(boundmsg_ipv6), sizeof(boundmsg_ipv6)-strlen(boundmsg_ipv6),
+							"%s:%d%s, ", listenptr->ip, listenptr->port,
+							listenptr->options & LISTENER_TLS ? "(SSL/TLS)" : "");
+					else
+						snprintf(boundmsg_ipv4+strlen(boundmsg_ipv4), sizeof(boundmsg_ipv4)-strlen(boundmsg_ipv4),
+							"%s:%d%s, ", listenptr->ip, listenptr->port,
+							listenptr->options & LISTENER_TLS ? "(SSL/TLS)" : "");
+				}
+			}
+		}
+
+		/* NOTE: do not merge this with code above (nor in an else block),
+		 * as add_listener() affects this flag.
+		 */
+		if (listenptr->options & LISTENER_BOUND)
+			ports_bound++;
+	}
+
+	if (ports_bound == 0)
+	{
+		ircd_log(LOG_ERROR, "IRCd could not listen on any ports. If you see 'Address already in use' errors "
+		                    "above then most likely the IRCd is already running (or something else is using the "
+		                    "specified ports). If you are sure the IRCd is not running then verify your "
+		                    "listen blocks, maybe you have to bind to a specific IP rather than \"*\".");
+		exit(-1);
+	}
+
+	if (failed && !loop.ircd_booted)
+	{
+		ircd_log(LOG_ERROR, "Could not listen on all specified addresses/ports. See errors above. "
+		                    "Please fix your listen { } blocks and/or make sure no other programs "
+		                    "are listening on the same port.");
+		exit(-1);
+	}
+
+	if (!loop.ircd_booted)
+	{
+		if (strlen(boundmsg_ipv4) > 2)
+			boundmsg_ipv4[strlen(boundmsg_ipv4)-2] = '\0';
+		if (strlen(boundmsg_ipv6) > 2)
+			boundmsg_ipv6[strlen(boundmsg_ipv6)-2] = '\0';
+
+		ircd_log(LOG_ERROR, "UnrealIRCd is now listening on the following addresses/ports:");
+		ircd_log(LOG_ERROR, "IPv4: %s", *boundmsg_ipv4 ? boundmsg_ipv4 : "<none>");
+		ircd_log(LOG_ERROR, "IPv6: %s", *boundmsg_ipv6 ? boundmsg_ipv6 : "<none>");
+	}
+}
+
+/* Actually use configuration */
+void run_configuration(void)
+{
+	start_listeners();
+}
+
+int	_conf_offchans(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		ConfigItem_offchans *of = safe_alloc(sizeof(ConfigItem_offchans));
+		strlcpy(of->chname, cep->ce_varname, CHANNELLEN+1);
+		for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+		{
+			if (!strcmp(cepp->ce_varname, "topic"))
+				safe_strdup(of->topic, cepp->ce_vardata);
+		}
+		AddListItem(of, conf_offchans);
+	}
+	return 0;
+}
+
+int	_test_offchans(ConfigFile *conf, ConfigEntry *ce)
+{
+	int errors = 0;
+	ConfigEntry *cep, *cep2;
+
+	if (!ce->ce_entries)
+	{
+		config_error("%s:%i: empty official-channels block",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+
+	config_warn("set::oficial-channels is deprecated. It often does not do what you want. "
+	            "You're better of creating a channel, setting all modes, topic, etc. to your liking "
+	            "and then making the channel permanent (MODE #channel +P). "
+	            "The channel will then be stored in a database to preserve it between restarts.");
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (strlen(cep->ce_varname) > CHANNELLEN)
+		{
+			config_error("%s:%i: official-channels: '%s' name too long (max %d characters).",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname, CHANNELLEN);
+			errors++;
+			continue;
+		}
+		if (!valid_channelname(cep->ce_varname))
+		{
+			config_error("%s:%i: official-channels: '%s' is not a valid channel name.",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+		for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+		{
+			if (!cep2->ce_vardata)
+			{
+				config_error_empty(cep2->ce_fileptr->cf_filename,
+					cep2->ce_varlinenum, "official-channels",
+					cep2->ce_varname);
+				errors++;
+				continue;
+			}
+			if (!strcmp(cep2->ce_varname, "topic"))
+			{
+				if (strlen(cep2->ce_vardata) > MAXTOPICLEN)
+				{
+					config_error("%s:%i: official-channels::%s: topic too long (max %d characters).",
+						cep2->ce_fileptr->cf_filename, cep2->ce_varlinenum, cep->ce_varname, MAXTOPICLEN);
+					errors++;
+					continue;
+				}
+			} else {
+				config_error_unknown(cep2->ce_fileptr->cf_filename,
+					cep2->ce_varlinenum, "official-channels",
+					cep2->ce_varname);
+				errors++;
+				continue;
+			}
+		}
+	}
+	return errors;
+}
+
+int	_conf_alias(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigItem_alias *alias = NULL;
+	ConfigItem_alias_format *format;
+	ConfigEntry 	    	*cep, *cepp;
+	RealCommand *cmptr;
+
+	if ((cmptr = find_command(ce->ce_vardata, CMD_ALIAS)))
+		CommandDelX(NULL, cmptr);
+	if (find_command_simple(ce->ce_vardata))
+	{
+		config_warn("%s:%i: Alias '%s' would conflict with command (or server token) '%s', alias not added.",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			ce->ce_vardata, ce->ce_vardata);
+		return 0;
+	}
+	if ((alias = find_alias(ce->ce_vardata)))
+		DelListItem(alias, conf_alias);
+	alias = safe_alloc(sizeof(ConfigItem_alias));
+	safe_strdup(alias->alias, ce->ce_vardata);
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "format")) {
+			format = safe_alloc(sizeof(ConfigItem_alias_format));
+			safe_strdup(format->format, cep->ce_vardata);
+			format->expr = unreal_create_match(MATCH_PCRE_REGEX, cep->ce_vardata, NULL);
+			if (!format->expr)
+				abort(); /* Impossible due to _test_alias earlier */
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (!strcmp(cepp->ce_varname, "nick") ||
+				    !strcmp(cepp->ce_varname, "target") ||
+				    !strcmp(cepp->ce_varname, "command")) {
+					safe_strdup(format->nick, cepp->ce_vardata);
+				}
+				else if (!strcmp(cepp->ce_varname, "parameters")) {
+					safe_strdup(format->parameters, cepp->ce_vardata);
+				}
+				else if (!strcmp(cepp->ce_varname, "type")) {
+					if (!strcmp(cepp->ce_vardata, "services"))
+						format->type = ALIAS_SERVICES;
+					else if (!strcmp(cepp->ce_vardata, "stats"))
+						format->type = ALIAS_STATS;
+					else if (!strcmp(cepp->ce_vardata, "normal"))
+						format->type = ALIAS_NORMAL;
+					else if (!strcmp(cepp->ce_vardata, "channel"))
+						format->type = ALIAS_CHANNEL;
+					else if (!strcmp(cepp->ce_vardata, "real"))
+						format->type = ALIAS_REAL;
+				}
+			}
+			AddListItem(format, alias->format);
+		}
+
+		else if (!strcmp(cep->ce_varname, "nick") || !strcmp(cep->ce_varname, "target"))
+		{
+			safe_strdup(alias->nick, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "type")) {
+			if (!strcmp(cep->ce_vardata, "services"))
+				alias->type = ALIAS_SERVICES;
+			else if (!strcmp(cep->ce_vardata, "stats"))
+				alias->type = ALIAS_STATS;
+			else if (!strcmp(cep->ce_vardata, "normal"))
+				alias->type = ALIAS_NORMAL;
+			else if (!strcmp(cep->ce_vardata, "channel"))
+				alias->type = ALIAS_CHANNEL;
+			else if (!strcmp(cep->ce_vardata, "command"))
+				alias->type = ALIAS_COMMAND;
+		}
+		else if (!strcmp(cep->ce_varname, "spamfilter"))
+			alias->spamfilter = config_checkval(cep->ce_vardata, CFG_YESNO);
+	}
+	if (BadPtr(alias->nick) && alias->type != ALIAS_COMMAND) {
+		safe_strdup(alias->nick, alias->alias);
+	}
+	AliasAdd(NULL, alias->alias, cmd_alias, 1, CMD_USER|CMD_ALIAS);
+
+	AddListItem(alias, conf_alias);
+	return 0;
+}
+
+
+int _test_alias(ConfigFile *conf, ConfigEntry *ce) {
+	int errors = 0;
+	ConfigEntry *cep, *cepp;
+	char has_type = 0, has_target = 0, has_format = 0;
+	char type = 0;
+
+	if (!ce->ce_entries)
+	{
+		config_error("%s:%i: empty alias block",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: alias without name",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+	else if (!find_command(ce->ce_vardata, CMD_ALIAS) && find_command(ce->ce_vardata, 0)) {
+		config_status("%s:%i: %s is an existing command, can not add alias",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum, ce->ce_vardata);
+		errors++;
+	}
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "alias"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "format")) {
+			char *err = NULL;
+			Match *expr;
+			char has_type = 0, has_target = 0, has_parameters = 0;
+
+			has_format = 1;
+			expr = unreal_create_match(MATCH_PCRE_REGEX, cep->ce_vardata, &err);
+			if (!expr)
+			{
+				config_error("%s:%i: alias::format contains an invalid regex: %s",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, err);
+				config_error("Upgrading from 3.2.x to UnrealIRCd 4? Note that regex changed from POSIX Regex "
+				             "to PCRE Regex!"); /* TODO: refer to some url ? */
+			} else {
+				unreal_delete_match(expr);
+			}
+
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next) {
+				if (config_is_blankorempty(cepp, "alias::format"))
+				{
+					errors++;
+					continue;
+				}
+				if (!strcmp(cepp->ce_varname, "nick") ||
+				    !strcmp(cepp->ce_varname, "command") ||
+				    !strcmp(cepp->ce_varname, "target"))
+				{
+					if (has_target)
+					{
+						config_warn_duplicate(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum,
+							"alias::format::target");
+						continue;
+					}
+					has_target = 1;
+				}
+				else if (!strcmp(cepp->ce_varname, "type"))
+				{
+					if (has_type)
+					{
+						config_warn_duplicate(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum,
+							"alias::format::type");
+						continue;
+					}
+					has_type = 1;
+					if (!strcmp(cepp->ce_vardata, "services"))
+						;
+					else if (!strcmp(cepp->ce_vardata, "stats"))
+						;
+					else if (!strcmp(cepp->ce_vardata, "normal"))
+						;
+					else if (!strcmp(cepp->ce_vardata, "channel"))
+						;
+					else if (!strcmp(cepp->ce_vardata, "real"))
+						;
+					else
+					{
+						config_error("%s:%i: unknown alias type",
+						cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+					}
+				}
+				else if (!strcmp(cepp->ce_varname, "parameters"))
+				{
+					if (has_parameters)
+					{
+						config_warn_duplicate(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum,
+							"alias::format::parameters");
+						continue;
+					}
+					has_parameters = 1;
+				}
+				else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "alias::format",
+						cepp->ce_varname);
+					errors++;
+				}
+			}
+			if (!has_target)
+			{
+				config_error_missing(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "alias::format::target");
+				errors++;
+			}
+			if (!has_type)
+			{
+				config_error_missing(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "alias::format::type");
+				errors++;
+			}
+			if (!has_parameters)
+			{
+				config_error_missing(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "alias::format::parameters");
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "nick") || !strcmp(cep->ce_varname, "target"))
+		{
+			if (has_target)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "alias::target");
+				continue;
+			}
+			has_target = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "type")) {
+			if (has_type)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "alias::type");
+				continue;
+			}
+			has_type = 1;
+			if (!strcmp(cep->ce_vardata, "services"))
+				;
+			else if (!strcmp(cep->ce_vardata, "stats"))
+				;
+			else if (!strcmp(cep->ce_vardata, "normal"))
+				;
+			else if (!strcmp(cep->ce_vardata, "channel"))
+				;
+			else if (!strcmp(cep->ce_vardata, "command"))
+				type = 'c';
+			else {
+				config_error("%s:%i: unknown alias type",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "spamfilter"))
+			;
+		else {
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"alias", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_type)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"alias::type");
+		errors++;
+	}
+	if (!has_format && type == 'c')
+	{
+		config_error("%s:%d: alias::type is 'command' but no alias::format was specified",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+	else if (has_format && type != 'c')
+	{
+		config_error("%s:%d: alias::format specified when type is not 'command'",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+	return errors;
+}
+
+int	_conf_deny(ConfigFile *conf, ConfigEntry *ce)
+{
+Hook *h;
+
+	if (!strcmp(ce->ce_vardata, "channel"))
+		_conf_deny_channel(conf, ce);
+	else if (!strcmp(ce->ce_vardata, "link"))
+		_conf_deny_link(conf, ce);
+	else if (!strcmp(ce->ce_vardata, "version"))
+		_conf_deny_version(conf, ce);
+	else
+	{
+		int value;
+		for (h = Hooks[HOOKTYPE_CONFIGRUN]; h; h = h->next)
+		{
+			value = (*(h->func.intfunc))(conf,ce,CONFIG_DENY);
+			if (value == 1)
+				break;
+		}
+		return 0;
+	}
+	return 0;
+}
+
+int	_conf_deny_channel(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigItem_deny_channel 	*deny = NULL;
+	ConfigEntry 	    	*cep;
+
+	deny = safe_alloc(sizeof(ConfigItem_deny_channel));
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "channel"))
+		{
+			safe_strdup(deny->channel, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "redirect"))
+		{
+			safe_strdup(deny->redirect, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			safe_strdup(deny->reason, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "warn"))
+		{
+			deny->warn = config_checkval(cep->ce_vardata,CFG_YESNO);
+		}
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			safe_strdup(deny->class, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "mask"))
+		{
+			unreal_add_masks(&deny->mask, cep);
+		}
+	}
+	AddListItem(deny, conf_deny_channel);
+	return 0;
+}
+int	_conf_deny_link(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigItem_deny_link 	*deny = NULL;
+	ConfigEntry 	    	*cep;
+
+	deny = safe_alloc(sizeof(ConfigItem_deny_link));
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			safe_strdup(deny->mask, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "rule"))
+		{
+			deny->rule = (char *)crule_parse(cep->ce_vardata);
+			safe_strdup(deny->prettyrule, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "type")) {
+			if (!strcmp(cep->ce_vardata, "all"))
+				deny->flag.type = CRULE_ALL;
+			else if (!strcmp(cep->ce_vardata, "auto"))
+				deny->flag.type = CRULE_AUTO;
+		}
+	}
+	AddListItem(deny, conf_deny_link);
+	return 0;
+}
+
+int	_conf_deny_version(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigItem_deny_version *deny = NULL;
+	ConfigEntry 	    	*cep;
+
+	deny = safe_alloc(sizeof(ConfigItem_deny_version));
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			safe_strdup(deny->mask, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "version"))
+		{
+			safe_strdup(deny->version, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "flags"))
+		{
+			safe_strdup(deny->flags, cep->ce_vardata);
+		}
+	}
+	AddListItem(deny, conf_deny_version);
+	return 0;
+}
+
+int     _test_deny(ConfigFile *conf, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	int	    errors = 0;
+	Hook	*h;
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: deny without type",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	if (!strcmp(ce->ce_vardata, "channel"))
+	{
+		char has_channel = 0, has_warn = 0, has_reason = 0, has_redirect = 0, has_class = 0;
+		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+		{
+			if (config_is_blankorempty(cep, "deny channel"))
+			{
+				errors++;
+				continue;
+			}
+			if (!strcmp(cep->ce_varname, "channel"))
+			{
+				if (has_channel)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny channel::channel");
+					continue;
+				}
+				has_channel = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "redirect"))
+			{
+				if (has_redirect)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny channel::redirect");
+					continue;
+				}
+				has_redirect = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "reason"))
+			{
+				if (has_reason)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny channel::reason");
+					continue;
+				}
+				has_reason = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "warn"))
+			{
+				if (has_warn)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny channel::warn");
+					continue;
+				}
+				has_warn = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "class"))
+			{
+				if (has_class)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny channel::class");
+					continue;
+				}
+				has_class = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "mask"))
+			{
+			}
+			else
+			{
+				config_error_unknown(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "deny channel", cep->ce_varname);
+				errors++;
+			}
+		}
+		if (!has_channel)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny channel::channel");
+			errors++;
+		}
+		if (!has_reason)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny channel::reason");
+			errors++;
+		}
+	}
+	else if (!strcmp(ce->ce_vardata, "link"))
+	{
+		char has_mask = 0, has_rule = 0, has_type = 0;
+		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+		{
+			if (config_is_blankorempty(cep, "deny link"))
+			{
+				errors++;
+				continue;
+			}
+			if (!strcmp(cep->ce_varname, "mask"))
+			{
+				if (has_mask)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny link::mask");
+					continue;
+				}
+				has_mask = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "rule"))
+			{
+				int val = 0;
+				if (has_rule)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny link::rule");
+					continue;
+				}
+				has_rule = 1;
+				if ((val = crule_test(cep->ce_vardata)))
+				{
+					config_error("%s:%i: deny link::rule contains an invalid expression: %s",
+						cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum,
+						crule_errstring(val));
+					errors++;
+				}
+			}
+			else if (!strcmp(cep->ce_varname, "type"))
+			{
+				if (has_type)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny link::type");
+					continue;
+				}
+				has_type = 1;
+				if (!strcmp(cep->ce_vardata, "auto"))
+				;
+				else if (!strcmp(cep->ce_vardata, "all"))
+				;
+				else {
+					config_status("%s:%i: unknown deny link type",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+					errors++;
+				}
+			}
+			else
+			{
+				config_error_unknown(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "deny link", cep->ce_varname);
+				errors++;
+			}
+		}
+		if (!has_mask)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny link::mask");
+			errors++;
+		}
+		if (!has_rule)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny link::rule");
+			errors++;
+		}
+		if (!has_type)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny link::type");
+			errors++;
+		}
+	}
+	else if (!strcmp(ce->ce_vardata, "version"))
+	{
+		char has_mask = 0, has_version = 0, has_flags = 0;
+		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+		{
+			if (config_is_blankorempty(cep, "deny version"))
+			{
+				errors++;
+				continue;
+			}
+			if (!strcmp(cep->ce_varname, "mask"))
+			{
+				if (has_mask)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny version::mask");
+					continue;
+				}
+				has_mask = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "version"))
+			{
+				if (has_version)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny version::version");
+					continue;
+				}
+				has_version = 1;
+			}
+			else if (!strcmp(cep->ce_varname, "flags"))
+			{
+				if (has_flags)
+				{
+					config_warn_duplicate(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "deny version::flags");
+					continue;
+				}
+				has_flags = 1;
+			}
+			else
+			{
+				config_error_unknown(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "deny version", cep->ce_varname);
+				errors++;
+			}
+		}
+		if (!has_mask)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny version::mask");
+			errors++;
+		}
+		if (!has_version)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny version::version");
+			errors++;
+		}
+		if (!has_flags)
+		{
+			config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"deny version::flags");
+			errors++;
+		}
+	}
+	else
+	{
+		int used = 0;
+		for (h = Hooks[HOOKTYPE_CONFIGTEST]; h; h = h->next)
+		{
+			int value, errs = 0;
+			if (h->owner && !(h->owner->flags & MODFLAG_TESTING)
+			    && !(h->owner->options & MOD_OPT_PERM))
+				continue;
+			value = (*(h->func.intfunc))(conf,ce,CONFIG_DENY, &errs);
+			if (value == 2)
+				used = 1;
+			if (value == 1)
+			{
+				used = 1;
+				break;
+			}
+			if (value == -1)
+			{
+				used = 1;
+				errors += errs;
+				break;
+			}
+			if (value == -2)
+			{
+				used = 1;
+				errors += errs;
+			}
+		}
+		if (!used) {
+			config_error("%s:%i: unknown deny type %s",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				ce->ce_vardata);
+			return 1;
+		}
+		return errors;
+	}
+
+	return errors;
+}
+
+#ifdef USE_LIBCURL
+static void conf_download_complete(const char *url, const char *file, const char *errorbuf, int cached, void *inc_key)
+{
+	ConfigItem_include *inc;
+
+	if (!loop.ircd_rehashing)
+		return;
+
+	/*
+	  use inc_key to find the correct include block. This
+	  should be cheaper than using the full URL.
+	 */
+	for (inc = conf_include; inc; inc = inc->next)
+	{
+		if ( inc_key != (void *)inc )
+			continue;
+		if (!(inc->flag.type & INCLUDE_REMOTE))
+			continue;
+		if (inc->flag.type & INCLUDE_NOTLOADED)
+			continue;
+		if (strcasecmp(url, inc->url))
+			continue;
+
+		inc->flag.type &= ~INCLUDE_DLQUEUED;
+		break;
+	}
+	if (!inc)
+	{
+		ircd_log(LOG_ERROR, "Downloaded remote include which matches no include statement.");
+		return;
+	}
+
+	if (!file && !cached)
+		update_remote_include(inc, file, 0, errorbuf); /* DOWNLOAD FAILED */
+	else
+	{
+		char *urlfile = url_getfilename(url);
+		char *file_basename = unreal_getfilename(urlfile);
+		char *tmp = unreal_mktemp(TMPDIR, file_basename ? file_basename : "download.conf");
+		safe_free(urlfile);
+
+		if (cached)
+		{
+			unreal_copyfileex(inc->file, tmp, 1);
+			unreal_copyfileex(inc->file, unreal_mkcache(url), 0);
+			update_remote_include(inc, tmp, 0, NULL);
+		}
+		else
+		{
+			/*
+			  copy/hardlink file to another file because our caller will
+			  remove(file).
+			*/
+			unreal_copyfileex(file, tmp, 1);
+			update_remote_include(inc, tmp, 0, NULL);
+			unreal_copyfileex(file, unreal_mkcache(url), 0);
+		}
+	}
+	for (inc = conf_include; inc; inc = inc->next)
+	{
+		if (inc->flag.type & INCLUDE_DLQUEUED)
+			return;
+	}
+	rehash_internal(loop.rehash_save_client, loop.rehash_save_sig);
+}
+#endif
+
+int     rehash(Client *client, int sig)
+{
+#ifdef USE_LIBCURL
+	ConfigItem_include *inc;
+	char found_remote = 0;
+	if (loop.ircd_rehashing)
+	{
+		if (!sig)
+			sendnotice(client, "A rehash is already in progress");
+		return 0;
+	}
+
+	/* Log who or what did the rehash: */
+	if (sig)
+	{
+		ircd_log(LOG_ERROR, "Rehashing configuration file (SIGHUP signal received)");
+	} else
+	if (client && client->user)
+	{
+		ircd_log(LOG_ERROR, "Rehashing configuration file (requested by %s!%s@%s)",
+			client->name, client->user->username, client->user->realhost);
+	} else
+	if (client)
+	{
+		ircd_log(LOG_ERROR, "Rehashing configuration file (requested by %s)",
+			client->name);
+	}
+
+	loop.ircd_rehashing = 1;
+	loop.rehash_save_client = client;
+	loop.rehash_save_sig = sig;
+	for (inc = conf_include; inc; inc = inc->next)
+	{
+		time_t modtime;
+		if (!(inc->flag.type & INCLUDE_REMOTE))
+			continue;
+
+		if (inc->flag.type & INCLUDE_NOTLOADED)
+			continue;
+		found_remote = 1;
+		modtime = unreal_getfilemodtime(inc->file);
+		inc->flag.type |= INCLUDE_DLQUEUED;
+
+		/*
+		  use (void *)inc as the key for finding which
+		  include block conf_download_complete() should use.
+		*/
+		download_file_async(inc->url, modtime, conf_download_complete, (void *)inc);
+	}
+	if (!found_remote)
+		return rehash_internal(client, sig);
+	return 0;
+#else
+	loop.ircd_rehashing = 1;
+	return rehash_internal(client, sig);
+#endif
+}
+
+int	rehash_internal(Client *client, int sig)
+{
+	if (sig == 1)
+		sendto_ops("Got signal SIGHUP, reloading %s file", configfile);
+	loop.ircd_rehashing = 1; /* double checking.. */
+	if (init_conf(configfile, 1) == 0)
+		run_configuration();
+	if (sig == 1)
+		reread_motdsandrules();
+	unload_all_unused_snomasks();
+	unload_all_unused_umodes();
+	unload_all_unused_extcmodes();
+	unload_all_unused_caps();
+	unload_all_unused_history_backends();
+	// unload_all_unused_moddata(); -- this will crash
+	extcmodes_check_for_changes();
+	umodes_check_for_changes();
+	charsys_check_for_changes();
+	loop.ircd_rehashing = 0;
+	remote_rehash_client = NULL;
+	return 1;
+}
+
+void link_cleanup(ConfigItem_link *link_ptr)
+{
+	safe_free(link_ptr->servername);
+	unreal_delete_masks(link_ptr->incoming.mask);
+	Auth_FreeAuthConfig(link_ptr->auth);
+	safe_free(link_ptr->outgoing.bind_ip);
+	safe_free(link_ptr->outgoing.hostname);
+	safe_free(link_ptr->hub);
+	safe_free(link_ptr->leaf);
+	if (link_ptr->ssl_ctx)
+	{
+		SSL_CTX_free(link_ptr->ssl_ctx);
+		link_ptr->ssl_ctx = NULL;
+	}
+	if (link_ptr->tls_options)
+	{
+		free_tls_options(link_ptr->tls_options);
+		link_ptr->tls_options = NULL;
+    }
+}
+
+void delete_linkblock(ConfigItem_link *link_ptr)
+{
+	Debug((DEBUG_ERROR, "delete_linkblock: deleting %s, refcount=%d",
+		link_ptr->servername, link_ptr->refcount));
+	if (link_ptr->class)
+	{
+		link_ptr->class->xrefcount--;
+		/* Perhaps the class is temporary too and we need to free it... */
+		if (link_ptr->class->flag.temporary &&
+		    !link_ptr->class->clients && !link_ptr->class->xrefcount)
+		{
+			delete_classblock(link_ptr->class);
+			link_ptr->class = NULL;
+		}
+	}
+	link_cleanup(link_ptr);
+	DelListItem(link_ptr, conf_link);
+	safe_free(link_ptr);
+}
+
+void delete_classblock(ConfigItem_class *class_ptr)
+{
+	Debug((DEBUG_ERROR, "delete_classblock: deleting %s, clients=%d, xrefcount=%d",
+		class_ptr->name, class_ptr->clients, class_ptr->xrefcount));
+	safe_free(class_ptr->name);
+	DelListItem(class_ptr, conf_class);
+	safe_free(class_ptr);
+}
+
+void	listen_cleanup()
+{
+	int	i = 0;
+	ConfigItem_listen *listen_ptr, *next;
+
+	for (listen_ptr = conf_listen; listen_ptr; listen_ptr = next)
+	{
+		next = listen_ptr->next;
+		if (listen_ptr->flag.temporary && !listen_ptr->clients)
+		{
+			safe_free(listen_ptr->ip);
+			free_tls_options(listen_ptr->tls_options);
+			DelListItem(listen_ptr, conf_listen);
+			safe_free(listen_ptr);
+			i++;
+		}
+	}
+
+	if (i)
+		close_unbound_listeners();
+}
+
+#ifdef USE_LIBCURL
+char *find_remote_include(char *url, char **errorbuf)
+{
+	ConfigItem_include *inc;
+
+	for (inc = conf_include; inc; inc = inc->next)
+	{
+		if (!(inc->flag.type & INCLUDE_NOTLOADED))
+			continue;
+		if (!(inc->flag.type & INCLUDE_REMOTE))
+			continue;
+		if (!strcasecmp(url, inc->url))
+		{
+			*errorbuf = inc->errorbuf;
+			return inc->file;
+		}
+	}
+	return NULL;
+}
+
+char *find_loaded_remote_include(char *url)
+{
+	ConfigItem_include *inc;
+
+	for (inc = conf_include; inc; inc = inc->next)
+	{
+		if ((inc->flag.type & INCLUDE_NOTLOADED))
+			continue;
+		if (!(inc->flag.type & INCLUDE_REMOTE))
+			continue;
+		if (!strcasecmp(url, inc->url))
+			return inc->file;
+	}
+
+	return NULL;
+}
+
+/**
+ * Non-asynchronous remote inclusion to give a user better feedback
+ * when first starting his IRCd.
+ *
+ * The asynchronous friend is rehash() which merely queues remote
+ * includes for download using download_file_async().
+ */
+int remote_include(ConfigEntry *ce)
+{
+	char *errorbuf = NULL;
+	char *url = ce->ce_vardata;
+	char *file = find_remote_include(url, &errorbuf);
+	int ret;
+	if (!loop.ircd_rehashing || (loop.ircd_rehashing && !file && !errorbuf))
+	{
+		char *error;
+		if (config_verbose > 0)
+			config_status("Downloading %s", displayurl(url));
+		file = download_file(url, &error);
+		if (!file)
+		{
+			if (has_cached_version(url))
+			{
+				config_warn("%s:%i: include: error downloading '%s': %s -- using cached version instead.",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+					displayurl(url), error);
+				safe_strdup(file, unreal_mkcache(url));
+				/* Let it pass to load_conf()... */
+			} else {
+				config_error("%s:%i: include: error downloading '%s': %s",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+					 displayurl(url), error);
+				return -1;
+			}
+		} else {
+			unreal_copyfileex(file, unreal_mkcache(url), 0);
+		}
+		add_remote_include(file, url, 0, NULL, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		ret = load_conf(file, url);
+		safe_free(file);
+		return ret;
+	}
+	else
+	{
+		if (errorbuf)
+		{
+			if (has_cached_version(url))
+			{
+				config_warn("%s:%i: include: error downloading '%s': %s -- using cached version instead.",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+					displayurl(url), errorbuf);
+				/* Let it pass to load_conf()... */
+				safe_strdup(file, unreal_mkcache(url));
+			} else {
+				config_error("%s:%i: include: error downloading '%s': %s",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+					displayurl(url), errorbuf);
+				return -1;
+			}
+		}
+		if (config_verbose > 0)
+			config_status("Loading %s from download", url);
+		add_remote_include(file, url, 0, NULL, ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		ret = load_conf(file, url);
+		return ret;
+	}
+	return 0;
+}
+#endif
+
+/**
+ * Add an item to the conf_include list for the specified file.
+ *
+ * Checks for whether or not we're performing recursive includes
+ * belong in conf_load() because that function is able to return an
+ * error code. Any checks in here will end up being ignored by callers
+ * and thus will gain us nothing.
+ *
+ * @param file path to the include file.
+ */
+void add_include(const char *file, const char *included_from, int included_from_line)
+{
+	ConfigItem_include *inc;
+
+	inc = safe_alloc(sizeof(ConfigItem_include));
+	safe_strdup(inc->file, file);
+	inc->flag.type = INCLUDE_NOTLOADED;
+	safe_strdup(inc->included_from, included_from);
+	inc->included_from_line = included_from_line;
+	AddListItem(inc, conf_include);
+}
+
+#ifdef USE_LIBCURL
+/**
+ * Adds a remote include entry to the config_include list.
+ *
+ * This is to be called whenever the included_from and
+ * included_from_line parameters are known. This means that during a
+ * rehash when downloads are done asynchronously, you call this with
+ * the inclued_from and included_from_line information. After the
+ * download is complete and you know there it is stored in the FS,
+ * call update_remote_include().
+ */
+void add_remote_include(const char *file, const char *url, int flags, const char *errorbuf, const char *included_from, int included_from_line)
+{
+	ConfigItem_include *inc;
+
+	/* we rely on safe_alloc() zeroing the ConfigItem_include */
+	inc = safe_alloc(sizeof(ConfigItem_include));
+	if (included_from)
+	{
+		safe_strdup(inc->included_from, included_from);
+		inc->included_from_line = included_from_line;
+	}
+	safe_strdup(inc->url, url);
+
+	update_remote_include(inc, file, INCLUDE_NOTLOADED|INCLUDE_REMOTE|flags, errorbuf);
+	AddListItem(inc, conf_include);
+}
+
+/**
+ * Update certain information in a remote include's config_include list entry.
+ *
+ * @param file the place on disk where the downloaded remote include
+ *        may be found
+ * @param flags additional flags to set on the config_include entry
+ * @param errorbuf non-NULL if there were errors encountered in
+ *        downloading. The error will be stored into the config_include
+ *        entry.
+ */
+void update_remote_include(ConfigItem_include *inc, const char *file, int flags, const char *errorbuf)
+{
+	/*
+	 * file may be NULL when errorbuf is non-NULL and vice-versa.
+	 */
+	if (file)
+		safe_strdup(inc->file, file);
+	inc->flag.type |= flags;
+
+	if (errorbuf)
+		safe_strdup(inc->errorbuf, errorbuf);
+}
+#endif
+
+/**
+ * Clean up conf_include after a rehash fails because of a
+ * configuration file error.
+ *
+ * Duplicates some in unload_loaded_include().
+ */
+void unload_notloaded_includes(void)
+{
+	ConfigItem_include *inc, *next;
+
+	for (inc = conf_include; inc; inc = next)
+	{
+		next = inc->next;
+		if ((inc->flag.type & INCLUDE_NOTLOADED) || !(inc->flag.type & INCLUDE_USED))
+		{
+#ifdef USE_LIBCURL
+			if (inc->flag.type & INCLUDE_REMOTE)
+			{
+				/* Delete the file, but only if it's not a cached version */
+				if (strncmp(inc->file, CACHEDIR, strlen(CACHEDIR)))
+				{
+					remove(inc->file);
+				}
+				safe_free(inc->url);
+				safe_free(inc->errorbuf);
+			}
+#endif
+			safe_free(inc->file);
+			safe_free(inc->included_from);
+			DelListItem(inc, conf_include);
+			safe_free(inc);
+		}
+	}
+}
+
+/**
+ * Clean up conf_include after a successful rehash to make way for
+ * load_includes().
+ */
+void unload_loaded_includes(void)
+{
+	ConfigItem_include *inc, *next;
+
+	for (inc = conf_include; inc; inc = next)
+	{
+		next = inc->next;
+		if (!(inc->flag.type & INCLUDE_NOTLOADED) || !(inc->flag.type & INCLUDE_USED))
+		{
+#ifdef USE_LIBCURL
+			if (inc->flag.type & INCLUDE_REMOTE)
+			{
+				/* Delete the file, but only if it's not a cached version */
+				if (strncmp(inc->file, CACHEDIR, strlen(CACHEDIR)))
+				{
+					remove(inc->file);
+				}
+				safe_free(inc->url);
+				safe_free(inc->errorbuf);
+			}
+#endif
+			safe_free(inc->file);
+			safe_free(inc->included_from);
+			DelListItem(inc, conf_include);
+			safe_free(inc);
+		}
+	}
+}
+
+/**
+ * Mark loaded includes as loaded by removing the INCLUDE_NOTLOADED
+ * flag. Meant to be called only after calling
+ * unload_loaded_includes().
+ */
+void load_includes(void)
+{
+	ConfigItem_include *inc;
+
+	/* Doing this for all the includes should actually be faster
+	 * than only doing it for includes that are not-loaded
+	 */
+	for (inc = conf_include; inc; inc = inc->next)
+		inc->flag.type &= ~INCLUDE_NOTLOADED;
+}
+
+int tls_tests(void)
+{
+	if (have_tls_listeners == 0)
+	{
+		config_error("Your server is not listening on any SSL/TLS ports.");
+		config_status("Add this to your unrealircd.conf: listen { ip %s; port 6697; options { tls; }; };",
+		            port_6667_ip ? port_6667_ip : "*");
+		config_status("See https://www.unrealircd.org/docs/FAQ#Your_server_is_not_listening_on_any_SSL_ports");
+		return 0;
+	}
+
+	return 1;
+}
+
+/** Check if the user attempts to unload (eg: by commenting out) a module
+ * that is currently loaded and is tagged as MOD_OPT_PERM_RELOADABLE
+ * (in other words: a module that allows re-loading but not un-loading)
+ */
+int reloadable_perm_module_unloaded(void)
+{
+    Module *m, *m2;
+    extern Module *Modules;
+    int ret = 0;
+
+	for (m = Modules; m; m = m->next)
+	{
+		if ((m->options & MOD_OPT_PERM_RELOADABLE) && (m->flags & MODFLAG_LOADED))
+		{
+			/* For each module w/MOD_OPT_PERM_RELOADABLE that is currently fully loaded... */
+			int found = 0;
+			for (m2 = Modules; m2; m2 = m2->next)
+			{
+				if ((m != m2) && !strcmp(m->header->name, m2->header->name))
+					found = 1;
+			}
+			if (!found)
+			{
+				config_error("Attempt to unload module '%s' is not permitted. Module is permanent and reloadable only.", m->header->name);
+				ret = 1;
+				/* we don't return straight away so the user gets to see all errors and not just one */
+			}
+		}
+	}
+
+	return ret;
+}
+
+char *link_generator_spkifp(TLSOptions *tlsoptions)
+{
+	SSL_CTX *ctx;
+	SSL *ssl;
+	X509 *cert;
+
+	ctx = init_ctx(tlsoptions, 1);
+	if (!ctx)
+		exit(1);
+	ssl = SSL_new(ctx);
+	if (!ssl)
+		exit(1);
+	cert = SSL_get_certificate(ssl);
+	return spki_fingerprint_ex(cert);
+}
+
+void link_generator(void)
+{
+	ConfigItem_listen *lstn;
+	TLSOptions *tlsopt = iConf.tls_options; /* never null */
+	int port = 0;
+	char *ip = NULL;
+	char *spkifp;
+
+	for (lstn = conf_listen; lstn; lstn = lstn->next)
+	{
+		if ((lstn->options & LISTENER_SERVERSONLY) &&
+		    (lstn->options & LISTENER_TLS))
+		{
+			if (lstn->tls_options)
+				tlsopt = lstn->tls_options;
+			port = lstn->port;
+			if (strcmp(lstn->ip, "*"))
+				ip = lstn->ip;
+			/* else NULL */
+			break;
+		}
+	}
+
+	if (!port)
+	{
+		printf("You don't have any listen { } blocks that are serversonly.\n");
+		printf("It is recommended to have at least one. Add this to your configuration file:\n");
+		printf("listen { ip *; port 6900; options { tls; serversonly; }; };\n");
+		exit(1);
+	}
+
+	spkifp = link_generator_spkifp(tlsopt);
+	if (!spkifp)
+	{
+		printf("Could not calculate spkifp. Maybe you have uncommon SSL/TLS options set? Odd...\n");
+		exit(1);
+	}
+
+	printf("\n");
+	printf("Add the following link block to the unrealircd.conf on the OTHER side of the link\n");
+	printf("(so NOT in the unrealircd.conf on THIS machine). Here it is, just copy-paste:\n");
+	printf("################################################################################\n");
+	printf("link %s {\n"
+	       "    incoming {\n"
+	       "        mask *;\n"
+	       "    }\n"
+	       "    outgoing {\n"
+	       "        hostname %s;\n"
+	       "        port %d;\n"
+	       "    }\n"
+	       "    password \"%s\" { spkifp; }\n"
+	       "    class servers;\n"
+	       "}\n",
+	       conf_me->name,
+	       ip ? ip : conf_me->name,
+	       port,
+	       spkifp);
+	printf("################################################################################\n");
+	exit(0);
+}
diff --git a/src/conf_preprocessor.c b/src/conf_preprocessor.c
new file mode 100644
index 0000000..ce6446c
--- /dev/null
+++ b/src/conf_preprocessor.c
@@ -0,0 +1,534 @@
+/* UnrealIRCd configuration preprocessor
+ * (C) Copyright 2019 Bram Matthys ("Syzop") and the UnrealIRCd team
+ * License: GPLv2
+ *
+ * Technically this isn't a 100% true preprocessor, but to the end user
+ * it will certainly look like it, hence the name.
+ */
+
+#include "unrealircd.h"
+
+extern ConfigFile *conf;
+
+NameValueList *config_defines = NULL; /**< List of @defines, only valid during configuration reading */
+
+void skip_whitespace(char **p)
+{
+	for (; **p == ' ' || **p == '\t'; *p = *p + 1);
+}
+
+void read_until(char **p, char *stopchars)
+{
+	for (; **p && !strchr(stopchars, **p); *p = *p + 1);
+}
+
+static inline int ValidVarCharacter(char x)
+{
+	if (isupper(x) || isdigit(x) || strchr("_", x))
+		return 1;
+	return 0;
+}
+
+PreprocessorItem evaluate_preprocessor_if(char *statement, char *filename, int linenumber, ConditionalConfig **cc_out)
+{
+	char *p=statement, *name;
+	int negative = 0;
+	ConditionalConfig *cc;
+
+	/* Currently we support only 4 things:
+	 * $XYZ == "something"
+	 * $XYZ != "something"
+	 * module-loaded("something")
+	 * !module-loaded("something")
+	 * defined($XYZ)
+	 * !defined($XYZ)
+	 * We do not support && or || or anything else at this time.
+	 */
+	skip_whitespace(&p);
+	if (*p == '@')
+		p++;
+	if (*p == '!')
+	{
+		negative = 1;
+		p++;
+		skip_whitespace(&p);
+	}
+
+	/* Now comes the keyword or a variable name */
+	if (!strncmp(p, "module-loaded", 13))
+	{
+		p += 13;
+		skip_whitespace(&p);
+		if (*p != '(')
+		{
+			config_error("%s:%i: expected '(' for module-loaded(...",
+				filename, linenumber);
+			return PREPROCESSOR_ERROR;
+		}
+		p++;
+		skip_whitespace(&p);
+		if (*p == '"')
+			p++;
+		name = p;
+		read_until(&p, ")\"");
+		if (!*p)
+		{
+			config_error("%s:%i: invalid if statement (termination error): %s",
+				filename, linenumber, statement);
+			return PREPROCESSOR_ERROR;
+		}
+		*p = '\0';
+		cc = safe_alloc(sizeof(ConditionalConfig));
+		cc->condition = IF_MODULE;
+		cc->negative = negative;
+		safe_strdup(cc->name, name);
+		*cc_out = cc;
+		return PREPROCESSOR_IF;
+	} else
+	if (!strncmp(p, "defined", 7))
+	{
+		p += 7;
+		skip_whitespace(&p);
+		if (*p != '(')
+		{
+			config_error("%s:%i: expected '(' for defined(...",
+				filename, linenumber);
+			return PREPROCESSOR_ERROR;
+		}
+		p++;
+		skip_whitespace(&p);
+		if (*p == '"')
+			p++;
+		name = p;
+		read_until(&p, ")\"");
+		if (!*p)
+		{
+			config_error("%s:%i: invalid if statement (termination error): %s",
+				filename, linenumber, statement);
+			return PREPROCESSOR_ERROR;
+		}
+		*p = '\0';
+		cc = safe_alloc(sizeof(ConditionalConfig));
+		cc->condition = IF_DEFINED;
+		cc->negative = negative;
+		safe_strdup(cc->name, name);
+		*cc_out = cc;
+		return PREPROCESSOR_IF;
+	} else
+	{
+		char *name_terminate, *name2;
+		// Should be one of:
+		// $XYZ == "something"
+		// $XYZ != "something"
+		// Anything else is an error.
+		if (*p != '$')
+		{
+			config_error("%s:%i: invalid @if statement. Either an unknown function, or did you mean $VARNAME?: %s",
+				filename, linenumber, statement);
+			return PREPROCESSOR_ERROR;
+		}
+		p++;
+		/* variable name starts now */
+		name = p;
+		read_until(&p, " \t=!");
+		if (!*p)
+		{
+			config_error("%s:%i: invalid if statement (termination error): %s",
+				filename, linenumber, statement);
+			return PREPROCESSOR_ERROR;
+		}
+		name_terminate = p;
+		skip_whitespace(&p);
+		if (!strncmp(p, "==", 2))
+		{
+			negative = 0;
+		} else
+		if (!strncmp(p, "!=", 2))
+		{
+			negative = 1;
+		} else
+		{
+			*name_terminate = '\0';
+			config_error("%s:%i: @if: expected == or != after '%s'",
+				filename, linenumber, name);
+			return PREPROCESSOR_ERROR;
+		}
+		p += 2;
+		*name_terminate = '\0';
+		skip_whitespace(&p);
+		if (*p != '"')
+		{
+			config_error("%s:%i: @if: expected double quotes, missing \" perhaps?",
+				filename, linenumber);
+			return PREPROCESSOR_ERROR;
+		}
+		p++;
+		name2 = p;
+		read_until(&p, "\"");
+		if (!*p)
+		{
+			config_error("%s:%i: invalid @if statement, missing \" at end perhaps?",
+				filename, linenumber);
+			return PREPROCESSOR_ERROR;
+		}
+		*p = '\0';
+		cc = safe_alloc(sizeof(ConditionalConfig));
+		cc->condition = IF_VALUE;
+		cc->negative = negative;
+		safe_strdup(cc->name, name);
+		safe_strdup(cc->opt, name2);
+		*cc_out = cc;
+		return PREPROCESSOR_IF;
+	}
+
+	config_error("%s:%i: Error while evaluating '@if' statement '%s'",
+		filename, linenumber, statement);
+	return PREPROCESSOR_ERROR;
+}
+
+PreprocessorItem  evaluate_preprocessor_define(char *statement, char *filename, int linenumber)
+{
+	char *p = statement;
+	char *name, *name_terminator;
+	char *value;
+
+	skip_whitespace(&p);
+	name = p;
+	read_until(&p, " \t");
+	if (!*p)
+	{
+		config_error("%s:%i: invalid @define statement",
+			filename, linenumber);
+		return PREPROCESSOR_ERROR;
+	}
+	name_terminator = p;
+	skip_whitespace(&p);
+	if (*p != '"')
+	{
+		config_error("%s:%i: @define: expected double quotes, missing \" perhaps?",
+			filename, linenumber);
+		return PREPROCESSOR_ERROR;
+	}
+	p++;
+	value = p;
+	read_until(&p, "\"");
+	if (!*p)
+	{
+		config_error("%s:%i: invalid @define statement, missing \" at end perhaps?",
+			filename, linenumber);
+		return PREPROCESSOR_ERROR;
+	}
+
+	*p = '\0';
+	*name_terminator = '\0';
+
+	if (*name != '$')
+	{
+		config_error("%s:%i: the defined variable should start with a dollar sign ($), "
+		             "so: @define $something \"123\" and not @define something \"123\"",
+		             filename, linenumber);
+		return PREPROCESSOR_ERROR;
+	}
+	/* Skip dollar sign */
+	name++;
+	for (p = name; *p; p++)
+	{
+		if (!ValidVarCharacter(*p))
+		{
+			config_error("%s:%i: A $VARIABLE name may only contain UPPERcase characters, "
+			             "digits, and the _ character. Illegal character: '%c'",
+			             filename, linenumber, *p);
+			return PREPROCESSOR_ERROR;
+		}
+	}
+
+	if (strlen(value) > 512)
+	{
+		config_error("%s:%i: Value of defined variable is extremely large (%ld characters)!",
+		             filename, linenumber, (long)strlen(value));
+		return PREPROCESSOR_ERROR;
+	}
+
+	NameValueList *d = safe_alloc(sizeof(NameValueList));
+	safe_strdup(d->name, name);
+	safe_strdup(d->value, value);
+	AddListItem(d, config_defines);
+	return PREPROCESSOR_DEFINE;
+}
+
+PreprocessorItem  parse_preprocessor_item(char *start, char *end, char *filename, int linenumber, ConditionalConfig **cc)
+{
+	char buf[512];
+	int max;
+
+	*cc = NULL;
+
+	max = end - start + 1;
+	if (max > sizeof(buf))
+		max = sizeof(buf);
+	strlcpy(buf, start, max);
+
+	if (!strncmp(buf, "@define", 7))
+		return evaluate_preprocessor_define(buf+7, filename, linenumber);
+	else if (!strncmp(buf, "@if ", 4))
+		return evaluate_preprocessor_if(buf+4, filename, linenumber, cc);
+	else if (!strcmp(buf, "@endif"))
+		return PREPROCESSOR_ENDIF;
+
+	config_error("%s:%i: Unknown preprocessor directive: %s", filename, linenumber, buf);
+	return PREPROCESSOR_ERROR; /* ??? */
+}
+
+/** Free a ConditionalConfig entry.
+ * NOTE: be sure to do a DelListItem() before calling this, if necessary.
+ */
+void preprocessor_cc_free_entry(ConditionalConfig *cc)
+{
+	safe_free(cc->name);
+	safe_free(cc->opt);
+	safe_free(cc);
+}
+
+/** Free ConditionalConfig entries in a linked list that
+ * are equal or above 'level'. This happens during an @endif.
+ */
+void preprocessor_cc_free_level(ConditionalConfig **cc_list, int level)
+{
+	ConditionalConfig *cc, *cc_next;
+	for (cc = *cc_list; cc; cc = cc_next)
+	{
+		cc_next = cc->next;
+		if (cc->priority >= level)
+		{
+			DelListItem(cc, *cc_list);
+			preprocessor_cc_free_entry(cc);
+		}
+	}
+}
+
+/** Duplicates a linked list of ConditionalConfig entries */
+void preprocessor_cc_duplicate_list(ConditionalConfig *r, ConditionalConfig **out)
+{
+	ConditionalConfig *cc;
+
+	*out = NULL;
+	for (; r; r = r->next)
+	{
+		cc = safe_alloc(sizeof(ConditionalConfig));
+		safe_strdup(cc->name, r->name);
+		safe_strdup(cc->opt, r->opt);
+		cc->priority = r->priority;
+		cc->condition = r->condition;
+		cc->negative = r->negative;
+		AddListItem(cc, *out);
+	}
+}
+
+void preprocessor_cc_free_list(ConditionalConfig *cc)
+{
+	ConditionalConfig *cc_next;
+
+	for (; cc; cc = cc_next)
+	{
+		cc_next = cc->next;
+		safe_free(cc->name);
+		safe_free(cc->opt);
+		safe_free(cc);
+	}
+}
+
+NameValueList *find_config_define(const char *name)
+{
+	NameValueList *n;
+
+	for (n = config_defines; n; n = n->next)
+		if (!strcasecmp(n->name, name))
+			return n;
+	return NULL;
+}
+
+/** Resolve a preprocessor condition to true (=default) or false */
+int preprocessor_resolve_if(ConditionalConfig *cc, PreprocessorPhase phase)
+{
+	int result = 0;
+
+	if (!cc)
+		return 1;
+
+	if (cc->condition == IF_MODULE)
+	{
+		if (phase == PREPROCESSOR_PHASE_INITIAL)
+			return 1; /* we cannot handle @if module-loaded() yet.. */
+		if (is_module_loaded(cc->name))
+		{
+			result = 1;
+		}
+	} else
+	if (cc->condition == IF_DEFINED)
+	{
+		NameValueList *d = find_config_define(cc->name);
+		if (d)
+		{
+			result = 1;
+		}
+	} else
+	if (cc->condition == IF_VALUE)
+	{
+		NameValueList *d = find_config_define(cc->name);
+		if (d && !strcasecmp(d->value, cc->opt))
+		{
+			result = 1;
+		}
+	} else
+	{
+		config_status("[BUG] unhandled @if type!!");
+	}
+
+	if (cc->negative)
+		result = result ? 0 : 1;
+
+	return result;
+}
+
+void preprocessor_resolve_conditionals_ce(ConfigEntry **ce_list, PreprocessorPhase phase)
+{
+	ConfigEntry *ce, *ce_next, *ce_prev;
+	ConfigEntry *cep, *cep_next, *cep_prev;
+
+	ce_prev = NULL;
+	for (ce = *ce_list; ce; ce = ce_next)
+	{
+		ce_next = ce->ce_next;
+		/* This is for an @if before a block start */
+		if (!preprocessor_resolve_if(ce->ce_cond, phase))
+		{
+			/* Delete this entry */
+			if (ce == *ce_list)
+			{
+				/* we are head, so new head */
+				*ce_list = ce->ce_next; /* can be NULL now */
+			} else {
+				/* non-head */
+				ce_prev->ce_next = ce->ce_next; /* can be NULL now */
+			}
+			config_entry_free(ce);
+			continue;
+		}
+		preprocessor_resolve_conditionals_ce(&ce->ce_entries, phase);
+		ce_prev = ce;
+	}
+}
+
+void preprocessor_resolve_conditionals_all(PreprocessorPhase phase)
+{
+	ConfigFile *cfptr;
+
+	for (cfptr = conf; cfptr; cfptr = cfptr->cf_next)
+		preprocessor_resolve_conditionals_ce(&cfptr->cf_entries, phase);
+}
+
+/** Frees the list of config_defines, so all @defines */
+void free_config_defines(void)
+{
+	NameValueList *e, *e_next;
+	for (e = config_defines; e; e = e_next)
+	{
+		e_next = e->next;
+		safe_free(e->name);
+		safe_free(e->value);
+		safe_free(e);
+	}
+	config_defines = NULL;
+}
+
+/** Return value of defined value */
+char *get_config_define(char *name)
+{
+	NameValueList *e;
+
+	for (e = config_defines; e; e = e->next)
+	{
+		if (!strcasecmp(e->name, name))
+			return e->value;
+	}
+
+	return NULL;
+}
+
+void preprocessor_replace_defines(char **item, ConfigEntry *ce)
+{
+	static char buf[4096];
+	char varname[512];
+	const char *i, *varstart, *varend;
+	char *o;
+	int n = sizeof(buf)-2;
+	int limit;
+	char *value;
+
+	if (!strchr(*item, '$'))
+		return; /* quick return in 99% of the cases */
+
+	o = buf;
+	for (i = *item; *i; i++)
+	{
+		if (*i != '$')
+		{
+			*o++ = *i;
+			if (--n == 0)
+				break;
+			continue;
+		}
+
+		/* $ encountered: */
+		varstart = i;
+		i++;
+		for (; *i && ValidVarCharacter(*i); i++);
+		varend = i;
+		i--;
+		limit = varend - varstart + 1;
+		if (limit > sizeof(varname))
+			limit = sizeof(varname);
+		strlcpy(varname, varstart, limit);
+		if (!strncmp(varstart, "$$", 2))
+		{
+			/* If we get here then we encountered "$$"
+			 * and varname is just "$".
+			 * This means we are hitting a $ escape sequence,
+			 * the $$ is used as a literal $.
+			 * Would be very rare if you need it, but.. we support it.
+			 */
+			value = varname; /* bit confusing, but no +1 here */
+			i++; /* skip extra $ in input */
+		} else
+		{
+			value = get_config_define(varname+1);
+			if (!value)
+			{
+#if 0
+				/* Complain about $VARS if they are not defined, but don't bother
+				 * for cases where it's clearly not a macro, eg. contains illegal
+				 * variable characters.
+				 */
+				if ((limit > 2) && ((*varend == '\0') || strchr("\t ,.", *varend)))
+				{
+					config_warn("%s:%d: Variable %s used here but there's no @define for it earlier.",
+						    ce->ce_fileptr->cf_filename, ce->ce_varlinenum, varname);
+				}
+#endif
+				value = varname; /* not found? then use varname, including the '$' */
+			}
+		}
+		limit = strlen(value) + 1;
+		if (limit > n)
+			limit = n;
+		strlcpy(o, value, limit);
+		o += limit - 1;
+		n -= limit;
+		if (n == 0)
+			break; /* no output buffer left */
+		if (*varend == 0)
+			break; /* no input buffer left */
+	}
+	*o = '\0';
+	safe_strdup(*item, buf);
+}
diff --git a/src/crashreport.c b/src/crashreport.c
new file mode 100644
index 0000000..aaf9901
--- /dev/null
+++ b/src/crashreport.c
@@ -0,0 +1,890 @@
+/* UnrealIRCd crash reporter code.
+ * (C) Copyright 2015-2019 Bram Matthys ("Syzop") and the UnrealIRCd Team.
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+#ifndef _WIN32
+#include <dirent.h>
+#else
+extern void StartUnrealAgain(void);
+#endif
+#include "version.h"
+
+extern char *getosname(void);
+
+
+time_t get_file_time(char *fname)
+{
+	struct stat st;
+	
+	if (stat(fname, &st) != 0)
+		return 0;
+
+	return (time_t)st.st_ctime;
+}
+
+char *find_best_coredump(void)
+{
+	static char best_fname[512];
+	time_t best_time = 0, t;
+	struct dirent *dir;
+#ifndef _WIN32
+	DIR *fd = opendir(TMPDIR);
+
+	if (!fd)
+		return NULL;
+	
+	*best_fname = '\0';
+	
+	while ((dir = readdir(fd)))
+	{
+		char *fname = dir->d_name;
+		if (strstr(fname, "core") && !strstr(fname, ".so") &&
+		    !strstr(fname, ".conf") && !strstr(fname, ".txt") &&
+		    !strstr(fname, ".done"))
+		{
+			char buf[512];
+			
+			snprintf(buf, sizeof(buf), "%s/%s", TMPDIR, fname);
+			t = get_file_time(buf);
+			if (t && (t > best_time))
+			{
+				best_time = t;
+				strlcpy(best_fname, buf, sizeof(best_fname));
+			}
+		}
+	}
+	closedir(fd);
+#else
+	/* Windows */
+	WIN32_FIND_DATA hData;
+	HANDLE hFile;
+	
+	hFile = FindFirstFile("unrealircd.*.core", &hData);
+	if (hFile == INVALID_HANDLE_VALUE)
+		return NULL;
+	
+	do
+	{
+		char *fname = hData.cFileName;
+		if (!strstr(fname, ".done"))
+		{
+			char buf[512];
+			strlcpy(buf, fname, sizeof(buf));
+			t = get_file_time(buf);
+			if (t && (t > best_time))
+			{
+				best_time = t;
+				strlcpy(best_fname, buf, sizeof(best_fname));
+			}
+		}
+	} while (FindNextFile(hFile, &hData));
+	FindClose(hFile);
+#endif	
+	
+	if (*best_fname)
+		return best_fname;
+	
+	return NULL; /* none found */
+}
+
+/** Find the latest AddressSanitizer log file */
+char *find_best_asan_log(void)
+{
+#ifndef _WIN32
+	static char best_fname[512];
+	time_t best_time = 0, t;
+	struct dirent *dir;
+	DIR *fd = opendir(TMPDIR);
+
+	if (!fd)
+		return NULL;
+
+	*best_fname = '\0';
+
+	while ((dir = readdir(fd)))
+	{
+		char *fname = dir->d_name;
+		if (strstr(fname, "unrealircd_asan.") && !strstr(fname, ".so") &&
+		    !strstr(fname, ".conf") && !strstr(fname, ".txt") &&
+		    !strstr(fname, ".done"))
+		{
+			char buf[512];
+
+			snprintf(buf, sizeof(buf), "%s/%s", TMPDIR, fname);
+			t = get_file_time(buf);
+			if (t && (t > best_time))
+			{
+				best_time = t;
+				strlcpy(best_fname, buf, sizeof(best_fname));
+			}
+		}
+	}
+	closedir(fd);
+	return BadPtr(best_fname) ? NULL : best_fname;
+#else
+	return NULL;
+#endif
+}
+
+#define EL_AR_MAX MAXPARA
+char **explode(char *str, char *delimiter)
+{
+	static char *ret[EL_AR_MAX+1];
+	static char buf[1024];
+	char *p, *name;
+	int cnt = 0;
+	
+	memset(&ret, 0, sizeof(ret)); /* make sure all elements are NULL */
+	
+	strlcpy(buf, str, sizeof(buf));
+	for (name = strtoken(&p, buf, delimiter); name; name = strtoken(&p, NULL, delimiter))
+	{
+		ret[cnt++] = name;
+		if (cnt == EL_AR_MAX)
+			break;
+	}
+	ret[cnt] = NULL;
+	
+	return ret;
+}
+
+void crash_report_fix_libs(char *coredump, int *thirdpartymods)
+{
+#ifndef _WIN32
+	FILE *fd;
+	char cmd[512], buf[1024];
+
+	/* This is needed for this function to work, but we keep it since it's
+	 * useful in general to have the bug report in English as well.
+	 */
+	setenv("LANG", "C", 1);
+	setenv("LC_ALL", "C", 1);
+
+	snprintf(cmd, sizeof(cmd), "echo info sharedlibrary|gdb %s/unrealircd %s 2>&1",
+		BINDIR, coredump);
+
+	fd = popen(cmd, "r");
+	if (!fd)
+		return;
+
+	while((fgets(buf, sizeof(buf), fd)))
+	{
+		char *file, *path;
+		char target[512];
+		char **arr;
+
+		stripcrlf(buf);
+
+		if (strstr(buf, ".third."))
+		    *thirdpartymods = 1;
+
+		/* Output we are interested is something like this:
+		 * <many spaces>    No        /home/blabla/unrealircd/tmp/5114DF16.m_kick.so
+		 */
+		if (!strstr(buf, " No "))
+			continue;
+		
+		path = strchr(buf, '/');
+		if (!path)
+			continue;
+
+		if (!strstr(path, TMPDIR))
+			continue; /* we only care about our TMPDIR stuff */
+		
+		file = strrchr(path, '/');
+		if (!file)
+			continue;
+		file++;
+		
+		/* files have the following two formats:
+		 * 5BE7DF9.m_svsnline.so          for modules/m_svsnline.so
+		 * 300AA138.chanmodes.nokick.so   for modules/chanmodes/nokick.so
+		 */
+		arr = explode(file, ".");
+		if (!arr[3])
+			snprintf(target, sizeof(target), "%s/%s.%s", MODULESDIR, arr[1], arr[2]);
+		else
+			snprintf(target, sizeof(target), "%s/%s/%s.%s", MODULESDIR, arr[1], arr[2], arr[3]);
+		
+		if (!file_exists(target))
+		{
+			printf("WARNING: could not resolve %s: %s does not exist\n", path, target);
+		} else {
+			if (symlink(target, path) < 0)
+				printf("WARNING: could not create symlink %s -> %s\n", path, target);
+		}
+		
+	}
+	pclose(fd);
+#endif
+}
+
+int crash_report_backtrace(FILE *reportfd, char *coredump)
+{
+	FILE *fd;
+	char cmd[512], buf[1024];
+	int n;
+
+#ifndef _WIN32
+	snprintf(buf, sizeof(buf), "%s/gdb.commands", TMPDIR);
+	fd = fopen(buf, "w");
+	if (!fd)
+	{
+		printf("ERROR: Could not write to %s.\n", buf);
+		return 0;
+	}
+	fprintf(fd, "frame\n"
+	            "echo \\n\n"
+	            "list\n"
+	            "echo \\n\n"
+	            "x/s our_mod_version\n"
+	            "echo \\n\n"
+	            "x/s backupbuf\n"
+	            "echo \\n\n"
+	            "bt\n"
+	            "echo \\n\n"
+	            "bt full\n"
+	            "echo \\n\n"
+	            "quit\n");
+	fclose(fd);
+
+	
+	snprintf(cmd, sizeof(cmd), "gdb -batch -x %s %s/unrealircd %s 2>&1",
+		buf, BINDIR, coredump);
+	
+	fd = popen(cmd, "r");
+	if (!fd)
+		return 0;
+	
+	fprintf(reportfd, "START OF BACKTRACE\n");
+	while((fgets(buf, sizeof(buf), fd)))
+	{
+		stripcrlf(buf);
+		fprintf(reportfd, " %s\n", buf);
+	}
+	n = pclose(fd);
+
+	fprintf(reportfd, "END OF BACKTRACE\n");
+
+	if (WEXITSTATUS(n) == 127)
+		return 0;
+
+	return 1;
+#else
+	fd = fopen(coredump, "r");
+	if (!fd)
+		return 0;
+	fprintf(reportfd, "START OF CRASH DUMP\n");
+	while((fgets(buf, sizeof(buf), fd)))
+	{
+		stripcrlf(buf);
+		fprintf(reportfd, " %s\n", buf);
+	}
+	fclose(fd);
+	fprintf(reportfd, "END OF CRASH DUMP\n");
+	return 1;
+#endif
+}
+
+int crash_report_asan_log(FILE *reportfd, char *coredump)
+{
+#ifndef _WIN32
+	time_t coretime, asantime;
+	FILE *fd;
+	char buf[1024];
+	char *asan_log = find_best_asan_log();
+	int n;
+
+	if (!asan_log)
+		return 0;
+
+	coretime = get_file_time(coredump);
+	asantime = get_file_time(asan_log);
+
+	fprintf(reportfd, "ASan log file found '%s' which is %ld newer than core file\n",
+		asan_log,
+		(long)((long)(coretime) - (long)asantime));
+
+	fd = fopen(asan_log, "r");
+	if (!fd)
+	{
+		fprintf(reportfd, "Could not open ASan log (%s)\n", strerror(errno));
+		return 0;
+	}
+	fprintf(reportfd, "START OF ASAN LOG\n");
+	while((fgets(buf, sizeof(buf), fd)))
+	{
+		stripcrlf(buf);
+		fprintf(reportfd, " %s\n", buf);
+	}
+	n = pclose(fd);
+	fprintf(reportfd, "END OF ASAN LOG\n");
+
+	if (WEXITSTATUS(n) == 127)
+		return 0;
+
+	return 1;
+#else
+	return 0;
+#endif
+}
+
+void crash_report_header(FILE *reportfd, char *coredump)
+{
+	time_t t;
+	
+	fprintf(reportfd, "== UNREALIRCD CRASH REPORT ==\n"
+	                  "\n"
+	                  "SYSTEM INFORMATION:\n");
+	
+	fprintf(reportfd, "UnrealIRCd version: %s\n", VERSIONONLY);
+#if defined(__VERSION__)
+	fprintf(reportfd, "          Compiler: %s\n", __VERSION__);
+#endif
+	
+	fprintf(reportfd, "  Operating System: %s\n", MYOSNAME);
+
+	
+	fprintf(reportfd, "Using core file: %s\n", coredump);
+	
+	t = get_file_time(coredump);
+	if (t != 0)
+	{
+		fprintf(reportfd, "Crash date/time: %s\n", myctime(t) ? myctime(t) : "???");
+		fprintf(reportfd, " Crash secs ago: %ld\n",
+			(long)(time(NULL) - t));
+	} else {
+		fprintf(reportfd, "Crash date/time: UNKNOWN\n");
+		fprintf(reportfd, " Crash secs ago: UNKNOWN\n");
+	}
+	
+	fprintf(reportfd, "\n");
+}
+
+/** Checks if the binary is newer than the coredump.
+ * If that's the case (1) then the core dump is likely not very usable.
+ */
+int corefile_vs_binary_mismatch(char *coredump)
+{
+#ifndef _WIN32
+	time_t core, binary;
+	char fname[512];
+	
+	snprintf(fname, sizeof(fname), "%s/unrealircd", BINDIR);
+	
+	core = get_file_time(coredump);
+	binary = get_file_time(fname);
+	
+	if (!core || !binary)
+		return 0; /* don't know then */
+	
+	if (binary > core)
+		return 1; /* yup, mismatch ;/ */
+	
+	return 0; /* GOOD! */
+#else
+	return 0; /* guess we don't check this on Windows? Or will we check UnrealIRCd.exe... hmm.. yeah maybe good idea */
+#endif
+}
+
+int attach_file(FILE *fdi, FILE *fdo)
+{
+	char binbuf[60];
+	char printbuf[100];
+	size_t n, total = 0;
+
+	fprintf(fdo, "\n*** ATTACHMENT ****\n");
+	while((n = fread(binbuf, 1, sizeof(binbuf), fdi)) > 0)
+	{
+		b64_encode(binbuf, n, printbuf, sizeof(printbuf));
+		fprintf(fdo, "%s\n", printbuf);
+
+		total += strlen(printbuf);
+
+		if (total > 15000000)
+			return 0; /* Safety limit */
+	}
+
+	fprintf(fdo, "*** END OF ATTACHMENT ***\n");
+	return 1;
+}
+
+/** Figure out the libc library name (.so file), copy it to tmp/
+ * to include it in the bug report. This can improve the backtrace
+ * a lot (read: make it actually readable / useful) in case we
+ * crash in a libc function.
+ */
+char *copy_libc_so(void)
+{
+#ifdef _WIN32
+	return "";
+#else
+	FILE *fd;
+	char buf[1024];
+	static char ret[512];
+	char *basename = NULL, *libcname = NULL, *p, *start;
+
+	snprintf(buf, sizeof(buf), "ldd %s/unrealircd 2>/dev/null", BINDIR);
+	fd = popen(buf, "r");
+	if (!fd)
+		return "";
+
+	while ((fgets(buf, sizeof(buf), fd)))
+	{
+		stripcrlf(buf);
+		p = strstr(buf, "libc.so");
+		if (!p)
+			continue;
+		basename = p;
+		p = strchr(p, ' ');
+		if (!p)
+			continue;
+		*p++ = '\0';
+		p = strstr(p, "=> ");
+		if (!p)
+			continue;
+		start = p += 3; /* skip "=> " */
+		p = strchr(start, ' ');
+		if (!p)
+			continue;
+		*p = '\0';
+		libcname = start;
+		break;
+	}
+	pclose(fd);
+
+	if (!basename || !libcname)
+		return ""; /* not found, weird */
+
+	snprintf(ret, sizeof(ret), "%s/%s", TMPDIR, basename);
+	if (!unreal_copyfile(libcname, ret))
+		return ""; /* copying failed */
+
+	return ret;
+#endif
+}
+int attach_coredump(FILE *fdo, char *coredump)
+{
+	FILE *fdi;
+	char fname[512];
+	char *libcname = copy_libc_so();
+
+#ifndef _WIN32
+	/* On *NIX we create a .tar.bz2 / .tar.gz (may take a couple of seconds) */
+	printf("Please wait...\n");
+	snprintf(fname, sizeof(fname), "tar c %s/unrealircd %s %s %s 2>/dev/null|(bzip2 || gzip) 2>/dev/null",
+		BINDIR, coredump, MODULESDIR, libcname);
+
+	fdi = popen(fname, "r");
+#else
+	/* On Windows we attach de .mdmp, the small minidump file */
+	strlcpy(fname, coredump, sizeof(fname));
+	if (strlen(fname) > 5)
+		fname[strlen(fname)-5] = '\0'; /* cut off the '.core' part */
+	strlcat(fname, ".mdmp", sizeof(fname)); /* and add '.mdmp' */
+	fprintf(fdo, "Windows MINIDUMP: %s\n", fname);
+	fdi = fopen(fname, "rb");
+#endif
+	if (!fdi)
+		return 0;
+
+	attach_file(fdi, fdo);
+
+#ifndef _WIN32
+	pclose(fdi);
+#else
+	fclose(fdi);
+#endif
+	return 1;
+}
+
+char *generate_crash_report(char *coredump, int *thirdpartymods)
+{
+	static char reportfname[512];
+	FILE *reportfd;
+
+	*thirdpartymods = 0;
+
+	if (coredump == NULL)
+		coredump = find_best_coredump();
+	
+	if (coredump == NULL)
+		return NULL; /* nothing available */
+
+	if (corefile_vs_binary_mismatch(coredump))
+		return NULL;
+	
+	snprintf(reportfname, sizeof(reportfname), "%s/crash.report.%s.%ld.txt",
+		TMPDIR, unreal_getfilename(coredump), (long)time(NULL));
+
+	reportfd = fopen(reportfname, "w");
+	if (!reportfd)
+	{
+		printf("ERROR: could not open '%s' for writing\n", reportfname);
+		return NULL;
+	}
+
+	crash_report_header(reportfd, coredump);
+	crash_report_fix_libs(coredump, thirdpartymods);
+	
+	crash_report_backtrace(reportfd, coredump);
+	crash_report_asan_log(reportfd, coredump);
+	attach_coredump(reportfd, coredump);
+
+	fclose(reportfd);
+
+	return reportfname;
+}
+
+int running_interactive(void)
+{
+#ifndef _WIN32
+	char *s;
+	
+	if (!isatty(0))
+		return 0;
+	
+	s = getenv("TERM");
+	if (!s || !strcasecmp(s, "dumb") || !strcasecmp(s, "none"))
+		return 0;
+
+	return 1;
+#else
+	return IsService ? 0 : 1;
+#endif
+}
+
+#define REPORT_NEVER	-1
+#define REPORT_ASK		0
+#define REPORT_AUTO		1
+
+
+int getfilesize(char *fname)
+{
+	struct stat st;
+	
+	if (stat(fname, &st) != 0)
+		return -1;
+	
+	return (int)st.st_size;
+}
+
+#define CRASH_REPORT_HOST "crash.unrealircd.org"
+
+SSL_CTX *crashreport_init_ssl(void)
+{
+	SSL_CTX *ctx_client;
+	char buf[512];
+	
+	SSL_load_error_strings();
+	SSLeay_add_ssl_algorithms();
+
+	ctx_client = SSL_CTX_new(SSLv23_client_method());
+	if (!ctx_client)
+		return NULL;
+#ifdef HAS_SSL_CTX_SET_MIN_PROTO_VERSION
+	SSL_CTX_set_min_proto_version(ctx_client, TLS1_2_VERSION);
+#endif
+	SSL_CTX_set_options(ctx_client, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1);
+
+	/* Verify peer certificate */
+	snprintf(buf, sizeof(buf), "%s/tls/curl-ca-bundle.crt", CONFDIR);
+	SSL_CTX_load_verify_locations(ctx_client, buf, NULL);
+	SSL_CTX_set_verify(ctx_client, SSL_VERIFY_PEER, NULL);
+
+	/* Limit ciphers as well */
+	SSL_CTX_set_cipher_list(ctx_client, UNREALIRCD_DEFAULT_CIPHERS);
+
+	return ctx_client;
+}	
+
+int crashreport_send(char *fname)
+{
+	char buf[1024];
+	char header[512], footer[512];
+	char delimiter[41];
+	int filesize;
+	int n;
+	FILE *fd;
+	SSL_CTX *ctx_client;
+	SSL *ssl = NULL;
+	BIO *socket = NULL;
+	int xfr = 0;
+	char *errstr = NULL;
+	
+	filesize = getfilesize(fname);
+	if (filesize < 0)
+		return 0;
+	
+	for (n = 0; n < sizeof(delimiter); n++)
+		delimiter[n] = getrandom8()%26 + 'a';
+	delimiter[sizeof(delimiter)-1] = '\0';
+	
+	snprintf(header, sizeof(header), "--%s\r\n"
+	                           "Content-Disposition: form-data; name=\"upload\"; filename=\"crash.txt\"\r\n"
+	                           "Content-Type: text/plain\r\n"
+	                           "\r\n",
+	                           delimiter);
+	snprintf(footer, sizeof(footer), "\r\n--%s--\r\n", delimiter);
+
+	ctx_client = crashreport_init_ssl();
+	if (!ctx_client)
+	{
+		printf("ERROR: TLS initalization failure (I)\n");
+		return 0;
+	}
+	
+	socket = BIO_new_ssl_connect(ctx_client);
+	if (!socket)
+	{
+		printf("ERROR: TLS initalization failure (II)\n");
+		return 0;
+	}
+	
+	BIO_set_conn_hostname(socket, CRASH_REPORT_HOST ":443");
+
+	if (BIO_do_connect(socket) != 1)
+	{
+		printf("ERROR: Could not connect to %s\n", CRASH_REPORT_HOST);
+		return 0;
+	}
+	
+	if (BIO_do_handshake(socket) != 1)
+	{
+		printf("ERROR: Could not connect to %s (TLS handshake failed)\n", CRASH_REPORT_HOST);
+		return 0;
+	}
+
+	BIO_get_ssl(socket, &ssl);
+	if (!ssl)
+	{
+		printf("ERROR: Could not get TLS connection from BIO\n");
+		return 0;
+	}
+
+	if (!verify_certificate(ssl, CRASH_REPORT_HOST, &errstr))
+	{
+		printf("Certificate problem with crash.unrealircd.org: %s\n", errstr);
+		printf("Fatal error. See above.\n");
+		return 0;
+	}
+
+	snprintf(buf, sizeof(buf), "POST /crash.php HTTP/1.1\r\n"
+	                    "User-Agent: UnrealIRCd %s\r\n"
+	                    "Host: %s\r\n"
+	                    "Accept: */*\r\n"
+	                    "Content-Length: %d\r\n"
+	                    "Expect: 100-continue\r\n"
+	                    "Content-Type: multipart/form-data; boundary=%s\r\n"
+	                    "\r\n",
+	                    VERSIONONLY,
+	                    CRASH_REPORT_HOST,
+	                    (int)(filesize+strlen(header)+strlen(footer)),
+	                    delimiter);
+	
+	BIO_puts(socket, buf);
+	
+	memset(buf, 0, sizeof(buf));
+	n = BIO_read(socket, buf, 255);
+	if ((n < 0) || strncmp(buf, "HTTP/1.1 100", 12))
+	{
+		printf("Error transmitting bug report (stage II, n=%d)\n", n);
+		return 0;
+	}
+	
+	fd = fopen(fname, "rb");
+	if (!fd)
+		return 0;
+
+	BIO_puts(socket, header);
+
+#ifndef _WIN32
+	printf("Sending...");
+#endif
+	while ((fgets(buf, sizeof(buf), fd)))
+	{
+		BIO_puts(socket, buf);
+#ifndef _WIN32
+		if ((++xfr % 1000) == 0)
+		{
+			printf(".");
+			fflush(stdout);
+		}
+#endif
+	}
+	fclose(fd);
+
+	BIO_puts(socket, footer);
+
+	do { } while(BIO_should_retry(socket)); /* make sure we are really finished (you never know with TLS) */
+
+#ifndef _WIN32
+	printf("\n");
+#endif
+	BIO_free_all(socket);
+	
+	SSL_CTX_free(ctx_client);
+	
+	return 1;
+}
+
+void mark_coredump_as_read(char *coredump)
+{
+	char buf[512];
+	
+	snprintf(buf, sizeof(buf), "%s.%ld.done", coredump, (long)time(NULL));
+	
+	(void)rename(coredump, buf);
+}
+
+static int report_pref = REPORT_ASK;
+
+void report_crash(void)
+{
+	char *coredump, *fname;
+	int thirdpartymods = 0;
+	int crashed_secs_ago;
+
+	if (!running_interactive() && (report_pref != REPORT_AUTO))
+		exit(0); /* don't bother if we run through cron or something similar */
+
+	coredump = find_best_coredump();
+	if (!coredump)
+		return; /* no crashes */
+
+	crashed_secs_ago = time(NULL) - get_file_time(coredump);
+	if (crashed_secs_ago > 86400*7)
+		return; /* stop bothering about it after a while */
+
+	fname = generate_crash_report(coredump, &thirdpartymods);
+	
+	if (!fname)
+		return;
+
+#ifndef _WIN32
+	printf("The IRCd has been started now (and is running), but it did crash %d seconds ago.\n", crashed_secs_ago);
+	printf("Crash report generated in: %s\n\n", fname);
+
+	if (thirdpartymods)
+	{
+	    printf("** IMPORTANT **\n"
+               "Your UnrealIRCd crashed and you have 3rd party modules loaded (modules created\n"
+               "by someone other than the UnrealIRCd team). If you installed new 3rd party\n"
+               "module(s) in the past few weeks we suggest to unload these modules and see if\n"
+               "the crash issue dissapears. If so, that module is probably to blame.\n"
+               "If you keep crashing without 3rd party modules then please do report it to\n"
+               "the UnrealIRCd team.\n"
+               "The reason we ask you to do this is because more than 95%% of the crash issues\n"
+               "reported nowadays are caused by 3rd party modules and not by an UnrealIRCd bug.\n"
+               "\n");
+	}
+		
+	if (report_pref == REPORT_NEVER)
+	{
+		printf("Crash report will not be sent to UnrealIRCd Team.\n\n");
+		printf("Feel free to read the report at %s and if you change your mind you can submit it anyway at https://bugs.unrealircd.org/\n", fname);
+	} else
+	if (report_pref == REPORT_ASK)
+	{
+		char answerbuf[64], *answer;
+		printf("Shall I send a crash report to the UnrealIRCd developers?\n");
+		if (!thirdpartymods)
+		    printf("Crash reports help us greatly with fixing bugs that affect you and others\n");
+		printf("\n");
+		
+		do
+		{
+			printf("Answer (Y/N): ");
+			*answerbuf = '\0';
+			answer = fgets(answerbuf, sizeof(answerbuf), stdin);
+			
+			if (answer && (toupper(*answer) == 'N'))
+			{
+				printf("Ok, not sending bug report.\n\n");
+				printf("Feel free to read the report at %s and if you change your mind you can submit it anyway at https://bugs.unrealircd.org/\n", fname);
+				return;
+			}
+			if (answer && (toupper(*answer) == 'Y'))
+			{
+				break;
+			}
+			
+			printf("Invalid response. Please enter either Y or N\n\n");
+		} while(1);
+	} else if (report_pref != REPORT_AUTO)
+	{
+		printf("Huh. report_pref setting is weird. Aborting.\n");
+		return;
+	}
+
+	if (running_interactive())
+	{
+		char buf[8192], *line;
+
+		printf("\nDo you want to give your e-mail address so we could ask for additional information or "
+		       "give you feedback about the crash? This is completely optional, just press ENTER to skip.\n\n"
+		       "E-mail address (optional): ");
+		line = fgets(buf, sizeof(buf), stdin);
+		
+		if (line && *line && (*line != '\n'))
+		{
+			FILE *fd = fopen(fname, "a");
+			if (fd)
+			{
+				fprintf(fd, "\nUSER E-MAIL ADDRESS: %s\n", line);
+				fclose(fd);
+			}
+		}
+
+		printf("\nDo you have anything else to tell about the crash, maybe the circumstances? You can type 1 single line\n"
+		       "Again, this is completely optional. Just press ENTER to skip.\n\n"
+		       "Additional information (optional): ");
+		line = fgets(buf, sizeof(buf), stdin);
+		
+		if (line && *line && (*line != '\n'))
+		{
+			FILE *fd = fopen(fname, "a");
+			if (fd)
+			{
+				fprintf(fd, "\nCOMMENT BY USER: %s\n", line);
+				fclose(fd);
+			}
+		}
+	}
+	if (crashreport_send(fname))
+	{
+		printf("\nThe crash report has been sent to the UnrealIRCd developers. "
+		       "Thanks a lot for helping to make UnrealIRCd a better product!\n\n");
+	}
+
+#else
+	/* Windows */
+	if (MessageBox(NULL, "UnrealIRCd crashed. May I send a report about this to the UnrealIRCd developers? This helps us a lot.",
+	                     "UnrealIRCd crash",
+	                     MB_YESNO|MB_ICONQUESTION) == IDYES)
+	{
+		/* Yay */
+		
+		if (crashreport_send(fname))
+		{
+			MessageBox(NULL, "The crash report has been sent to the UnrealIRCd developers. "
+			                 "If you have any additional information (like details surrounding "
+			                 "the crash) then please e-mail syzop@unrealircd.org, such "
+			                 "information is most welcome. Thanks!",
+			           "UnrealIRCd crash report sent", MB_ICONINFORMATION|MB_OK);
+		}
+	}
+#endif
+	mark_coredump_as_read(coredump);
+	
+#ifdef _WIN32
+	if (MessageBox(NULL, "Start UnrealIRCd again?",
+	                     "UnrealIRCd crash",
+	                     MB_YESNO|MB_ICONQUESTION) == IDYES)
+	{
+		StartUnrealAgain();
+	}
+#endif
+}
diff --git a/src/crule.c b/src/crule.c
new file mode 100644
index 0000000..12b2c5e
--- /dev/null
+++ b/src/crule.c
@@ -0,0 +1,785 @@
+/*
+ * SmartRoute phase 1
+ * connection rule patch
+ * by Tony Vencill (Tonto on IRC) <vencill@bga.com>
+ *
+ * The majority of this file is a recusive descent parser used to convert
+ * connection rules into expression trees when the conf file is read.
+ * All parsing structures and types are hidden in the interest of good
+ * programming style and to make possible future data structure changes
+ * without affecting the interface between this patch and the rest of the
+ * server.  The only functions accessible externally are crule_parse,
+ * crule_free, and crule_eval.  Prototypes for these functions can be
+ * found in h.h.
+ *
+ * Please direct any connection rule or SmartRoute questions to Tonto on
+ * IRC or by email to vencill@bga.com.
+ *
+ * For parser testing, defining CR_DEBUG generates a stand-alone parser
+ * that takes rules from stdin and prints out memory allocation
+ * information and the parsed rule.  This stand alone parser is ignorant
+ * of the irc server and thus cannot do rule evaluation.  Do not define
+ * this flag when compiling the server!  If you wish to generate the
+ * test parser, compile from the ircd directory with a line similar to
+ * cc -o parser -DCR_DEBUG crule.c
+ *
+ * The define CR_CHKCONF is provided to generate routines needed in
+ * chkconf.  These consist of the parser, a different crule_parse that
+ * prints errors to stderr, and crule_free (just for good style and to
+ * more closely simulate the actual ircd environment).  crule_eval and
+ * the rule functions are made empty functions as in the stand-alone
+ * test parser.
+ */
+
+#ifndef CR_DEBUG
+/* ircd functions and types we need */
+#include "struct.h"
+#include "common.h"
+#include "sys.h"
+#include "h.h"
+#include <string.h>
+
+char *collapse(char *pattern);
+extern Client *client;
+
+ID_Copyright("(C) Tony Vincell");
+
+#else
+/* includes and defines to make the stand-alone test parser */
+#include <stdio.h>
+#include <string.h>
+#define BadPtr(x) (!(x) || (*(x) == '\0'))
+#endif
+
+#if defined(CR_DEBUG) || defined(CR_CHKCONF)
+#undef safe_free
+#undef free
+#define safe_free free
+#endif
+
+/* some constants and shared data types */
+#define CR_MAXARGLEN 80		/* why 80? why not? it's > hostname lengths */
+#define CR_MAXARGS 3		/* there's a better way to do this, but not now */
+
+/* some symbols for easy reading */
+enum crule_token
+    { CR_UNKNOWN, CR_END, CR_AND, CR_OR, CR_NOT, CR_OPENPAREN, CR_CLOSEPAREN,
+	CR_COMMA, CR_WORD
+};
+enum crule_errcode
+    { CR_NOERR, CR_UNEXPCTTOK, CR_UNKNWTOK, CR_EXPCTAND, CR_EXPCTOR,
+	CR_EXPCTPRIM, CR_EXPCTOPEN, CR_EXPCTCLOSE, CR_UNKNWFUNC, CR_ARGMISMAT
+};
+
+/* expression tree structure, function pointer, and tree pointer */
+/* local! */
+typedef int (*crule_funcptr) (int, void **);
+struct crule_treestruct {
+	crule_funcptr funcptr;
+	int  numargs;
+	void *arg[CR_MAXARGS];	/* for operators arg points to a tree element;
+				   for functions arg points to a char string */
+};
+typedef struct crule_treestruct crule_treeelem;
+typedef crule_treeelem *crule_treeptr;
+
+/* rule function prototypes - local! */
+int crule_connected(int, void **);
+int crule_directcon(int, void **);
+int crule_via(int, void **);
+int crule_directop(int, void **);
+int crule__andor(int, void **);
+int crule__not(int, void **);
+
+/* parsing function prototypes - local! */
+int crule_gettoken(int *, char **);
+void crule_getword(char *, int *, int, char **);
+int crule_parseandexpr(crule_treeptr *, int *, char **);
+int crule_parseorexpr(crule_treeptr *, int *, char **);
+int crule_parseprimary(crule_treeptr *, int *, char **);
+int crule_parsefunction(crule_treeptr *, int *, char **);
+int crule_parsearglist(crule_treeptr, int *, char **);
+
+#if defined(CR_DEBUG) || defined(CR_CHKCONF)
+/* prototypes for the test parser; if not debugging, these are
+ * defined in h.h */
+char *crule_parse(char *);
+void crule_free(char **);
+#ifdef CR_DEBUG
+void print_tree(crule_treeptr));
+#endif
+#endif
+
+/* error messages */
+char *crule_errstr[] = {
+	"Unknown error",	/* NOERR? - for completeness */
+	"Unexpected token",	/* UNEXPCTTOK */
+	"Unknown token",	/* UNKNWTOK */
+	"And expr expected",	/* EXPCTAND */
+	"Or expr expected",	/* EXPCTOR */
+	"Primary expected",	/* EXPCTPRIM */
+	"( expected",		/* EXPCTOPEN */
+	") expected",		/* EXPCTCLOSE */
+	"Unknown function",	/* UNKNWFUNC */
+	"Argument mismatch"	/* ARGMISMAT */
+};
+
+/* function table - null terminated */
+struct crule_funclistent {
+	char name[15];		/* MAXIMUM FUNCTION NAME LENGTH IS 14 CHARS!! */
+	int  reqnumargs;
+	crule_funcptr funcptr;
+};
+struct crule_funclistent crule_funclist[] = {
+	/* maximum function name length is 14 chars */
+	{"connected", 1, crule_connected},
+	{"directcon", 1, crule_directcon},
+	{"via", 2, crule_via},
+	{"directop", 0, crule_directop},
+	{"", 0, NULL}		/* this must be here to mark end of list */
+};
+
+int  crule_connected(int numargs, void *crulearg[])
+{
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+	Client *client;
+
+	/* taken from cmd_links */
+	/* Faster this way -- codemastr*/
+	list_for_each_entry(client, &global_server_list, client_node)
+	{
+		if (!match_simple((char *)crulearg[0], client->name))
+			continue;
+		return (1);
+	}
+	return (0);
+#endif
+}
+
+int  crule_directcon(int numargs, void *crulearg[])
+{
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+	Client *client;
+
+	/* adapted from cmd_trace and exit_one_client */
+	/* XXX: iterate server_list when added */
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (!IsServer(client))
+			continue;
+		if (!match_simple((char *)crulearg[0], client->name))
+			continue;
+		return (1);
+	}
+	return (0);
+#endif
+}
+
+int  crule_via(int numargs, void *crulearg[])
+{
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+	Client *client;
+
+	/* adapted from cmd_links */
+	/* Faster this way -- codemastr */
+	list_for_each_entry(client, &global_server_list, client_node)
+	{
+		if (!match_simple((char *)crulearg[1], client->name))
+			continue;
+		if (!match_simple((char *)crulearg[0], client->serv->up))
+			continue;
+		return (1);
+	}
+	return (0);
+#endif
+}
+
+int  crule_directop(int numargs, void *crulearg[])
+{
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+	Client *client;
+
+	/* adapted from cmd_trace */
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (!IsOper(client))
+			continue;
+
+		return (1);
+	}
+
+	return (0);
+#endif
+}
+
+int  crule__andor(int numargs, void *crulearg[])
+{
+	int  result1;
+
+	result1 = ((crule_treeptr) crulearg[0])->funcptr
+	    (((crule_treeptr) crulearg[0])->numargs,
+	    (void *)((crule_treeptr) crulearg[0])->arg);
+	if (crulearg[2])	/* or */
+		return (result1 ||
+		    ((crule_treeptr) crulearg[1])->funcptr
+		    (((crule_treeptr) crulearg[1])->numargs,
+		    (void *)((crule_treeptr) crulearg[1])->arg));
+	else
+		return (result1 &&
+		    ((crule_treeptr) crulearg[1])->funcptr
+		    (((crule_treeptr) crulearg[1])->numargs,
+		    (void *)((crule_treeptr) crulearg[1])->arg));
+}
+
+int  crule__not(int numargs, void *crulearg[])
+{
+	return (!((crule_treeptr) crulearg[0])->funcptr
+	    (((crule_treeptr) crulearg[0])->numargs,
+	    (void *)((crule_treeptr) crulearg[0])->arg));
+}
+
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+int  crule_eval(rule)
+	char *rule;
+{
+	return (((crule_treeptr) rule)->funcptr
+	    (((crule_treeptr) rule)->numargs, ((crule_treeptr) rule)->arg));
+}
+#endif
+
+int  crule_gettoken(int *next_tokp, char **ruleptr)
+{
+	char pending = '\0';
+
+	*next_tokp = CR_UNKNOWN;
+	while (*next_tokp == CR_UNKNOWN)
+		switch (*(*ruleptr)++)
+		{
+		  case ' ':
+		  case '\t':
+			  break;
+		  case '&':
+			  if (pending == '\0')
+				  pending = '&';
+			  else if (pending == '&')
+				  *next_tokp = CR_AND;
+			  else
+				  return (CR_UNKNWTOK);
+			  break;
+		  case '|':
+			  if (pending == '\0')
+				  pending = '|';
+			  else if (pending == '|')
+				  *next_tokp = CR_OR;
+			  else
+				  return (CR_UNKNWTOK);
+			  break;
+		  case '!':
+			  *next_tokp = CR_NOT;
+			  break;
+		  case '(':
+			  *next_tokp = CR_OPENPAREN;
+			  break;
+		  case ')':
+			  *next_tokp = CR_CLOSEPAREN;
+			  break;
+		  case ',':
+			  *next_tokp = CR_COMMA;
+			  break;
+		  case '\0':
+			  (*ruleptr)--;
+			  *next_tokp = CR_END;
+			  break;
+		  /* Both - and : can appear in hostnames so they must not be 
+		   * treated as separators -- codemastr */
+		  default:
+			  if ((isalpha(*(--(*ruleptr)))) || (**ruleptr == '*')
+			      || (**ruleptr == '?') || (**ruleptr == '.')
+			      || (**ruleptr == '-') || (**ruleptr == ':'))
+				  *next_tokp = CR_WORD;
+			  else
+				  return (CR_UNKNWTOK);
+			  break;
+		}
+	return CR_NOERR;
+}
+
+void crule_getword(char *word, int *wordlenp, int maxlen, char **ruleptr)
+{
+	char *word_ptr;
+
+	word_ptr = word;
+	/* Both - and : can appear in hostnames so they must not be 
+	 * treated as separators -- codemastr */
+
+	while ((isalnum(**ruleptr)) || (**ruleptr == '*') ||
+	    (**ruleptr == '?') || (**ruleptr == '.') || (**ruleptr == '-') ||
+	    (**ruleptr == ':'))
+		*word_ptr++ = *(*ruleptr)++;
+	*word_ptr = '\0';
+	*wordlenp = word_ptr - word;
+}
+
+/*
+ * Grammar
+ *   rule:
+ *     orexpr END          END is end of input
+ *   orexpr:
+ *     andexpr
+ *     andexpr || orexpr
+ *   andexpr:
+ *     primary
+ *     primary && andexpr
+ *  primary:
+ *    function
+ *    ! primary
+ *    ( orexpr )
+ *  function:
+ *    word ( )             word is alphanumeric string, first character
+ *    word ( arglist )       must be a letter
+ *  arglist:
+ *    word
+ *    word , arglist
+ */
+
+char *crule_parse(char *rule)
+{
+	char *ruleptr = rule;
+	int  next_tok;
+	crule_treeptr ruleroot = NULL;
+	int  errcode = CR_NOERR;
+
+	if ((errcode = crule_gettoken(&next_tok, &ruleptr)) == CR_NOERR) {
+		if ((errcode = crule_parseorexpr(&ruleroot, &next_tok,
+		    &ruleptr)) == CR_NOERR) {
+			if (ruleroot != NULL) {
+				if (next_tok == CR_END)
+					return ((char *)ruleroot);
+				else
+					errcode = CR_UNEXPCTTOK;
+			}
+			else
+				errcode = CR_EXPCTOR;
+		}
+	}
+	if (ruleroot != NULL)
+		crule_free((char **)&ruleroot);
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+	Debug((DEBUG_ERROR, "%s in rule: %s", crule_errstr[errcode], rule));
+#else
+	(void)fprintf(stderr, "%s in rule: %s\n", crule_errstr[errcode], rule);
+#endif
+	return NULL;
+}
+
+int  crule_parseorexpr(crule_treeptr *orrootp, int *next_tokp, char **ruleptr)
+{
+	int  errcode = CR_NOERR;
+	crule_treeptr andexpr;
+	crule_treeptr orptr;
+
+	*orrootp = NULL;
+	while (errcode == CR_NOERR)
+	{
+		errcode = crule_parseandexpr(&andexpr, next_tokp, ruleptr);
+		if ((errcode == CR_NOERR) && (*next_tokp == CR_OR))
+		{
+			orptr =
+			    (crule_treeptr) safe_alloc(sizeof(crule_treeelem));
+#ifdef CR_DEBUG
+			(void)fprintf(stderr, "allocating or element at %ld\n", orptr);
+#endif
+			orptr->funcptr = crule__andor;
+			orptr->numargs = 3;
+			orptr->arg[2] = (void *)1;
+			if (*orrootp != NULL)
+			{
+				(*orrootp)->arg[1] = andexpr;
+				orptr->arg[0] = *orrootp;
+			}
+			else
+				orptr->arg[0] = andexpr;
+			*orrootp = orptr;
+		}
+		else
+		{
+			if (*orrootp != NULL)
+				if (andexpr != NULL)
+				{
+					(*orrootp)->arg[1] = andexpr;
+					return (errcode);
+				}
+				else
+				{
+					(*orrootp)->arg[1] = NULL;	/* so free doesn't seg fault */
+					return (CR_EXPCTAND);
+				}
+			else
+			{
+				*orrootp = andexpr;
+				return (errcode);
+			}
+		}
+		if ((errcode = crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+			return (errcode);
+	}
+	return (errcode);
+}
+
+int  crule_parseandexpr(crule_treeptr *androotp, int *next_tokp, char **ruleptr)
+{
+	int  errcode = CR_NOERR;
+	crule_treeptr primary;
+	crule_treeptr andptr;
+
+	*androotp = NULL;
+	while (errcode == CR_NOERR)
+	{
+		errcode = crule_parseprimary(&primary, next_tokp, ruleptr);
+		if ((errcode == CR_NOERR) && (*next_tokp == CR_AND))
+		{
+			andptr =
+			    (crule_treeptr) safe_alloc(sizeof(crule_treeelem));
+#ifdef CR_DEBUG
+			(void)fprintf(stderr, "allocating and element at %ld\n", andptr);
+#endif
+			andptr->funcptr = crule__andor;
+			andptr->numargs = 3;
+			andptr->arg[2] = (void *)0;
+			if (*androotp != NULL)
+			{
+				(*androotp)->arg[1] = primary;
+				andptr->arg[0] = *androotp;
+			}
+			else
+				andptr->arg[0] = primary;
+			*androotp = andptr;
+		}
+		else
+		{
+			if (*androotp != NULL)
+				if (primary != NULL)
+				{
+					(*androotp)->arg[1] = primary;
+					return (errcode);
+				}
+				else
+				{
+					(*androotp)->arg[1] = NULL;	/* so free doesn't seg fault */
+					return (CR_EXPCTPRIM);
+				}
+			else
+			{
+				*androotp = primary;
+				return (errcode);
+			}
+		}
+		if ((errcode = crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+			return (errcode);
+	}
+	return (errcode);
+}
+
+int  crule_parseprimary(crule_treeptr *primrootp, int *next_tokp, char **ruleptr)
+{
+	crule_treeptr *insertionp;
+	int  errcode = CR_NOERR;
+
+	*primrootp = NULL;
+	insertionp = primrootp;
+	while (errcode == CR_NOERR)
+	{
+		switch (*next_tokp)
+		{
+		  case CR_OPENPAREN:
+			  if ((errcode =
+			      crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+				  break;
+			  if ((errcode =
+			      crule_parseorexpr(insertionp, next_tokp,
+			      ruleptr)) != CR_NOERR)
+				  break;
+			  if (*insertionp == NULL)
+			  {
+				  errcode = CR_EXPCTAND;
+				  break;
+			  }
+			  if (*next_tokp != CR_CLOSEPAREN)
+			  {
+				  errcode = CR_EXPCTCLOSE;
+				  break;
+			  }
+			  errcode = crule_gettoken(next_tokp, ruleptr);
+			  break;
+		  case CR_NOT:
+			  *insertionp =
+			      (crule_treeptr) safe_alloc(sizeof(crule_treeelem));
+#ifdef CR_DEBUG
+			  (void)fprintf(stderr,
+			      "allocating primary element at %ld\n",
+			      *insertionp);
+#endif
+			  (*insertionp)->funcptr = crule__not;
+			  (*insertionp)->numargs = 1;
+			  (*insertionp)->arg[0] = NULL;
+			  insertionp =
+			      (crule_treeptr *) & ((*insertionp)->arg[0]);
+			  if ((errcode =
+			      crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+				  break;
+			  continue;
+		  case CR_WORD:
+			  errcode =
+			      crule_parsefunction(insertionp, next_tokp,
+			      ruleptr);
+			  break;
+		  default:
+			  if (*primrootp == NULL)
+				  errcode = CR_NOERR;
+			  else
+				  errcode = CR_EXPCTPRIM;
+			  break;
+		}
+		return (errcode);
+	}
+	return (errcode);
+}
+
+int  crule_parsefunction(crule_treeptr *funcrootp, int *next_tokp, char **ruleptr)
+{
+	int  errcode = CR_NOERR;
+	char funcname[CR_MAXARGLEN];
+	int  namelen;
+	int  funcnum;
+
+	*funcrootp = NULL;
+	crule_getword(funcname, &namelen, CR_MAXARGLEN, ruleptr);
+	if ((errcode = crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+		return (errcode);
+	if (*next_tokp == CR_OPENPAREN)
+	{
+		for (funcnum = 0;; funcnum++)
+		{
+			if (strcasecmp(crule_funclist[funcnum].name, funcname) == 0)
+				break;
+			if (crule_funclist[funcnum].name[0] == '\0')
+				return (CR_UNKNWFUNC);
+		}
+		if ((errcode = crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+			return (errcode);
+		*funcrootp = (crule_treeptr) safe_alloc(sizeof(crule_treeelem));
+#ifdef CR_DEBUG
+		(void)fprintf(stderr, "allocating function element at %ld\n",
+		    *funcrootp);
+#endif
+		(*funcrootp)->funcptr = NULL;	/* for freeing aborted trees */
+		if ((errcode = crule_parsearglist(*funcrootp, next_tokp,
+		    ruleptr)) != CR_NOERR)
+			return (errcode);
+		if (*next_tokp != CR_CLOSEPAREN)
+			return (CR_EXPCTCLOSE);
+		if ((crule_funclist[funcnum].reqnumargs !=
+		    (*funcrootp)->numargs)
+		    && (crule_funclist[funcnum].reqnumargs != -1))
+			return (CR_ARGMISMAT);
+		if ((errcode = crule_gettoken(next_tokp, ruleptr)) != CR_NOERR)
+			return (errcode);
+		(*funcrootp)->funcptr = crule_funclist[funcnum].funcptr;
+		return (CR_NOERR);
+	}
+	else
+		return (CR_EXPCTOPEN);
+}
+
+int  crule_parsearglist(crule_treeptr argrootp, int *next_tokp, char **ruleptr)
+{
+	int  errcode = CR_NOERR;
+	char *argelemp = NULL;
+	char currarg[CR_MAXARGLEN];
+	int  arglen = 0;
+	char word[CR_MAXARGLEN];
+	int  wordlen = 0;
+
+	argrootp->numargs = 0;
+	currarg[0] = '\0';
+	while (errcode == CR_NOERR)
+	{
+		switch (*next_tokp)
+		{
+		  case CR_WORD:
+			  crule_getword(word, &wordlen, CR_MAXARGLEN, ruleptr);
+			  if (currarg[0] != '\0')
+			  {
+				  if ((arglen + wordlen) < (CR_MAXARGLEN - 1))
+				  {
+					  strlcat(currarg, " ", sizeof currarg);
+					  strlcat(currarg, word, sizeof currarg);
+					  arglen += wordlen + 1;
+				  }
+			  }
+			  else
+			  {
+				  strlcpy(currarg, word, sizeof currarg);
+				  arglen = wordlen;
+			  }
+			  errcode = crule_gettoken(next_tokp, ruleptr);
+			  break;
+		  default:
+#if !defined(CR_DEBUG) && !defined(CR_CHKCONF)
+			  collapse(currarg);
+#endif
+			  if (*currarg)
+			  {
+				  safe_strdup(argelemp, currarg);
+				  argrootp->arg[argrootp->numargs++] = (void *)argelemp;
+			  }
+			  if (*next_tokp != CR_COMMA)
+				  return (CR_NOERR);
+			  currarg[0] = '\0';
+			  errcode = crule_gettoken(next_tokp, ruleptr);
+			  break;
+		}
+	}
+	return (errcode);
+}
+
+/*
+ * this function is recursive..  i wish i knew a nonrecursive way but
+ * i dont.  anyway, recursion is fun..  :)
+ * DO NOT CALL THIS FUNTION WITH A POINTER TO A NULL POINTER
+ * (ie: if *elem is NULL, you're doing it wrong - seg fault)
+ */
+void crule_free(char **elem)
+{
+	int  arg, numargs;
+
+	if ((*((crule_treeptr *) elem))->funcptr == crule__not)
+	{
+		/* type conversions and ()'s are fun! ;)  here have an asprin.. */
+		if ((*((crule_treeptr *) elem))->arg[0] != NULL)
+			crule_free((char **)&((*((crule_treeptr *)
+			    elem))->arg[0]));
+	}
+	else if ((*((crule_treeptr *) elem))->funcptr == crule__andor)
+	{
+		crule_free((char **)&((*((crule_treeptr *) elem))->arg[0]));
+		if ((*((crule_treeptr *) elem))->arg[1] != NULL)
+			crule_free((char **)&((*((crule_treeptr *)
+			    elem))->arg[1]));
+	}
+	else
+	{
+		numargs = (*((crule_treeptr *) elem))->numargs;
+		for (arg = 0; arg < numargs; arg++)
+			safe_free_raw((char *)(*((crule_treeptr *) elem))->arg[arg]);
+	}
+#ifdef CR_DEBUG
+	(void)fprintf(stderr, "freeing element at %ld\n", *elem);
+#endif
+	safe_free(*elem);
+	*elem = NULL;
+}
+
+char *crule_errstring(int errcode)
+{
+	return crule_errstr[errcode-1];
+}
+
+int crule_test(char *rule)
+{
+	char *ruleptr = rule;
+	int  next_tok;
+	crule_treeptr ruleroot = NULL;
+	int  errcode = CR_NOERR;
+
+	if ((errcode = crule_gettoken(&next_tok, &ruleptr)) == CR_NOERR) {
+		if ((errcode = crule_parseorexpr(&ruleroot, &next_tok,
+		    &ruleptr)) == CR_NOERR) {
+			if (ruleroot != NULL) {
+				if (next_tok == CR_END)
+				{
+					crule_free((char **)&ruleroot);
+					return 0;
+				}
+				else
+					errcode = CR_UNEXPCTTOK;
+			}
+			else
+				errcode = CR_EXPCTOR;
+		}
+	}
+	if (ruleroot != NULL)
+		crule_free((char **)&ruleroot);
+	return errcode+1;
+}
+
+#ifdef CR_DEBUG
+void print_tree(crule_treeptr printelem)
+{
+	int  funcnum, arg;
+
+	if (printelem->funcptr == crule__not)
+	{
+		printf("!( ");
+		print_tree((crule_treeptr) printelem->arg[0]);
+		printf(") ");
+	}
+	else if (printelem->funcptr == crule__andor)
+	{
+		printf("( ");
+		print_tree((crule_treeptr) printelem->arg[0]);
+		if (printelem->arg[2])
+			printf("|| ");
+		else
+			printf("&& ");
+		print_tree((crule_treeptr) printelem->arg[1]);
+		printf(") ");
+	}
+	else
+	{
+		for (funcnum = 0;; funcnum++)
+		{
+			if (printelem->funcptr ==
+			    crule_funclist[funcnum].funcptr)
+				break;
+			if (crule_funclist[funcnum].funcptr == NULL)
+			{
+				printf("\nACK!  *koff*  *sputter*\n");
+				exit(1);
+			}
+		}
+		printf("%s(", crule_funclist[funcnum].name);
+		for (arg = 0; arg < printelem->numargs; arg++)
+		{
+			if (arg != 0)
+				printf(",");
+			printf("%s", (char *)printelem->arg[arg]);
+		}
+		printf(") ");
+	}
+}
+
+#endif
+
+#ifdef CR_DEBUG
+void main()
+{
+	char indata[256];
+	char *rule;
+
+	printf("rule: ");
+	while (fgets(indata, 256, stdin) != NULL)
+	{
+		indata[strlen(indata) - 1] = '\0';	/* lose the newline */
+		if ((rule = crule_parse(indata)) != NULL)
+		{
+			printf("equivalent rule: ");
+			print_tree((crule_treeptr) rule);
+			printf("\n");
+			crule_free(&rule);
+		}
+		printf("\nrule: ");
+	}
+	printf("\n");
+}
+#endif
diff --git a/src/crypt_blowfish.c b/src/crypt_blowfish.c
new file mode 100644
index 0000000..3aaac9e
--- /dev/null
+++ b/src/crypt_blowfish.c
@@ -0,0 +1,907 @@
+/*
+ * The crypt_blowfish homepage is:
+ *
+ *	http://www.openwall.com/crypt/
+ *
+ * This code comes from John the Ripper password cracker, with reentrant
+ * and crypt(3) interfaces added, but optimizations specific to password
+ * cracking removed.
+ *
+ * Written by Solar Designer <solar at openwall.com> in 1998-2014.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 1998-2014 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * It is my intent that you should be able to use this on your system,
+ * as part of a software package, or anywhere else to improve security,
+ * ensure compatibility, or for any other purpose.  I would appreciate
+ * it if you give credit where it is due and keep your modifications in
+ * the public domain as well, but I don't require that in order to let
+ * you place this code and any modifications you make under a license
+ * of your choice.
+ *
+ * This implementation is fully compatible with OpenBSD's bcrypt.c for prefix
+ * "$2b$", originally by Niels Provos <provos at citi.umich.edu>, and it uses
+ * some of his ideas.  The password hashing algorithm was designed by David
+ * Mazieres <dm at lcs.mit.edu>.  For information on the level of
+ * compatibility for bcrypt hash prefixes other than "$2b$", please refer to
+ * the comments in BF_set_key() below and to the included crypt(3) man page.
+ *
+ * There's a paper on the algorithm that explains its design decisions:
+ *
+ *	http://www.usenix.org/events/usenix99/provos.html
+ *
+ * Some of the tricks in BF_ROUND might be inspired by Eric Young's
+ * Blowfish library (I can't be sure if I would think of something if I
+ * hadn't seen his code).
+ */
+
+#include <string.h>
+
+#include <errno.h>
+#ifndef __set_errno
+#define __set_errno(val) errno = (val)
+#endif
+
+/* Just to make sure the prototypes match the actual definitions */
+#include "crypt_blowfish.h"
+
+#ifdef __i386__
+#define BF_ASM				0 /* old x86 asm not included in UnrealIRCd */
+#define BF_SCALE			1
+#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
+#define BF_ASM				0
+#define BF_SCALE			1
+#else
+#define BF_ASM				0
+#define BF_SCALE			0
+#endif
+
+typedef unsigned int BF_word;
+typedef signed int BF_word_signed;
+
+/* Number of Blowfish rounds, this is also hardcoded into a few places */
+#define BF_N				16
+
+typedef BF_word BF_key[BF_N + 2];
+
+typedef struct {
+	BF_word S[4][0x100];
+	BF_key P;
+} BF_ctx;
+
+/*
+ * Magic IV for 64 Blowfish encryptions that we do at the end.
+ * The string is "OrpheanBeholderScryDoubt" on big-endian.
+ */
+static BF_word BF_magic_w[6] = {
+	0x4F727068, 0x65616E42, 0x65686F6C,
+	0x64657253, 0x63727944, 0x6F756274
+};
+
+/*
+ * P-box and S-box tables initialized with digits of Pi.
+ */
+static BF_ctx BF_init_state = {
+	{
+		{
+			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+			0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+		}, {
+			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+		}, {
+			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+			0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+		}, {
+			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+		}
+	}, {
+		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+		0x9216d5d9, 0x8979fb1b
+	}
+};
+
+static unsigned char BF_itoa64[64 + 1] =
+	"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+static unsigned char BF_atoi64[0x60] = {
+	64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
+	54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
+	64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64,
+	64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+	43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64
+};
+
+#define BF_safe_atoi64(dst, src) \
+{ \
+	tmp = (unsigned char)(src); \
+	if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
+	tmp = BF_atoi64[tmp]; \
+	if (tmp > 63) return -1; \
+	(dst) = tmp; \
+}
+
+static int BF_decode(BF_word *dst, const char *src, int size)
+{
+	unsigned char *dptr = (unsigned char *)dst;
+	unsigned char *end = dptr + size;
+	const unsigned char *client = (const unsigned char *)src;
+	unsigned int tmp, c1, c2, c3, c4;
+
+	do {
+		BF_safe_atoi64(c1, *client++);
+		BF_safe_atoi64(c2, *client++);
+		*dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
+		if (dptr >= end) break;
+
+		BF_safe_atoi64(c3, *client++);
+		*dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
+		if (dptr >= end) break;
+
+		BF_safe_atoi64(c4, *client++);
+		*dptr++ = ((c3 & 0x03) << 6) | c4;
+	} while (dptr < end);
+
+	return 0;
+}
+
+static void BF_encode(char *dst, const BF_word *src, int size)
+{
+	const unsigned char *client = (const unsigned char *)src;
+	const unsigned char *end = client + size;
+	unsigned char *dptr = (unsigned char *)dst;
+	unsigned int c1, c2;
+
+	do {
+		c1 = *client++;
+		*dptr++ = BF_itoa64[c1 >> 2];
+		c1 = (c1 & 0x03) << 4;
+		if (client >= end) {
+			*dptr++ = BF_itoa64[c1];
+			break;
+		}
+
+		c2 = *client++;
+		c1 |= c2 >> 4;
+		*dptr++ = BF_itoa64[c1];
+		c1 = (c2 & 0x0f) << 2;
+		if (client >= end) {
+			*dptr++ = BF_itoa64[c1];
+			break;
+		}
+
+		c2 = *client++;
+		c1 |= c2 >> 6;
+		*dptr++ = BF_itoa64[c1];
+		*dptr++ = BF_itoa64[c2 & 0x3f];
+	} while (client < end);
+}
+
+static void BF_swap(BF_word *x, int count)
+{
+	static int endianness_check = 1;
+	char *is_little_endian = (char *)&endianness_check;
+	BF_word tmp;
+
+	if (*is_little_endian)
+	do {
+		tmp = *x;
+		tmp = (tmp << 16) | (tmp >> 16);
+		*x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
+	} while (--count);
+}
+
+#if BF_SCALE
+/* Architectures which can shift addresses left by 2 bits with no extra cost */
+#define BF_ROUND(L, R, N) \
+	tmp1 = L & 0xFF; \
+	tmp2 = L >> 8; \
+	tmp2 &= 0xFF; \
+	tmp3 = L >> 16; \
+	tmp3 &= 0xFF; \
+	tmp4 = L >> 24; \
+	tmp1 = data.ctx.S[3][tmp1]; \
+	tmp2 = data.ctx.S[2][tmp2]; \
+	tmp3 = data.ctx.S[1][tmp3]; \
+	tmp3 += data.ctx.S[0][tmp4]; \
+	tmp3 ^= tmp2; \
+	R ^= data.ctx.P[N + 1]; \
+	tmp3 += tmp1; \
+	R ^= tmp3;
+#else
+/* Architectures with no complicated addressing modes supported */
+#define BF_INDEX(S, i) \
+	(*((BF_word *)(((unsigned char *)S) + (i))))
+#define BF_ROUND(L, R, N) \
+	tmp1 = L & 0xFF; \
+	tmp1 <<= 2; \
+	tmp2 = L >> 6; \
+	tmp2 &= 0x3FC; \
+	tmp3 = L >> 14; \
+	tmp3 &= 0x3FC; \
+	tmp4 = L >> 22; \
+	tmp4 &= 0x3FC; \
+	tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
+	tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
+	tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
+	tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
+	tmp3 ^= tmp2; \
+	R ^= data.ctx.P[N + 1]; \
+	tmp3 += tmp1; \
+	R ^= tmp3;
+#endif
+
+/*
+ * Encrypt one block, BF_N is hardcoded here.
+ */
+#define BF_ENCRYPT \
+	L ^= data.ctx.P[0]; \
+	BF_ROUND(L, R, 0); \
+	BF_ROUND(R, L, 1); \
+	BF_ROUND(L, R, 2); \
+	BF_ROUND(R, L, 3); \
+	BF_ROUND(L, R, 4); \
+	BF_ROUND(R, L, 5); \
+	BF_ROUND(L, R, 6); \
+	BF_ROUND(R, L, 7); \
+	BF_ROUND(L, R, 8); \
+	BF_ROUND(R, L, 9); \
+	BF_ROUND(L, R, 10); \
+	BF_ROUND(R, L, 11); \
+	BF_ROUND(L, R, 12); \
+	BF_ROUND(R, L, 13); \
+	BF_ROUND(L, R, 14); \
+	BF_ROUND(R, L, 15); \
+	tmp4 = R; \
+	R = L; \
+	L = tmp4 ^ data.ctx.P[BF_N + 1];
+
+#if BF_ASM
+#define BF_body() \
+	_BF_body_r(&data.ctx);
+#else
+#define BF_body() \
+	L = R = 0; \
+	ptr = data.ctx.P; \
+	do { \
+		ptr += 2; \
+		BF_ENCRYPT; \
+		*(ptr - 2) = L; \
+		*(ptr - 1) = R; \
+	} while (ptr < &data.ctx.P[BF_N + 2]); \
+\
+	ptr = data.ctx.S[0]; \
+	do { \
+		ptr += 2; \
+		BF_ENCRYPT; \
+		*(ptr - 2) = L; \
+		*(ptr - 1) = R; \
+	} while (ptr < &data.ctx.S[3][0xFF]);
+#endif
+
+static void BF_set_key(const char *key, BF_key expanded, BF_key initial,
+    unsigned char flags)
+{
+	const char *ptr = key;
+	unsigned int bug, i, j;
+	BF_word safety, sign, diff, tmp[2];
+
+/*
+ * There was a sign extension bug in older revisions of this function.  While
+ * we would have liked to simply fix the bug and move on, we have to provide
+ * a backwards compatibility feature (essentially the bug) for some systems and
+ * a safety measure for some others.  The latter is needed because for certain
+ * multiple inputs to the buggy algorithm there exist easily found inputs to
+ * the correct algorithm that produce the same hash.  Thus, we optionally
+ * deviate from the correct algorithm just enough to avoid such collisions.
+ * While the bug itself affected the majority of passwords containing
+ * characters with the 8th bit set (although only a percentage of those in a
+ * collision-producing way), the anti-collision safety measure affects
+ * only a subset of passwords containing the '\xff' character (not even all of
+ * those passwords, just some of them).  This character is not found in valid
+ * UTF-8 sequences and is rarely used in popular 8-bit character encodings.
+ * Thus, the safety measure is unlikely to cause much annoyance, and is a
+ * reasonable tradeoff to use when authenticating against existing hashes that
+ * are not reliably known to have been computed with the correct algorithm.
+ *
+ * We use an approach that tries to minimize side-channel leaks of password
+ * information - that is, we mostly use fixed-cost bitwise operations instead
+ * of branches or table lookups.  (One conditional branch based on password
+ * length remains.  It is not part of the bug aftermath, though, and is
+ * difficult and possibly unreasonable to avoid given the use of C strings by
+ * the caller, which results in similar timing leaks anyway.)
+ *
+ * For actual implementation, we set an array index in the variable "bug"
+ * (0 means no bug, 1 means sign extension bug emulation) and a flag in the
+ * variable "safety" (bit 16 is set when the safety measure is requested).
+ * Valid combinations of settings are:
+ *
+ * Prefix "$2a$": bug = 0, safety = 0x10000
+ * Prefix "$2b$": bug = 0, safety = 0
+ * Prefix "$2x$": bug = 1, safety = 0
+ * Prefix "$2y$": bug = 0, safety = 0
+ */
+	bug = (unsigned int)flags & 1;
+	safety = ((BF_word)flags & 2) << 15;
+
+	sign = diff = 0;
+
+	for (i = 0; i < BF_N + 2; i++) {
+		tmp[0] = tmp[1] = 0;
+		for (j = 0; j < 4; j++) {
+			tmp[0] <<= 8;
+			tmp[0] |= (unsigned char)*ptr; /* correct */
+			tmp[1] <<= 8;
+			tmp[1] |= (BF_word_signed)(signed char)*ptr; /* bug */
+/*
+ * Sign extension in the first char has no effect - nothing to overwrite yet,
+ * and those extra 24 bits will be fully shifted out of the 32-bit word.  For
+ * chars 2, 3, 4 in each four-char block, we set bit 7 of "sign" if sign
+ * extension in tmp[1] occurs.  Once this flag is set, it remains set.
+ */
+			if (j)
+				sign |= tmp[1] & 0x80;
+			if (!*ptr)
+				ptr = key;
+			else
+				ptr++;
+		}
+		diff |= tmp[0] ^ tmp[1]; /* Non-zero on any differences */
+
+		expanded[i] = tmp[bug];
+		initial[i] = BF_init_state.P[i] ^ tmp[bug];
+	}
+
+/*
+ * At this point, "diff" is zero iff the correct and buggy algorithms produced
+ * exactly the same result.  If so and if "sign" is non-zero, which indicates
+ * that there was a non-benign sign extension, this means that we have a
+ * collision between the correctly computed hash for this password and a set of
+ * passwords that could be supplied to the buggy algorithm.  Our safety measure
+ * is meant to protect from such many-buggy to one-correct collisions, by
+ * deviating from the correct algorithm in such cases.  Let's check for this.
+ */
+	diff |= diff >> 16; /* still zero iff exact match */
+	diff &= 0xffff; /* ditto */
+	diff += 0xffff; /* bit 16 set iff "diff" was non-zero (on non-match) */
+	sign <<= 9; /* move the non-benign sign extension flag to bit 16 */
+	sign &= ~diff & safety; /* action needed? */
+
+/*
+ * If we have determined that we need to deviate from the correct algorithm,
+ * flip bit 16 in initial expanded key.  (The choice of 16 is arbitrary, but
+ * let's stick to it now.  It came out of the approach we used above, and it's
+ * not any worse than any other choice we could make.)
+ *
+ * It is crucial that we don't do the same to the expanded key used in the main
+ * Eksblowfish loop.  By doing it to only one of these two, we deviate from a
+ * state that could be directly specified by a password to the buggy algorithm
+ * (and to the fully correct one as well, but that's a side-effect).
+ */
+	initial[0] ^= sign;
+}
+
+static const unsigned char flags_by_subtype[26] =
+	{2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0};
+
+static char *BF_crypt(const char *key, const char *setting,
+	char *output, int size,
+	BF_word min)
+{
+#if BF_ASM
+	extern void _BF_body_r(BF_ctx *ctx);
+#endif
+	struct {
+		BF_ctx ctx;
+		BF_key expanded_key;
+		union {
+			BF_word salt[4];
+			BF_word output[6];
+		} binary;
+	} data;
+	BF_word L, R;
+	BF_word tmp1, tmp2, tmp3, tmp4;
+	BF_word *ptr;
+	BF_word count;
+	int i;
+
+	if (size < 7 + 22 + 31 + 1) {
+		__set_errno(ERANGE);
+		return NULL;
+	}
+
+	if (setting[0] != '$' ||
+	    setting[1] != '2' ||
+	    setting[2] < 'a' || setting[2] > 'z' ||
+	    !flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a'] ||
+	    setting[3] != '$' ||
+	    setting[4] < '0' || setting[4] > '3' ||
+	    setting[5] < '0' || setting[5] > '9' ||
+	    (setting[4] == '3' && setting[5] > '1') ||
+	    setting[6] != '$') {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+
+	count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
+	if (count < min || BF_decode(data.binary.salt, &setting[7], 16)) {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+	BF_swap(data.binary.salt, 4);
+
+	BF_set_key(key, data.expanded_key, data.ctx.P,
+	    flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a']);
+
+	memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
+
+	L = R = 0;
+	for (i = 0; i < BF_N + 2; i += 2) {
+		L ^= data.binary.salt[i & 2];
+		R ^= data.binary.salt[(i & 2) + 1];
+		BF_ENCRYPT;
+		data.ctx.P[i] = L;
+		data.ctx.P[i + 1] = R;
+	}
+
+	ptr = data.ctx.S[0];
+	do {
+		ptr += 4;
+		L ^= data.binary.salt[(BF_N + 2) & 3];
+		R ^= data.binary.salt[(BF_N + 3) & 3];
+		BF_ENCRYPT;
+		*(ptr - 4) = L;
+		*(ptr - 3) = R;
+
+		L ^= data.binary.salt[(BF_N + 4) & 3];
+		R ^= data.binary.salt[(BF_N + 5) & 3];
+		BF_ENCRYPT;
+		*(ptr - 2) = L;
+		*(ptr - 1) = R;
+	} while (ptr < &data.ctx.S[3][0xFF]);
+
+	do {
+		int done;
+
+		for (i = 0; i < BF_N + 2; i += 2) {
+			data.ctx.P[i] ^= data.expanded_key[i];
+			data.ctx.P[i + 1] ^= data.expanded_key[i + 1];
+		}
+
+		done = 0;
+		do {
+			BF_body();
+			if (done)
+				break;
+			done = 1;
+
+			tmp1 = data.binary.salt[0];
+			tmp2 = data.binary.salt[1];
+			tmp3 = data.binary.salt[2];
+			tmp4 = data.binary.salt[3];
+			for (i = 0; i < BF_N; i += 4) {
+				data.ctx.P[i] ^= tmp1;
+				data.ctx.P[i + 1] ^= tmp2;
+				data.ctx.P[i + 2] ^= tmp3;
+				data.ctx.P[i + 3] ^= tmp4;
+			}
+			data.ctx.P[16] ^= tmp1;
+			data.ctx.P[17] ^= tmp2;
+		} while (1);
+	} while (--count);
+
+	for (i = 0; i < 6; i += 2) {
+		L = BF_magic_w[i];
+		R = BF_magic_w[i + 1];
+
+		count = 64;
+		do {
+			BF_ENCRYPT;
+		} while (--count);
+
+		data.binary.output[i] = L;
+		data.binary.output[i + 1] = R;
+	}
+
+	memcpy(output, setting, 7 + 22 - 1);
+	output[7 + 22 - 1] = BF_itoa64[(int)
+		BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30];
+
+/* This has to be bug-compatible with the original implementation, so
+ * only encode 23 of the 24 bytes. :-) */
+	BF_swap(data.binary.output, 6);
+	BF_encode(&output[7 + 22], data.binary.output, 23);
+	output[7 + 22 + 31] = '\0';
+
+	return output;
+}
+
+int _crypt_output_magic(const char *setting, char *output, int size)
+{
+	if (size < 3)
+		return -1;
+
+	output[0] = '*';
+	output[1] = '0';
+	output[2] = '\0';
+
+	if (setting[0] == '*' && setting[1] == '0')
+		output[1] = '1';
+
+	return 0;
+}
+
+/*
+ * Please preserve the runtime self-test.  It serves two purposes at once:
+ *
+ * 1. We really can't afford the risk of producing incompatible hashes e.g.
+ * when there's something like gcc bug 26587 again, whereas an application or
+ * library integrating this code might not also integrate our external tests or
+ * it might not run them after every build.  Even if it does, the miscompile
+ * might only occur on the production build, but not on a testing build (such
+ * as because of different optimization settings).  It is painful to recover
+ * from incorrectly-computed hashes - merely fixing whatever broke is not
+ * enough.  Thus, a proactive measure like this self-test is needed.
+ *
+ * 2. We don't want to leave sensitive data from our actual password hash
+ * computation on the stack or in registers.  Previous revisions of the code
+ * would do explicit cleanups, but simply running the self-test after hash
+ * computation is more reliable.
+ *
+ * The performance cost of this quick self-test is around 0.6% at the "$2a$08"
+ * setting.
+ */
+char *_crypt_blowfish_rn(const char *key, const char *setting,
+	char *output, int size)
+{
+	const char *test_key = "8b \xd0\xc1\xd2\xcf\xcc\xd8";
+	const char *test_setting = "$2a$00$abcdefghijklmnopqrstuu";
+	static const char * const test_hashes[2] =
+		{"i1D709vfamulimlGcq0qq3UvuUasvEa\0\x55", /* 'a', 'b', 'y' */
+		"VUrPmXD6q/nVSSp7pNDhCR9071IfIRe\0\x55"}; /* 'x' */
+	const char *test_hash = test_hashes[0];
+	char *retval;
+	const char *p;
+	int save_errno, ok;
+	struct {
+		char s[7 + 22 + 1];
+		char o[7 + 22 + 31 + 1 + 1 + 1];
+	} buf;
+
+/* Hash the supplied password */
+	_crypt_output_magic(setting, output, size);
+	retval = BF_crypt(key, setting, output, size, 16);
+	save_errno = errno;
+
+/*
+ * Do a quick self-test.  It is important that we make both calls to BF_crypt()
+ * from the same scope such that they likely use the same stack locations,
+ * which makes the second call overwrite the first call's sensitive data on the
+ * stack and makes it more likely that any alignment related issues would be
+ * detected by the self-test.
+ */
+	memcpy(buf.s, test_setting, sizeof(buf.s));
+	if (retval) {
+		unsigned int flags = flags_by_subtype[
+		    (unsigned int)(unsigned char)setting[2] - 'a'];
+		test_hash = test_hashes[flags & 1];
+		buf.s[2] = setting[2];
+	}
+	memset(buf.o, 0x55, sizeof(buf.o));
+	buf.o[sizeof(buf.o) - 1] = 0;
+	p = BF_crypt(test_key, buf.s, buf.o, sizeof(buf.o) - (1 + 1), 1);
+
+	ok = (p == buf.o &&
+	    !memcmp(p, buf.s, 7 + 22) &&
+	    !memcmp(p + (7 + 22), test_hash, 31 + 1 + 1 + 1));
+
+	{
+		const char *k = "\xff\xa3" "34" "\xff\xff\xff\xa3" "345";
+		BF_key ae, ai, ye, yi;
+		BF_set_key(k, ae, ai, 2); /* $2a$ */
+		BF_set_key(k, ye, yi, 4); /* $2y$ */
+		ai[0] ^= 0x10000; /* undo the safety (for comparison) */
+		ok = ok && ai[0] == 0xdb9c59bc && ye[17] == 0x33343500 &&
+		    !memcmp(ae, ye, sizeof(ae)) &&
+		    !memcmp(ai, yi, sizeof(ai));
+	}
+
+	__set_errno(save_errno);
+	if (ok)
+		return retval;
+
+/* Should not happen */
+	_crypt_output_magic(setting, output, size);
+	__set_errno(EINVAL); /* pretend we don't support this hash type */
+	return NULL;
+}
+
+char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	if (size < 16 || output_size < 7 + 22 + 1 ||
+	    (count && (count < 4 || count > 31)) ||
+	    prefix[0] != '$' || prefix[1] != '2' ||
+	    (prefix[2] != 'a' && prefix[2] != 'b' && prefix[2] != 'y')) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	if (!count) count = 5;
+
+	output[0] = '$';
+	output[1] = '2';
+	output[2] = prefix[2];
+	output[3] = '$';
+	output[4] = '0' + count / 10;
+	output[5] = '0' + count % 10;
+	output[6] = '$';
+
+	BF_encode(&output[7], (const BF_word *)input, 16);
+	output[7 + 22] = '\0';
+
+	return output;
+}
diff --git a/src/dbuf.c b/src/dbuf.c
new file mode 100644
index 0000000..62cb40f
--- /dev/null
+++ b/src/dbuf.c
@@ -0,0 +1,190 @@
+/*
+ * UnrealIRCd, src/dbuf.c
+ * Copyright (c) 2013 William Pitcock <nenolod@dereferenced.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+static mp_pool_t *dbuf_bufpool = NULL;
+
+void dbuf_init(void)
+{
+	dbuf_bufpool = mp_pool_new(sizeof(struct dbufbuf), 512 * 1024);
+}
+
+/*
+** dbuf_alloc - allocates a dbufbuf structure either from freelist or
+** creates a new one.
+*/
+static dbufbuf *dbuf_alloc(dbuf *dbuf_p)
+{
+	dbufbuf *ptr;
+
+	assert(dbuf_p != NULL);
+
+	ptr = mp_pool_get(dbuf_bufpool);
+	memset(ptr, 0, sizeof(dbufbuf));
+
+	INIT_LIST_HEAD(&ptr->dbuf_node);
+	list_add_tail(&ptr->dbuf_node, &dbuf_p->dbuf_list);
+
+	return ptr;
+}
+
+/*
+** dbuf_free - return a dbufbuf structure to the freelist
+*/
+static void dbuf_free(dbufbuf *ptr)
+{
+	assert(ptr != NULL);
+
+	list_del(&ptr->dbuf_node);
+	mp_pool_release(ptr);
+}
+
+void dbuf_queue_init(dbuf *dyn)
+{
+	INIT_LIST_HEAD(&dyn->dbuf_list);
+}
+
+void dbuf_put(dbuf *dyn, char *buf, size_t length)
+{
+	struct dbufbuf *block;
+	size_t amount;
+
+	assert(length > 0);
+	if (list_empty(&dyn->dbuf_list))
+		dbuf_alloc(dyn);
+
+	while (length > 0)
+	{
+		block = container_of(dyn->dbuf_list.prev, struct dbufbuf, dbuf_node);
+
+		amount = DBUF_BLOCK_SIZE - block->size;
+		if (!amount)
+		{
+			block = dbuf_alloc(dyn);
+			amount = DBUF_BLOCK_SIZE;
+		}
+		if (amount > length)
+			amount = length;
+
+		memcpy(&block->data[block->size], buf, amount);
+
+		length -= amount;
+		block->size += amount;
+		dyn->length += amount;
+		buf += amount;
+	}
+}
+
+void dbuf_delete(dbuf *dyn, size_t length)
+{
+	struct dbufbuf *block;
+
+	assert(dyn->length >= length);
+	if (length == 0)
+		return;
+
+	for (;;)
+	{
+		if (length == 0)
+			return;
+
+		block = container_of(dyn->dbuf_list.next, struct dbufbuf, dbuf_node);
+		if (length < block->size)
+			break;
+
+		dyn->length -= block->size;
+		length -= block->size;
+		dbuf_free(block);
+	}
+
+	block->size -= length;
+	dyn->length -= length;
+	memmove(block->data, &block->data[length], block->size);
+}
+
+/*
+** dbuf_getmsg
+**
+** Check the buffers to see if there is a string which is terminted with
+** either a \r or \n prsent.  If so, copy as much as possible (determined by
+** length) into buf and return the amount copied - else return 0.
+**
+** Partially based on extract_one_line() from ircd-hybrid. --kaniini
+*/
+int  dbuf_getmsg(dbuf *dyn, char *buf)
+{
+	dbufbuf *block;
+	int line_bytes = 0, empty_bytes = 0, phase = 0;
+	unsigned int idx;
+	char c;
+	char *p = buf;
+
+	/*
+	 * Phase 0: "empty" characters before the line
+	 * Phase 1: copying the line
+	 * Phase 2: "empty" characters after the line
+	 *          (delete them as well and free some space in the dbuf)
+	 *
+	 * Empty characters are CR, LF and space (but, of course, not
+	 * in the middle of a line). We try to remove as much of them as we can,
+	 * since they simply eat server memory.
+	 *
+	 * --adx
+	 */
+	list_for_each_entry2(block, dbufbuf, &dyn->dbuf_list, dbuf_node)
+	{
+		for (idx = 0; idx < block->size; idx++)
+		{
+			c = block->data[idx];
+			if (c == '\r' || c == '\n' || (c == ' ' && phase != 1))
+			{
+				empty_bytes++;
+				if (phase == 1)
+					phase = 2;
+			}
+			else switch (phase)
+			{
+				case 0: phase = 1; /* FALLTHROUGH */
+				case 1: if (line_bytes++ < READBUFSIZE - 2)
+						*p++ = c;
+					break;
+				case 2: *p = '\0';
+					dbuf_delete(dyn, line_bytes + empty_bytes);
+					return MIN(line_bytes, READBUFSIZE - 2);
+			}
+		}
+	}
+
+	if (phase != 2)
+	{
+		/* If we have not reached phase 2 then this is not
+		 * not a complete line and it is invalid (return 0).
+		 */
+		line_bytes = 0;
+		*buf = '\0';
+	} else {
+		/* Zero terminate the string */
+		*p = '\0';
+	}
+
+	/* Remove what is now unnecessary */
+	dbuf_delete(dyn, line_bytes + empty_bytes);
+	return MIN(line_bytes, READBUFSIZE - 2);
+}
diff --git a/src/debug.c b/src/debug.c
new file mode 100644
index 0000000..e28f898
--- /dev/null
+++ b/src/debug.c
@@ -0,0 +1,160 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/debug.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Some debugging functions that should probably be moved elsewhere.
+ */
+
+/* debug.c 2.30 1/3/94 (C) 1988 University of Oulu, Computing Center and Jarkko Oikarinen */
+
+#include "unrealircd.h"
+
+/** String of server options in this compile (eg 'D' for debug mode).
+ */
+MODVAR char serveropts[] = {
+#ifdef	DEBUGMODE
+	'D',
+#endif
+	/* FDLIST (always) */
+	'F',
+	/* Hub (always) */
+	'h',
+	/* NOSPOOF (always) */
+	'n',
+#ifdef	VALLOC
+	'V',
+#endif
+#ifdef	_WIN32
+	'W',
+#endif
+#ifdef	USE_SYSLOG
+	'Y',
+#endif
+	'6',
+#ifdef USE_SSL
+	'e',
+#endif
+#ifndef NO_OPEROVERRIDE
+	'O',
+#endif
+#ifndef OPEROVERRIDE_VERIFY
+	'o',
+#endif
+	'E',
+#ifdef USE_LIBCURL
+	'r',
+#endif
+	'\0', /* Don't change those nuls. -- Syzop */
+	'\0',
+	'\0',
+	'\0',
+	'\0'
+};
+
+char *extraflags = NULL;
+
+MODVAR int debugfd = 2;
+
+void	flag_add(char ch)
+{
+	char *newextra;
+	if (extraflags)
+	{
+		char tmp[2] = { ch, 0 };
+		newextra = safe_alloc(strlen(extraflags) + 2);
+		strcpy(newextra, extraflags);
+		strcat(newextra, tmp);
+		safe_free(extraflags);
+		extraflags = newextra;
+	}
+	else
+	{
+		extraflags = safe_alloc(2);
+		extraflags[0] = ch;
+		extraflags[1] = '\0';
+	}
+}
+
+void	flag_del(char ch)
+{
+	int newsz;
+	char *p, *op;
+	char *newflags;
+	newsz = 0;	
+	p = extraflags;
+	for (newsz = 0, p = extraflags; *p; p++)
+		if (*p != ch)
+			newsz++;
+	newflags = safe_alloc(newsz + 1);
+	for (p = newflags, op = extraflags; (*op) && (newsz); newsz--, op++)
+		if (*op != ch)
+			*p++ = *op;
+	*p = '\0';
+	safe_free(extraflags);
+	extraflags = newflags;
+}
+
+
+
+#ifdef DEBUGMODE
+
+#ifndef _WIN32
+#define SET_ERRNO(x) errno = x
+#else
+#define SET_ERRNO(x) WSASetLastError(x)
+#endif /* _WIN32 */
+
+static char debugbuf[4096];
+
+void debug(int level, FORMAT_STRING(const char *form), ...)
+{
+	int err = ERRNO;
+
+	va_list vl;
+	va_start(vl, form);
+
+	if ((debuglevel >= 0) && (level <= debuglevel))
+	{
+		(void)ircvsnprintf(debugbuf, sizeof(debugbuf), form, vl);
+
+#ifndef _WIN32
+		strlcat(debugbuf, "\n", sizeof(debugbuf));
+		if (write(debugfd, debugbuf, strlen(debugbuf)) < 0)
+		{
+			/* Yeah.. what can we do if output isn't working? Outputting an error makes no sense */
+			;
+		}
+#else
+		strlcat(debugbuf, "\r\n", sizeof(debugbuf));
+		OutputDebugString(debugbuf);
+#endif
+	}
+	va_end(vl);
+	SET_ERRNO(err);
+}
+
+int checkprotoflags(Client *client, int flags, char *file, int line)
+{
+	if (!MyConnect(client))
+		ircd_log(LOG_ERROR, "[Debug] [BUG] ERROR: %s:%d: IsToken(<%s>,%d) on remote client",
+		         file, line, client->name, flags);
+	return ((client->local->proto & flags) == flags) ? 1 : 0;
+}
+#endif
diff --git a/src/dispatch.c b/src/dispatch.c
new file mode 100644
index 0000000..37540f3
--- /dev/null
+++ b/src/dispatch.c
@@ -0,0 +1,638 @@
+/*
+ * UnrealIRCd, src/dispatch.c
+ * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Some specials here, for this file.. */
+
+/* Do we even support this, poll on Windows? */
+#ifdef BACKEND_POLL
+#ifndef _WIN32
+# include <poll.h>
+#else
+# define poll WSAPoll
+# define POLLRDHUP POLLHUP
+#endif
+#endif
+
+#ifdef _WIN32
+#include <WinSock2.h>
+#endif
+#ifndef _WIN32
+#include <sys/file.h>
+#include <sys/ioctl.h>
+#endif
+
+/***************************************************************************************
+ * Backend-independent functions.  fd_setselect() and friends                          *
+ ***************************************************************************************/
+void fd_setselect(int fd, int flags, IOCallbackFunc iocb, void *data)
+{
+	FDEntry *fde;
+	int changed = 0;
+#if 0
+	ircd_log(LOG_ERROR, "fd_setselect(): fd %d flags %d func %p", fd, flags, &iocb);
+#endif
+	if ((fd < 0) || (fd >= MAXCONNECTIONS))
+	{
+		sendto_realops("[BUG] trying to modify fd #%d in fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+		ircd_log(LOG_ERROR, "[BUG] trying to modify fd #%d in fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return;
+	}
+
+	fde = &fd_table[fd];
+	fde->data = data;
+
+	if (flags & FD_SELECT_READ)
+	{
+		if (fde->read_callback != iocb)
+		{
+			fde->read_callback = iocb;
+			changed = 1;
+		}
+	}
+	if (flags & FD_SELECT_WRITE)
+	{
+		if (fde->write_callback != iocb)
+		{
+			fde->write_callback = iocb;
+			changed = 1;
+		}
+	}
+
+	// This is efficient, but.. there are places which do two fd_setselect(),
+	// it would be nice if we can merge this into one syscall..
+	if (changed)
+		fd_refresh(fd);
+}
+
+/***************************************************************************************
+ * select() backend.                                                                   *
+ ***************************************************************************************/
+#ifdef BACKEND_SELECT
+
+#ifndef _WIN32
+# include <sys/select.h>
+#endif
+
+static int highest_fd = -1;
+static fd_set read_fds, write_fds;
+
+void fd_refresh(int fd)
+{
+	FDEntry *fde = &fd_table[fd];
+	unsigned int flags = 0;
+
+	if (fde->read_callback)
+	{
+		flags |= FD_SELECT_READ;
+
+		FD_SET(fd, &read_fds);
+	}
+	else
+		FD_CLR(fd, &read_fds);
+
+	if (fde->write_callback)
+	{
+		flags |= FD_SELECT_WRITE;
+
+		FD_SET(fd, &write_fds);
+	}
+	else
+		FD_CLR(fd, &write_fds);
+
+	if (flags && highest_fd < fd)
+		highest_fd = fd;
+
+	while (highest_fd > 0 &&
+		!(FD_ISSET(highest_fd, &read_fds) || FD_ISSET(highest_fd, &write_fds)))
+		highest_fd--;
+
+	fde->backend_flags = flags;
+}
+
+void fd_debug(fd_set *f, int highest, char *name)
+{
+	int i;
+	for (i = 0; i < highest; i++)
+	{
+		if (FD_ISSET(i, f))
+		{
+			/* check if fd 'i' is valid... */
+			//if (fcntl(i, F_GETFL) < 0)
+			int nonb = 1;
+			if (ioctlsocket(i, FIONBIO, &nonb) < 0)
+				ircd_log(LOG_ERROR, "fd_debug: FD #%d is invalid!!!", i);
+		}
+	}
+}
+void fd_select(time_t delay)
+{
+	struct timeval to;
+	int num, fd;
+	fd_set work_read_fds;
+	fd_set work_write_fds;
+#ifdef _WIN32
+	fd_set work_except_fds; /* only needed on windows as it may indicate a failed connect() */
+#endif
+
+	/* copy the FD sets so that our master sets are untouched */
+	memcpy(&work_read_fds, &read_fds, sizeof(fd_set));
+	memcpy(&work_write_fds, &write_fds, sizeof(fd_set));
+#ifdef _WIN32
+	memcpy(&work_except_fds, &write_fds, sizeof(fd_set));
+#endif
+
+	memset(&to, 0, sizeof(to));
+	to.tv_sec = delay / 1000;
+	to.tv_usec = (delay % 1000) * 1000;
+
+#ifdef DEBUGMODE
+	ircd_log(LOG_ERROR, "fd_select() on 0-%d...", highest_fd+1);
+#endif
+
+#ifdef _WIN32
+	num = select(highest_fd + 1, &work_read_fds, &work_write_fds, &work_except_fds, &to);
+#else
+	num = select(highest_fd + 1, &work_read_fds, &work_write_fds, NULL, &to);
+#endif
+	if (num < 0)
+	{
+		extern void report_baderror(char *text, Client *client);
+		report_baderror("select %s:%s", &me);
+		/* DEBUG the actual problem: */
+		memcpy(&work_read_fds, &read_fds, sizeof(fd_set));
+		memcpy(&work_write_fds, &write_fds, sizeof(fd_set));
+		fd_debug(&work_read_fds, highest_fd+1, "read");
+		fd_debug(&work_write_fds, highest_fd+1, "write");
+#ifdef _WIN32
+		Sleep(500);
+#endif
+	}
+
+	if (num <= 0)
+		return;
+
+	for (fd = 0; fd <= highest_fd && num > 0; fd++)
+	{
+		FDEntry *fde;
+		IOCallbackFunc iocb;
+		int evflags = 0;
+
+		fde = &fd_table[fd];
+		if (!fde->is_open)
+			continue;
+
+#ifdef DEBUGMODE
+		ircd_log(LOG_ERROR, "fd_select(): checking %d...", fd);
+#endif
+
+		if (FD_ISSET(fd, &work_read_fds))
+			evflags |= FD_SELECT_READ;
+
+		if (FD_ISSET(fd, &work_write_fds))
+			evflags |= FD_SELECT_WRITE;
+
+#ifdef _WIN32
+		/* Exception may happen due to failed connect. Translate to write event, like on *NIX. */
+		if (FD_ISSET(fd, &work_except_fds))
+			evflags |= FD_SELECT_WRITE;
+#endif
+
+		if (!evflags)
+			continue;
+
+#ifdef DEBUGMODE
+		ircd_log(LOG_ERROR, "fd_select(): events for %d (%d)... processing...", fd, evflags);
+#endif
+
+		if (evflags & FD_SELECT_READ)
+		{
+			iocb = fde->read_callback;
+
+			if (iocb != NULL)
+				iocb(fd, evflags, fde->data);
+		}
+
+		if (evflags & FD_SELECT_WRITE)
+		{
+			iocb = fde->write_callback;
+
+			if (iocb != NULL)
+				iocb(fd, evflags, fde->data);
+		}
+
+		num--;
+	}
+}
+
+void fd_fork()
+{
+}
+
+#endif
+
+/***************************************************************************************
+ * kqueue() backend.                                                                   *
+ ***************************************************************************************/
+#ifdef BACKEND_KQUEUE
+
+#include <sys/event.h>
+
+static int kqueue_fd = -1;
+static struct kevent kqueue_events[MAXCONNECTIONS * 2];
+static struct kevent kqueue_prepared[MAXCONNECTIONS * 2];
+static char kqueue_enabled[MAXCONNECTIONS * 2];
+
+void fd_fork()
+{
+	kqueue_fd = kqueue();
+	int p;
+
+	for (p=0; p < MAXCONNECTIONS * 2; ++p)
+	{
+		if (kqueue_enabled[p])
+		{
+			if (kevent(kqueue_fd, &kqueue_prepared[p], 1, NULL, 0, &(const struct timespec){ .tv_sec = 0, .tv_nsec = 0}) != 0)
+			{
+				if (ERRNO == P_EWOULDBLOCK || ERRNO == P_EAGAIN)
+					continue;
+					
+#ifdef DEBUGMODE
+				ircd_log(LOG_ERROR, "[BUG?] kevent returned %d", errno);
+#endif
+			}
+		}
+	}
+}
+
+void fd_refresh(int fd)
+{
+	FDEntry *fde = &fd_table[fd];
+
+	if (kqueue_fd == -1)
+	{
+		kqueue_fd = kqueue();
+		memset(kqueue_enabled,0,MAXCONNECTIONS*2);
+	}
+
+	kqueue_enabled[fd] = 0;
+	kqueue_enabled[fd+MAXCONNECTIONS] = 0;
+
+	if (fde->read_callback != NULL || fde->backend_flags & EVFILT_READ)
+	{
+		EV_SET(&kqueue_prepared[fd], (uintptr_t) fd, (short) EVFILT_READ, fde->read_callback != NULL ? EV_ADD : EV_DELETE, 0, 0, fde);
+		if (kevent(kqueue_fd, &kqueue_prepared[fd], 1, NULL, 0, &(const struct timespec){ .tv_sec = 0, .tv_nsec = 0}) != 0)
+		{
+#ifdef DEBUGMODE
+			if (ERRNO != P_EWOULDBLOCK && ERRNO != P_EAGAIN)
+			{
+				ircd_log(LOG_ERROR, "[BUG?] fd_refresh(): kevent returned %d for fd %d for read callback (%s)",
+				         errno, fd, (fde->read_callback ? "add" : "delete"));
+			}
+#endif
+		}
+	}
+
+	if (fde->write_callback != NULL || fde->backend_flags & EVFILT_WRITE)
+	{
+		EV_SET(&kqueue_prepared[fd+MAXCONNECTIONS], (uintptr_t) fd, (short) EVFILT_WRITE, fde->write_callback != NULL ? EV_ADD : EV_DELETE, 0, 0, fde);
+		if (kevent(kqueue_fd, &kqueue_prepared[fd+MAXCONNECTIONS], 1, NULL, 0, &(const struct timespec){ .tv_sec = 0, .tv_nsec = 0}) != 0)
+		{
+#ifdef DEBUGMODE
+			if (ERRNO != P_EWOULDBLOCK && ERRNO != P_EAGAIN && fde->write_callback)
+			{
+				ircd_log(LOG_ERROR, "[BUG?] fd_refresh(): kevent returned %d for fd %d for write callback (%s)",
+				         errno, fd, "add" /*(fde->write_callback ? "add" : "delete")*/);
+			}
+#endif
+		}
+	}
+
+	fde->backend_flags = 0;
+
+	if (fde->read_callback != NULL)
+	{
+		fde->backend_flags |= EVFILT_READ;
+		kqueue_enabled[fd] = 1;
+
+	}
+
+	if (fde->write_callback != NULL)
+	{
+		fde->backend_flags |= EVFILT_WRITE;
+		kqueue_enabled[fd+MAXCONNECTIONS] = 1;
+	}
+}
+
+void fd_select(time_t delay)
+{
+	struct timespec ts;
+	int num, p, revents, fd;
+	struct kevent *ke;
+
+	if (kqueue_fd == -1)
+	{
+		kqueue_fd = kqueue();
+		memset(kqueue_enabled,0,MAXCONNECTIONS*2);
+	}
+
+	memset(&ts, 0, sizeof(ts));
+	ts.tv_sec = delay / 1000;
+	ts.tv_nsec = delay % 1000 * 1000000;
+
+	num = kevent(kqueue_fd, NULL, 0, kqueue_events, MAXCONNECTIONS * 2, &ts);
+	if (num <= 0)
+		return;
+
+	for (p = 0; p < num; p++)
+	{
+		FDEntry *fde;
+		IOCallbackFunc iocb;
+		int evflags = 0;
+
+		ke = &kqueue_events[p];
+		fd = ke->ident;
+		revents = ke->filter;
+		fde = ke->udata;
+
+		if (revents == EVFILT_READ)
+		{
+			iocb = fde->read_callback;
+
+			if (iocb != NULL)
+				iocb(fd, FD_SELECT_READ, fde->data);
+		}
+
+		if (revents == EVFILT_WRITE)
+		{
+			iocb = fde->write_callback;
+
+			if (iocb != NULL)
+				iocb(fd, FD_SELECT_WRITE, fde->data);
+		}
+	}
+}
+#endif
+
+/***************************************************************************************
+ * epoll() backend.                                                                    *
+ ***************************************************************************************/
+#ifdef BACKEND_EPOLL
+
+#include <sys/epoll.h>
+
+static int epoll_fd = -1;
+static struct epoll_event epfds[MAXCONNECTIONS + 1];
+
+void fd_refresh(int fd)
+{
+	struct epoll_event ep_event;
+	FDEntry *fde = &fd_table[fd];
+	unsigned int pflags = 0;
+	int op = -1;
+
+	if (epoll_fd == -1)
+		epoll_fd = epoll_create(MAXCONNECTIONS);
+
+	if (fde->read_callback)
+		pflags |= EPOLLIN;
+
+	if (fde->write_callback)
+		pflags |= EPOLLOUT;
+
+	if (pflags == 0 && fde->backend_flags == 0)
+		return;
+	else if (pflags == 0)
+		op = EPOLL_CTL_DEL;
+	else if (fde->backend_flags == 0 && pflags != 0)
+		op = EPOLL_CTL_ADD;
+	else if (fde->backend_flags != pflags)
+		op = EPOLL_CTL_MOD;
+
+	if (op == -1)
+		return;
+
+	memset(&ep_event, 0, sizeof(ep_event));
+	ep_event.events = pflags;
+	ep_event.data.ptr = fde;
+
+	if (epoll_ctl(epoll_fd, op, fd, &ep_event) != 0)
+	{
+		if (ERRNO == P_EWOULDBLOCK || ERRNO == P_EAGAIN)
+			return;
+
+		ircd_log(LOG_ERROR, "[BUG] fd_refresh(): epoll_ctl returned error %d (%s) for fd %d (%s)",
+			errno, STRERROR(ERRNO), fd, fde->desc);
+		return;
+	}
+
+	fde->backend_flags = pflags;
+}
+
+void fd_select(time_t delay)
+{
+	int num, p, revents, fd;
+	struct epoll_event *epfd;
+#ifdef DEBUG_IOENGINE
+	int read_callbacks = 0, write_callbacks = 0;
+	struct timeval oldt, t;
+	long long tdiff;
+#endif
+	if (epoll_fd == -1)
+		epoll_fd = epoll_create(MAXCONNECTIONS);
+
+	num = epoll_wait(epoll_fd, epfds, MAXCONNECTIONS, delay);
+	if (num <= 0)
+		return;
+
+#ifdef DEBUG_IOENGINE
+	gettimeofday(&oldt, NULL);
+#endif
+
+	for (p = 0; p < num; p++)
+	{
+		FDEntry *fde;
+		IOCallbackFunc iocb;
+		int evflags = 0;
+
+		epfd = &epfds[p];
+
+		revents = epfd->events;
+		if (revents == 0)
+			continue;
+
+		fde = epfd->data.ptr;
+		fd = fde->fd;
+
+		if (revents & (EPOLLIN | EPOLLHUP | EPOLLERR))
+			evflags |= FD_SELECT_READ;
+
+		if (revents & (EPOLLOUT | EPOLLHUP | EPOLLERR))
+			evflags |= FD_SELECT_WRITE;
+
+		if (evflags & FD_SELECT_READ)
+		{
+			iocb = fde->read_callback;
+
+			if (iocb != NULL)
+				iocb(fd, evflags, fde->data);
+
+#ifdef DEBUG_IOENGINE
+			read_callbacks++;
+#endif
+		}
+
+		if (evflags & FD_SELECT_WRITE)
+		{
+			iocb = fde->write_callback;
+
+			if (iocb != NULL)
+				iocb(fd, evflags, fde->data);
+
+#ifdef DEBUG_IOENGINE
+			write_callbacks++;
+#endif
+		}
+#if 0
+		if (((read_callbacks + write_callbacks) % 100) == 0)
+		{
+			/* every 100 events.. set the internal clock so we don't screw up under extreme load */
+			timeofday = time(NULL);
+		}
+#endif
+	}
+
+#ifdef DEBUG_IOENGINE
+	gettimeofday(&t, NULL);
+	tdiff = ((t.tv_sec - oldt.tv_sec) * 1000000) + (t.tv_usec - oldt.tv_usec);
+
+	if (tdiff > 1000000)
+	{
+		sendto_realops_and_log("WARNING: Slow I/O engine or high load: fd_select() took %lld ms! read_callbacks=%d, write_callbacks=%d",
+			tdiff / 1000, read_callbacks, write_callbacks);
+	}
+#endif
+}
+
+
+void fd_fork()
+{
+}
+
+#endif
+
+/***************************************************************************************
+ * Poll() backend.                                                                     *
+ ***************************************************************************************/
+#ifdef BACKEND_POLL
+
+#ifndef POLLRDNORM
+# define POLLRDNORM POLLIN
+#endif
+#ifndef POLLWRNORM
+# define POLLWRNORM POLLOUT
+#endif
+
+static struct pollfd pollfds[FD_SETSIZE];
+static nfds_t nfds = 0;
+
+void fd_refresh(int fd)
+{
+	FDEntry *fde = &fd_table[fd];
+	unsigned int pflags = 0;
+	unsigned int i;
+
+	if (fde->read_callback)
+		pflags |= (POLLRDNORM | POLLIN);
+
+	if (fde->write_callback)
+		pflags |= (POLLWRNORM | POLLOUT);
+
+	pollfds[fde->fd].events = pflags;
+	pollfds[fde->fd].fd = pflags ? fde->fd : -1;
+
+	/* tighten maximum pollfd */
+	if (pflags && nfds < fde->fd)
+		nfds = fde->fd;
+
+	while (nfds > 0 && pollfds[nfds].fd == -1)
+		nfds--;
+
+	fde->backend_flags = pflags;
+}
+
+void fd_select(time_t delay)
+{
+	int num, p, revents, fd;
+	struct pollfd *pfd;
+
+	num = poll(pollfds, nfds + 1, delay);
+	if (num <= 0)
+		return;
+
+	for (p = 0; p < (nfds + 1); p++)
+	{
+		FDEntry *fde;
+		IOCallbackFunc iocb;
+		int evflags = 0;
+
+		pfd = &pollfds[p];
+
+		revents = pfd->revents;
+		fd = pfd->local->fd;
+		if (revents == 0 || fd == -1)
+			continue;
+
+		fde = &fd_table[fd];
+
+		if (revents & (POLLRDNORM | POLLIN | POLLHUP | POLLERR))
+			evflags |= FD_SELECT_READ;
+
+		if (revents & (POLLWRNORM | POLLOUT | POLLHUP | POLLERR))
+			evflags |= FD_SELECT_WRITE;
+
+		if (evflags & FD_SELECT_READ)
+		{
+			iocb = fde->read_callback;
+
+			if (iocb != NULL)
+				iocb(fd, evflags, fde->data);
+		}
+
+		if (evflags & FD_SELECT_WRITE)
+		{
+			iocb = fde->write_callback;
+			if (iocb != NULL)
+				iocb(fd, evflags, fde->data);
+		}
+	}
+}
+
+
+void fd_fork()
+{
+}
+
+#endif
diff --git a/src/dns.c b/src/dns.c
new file mode 100644
index 0000000..4fe8a80
--- /dev/null
+++ b/src/dns.c
@@ -0,0 +1,742 @@
+/************************************************************************
+ * IRC - Internet Relay Chat, src/dns.c
+ * (C) 2005 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "unrealircd.h"
+#include "dns.h"
+
+#if !defined(UNREAL_VERSION_TIME)
+ #error "YOU MUST RUN ./Config WHENEVER YOU ARE UPGRADING UNREAL!!!!"
+#endif
+
+
+/* Prevent crashes due to invalid prototype/ABI.
+ * And force the use of at least the version shipped with Unreal
+ * (or at least one without known security issues).
+ */
+#if ARES_VERSION < 0x010600
+ #error "You have an old c-ares version on your system and/or Unreals c-ares failed to compile!"
+#endif
+
+/* Forward declerations */
+void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he);
+void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he);
+void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he);
+void unrealdns_delasyncconnects(void);
+static uint64_t unrealdns_hash_ip(const char *ip);
+static void unrealdns_addtocache(char *name, char *ip);
+static char *unrealdns_findcache_ip(char *ip);
+struct hostent *unreal_create_hostent(char *name, char *ip);
+static void unrealdns_freeandremovereq(DNSReq *r);
+void unrealdns_removecacherecord(DNSCache *c);
+
+/* Externs */
+extern void proceed_normal_client_handshake(Client *client, struct hostent *he);
+
+/* Global variables */
+
+ares_channel resolver_channel; /**< The resolver channel. */
+
+DNSStats dnsstats;
+
+static DNSReq *requests = NULL; /**< Linked list of requests (pending responses). */
+
+static DNSCache *cache_list = NULL; /**< Linked list of cache */
+static DNSCache *cache_hashtbl[DNS_HASH_SIZE]; /**< Hash table of cache */
+
+static unsigned int unrealdns_num_cache = 0; /**< # of cache entries in memory */
+
+static char siphashkey_dns_ip[SIPHASH_KEY_LENGTH];
+
+static void unrealdns_io_cb(int fd, int revents, void *data)
+{
+	ares_socket_t read_fd, write_fd;
+	FDEntry *fde;
+
+	read_fd = write_fd = ARES_SOCKET_BAD;
+	fde = &fd_table[fd];
+
+	if (revents & FD_SELECT_READ)
+		read_fd = fde->fd;
+
+	if (revents & FD_SELECT_WRITE)
+		write_fd = fde->fd;
+
+	ares_process_fd(resolver_channel, read_fd, write_fd);
+}
+
+static void unrealdns_sock_state_cb(void *data, ares_socket_t fd, int read, int write)
+{
+	int selflags = 0;
+
+	if (!read && !write)
+	{
+		/* Socket is going to be closed *BY C-ARES*..
+		 * so don't call fd_close() but fd_unmap().
+		 */
+		fd_unmap(fd);
+		return;
+	}
+	
+	if (read)
+		selflags |= FD_SELECT_READ;
+
+	if (write)
+		selflags |= FD_SELECT_WRITE;
+
+	fd_setselect(fd, selflags, unrealdns_io_cb, data);
+}
+
+/* Who thought providing a socket OPEN callback without a socket CLOSE callback was
+ * a good idea...?  --nenolod
+ */
+static int unrealdns_sock_create_cb(ares_socket_t fd, int type, void *data)
+{
+	fd_open(fd, "DNS Resolver Socket");
+	return ARES_SUCCESS;
+}
+
+static EVENT(unrealdns_timeout)
+{
+	ares_process_fd(resolver_channel, ARES_SOCKET_BAD, ARES_SOCKET_BAD);
+}
+
+static Event *unrealdns_timeout_hdl = NULL;
+
+void init_resolver(int firsttime)
+{
+	struct ares_options options;
+	int n;
+	int optmask;
+
+	if (requests)
+		abort(); /* should never happen */
+		
+	if (firsttime)
+	{
+		memset(&cache_hashtbl, 0, sizeof(cache_hashtbl));
+		memset(&dnsstats, 0, sizeof(dnsstats));
+		siphash_generate_key(siphashkey_dns_ip);
+		ares_library_init(ARES_LIB_INIT_ALL);
+	}
+
+	memset(&options, 0, sizeof(options));
+	options.timeout = 1500; /* 1.5 seconds */
+	options.tries = 2;
+	/* Note that the effective DNS timeout is NOT simply 1500*2=3000.
+	 * This is because c-ares does some incremental timeout stuff itself
+	 * that may add up to twice the timeout in the second round,
+	 * so effective max is 1500ms first and then up to 3000s, so 4500ms in total
+	 * (until they change the algorithm again, that is...).
+	 */
+	options.flags |= ARES_FLAG_NOALIASES|ARES_FLAG_IGNTC;
+	options.sock_state_cb = unrealdns_sock_state_cb;
+	optmask = ARES_OPT_TIMEOUTMS|ARES_OPT_TRIES|ARES_OPT_FLAGS|ARES_OPT_SOCK_STATE_CB;
+#ifndef _WIN32
+	/* on *NIX don't use the hosts file, since it causes countless useless reads.
+	 * on Windows we use it for now, this could be changed in the future.
+	 */
+	options.lookups = "b";
+	optmask |= ARES_OPT_LOOKUPS;
+#endif
+	n = ares_init_options(&resolver_channel, &options, optmask);
+	if (n != ARES_SUCCESS)
+	{
+		/* FATAL */
+		config_error("resolver: ares_init_options() failed with error code %d [%s]", n, ares_strerror(n));
+#ifdef _WIN32
+		win_error();
+#endif
+		exit(-7);
+	}
+
+	ares_set_socket_callback(resolver_channel, unrealdns_sock_create_cb, NULL);
+	unrealdns_timeout_hdl = EventAdd(NULL, "unrealdns_timeout", unrealdns_timeout, NULL, 500, 0);
+}
+
+void reinit_resolver(Client *client)
+{
+	EventDel(unrealdns_timeout_hdl);
+
+	sendto_ops_and_log("%s requested reinitalization of resolver!", client->name);
+	sendto_realops("Destroying resolver channel, along with all currently pending queries...");
+	ares_destroy(resolver_channel);
+	sendto_realops("Initializing resolver again...");
+	init_resolver(0);
+	sendto_realops("Reinitalization finished successfully.");
+}
+
+void unrealdns_addreqtolist(DNSReq *r)
+{
+	if (requests)
+	{
+		r->next = requests;
+		requests->prev = r;
+	}
+	requests = r;
+}
+
+/** Get (and verify) the host for an incoming client.
+ * - it checks the cache first, returns the host if found (and valid).
+ * - if not found in cache it does ip->name and then name->ip, if both resolve
+ *   to the same name it is accepted, otherwise not.
+ *   We return NULL in this case and an asynchronic request is done.
+ *   When done, proceed_normal_client_handshake() is called.
+ */
+struct hostent *unrealdns_doclient(Client *client)
+{
+	DNSReq *r;
+	char *cache_name;
+
+	cache_name = unrealdns_findcache_ip(client->ip);
+	if (cache_name)
+		return unreal_create_hostent(cache_name, client->ip);
+
+	/* Create a request */
+	r = safe_alloc(sizeof(DNSReq));
+	r->client = client;
+	r->ipv6 = IsIPV6(client);
+	unrealdns_addreqtolist(r);
+
+	/* Execute it */
+	if (r->ipv6)
+	{
+		struct in6_addr addr;
+		memset(&addr, 0, sizeof(addr));
+		inet_pton(AF_INET6, client->ip, &addr);
+		ares_gethostbyaddr(resolver_channel, &addr, 16, AF_INET6, unrealdns_cb_iptoname, r);
+	} else {
+		struct in_addr addr;
+		memset(&addr, 0, sizeof(addr));
+		inet_pton(AF_INET, client->ip, &addr);
+		ares_gethostbyaddr(resolver_channel, &addr, 4, AF_INET, unrealdns_cb_iptoname, r);
+	}
+
+	return NULL;
+}
+
+/** Resolve a name to an IP, for a link block.
+ */
+void unrealdns_gethostbyname_link(char *name, ConfigItem_link *conf, int ipv4_only)
+{
+	DNSReq *r;
+
+	/* Create a request */
+	r = safe_alloc(sizeof(DNSReq));
+	r->linkblock = conf;
+	safe_strdup(r->name, name);
+	if (!DISABLE_IPV6 && !ipv4_only)
+	{
+		/* We try an IPv6 lookup first, and if that fails we try IPv4. */
+		r->ipv6 = 1;
+	}
+
+	unrealdns_addreqtolist(r);
+
+	/* Execute it */
+	ares_gethostbyname(resolver_channel, r->name, r->ipv6 ? AF_INET6 : AF_INET, unrealdns_cb_nametoip_link, r);
+}
+
+void unrealdns_cb_iptoname(void *arg, int status, int timeouts, struct hostent *he)
+{
+	DNSReq *r = (DNSReq *)arg;
+	DNSReq *newr;
+	Client *client = r->client;
+	char ipv6 = r->ipv6;
+
+	unrealdns_freeandremovereq(r);
+
+	if (!client)
+		return; 
+	
+	/* Check for status and null name (yes, we must) */
+	if ((status != 0) || !he->h_name || !*he->h_name)
+	{
+		/* Failed */
+		proceed_normal_client_handshake(client, NULL);
+		return;
+	}
+
+	/* Good, we got a valid response, now prepare for name -> ip */
+	newr = safe_alloc(sizeof(DNSReq));
+	newr->client = client;
+	newr->ipv6 = ipv6;
+	safe_strdup(newr->name, he->h_name);
+	unrealdns_addreqtolist(newr);
+
+	ares_gethostbyname(resolver_channel, he->h_name, ipv6 ? AF_INET6 : AF_INET, unrealdns_cb_nametoip_verify, newr);
+}
+
+/*
+  returns:
+  1 = good hostname
+  0 = bad hostname
+ */
+int verify_hostname(char *name)
+{
+char *p;
+
+	if (strlen(name) > HOSTLEN)
+		return 0; 
+
+	/* No underscores or other illegal characters */
+	for (p = name; *p; p++)
+		if (!isalnum(*p) && !strchr(".-", *p))
+			return 0;
+
+	return 1;
+}
+
+
+void unrealdns_cb_nametoip_verify(void *arg, int status, int timeouts, struct hostent *he)
+{
+	DNSReq *r = (DNSReq *)arg;
+	Client *client = r->client;
+	char ipv6 = r->ipv6;
+	int i;
+	struct hostent *he2;
+
+	if (!client)
+		goto bad;
+
+	if ((status != 0) || (ipv6 && (he->h_length != 16)) || (!ipv6 && (he->h_length != 4)))
+	{
+		/* Failed: error code, or data length is incorrect */
+		proceed_normal_client_handshake(client, NULL);
+		goto bad;
+	}
+
+	/* Verify ip->name and name->ip mapping... */
+	for (i = 0; he->h_addr_list[i]; i++)
+	{
+		if (r->ipv6)
+		{
+			struct in6_addr addr;
+			if (inet_pton(AF_INET6, client->ip, &addr) != 1)
+				continue; /* something fucked */
+			if (!memcmp(he->h_addr_list[i], &addr, 16))
+				break; /* MATCH */
+		} else {
+			struct in_addr addr;
+			if (inet_pton(AF_INET, client->ip, &addr) != 1)
+				continue; /* something fucked */
+			if (!memcmp(he->h_addr_list[i], &addr, 4))
+				break; /* MATCH */
+		}
+	}
+
+	if (!he->h_addr_list[i])
+	{
+		/* Failed name <-> IP mapping */
+		proceed_normal_client_handshake(client, NULL);
+		goto bad;
+	}
+
+	if (!verify_hostname(r->name))
+	{
+		/* Hostname is bad, don't cache and consider unresolved */
+		proceed_normal_client_handshake(client, NULL);
+		goto bad;
+	}
+
+	/* Entry was found, verified, and can be added to cache */
+
+	unrealdns_addtocache(r->name, client->ip);
+	
+	he2 = unreal_create_hostent(r->name, client->ip);
+	proceed_normal_client_handshake(client, he2);
+
+bad:
+	unrealdns_freeandremovereq(r);
+}
+
+void unrealdns_cb_nametoip_link(void *arg, int status, int timeouts, struct hostent *he)
+{
+	DNSReq *r = (DNSReq *)arg;
+	int n;
+	struct hostent *he2;
+	char ipbuf[HOSTLEN+1];
+	char *ip = NULL;
+
+	if (!r->linkblock)
+	{
+		/* Possible if deleted due to rehash async removal */
+		unrealdns_freeandremovereq(r);
+		return;
+	}
+
+	if ((status != 0) || !he->h_addr_list || !he->h_addr_list[0])
+	{
+		if (r->ipv6)
+		{
+			/* Retry for IPv4... */
+			r->ipv6 = 0;
+			ares_gethostbyname(resolver_channel, r->name, AF_INET, unrealdns_cb_nametoip_link, r);
+
+			return;
+		}
+
+		/* fatal error while resolving */
+		sendto_ops_and_log("Unable to resolve hostname '%s', when trying to connect to server %s.",
+			r->name, r->linkblock->servername);
+		r->linkblock->refcount--;
+		unrealdns_freeandremovereq(r);
+		return;
+	}
+	r->linkblock->refcount--;
+
+	if (!he->h_addr_list[0] || (he->h_length != (r->ipv6 ? 16 : 4)) ||
+	    !(ip = inetntop(r->ipv6 ? AF_INET6 : AF_INET, he->h_addr_list[0], ipbuf, sizeof(ipbuf))))
+	{
+		/* Illegal response -- fatal */
+		sendto_ops_and_log("Unable to resolve hostname '%s', when trying to connect to server %s.",
+			r->name, r->linkblock->servername);
+		unrealdns_freeandremovereq(r);
+		return;
+	}
+	
+	/* Ok, since we got here, it seems things were actually succesfull */
+
+	/* Fill in [linkblockstruct]->ipnum */
+	safe_strdup(r->linkblock->connect_ip, ip);
+	he2 = unreal_create_hostent(he->h_name, ip);
+
+	switch ((n = connect_server(r->linkblock, r->client, he2)))
+	{
+		case 0:
+			sendto_ops_and_log("Connecting to server %s[%s].", r->linkblock->servername, ip);
+			break;
+		case -1:
+			sendto_ops_and_log("Couldn't connect to server %s[%s].", r->linkblock->servername, ip);
+			break;
+		case -2:
+			/* Should not happen since he is not NULL */
+			sendto_ops_and_log("Hostname %s is unknown for server %s (!?).", r->linkblock->outgoing.hostname, r->linkblock->servername);
+			break;
+		default:
+			sendto_ops_and_log("Connection to server %s failed: %s", r->linkblock->servername, STRERROR(n));
+	}
+	
+	unrealdns_freeandremovereq(r);
+	/* DONE */
+}
+
+static uint64_t unrealdns_hash_ip(const char *ip)
+{
+        return siphash(ip, siphashkey_dns_ip) % DNS_HASH_SIZE;
+}
+
+static void unrealdns_addtocache(char *name, char *ip)
+{
+	unsigned int hashv;
+	DNSCache *c;
+
+	dnsstats.cache_adds++;
+
+	hashv = unrealdns_hash_ip(ip);
+
+	/* Check first if it is already present in the cache.
+	 * This is possible, when 2 clients connect at the same time.
+	 */	
+	for (c = cache_hashtbl[hashv]; c; c = c->hnext)
+		if (!strcmp(ip, c->ip))
+			return; /* already present in cache */
+
+	/* Remove last item, if we got too many entries.. */
+	if (unrealdns_num_cache >= DNS_MAX_ENTRIES)
+	{
+		for (c = cache_list; c->next; c = c->next);
+		unrealdns_removecacherecord(c);
+	}
+
+	/* Create record */
+	c = safe_alloc(sizeof(DNSCache));
+	safe_strdup(c->name, name);
+	safe_strdup(c->ip, ip);
+	c->expires = TStime() + DNSCACHE_TTL;
+	
+	/* Add to hash table */
+	if (cache_hashtbl[hashv])
+	{
+		cache_hashtbl[hashv]->hprev = c;
+		c->hnext = cache_hashtbl[hashv];
+	}
+	cache_hashtbl[hashv] = c;
+	
+	/* Add to linked list */
+	if (cache_list)
+	{
+		cache_list->prev = c;
+		c->next = cache_list;
+	}
+	cache_list = c;
+
+	unrealdns_num_cache++;
+	/* DONE */
+}
+
+/** Search the cache for a confirmed ip->name and name->ip match, by address.
+ * @returns The resolved hostname, or NULL if not found in cache.
+ */
+static char *unrealdns_findcache_ip(char *ip)
+{
+	unsigned int hashv;
+	DNSCache *c;
+
+	hashv = unrealdns_hash_ip(ip);
+	
+	for (c = cache_hashtbl[hashv]; c; c = c->hnext)
+		if (!strcmp(ip, c->ip))
+		{
+			dnsstats.cache_hits++;
+			return c->name;
+		}
+	
+	dnsstats.cache_misses++;
+	return NULL;
+}
+
+/** Removes dns cache record from list (and frees it).
+ */
+void unrealdns_removecacherecord(DNSCache *c)
+{
+unsigned int hashv;
+
+	/* We basically got 4 pointers to update:
+	 * <previous listitem>->next
+	 * <next listitem>->previous
+	 * <previous hashitem>->next
+	 * <next hashitem>->prev.
+	 * And we need to update 'cache_list' and 'cache_hash[]' if needed.
+	 */
+	if (c->prev)
+		c->prev->next = c->next;
+	else
+		cache_list = c->next; /* new list HEAD */
+	
+	if (c->next)
+		c->next->prev = c->prev;
+	
+	if (c->hprev)
+		c->hprev->hnext = c->hnext;
+	else {
+		/* new hash HEAD */
+		hashv = unrealdns_hash_ip(c->ip);
+		if (cache_hashtbl[hashv] != c)
+			abort(); /* impossible */
+		cache_hashtbl[hashv] = c->hnext;
+	}
+	
+	if (c->hnext)
+		c->hnext->hprev = c->hprev;
+	
+	safe_free(c->name);
+	safe_free(c->ip);
+	safe_free(c);
+
+	unrealdns_num_cache--;
+}
+
+/** This regulary removes old dns records from the cache */
+EVENT(unrealdns_removeoldrecords)
+{
+DNSCache *c, *next;
+
+	for (c = cache_list; c; c = next)
+	{
+		next = c->next;
+		if (c->expires < TStime())
+		{
+#if 0
+			sendto_realops(client, "[Syzop/DNS] Expire: %s [%s] (%ld < %ld)",
+				c->name, c->ip, c->expires, TStime());
+#endif
+			unrealdns_removecacherecord(c);
+		}
+	}
+}
+
+struct hostent *unreal_create_hostent(char *name, char *ip)
+{
+struct hostent *he;
+
+	/* Create a hostent structure (I HATE HOSTENTS) and return it.. */
+	he = safe_alloc(sizeof(struct hostent));
+	safe_strdup(he->h_name, name);
+	if (strchr(ip, ':'))
+	{
+		/* IPv6 */
+		he->h_addrtype = AF_INET6;
+		he->h_length = sizeof(struct in6_addr);
+		he->h_addr_list = safe_alloc(sizeof(char *) * 2); /* alocate an array of 2 pointers */
+		he->h_addr_list[0] = safe_alloc(sizeof(struct in6_addr));
+		inet_pton(AF_INET6, ip, he->h_addr_list[0]);
+	} else {
+		he->h_addrtype = AF_INET;
+		he->h_length = sizeof(struct in_addr);
+		he->h_addr_list = safe_alloc(sizeof(char *) * 2); /* alocate an array of 2 pointers */
+		he->h_addr_list[0] = safe_alloc(sizeof(struct in_addr));
+		inet_pton(AF_INET, ip, he->h_addr_list[0]);
+	}
+
+	return he;
+}
+
+void unreal_free_hostent(struct hostent *he)
+{
+	safe_free(he->h_name);
+	safe_free(he->h_addr_list[0]);
+	safe_free(he->h_addr_list);
+	safe_free(he);
+}
+
+static void unrealdns_freeandremovereq(DNSReq *r)
+{
+	if (r->prev)
+		r->prev->next = r->next;
+	else
+		requests = r->next; /* new HEAD */
+	
+	if (r->next)
+		r->next->prev = r->prev;
+
+	safe_free(r->name);
+	safe_free(r);
+}
+
+/** Delete requests for client 'client'.
+ * Actually we DO NOT (and should not) delete them, but simply mark them as 'dead'.
+ */
+void unrealdns_delreq_bycptr(Client *client)
+{
+	DNSReq *r;
+
+	for (r = requests; r; r = r->next)
+		if (r->client == client)
+			r->client = NULL;
+}
+
+void unrealdns_delasyncconnects(void)
+{
+	DNSReq *r;
+
+	for (r = requests; r; r = r->next)
+		if (r->type == DNSREQ_CONNECT)
+			r->linkblock = NULL;
+	
+}
+
+CMD_FUNC(cmd_dns)
+{
+	DNSCache *c;
+	DNSReq *r;
+	char *param;
+
+	if (!ValidatePermissionsForPath("server:dns",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc > 1) && !BadPtr(parv[1]))
+		param = parv[1];
+	else
+		param = "";
+
+	if (*param == 'l') /* LIST CACHE */
+	{
+		sendtxtnumeric(client, "DNS CACHE List (%u items):", unrealdns_num_cache);
+		for (c = cache_list; c; c = c->next)
+			sendtxtnumeric(client, " %s [%s]", c->name, c->ip);
+	} else
+	if (*param == 'r') /* LIST REQUESTS */
+	{
+		sendtxtnumeric(client, "DNS Request List:");
+		for (r = requests; r; r = r->next)
+			sendtxtnumeric(client, " %s", r->client ? r->client->ip : "<client lost>");
+	} else
+	if (*param == 'c') /* CLEAR CACHE */
+	{
+		sendto_realops("%s (%s@%s) cleared the DNS cache list (/QUOTE DNS c)",
+			client->name, client->user->username, client->user->realhost);
+		
+		while (cache_list)
+		{
+			c = cache_list->next;
+			safe_free(cache_list->name);
+			safe_free(cache_list->ip);
+			safe_free(cache_list);
+			cache_list = c;
+		}
+		memset(&cache_hashtbl, 0, sizeof(cache_hashtbl));
+		unrealdns_num_cache = 0;
+		sendnotice(client, "DNS Cache has been cleared");
+	} else
+	if (*param == 'i') /* INFORMATION */
+	{
+		struct ares_options inf;
+		struct ares_addr_node *serverlist = NULL, *ns;
+		int i;
+		int optmask;
+
+		sendtxtnumeric(client, "****** DNS Configuration Information ******");
+		sendtxtnumeric(client, " c-ares version: %s",ares_version(NULL));
+		
+		i = 0;
+		ares_get_servers(resolver_channel, &serverlist);
+		for (ns = serverlist; ns; ns = ns->next)
+		{
+			char ipbuf[128], *ip;
+			i++;
+			
+			ip = inetntop(ns->family, &ns->addr, ipbuf, sizeof(ipbuf));
+			sendtxtnumeric(client, "      server #%d: %s", i, ip ? ip : "<error>");
+		}
+		ares_free_data(serverlist);
+
+		ares_save_options(resolver_channel, &inf, &optmask);
+		if (optmask & ARES_OPT_TIMEOUTMS)
+			sendtxtnumeric(client, "        timeout: %d", inf.timeout);
+		if (optmask & ARES_OPT_TRIES)
+			sendtxtnumeric(client, "          tries: %d", inf.tries);
+		if (optmask & ARES_OPT_DOMAINS)
+		{
+			sendtxtnumeric(client, "   # of search domains: %d", inf.ndomains);
+			for (i = 0; i < inf.ndomains; i++)
+				sendtxtnumeric(client, "      domain #%d: %s", i+1, inf.domains[i]);
+		}
+		sendtxtnumeric(client, "****** End of DNS Configuration Info ******");
+		
+		ares_destroy_options(&inf);
+	} else /* STATISTICS */
+	{
+		sendtxtnumeric(client, "DNS CACHE Stats:");
+		sendtxtnumeric(client, " hits: %d", dnsstats.cache_hits);
+		sendtxtnumeric(client, " misses: %d", dnsstats.cache_misses);
+	}
+	return;
+}
+
+/* Little helper function for dnsbl module.
+ * No we will NOT copy the entire c-ares api, just this one.
+ */
+void unreal_gethostbyname(const char *name, int family, ares_host_callback callback, void *arg)
+{
+	ares_gethostbyname(resolver_channel, name, family, callback, arg);
+}
diff --git a/src/fdlist.c b/src/fdlist.c
new file mode 100644
index 0000000..0d9dc98
--- /dev/null
+++ b/src/fdlist.c
@@ -0,0 +1,199 @@
+/*
+ * UnrealIRCd, src/fdlist.c
+ * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* new FD management code, based on mowgli.eventloop from atheme, hammered into Unreal by
+ * me, nenolod.
+ */
+FDEntry fd_table[MAXCONNECTIONS + 1];
+
+int fd_open(int fd, const char *desc)
+{
+	FDEntry *fde;
+
+	if ((fd < 0) || (fd >= MAXCONNECTIONS))
+	{
+		sendto_realops("[BUG] trying to add fd #%d to fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+		ircd_log(LOG_ERROR, "[BUG] trying to add fd #%d to fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return -1;
+	}
+
+	fde = &fd_table[fd];
+	memset(fde, 0, sizeof(FDEntry));
+
+	fde->fd = fd;
+	fde->is_open = 1;
+	fde->backend_flags = 0;
+	strlcpy(fde->desc, desc, FD_DESC_SZ);
+
+	return fde->fd;
+}
+
+#ifndef _WIN32
+# define OPEN_MODES	S_IRUSR|S_IWUSR
+#else
+# define OPEN_MODES	S_IREAD|S_IWRITE
+#endif
+
+int fd_fileopen(const char *path, unsigned int flags)
+{
+	int fd;
+	char comment[FD_DESC_SZ];
+	char pathbuf[BUFSIZE];
+
+	fd = open(path, flags, OPEN_MODES);
+	if (fd < 0)
+		return -1;
+
+	strlcpy(pathbuf, path, sizeof pathbuf);
+
+	snprintf(comment, sizeof comment, "File: %s", unreal_getfilename(pathbuf));
+
+	return fd_open(fd, comment);
+}
+
+int fd_unmap(int fd)
+{
+	FDEntry *fde;
+	unsigned int befl;
+
+	if ((fd < 0) || (fd >= MAXCONNECTIONS))
+	{
+		sendto_realops("[BUG] trying to close fd #%d in fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+		ircd_log(LOG_ERROR, "[BUG] trying to close fd #%d in fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return 0;
+	}
+
+	fde = &fd_table[fd];
+	if (!fde->is_open)
+	{
+		sendto_realops("[BUG] trying to close fd #%d in fd table, but this FD isn't reported open",
+				fd);
+		ircd_log(LOG_ERROR, "[BUG] trying to close fd #%d in fd table, but this FD isn't reported open",
+				fd);
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return 0;
+	}
+
+	befl = fde->backend_flags;
+	memset(fde, 0, sizeof(FDEntry));
+
+	fde->fd = fd;
+
+	/* only notify the backend if it is actively tracking the FD */
+	if (befl)
+		fd_refresh(fd);
+	
+	return 1;
+}
+
+void fd_close(int fd)
+{
+	if (!fd_unmap(fd))
+		return;
+
+	CLOSE_SOCK(fd);
+}
+
+/* Deregister I/O notification for this file descriptor */
+void fd_unnotify(int fd)
+{
+FDEntry *fde;
+#ifdef DEBUGMODE
+	ircd_log(LOG_ERROR, "fd_unnotify(): fd=%d", fd);
+#endif
+	if ((fd < 0) || (fd >= MAXCONNECTIONS))
+		return;
+	
+	fde = &fd_table[fd];
+	if (!fde || !fde->is_open)
+		return;
+		
+	fde->read_callback = fde->write_callback = NULL;
+	fd_refresh(fd);
+}
+
+int fd_socket(int family, int type, int protocol, const char *desc)
+{
+	int fd;
+
+	fd = socket(family, type, protocol);
+	if (fd < 0)
+		return -1;
+
+	return fd_open(fd, desc);
+}
+
+int fd_accept(int sockfd)
+{
+	const char buf[] = "Incoming connection";
+	int fd;
+
+	fd = accept(sockfd, NULL, NULL);
+	if (fd < 0)
+		return -1;
+
+	return fd_open(fd, buf);
+}
+
+void fd_desc(int fd, const char *desc)
+{
+	FDEntry *fde;
+
+	if ((fd < 0) || (fd >= MAXCONNECTIONS))
+	{
+		sendto_realops("[BUG] trying to modify fd #%d in fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+		ircd_log(LOG_ERROR, "[BUG] trying to modify fd #%d in fd table, but MAXCONNECTIONS is %d",
+				fd, MAXCONNECTIONS);
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return;
+	}
+
+	fde = &fd_table[fd];
+	if (!fde->is_open)
+	{
+		sendto_realops("[BUG] trying to modify fd #%d in fd table, but this FD isn't reported open",
+				fd);
+		ircd_log(LOG_ERROR, "[BUG] trying to modify fd #%d in fd table, but this FD isn't reported open",
+				fd);
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return;
+	}
+
+	strlcpy(fde->desc, desc, FD_DESC_SZ);
+}
+
diff --git a/src/hash.c b/src/hash.c
new file mode 100644
index 0000000..149e2cb
--- /dev/null
+++ b/src/hash.c
@@ -0,0 +1,1026 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, src/hash.c
+ *   Copyright (C) 1991 Darren Reed
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Next #define's, the siphash_raw() and siphash_nocase() functions are based
+ * on the SipHash reference C implementation to which the following applies:
+ * Copyright (c) 2012-2016 Jean-Philippe Aumasson
+ *  <jeanphilippe.aumasson@gmail.com>
+ * Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
+ * Further enhancements were made by:
+ * Copyright (c) 2017 Salvatore Sanfilippo <antirez@gmail.com>
+ * To the extent possible under law, the author(s) have dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty.
+ * You should have received a copy of the CC0 Public Domain Dedication along
+ * with this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ *
+ * In addition to above, Bram Matthys (Syzop), did some minor enhancements,
+ * such as dropping the uint8_t stuff (in UnrealIRCd char is always unsigned)
+ * and getting rid of the length argument.
+ *
+ * The end result are simple functions for API end-users and we encourage
+ * everyone to use these two hash functions everywhere in UnrealIRCd.
+ */
+
+#define ROTL(x, b) (uint64_t)(((x) << (b)) | ((x) >> (64 - (b))))
+
+#define U32TO8_LE(p, v)                                                        \
+    (p)[0] = (char)((v));                                                   \
+    (p)[1] = (char)((v) >> 8);                                              \
+    (p)[2] = (char)((v) >> 16);                                             \
+    (p)[3] = (char)((v) >> 24);
+
+#define U64TO8_LE(p, v)                                                        \
+    U32TO8_LE((p), (uint32_t)((v)));                                           \
+    U32TO8_LE((p) + 4, (uint32_t)((v) >> 32));
+
+#define U8TO64_LE(p)                                                           \
+    (((uint64_t)((p)[0])) | ((uint64_t)((p)[1]) << 8) |                        \
+     ((uint64_t)((p)[2]) << 16) | ((uint64_t)((p)[3]) << 24) |                 \
+     ((uint64_t)((p)[4]) << 32) | ((uint64_t)((p)[5]) << 40) |                 \
+     ((uint64_t)((p)[6]) << 48) | ((uint64_t)((p)[7]) << 56))
+
+#define U8TO64_LE_NOCASE(p)                                                    \
+    (((uint64_t)(tolower((p)[0]))) |                                           \
+     ((uint64_t)(tolower((p)[1])) << 8) |                                      \
+     ((uint64_t)(tolower((p)[2])) << 16) |                                     \
+     ((uint64_t)(tolower((p)[3])) << 24) |                                     \
+     ((uint64_t)(tolower((p)[4])) << 32) |                                              \
+     ((uint64_t)(tolower((p)[5])) << 40) |                                              \
+     ((uint64_t)(tolower((p)[6])) << 48) |                                              \
+     ((uint64_t)(tolower((p)[7])) << 56))
+
+#define SIPROUND                                                               \
+    do {                                                                       \
+        v0 += v1;                                                              \
+        v1 = ROTL(v1, 13);                                                     \
+        v1 ^= v0;                                                              \
+        v0 = ROTL(v0, 32);                                                     \
+        v2 += v3;                                                              \
+        v3 = ROTL(v3, 16);                                                     \
+        v3 ^= v2;                                                              \
+        v0 += v3;                                                              \
+        v3 = ROTL(v3, 21);                                                     \
+        v3 ^= v0;                                                              \
+        v2 += v1;                                                              \
+        v1 = ROTL(v1, 17);                                                     \
+        v1 ^= v2;                                                              \
+        v2 = ROTL(v2, 32);                                                     \
+    } while (0)
+
+/** Generic hash function in UnrealIRCd - raw version.
+ * Note that you probably want siphash() or siphash_nocase() instead.
+ * @param in    The data to hash
+ * @param inlen The length of the data
+ * @param k     The key to use for hashing (SIPHASH_KEY_LENGTH bytes,
+ *              which is actually 16, not NUL terminated)
+ * @returns Hash result as a 64 bit unsigned integer.
+ * @note  The key (k) should be random and must stay the same for
+ *        as long as you use the function for your specific hash table.
+ *        Simply use the following on boot: siphash_generate_key(k);
+ *
+ *        This siphash_raw() version is meant for non-strings,
+ *        such as raw IP address structs and such.
+ */
+uint64_t siphash_raw(const char *in, size_t inlen, const char *k)
+{
+    uint64_t hash;
+    char *out = (char*) &hash;
+    uint64_t v0 = 0x736f6d6570736575ULL;
+    uint64_t v1 = 0x646f72616e646f6dULL;
+    uint64_t v2 = 0x6c7967656e657261ULL;
+    uint64_t v3 = 0x7465646279746573ULL;
+    uint64_t k0 = U8TO64_LE(k);
+    uint64_t k1 = U8TO64_LE(k + 8);
+    uint64_t m;
+    const char *end = in + inlen - (inlen % sizeof(uint64_t));
+    const int left = inlen & 7;
+    uint64_t b = ((uint64_t)inlen) << 56;
+    v3 ^= k1;
+    v2 ^= k0;
+    v1 ^= k1;
+    v0 ^= k0;
+
+    for (; in != end; in += 8) {
+        m = U8TO64_LE(in);
+        v3 ^= m;
+
+        SIPROUND;
+        SIPROUND;
+
+        v0 ^= m;
+    }
+
+    switch (left) {
+    case 7: b |= ((uint64_t)in[6]) << 48; /* fallthrough */
+    case 6: b |= ((uint64_t)in[5]) << 40; /* fallthrough */
+    case 5: b |= ((uint64_t)in[4]) << 32; /* fallthrough */
+    case 4: b |= ((uint64_t)in[3]) << 24; /* fallthrough */
+    case 3: b |= ((uint64_t)in[2]) << 16; /* fallthrough */
+    case 2: b |= ((uint64_t)in[1]) << 8;  /* fallthrough */
+    case 1: b |= ((uint64_t)in[0]); break;
+    case 0: break;
+    }
+
+    v3 ^= b;
+
+    SIPROUND;
+    SIPROUND;
+
+    v0 ^= b;
+    v2 ^= 0xff;
+
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out, b);
+
+    return hash;
+}
+
+/** Generic hash function in UnrealIRCd - case insensitive.
+ * This deals with IRC case-insensitive matches, which is
+ * what you need for things like nicks and channels.
+ * @param str   The string to hash (NUL-terminated)
+ * @param k     The key to use for hashing (SIPHASH_KEY_LENGTH bytes,
+ *              which is actually 16, not NUL terminated)
+ * @returns Hash result as a 64 bit unsigned integer.
+ * @note  The key (k) should be random and must stay the same for
+ *        as long as you use the function for your specific hash table.
+ *        Simply use the following on boot: siphash_generate_key(k);
+ */
+uint64_t siphash_nocase(const char *in, const char *k)
+{
+    uint64_t hash;
+    char *out = (char*) &hash;
+    size_t inlen = strlen(in);
+    uint64_t v0 = 0x736f6d6570736575ULL;
+    uint64_t v1 = 0x646f72616e646f6dULL;
+    uint64_t v2 = 0x6c7967656e657261ULL;
+    uint64_t v3 = 0x7465646279746573ULL;
+    uint64_t k0 = U8TO64_LE(k);
+    uint64_t k1 = U8TO64_LE(k + 8);
+    uint64_t m;
+    const char *end = in + inlen - (inlen % sizeof(uint64_t));
+    const int left = inlen & 7;
+    uint64_t b = ((uint64_t)inlen) << 56;
+    v3 ^= k1;
+    v2 ^= k0;
+    v1 ^= k1;
+    v0 ^= k0;
+
+    for (; in != end; in += 8) {
+        m = U8TO64_LE_NOCASE(in);
+        v3 ^= m;
+
+        SIPROUND;
+        SIPROUND;
+
+        v0 ^= m;
+    }
+
+    switch (left) {
+    case 7: b |= ((uint64_t)tolower(in[6])) << 48; /* fallthrough */
+    case 6: b |= ((uint64_t)tolower(in[5])) << 40; /* fallthrough */
+    case 5: b |= ((uint64_t)tolower(in[4])) << 32; /* fallthrough */
+    case 4: b |= ((uint64_t)tolower(in[3])) << 24; /* fallthrough */
+    case 3: b |= ((uint64_t)tolower(in[2])) << 16; /* fallthrough */
+    case 2: b |= ((uint64_t)tolower(in[1])) << 8;  /* fallthrough */
+    case 1: b |= ((uint64_t)tolower(in[0])); break;
+    case 0: break;
+    }
+
+    v3 ^= b;
+
+    SIPROUND;
+    SIPROUND;
+
+    v0 ^= b;
+    v2 ^= 0xff;
+
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+    SIPROUND;
+
+    b = v0 ^ v1 ^ v2 ^ v3;
+    U64TO8_LE(out, b);
+
+    return hash;
+}
+
+/* End of imported code */
+
+/** Generic hash function in UnrealIRCd.
+ * @param str   The string to hash (NUL-terminated)
+ * @param k     The key to use for hashing (SIPHASH_KEY_LENGTH bytes,
+ *              which is actually 16, not NUL terminated)
+ * @returns Hash result as a 64 bit unsigned integer.
+ * @note  The key (k) should be random and must stay the same for
+ *        as long as you use the function for your specific hash table.
+ *        Simply use the following on boot: siphash_generate_key(k);
+ */
+uint64_t siphash(const char *in, const char *k)
+{
+    size_t inlen = strlen(in);
+
+    return siphash_raw(in, inlen, k);
+}
+/** Generate a key that is used by siphash() and siphash_nocase().
+ * @param k   The key, this must be a char array of size 16.
+ */
+void siphash_generate_key(char *k)
+{
+	int i;
+	for (i = 0; i < 16; i++)
+		k[i] = getrandom8();
+}
+
+static struct list_head clientTable[NICK_HASH_TABLE_SIZE];
+static struct list_head idTable[NICK_HASH_TABLE_SIZE];
+static Channel *channelTable[CHAN_HASH_TABLE_SIZE];
+static Watch *watchTable[WATCH_HASH_TABLE_SIZE];
+
+static char siphashkey_nick[SIPHASH_KEY_LENGTH];
+static char siphashkey_chan[SIPHASH_KEY_LENGTH];
+static char siphashkey_watch[SIPHASH_KEY_LENGTH];
+static char siphashkey_whowas[SIPHASH_KEY_LENGTH];
+static char siphashkey_throttling[SIPHASH_KEY_LENGTH];
+
+extern char unreallogo[];
+
+/** Initialize all hash tables */
+void init_hash(void)
+{
+	int i;
+
+	siphash_generate_key(siphashkey_nick);
+	siphash_generate_key(siphashkey_chan);
+	siphash_generate_key(siphashkey_watch);
+	siphash_generate_key(siphashkey_whowas);
+	siphash_generate_key(siphashkey_throttling);
+
+	for (i = 0; i < NICK_HASH_TABLE_SIZE; i++)
+		INIT_LIST_HEAD(&clientTable[i]);
+
+	for (i = 0; i < NICK_HASH_TABLE_SIZE; i++)
+		INIT_LIST_HEAD(&idTable[i]);
+
+	memset(channelTable, 0, sizeof(channelTable));
+	memset(watchTable, 0, sizeof(watchTable));
+
+	memset(ThrottlingHash, 0, sizeof(ThrottlingHash));
+	/* do not call init_throttling() here, as
+	 * config file has not been read yet.
+	 * The hash table is ready, anyway.
+	 */
+
+	if (strcmp(BASE_VERSION, &unreallogo[337]))
+		loop.tainted = 1;
+}
+
+uint64_t hash_client_name(const char *name)
+{
+	return siphash_nocase(name, siphashkey_nick) % NICK_HASH_TABLE_SIZE;
+}
+
+uint64_t hash_channel_name(const char *name)
+{
+	return siphash_nocase(name, siphashkey_chan) % CHAN_HASH_TABLE_SIZE;
+}
+
+uint64_t hash_watch_nick_name(const char *name)
+{
+	return siphash_nocase(name, siphashkey_watch) % WATCH_HASH_TABLE_SIZE;
+}
+
+uint64_t hash_whowas_name(const char *name)
+{
+	return siphash_nocase(name, siphashkey_whowas) % WHOWAS_HASH_TABLE_SIZE;
+}
+
+/*
+ * add_to_client_hash_table
+ */
+int add_to_client_hash_table(char *name, Client *client)
+{
+	unsigned int hashv;
+	/*
+	 * If you see this, you have probably found your way to why changing the 
+	 * base version made the IRCd become weird. This has been the case in all
+	 * Unreal versions since 3.0. I'm sick of people ripping the IRCd off and 
+	 * just slapping on some random <theirnet> BASE_VERSION while not changing
+	 * a single bit of code. YOU DID NOT WRITE ALL OF THIS THEREFORE YOU DO NOT
+	 * DESERVE TO BE ABLE TO DO THAT. If you found this however, I'm OK with you 
+	 * removing the checks. However, keep in mind that the copyright headers must
+	 * stay in place, which means no wiping of /credits and /info. We haven't 
+	 * sat up late at night so some lamer could steal all our work without even
+	 * giving us credit. Remember to follow all regulations in LICENSE.
+	 * -Stskeeps
+	*/
+	if (loop.tainted)
+		return 0;
+	hashv = hash_client_name(name);
+	list_add(&client->client_hash, &clientTable[hashv]);
+	return 0;
+}
+
+/*
+ * add_to_client_hash_table
+ */
+int add_to_id_hash_table(char *name, Client *client)
+{
+	unsigned int hashv;
+	hashv = hash_client_name(name);
+	list_add(&client->id_hash, &idTable[hashv]);
+	return 0;
+}
+
+/*
+ * add_to_channel_hash_table
+ */
+int add_to_channel_hash_table(char *name, Channel *channel)
+{
+	unsigned int hashv;
+
+	hashv = hash_channel_name(name);
+	channel->hnextch = channelTable[hashv];
+	channelTable[hashv] = channel;
+	return 0;
+}
+/*
+ * del_from_client_hash_table
+ */
+int del_from_client_hash_table(char *name, Client *client)
+{
+	if (!list_empty(&client->client_hash))
+		list_del(&client->client_hash);
+
+	INIT_LIST_HEAD(&client->client_hash);
+
+	return 0;
+}
+
+int del_from_id_hash_table(char *name, Client *client)
+{
+	if (!list_empty(&client->id_hash))
+		list_del(&client->id_hash);
+
+	INIT_LIST_HEAD(&client->id_hash);
+
+	return 0;
+}
+
+/*
+ * del_from_channel_hash_table
+ */
+void del_from_channel_hash_table(char *name, Channel *channel)
+{
+	Channel *tmp, *prev = NULL;
+	unsigned int hashv;
+
+	hashv = hash_channel_name(name);
+	for (tmp = channelTable[hashv]; tmp; tmp = tmp->hnextch)
+	{
+		if (tmp == channel)
+		{
+			if (prev)
+				prev->hnextch = tmp->hnextch;
+			else
+				channelTable[hashv] = tmp->hnextch;
+			tmp->hnextch = NULL;
+			return; /* DONE */
+		}
+		prev = tmp;
+	}
+	return; /* NOTFOUND */
+}
+
+/*
+ * hash_find_client
+ */
+Client *hash_find_client(const char *name, Client *client)
+{
+	Client *tmp;
+	unsigned int hashv;
+
+	hashv = hash_client_name(name);
+	list_for_each_entry(tmp, &clientTable[hashv], client_hash)
+	{
+		if (smycmp(name, tmp->name) == 0)
+			return tmp;
+	}
+
+	return client;
+}
+
+Client *hash_find_id(const char *name, Client *client)
+{
+	Client *tmp;
+	unsigned int hashv;
+
+	hashv = hash_client_name(name);
+	list_for_each_entry(tmp, &idTable[hashv], id_hash)
+	{
+		if (smycmp(name, tmp->id) == 0)
+			return tmp;
+	}
+
+	return client;
+}
+
+/*
+ * hash_find_nickatserver
+ */
+Client *hash_find_nickatserver(const char *str, Client *def)
+{
+	char *serv;
+	char nick[NICKLEN+HOSTLEN+1];
+	Client *client;
+	
+	strlcpy(nick, str, sizeof(nick)); /* let's work on a copy */
+
+	serv = strchr(nick, '@');
+	if (serv)
+		*serv++ = '\0';
+
+	client = find_client(nick, NULL);
+	if (!client)
+		return NULL; /* client not found */
+	
+	if (!serv)
+		return client; /* validated: was just 'nick' and not 'nick@serv' */
+
+	/* Now validate the server portion */
+	if (client->user && !smycmp(serv, client->user->server))
+		return client; /* validated */
+	
+	return def;
+}
+/*
+ * hash_find_server
+ */
+Client *hash_find_server(const char *server, Client *def)
+{
+	Client *tmp;
+	unsigned int hashv;
+
+	hashv = hash_client_name(server);
+	list_for_each_entry(tmp, &clientTable[hashv], client_hash)
+	{
+		if (!IsServer(tmp) && !IsMe(tmp))
+			continue;
+		if (smycmp(server, tmp->name) == 0)
+		{
+			return tmp;
+		}
+	}
+
+	return def;
+}
+
+/** Find a client by name.
+ * @param name        The name to search for (eg: "nick" or "irc.example.net")
+ * @param requester   The client that is searching for this name
+ * @note  If 'requester' is a server or NULL, then we also check
+ *        the ID table, otherwise not.
+ */
+Client *find_client(char *name, Client *requester)
+{
+	if (requester == NULL || IsServer(requester))
+	{
+		Client *client;
+
+		if ((client = hash_find_id(name, NULL)) != NULL)
+			return client;
+	}
+
+	return hash_find_client(name, NULL);
+}
+
+/** Find a server by name.
+ * @param name        The server name to search for (eg: 'irc.example.net'
+ *                    or '001')
+ * @param requester   The client searching for the name.
+ * @note  If 'requester' is a server or NULL, then we also check
+ *        the ID table, otherwise not.
+ */
+Client *find_server(char *name, Client *requester)
+{
+	if (name)
+	{
+		Client *client;
+
+		if ((client = find_client(name, NULL)) != NULL && (IsServer(client) || IsMe(client)))
+			return client;
+	}
+
+	return NULL;
+}
+
+/** Find a person.
+ * @param name        The name to search for (eg: "nick" or "001ABCDEFG")
+ * @param requester   The client that is searching for this name
+ * @note  If 'requester' is a server or NULL, then we also check
+ *        the ID table, otherwise not.
+ */
+Client *find_person(char *name, Client *requester)
+{
+	Client *c2ptr;
+
+	c2ptr = find_client(name, requester);
+
+	if (c2ptr && IsUser(c2ptr) && c2ptr->user)
+		return c2ptr;
+
+	return NULL;
+}
+
+
+/*
+ * hash_find_channel
+ */
+Channel *hash_find_channel(char *name, Channel *channel)
+{
+	unsigned int hashv;
+	Channel *tmp;
+
+	hashv = hash_channel_name(name);
+
+	for (tmp = channelTable[hashv]; tmp; tmp = tmp->hnextch)
+	{
+		if (smycmp(name, tmp->chname) == 0)
+			return tmp;
+	}
+	return channel;
+}
+
+Channel *hash_get_chan_bucket(uint64_t hashv)
+{
+	if (hashv > CHAN_HASH_TABLE_SIZE)
+		return NULL;
+	return channelTable[hashv];
+}
+
+void  count_watch_memory(int *count, u_long *memory)
+{
+	int i = WATCH_HASH_TABLE_SIZE;
+	Watch *anptr;
+
+	while (i--)
+	{
+		anptr = watchTable[i];
+		while (anptr)
+		{
+			(*count)++;
+			(*memory) += sizeof(Watch)+strlen(anptr->nick);
+			anptr = anptr->hnext;
+		}
+	}
+}
+
+/*
+ * add_to_watch_hash_table
+ */
+int add_to_watch_hash_table(char *nick, Client *client, int awaynotify)
+{
+	unsigned int hashv;
+	Watch  *anptr;
+	Link  *lp;
+	
+	
+	/* Get the right bucket... */
+	hashv = hash_watch_nick_name(nick);
+	
+	/* Find the right nick (header) in the bucket, or NULL... */
+	if ((anptr = (Watch *)watchTable[hashv]))
+	  while (anptr && mycmp(anptr->nick, nick))
+		 anptr = anptr->hnext;
+	
+	/* If found NULL (no header for this nick), make one... */
+	if (!anptr) {
+		anptr = (Watch *)safe_alloc(sizeof(Watch)+strlen(nick));
+		anptr->lasttime = timeofday;
+		strcpy(anptr->nick, nick);
+		
+		anptr->watch = NULL;
+		
+		anptr->hnext = watchTable[hashv];
+		watchTable[hashv] = anptr;
+	}
+	/* Is this client already on the watch-list? */
+	if ((lp = anptr->watch))
+	  while (lp && (lp->value.client != client))
+		 lp = lp->next;
+	
+	/* No it isn't, so add it in the bucket and client addint it */
+	if (!lp) {
+		lp = anptr->watch;
+		anptr->watch = make_link();
+		anptr->watch->value.client = client;
+		anptr->watch->flags = awaynotify;
+		anptr->watch->next = lp;
+		
+		lp = make_link();
+		lp->next = client->local->watch;
+		lp->value.wptr = anptr;
+		lp->flags = awaynotify;
+		client->local->watch = lp;
+		client->local->watches++;
+	}
+	
+	return 0;
+}
+
+/*
+ *  hash_check_watch
+ */
+int hash_check_watch(Client *client, int reply)
+{
+	unsigned int hashv;
+	Watch  *anptr;
+	Link  *lp;
+	int awaynotify = 0;
+	
+	if ((reply == RPL_GONEAWAY) || (reply == RPL_NOTAWAY) || (reply == RPL_REAWAY))
+		awaynotify = 1;
+
+	/* Get us the right bucket */
+	hashv = hash_watch_nick_name(client->name);
+	
+	/* Find the right header in this bucket */
+	if ((anptr = (Watch *)watchTable[hashv]))
+	  while (anptr && mycmp(anptr->nick, client->name))
+		 anptr = anptr->hnext;
+	if (!anptr)
+	  return 0;   /* This nick isn't on watch */
+	
+	/* Update the time of last change to item */
+	anptr->lasttime = TStime();
+	
+	/* Send notifies out to everybody on the list in header */
+	for (lp = anptr->watch; lp; lp = lp->next)
+	{
+		if (!awaynotify)
+		{
+			sendnumeric(lp->value.client, reply,
+			    client->name,
+			    (IsUser(client) ? client->user->username : "<N/A>"),
+			    (IsUser(client) ?
+			    (IsHidden(client) ? client->user->virthost : client->
+			    user->realhost) : "<N/A>"), anptr->lasttime, client->info);
+		}
+		else
+		{
+			/* AWAY or UNAWAY */
+			if (!lp->flags)
+				continue; /* skip away/unaway notification for users not interested in them */
+
+			if (reply == RPL_NOTAWAY)
+				sendnumeric(lp->value.client, reply,
+				    client->name,
+				    (IsUser(client) ? client->user->username : "<N/A>"),
+				    (IsUser(client) ?
+				    (IsHidden(client) ? client->user->virthost : client->
+				    user->realhost) : "<N/A>"), client->user->lastaway);
+			else /* RPL_GONEAWAY / RPL_REAWAY */
+				sendnumeric(lp->value.client, reply,
+				    client->name,
+				    (IsUser(client) ? client->user->username : "<N/A>"),
+				    (IsUser(client) ?
+				    (IsHidden(client) ? client->user->virthost : client->
+				    user->realhost) : "<N/A>"), client->user->lastaway, client->user->away);
+		}
+	}
+	
+	return 0;
+}
+
+/*
+ * hash_get_watch
+ */
+Watch  *hash_get_watch(char *nick)
+{
+	unsigned int hashv;
+	Watch  *anptr;
+	
+	hashv = hash_watch_nick_name(nick);
+	
+	if ((anptr = (Watch *)watchTable[hashv]))
+	  while (anptr && mycmp(anptr->nick, nick))
+		 anptr = anptr->hnext;
+	
+	return anptr;
+}
+
+/*
+ * del_from_watch_hash_table
+ */
+int del_from_watch_hash_table(char *nick, Client *client)
+{
+	unsigned int hashv;
+	Watch  *anptr, *nlast = NULL;
+	Link  *lp, *last = NULL;
+
+	/* Get the bucket for this nick... */
+	hashv = hash_watch_nick_name(nick);
+	
+	/* Find the right header, maintaining last-link pointer... */
+	if ((anptr = (Watch *)watchTable[hashv]))
+	  while (anptr && mycmp(anptr->nick, nick)) {
+		  nlast = anptr;
+		  anptr = anptr->hnext;
+	  }
+	if (!anptr)
+	  return 0;   /* No such watch */
+	
+	/* Find this client from the list of notifies... with last-ptr. */
+	if ((lp = anptr->watch))
+	  while (lp && (lp->value.client != client)) {
+		  last = lp;
+		  lp = lp->next;
+	  }
+	if (!lp)
+	  return 0;   /* No such client to watch */
+	
+	/* Fix the linked list under header, then remove the watch entry */
+	if (!last)
+	  anptr->watch = lp->next;
+	else
+	  last->next = lp->next;
+	free_link(lp);
+	
+	/* Do the same regarding the links in client-record... */
+	last = NULL;
+	if ((lp = client->local->watch))
+	  while (lp && (lp->value.wptr != anptr)) {
+		  last = lp;
+		  lp = lp->next;
+	  }
+	
+	/*
+	 * Give error on the odd case... probobly not even neccessary
+	 * No error checking in ircd is unneccessary ;) -Cabal95
+	 */
+	if (!lp)
+	  sendto_ops("WATCH debug error: del_from_watch_hash_table "
+					 "found a watch entry with no client "
+					 "counterpoint processing nick %s on client %p!",
+					 nick, client->user);
+	else {
+		if (!last) /* First one matched */
+		  client->local->watch = lp->next;
+		else
+		  last->next = lp->next;
+		free_link(lp);
+	}
+	/* In case this header is now empty of notices, remove it */
+	if (!anptr->watch) {
+		if (!nlast)
+		  watchTable[hashv] = anptr->hnext;
+		else
+		  nlast->hnext = anptr->hnext;
+		safe_free(anptr);
+	}
+	
+	/* Update count of notifies on nick */
+	client->local->watches--;
+	
+	return 0;
+}
+
+/*
+ * hash_del_watch_list
+ */
+int   hash_del_watch_list(Client *client)
+{
+	unsigned int   hashv;
+	Watch  *anptr;
+	Link  *np, *lp, *last;
+	
+	
+	if (!(np = client->local->watch))
+	  return 0;   /* Nothing to do */
+	
+	client->local->watch = NULL; /* Break the watch-list for client */
+	while (np) {
+		/* Find the watch-record from hash-table... */
+		anptr = np->value.wptr;
+		last = NULL;
+		for (lp = anptr->watch; lp && (lp->value.client != client);
+			  lp = lp->next)
+		  last = lp;
+		
+		/* Not found, another "worst case" debug error */
+		if (!lp)
+		  sendto_ops("WATCH Debug error: hash_del_watch_list "
+						 "found a WATCH entry with no table "
+						 "counterpoint processing client %s!",
+						 client->name);
+		else {
+			/* Fix the watch-list and remove entry */
+			if (!last)
+			  anptr->watch = lp->next;
+			else
+			  last->next = lp->next;
+			free_link(lp);
+			
+			/*
+			 * If this leaves a header without notifies,
+			 * remove it. Need to find the last-pointer!
+			 */
+			if (!anptr->watch) {
+				Watch  *np2, *nl;
+				
+				hashv = hash_watch_nick_name(anptr->nick);
+				
+				nl = NULL;
+				np2 = watchTable[hashv];
+				while (np2 != anptr) {
+					nl = np2;
+					np2 = np2->hnext;
+				}
+				
+				if (nl)
+				  nl->hnext = anptr->hnext;
+				else
+				  watchTable[hashv] = anptr->hnext;
+				safe_free(anptr);
+			}
+		}
+		
+		lp = np; /* Save last pointer processed */
+		np = np->next; /* Jump to the next pointer */
+		free_link(lp); /* Free the previous */
+	}
+	
+	client->local->watches = 0;
+	
+	return 0;
+}
+
+/* Throttling - originally by Stskeeps */
+
+/* Note that we call this set::anti-flood::connect-flood nowadays */
+
+struct MODVAR ThrottlingBucket *ThrottlingHash[THROTTLING_HASH_TABLE_SIZE];
+
+void update_throttling_timer_settings(void)
+{
+	long v;
+	EventInfo eInfo;
+
+	if (!THROTTLING_PERIOD)
+	{
+		v = 120*1000;
+	} else
+	{
+		v = (THROTTLING_PERIOD*1000)/2;
+		if (v > 5000)
+			v = 5000; /* run at least every 5s */
+		if (v < 1000)
+			v = 1000; /* run at max once every 1s */
+	}
+
+	memset(&eInfo, 0, sizeof(eInfo));
+	eInfo.flags = EMOD_EVERY;
+	eInfo.every_msec = v;
+	EventMod(EventFind("throttling_check_expire"), &eInfo);
+}
+
+void init_throttling()
+{
+	EventAdd(NULL, "throttling_check_expire", throttling_check_expire, NULL, 123456, 0);
+	/* Note: the every_ms value (123,456) will be adjusted on boot and rehash
+	 * via the update_throttling_timer_settings() function.
+	 */
+}
+
+uint64_t hash_throttling(char *ip)
+{
+	return siphash(ip, siphashkey_throttling) % THROTTLING_HASH_TABLE_SIZE;
+}
+
+struct ThrottlingBucket *find_throttling_bucket(Client *client)
+{
+	int hash = 0;
+	struct ThrottlingBucket *p;
+	hash = hash_throttling(client->ip);
+	
+	for (p = ThrottlingHash[hash]; p; p = p->next)
+	{
+		if (!strcmp(p->ip, client->ip))
+			return p;
+	}
+	
+	return NULL;
+}
+
+EVENT(throttling_check_expire)
+{
+	struct ThrottlingBucket *n, *n_next;
+	int	i;
+	static time_t t = 0;
+		
+	for (i = 0; i < THROTTLING_HASH_TABLE_SIZE; i++)
+	{
+		for (n = ThrottlingHash[i]; n; n = n_next)
+		{
+			n_next = n->next;
+			if ((TStime() - n->since) > (THROTTLING_PERIOD ? THROTTLING_PERIOD : 15))
+			{
+				DelListItem(n, ThrottlingHash[i]);
+				safe_free(n->ip);
+				safe_free(n);
+			}
+		}
+	}
+
+	if (!t || (TStime() - t > 30))
+	{
+		extern Module *Modules;
+		char *p = serveropts + strlen(serveropts);
+		Module *mi;
+		t = TStime();
+		if (!Hooks[17] && strchr(serveropts, 'm'))
+		{ p = strchr(serveropts, 'm'); *p = '\0'; }
+		if (!Hooks[18] && strchr(serveropts, 'M'))
+		{ p = strchr(serveropts, 'M'); *p = '\0'; }
+		if (!Hooks[49] && !Hooks[51] && strchr(serveropts, 'R'))
+		{ p = strchr(serveropts, 'R'); *p = '\0'; }
+		if (Hooks[17] && !strchr(serveropts, 'm'))
+			*p++ = 'm';
+		if (Hooks[18] && !strchr(serveropts, 'M'))
+			*p++ = 'M';
+		if ((Hooks[49] || Hooks[51]) && !strchr(serveropts, 'R'))
+			*p++ = 'R';
+		*p = '\0';
+		for (mi = Modules; mi; mi = mi->next)
+			if (!(mi->options & MOD_OPT_OFFICIAL))
+				tainted = 99;
+	}
+
+	return;
+}
+
+void add_throttling_bucket(Client *client)
+{
+	int hash;
+	struct ThrottlingBucket *n;
+
+	n = safe_alloc(sizeof(struct ThrottlingBucket));	
+	n->next = n->prev = NULL; 
+	safe_strdup(n->ip, client->ip);
+	n->since = TStime();
+	n->count = 1;
+	hash = hash_throttling(client->ip);
+	AddListItem(n, ThrottlingHash[hash]);
+	return;
+}
+
+/** Checks whether the user is connect-flooding.
+ * @retval 0 Denied, throttled.
+ * @retval 1 Allowed, but known in the list.
+ * @retval 2 Allowed, not in list or is an exception.
+ * @see add_connection()
+ */
+int throttle_can_connect(Client *client)
+{
+	struct ThrottlingBucket *b;
+
+	if (!THROTTLING_PERIOD || !THROTTLING_COUNT)
+		return 2;
+
+	if (!(b = find_throttling_bucket(client)))
+		return 1;
+	else
+	{
+		if (find_tkl_exception(TKL_CONNECT_FLOOD, client))
+			return 2;
+		if (b->count+1 > (THROTTLING_COUNT ? THROTTLING_COUNT : 3))
+			return 0;
+		b->count++;
+		return 2;
+	}
+}
diff --git a/src/ircd.c b/src/ircd.c
new file mode 100644
index 0000000..60fef06
--- /dev/null
+++ b/src/ircd.c
@@ -0,0 +1,1525 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, src/ircd.c
+ *   Copyright (C) 1989-1990 Jarkko Oikarinen and
+ *                 University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#ifdef __FreeBSD__
+char *malloc_options = "h" MALLOC_FLAGS_EXTRA;
+#endif
+
+#ifndef _WIN32
+extern char unreallogo[];
+#endif
+int  SVSNOOP = 0;
+extern MODVAR char *buildid;
+time_t timeofday = 0;
+struct timeval timeofday_tv;
+int  tainted = 0;
+LoopStruct loop;
+MODVAR MemoryInfo StatsZ;
+#ifndef _WIN32
+uid_t irc_uid = 0;
+gid_t irc_gid = 0;
+#endif
+
+MODVAR IRCCounts irccounts;
+MODVAR Client me;			/* That's me */
+MODVAR char *me_hash;
+extern char backupbuf[8192];
+#ifdef _WIN32
+extern SERVICE_STATUS_HANDLE IRCDStatusHandle;
+extern SERVICE_STATUS IRCDStatus;
+#endif
+
+MODVAR unsigned char conf_debuglevel = 0;
+
+#ifdef USE_LIBCURL
+extern void url_init(void);
+#endif
+
+void server_reboot(char *);
+void restart(char *);
+static void open_debugfile(), setup_signals();
+extern void init_glines(void);
+extern void tkl_init(void);
+extern void process_clients(void);
+
+#ifndef _WIN32
+MODVAR char **myargv;
+#else
+LPCSTR cmdLine;
+#endif
+char *configfile = NULL; 	/* Server configuration file */
+int  debuglevel = 0;		/* Server debug level */
+int  bootopt = 0;		/* Server boot option flags */
+char *debugmode = "";		/*  -"-    -"-   -"-  */
+char *sbrk0;			/* initial sbrk(0) */
+static int dorehash = 0, dorestart = 0, doreloadcert = 0;
+MODVAR int  booted = FALSE;
+
+void s_die()
+{
+#ifdef _WIN32
+	Client *client;
+	if (!IsService)
+	{
+		unload_all_modules();
+
+		list_for_each_entry(client, &lclient_list, lclient_node)
+			(void) send_queued(client);
+
+		exit(-1);
+	}
+	else {
+		SERVICE_STATUS status;
+		SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", SERVICE_STOP);
+		ControlService(hService, SERVICE_CONTROL_STOP, &status);
+	}
+#else
+	unload_all_modules();
+	unlink(conf_files ? conf_files->pid_file : IRCD_PIDFILE);
+	exit(-1);
+#endif
+}
+
+#ifndef _WIN32
+static void s_rehash()
+{
+	struct sigaction act;
+	dorehash = 1;
+	act.sa_handler = s_rehash;
+	act.sa_flags = 0;
+	(void)sigemptyset(&act.sa_mask);
+	(void)sigaddset(&act.sa_mask, SIGHUP);
+	(void)sigaction(SIGHUP, &act, NULL);
+}
+
+static void s_reloadcert()
+{
+	struct sigaction act;
+	doreloadcert = 1;
+	act.sa_handler = s_reloadcert;
+	act.sa_flags = 0;
+	(void)sigemptyset(&act.sa_mask);
+	(void)sigaddset(&act.sa_mask, SIGUSR1);
+	(void)sigaction(SIGUSR1, &act, NULL);
+}
+#endif // #ifndef _WIN32
+
+void restart(char *mesg)
+{
+	server_reboot(mesg);
+}
+
+void s_restart()
+{
+	dorestart = 1;
+#if 0
+	static int restarting = 0;
+
+	if (restarting == 0) {
+		/*
+		 * Send (or attempt to) a dying scream to oper if present
+		 */
+
+		restarting = 1;
+		server_reboot("SIGINT");
+	}
+#endif
+}
+
+
+#ifndef _WIN32
+/** Signal handler for signals which we ignore,
+ * like SIGPIPE ("Broken pipe") and SIGWINCH (terminal window changed) etc.
+ */
+void ignore_this_signal()
+{
+	struct sigaction act;
+
+	act.sa_handler = ignore_this_signal;
+	act.sa_flags = 0;
+	(void)sigemptyset(&act.sa_mask);
+	(void)sigaddset(&act.sa_mask, SIGALRM);
+	(void)sigaddset(&act.sa_mask, SIGPIPE);
+	(void)sigaction(SIGALRM, &act, (struct sigaction *)NULL);
+	(void)sigaction(SIGPIPE, &act, (struct sigaction *)NULL);
+#ifdef SIGWINCH
+	(void)sigaddset(&act.sa_mask, SIGWINCH);
+	(void)sigaction(SIGWINCH, &act, (struct sigaction *)NULL);
+#endif
+}
+#endif /* #ifndef _WIN32 */
+
+
+void server_reboot(char *mesg)
+{
+	int i;
+	Client *client;
+	sendto_realops("Aieeeee!!!  Restarting server... %s", mesg);
+	Debug((DEBUG_NOTICE, "Restarting server... %s", mesg));
+
+	list_for_each_entry(client, &lclient_list, lclient_node)
+		(void) send_queued(client);
+
+	/*
+	 * ** fd 0 must be 'preserved' if either the -d or -i options have
+	 * ** been passed to us before restarting.
+	 */
+#ifdef HAVE_SYSLOG
+	(void)closelog();
+#endif
+#ifndef _WIN32
+	for (i = 3; i < MAXCONNECTIONS; i++)
+		(void)close(i);
+	if (!(bootopt & (BOOT_TTY | BOOT_DEBUG)))
+		(void)close(2);
+	(void)close(1);
+	(void)close(0);
+	(void)execv(MYNAME, myargv);
+#else
+	close_connections();
+	if (!IsService)
+	{
+		CleanUp();
+		WinExec(cmdLine, SW_SHOWDEFAULT);
+	}
+#endif
+#ifndef _WIN32
+	Debug((DEBUG_FATAL, "Couldn't restart server: %s", strerror(errno)));
+#else
+	Debug((DEBUG_FATAL, "Couldn't restart server: %s",
+	    strerror(GetLastError())));
+#endif
+	unload_all_modules();
+#ifdef _WIN32
+	if (IsService)
+	{
+		SERVICE_STATUS status;
+		PROCESS_INFORMATION pi;
+		STARTUPINFO si;
+		char fname[MAX_PATH];
+		memset(&status, 0, sizeof(status));
+		memset(&si, 0, sizeof(si));
+		IRCDStatus.dwCurrentState = SERVICE_STOP_PENDING;
+		SetServiceStatus(IRCDStatusHandle, &IRCDStatus);
+		GetModuleFileName(GetModuleHandle(NULL), fname, MAX_PATH);
+		CreateProcess(fname, "restartsvc", NULL, NULL, FALSE,
+			0, NULL, NULL, &si, &pi);
+		IRCDStatus.dwCurrentState = SERVICE_STOPPED;
+		SetServiceStatus(IRCDStatusHandle, &IRCDStatus);
+		ExitProcess(0);
+	}
+	else
+#endif
+	exit(-1);
+}
+
+MODVAR char *areason;
+
+EVENT(loop_event)
+{
+	if (loop.do_garbage_collect == 1) {
+		garbage_collect(NULL);
+	}
+}
+
+EVENT(garbage_collect)
+{
+	extern int freelinks;
+	extern Link *freelink;
+	Link p;
+	int  ii;
+
+	if (loop.do_garbage_collect == 1)
+		sendto_realops("Doing garbage collection ..");
+	if (freelinks > HOW_MANY_FREELINKS_ALLOWED) {
+		ii = freelinks;
+		while (freelink && (freelinks > HOW_MANY_FREELINKS_ALLOWED)) {
+			freelinks--;
+			p.next = freelink;
+			freelink = freelink->next;
+			safe_free(p.next);
+		}
+		if (loop.do_garbage_collect == 1) {
+			loop.do_garbage_collect = 0;
+			sendto_realops
+			    ("Cleaned up %i garbage blocks", (ii - freelinks));
+		}
+	}
+	if (loop.do_garbage_collect == 1)
+		loop.do_garbage_collect = 0;
+}
+
+/*
+** try_connections
+**
+**	Scan through configuration and try new connections.
+**	Returns the calendar time when the next call to this
+**	function should be made latest. (No harm done if this
+**	is called earlier or later...)
+*/
+EVENT(try_connections)
+{
+	ConfigItem_link *aconf;
+	ConfigItem_deny_link *deny;
+	Client *client;
+	int  confrq;
+	ConfigItem_class *class;
+
+	for (aconf = conf_link; aconf; aconf = aconf->next)
+	{
+		/* We're only interested in autoconnect blocks that are valid (and ignore temporary link blocks) */
+		if (!(aconf->outgoing.options & CONNECT_AUTO) || !aconf->outgoing.hostname || (aconf->flag.temporary == 1))
+			continue;
+
+		class = aconf->class;
+
+		/* Only do one connection attempt per <connfreq> seconds (for the same server) */
+		if ((aconf->hold > TStime()))
+			continue;
+		confrq = class->connfreq;
+		aconf->hold = TStime() + confrq;
+
+		client = find_client(aconf->servername, NULL);
+		if (client)
+			continue; /* Server already connected (or connecting) */
+
+		if (class->clients >= class->maxclients)
+			continue; /* Class is full */
+
+		/* Check connect rules to see if we're allowed to try the link */
+		for (deny = conf_deny_link; deny; deny = deny->next)
+			if (match_simple(deny->mask, aconf->servername) && crule_eval(deny->rule))
+				break;
+
+		if (!deny && connect_server(aconf, NULL, NULL) == 0)
+			sendto_realops("Connection to %s[%s] activated.",
+				aconf->servername, aconf->outgoing.hostname);
+
+	}
+}
+
+/** Does this user match any TKL's? */
+int match_tkls(Client *client)
+{
+	ConfigItem_ban *bconf = NULL;
+	char banbuf[1024];
+
+	char killflag = 0;
+
+	/* Process dynamic *LINES */
+	if (find_tkline_match(client, 0))
+		return 1; /* user killed */
+
+	find_shun(client); /* check for shunned and take action, if so */
+
+	if (IsUser(client))
+	{
+		/* Check ban realname { } */
+		if (!ValidatePermissionsForPath("immune",client,NULL,NULL,NULL) && (bconf = find_ban(NULL, client->info, CONF_BAN_REALNAME)))
+			killflag++;
+	}
+
+	/* If user is meant to be killed, take action: */
+	if (killflag)
+	{
+		if (IsUser(client))
+			sendto_realops("Ban active for %s (%s)",
+				get_client_name(client, FALSE),
+				bconf->reason ? bconf->reason : "no reason");
+
+		if (IsServer(client))
+			sendto_realops("Ban active for server %s (%s)",
+				get_client_name(client, FALSE),
+				bconf->reason ? bconf->reason : "no reason");
+
+		if (bconf->reason) {
+			if (IsUser(client))
+				snprintf(banbuf, sizeof(banbuf), "User has been banned (%s)", bconf->reason);
+			else
+				snprintf(banbuf, sizeof(banbuf), "Banned (%s)", bconf->reason);
+			exit_client(client, NULL, banbuf);
+		} else {
+			if (IsUser(client))
+				exit_client(client, NULL, "User has been banned");
+			else
+				exit_client(client, NULL, "Banned");
+		}
+		return 1; /* stop processing this user, as (s)he is dead now. */
+	}
+
+	if (loop.do_bancheck_spamf_user && IsUser(client) && find_spamfilter_user(client, SPAMFLAG_NOWARN))
+		return 1;
+
+	if (loop.do_bancheck_spamf_away && IsUser(client) &&
+	    client->user->away != NULL &&
+	    match_spamfilter(client, client->user->away, SPAMF_AWAY, NULL, SPAMFLAG_NOWARN, NULL))
+	{
+		return 1;
+	}
+
+	return 0;
+}
+
+/** Time out connections that are still in handshake.
+ */
+EVENT(handshake_timeout)
+{
+	Client *client, *next;
+
+	list_for_each_entry_safe(client, next, &unknown_list, lclient_node)
+	{
+		if (client->local->firsttime && ((TStime() - client->local->firsttime) > iConf.handshake_timeout))
+		{
+			if (client->serv && *client->serv->by)
+			{
+				/* If this is a handshake timeout to an outgoing server then notify ops & log it */
+				sendto_ops_and_log("Connection handshake timeout while connecting to server '%s' (%s)",
+					client->name, client->ip?client->ip:"<unknown ip>");
+			}
+
+			exit_client(client, NULL, "Registration Timeout");
+			continue;
+		}
+	}
+}
+
+/** Ping individual user, and check for ping timeout */
+void check_ping(Client *client)
+{
+	char scratch[64];
+	int ping = 0;
+
+	ping = client->local->class ? client->local->class->pingfreq : iConf.handshake_timeout;
+	Debug((DEBUG_DEBUG, "c(%s)=%d p %d a %lld", client->name,
+		client->status, ping,
+		(long long)(TStime() - client->local->lasttime)));
+
+	/* If ping is less than or equal to the last time we received a command from them */
+	if (ping > (TStime() - client->local->lasttime))
+		return; /* some recent command was executed */
+
+	if (
+		/* If we have sent a ping */
+		(IsPingSent(client)
+		/* And they had 2x ping frequency to respond */
+		&& ((TStime() - client->local->lasttime) >= (2 * ping)))
+		||
+		/* Or isn't registered and time spent is larger than ping (CONNECTTIMEOUT).. */
+		(!IsRegistered(client) && (TStime() - client->local->since >= ping))
+		)
+	{
+		if (IsServer(client) || IsConnecting(client) ||
+		    IsHandshake(client) || IsTLSConnectHandshake(client))
+		{
+			sendto_umode_global(UMODE_OPER, "No response from %s, closing link",
+			                    get_client_name(client, FALSE));
+			ircd_log(LOG_ERROR, "No response from %s, closing link",
+			         get_client_name(client, FALSE));
+		}
+		if (IsTLSAcceptHandshake(client))
+			Debug((DEBUG_DEBUG, "ssl accept handshake timeout: %s (%lld-%lld > %lld)", client->local->sockhost,
+				(long long)TStime(), (long long)client->local->since, (long long)ping));
+		ircsnprintf(scratch, sizeof(scratch), "Ping timeout: %lld seconds",
+			(long long) (TStime() - client->local->lasttime));
+		exit_client(client, NULL, scratch);
+		return;
+	}
+	else if (IsRegistered(client) && !IsPingSent(client))
+	{
+		/* Time to send a PING */
+		SetPingSent(client);
+		ClearPingWarning(client);
+		/* not nice but does the job */
+		client->local->lasttime = TStime() - ping;
+		sendto_one(client, NULL, "PING :%s", me.name);
+	}
+	else if (!IsPingWarning(client) && PINGWARNING > 0 &&
+		(IsServer(client) || IsHandshake(client) || IsConnecting(client) ||
+		IsTLSConnectHandshake(client)) &&
+		(TStime() - client->local->lasttime) >= (ping + PINGWARNING))
+	{
+		SetPingWarning(client);
+		sendto_realops("Warning, no response from %s for %d seconds",
+			get_client_name(client, FALSE), PINGWARNING);
+	}
+
+	return;
+}
+
+/*
+ * Check registered connections for PING timeout.
+ * XXX: also does some other stuff still, need to sort this.  --nenolod
+ * Perhaps it would be wise to ping servers as well mr nenolod, just an idea -- Syzop
+ */
+EVENT(check_pings)
+{
+	Client *client, *next;
+
+	list_for_each_entry_safe(client, next, &lclient_list, lclient_node)
+	{
+		/* Check TKLs for this user */
+		if (loop.do_bancheck && match_tkls(client))
+			continue;
+		check_ping(client);
+		/* don't touch 'client' after this as it may have been killed */
+	}
+
+	list_for_each_entry_safe(client, next, &server_list, special_node)
+	{
+		check_ping(client);
+	}
+
+	loop.do_bancheck = loop.do_bancheck_spamf_user = loop.do_bancheck_spamf_away = 0;
+	/* done */
+}
+
+EVENT(check_deadsockets)
+{
+	Client *client, *next;
+
+	list_for_each_entry_safe(client, next, &unknown_list, lclient_node)
+	{
+		/* No need to notify opers here. It's already done when dead socket is set */
+		if (IsDeadSocket(client))
+		{
+#ifdef DEBUGMODE
+			ircd_log(LOG_ERROR, "Closing deadsock: %d/%s", client->local->fd, client->name);
+#endif
+			ClearDeadSocket(client); /* CPR. So we send the error. */
+			exit_client(client, NULL, client->local->error_str ? client->local->error_str : "Dead socket");
+			continue;
+		}
+	}
+
+	list_for_each_entry_safe(client, next, &lclient_list, lclient_node)
+	{
+		/* No need to notify opers here. It's already done when dead socket is set */
+		if (IsDeadSocket(client))
+		{
+#ifdef DEBUGMODE
+			ircd_log(LOG_ERROR, "Closing deadsock: %d/%s", client->local->fd, client->name);
+#endif
+			ClearDeadSocket(client); /* CPR. So we send the error. */
+			exit_client(client, NULL, client->local->error_str ? client->local->error_str : "Dead socket");
+			continue;
+		}
+	}
+
+	/* Next is for clients that are already exited (unlike the above).
+	 * The client is already out of all lists (channels, invites, etc etc)
+	 * and 90% has been freed. Here we actually free the remaining parts.
+	 * We don't have to send anything anymore.
+	 */
+	list_for_each_entry_safe(client, next, &dead_list, client_node)
+	{
+		if (!IsDead(client))
+			abort(); /* impossible */
+#ifdef DEBUGMODE
+		ircd_log(LOG_ERROR, "Closing deadsock2: %s", client->name);
+#endif
+		list_del(&client->client_node);
+		free_client(client);
+	}
+}
+
+/*
+** bad_command
+**	This is called when the commandline is not acceptable.
+**	Give error message and exit without starting anything.
+*/
+static int bad_command(const char *argv0)
+{
+#ifndef _WIN32
+	if (!argv0)
+		argv0 = "unrealircd";
+
+	(void)printf
+	    ("Usage: %s [-f <config>] [-F]\n"
+	     "\n"
+	     "UnrealIRCd\n"
+	     " -f <config>     Load configuration from <config> instead of the default\n"
+	     "                 (%s).\n"
+	     " -F              Don't fork() when starting up. Use this when running\n"
+	     "                 UnrealIRCd under gdb or when playing around with settings\n"
+	     "                 on a non-production setup.\n"
+	     "\n",
+	     argv0, CONFIGFILE);
+	(void)printf("Server not started\n\n");
+#else
+	if (!IsService) {
+		MessageBox(NULL,
+		    "Usage: UnrealIRCd [-f configfile]\n",
+		    "UnrealIRCD/32", MB_OK);
+	}
+#endif
+	return (-1);
+}
+
+char chess[] = {
+	85, 110, 114, 101, 97, 108, 0
+};
+
+static void version_check_logerror(char *fmt, ...)
+{
+va_list va;
+char buf[1024];
+
+	va_start(va, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, va);
+	va_end(va);
+#ifndef _WIN32
+	fprintf(stderr, "[!!!] %s\n", buf);
+#else
+	win_log("[!!!] %s", buf);
+#endif
+}
+
+/** Ugly version checker that ensures ssl/curl runtime libraries match the
+ * version we compiled for.
+ */
+static void do_version_check()
+{
+	const char *compiledfor, *runtime;
+	int error = 0;
+	char *p;
+
+	/* OPENSSL:
+	 * Nowadays (since openssl 1.0.0) they retain binary compatibility
+	 * when the first two version numbers are the same: eg 1.0.0 and 1.0.2
+	 */
+	compiledfor = OPENSSL_VERSION_TEXT;
+	runtime = SSLeay_version(SSLEAY_VERSION);
+	p = strchr(compiledfor, '.');
+	if (p)
+	{
+		p = strchr(p+1, '.');
+		if (p)
+		{
+			int versionlen = p - compiledfor + 1;
+
+			if (strncasecmp(compiledfor, runtime, versionlen))
+			{
+				version_check_logerror("OpenSSL version mismatch: compiled for '%s', library is '%s'",
+					compiledfor, runtime);
+				error=1;
+			}
+		}
+	}
+
+
+#ifdef USE_LIBCURL
+	/* Perhaps someone should tell them to do this a bit more easy ;)
+	 * problem is runtime output is like: 'libcurl/7.11.1 c-ares/1.2.0'
+	 * while header output is like: '7.11.1'.
+	 */
+	{
+		char buf[128], *p;
+
+		runtime = curl_version();
+		compiledfor = LIBCURL_VERSION;
+		if (!strncmp(runtime, "libcurl/", 8))
+		{
+			strlcpy(buf, runtime+8, sizeof(buf));
+			p = strchr(buf, ' ');
+			if (p)
+			{
+				*p = '\0';
+				if (strcmp(compiledfor, buf))
+				{
+					version_check_logerror("Curl version mismatch: compiled for '%s', library is '%s'",
+						compiledfor, buf);
+					error = 1;
+				}
+			}
+		}
+	}
+#endif
+
+	if (error)
+	{
+#ifndef _WIN32
+		version_check_logerror("Header<->library mismatches can make UnrealIRCd *CRASH*! "
+		                "Make sure you don't have multiple versions of openssl installed (eg: "
+		                "one in /usr and one in /usr/local). And, if you recently upgraded them, "
+		                "be sure to recompile UnrealIRCd.");
+#else
+		version_check_logerror("Header<->library mismatches can make UnrealIRCd *CRASH*! "
+		                "This should never happen with official Windows builds... unless "
+		                "you overwrote any .dll files with newer/older ones or something.");
+		win_error();
+#endif
+		tainted = 1;
+	}
+}
+
+extern void applymeblock(void);
+
+extern MODVAR Event *events;
+
+/** This functions resets a couple of timers and does other things that
+ * are absolutely cruicial when the clock is adjusted - particularly
+ * when the clock goes backwards. -- Syzop
+ */
+void fix_timers(void)
+{
+	int i, cnt;
+	Client *client;
+	Event *e;
+	struct ThrottlingBucket *thr;
+	ConfigItem_link *lnk;
+
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (client->local->since > TStime())
+		{
+			Debug((DEBUG_DEBUG, "fix_timers(): %s: client->local->since %ld -> %ld",
+				client->name, client->local->since, TStime()));
+			client->local->since = TStime();
+		}
+		if (client->local->lasttime > TStime())
+		{
+			Debug((DEBUG_DEBUG, "fix_timers(): %s: client->local->lasttime %ld -> %ld",
+				client->name, client->local->lasttime, TStime()));
+			client->local->lasttime = TStime();
+		}
+		if (client->local->last > TStime())
+		{
+			Debug((DEBUG_DEBUG, "fix_timers(): %s: client->local->last %ld -> %ld",
+				client->name, client->local->last, TStime()));
+			client->local->last = TStime();
+		}
+
+		/* users */
+		if (MyUser(client))
+		{
+			if (client->local->nextnick > TStime())
+			{
+				Debug((DEBUG_DEBUG, "fix_timers(): %s: client->local->nextnick %ld -> %ld",
+					client->name, client->local->nextnick, TStime()));
+				client->local->nextnick = TStime();
+			}
+			if (client->local->nexttarget > TStime())
+			{
+				Debug((DEBUG_DEBUG, "fix_timers(): %s: client->local->nexttarget %ld -> %ld",
+					client->name, client->local->nexttarget, TStime()));
+				client->local->nexttarget = TStime();
+			}
+
+		}
+	}
+
+	/* Reset all event timers */
+	for (e = events; e; e = e->next)
+	{
+		if (e->last_run.tv_sec > TStime())
+		{
+			e->last_run.tv_sec = TStime()-1;
+			e->last_run.tv_usec = 0;
+		}
+	}
+
+	/* For throttling we only have to deal with time jumping backward, which
+	 * is a real problem as if the jump was, say, 900 seconds, then it would
+	 * (potentially) throttle for 900 seconds.
+	 * Time going forward is "no problem", it just means we expire our entries
+	 * sonner than we should.
+	 */
+	cnt = 0;
+	for (i = 0; i < THROTTLING_HASH_TABLE_SIZE; i++)
+	{
+		for (thr = ThrottlingHash[i]; thr; thr = thr->next)
+		{
+			if (thr->since > TStime())
+				thr->since = TStime();
+		}
+	}
+	Debug((DEBUG_DEBUG, "fix_timers(): removed %d throttling item(s)", cnt));
+
+	/* Make sure autoconnect for servers still works (lnk->hold) */
+	for (lnk = conf_link; lnk; lnk = lnk->next)
+	{
+		int t = lnk->class ? lnk->class->connfreq : 90;
+
+		if (lnk->hold > TStime() + t)
+		{
+			lnk->hold = TStime() + (t / 2); /* compromise */
+			Debug((DEBUG_DEBUG, "fix_timers(): link '%s' hold-time adjusted to %ld", lnk->servername, lnk->hold));
+		}
+	}
+}
+
+
+#ifndef _WIN32
+static void generate_cloakkeys()
+{
+	/* Generate 3 cloak keys */
+#define GENERATE_CLOAKKEY_MINLEN 50
+#define GENERATE_CLOAKKEY_MAXLEN 60 /* Length of cloak keys to generate. */
+	char keyBuf[GENERATE_CLOAKKEY_MAXLEN + 1];
+	int keyNum;
+	int keyLen;
+	int charIndex;
+
+	short has_upper;
+	short has_lower;
+	short has_num;
+
+	fprintf(stderr, "Here are 3 random cloak keys:\n");
+
+	for (keyNum = 0; keyNum < 3; ++keyNum)
+	{
+		has_upper = 0;
+		has_lower = 0;
+		has_num = 0;
+
+		keyLen = (getrandom8() % (GENERATE_CLOAKKEY_MAXLEN - GENERATE_CLOAKKEY_MINLEN + 1)) + GENERATE_CLOAKKEY_MINLEN;
+		for (charIndex = 0; charIndex < keyLen; ++charIndex)
+		{
+			switch (getrandom8() % 3)
+			{
+				case 0: /* Uppercase. */
+					keyBuf[charIndex] = (char)('A' + (getrandom8() % ('Z' - 'A')));
+					has_upper = 1;
+					break;
+				case 1: /* Lowercase. */
+					keyBuf[charIndex] = (char)('a' + (getrandom8() % ('z' - 'a')));
+					has_lower = 1;
+					break;
+				case 2: /* Digit. */
+					keyBuf[charIndex] = (char)('0' + (getrandom8() % ('9' - '0')));
+					has_num = 1;
+					break;
+			}
+		}
+		keyBuf[keyLen] = '\0';
+
+		if (has_upper && has_lower && has_num)
+			(void)fprintf(stderr, "%s\n", keyBuf);
+		else
+			/* Try again. For this reason, keyNum must be signed. */
+			keyNum--;
+	}
+}
+#endif
+
+/* MY tdiff... because 'double' sucks.
+ * This should work until 2038, and very likely after that as well
+ * because 'long' should be 64 bit on all systems by then... -- Syzop
+ */
+#define mytdiff(a, b)   ((long)a - (long)b)
+
+#define NEGATIVE_SHIFT_WARN	-15
+#define POSITIVE_SHIFT_WARN	20
+
+void detect_timeshift_and_warn(void)
+{
+	static time_t highesttimeofday=0, oldtimeofday=0, lasthighwarn=0;
+
+	if (oldtimeofday == 0)
+		oldtimeofday = timeofday; /* pretend everything is ok the first time.. */
+
+	if (mytdiff(timeofday, oldtimeofday) < NEGATIVE_SHIFT_WARN) {
+		/* tdiff = # of seconds of time set backwards (positive number! eg: 60) */
+		time_t tdiff = oldtimeofday - timeofday;
+		ircd_log(LOG_ERROR, "WARNING: Time running backwards! Clock set back ~%lld seconds (%lld -> %lld)",
+			(long long)tdiff, (long long)oldtimeofday, (long long)timeofday);
+		ircd_log(LOG_ERROR, "[TimeShift] Resetting a few timers to prevent IRCd freeze!");
+		sendto_realops("WARNING: Time running backwards! Clock set back ~%lld seconds (%lld -> %lld)",
+			(long long)tdiff, (long long)oldtimeofday, (long long)timeofday);
+		sendto_realops("Incorrect time for IRC servers is a serious problem. "
+			       "Time being set backwards (system clock changed) is "
+			       "even more serious and can cause clients to freeze, channels to be "
+			       "taken over, and other issues.");
+		sendto_realops("Please be sure your clock is always synchronized before "
+			       "the IRCd is started!");
+		sendto_realops("[TimeShift] Resetting a few timers to prevent IRCd freeze!");
+		fix_timers();
+	} else
+	if (mytdiff(timeofday, oldtimeofday) > POSITIVE_SHIFT_WARN) /* do not set too low or you get false positives */
+	{
+		/* tdiff = # of seconds of time set forward (eg: 60) */
+		time_t tdiff = timeofday - oldtimeofday;
+		ircd_log(LOG_ERROR, "WARNING: Time jumped ~%lld seconds ahead! (%lld -> %lld)",
+			(long long)tdiff, (long long)oldtimeofday, (long long)timeofday);
+		ircd_log(LOG_ERROR, "[TimeShift] Resetting some timers!");
+		sendto_realops("WARNING: Time jumped ~%lld seconds ahead! (%lld -> %lld)",
+			(long long)tdiff, (long long)oldtimeofday, (long long)timeofday);
+		sendto_realops("Incorrect time for IRC servers is a serious problem. "
+			       "Time being adjusted (by changing the system clock) "
+			       "more than a few seconds forward/backward can lead to serious issues.");
+		sendto_realops("Please be sure your clock is always synchronized before "
+			       "the IRCd is started!");
+		sendto_realops("[TimeShift] Resetting some timers!");
+		fix_timers();
+	}
+
+	if (highesttimeofday+NEGATIVE_SHIFT_WARN > timeofday)
+	{
+		if (lasthighwarn > timeofday)
+			lasthighwarn = timeofday;
+		if (timeofday - lasthighwarn > 300)
+		{
+			ircd_log(LOG_ERROR, "[TimeShift] The (IRCd) clock was set backwards. "
+				"Waiting for time to be OK again. This will be in %lld seconds",
+				(long long)(highesttimeofday - timeofday));
+			sendto_realops("[TimeShift] The (IRCd) clock was set backwards. Timers, nick- "
+				       "and channel-timestamps are possibly incorrect. This message will "
+				       "repeat itself until we catch up with the original time, which will be "
+				       "in %lld seconds", (long long)(highesttimeofday - timeofday));
+			lasthighwarn = timeofday;
+		}
+	} else {
+		highesttimeofday = timeofday;
+	}
+
+	oldtimeofday = timeofday;
+}
+
+/** Check if at least 'minimum' seconds passed by since last run.
+ * @param tv_old   Pointer to a timeval struct to keep track of things.
+ * @param minimum  The time specified in milliseconds (eg: 1000 for 1 second)
+ * @returns When 'minimum' msec passed 1 is returned and the time is reset, otherwise 0 is returned.
+ */
+int minimum_msec_since_last_run(struct timeval *tv_old, long minimum)
+{
+	long v;
+
+	if (tv_old->tv_sec == 0)
+	{
+		/* First call ever */
+		tv_old->tv_sec = timeofday_tv.tv_sec;
+		tv_old->tv_usec = timeofday_tv.tv_usec;
+		return 0;
+	}
+	v = ((timeofday_tv.tv_sec - tv_old->tv_sec) * 1000) + ((timeofday_tv.tv_usec - tv_old->tv_usec)/1000);
+	if (v >= minimum)
+	{
+		tv_old->tv_sec = timeofday_tv.tv_sec;
+		tv_old->tv_usec = timeofday_tv.tv_usec;
+		return 1;
+	}
+	return 0;
+}
+
+/** The main function. This will call SocketLoop() once the server is ready. */
+#ifndef _WIN32
+int main(int argc, char *argv[])
+#else
+int InitUnrealIRCd(int argc, char *argv[])
+#endif
+{
+#ifdef _WIN32
+	WORD wVersionRequested = MAKEWORD(1, 1);
+	WSADATA wsaData;
+#else
+	uid_t uid, euid;
+	gid_t gid, egid;
+#endif
+#ifdef HAVE_PSTAT
+	union pstun pstats;
+#endif
+#ifndef _WIN32
+	struct rlimit corelim;
+#endif
+
+	gettimeofday(&timeofday_tv, NULL);
+	timeofday = timeofday_tv.tv_sec;
+
+	safe_strdup(configfile, CONFIGFILE);
+
+	init_random(); /* needs to be done very early!! */
+
+	memset(&botmotd, '\0', sizeof(MOTDFile));
+	memset(&rules, '\0', sizeof(MOTDFile));
+	memset(&opermotd, '\0', sizeof(MOTDFile));
+	memset(&motd, '\0', sizeof(MOTDFile));
+	memset(&smotd, '\0', sizeof(MOTDFile));
+	memset(&svsmotd, '\0', sizeof(MOTDFile));
+	memset(&me, 0, sizeof(me));
+	me.local = safe_alloc(sizeof(LocalClient));
+	memset(&loop, 0, sizeof(loop));
+
+	init_hash();
+
+	SetupEvents();
+
+#ifdef _WIN32
+	CreateMutex(NULL, FALSE, "UnrealMutex");
+	SetErrorMode(SEM_FAILCRITICALERRORS);
+#endif
+#if !defined(_WIN32) && !defined(_AMIGA)
+	sbrk0 = (char *)sbrk((size_t)0);
+	uid = getuid();
+	euid = geteuid();
+	gid = getgid();
+	egid = getegid();
+
+	if (euid == 0)
+	{
+		fprintf(stderr,
+			"** ERROR **\n"
+			"You attempted to run UnrealIRCd as root. This is VERY DANGEROUS\n"
+			"as any compromise of your UnrealIRCd will result in full\n"
+			"privileges to the attacker on the entire machine.\n"
+			"You MUST start UnrealIRCd as a different user!\n"
+			"\n"
+			"For more information, see:\n"
+			"https://www.unrealircd.org/docs/Do_not_run_as_root\n"
+			"\n");
+		exit(1);
+	}
+#endif
+#ifndef _WIN32
+	myargv = argv;
+#else
+	cmdLine = GetCommandLine();
+#endif
+#ifndef _WIN32
+	(void)umask(077);	/* better safe than sorry --SRB */
+#else
+	WSAStartup(wVersionRequested, &wsaData);
+#endif
+	memset(&StatsZ, 0, sizeof(StatsZ));
+	setup_signals();
+
+	memset(&irccounts, '\0', sizeof(irccounts));
+	irccounts.servers = 1;
+
+	mp_pool_init();
+	dbuf_init();
+	initlists();
+
+#ifdef USE_LIBCURL
+	url_init();
+#endif
+	tkl_init();
+	umode_init();
+	extcmode_init();
+	efunctions_init();
+	clear_scache_hash_table();
+#ifndef _WIN32
+	/* Make it so we can dump core */
+	corelim.rlim_cur = corelim.rlim_max = RLIM_INFINITY;
+	setrlimit(RLIMIT_CORE, &corelim);
+#endif
+	/*
+	 * ** All command line parameters have the syntax "-fstring"
+	 * ** or "-f string" (e.g. the space is optional). String may
+	 * ** be empty. Flag characters cannot be concatenated (like
+	 * ** "-fxyz"), it would conflict with the form "-fstring".
+	 */
+	while (--argc > 0 && (*++argv)[0] == '-') {
+		char *p = argv[0] + 1;
+		int  flag = *p++;
+		if (flag == '\0' || *p == '\0') {
+			if (argc > 1 && argv[1][0] != '-') {
+				p = *++argv;
+				argc -= 1;
+			} else
+				p = "";
+		}
+		switch (flag)
+		{
+			case 'F':
+				bootopt |= BOOT_NOFORK;
+				break;
+			case 'f':
+#ifndef _WIN32
+				if ((uid != euid) || (gid != egid))
+				{
+					printf("ERROR: Command line config with a setuid/setgid ircd is not allowed");
+					exit(1);
+				}
+#endif
+				safe_strdup(configfile, p);
+				convert_to_absolute_path(&configfile, CONFDIR);
+				break;
+#ifndef _WIN32
+		  case 'P':{
+			  short type;
+			  char *result;
+			  srandom(TStime());
+			  type = Auth_FindType(NULL, p);
+			  if (type == -1)
+			  {
+			      type = AUTHTYPE_ARGON2;
+			  } else {
+			      p = *++argv;
+			      argc--;
+			  }
+			  if (BadPtr(p))
+			  {
+#ifndef _WIN32
+			      p = getpass("Enter password to hash: ");
+#else
+				  printf("ERROR: You should specify a password to hash");
+				  exit(1);
+#endif
+			  }
+			  if ((type == AUTHTYPE_UNIXCRYPT) && (strlen(p) > 8))
+			  {
+			      /* Hmmm.. is this warning really still true (and always) ?? */
+			      printf("WARNING: Password truncated to 8 characters due to 'crypt' algorithm. "
+		                 "You are suggested to use the 'argon2' algorithm instead.");
+				  p[8] = '\0';
+			  }
+			  if (!(result = Auth_Hash(type, p))) {
+				  printf("Failed to generate password. Deprecated method? Try 'argon2' instead.\n");
+				  exit(0);
+			  }
+			  printf("Encrypted password is: %s\n", result);
+			  exit(0);
+		  }
+#endif
+#if 0
+		case 'S':
+			charsys_dump_table(p ? p : "*");
+			exit(0);
+#endif
+#ifndef _WIN32
+		  case 't':
+			  bootopt |= BOOT_TTY;
+			  break;
+		  case 'v':
+			  (void)printf("%s build %s\n", version, buildid);
+#else
+		  case 'v':
+			  if (!IsService) {
+				  MessageBox(NULL, version,
+				      "UnrealIRCD/Win32 version", MB_OK);
+			  }
+#endif
+			  exit(0);
+		  case 'C':
+			  config_verbose = atoi(p);
+			  break;
+		  case 'c':
+			  loop.config_test = 1;
+			  break;
+		  case 'x':
+#ifdef	DEBUGMODE
+			  debuglevel = atoi(p);
+			  debugmode = *p ? p : "0";
+			  bootopt |= BOOT_DEBUG;
+			  break;
+#else
+# ifndef _WIN32
+			  (void)fprintf(stderr,
+			      "%s: DEBUGMODE must be defined for -x y\n",
+			      myargv[0]);
+# else
+			  if (!IsService) {
+				  MessageBox(NULL,
+				      "DEBUGMODE must be defined for -x option",
+				      "UnrealIRCD/32", MB_OK);
+			  }
+# endif
+			  exit(0);
+#endif
+#ifndef _WIN32
+		  case 'k':
+			  generate_cloakkeys();
+			  exit(0);
+#endif
+		  case 'U':
+		      if (chdir(CONFDIR) < 0)
+	{
+		      	fprintf(stderr, "Unable to change to '%s' directory\n", CONFDIR);
+		      	exit(1);
+		      }
+		      update_conf();
+		      exit(0);
+		  case 'R':
+		      report_crash();
+		      exit(0);
+#ifndef _WIN32
+		  case 'm':
+		      modulemanager(argc, argv);
+		      exit(0);
+#endif
+		  case '8':
+		      utf8_test();
+		      exit(0);
+		  case 'L':
+		      loop.boot_function = link_generator;
+		      break;
+		  default:
+#ifndef _WIN32
+			  return bad_command(myargv[0]);
+#else
+			  return bad_command(NULL);
+#endif
+			  break;
+		}
+	}
+
+	do_version_check();
+
+#if !defined(_WIN32)
+#ifndef _WIN32
+	mkdir(TMPDIR, S_IRUSR|S_IWUSR|S_IXUSR); /* Create the tmp dir, if it doesn't exist */
+ 	mkdir(CACHEDIR, S_IRUSR|S_IWUSR|S_IXUSR); /* Create the cache dir, if it doesn't exist */
+#else
+	mkdir(TMPDIR);
+	mkdir(CACHEDIR);
+#endif
+	if (chdir(TMPDIR)) {
+# ifndef _WIN32
+		perror("chdir");
+		fprintf(stderr, "ERROR: Unable to change to directory '%s'\n", TMPDIR);
+# else
+		if (!IsService) {
+			MessageBox(NULL, strerror(GetLastError()),
+			    "UnrealIRCD/32: chdir()", MB_OK);
+		}
+# endif
+		exit(-1);
+	}
+#endif
+#ifndef _WIN32
+	/*
+	 * didn't set debuglevel
+	 */
+	/*
+	 * but asked for debugging output to tty
+	 */
+	if ((debuglevel < 0) && (bootopt & BOOT_TTY)) {
+		(void)fprintf(stderr,
+		    "you specified -t without -x. use -x <n>\n");
+		exit(-1);
+	}
+#endif
+
+	/* HACK! This ifndef should be removed when the restart-on-w32-brings-up-dialog bug
+	 * is fixed. This is just an ugly "ignore the invalid parameter" thing ;). -- Syzop
+	 */
+#ifndef _WIN32
+	if (argc > 0)
+		return bad_command(myargv[0]);	/* This should exit out */
+#endif
+#ifndef _WIN32
+	fprintf(stderr, "%s", unreallogo);
+	fprintf(stderr, "                           v%s\n\n", VERSIONONLY);
+	fprintf(stderr, "UnrealIRCd is brought to you by Bram Matthys (Syzop), Gottem and i\n\n");
+
+	fprintf(stderr, "Using the following libraries:\n");
+	fprintf(stderr, "* %s\n", pcre2_version());
+	fprintf(stderr, "* %s\n", SSLeay_version(SSLEAY_VERSION));
+#ifdef USE_LIBCURL
+	fprintf(stderr, "* %s\n", curl_version());
+#endif
+#endif
+	check_user_limit();
+#ifndef _WIN32
+	fprintf(stderr, "\n");
+	fprintf(stderr, "This server can handle %d concurrent sockets (%d clients + %d reserve)\n\n",
+		maxclients+CLIENTS_RESERVE, maxclients, CLIENTS_RESERVE);
+#endif
+	init_CommandHash();
+	initwhowas();
+	initstats();
+	if (!loop.config_test)
+		DeleteTempModules();
+	booted = FALSE;
+#if !defined(_WIN32) && !defined(_AMIGA) && !defined(OSXTIGER) && DEFAULT_PERMISSIONS != 0
+	/* Hack to stop people from being able to read the config file */
+	(void)chmod(CPATH, DEFAULT_PERMISSIONS);
+#endif
+	init_dynconf();
+	early_init_ssl();
+	/*
+	 * Add default class
+	 */
+	default_class = safe_alloc(sizeof(ConfigItem_class));
+	default_class->flag.permanent = 1;
+	default_class->pingfreq = 120;
+	default_class->maxclients = 100;
+	default_class->sendq = DEFAULT_RECVQ;
+	default_class->name = "default";
+	AddListItem(default_class, conf_class);
+	if (init_conf(configfile, 0) < 0)
+	{
+		exit(-1);
+	}
+	booted = TRUE;
+	load_tunefile();
+	make_umodestr();
+	SetListening(&me);
+	me.local->fd = -1;
+	SetMe(&me);
+	make_server(&me);
+	extcmodes_check_for_changes();
+	umodes_check_for_changes();
+	charsys_check_for_changes();
+	clicap_init();
+	if (!find_command_simple("PRIVMSG"))
+	{
+		config_error("Someone forgot to load modules with proper commands in them. READ THE DOCUMENTATION");
+		exit(-4);
+	}
+
+#ifndef _WIN32
+	fprintf(stderr, "Initializing TLS..\n");
+#endif
+	if (!init_ssl())
+	{
+		config_error("Failed to load SSL/TLS (see errors above). UnrealIRCd can not start.");
+#ifdef _WIN32
+		win_error(); /* display error dialog box */
+#endif
+		exit(9);
+	}
+	if (loop.config_test)
+	{
+		ircd_log(LOG_ERROR, "Configuration test passed OK");
+		fflush(stderr);
+		exit(0);
+	}
+	if (loop.boot_function)
+		loop.boot_function();
+#ifndef _WIN32
+	fprintf(stderr, "Dynamic configuration initialized.. booting IRCd.\n");
+#endif
+	open_debugfile();
+	me.local->port = 6667; /* pointless? */
+	init_sys();
+	applymeblock();
+#ifdef HAVE_SYSLOG
+	openlog("ircd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
+#endif
+	run_configuration();
+	ircd_log(LOG_ERROR, "UnrealIRCd started.");
+
+	read_motd(conf_files->botmotd_file, &botmotd);
+	read_motd(conf_files->rules_file, &rules);
+	read_motd(conf_files->opermotd_file, &opermotd);
+	read_motd(conf_files->motd_file, &motd);
+	read_motd(conf_files->smotd_file, &smotd);
+	read_motd(conf_files->svsmotd_file, &svsmotd);
+
+	me.hopcount = 0;
+	me.local->authfd = -1;
+	me.user = NULL;
+	me.direction = &me;
+
+	/*
+	 * This listener will never go away
+	 */
+	me_hash = find_or_add(me.name);
+	me.serv->up = me_hash;
+	timeofday = time(NULL);
+	me.local->lasttime = me.local->since = me.local->firsttime = me.serv->boottime = TStime();
+	me.serv->features.protocol = UnrealProtocol;
+	safe_strdup(me.serv->features.software, version);
+	add_to_client_hash_table(me.name, &me);
+	add_to_id_hash_table(me.id, &me);
+	list_add(&me.client_node, &global_server_list);
+#if !defined(_AMIGA) && !defined(_WIN32) && !defined(NO_FORKING)
+	if (!(bootopt & BOOT_NOFORK))
+	{
+		pid_t p;
+		p = fork();
+		if (p < 0)
+		{
+			fprintf(stderr, "Could not create background job. Call to fork() failed: %s\n",
+				strerror(errno));
+			exit(-1);
+		}
+		if (p > 0)
+		{
+			/* Background job created and we are the parent. We can terminate. */
+			exit(0);
+		}
+		/* Background process (child) continues below... */
+		close_std_descriptors();
+		fd_fork();
+		loop.ircd_forked = 1;
+	}
+#endif
+#ifdef _WIN32
+	loop.ircd_forked = 1;
+#endif
+
+	fix_timers();
+	write_pidfile();
+	Debug((DEBUG_NOTICE, "Server ready..."));
+	init_throttling();
+	loop.ircd_booted = 1;
+#if defined(HAVE_SETPROCTITLE)
+	setproctitle("%s", me.name);
+#elif defined(HAVE_PSTAT)
+	pstats.pst_command = me.name;
+	pstat(PSTAT_SETCMD, pstats, strlen(me.name), 0, 0);
+#elif defined(HAVE_PSSTRINGS)
+	PS_STRINGS->ps_nargvstr = 1;
+	PS_STRINGS->ps_argvstr = me.name;
+#endif
+	module_loadall();
+
+#ifndef _WIN32
+	SocketLoop(NULL);
+#endif
+	return 1;
+}
+
+/** The main loop that the server will run all the time.
+ * On Windows this is a thread, on *NIX we simply jump here from main()
+ * when the server is ready.
+ */
+void SocketLoop(void *dummy)
+{
+	struct timeval doevents_tv, process_clients_tv;
+
+	memset(&doevents_tv, 0, sizeof(doevents_tv));
+	memset(&process_clients_tv, 0, sizeof(process_clients_tv));
+
+	while (1)
+	{
+		gettimeofday(&timeofday_tv, NULL);
+		timeofday = timeofday_tv.tv_sec;
+
+		detect_timeshift_and_warn();
+
+		if (minimum_msec_since_last_run(&doevents_tv, 250))
+			DoEvents();
+
+		/* Update statistics */
+		if (irccounts.clients > irccounts.global_max)
+			irccounts.global_max = irccounts.clients;
+		if (irccounts.me_clients > irccounts.me_max)
+			irccounts.me_max = irccounts.me_clients;
+
+		/* Process I/O */
+		fd_select(SOCKETLOOP_MAX_DELAY);
+
+		if (minimum_msec_since_last_run(&process_clients_tv, 200))
+			process_clients();
+
+		/* Check if there are pending "actions".
+		 * These are actions that should be done outside of
+		 * process_clients() and fd_select() when we are not
+		 * processing any clients.
+		 */
+		if (dorehash)
+		{
+			(void)rehash(&me, 1);
+			dorehash = 0;
+		}
+		if (dorestart)
+		{
+			server_reboot("SIGINT");
+		}
+		if (doreloadcert)
+		{
+			reinit_ssl(NULL);
+			doreloadcert = 0;
+		}
+	}
+}
+
+/*
+ * open_debugfile
+ *
+ * If the -t option is not given on the command line when the server is
+ * started, all debugging output is sent to the file set by LPATH in config.h
+ * If the debuglevel is not set from the command line by -x, use /dev/null
+ * as the dummy logfile as long as DEBUGMODE has been defined, else don't
+ * waste the fd.
+ */
+static void open_debugfile(void)
+{
+#ifdef	DEBUGMODE
+	int  fd;
+	Client *client;
+	if (debuglevel >= 0) {
+		client = make_client(NULL, NULL);
+		client->local->fd = 2;
+		SetLog(client);
+		client->local->port = debuglevel;
+		client->flags = 0;
+
+		strlcpy(client->local->sockhost, me.local->sockhost, sizeof client->local->sockhost);
+# ifndef _WIN32
+		/*(void)printf("isatty = %d ttyname = %#x\n",
+		    isatty(2), (u_int)ttyname(2)); */
+		if (!(bootopt & BOOT_TTY)) {	/* leave debugging output on fd 2 */
+			if (truncate(LOGFILE, 0) < 0)
+				fprintf(stderr, "WARNING: could not truncate log file '%s'\n", LOGFILE);
+			if ((fd = open(LOGFILE, O_WRONLY | O_CREAT, 0600)) < 0)
+				if ((fd = open("/dev/null", O_WRONLY)) < 0)
+					exit(-1);
+
+#if 1
+			client->local->fd = fd;
+			debugfd = fd;
+#else
+			/* if (fd != 2) {
+				(void)dup2(fd, 2);
+				(void)close(fd);
+			} -- hands off stderr! */
+#endif
+			strlcpy(client->name, LOGFILE, sizeof(client->name));
+		} else if (isatty(2) && ttyname(2))
+			strlcpy(client->name, ttyname(2), sizeof(client->name));
+		else
+# endif
+			strlcpy(client->name, "FD2-Pipe", sizeof(client->name));
+		Debug((DEBUG_FATAL,
+		    "Debug: File <%s> Level: %d at %s", client->name,
+		    client->local->port, myctime(time(NULL))));
+	}
+#endif
+}
+
+static void setup_signals()
+{
+#ifndef _WIN32
+	struct sigaction act;
+	act.sa_handler = SIG_IGN;
+	act.sa_flags = 0;
+	(void)sigemptyset(&act.sa_mask);
+	(void)sigaddset(&act.sa_mask, SIGPIPE);
+	(void)sigaddset(&act.sa_mask, SIGALRM);
+#ifdef SIGWINCH
+	(void)sigaddset(&act.sa_mask, SIGWINCH);
+	(void)sigaction(SIGWINCH, &act, NULL);
+#endif
+	(void)sigaction(SIGPIPE, &act, NULL);
+	act.sa_handler = ignore_this_signal;
+	(void)sigaction(SIGALRM, &act, NULL);
+	act.sa_handler = s_rehash;
+	(void)sigemptyset(&act.sa_mask);
+	(void)sigaddset(&act.sa_mask, SIGHUP);
+	(void)sigaction(SIGHUP, &act, NULL);
+	act.sa_handler = s_restart;
+	(void)sigaddset(&act.sa_mask, SIGINT);
+	(void)sigaction(SIGINT, &act, NULL);
+	act.sa_handler = s_die;
+	(void)sigaddset(&act.sa_mask, SIGTERM);
+	(void)sigaction(SIGTERM, &act, NULL);
+	act.sa_handler = s_reloadcert;
+	(void)sigemptyset(&act.sa_mask);
+	(void)sigaddset(&act.sa_mask, SIGUSR1);
+	(void)sigaction(SIGUSR1, &act, NULL);
+#endif
+}
diff --git a/src/ircsprintf.c b/src/ircsprintf.c
new file mode 100644
index 0000000..14c36cd
--- /dev/null
+++ b/src/ircsprintf.c
@@ -0,0 +1,215 @@
+/*
+ * Unreal Internet Relay Chat Daemon, src/ircsprintf.c
+ *
+ * (C) Copyright 2013
+ *
+ * Author: Falcon Darkstar Momot based upon earlier code by Carlo Wood in 1997:
+ * 1024/624ACAD5 1997/01/26 Carlo Wood, Run on IRC <carlo@runaway.xs4all.nl>
+ * Key fingerprint = 32 EC A7 B6 AC DB 65 A6  F6 F6 55 DD 1C DC FF 61
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Id$
+ */
+#include "ircsprintf.h"
+#include <stdio.h>
+
+/** Optimized version of vsnprintf() for us.
+ * ircvsnprintf is optimized for the formats: %s, %c, %d, %i, %u, %lu and %lld.
+ * If you only use these format string types then this function is significantly
+ * faster than regular vsnprintf().
+ * When it encounters any other format type or things like padding, precision,
+ * etc. then it will resort to calling vsnprintf(), so no problem.
+ */
+char *ircvsnprintf(char *str, size_t size, const char *format, va_list vl)
+{
+	char *str_begin = str;
+	char c;
+	const char *end = str+size-1; /* for comparison, not dereferencing.  It is the last position a null can go. */
+	char scratch_buffer[32]; /* large enough for 64 bit integer as a string */
+
+	if (!size) return str;
+
+	while (str!=end && (c = *format++))
+	{
+		if (c == '%')
+		{
+			c = *format++;
+			if (c == 's')
+			{
+				/* %s - string */
+				const char *p1 = va_arg(vl, const char *);
+				while (str!=end && *p1) *str++ = *p1++;
+				continue;
+			}
+			else if (c == 'c')
+			{
+				/* %c - single character */
+				*str++ = (char)va_arg(vl, int);
+				continue;
+			}
+			else if (c == 'd' || c == 'i')
+			{
+				/* %d and %i - integer */
+				char *t;
+				int v = va_arg(vl, int);
+				int i = 0;
+				size_t len;
+				if (v<0)
+				{
+					v*=-1;
+					*str++ = '-';
+					if (str==end) break;
+				}
+				if (v==0)
+				{
+					*str++ = '0';
+					continue;
+				}
+
+				t = scratch_buffer + sizeof(scratch_buffer);
+				while (v)
+				{
+					*--t = (v%10) + '0';
+					v/=10;
+				}
+
+				len = sizeof(scratch_buffer)-(t-scratch_buffer);
+				if ((str+len)>end) break;
+				for (i = 0; i < len; i++)
+					*str++=t[i];
+				continue;
+			}
+			else if (c == 'l')
+			{
+				if (format[0] == 'l' && format[1] == 'd')
+				{
+					/* %lld - long long */
+					char *t;
+					long long v = va_arg(vl, long long);
+					int i = 0;
+					size_t len;
+
+					format += 2;
+					if (v<0)
+					{
+						v*=-1;
+						*str++ = '-';
+						if (str==end) break;
+					}
+					if (v==0)
+					{
+						*str++ = '0';
+						continue;
+					}
+
+					t = scratch_buffer + sizeof(scratch_buffer);
+					while (v)
+					{
+						*--t = (v%10) + '0';
+						v/=10;
+					}
+
+					len = sizeof(scratch_buffer)-(t-scratch_buffer);
+					if ((str+len)>end) break;
+					for (i = 0; i < len; i++)
+						*str++=t[i];
+					continue;
+				}
+				if (*format == 'u')
+				{
+					/* %lu - unsigned long */
+					char *t;
+					unsigned long v = va_arg(vl, unsigned long);
+					int i = 0;
+					size_t len;
+
+					format++;
+					if (v==0)
+					{
+						*str++ = '0';
+						continue;
+					}
+
+					t = scratch_buffer + sizeof(scratch_buffer);
+					while (v)
+					{
+						*--t = (v%10) + '0';
+						v/=10;
+					}
+
+					len = sizeof(scratch_buffer)-(t-scratch_buffer);
+					if ((str+len)>end) break;
+					for (i = 0; i < len; i++)
+						*str++=t[i];
+					continue;
+				}
+			}
+			else if (c == 'u')
+			{
+				/* %u - unsigned integer */
+				char *t;
+				unsigned int v = va_arg(vl, unsigned int);
+				int i = 0;
+				size_t len;
+				if (v==0)
+				{
+					*str++ = '0';
+					continue;
+				}
+
+				t = scratch_buffer + sizeof(scratch_buffer);
+				while (v)
+				{
+					*--t = (v%10) + '0';
+					v/=10;
+				}
+
+				len = sizeof(scratch_buffer)-(t-scratch_buffer);
+				if ((str+len)>end) break;
+				for (i = 0; i < len; i++)
+					*str++=t[i];
+				continue;
+			}
+			else if (c == '%')
+			{
+				/* %% - literal percent character */
+				*str++ = '%';
+				continue;
+			}
+			else if (!c)
+				break; /* A % at the end of the format string (illegal, skipped) */
+			
+			/* The default case, when we cannot handle the % format:
+			 * Stop what we are doing and pass control to the real vsnprintf()
+			 */
+			format -= 2;
+			vsnprintf(str, (size_t)(end-str+1), format, vl);
+			return str_begin;
+		}
+		*str++ = c;
+	}
+	*str = 0;
+	return str_begin;
+}
+
+char *ircsnprintf(char *str, size_t size, const char *format, ...) {
+	va_list vl;
+	char *ret;
+	va_start(vl, format);
+	ret = ircvsnprintf(str, size, format, vl);
+	va_end(vl);
+	return ret;
+}
diff --git a/src/list.c b/src/list.c
new file mode 100644
index 0000000..25a0209
--- /dev/null
+++ b/src/list.c
@@ -0,0 +1,569 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat, src/list.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Finland
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+void free_link(Link *);
+Link *make_link();
+
+ID_Copyright
+    ("(C) 1988 University of Oulu, Computing Center and Jarkko Oikarinen");
+ID_Notes("2.24 4/20/94");
+
+#ifdef	DEBUGMODE
+static struct liststats {
+	int  inuse;
+} cloc, crem, users, servs, links;
+
+#endif
+
+MODVAR int  flinks = 0;
+MODVAR int  freelinks = 0;
+MODVAR Link *freelink = NULL;
+MODVAR Member *freemember = NULL;
+MODVAR Membership *freemembership = NULL;
+MODVAR int  numclients = 0;
+
+// TODO: Document whether servers are included or excluded in these lists...
+
+MODVAR struct list_head unknown_list;		/**< Local clients in handshake (may become a user or server later) */
+MODVAR struct list_head lclient_list;		/**< Local clients (users only, right?) */
+MODVAR struct list_head client_list;		/**< All clients - local and remote (not in handshake) */
+MODVAR struct list_head server_list;		/**< Locally connected servers */
+MODVAR struct list_head oper_list;		/**< Locally connected IRC Operators */
+MODVAR struct list_head global_server_list;	/**< All servers (local and remote) */
+MODVAR struct list_head dead_list;		/**< All dead clients (local and remote) that will soon be freed in the main loop */
+
+static mp_pool_t *client_pool = NULL;
+static mp_pool_t *local_client_pool = NULL;
+static mp_pool_t *user_pool = NULL;
+static mp_pool_t *link_pool = NULL;
+
+void initlists(void)
+{
+#ifdef	DEBUGMODE
+	memset(&cloc, 0, sizeof(cloc));
+	memset(&crem, 0, sizeof(crem));
+	memset(&users, 0, sizeof(users));
+	memset(&servs, 0, sizeof(servs));
+	memset(&links, 0, sizeof(links));
+#endif
+
+	INIT_LIST_HEAD(&client_list);
+	INIT_LIST_HEAD(&lclient_list);
+	INIT_LIST_HEAD(&server_list);
+	INIT_LIST_HEAD(&oper_list);
+	INIT_LIST_HEAD(&unknown_list);
+	INIT_LIST_HEAD(&global_server_list);
+	INIT_LIST_HEAD(&dead_list);
+
+	client_pool = mp_pool_new(sizeof(Client), 512 * 1024);
+	local_client_pool = mp_pool_new(sizeof(LocalClient), 512 * 1024);
+	user_pool = mp_pool_new(sizeof(ClientUser), 512 * 1024);
+	link_pool = mp_pool_new(sizeof(Link), 512 * 1024);
+}
+
+/*
+** Create a new Client structure and set it to initial state.
+**
+**	from == NULL,	create local client (a client connected
+**			to a socket).
+**
+**	from,	create remote client (behind a socket
+**			associated with the client defined by
+**			'from'). ('from' is a local client!!).
+*/
+Client *make_client(Client *from, Client *servr)
+{
+	Client *client = mp_pool_get(client_pool);
+	memset(client, 0, sizeof(Client));
+
+#ifdef	DEBUGMODE
+	if (!from)
+		cloc.inuse++;
+	else
+		crem.inuse++;
+#endif
+
+	/* Note: all fields are already NULL/0, no need to set here */
+	client->direction = from ? from : client;	/* 'from' of local client is self! */
+	client->srvptr = servr;
+	client->status = CLIENT_STATUS_UNKNOWN;
+
+	INIT_LIST_HEAD(&client->client_node);
+	INIT_LIST_HEAD(&client->client_hash);
+	INIT_LIST_HEAD(&client->id_hash);
+
+	strcpy(client->ident, "unknown");
+	if (!from)
+	{
+		/* Local client */
+		const char *id;
+		
+		client->local = mp_pool_get(local_client_pool);
+		memset(client->local, 0, sizeof(LocalClient));
+		
+		INIT_LIST_HEAD(&client->lclient_node);
+		INIT_LIST_HEAD(&client->special_node);
+
+		client->local->since = client->local->lasttime =
+		client->lastnick = client->local->firsttime =
+		client->local->last = TStime();
+		client->local->class = NULL;
+		client->local->passwd = NULL;
+		client->local->sockhost[0] = '\0';
+		client->local->authfd = -1;
+		client->local->fd = -1;
+
+		dbuf_queue_init(&client->local->recvQ);
+		dbuf_queue_init(&client->local->sendQ);
+
+		while (hash_find_id((id = uid_get()), NULL) != NULL)
+			;
+		strlcpy(client->id, id, sizeof client->id);
+		add_to_id_hash_table(client->id, client);
+	}
+	return client;
+}
+
+void free_client(Client *client)
+{
+	if (!list_empty(&client->client_node))
+		list_del(&client->client_node);
+
+	if (MyConnect(client))
+	{
+		if (!list_empty(&client->lclient_node))
+			list_del(&client->lclient_node);
+		if (!list_empty(&client->special_node))
+			list_del(&client->special_node);
+
+		RunHook(HOOKTYPE_FREE_CLIENT, client);
+		if (client->local)
+		{
+			safe_free(client->local->passwd);
+			safe_free(client->local->error_str);
+			if (client->local->hostp)
+				unreal_free_hostent(client->local->hostp);
+			
+			mp_pool_release(client->local);
+		}
+		if (*client->id)
+		{
+			/* This is already del'd in exit_one_client, so we
+			 * only have it here in case a shortcut was taken,
+			 * such as from add_connection() to free_client().
+			 */
+			del_from_id_hash_table(client->id, client);
+		}
+	}
+	
+	safe_free(client->ip);
+
+	mp_pool_release(client);
+}
+
+/*
+** 'make_user' add's an User information block to a client
+** if it was not previously allocated.
+*/
+ClientUser *make_user(Client *client)
+{
+	ClientUser *user;
+
+	user = client->user;
+	if (!user)
+	{
+		user = mp_pool_get(user_pool);
+		memset(user, 0, sizeof(ClientUser));
+
+#ifdef	DEBUGMODE
+		users.inuse++;
+#endif
+		user->swhois = NULL;
+		user->away = NULL;
+		user->flood.away_t = 0;
+		user->flood.away_c = 0;
+		user->joined = 0;
+		user->channel = NULL;
+		user->invited = NULL;
+		user->server = NULL;
+		strlcpy(user->svid, "0", sizeof(user->svid));
+		user->whowas = NULL;
+		user->snomask = 0;
+		if (client->ip)
+		{
+			/* initially set client->user->realhost to IP */
+			strlcpy(user->realhost, client->ip, sizeof(user->realhost));
+		} else {
+			*user->realhost = '\0';
+		}
+		user->virthost = NULL;
+		client->user = user;		
+	}
+	return user;
+}
+
+Server *make_server(Client *client)
+{
+	Server *serv = client->serv;
+
+	if (!serv)
+	{
+		serv = safe_alloc(sizeof(Server));
+#ifdef	DEBUGMODE
+		servs.inuse++;
+#endif
+		*serv->by = '\0';
+		serv->users = 0;
+		serv->up = NULL;
+		client->serv = serv;
+	}
+	if (strlen(client->id) > 3)
+	{
+		/* Probably the auto-generated UID for a server that
+		 * still uses the old protocol (without SID).
+		 */
+		del_from_id_hash_table(client->id, client);
+		*client->id = '\0';
+	}
+	if (MyConnect(client) && (client->local->fd >= 0))
+	{
+		/* Give servers a large socket buffer for performance */
+		set_socket_buffers(client->local->fd, SERVER_SOCKET_RECEIVE_BUFFER, SERVER_SOCKET_SEND_BUFFER);
+	}
+	return client->serv;
+}
+
+/*
+** free_user
+**	Decrease user reference count by one and realease block,
+**	if count reaches 0
+*/
+void free_user(Client *client)
+{
+	RunHook(HOOKTYPE_FREE_USER, client);
+	safe_free(client->user->away);
+	if (client->user->swhois)
+	{
+		SWhois *s, *s_next;
+		for (s = client->user->swhois; s; s = s_next)
+		{
+			s_next = s->next;
+			safe_free(s->line);
+			safe_free(s->setby);
+			safe_free(s);
+		}
+		client->user->swhois = NULL;
+	}
+	safe_free(client->user->virthost);
+	safe_free(client->user->operlogin);
+	mp_pool_release(client->user);
+#ifdef	DEBUGMODE
+	users.inuse--;
+#endif
+	client->user = NULL;
+}
+
+/*
+ * taken the code from ExitOneClient() for this and placed it here.
+ * - avalon
+ */
+void remove_client_from_list(Client *client)
+{
+	list_del(&client->client_node);
+	if (MyConnect(client))
+	{
+		if (!list_empty(&client->lclient_node))
+			list_del(&client->lclient_node);
+		if (!list_empty(&client->special_node))
+			list_del(&client->special_node);
+	}
+	if (IsServer(client))
+	{
+		irccounts.servers--;
+	}
+	if (IsUser(client))
+	{
+		if (IsInvisible(client))
+		{
+			irccounts.invisible--;
+		}
+		if (IsOper(client) && !IsHideOper(client))
+		{
+			irccounts.operators--;
+			VERIFY_OPERCOUNT(client, "rmvlist");
+		}
+		irccounts.clients--;
+		if (client->srvptr && client->srvptr->serv)
+			client->srvptr->serv->users--;
+	}
+	if (IsUnknown(client) || IsConnecting(client) || IsHandshake(client)
+		|| IsTLSHandshake(client)
+	)
+		irccounts.unknown--;
+
+	if (IsUser(client))	/* Only persons can have been added before */
+	{
+		add_history(client, 0);
+		off_history(client);	/* Remove all pointers to client */
+	}
+	
+	if (client->user)
+		free_user(client);
+	if (client->serv)
+	{
+		safe_free(client->serv->features.usermodes);
+		safe_free(client->serv->features.chanmodes[0]);
+		safe_free(client->serv->features.chanmodes[1]);
+		safe_free(client->serv->features.chanmodes[2]);
+		safe_free(client->serv->features.chanmodes[3]);
+		safe_free(client->serv->features.software);
+		safe_free(client->serv->features.nickchars);
+		safe_free(client->serv);
+#ifdef	DEBUGMODE
+		servs.inuse--;
+#endif
+	}
+#ifdef	DEBUGMODE
+	if (client->local && client->local->fd == -2)
+		cloc.inuse--;
+	else
+		crem.inuse--;
+#endif
+	if (!list_empty(&client->client_node))
+		abort();
+	if (!list_empty(&client->client_hash))
+		abort();
+	if (!list_empty(&client->id_hash))
+		abort();
+	numclients--;
+	/* Add to killed clients list */
+	list_add(&client->client_node, &dead_list);
+	// THIS IS NOW DONE IN THE MAINLOOP --> free_client(client);
+	SetDead(client);
+	SetDeadSocket(client);
+	return;
+}
+
+/*
+ * although only a small routine, it appears in a number of places
+ * as a collection of a few lines...functions like this *should* be
+ * in this file, shouldnt they ?  after all, this is list.c, isnt it ?
+ * -avalon
+ */
+void add_client_to_list(Client *client)
+{
+	list_add(&client->client_node, &client_list);
+}
+
+/** Make a new link entry.
+ * @note  When you no longer need it, call free_link()
+ *        NEVER call free() or safe_free() on it.
+ */
+Link *make_link(void)
+{
+	Link *l = mp_pool_get(link_pool);
+	memset(l, 0, sizeof(Link));
+#ifdef	DEBUGMODE
+	links.inuse++;
+#endif
+	return l;
+}
+
+/** Releases a link that was previously created with make_link() */
+void free_link(Link *lp)
+{
+	mp_pool_release(lp);
+
+#ifdef	DEBUGMODE
+	links.inuse--;
+#endif
+}
+
+Ban *make_ban(void)
+{
+	Ban *lp;
+
+	lp = safe_alloc(sizeof(Ban));
+#ifdef	DEBUGMODE
+	links.inuse++;
+#endif
+	return lp;
+}
+
+void free_ban(Ban *lp)
+{
+	safe_free(lp);
+#ifdef	DEBUGMODE
+	links.inuse--;
+#endif
+}
+
+void add_ListItem(ListStruct *item, ListStruct **list)
+{
+	item->next = *list;
+	item->prev = NULL;
+	if (*list)
+		(*list)->prev = item;
+	*list = item;
+}
+
+/* (note that if you end up using this, you should probably
+ *  use a circular linked list instead)
+ */
+void append_ListItem(ListStruct *item, ListStruct **list)
+{
+	ListStruct *l;
+
+	if (!*list)
+	{
+		*list = item;
+		return;
+	}
+
+	for (l = *list; l->next; l = l->next);
+	l->next = item;
+	item->prev = l;
+}
+
+void del_ListItem(ListStruct *item, ListStruct **list)
+{
+	if (!item)
+		return;
+
+	if (item->prev)
+		item->prev->next = item->next;
+	if (item->next)
+		item->next->prev = item->prev;
+	if (*list == item)
+		*list = item->next; /* new head */
+}
+
+/** Add item to list with a 'priority'.
+ * If there are multiple items with the same priority then it will be
+ * added as the last item within.
+ */
+void add_ListItemPrio(ListStructPrio *new, ListStructPrio **list, int priority)
+{
+	ListStructPrio *x, *last = NULL;
+	
+	if (!*list)
+	{
+		/* We are the only item. Easy. */
+		*list = new;
+		return;
+	}
+	
+	for (x = *list; x; x = x->next)
+	{
+		last = x;
+		if (x->priority >= priority)
+			break;
+	}
+
+	if (x)
+	{
+		if (x->prev)
+		{
+			/* We will insert ourselves just before this item */
+			new->prev = x->prev;
+			new->next = x;
+			x->prev->next = new;
+			x->prev = new;
+		} else {
+			/* We are the new head */
+			*list = new;
+			new->next = x;
+			x->prev = new;
+		}
+	} else
+	{
+		/* We are the last item */
+		last->next = new;
+		new->prev = last;
+	}
+}
+
+/* NameList functions */
+
+void _add_name_list(NameList **list, char *name)
+{
+	NameList *e = safe_alloc(sizeof(NameList)+strlen(name));
+	strcpy(e->name, name); /* safe, allocated above */
+	AddListItem(e, *list);
+}
+
+void _free_entire_name_list(NameList *n)
+{
+	NameList *n_next;
+
+	for (; n; n = n_next)
+	{
+		n_next = n->next;
+		safe_free(n);
+	}
+}
+
+void _del_name_list(NameList **list, char *name)
+{
+	NameList *e = find_name_list(*list, name);
+	if (e)
+	{
+		DelListItem(e, *list);
+		safe_free(e);
+		return;
+	}
+}
+
+/** Find an entry in a NameList - case insensitive comparisson.
+ * @ingroup ListFunctions
+ */
+NameList *find_name_list(NameList *list, char *name)
+{
+	NameList *e;
+
+	for (e = list; e; e = e->next)
+	{
+		if (!strcasecmp(e->name, name))
+		{
+			return e;
+		}
+	}
+	return NULL;
+}
+
+/** Find an entry in a NameList by running match_simpl() on it.
+ * @ingroup ListFunctions
+ */
+NameList *find_name_list_match(NameList *list, char *name)
+{
+	NameList *e;
+
+	for (e = list; e; e = e->next)
+	{
+		if (match_simple(e->name, name))
+		{
+			return e;
+		}
+	}
+	return NULL;
+}
+
diff --git a/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj b/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj
new file mode 100644
index 0000000..0dd9a06
--- /dev/null
+++ b/src/macosx/UnrealIRCd.xcodeproj/project.pbxproj
@@ -0,0 +1,463 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		1F101A741B59EF2F00FE6A5B /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F101A721B59EF2F00FE6A5B /* logo.png */; };
+		1F101A751B59EF2F00FE6A5B /* logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F101A731B59EF2F00FE6A5B /* logo@2x.png */; };
+		1F1E10F61B5A43CD00D69F41 /* DaemonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1E10F51B5A43CD00D69F41 /* DaemonModel.swift */; };
+		1F1E10F81B5A43D800D69F41 /* ConfigurationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1E10F71B5A43D800D69F41 /* ConfigurationModel.swift */; };
+		1F1E10FA1B5A43EE00D69F41 /* AppModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F1E10F91B5A43EE00D69F41 /* AppModel.swift */; };
+		1F67373F1B5B93CC00C213D8 /* ChangeNotifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F67373E1B5B93CC00C213D8 /* ChangeNotifier.swift */; };
+		1FE784F51B3DF0DD006CB6DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE784F41B3DF0DD006CB6DD /* AppDelegate.swift */; };
+		1FE784F71B3DF0DD006CB6DD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE784F61B3DF0DD006CB6DD /* ViewController.swift */; };
+		1FE784F91B3DF0DD006CB6DD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1FE784F81B3DF0DD006CB6DD /* Images.xcassets */; };
+		1FE784FC1B3DF0DD006CB6DD /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1FE784FA1B3DF0DD006CB6DD /* Main.storyboard */; };
+		1FE785081B3DF0DD006CB6DD /* UnrealIRCdTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE785071B3DF0DD006CB6DD /* UnrealIRCdTests.swift */; };
+		1FFB26B51B5BABFF00FF2D71 /* WindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FFB26B41B5BABFF00FF2D71 /* WindowController.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXContainerItemProxy section */
+		1FE785021B3DF0DD006CB6DD /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = 1FE784E71B3DF0DD006CB6DD /* Project object */;
+			proxyType = 1;
+			remoteGlobalIDString = 1FE784EE1B3DF0DD006CB6DD;
+			remoteInfo = UnrealIRCd;
+		};
+/* End PBXContainerItemProxy section */
+
+/* Begin PBXFileReference section */
+		1F101A721B59EF2F00FE6A5B /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
+		1F101A731B59EF2F00FE6A5B /* logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo@2x.png"; sourceTree = "<group>"; };
+		1F1E10F51B5A43CD00D69F41 /* DaemonModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DaemonModel.swift; sourceTree = "<group>"; };
+		1F1E10F71B5A43D800D69F41 /* ConfigurationModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigurationModel.swift; sourceTree = "<group>"; };
+		1F1E10F91B5A43EE00D69F41 /* AppModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppModel.swift; sourceTree = "<group>"; };
+		1F67373E1B5B93CC00C213D8 /* ChangeNotifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ChangeNotifier.swift; sourceTree = "<group>"; };
+		1FE784EF1B3DF0DD006CB6DD /* UnrealIRCd.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UnrealIRCd.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		1FE784F31B3DF0DD006CB6DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		1FE784F41B3DF0DD006CB6DD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		1FE784F61B3DF0DD006CB6DD /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
+		1FE784F81B3DF0DD006CB6DD /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
+		1FE784FB1B3DF0DD006CB6DD /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
+		1FE785011B3DF0DD006CB6DD /* UnrealIRCdTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = UnrealIRCdTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
+		1FE785061B3DF0DD006CB6DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		1FE785071B3DF0DD006CB6DD /* UnrealIRCdTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnrealIRCdTests.swift; sourceTree = "<group>"; };
+		1FFB26B41B5BABFF00FF2D71 /* WindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WindowController.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		1FE784EC1B3DF0DD006CB6DD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		1FE784FE1B3DF0DD006CB6DD /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		1FE784E61B3DF0DD006CB6DD = {
+			isa = PBXGroup;
+			children = (
+				1FE784F11B3DF0DD006CB6DD /* UnrealIRCd */,
+				1FE785041B3DF0DD006CB6DD /* UnrealIRCdTests */,
+				1FE784F01B3DF0DD006CB6DD /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		1FE784F01B3DF0DD006CB6DD /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				1FE784EF1B3DF0DD006CB6DD /* UnrealIRCd.app */,
+				1FE785011B3DF0DD006CB6DD /* UnrealIRCdTests.xctest */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		1FE784F11B3DF0DD006CB6DD /* UnrealIRCd */ = {
+			isa = PBXGroup;
+			children = (
+				1FE784F41B3DF0DD006CB6DD /* AppDelegate.swift */,
+				1FE784F61B3DF0DD006CB6DD /* ViewController.swift */,
+				1FE784F81B3DF0DD006CB6DD /* Images.xcassets */,
+				1FE784FA1B3DF0DD006CB6DD /* Main.storyboard */,
+				1FE784F21B3DF0DD006CB6DD /* Supporting Files */,
+				1F1E10F51B5A43CD00D69F41 /* DaemonModel.swift */,
+				1F1E10F71B5A43D800D69F41 /* ConfigurationModel.swift */,
+				1F1E10F91B5A43EE00D69F41 /* AppModel.swift */,
+				1F67373E1B5B93CC00C213D8 /* ChangeNotifier.swift */,
+				1FFB26B41B5BABFF00FF2D71 /* WindowController.swift */,
+			);
+			path = UnrealIRCd;
+			sourceTree = "<group>";
+		};
+		1FE784F21B3DF0DD006CB6DD /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				1F101A721B59EF2F00FE6A5B /* logo.png */,
+				1F101A731B59EF2F00FE6A5B /* logo@2x.png */,
+				1FE784F31B3DF0DD006CB6DD /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		1FE785041B3DF0DD006CB6DD /* UnrealIRCdTests */ = {
+			isa = PBXGroup;
+			children = (
+				1FE785071B3DF0DD006CB6DD /* UnrealIRCdTests.swift */,
+				1FE785051B3DF0DD006CB6DD /* Supporting Files */,
+			);
+			path = UnrealIRCdTests;
+			sourceTree = "<group>";
+		};
+		1FE785051B3DF0DD006CB6DD /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				1FE785061B3DF0DD006CB6DD /* Info.plist */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		1FE784EE1B3DF0DD006CB6DD /* UnrealIRCd */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1FE7850B1B3DF0DD006CB6DD /* Build configuration list for PBXNativeTarget "UnrealIRCd" */;
+			buildPhases = (
+				1FE784EB1B3DF0DD006CB6DD /* Sources */,
+				1FE784EC1B3DF0DD006CB6DD /* Frameworks */,
+				1FE784ED1B3DF0DD006CB6DD /* Resources */,
+				1F91FBDA1B58D9EB00A60151 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = UnrealIRCd;
+			productName = UnrealIRCd;
+			productReference = 1FE784EF1B3DF0DD006CB6DD /* UnrealIRCd.app */;
+			productType = "com.apple.product-type.application";
+		};
+		1FE785001B3DF0DD006CB6DD /* UnrealIRCdTests */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 1FE7850E1B3DF0DD006CB6DD /* Build configuration list for PBXNativeTarget "UnrealIRCdTests" */;
+			buildPhases = (
+				1FE784FD1B3DF0DD006CB6DD /* Sources */,
+				1FE784FE1B3DF0DD006CB6DD /* Frameworks */,
+				1FE784FF1B3DF0DD006CB6DD /* Resources */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+				1FE785031B3DF0DD006CB6DD /* PBXTargetDependency */,
+			);
+			name = UnrealIRCdTests;
+			productName = UnrealIRCdTests;
+			productReference = 1FE785011B3DF0DD006CB6DD /* UnrealIRCdTests.xctest */;
+			productType = "com.apple.product-type.bundle.unit-test";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		1FE784E71B3DF0DD006CB6DD /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 0700;
+				LastUpgradeCheck = 0630;
+				ORGANIZATIONNAME = "UnrealIRCd Team";
+				TargetAttributes = {
+					1FE784EE1B3DF0DD006CB6DD = {
+						CreatedOnToolsVersion = 6.3.2;
+					};
+					1FE785001B3DF0DD006CB6DD = {
+						CreatedOnToolsVersion = 6.3.2;
+						TestTargetID = 1FE784EE1B3DF0DD006CB6DD;
+					};
+				};
+			};
+			buildConfigurationList = 1FE784EA1B3DF0DD006CB6DD /* Build configuration list for PBXProject "UnrealIRCd" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 1FE784E61B3DF0DD006CB6DD;
+			productRefGroup = 1FE784F01B3DF0DD006CB6DD /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				1FE784EE1B3DF0DD006CB6DD /* UnrealIRCd */,
+				1FE785001B3DF0DD006CB6DD /* UnrealIRCdTests */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		1FE784ED1B3DF0DD006CB6DD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1FE784F91B3DF0DD006CB6DD /* Images.xcassets in Resources */,
+				1F101A751B59EF2F00FE6A5B /* logo@2x.png in Resources */,
+				1FE784FC1B3DF0DD006CB6DD /* Main.storyboard in Resources */,
+				1F101A741B59EF2F00FE6A5B /* logo.png in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		1FE784FF1B3DF0DD006CB6DD /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		1F91FBDA1B58D9EB00A60151 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		1FE784EB1B3DF0DD006CB6DD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1F1E10F81B5A43D800D69F41 /* ConfigurationModel.swift in Sources */,
+				1FE784F71B3DF0DD006CB6DD /* ViewController.swift in Sources */,
+				1FE784F51B3DF0DD006CB6DD /* AppDelegate.swift in Sources */,
+				1FFB26B51B5BABFF00FF2D71 /* WindowController.swift in Sources */,
+				1F1E10FA1B5A43EE00D69F41 /* AppModel.swift in Sources */,
+				1F1E10F61B5A43CD00D69F41 /* DaemonModel.swift in Sources */,
+				1F67373F1B5B93CC00C213D8 /* ChangeNotifier.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		1FE784FD1B3DF0DD006CB6DD /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				1FE785081B3DF0DD006CB6DD /* UnrealIRCdTests.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXTargetDependency section */
+		1FE785031B3DF0DD006CB6DD /* PBXTargetDependency */ = {
+			isa = PBXTargetDependency;
+			target = 1FE784EE1B3DF0DD006CB6DD /* UnrealIRCd */;
+			targetProxy = 1FE785021B3DF0DD006CB6DD /* PBXContainerItemProxy */;
+		};
+/* End PBXTargetDependency section */
+
+/* Begin PBXVariantGroup section */
+		1FE784FA1B3DF0DD006CB6DD /* Main.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				1FE784FB1B3DF0DD006CB6DD /* Base */,
+			);
+			name = Main.storyboard;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		1FE785091B3DF0DD006CB6DD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = macosx;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		1FE7850A1B3DF0DD006CB6DD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		1FE7850C1B3DF0DD006CB6DD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = UnrealIRCd/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		1FE7850D1B3DF0DD006CB6DD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				COMBINE_HIDPI_IMAGES = YES;
+				INFOPLIST_FILE = UnrealIRCd/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+		1FE7850F1B3DF0DD006CB6DD /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+					"$(inherited)",
+				);
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = UnrealIRCdTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UnrealIRCd.app/Contents/MacOS/UnrealIRCd";
+			};
+			name = Debug;
+		};
+		1FE785101B3DF0DD006CB6DD /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				BUNDLE_LOADER = "$(TEST_HOST)";
+				COMBINE_HIDPI_IMAGES = YES;
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(DEVELOPER_FRAMEWORKS_DIR)",
+					"$(inherited)",
+				);
+				INFOPLIST_FILE = UnrealIRCdTests/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/UnrealIRCd.app/Contents/MacOS/UnrealIRCd";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		1FE784EA1B3DF0DD006CB6DD /* Build configuration list for PBXProject "UnrealIRCd" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1FE785091B3DF0DD006CB6DD /* Debug */,
+				1FE7850A1B3DF0DD006CB6DD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1FE7850B1B3DF0DD006CB6DD /* Build configuration list for PBXNativeTarget "UnrealIRCd" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1FE7850C1B3DF0DD006CB6DD /* Debug */,
+				1FE7850D1B3DF0DD006CB6DD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		1FE7850E1B3DF0DD006CB6DD /* Build configuration list for PBXNativeTarget "UnrealIRCdTests" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1FE7850F1B3DF0DD006CB6DD /* Debug */,
+				1FE785101B3DF0DD006CB6DD /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 1FE784E71B3DF0DD006CB6DD /* Project object */;
+}
diff --git a/src/macosx/UnrealIRCd.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/src/macosx/UnrealIRCd.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000..0558e4d
--- /dev/null
+++ b/src/macosx/UnrealIRCd.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:UnrealIRCd.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/src/macosx/UnrealIRCd/AppDelegate.swift b/src/macosx/UnrealIRCd/AppDelegate.swift
new file mode 100644
index 0000000..6463cc7
--- /dev/null
+++ b/src/macosx/UnrealIRCd/AppDelegate.swift
@@ -0,0 +1,55 @@
+//
+//  AppDelegate.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 6/26/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Cocoa
+
+@NSApplicationMain
+class AppDelegate: NSObject, NSApplicationDelegate {
+
+    
+    @IBOutlet weak var mainMenu : NSMenu?
+    var appModel : AppModel?
+    
+    override init() {
+        super.init()
+    }
+ 
+    func applicationDidFinishLaunching(aNotification: NSNotification)
+    {
+        appModel = AppModel(menu: mainMenu!)
+        appModel?.startup()
+        
+    }
+
+    func applicationWillTerminate(aNotification: NSNotification) {
+        appModel?.shutdown()
+    }
+    
+    @IBAction func startDaemon(sender: NSMenuItem) {
+        appModel?.startDaemon()
+    }
+    
+    @IBAction func stopDaemon(sender: NSMenuItem) {
+        appModel?.stopDaemon()
+    }
+    
+    @IBAction func configureDaemon(sender: NSMenuItem) {
+        appModel?.showPreferences()
+    }
+    
+    @IBAction func help(sender: NSMenuItem) {
+        appModel?.launchHelp()
+    }
+    
+    @IBAction func quit(sender: NSMenuItem) {
+        appModel?.shutdown()
+    }
+
+
+}
+
diff --git a/src/macosx/UnrealIRCd/AppModel.swift b/src/macosx/UnrealIRCd/AppModel.swift
new file mode 100644
index 0000000..7cb4570
--- /dev/null
+++ b/src/macosx/UnrealIRCd/AppModel.swift
@@ -0,0 +1,86 @@
+//
+//  AppModel.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 7/18/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Foundation
+import AppKit
+
+class AppModel : ChangeNotifierDelegate
+{
+    var menuItem : NSStatusItem
+    static let logoName = "logo.png"
+    static let helpURL = "https://www.unrealircd.org/docs/UnrealIRCd_5_documentation"
+    var daemonModel : DaemonModel
+    var configurationModel : ConfigurationModel
+    var windowController : NSWindowController?
+    var mainMenu : NSMenu
+    
+    init(menu: NSMenu)
+    {
+        menuItem = NSStatusBar.systemStatusBar().statusItemWithLength(-1/*NSVariableStatusItemLength*/)
+        mainMenu = menu
+        menuItem.image = NSImage(named: AppModel.logoName)
+        menuItem.menu = menu
+        
+        daemonModel = DaemonModel()
+        configurationModel = ConfigurationModel()
+
+        daemonModel.attachChangeDelegate(self)
+    }
+    
+    func launchHelp()
+    {
+        if let url = NSURL(string: AppModel.helpURL)
+        {
+            NSWorkspace.sharedWorkspace().openURL(url)
+        }
+    }
+    
+    func showPreferences()
+    {
+        windowController!.showWindow(self)
+    }
+    
+    func startup()
+    {
+        if configurationModel.shouldAutoStartDaemon
+        {
+            daemonModel.start()
+        }
+        
+        
+        let storyboard = NSStoryboard(name: "Main", bundle:nil)
+        let controller = storyboard!.instantiateControllerWithIdentifier("Configuration") as! WindowController?
+        assert(controller != nil, "Unable to load window from XIB")
+        controller?.setupModels(daemonModel, configurationModel: configurationModel)
+        windowController = controller
+    }
+    
+    func shutdown()
+    {
+        daemonModel.stop()
+        exit(0)
+    }
+    
+    func startDaemon()
+    {
+        daemonModel.start()
+    }
+    
+    func stopDaemon()
+    {
+        daemonModel.stop()
+    }
+    
+    func modelChanged(model: ChangeNotifier)
+    {
+        let daemonStatus = daemonModel.isRunning
+        mainMenu.itemWithTitle("Start UnrealIRCd")?.enabled = !daemonStatus
+        mainMenu.itemWithTitle("Stop UnrealIRCd")?.enabled = daemonStatus
+    }
+    
+}
\ No newline at end of file
diff --git a/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard b/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard
new file mode 100644
index 0000000..662640c
--- /dev/null
+++ b/src/macosx/UnrealIRCd/Base.lproj/Main.storyboard
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
+    </dependencies>
+    <scenes>
+        <!--Application-->
+        <scene sceneID="JPo-4y-FX3">
+            <objects>
+                <application id="hnw-xV-0zn" sceneMemberID="viewController">
+                    <menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
+                        <items>
+                            <menuItem title="Menu" id="arB-Ko-zYF">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Menu" id="nGf-dN-dCb">
+                                    <items>
+                                        <menuItem title="Preferences..." id="hg4-Jt-NlG">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="configureDaemon:" target="Voe-Tx-rLC" id="lTe-kQ-PcS"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="U1o-b6-ve3"/>
+                                        <menuItem title="Start UnrealIRCd" id="sdz-uA-JlO">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="startDaemon:" target="Voe-Tx-rLC" id="pAe-Ca-hpE"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop UnrealIRCd" enabled="NO" id="mWB-m4-eGp">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="stopDaemon:" target="Voe-Tx-rLC" id="nCK-J9-mwB"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="eTD-rh-FcN"/>
+                                        <menuItem title="Help" id="Z7I-ow-aOT">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="help:" target="Voe-Tx-rLC" id="3u2-Sx-rc5"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="8za-1l-uTx"/>
+                                        <menuItem title="Quit" id="33Y-FY-tQn">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="quit:" target="Voe-Tx-rLC" id="ejg-Xk-bjF"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                    <connections>
+                        <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
+                    </connections>
+                </application>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="UnrealIRCd" customModuleProvider="target">
+                    <connections>
+                        <outlet property="mainMenu" destination="nGf-dN-dCb" id="k5P-Yl-n8g"/>
+                    </connections>
+                </customObject>
+                <customObject id="vdW-9I-abO"/>
+                <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="16.5" y="-49"/>
+        </scene>
+        <!--Window Controller-->
+        <scene sceneID="R2V-B0-nI4">
+            <objects>
+                <windowController storyboardIdentifier="Configuration" id="B8D-0N-5wS" customClass="WindowController" customModule="UnrealIRCd" customModuleProvider="target" sceneMemberID="viewController">
+                    <window key="window" title="UnrealIRCd Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
+                        <windowStyleMask key="styleMask" titled="YES" closable="YES"/>
+                        <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+                        <rect key="contentRect" x="255" y="558" width="480" height="270"/>
+                        <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
+                    </window>
+                    <connections>
+                        <segue destination="XfG-lQ-9wD" kind="relationship" relationship="window.shadowedContentViewController" id="cq2-FE-JQM"/>
+                    </connections>
+                </windowController>
+                <customObject id="Oky-zY-oP4" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="75" y="250"/>
+        </scene>
+        <!--View Controller-->
+        <scene sceneID="hIz-AP-VOD">
+            <objects>
+                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="UnrealIRCd" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" id="m2S-Jp-Qdl">
+                        <rect key="frame" x="0.0" y="0.0" width="480" height="185"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <subviews>
+                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4S5-7w-SIn">
+                                <rect key="frame" x="14" y="137" width="70" height="32"/>
+                                <buttonCell key="cell" type="push" title="Start" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="mtI-HB-jrt">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="startStopServer:" target="XfG-lQ-9wD" id="EhM-sP-aEa"/>
+                                </connections>
+                            </button>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="6bw-Ac-zJw">
+                                <rect key="frame" x="132" y="146" width="159" height="17"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Start or stop the daemon" id="xxm-nR-TUU">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fCr-eU-LoJ">
+                                <rect key="frame" x="14" y="13" width="100" height="32"/>
+                                <buttonCell key="cell" type="push" title="Configure" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="3Xv-nX-n4C">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                            </button>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1xI-FT-vHx">
+                                <rect key="frame" x="132" y="24" width="279" height="17"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Open daemon configuration file in text editor" id="ae5-uk-kWn">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uW3-i9-Wt6">
+                                <rect key="frame" x="132" y="115" width="315" height="18"/>
+                                <buttonCell key="cell" type="check" title="Automatically start server on application launch" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="HqA-5J-6fd">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                            </button>
+                            <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="fya-YD-1uu">
+                                <rect key="frame" x="132" y="88" width="274" height="18"/>
+                                <buttonCell key="cell" type="check" title="Automatically start Unreal Agent on login" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="VUc-0Q-Rwf">
+                                    <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                    <font key="font" metaFont="system"/>
+                                </buttonCell>
+                            </button>
+                        </subviews>
+                    </view>
+                    <connections>
+                        <outlet property="autoStartAgentCheckbox" destination="fya-YD-1uu" id="Kx6-Ab-fEZ"/>
+                        <outlet property="autoStartDaemonCheckbox" destination="uW3-i9-Wt6" id="ZTJ-tW-iPq"/>
+                        <outlet property="startStopButton" destination="4S5-7w-SIn" id="jBU-RO-YdF"/>
+                    </connections>
+                </viewController>
+                <customObject id="rPt-NT-nkU" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="75" y="612.5"/>
+        </scene>
+    </scenes>
+</document>
diff --git a/src/macosx/UnrealIRCd/ChangeNotifier.swift b/src/macosx/UnrealIRCd/ChangeNotifier.swift
new file mode 100644
index 0000000..21f2d48
--- /dev/null
+++ b/src/macosx/UnrealIRCd/ChangeNotifier.swift
@@ -0,0 +1,46 @@
+//
+//  ChangeNotifier.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 7/19/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Foundation
+class ChangeNotifier {
+    
+    var changeDelegates : Array<ChangeNotifierDelegate> = []
+    
+    init()
+    {
+        
+    }
+    
+    func attachChangeDelegate(delegate: ChangeNotifierDelegate)
+    {
+        changeDelegates.append(delegate)
+    }
+    
+    func dettachChangeDelegate(delegate: ChangeNotifierDelegate)
+    {
+        for i in 0 ... changeDelegates.count
+        {
+            if changeDelegates[i] === delegate
+            {
+                changeDelegates.removeAtIndex(i)
+            }
+        }
+    }
+        func notifyListeners()
+    {
+        for listener in changeDelegates
+        {
+            listener.modelChanged(self)
+        }
+    }
+}
+
+protocol ChangeNotifierDelegate : class
+{
+    func modelChanged(model: ChangeNotifier);
+}
\ No newline at end of file
diff --git a/src/macosx/UnrealIRCd/ConfigurationModel.swift b/src/macosx/UnrealIRCd/ConfigurationModel.swift
new file mode 100644
index 0000000..463851e
--- /dev/null
+++ b/src/macosx/UnrealIRCd/ConfigurationModel.swift
@@ -0,0 +1,41 @@
+//
+//  ConfigurationModel.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 7/18/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Foundation
+class ConfigurationModel : ChangeNotifier {
+
+    let defaults = NSUserDefaults.standardUserDefaults()
+    static let autoStartDaemonKey = "IRCD_AUTOSTART"
+    static let autoStartAgentKey = "AGENT_AUTOSTART"
+    
+    var shouldAutoStartAgent : Bool {
+        set(value)
+        {
+            defaults.setBool(value, forKey: ConfigurationModel.autoStartAgentKey)
+            defaults.synchronize()
+            notifyListeners();
+        }
+        get
+        {
+            return defaults.boolForKey(ConfigurationModel.autoStartAgentKey)
+        }
+    }
+    
+    var shouldAutoStartDaemon : Bool {
+        set(value)
+        {
+            defaults.setBool(value, forKey: ConfigurationModel.autoStartDaemonKey)
+            defaults.synchronize()
+            notifyListeners();
+        }
+        get
+        {
+            return defaults.boolForKey(ConfigurationModel.autoStartDaemonKey)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/macosx/UnrealIRCd/DaemonModel.swift b/src/macosx/UnrealIRCd/DaemonModel.swift
new file mode 100644
index 0000000..5c763f3
--- /dev/null
+++ b/src/macosx/UnrealIRCd/DaemonModel.swift
@@ -0,0 +1,40 @@
+//
+//  DaemonModel.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 7/18/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Foundation
+
+class DaemonModel : ChangeNotifier
+{
+    
+    
+    override init()
+    {
+        isRunning = false
+        super.init()
+    }
+
+    
+    func start()
+    {
+        isRunning = true
+    }
+    
+    func stop()
+    {
+        isRunning = false
+    }
+    
+    var isRunning : Bool
+    {
+        didSet {
+            notifyListeners()
+        }
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/src/macosx/UnrealIRCd/Images.xcassets/AppIcon.appiconset/Contents.json b/src/macosx/UnrealIRCd/Images.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 0000000..2db2b1c
--- /dev/null
+++ b/src/macosx/UnrealIRCd/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,58 @@
+{
+  "images" : [
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "16x16",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "32x32",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "128x128",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "256x256",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "mac",
+      "size" : "512x512",
+      "scale" : "2x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/src/macosx/UnrealIRCd/Info.plist b/src/macosx/UnrealIRCd/Info.plist
new file mode 100644
index 0000000..3e6882b
--- /dev/null
+++ b/src/macosx/UnrealIRCd/Info.plist
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIconFile</key>
+	<string></string>
+	<key>CFBundleIdentifier</key>
+	<string>com.unrealircd.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2015 UnrealIRCd Team. All rights reserved.</string>
+	<key>NSMainStoryboardFile</key>
+	<string>Main</string>
+	<key>LSUIElement</key>
+	<true/>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/src/macosx/UnrealIRCd/ViewController.swift b/src/macosx/UnrealIRCd/ViewController.swift
new file mode 100644
index 0000000..307951d
--- /dev/null
+++ b/src/macosx/UnrealIRCd/ViewController.swift
@@ -0,0 +1,87 @@
+//
+//  ViewController.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 6/26/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Cocoa
+import AppKit
+
+class ViewController: NSViewController, ChangeNotifierDelegate {
+    
+    @IBOutlet private weak var autoStartAgentCheckbox : NSButton?
+    @IBOutlet private weak var autoStartDaemonCheckbox : NSButton?
+    @IBOutlet private weak var startStopButton : NSButton?
+    static let stopButtonString = "Stop"
+    static let startButtonString = "Start"
+    var configModel : ConfigurationModel?
+    {
+        didSet {
+            updateConfigurationOptions()
+            configModel?.attachChangeDelegate(self)
+        }
+    }
+    
+    var daemonModel : DaemonModel?
+    {
+        didSet {
+            updateDaemonButton()
+            daemonModel?.attachChangeDelegate(self)
+        }
+    }
+    
+    func updateDaemonButton()
+    {
+        startStopButton?.title = daemonModel!.isRunning ? ViewController.stopButtonString : ViewController.startButtonString
+    }
+    
+    func updateConfigurationOptions()
+    {
+        autoStartAgentCheckbox?.state = configModel!.shouldAutoStartAgent ? NSOnState : NSOffState
+        autoStartDaemonCheckbox?.state = configModel!.shouldAutoStartDaemon ? NSOnState : NSOffState
+    }
+    
+    override func viewWillDisappear() {
+        saveConfigurationOptions()
+    }
+    
+    func saveConfigurationOptions()
+    {
+        configModel?.shouldAutoStartAgent = autoStartAgentCheckbox?.state == NSOnState ? true : false
+        configModel?.shouldAutoStartDaemon = autoStartAgentCheckbox?.state == NSOnState ? true : false
+    }
+    
+    @IBAction func startStopServer(sender: AnyObject)
+    {
+        if daemonModel!.isRunning
+        {
+            daemonModel?.stop()
+        }
+        else
+        {
+            daemonModel?.start()
+        }
+    }
+    
+    func modelChanged(model: ChangeNotifier) {
+        if model === daemonModel
+        {
+            updateDaemonButton()
+        }
+        
+        else if model === configModel
+        {
+            updateConfigurationOptions()
+        }
+    }
+    
+    @IBAction func configure(sender: AnyObject)
+    {
+        
+    }
+
+
+}
+
diff --git a/src/macosx/UnrealIRCd/WindowController.swift b/src/macosx/UnrealIRCd/WindowController.swift
new file mode 100644
index 0000000..322c490
--- /dev/null
+++ b/src/macosx/UnrealIRCd/WindowController.swift
@@ -0,0 +1,23 @@
+//
+//  WindowController.swift
+//  UnrealIRCd
+//
+//  Created by Travis McArthur on 7/19/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Foundation
+import AppKit
+
+class WindowController : NSWindowController
+{
+
+    func setupModels(daemonModel: DaemonModel, configurationModel: ConfigurationModel) {
+        let viewController = contentViewController as! ViewController
+        viewController.daemonModel = daemonModel
+        viewController.configModel = configurationModel
+        super.windowWillLoad()
+    }
+    
+    
+}
\ No newline at end of file
diff --git a/src/macosx/UnrealIRCd/logo.png b/src/macosx/UnrealIRCd/logo.png
new file mode 100644
index 0000000..a8c0e0f
Binary files /dev/null and b/src/macosx/UnrealIRCd/logo.png differ
diff --git a/src/macosx/UnrealIRCd/logo@2x.png b/src/macosx/UnrealIRCd/logo@2x.png
new file mode 100644
index 0000000..2300a16
Binary files /dev/null and b/src/macosx/UnrealIRCd/logo@2x.png differ
diff --git a/src/macosx/UnrealIRCdTests/Info.plist b/src/macosx/UnrealIRCdTests/Info.plist
new file mode 100644
index 0000000..b76591a
--- /dev/null
+++ b/src/macosx/UnrealIRCdTests/Info.plist
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.unrealircd.$(PRODUCT_NAME:rfc1034identifier)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/src/macosx/UnrealIRCdTests/UnrealIRCdTests.swift b/src/macosx/UnrealIRCdTests/UnrealIRCdTests.swift
new file mode 100644
index 0000000..c6fd629
--- /dev/null
+++ b/src/macosx/UnrealIRCdTests/UnrealIRCdTests.swift
@@ -0,0 +1,36 @@
+//
+//  UnrealIRCdTests.swift
+//  UnrealIRCdTests
+//
+//  Created by Travis McArthur on 6/26/15.
+//  Copyright (c) 2015 UnrealIRCd Team. All rights reserved.
+//
+
+import Cocoa
+import XCTest
+
+class UnrealIRCdTests: XCTestCase {
+    
+    override func setUp() {
+        super.setUp()
+        // Put setup code here. This method is called before the invocation of each test method in the class.
+    }
+    
+    override func tearDown() {
+        // Put teardown code here. This method is called after the invocation of each test method in the class.
+        super.tearDown()
+    }
+    
+    func testExample() {
+        // This is an example of a functional test case.
+        XCTAssert(true, "Pass")
+    }
+    
+    func testPerformanceExample() {
+        // This is an example of a performance test case.
+        self.measureBlock() {
+            // Put the code you want to measure the time of here.
+        }
+    }
+    
+}
diff --git a/src/match.c b/src/match.c
new file mode 100644
index 0000000..ccc1c39
--- /dev/null
+++ b/src/match.c
@@ -0,0 +1,865 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/match.c
+ *   Copyright (C) 1990 Jarkko Oikarinen
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+
+#include "unrealircd.h"
+
+ID_Copyright("(C) 1990 Jarkko Oikarinen");
+
+/*
+ *  Compare if a given string (name) matches the given
+ *  mask (which can contain wild cards: '*' - match any
+ *  number of chars, '?' - match any single character.
+ *
+ *	return	0, if match
+ *		1, if no match
+ */
+
+u_char touppertab[], tolowertab[];
+#define tolowertab2 tolowertab
+#define lc(x) tolowertab2[x]
+
+/* Match routine for special cases where escaping is needed in a normal fashion.
+ * Checks a string ('name') against a globbing(+more) pattern ('mask').
+ * Original by Douglas A Lewis (dalewis@acsu.buffalo.edu).
+ * Code based on hybrid7's version (match_esc()).
+ * Various modifications by Bram Matthys (Syzop).
+ * Returns 1 on match and 0 for no match.
+ * Instead of our previous code, this one is less optimized but actually  _readable_ ;).
+ * Modifications I (Syzop) had to do vs the hybrid7 code:
+ * - Got rid of (u_char *) casts, since we already compile with
+ *   chars defaulting to unsigned [or else major things break] ;).
+ * - Support for '_'.
+ * - Rip out support for '#'.
+ */
+int match_esc(const char *mask, const char *name)
+{
+	const u_char *m = mask;
+	const u_char *n = name;
+	const u_char *ma = NULL;
+	const u_char *na = name;
+
+	while(1)
+	{
+		if (*m == '*')
+		{
+			while (*m == '*') /* collapse.. */
+				m++;
+			ma = m; 
+			na = n;
+		}
+		
+		if (!*m)
+		{
+			if (!*n)
+				return 1;
+			if (!ma)
+				return 0;
+			for (m--; (m > (const u_char *)mask) && (*m == '?'); m--);
+			if (*m == '*')
+				return 1;
+			m = ma;
+			n = ++na;
+		} else
+		if (!*n)
+		{
+			while (*m == '*') /* collapse.. */
+				m++;
+			return (*m == 0);
+		}
+		
+		if (*m != '?')
+		{
+			if (*m == '\\')
+				if (!*++m)
+					return 0; /* unfinished escape sequence */
+			if ((lc(*m) != lc(*n)) && !((*m == '_') && (*n == ' ')))
+			{
+				if (!ma)
+					return 0;
+				m = ma;
+				n = ++na;
+			} else
+			{
+				m++;
+				n++;
+			}
+		} else
+		{
+			m++;
+			n++;
+		}
+	}
+	return 0;
+}
+
+/** Same credit/copyright as match_esc() applies, except escaping removed.. ;p */
+int match_simple(const char *mask, const char *name)
+{
+	const u_char *m = mask;
+	const u_char *n = name;
+	const u_char *ma = NULL;
+	const u_char *na = name;
+
+	while(1)
+	{
+		if (*m == '*')
+		{
+			while (*m == '*') /* collapse.. */
+				m++;
+			ma = m; 
+			na = n;
+		}
+		
+		if (!*m)
+		{
+			if (!*n)
+				return 1;
+			if (!ma)
+				return 0;
+			for (m--; (m > (const u_char *)mask) && (*m == '?'); m--);
+			if (*m == '*')
+				return 1;
+			m = ma;
+			n = ++na;
+		} else
+		if (!*n)
+		{
+			while (*m == '*') /* collapse.. */
+				m++;
+			return (*m == 0);
+		}
+		
+		if ((lc(*m) != lc(*n)) && !((*m == '_') && (*n == ' ')) && (*m != '?'))
+		{
+			if (!ma)
+				return 0;
+			m = ma;
+			n = ++na;
+		} else
+		{
+			m++;
+			n++;
+		}
+	}
+	return 0;
+}
+
+/*
+ * collapse a pattern string into minimal components.
+ * This particular version is "in place", so that it changes the pattern
+ * which is to be reduced to a "minimal" size.
+ */
+char *collapse(char *pattern)
+{
+	char *s;
+	char *s1;
+	char *t;
+
+	s = pattern;
+
+	if (BadPtr(pattern))
+		return pattern;
+	/*
+	 * Collapse all \** into \*, \*[?]+\** into \*[?]+
+	 */
+	for (; *s; s++)
+		if (*s == '\\')
+		{
+			if (!*(s + 1))
+				break;
+			else
+				s++;
+		}
+		else if (*s == '*')
+		{
+			if (*(t = s1 = s + 1) == '*')
+				while (*t == '*')
+					t++;
+			else if (*t == '?')
+				for (t++, s1++; *t == '*' || *t == '?'; t++)
+					if (*t == '?')
+						*s1++ = *t;
+			while ((*s1++ = *t++))
+				;
+		}
+	return pattern;
+}
+
+
+/* Case insensitive comparison of two NULL terminated strings,
+ * using the "IRC nick comparison" rules. Or, well, partially
+ * anyway.
+ * Should be used for NICK-related comparisons. And probably
+ * not even then, since this does not deal with multibyte.
+ * @returns 	 0, if s1 equal to s2
+ *		<0, if s1 lexicographically less than s2
+ *		>0, if s1 lexicographically greater than s2
+ */
+int  smycmp(const char *s1, const char *s2)
+{
+	u_char *str1;
+	u_char *str2;
+	int  res;
+
+	str1 = (u_char *)s1;
+	str2 = (u_char *)s2;
+
+	while ((res = toupper(*str1) - toupper(*str2)) == 0)
+	{
+		if (*str1 == '\0')
+			return 0;
+		str1++;
+		str2++;
+	}
+	return (res);
+}
+
+u_char tolowertab[] = {
+	0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa,
+	0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14,
+	0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
+	0x1e, 0x1f,
+	' ', '!', '"', '#', '$', '%', '&', 0x27, '(', ')',
+	'*', '+', ',', '-', '.', '/',
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	':', ';', '<', '=', '>', '?',
+	'@', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+	'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+	't', 'u', 'v', 'w', 'x', 'y', 'z', '[', '\\', ']', '^',
+	'_',
+	'`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
+	'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's',
+	't', 'u', 'v', 'w', 'x', 'y', 'z', '{', '|', '}', '~',
+	0x7f,
+	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+	0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
+	0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9,
+	0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9,
+	0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
+	0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9,
+	0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+	0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
+	0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+u_char touppertab[] = {
+	0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa,
+	0xb, 0xc, 0xd, 0xe, 0xf, 0x10, 0x11, 0x12, 0x13, 0x14,
+	0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,
+	0x1e, 0x1f,
+	' ', '!', '"', '#', '$', '%', '&', 0x27, '(', ')',
+	'*', '+', ',', '-', '.', '/',
+	'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+	':', ';', '<', '=', '>', '?',
+	'@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+	'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '[', '\\', ']', '^',
+	0x5f,
+	'`', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I',
+	'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S',
+	'T', 'U', 'V', 'W', 'X', 'Y', 'Z', '{', '|', '}', '~',
+	0x7f,
+	0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+	0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
+	0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99,
+	0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
+	0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9,
+	0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
+	0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9,
+	0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
+	0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9,
+	0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
+	0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9,
+	0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
+	0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+	0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
+	0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9,
+	0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff
+};
+
+u_char char_atribs[] = {
+/* 0-7 */ CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL,
+/* 8-12 */ CNTRL, CNTRL | SPACE, CNTRL | SPACE, CNTRL | SPACE,
+	CNTRL | SPACE,
+/* 13-15 */ CNTRL | SPACE, CNTRL, CNTRL,
+/* 16-23 */ CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL,
+/* 24-31 */ CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL, CNTRL,
+/* space */ PRINT | SPACE,
+/* !"#$%&'( */ PRINT, PRINT, PRINT, PRINT, PRINT, PRINT, PRINT, PRINT,
+/* )*+,-./ */ PRINT, PRINT, PRINT, PRINT, PRINT | ALLOW, PRINT | ALLOW,
+	PRINT,
+/* 012 */ PRINT | DIGIT | ALLOW, PRINT | DIGIT | ALLOW,
+	PRINT | DIGIT | ALLOW,
+/* 345 */ PRINT | DIGIT | ALLOW, PRINT | DIGIT | ALLOW,
+	PRINT | DIGIT | ALLOW,
+/* 678 */ PRINT | DIGIT | ALLOW, PRINT | DIGIT | ALLOW,
+	PRINT | DIGIT | ALLOW,
+/* 9:; */ PRINT | DIGIT | ALLOW, PRINT, PRINT,
+/* <=>? */ PRINT, PRINT, PRINT, PRINT,
+/* @ */ PRINT,
+/* ABC */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* DEF */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* GHI */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* JKL */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* MNO */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* PQR */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* STU */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* VWX */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* YZ[ */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW, PRINT,
+/* \]^ */ PRINT, PRINT, PRINT,
+/* _`  */ PRINT | ALLOW, PRINT,
+/* abc */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* def */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* ghi */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* jkl */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* mno */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* pqr */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* stu */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* vwx */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW,
+	PRINT | ALPHA | ALLOW,
+/* yz{ */ PRINT | ALPHA | ALLOW, PRINT | ALPHA | ALLOW, PRINT,
+/* |}~ */ PRINT, PRINT, PRINT,
+/* del */ 0,
+/* 80-8f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 90-9f */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* a0-af */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* b0-bf */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* c0-cf */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* d0-df */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* e0-ef */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* f0-ff */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/** Free up all resources of an Match entry (including the struct itself).
+ * NOTE: this function may (also) be called for Match structs that have only been
+ *       setup half-way, so use special care when accessing members (NULL checks!)
+ */
+void unreal_delete_match(Match *m)
+{
+	safe_free(m->str);
+	if (m->type == MATCH_PCRE_REGEX)
+	{
+		if (m->ext.pcre2_expr)
+			pcre2_code_free(m->ext.pcre2_expr);
+	}
+	safe_free(m);
+}
+
+Match *unreal_create_match(MatchType type, char *str, char **error)
+{
+	Match *m = safe_alloc(sizeof(Match));
+	static char errorbuf[512];
+
+	*errorbuf = '\0';
+
+	safe_strdup(m->str, str);
+	m->type = type;
+	
+	if (m->type == MATCH_SIMPLE)
+	{
+		/* Nothing to do */
+	}
+	else if (m->type == MATCH_PCRE_REGEX)
+	{
+		int errorcode = 0;
+		PCRE2_SIZE erroroffset = 0;
+		int options = 0;
+		char buf2[512];
+		
+		options = PCRE2_CASELESS|PCRE2_NEVER_UTF|PCRE2_NEVER_UCP;
+		
+		m->ext.pcre2_expr = pcre2_compile(str, PCRE2_ZERO_TERMINATED, options, &errorcode, &erroroffset, NULL);
+		if (m->ext.pcre2_expr == NULL)
+		{
+			*buf2 = '\0';
+			pcre2_get_error_message(errorcode, buf2, sizeof(buf2));
+			if (error)
+			{
+				if (erroroffset > 0)
+					snprintf(errorbuf, sizeof(errorbuf), "%s (at character #%d)", buf2, (int)erroroffset);
+				else
+					strlcpy(errorbuf, buf2, sizeof(errorbuf));
+				*error = errorbuf;
+			}
+			unreal_delete_match(m);
+			return NULL;
+		}
+		pcre2_jit_compile(m->ext.pcre2_expr, PCRE2_JIT_COMPLETE);
+		return m;
+	}
+	else {
+		/* Unknown type, how did that happen ? */
+		unreal_delete_match(m);
+		return NULL;
+	}
+	return m;
+}
+
+/** Try to match an Match entry ('m') against a string ('str').
+ * @returns 1 if matched, 0 if not.
+ * @note These (more logical) return values are opposite to the match_simple() function.
+ */
+int unreal_match(Match *m, char *str)
+{
+	if (m->type == MATCH_SIMPLE)
+	{
+		if (match_simple(m->str, str))
+			return 1;
+		return 0;
+	}
+	
+	if (m->type == MATCH_PCRE_REGEX)
+	{
+		pcre2_match_data *md = pcre2_match_data_create(9, NULL);
+		int ret;
+		
+		ret = pcre2_match(m->ext.pcre2_expr, str, PCRE2_ZERO_TERMINATED, 0, 0, md, NULL); /* run the regex */
+		pcre2_match_data_free(md); /* yeah, we never use it. unfortunately argument must be non-NULL for pcre2_match() */
+		
+		if (ret > 0)
+			return 1; /* MATCH */		
+		return 0; /* NO MATCH */
+	}
+
+	return 0;
+}
+
+int unreal_match_method_strtoval(char *str)
+{
+	if (!strcmp(str, "regex") || !strcmp(str, "pcre"))
+		return MATCH_PCRE_REGEX;
+	if (!strcmp(str, "simple") || !strcmp(str, "glob"))
+		return MATCH_SIMPLE;
+	return 0;
+}
+
+char *unreal_match_method_valtostr(int val)
+{
+	if (val == MATCH_PCRE_REGEX)
+		return "regex";
+	if (val == MATCH_SIMPLE)
+		return "simple";
+	
+	return "unknown";
+}
+
+/* It is unfortunately that we have 2 matching/replace systems.
+ * However, the above is for spamfilter matching and stuff
+ * and below is for matching on WORDS, which does specific things
+ * like replacement on word boundaries etc.
+ * Moved here from the censor channel and user mode module
+ * (previously was present in both modules, code duplication)
+ */
+int fast_badword_match(ConfigItem_badword *badword, char *line)
+{
+	char *p;
+	int bwlen = strlen(badword->word);
+	if ((badword->type & BADW_TYPE_FAST_L) && (badword->type & BADW_TYPE_FAST_R))
+		return (our_strcasestr(line, badword->word) ? 1 : 0);
+
+	p = line;
+	while((p = our_strcasestr(p, badword->word)))
+	{
+		if (!(badword->type & BADW_TYPE_FAST_L))
+		{
+			if ((p != line) && !iswseperator(*(p - 1))) /* aaBLA but no *BLA */
+				goto next;
+		}
+		if (!(badword->type & BADW_TYPE_FAST_R))
+		{
+			if (!iswseperator(*(p + bwlen)))  /* BLAaa but no BLA* */
+				goto next;
+		}
+		/* Looks like it matched */
+		return 1;
+next:
+		p += bwlen;
+	}
+	return 0;
+}
+
+/* fast_badword_replace:
+ * A fast replace routine written by Syzop used for replacing badwords.
+ * This searches in line for the bad word and replaces it.
+ * buf is used for the result and max is sizeof(buf).
+ * Assumptions[!]: max > 0 AND max > strlen(line)+1
+ */
+int fast_badword_replace(ConfigItem_badword *badword, char *line, char *buf, int max)
+{
+	/* Some aliases ;P */
+	char *replacew = badword->replace ? badword->replace : REPLACEWORD;
+	char *pold = line, *pnew = buf; /* Pointers to old string and new string */
+	char *poldx = line;
+	int replacen = -1; /* Only calculated if needed. w00t! saves us a few nanosecs? lol */
+	int searchn = -1;
+	char *startw, *endw;
+	char *c_eol = buf + max - 1; /* Cached end of (new) line */
+	int run = 1;
+	int cleaned = 0;
+
+	Debug((DEBUG_NOTICE, "replacing %s -> %s in '%s'", badword->word, replacew, line));
+
+	while(run) {
+		pold = our_strcasestr(pold, badword->word);
+		if (!pold)
+			break;
+		if (replacen == -1)
+			replacen = strlen(replacew);
+		if (searchn == -1)
+			searchn = strlen(badword->word);
+		/* Hunt for start of word */
+		if (pold > line) {
+			for (startw = pold; (!iswseperator(*startw) && (startw != line)); startw--);
+			if (iswseperator(*startw))
+				startw++; /* Don't point at the space/seperator but at the word! */
+		} else {
+			startw = pold;
+		}
+
+		if (!(badword->type & BADW_TYPE_FAST_L) && (pold != startw)) {
+			/* not matched */
+			pold++;
+			continue;
+		}
+
+		/* Hunt for end of word
+		 * Fix for bug #4909: word will be at least 'searchn' long so we can skip
+		 * 'searchn' bytes and avoid stopping half-way the badword.
+		 */
+		for (endw = pold+searchn; ((*endw != '\0') && (!iswseperator(*endw))); endw++);
+
+		if (!(badword->type & BADW_TYPE_FAST_R) && (pold+searchn != endw)) {
+			/* not matched */
+			pold++;
+			continue;
+		}
+
+		cleaned = 1; /* still too soon? Syzop/20050227 */
+
+		/* Do we have any not-copied-yet data? */
+		if (poldx != startw) {
+			int tmp_n = startw - poldx;
+			if (pnew + tmp_n >= c_eol) {
+				/* Partial copy and return... */
+				memcpy(pnew, poldx, c_eol - pnew);
+				*c_eol = '\0';
+				return 1;
+			}
+
+			memcpy(pnew, poldx, tmp_n);
+			pnew += tmp_n;
+		}
+		/* Now update the word in buf (pnew is now something like startw-in-new-buffer */
+
+		if (replacen) {
+			if ((pnew + replacen) >= c_eol) {
+				/* Partial copy and return... */
+				memcpy(pnew, replacew, c_eol - pnew);
+				*c_eol = '\0';
+				return 1;
+			}
+			memcpy(pnew, replacew, replacen);
+			pnew += replacen;
+		}
+		poldx = pold = endw;
+	}
+	/* Copy the last part */
+	if (*poldx) {
+		strncpy(pnew, poldx, c_eol - pnew);
+		*(c_eol) = '\0';
+	} else {
+		*pnew = '\0';
+	}
+	return cleaned;
+}
+
+/*
+ * Returns a string, which has been filtered by the words loaded via
+ * the loadbadwords() function.  It's primary use is to filter swearing
+ * in both private and public messages
+ */
+char *stripbadwords(char *str, ConfigItem_badword *start_bw, int *blocked)
+{
+	static char cleanstr[4096];
+	char buf[4096];
+	char *ptr;
+	int matchlen, m, stringlen, cleaned;
+	ConfigItem_badword *this_word;
+
+	*blocked = 0;
+
+	if (!start_bw)
+		return str;
+
+	/*
+	 * work on a copy
+	 */
+	stringlen = strlcpy(cleanstr, StripControlCodes(str), sizeof cleanstr);
+	matchlen = 0;
+	buf[0] = '\0';
+	cleaned = 0;
+
+	for (this_word = start_bw; this_word; this_word = this_word->next)
+	{
+		if (this_word->type & BADW_TYPE_FAST)
+		{
+			if (this_word->action == BADWORD_BLOCK)
+			{
+				if (fast_badword_match(this_word, cleanstr))
+				{
+					*blocked = 1;
+					return NULL;
+				}
+			}
+			else
+			{
+				int n;
+				/* fast_badword_replace() does size checking so we can use 512 here instead of 4096 */
+				n = fast_badword_replace(this_word, cleanstr, buf, 512);
+				if (!cleaned && n)
+					cleaned = n;
+				strcpy(cleanstr, buf);
+				memset(buf, 0, sizeof(buf)); /* regexp likes this somehow */
+			}
+		} else
+		if (this_word->type & BADW_TYPE_REGEX)
+		{
+			if (this_word->action == BADWORD_BLOCK)
+			{
+				pcre2_match_data *md = pcre2_match_data_create(9, NULL);
+				int ret;
+
+				ret = pcre2_match(this_word->pcre2_expr, cleanstr, PCRE2_ZERO_TERMINATED, 0, 0, md, NULL); /* run the regex */
+				pcre2_match_data_free(md); /* yeah, we never use it. unfortunately argument must be non-NULL for pcre2_match() */
+				if (ret > 0)
+				{
+					*blocked = 1;
+					return NULL;
+				}
+			}
+			else
+			{
+				pcre2_match_data *md;
+				int ret;
+				PCRE2_SIZE *dd;
+				int start, end;
+
+				ptr = cleanstr; /* set pointer to start of string */
+				while(1) {
+					md = pcre2_match_data_create(9, NULL);
+					/* ^^ we need to free 'md' in ALL circumstances.
+					 * remember this if you break or continue in this loop!
+					 */
+					ret = pcre2_match(this_word->pcre2_expr, ptr, PCRE2_ZERO_TERMINATED, 0, 0, md, NULL); /* run the regex */
+					if (ret > 0)
+					{
+						ircd_log(LOG_ERROR, "pcre2_get_ovector_count: %d", pcre2_get_ovector_count(md));
+						dd = pcre2_get_ovector_pointer(md);
+						start = (int)dd[0];
+						end = (int)dd[1];
+						if ((start < 0) || (end < 0) || (start > strlen(ptr)) || (end > strlen(ptr)+1))
+						{
+							ircd_log(LOG_ERROR, "pcre2_match() returned an ovector with OOB start/end: %d/%d, str (%d): '%s'",
+								(int)start, (int)end, (int)strlen(ptr), ptr);
+							abort();
+						}
+						m = end - start;
+						if (m == 0)
+						{
+							pcre2_match_data_free(md);
+							break; /* anti-loop */
+						}
+						cleaned = 1;
+						matchlen += m;
+						strlncat(buf, ptr, sizeof buf, start);
+						if (this_word->replace)
+							strlcat(buf, this_word->replace, sizeof buf); 
+						else
+							strlcat(buf, REPLACEWORD, sizeof buf);
+						ptr += end; /* Set pointer after the match pos */
+						pcre2_match_data_free(md);
+						continue; /* next! */
+					}
+					pcre2_match_data_free(md);
+					break; /* NOMATCH: we are done! */
+				}
+				/* All the better to eat you with! */
+				strlcat(buf, ptr, sizeof buf);	
+				memcpy(cleanstr, buf, sizeof cleanstr);
+				memset(buf, 0, sizeof(buf));
+				if (matchlen == stringlen)
+					break;
+			}
+		}
+	}
+
+	cleanstr[511] = '\0'; /* cutoff, just to be sure */
+
+	return (cleaned) ? cleanstr : str;
+}
+
+/** Checks if the specified regex (or fast badwords) is valid.
+ * returns NULL in case of success [!],
+ * pointer to buffer with error message otherwise
+ * if check_broadness is 1, the function will attempt to determine
+ * if the given regex string is too broad (i.e. matches everything)
+ */
+char *badword_config_check_regex(char *str, int fastsupport, int check_broadness)
+{
+	int regex=0;
+	char *tmp;
+	static char errorbuf[512];
+
+	if (fastsupport)
+	{
+		for (tmp = str; *tmp; tmp++) {
+			if (!isalnum(*tmp) && !(*tmp >= 128)) {
+				if ((str == tmp) && (*tmp == '*'))
+					continue;
+				if ((*(tmp + 1) == '\0') && (*tmp == '*'))
+					continue;
+				regex = 1;
+				break;
+			}
+		}
+	}
+	if (!fastsupport || regex)
+	{
+		int errorcode = 0;
+		PCRE2_SIZE erroroffset = 0;
+		pcre2_code *expr;
+		int options = 0;
+		char buf2[512];
+
+		options = PCRE2_CASELESS|PCRE2_NEVER_UTF|PCRE2_NEVER_UCP;
+
+		expr = pcre2_compile(str, PCRE2_ZERO_TERMINATED, options, &errorcode, &erroroffset, NULL);
+		if (expr == NULL)
+		{
+			pcre2_get_error_message(errorcode, buf2, sizeof(buf2));
+			if (erroroffset > 0)
+				snprintf(errorbuf, sizeof(errorbuf), "%s (at character #%d)", buf2, (int)erroroffset);
+			else
+				strlcpy(errorbuf, buf2, sizeof(errorbuf));
+			return errorbuf;
+		}
+		pcre2_code_free(expr);
+	}
+	return NULL;
+}
+
+int badword_config_process(ConfigItem_badword *ca, char *str)
+{
+	char *tmp;
+	short regex = 0;
+	int ast_l = 0, ast_r = 0;
+
+	/* The fast badwords routine can do: "blah" "*blah" "blah*" and "*blah*",
+	 * in all other cases use regex.
+	 */
+	for (tmp = str; *tmp; tmp++) {
+		if (!isalnum(*tmp) && !(*tmp >= 128)) {
+			if ((str == tmp) && (*tmp == '*')) {
+				ast_l = 1; /* Asterisk at the left */
+				continue;
+			}
+			if ((*(tmp + 1) == '\0') && (*tmp == '*')) {
+				ast_r = 1; /* Asterisk at the right */
+				continue;
+			}
+			regex = 1;
+			break;
+		}
+	}
+	if (regex)
+	{
+		int errorcode = 0;
+		PCRE2_SIZE erroroffset = 0;
+		int options = 0;
+
+		ca->type = BADW_TYPE_REGEX;
+		safe_strdup(ca->word, str);
+
+		options = PCRE2_CASELESS|PCRE2_NEVER_UTF|PCRE2_NEVER_UCP;
+
+		ca->pcre2_expr = pcre2_compile(str, PCRE2_ZERO_TERMINATED, options, &errorcode, &erroroffset, NULL);
+		if (ca->pcre2_expr == NULL)
+		{
+			/* This cannot happen since badword_config_check_regex()
+			 * should be called from config_test on each regex.
+			 */
+			config_error("badword_config_process(): failed to compile regex '%s', this is impossible!", str);
+			abort();
+		}
+		pcre2_jit_compile(ca->pcre2_expr, PCRE2_JIT_COMPLETE);
+	}
+	else
+	{
+		char *tmpw;
+		ca->type = BADW_TYPE_FAST;
+		ca->word = tmpw = safe_alloc(strlen(str) - ast_l - ast_r + 1);
+		/* Copy except for asterisks */
+		for (tmp = str; *tmp; tmp++)
+			if (*tmp != '*')
+				*tmpw++ = *tmp;
+		*tmpw = '\0';
+		if (ast_l)
+			ca->type |= BADW_TYPE_FAST_L;
+		if (ast_r)
+			ca->type |= BADW_TYPE_FAST_R;
+	}
+
+	return 1;
+}
+
+/** Frees a ConfigItem_badword item.
+ * Note that it does NOT remove from the list, you need
+ * to do this BEFORE calling this function.
+ */
+void badword_config_free(ConfigItem_badword *e)
+{
+	safe_free(e->word);
+	safe_free(e->replace);
+	if (e->pcre2_expr)
+		pcre2_code_free(e->pcre2_expr);
+	safe_free(e);
+}
diff --git a/src/mempool.c b/src/mempool.c
new file mode 100644
index 0000000..f96a0b4
--- /dev/null
+++ b/src/mempool.c
@@ -0,0 +1,745 @@
+/*
+ * Copyright (c) 2007-2012, The Tor Project, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *   * Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ *
+ *   * Redistributions in binary form must reproduce the above
+ *     copyright notice, this list of conditions and the following disclaimer
+ *     in the documentation and/or other materials provided with the
+ *     distribution.
+ *
+ *   * Neither the names of the copyright owners nor the names of its
+ *     contributors may be used to endorse or promote products derived from
+ *     this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/* Imported from hybrid svn:
+ * \file mempool.c
+ * \brief A pooling allocator
+ * \version $Id: mempool.c 1967 2013-05-08 14:33:22Z michael $
+ */
+
+#include "unrealircd.h"
+
+#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
+/* When running with AddressSanitizer, if using memory pools we will
+ * likely NOT detect various kinds of misusage. (This is a known problem)
+ * Therefore, if ASan is enabled, we don't use memory pools and will
+ * use malloc/free instead, so ASan can do it's job much better.
+ * Theoretically we could still use ASan + memory pools if we manually
+ * designate and mark red zones. However, that still does not fix the
+ * case of quick memory re-use. Mempool re-uses a freed area quickly
+ * to be efficient, while ASan does the exact opposite (putting
+ * freed items in a 256MB quarantine buffer), since quick re-use
+ * will hide use-after-free bugs. -- Syzop
+ */
+void mp_pool_init(void)
+{
+}
+
+mp_pool_t *mp_pool_new(size_t sz, size_t ignored)
+{
+    mp_pool_t *m = safe_alloc(sizeof(mp_pool_t));
+    /* We (mis)use the item_alloc_size. It has a slightly different
+     * meaning in the real mempool code where it's aligned, rounded, etc.
+     * That is something we don't want as it would hide small overflows.
+     */
+    m->item_alloc_size = sz;
+    return m;
+}
+
+void *mp_pool_get(mp_pool_t *pool)
+{
+    return malloc(pool->item_alloc_size);
+}
+
+void mp_pool_release(void *item)
+{
+    safe_free(item);
+}
+#else
+
+/** Returns floor(log2(u64)).  If u64 is 0, (incorrectly) returns 0. */
+static int
+tor_log2(uint64_t u64)
+{
+  int r = 0;
+
+  if (u64 >= (1ULL << 32))
+  {
+    u64 >>= 32;
+    r = 32;
+  }
+  if (u64 >= (1ULL << 16))
+  {
+    u64 >>= 16;
+    r += 16;
+  }
+  if (u64 >= (1ULL <<  8))
+  {
+    u64 >>= 8;
+    r += 8;
+  }
+  if (u64 >= (1ULL <<  4))
+  {
+    u64 >>= 4;
+    r += 4;
+  }
+  if (u64 >= (1ULL <<  2))
+  {
+    u64 >>= 2;
+    r += 2;
+  }
+  if (u64 >= (1ULL <<  1))
+  {
+    u64 >>= 1;
+    r += 1;
+  }
+
+  return r;
+}
+
+/** Return the power of 2 in range [1,UINT64_MAX] closest to <b>u64</b>.  If
+ * there are two powers of 2 equally close, round down. */
+static uint64_t
+round_to_power_of_2(uint64_t u64)
+{
+  int lg2;
+  uint64_t low;
+  uint64_t high;
+
+  if (u64 == 0)
+    return 1;
+
+  lg2 = tor_log2(u64);
+  low = 1ULL << lg2;
+
+  if (lg2 == 63)
+    return low;
+
+  high = 1ULL << (lg2 + 1);
+  if (high - u64 < u64 - low)
+    return high;
+  else
+    return low;
+}
+
+/* OVERVIEW:
+ *
+ *     This is an implementation of memory pools for Tor cells.  It may be
+ *     useful for you too.
+ *
+ *     Generally, a memory pool is an allocation strategy optimized for large
+ *     numbers of identically-sized objects.  Rather than the elaborate arena
+ *     and coalescing strategies you need to get good performance for a
+ *     general-purpose malloc(), pools use a series of large memory "chunks",
+ *     each of which is carved into a bunch of smaller "items" or
+ *     "allocations".
+ *
+ *     To get decent performance, you need to:
+ *        - Minimize the number of times you hit the underlying allocator.
+ *        - Try to keep accesses as local in memory as possible.
+ *        - Try to keep the common case fast.
+ *
+ *     Our implementation uses three lists of chunks per pool.  Each chunk can
+ *     be either "full" (no more room for items); "empty" (no items); or
+ *     "used" (not full, not empty).  There are independent doubly-linked
+ *     lists for each state.
+ *
+ * CREDIT:
+ *
+ *     I wrote this after looking at 3 or 4 other pooling allocators, but
+ *     without copying.  The strategy this most resembles (which is funny,
+ *     since that's the one I looked at longest ago) is the pool allocator
+ *     underlying Python's obmalloc code.  Major differences from obmalloc's
+ *     pools are:
+ *       - We don't even try to be threadsafe.
+ *       - We only handle objects of one size.
+ *       - Our list of empty chunks is doubly-linked, not singly-linked.
+ *         (This could change pretty easily; it's only doubly-linked for
+ *         consistency.)
+ *       - We keep a list of full chunks (so we can have a "nuke everything"
+ *         function).  Obmalloc's pools leave full chunks to float unanchored.
+ *
+ * LIMITATIONS:
+ *   - Not even slightly threadsafe.
+ *   - Likes to have lots of items per chunks.
+ *   - One pointer overhead per allocated thing.  (The alternative is
+ *     something like glib's use of an RB-tree to keep track of what
+ *     chunk any given piece of memory is in.)
+ *   - Only aligns allocated things to void* level: redefine ALIGNMENT_TYPE
+ *     if you need doubles.
+ *   - Could probably be optimized a bit; the representation contains
+ *     a bit more info than it really needs to have.
+ */
+
+/* Tuning parameters */
+/** Largest type that we need to ensure returned memory items are aligned to.
+ * Change this to "double" if we need to be safe for structs with doubles. */
+#define ALIGNMENT_TYPE void *
+/** Increment that we need to align allocated. */
+#define ALIGNMENT sizeof(ALIGNMENT_TYPE)
+/** Largest memory chunk that we should allocate. */
+#define MAX_CHUNK (8 *(1L << 20))
+/** Smallest memory chunk size that we should allocate. */
+#define MIN_CHUNK 4096
+
+typedef struct mp_allocated_t mp_allocated_t;
+typedef struct mp_chunk_t mp_chunk_t;
+
+/** Holds a single allocated item, allocated as part of a chunk. */
+struct mp_allocated_t {
+  /** The chunk that this item is allocated in.  This adds overhead to each
+   * allocated item, thus making this implementation inappropriate for
+   * very small items. */
+  mp_chunk_t *in_chunk;
+
+  union {
+    /** If this item is free, the next item on the free list. */
+    mp_allocated_t *next_free;
+
+    /** If this item is not free, the actual memory contents of this item.
+     * (Not actual size.) */
+    char mem[1];
+
+    /** An extra element to the union to insure correct alignment. */
+    ALIGNMENT_TYPE dummy_;
+  } u;
+};
+
+/** 'Magic' value used to detect memory corruption. */
+#define MP_CHUNK_MAGIC 0x09870123
+
+/** A chunk of memory.  Chunks come from malloc; we use them  */
+struct mp_chunk_t {
+  uint32_t magic; /**< Must be MP_CHUNK_MAGIC if this chunk is valid. */
+  mp_chunk_t *next; /**< The next free, used, or full chunk in sequence. */
+  mp_chunk_t *prev; /**< The previous free, used, or full chunk in sequence. */
+  mp_pool_t *pool; /**< The pool that this chunk is part of. */
+
+  /** First free item in the freelist for this chunk.  Note that this may be
+   * NULL even if this chunk is not at capacity: if so, the free memory at
+   * next_mem has not yet been carved into items.
+   */
+  mp_allocated_t *first_free;
+  int n_allocated; /**< Number of currently allocated items in this chunk. */
+  int capacity; /**< Number of items that can be fit into this chunk. */
+  size_t mem_size; /**< Number of usable bytes in mem. */
+  char *next_mem; /**< Pointer into part of <b>mem</b> not yet carved up. */
+  char mem[]; /**< Storage for this chunk. */
+};
+
+static mp_pool_t *mp_allocated_pools = NULL;
+
+/** Number of extra bytes needed beyond mem_size to allocate a chunk. */
+#define CHUNK_OVERHEAD offsetof(mp_chunk_t, mem[0])
+
+/** Given a pointer to a mp_allocated_t, return a pointer to the memory
+ * item it holds. */
+#define A2M(a) (&(a)->u.mem)
+/** Given a pointer to a memory_item_t, return a pointer to its enclosing
+ * mp_allocated_t. */
+#define M2A(p) (((char *)p) - offsetof(mp_allocated_t, u.mem))
+
+void
+mp_pool_init(void)
+{
+  EventAdd(NULL, "mp_pool_garbage_collect", &mp_pool_garbage_collect, NULL, 119*1000, 0);
+}
+
+/** Helper: Allocate and return a new memory chunk for <b>pool</b>.  Does not
+ * link the chunk into any list. */
+static mp_chunk_t *
+mp_chunk_new(mp_pool_t *pool)
+{
+  size_t sz = pool->new_chunk_capacity * pool->item_alloc_size;
+  mp_chunk_t *chunk = safe_alloc(CHUNK_OVERHEAD + sz);
+
+#ifdef MEMPOOL_STATS
+  ++pool->total_chunks_allocated;
+#endif
+  chunk->magic = MP_CHUNK_MAGIC;
+  chunk->capacity = pool->new_chunk_capacity;
+  chunk->mem_size = sz;
+  chunk->next_mem = chunk->mem;
+  chunk->pool = pool;
+  return chunk;
+}
+
+/** Take a <b>chunk</b> that has just been allocated or removed from
+ * <b>pool</b>'s empty chunk list, and add it to the head of the used chunk
+ * list. */
+static void
+add_newly_used_chunk_to_used_list(mp_pool_t *pool, mp_chunk_t *chunk)
+{
+  chunk->next = pool->used_chunks;
+  if (chunk->next)
+    chunk->next->prev = chunk;
+  pool->used_chunks = chunk;
+  assert(!chunk->prev);
+}
+
+/** Return a newly allocated item from <b>pool</b>. */
+void *
+mp_pool_get(mp_pool_t *pool)
+{
+  mp_chunk_t *chunk;
+  mp_allocated_t *allocated;
+
+  if (pool->used_chunks != NULL) {
+    /*
+     * Common case: there is some chunk that is neither full nor empty. Use
+     * that one. (We can't use the full ones, obviously, and we should fill
+     * up the used ones before we start on any empty ones.
+     */
+    chunk = pool->used_chunks;
+
+  } else if (pool->empty_chunks) {
+    /*
+     * We have no used chunks, but we have an empty chunk that we haven't
+     * freed yet: use that. (We pull from the front of the list, which should
+     * get us the most recently emptied chunk.)
+     */
+    chunk = pool->empty_chunks;
+
+    /* Remove the chunk from the empty list. */
+    pool->empty_chunks = chunk->next;
+    if (chunk->next)
+      chunk->next->prev = NULL;
+
+    /* Put the chunk on the 'used' list*/
+    add_newly_used_chunk_to_used_list(pool, chunk);
+
+    assert(!chunk->prev);
+    --pool->n_empty_chunks;
+    if (pool->n_empty_chunks < pool->min_empty_chunks)
+      pool->min_empty_chunks = pool->n_empty_chunks;
+  } else {
+    /* We have no used or empty chunks: allocate a new chunk. */
+    chunk = mp_chunk_new(pool);
+
+    /* Add the new chunk to the used list. */
+    add_newly_used_chunk_to_used_list(pool, chunk);
+  }
+
+  assert(chunk->n_allocated < chunk->capacity);
+
+  if (chunk->first_free) {
+    /* If there's anything on the chunk's freelist, unlink it and use it. */
+    allocated = chunk->first_free;
+    chunk->first_free = allocated->u.next_free;
+    allocated->u.next_free = NULL; /* For debugging; not really needed. */
+    assert(allocated->in_chunk == chunk);
+  } else {
+    /* Otherwise, the chunk had better have some free space left on it. */
+    assert(chunk->next_mem + pool->item_alloc_size <=
+           chunk->mem + chunk->mem_size);
+
+    /* Good, it did.  Let's carve off a bit of that free space, and use
+     * that. */
+    allocated = (void *)chunk->next_mem;
+    chunk->next_mem += pool->item_alloc_size;
+    allocated->in_chunk = chunk;
+    allocated->u.next_free = NULL; /* For debugging; not really needed. */
+  }
+
+  ++chunk->n_allocated;
+#ifdef MEMPOOL_STATS
+  ++pool->total_items_allocated;
+#endif
+
+  if (chunk->n_allocated == chunk->capacity) {
+    /* This chunk just became full. */
+    assert(chunk == pool->used_chunks);
+    assert(chunk->prev == NULL);
+
+    /* Take it off the used list. */
+    pool->used_chunks = chunk->next;
+    if (chunk->next)
+      chunk->next->prev = NULL;
+
+    /* Put it on the full list. */
+    chunk->next = pool->full_chunks;
+    if (chunk->next)
+      chunk->next->prev = chunk;
+    pool->full_chunks = chunk;
+  }
+  /* And return the memory portion of the mp_allocated_t. */
+  return A2M(allocated);
+}
+
+/** Return an allocated memory item to its memory pool. */
+void
+mp_pool_release(void *item)
+{
+  mp_allocated_t *allocated = (void *)M2A(item);
+  mp_chunk_t *chunk = allocated->in_chunk;
+
+  assert(chunk);
+  assert(chunk->magic == MP_CHUNK_MAGIC);
+  assert(chunk->n_allocated > 0);
+
+  allocated->u.next_free = chunk->first_free;
+  chunk->first_free = allocated;
+
+  if (chunk->n_allocated == chunk->capacity) {
+    /* This chunk was full and is about to be used. */
+    mp_pool_t *pool = chunk->pool;
+    /* unlink from the full list  */
+    if (chunk->prev)
+      chunk->prev->next = chunk->next;
+    if (chunk->next)
+      chunk->next->prev = chunk->prev;
+    if (chunk == pool->full_chunks)
+      pool->full_chunks = chunk->next;
+
+    /* link to the used list. */
+    chunk->next = pool->used_chunks;
+    chunk->prev = NULL;
+    if (chunk->next)
+      chunk->next->prev = chunk;
+    pool->used_chunks = chunk;
+  } else if (chunk->n_allocated == 1) {
+    /* This was used and is about to be empty. */
+    mp_pool_t *pool = chunk->pool;
+
+    /* Unlink from the used list */
+    if (chunk->prev)
+      chunk->prev->next = chunk->next;
+    if (chunk->next)
+      chunk->next->prev = chunk->prev;
+    if (chunk == pool->used_chunks)
+      pool->used_chunks = chunk->next;
+
+    /* Link to the empty list */
+    chunk->next = pool->empty_chunks;
+    chunk->prev = NULL;
+    if (chunk->next)
+      chunk->next->prev = chunk;
+    pool->empty_chunks = chunk;
+
+    /* Reset the guts of this chunk to defragment it, in case it gets
+     * used again. */
+    chunk->first_free = NULL;
+    chunk->next_mem = chunk->mem;
+
+    ++pool->n_empty_chunks;
+  }
+
+  --chunk->n_allocated;
+}
+
+/** Allocate a new memory pool to hold items of size <b>item_size</b>. We'll
+ * try to fit about <b>chunk_capacity</b> bytes in each chunk. */
+mp_pool_t *
+mp_pool_new(size_t item_size, size_t chunk_capacity)
+{
+  mp_pool_t *pool;
+  size_t alloc_size, new_chunk_cap;
+
+/*  assert(item_size < SIZE_T_CEILING);
+  assert(chunk_capacity < SIZE_T_CEILING);
+  assert(SIZE_T_CEILING / item_size > chunk_capacity);
+*/
+  pool = safe_alloc(sizeof(mp_pool_t));
+  /*
+   * First, we figure out how much space to allow per item. We'll want to
+   * use make sure we have enough for the overhead plus the item size.
+   */
+  alloc_size = (size_t)(offsetof(mp_allocated_t, u.mem) + item_size);
+  /*
+   * If the item_size is less than sizeof(next_free), we need to make
+   * the allocation bigger.
+   */
+  if (alloc_size < sizeof(mp_allocated_t))
+    alloc_size = sizeof(mp_allocated_t);
+
+  /* If we're not an even multiple of ALIGNMENT, round up. */
+  if (alloc_size % ALIGNMENT) {
+    alloc_size = alloc_size + ALIGNMENT - (alloc_size % ALIGNMENT);
+  }
+  if (alloc_size < ALIGNMENT)
+    alloc_size = ALIGNMENT;
+  assert((alloc_size % ALIGNMENT) == 0);
+
+  /*
+   * Now we figure out how many items fit in each chunk. We need to fit at
+   * least 2 items per chunk. No chunk can be more than MAX_CHUNK bytes long,
+   * or less than MIN_CHUNK.
+   */
+  if (chunk_capacity > MAX_CHUNK)
+    chunk_capacity = MAX_CHUNK;
+
+  /*
+   * Try to be around a power of 2 in size, since that's what allocators like
+   * handing out. 512K-1 byte is a lot better than 512K+1 byte.
+   */
+  chunk_capacity = (size_t) round_to_power_of_2(chunk_capacity);
+  while (chunk_capacity < alloc_size * 2 + CHUNK_OVERHEAD)
+    chunk_capacity *= 2;
+  if (chunk_capacity < MIN_CHUNK)
+    chunk_capacity = MIN_CHUNK;
+
+  new_chunk_cap = (chunk_capacity-CHUNK_OVERHEAD) / alloc_size;
+  assert(new_chunk_cap < INT_MAX);
+  pool->new_chunk_capacity = (int)new_chunk_cap;
+
+  pool->item_alloc_size = alloc_size;
+
+  pool->next = mp_allocated_pools;
+  mp_allocated_pools = pool;
+
+  ircd_log(LOG_DBG, "Capacity is %lu, item size is %lu, alloc size is %lu",
+       (unsigned long)pool->new_chunk_capacity,
+       (unsigned long)pool->item_alloc_size,
+       (unsigned long)(pool->new_chunk_capacity*pool->item_alloc_size));
+
+  return pool;
+}
+
+/** Helper function for qsort: used to sort pointers to mp_chunk_t into
+ * descending order of fullness. */
+static int
+mp_pool_sort_used_chunks_helper(const void *_a, const void *_b)
+{
+  mp_chunk_t *a = *(mp_chunk_t * const *)_a;
+  mp_chunk_t *b = *(mp_chunk_t * const *)_b;
+  return b->n_allocated - a->n_allocated;
+}
+
+/** Sort the used chunks in <b>pool</b> into descending order of fullness,
+ * so that we preferentially fill up mostly full chunks before we make
+ * nearly empty chunks less nearly empty. */
+static void
+mp_pool_sort_used_chunks(mp_pool_t *pool)
+{
+  int i, n = 0, inverted = 0;
+  mp_chunk_t **chunks, *chunk;
+
+  for (chunk = pool->used_chunks; chunk; chunk = chunk->next) {
+    ++n;
+    if (chunk->next && chunk->next->n_allocated > chunk->n_allocated)
+      ++inverted;
+  }
+
+  if (!inverted)
+    return;
+
+  chunks = safe_alloc(sizeof(mp_chunk_t *) * n);
+
+  for (i=0,chunk = pool->used_chunks; chunk; chunk = chunk->next)
+    chunks[i++] = chunk;
+
+  qsort(chunks, n, sizeof(mp_chunk_t *), mp_pool_sort_used_chunks_helper);
+  pool->used_chunks = chunks[0];
+  chunks[0]->prev = NULL;
+
+  for (i = 1; i < n; ++i) {
+    chunks[i - 1]->next = chunks[i];
+    chunks[i]->prev = chunks[i - 1];
+  }
+
+  chunks[n - 1]->next = NULL;
+  safe_free(chunks);
+  mp_pool_assert_ok(pool);
+}
+
+/** If there are more than <b>n</b> empty chunks in <b>pool</b>, free the
+ * excess ones that have been empty for the longest. If
+ * <b>keep_recently_used</b> is true, do not free chunks unless they have been
+ * empty since the last call to this function.
+ **/
+void
+mp_pool_clean(mp_pool_t *pool, int n_to_keep, int keep_recently_used)
+{
+  mp_chunk_t *chunk, **first_to_free;
+
+  mp_pool_sort_used_chunks(pool);
+  assert(n_to_keep >= 0);
+
+  if (keep_recently_used) {
+    int n_recently_used = pool->n_empty_chunks - pool->min_empty_chunks;
+    if (n_to_keep < n_recently_used)
+      n_to_keep = n_recently_used;
+  }
+
+  assert(n_to_keep >= 0);
+
+  first_to_free = &pool->empty_chunks;
+  while (*first_to_free && n_to_keep > 0) {
+    first_to_free = &(*first_to_free)->next;
+    --n_to_keep;
+  }
+  if (!*first_to_free) {
+    pool->min_empty_chunks = pool->n_empty_chunks;
+    return;
+  }
+
+  chunk = *first_to_free;
+  while (chunk) {
+    mp_chunk_t *next = chunk->next;
+    chunk->magic = 0xdeadbeef;
+    safe_free(chunk);
+#ifdef MEMPOOL_STATS
+    ++pool->total_chunks_freed;
+#endif
+    --pool->n_empty_chunks;
+    chunk = next;
+  }
+
+  pool->min_empty_chunks = pool->n_empty_chunks;
+  *first_to_free = NULL;
+}
+
+/** Helper: Given a list of chunks, free all the chunks in the list. */
+static void destroy_chunks(mp_chunk_t *chunk)
+{
+  mp_chunk_t *next;
+
+  while (chunk) {
+    chunk->magic = 0xd3adb33f;
+    next = chunk->next;
+    safe_free(chunk);
+    chunk = next;
+  }
+}
+
+/** Helper: make sure that a given chunk list is not corrupt. */
+static int
+assert_chunks_ok(mp_pool_t *pool, mp_chunk_t *chunk, int empty, int full)
+{
+  mp_allocated_t *allocated;
+  int n = 0;
+
+  if (chunk)
+    assert(chunk->prev == NULL);
+
+  while (chunk) {
+    n++;
+    assert(chunk->magic == MP_CHUNK_MAGIC);
+    assert(chunk->pool == pool);
+    for (allocated = chunk->first_free; allocated;
+         allocated = allocated->u.next_free) {
+      assert(allocated->in_chunk == chunk);
+    }
+    if (empty)
+      assert(chunk->n_allocated == 0);
+    else if (full)
+      assert(chunk->n_allocated == chunk->capacity);
+    else
+      assert(chunk->n_allocated > 0 && chunk->n_allocated < chunk->capacity);
+
+    assert(chunk->capacity == pool->new_chunk_capacity);
+
+    assert(chunk->mem_size ==
+           pool->new_chunk_capacity * pool->item_alloc_size);
+
+    assert(chunk->next_mem >= chunk->mem &&
+           chunk->next_mem <= chunk->mem + chunk->mem_size);
+
+    if (chunk->next)
+      assert(chunk->next->prev == chunk);
+
+    chunk = chunk->next;
+  }
+
+  return n;
+}
+
+/** Fail with an assertion if <b>pool</b> is not internally consistent. */
+void
+mp_pool_assert_ok(mp_pool_t *pool)
+{
+  int n_empty;
+
+  n_empty = assert_chunks_ok(pool, pool->empty_chunks, 1, 0);
+  assert_chunks_ok(pool, pool->full_chunks, 0, 1);
+  assert_chunks_ok(pool, pool->used_chunks, 0, 0);
+
+  assert(pool->n_empty_chunks == n_empty);
+}
+
+void
+mp_pool_garbage_collect(void *arg)
+{
+  mp_pool_t *pool = mp_allocated_pools;
+
+  for (; pool; pool = pool->next)
+    mp_pool_clean(pool, 0, 1);
+}
+
+/** Dump information about <b>pool</b>'s memory usage to the Tor log at level
+ * <b>severity</b>. */
+void
+mp_pool_log_status(mp_pool_t *pool)
+{
+  unsigned long long bytes_used = 0;
+  unsigned long long bytes_allocated = 0;
+  unsigned long long bu = 0, ba = 0;
+  mp_chunk_t *chunk;
+  int n_full = 0, n_used = 0;
+
+  assert(pool);
+
+  for (chunk = pool->empty_chunks; chunk; chunk = chunk->next)
+    bytes_allocated += chunk->mem_size;
+
+  ircd_log(LOG_DBG, "%llu bytes in %d empty chunks",
+       bytes_allocated, pool->n_empty_chunks);
+  for (chunk = pool->used_chunks; chunk; chunk = chunk->next) {
+    ++n_used;
+    bu += chunk->n_allocated * pool->item_alloc_size;
+    ba += chunk->mem_size;
+
+    ircd_log(LOG_DBG, "   used chunk: %d items allocated",
+         chunk->n_allocated);
+  }
+
+  ircd_log(LOG_DBG, "%llu/%llu bytes in %d partially full chunks",
+       bu, ba, n_used);
+  bytes_used += bu;
+  bytes_allocated += ba;
+  bu = ba = 0;
+
+  for (chunk = pool->full_chunks; chunk; chunk = chunk->next) {
+    ++n_full;
+    bu += chunk->n_allocated * pool->item_alloc_size;
+    ba += chunk->mem_size;
+  }
+
+  ircd_log(LOG_DBG, "%llu/%llu bytes in %d full chunks",
+       bu, ba, n_full);
+  bytes_used += bu;
+  bytes_allocated += ba;
+
+  ircd_log(LOG_DBG, "Total: %llu/%llu bytes allocated "
+       "for cell pools are full.",
+       bytes_used, bytes_allocated);
+
+#ifdef MEMPOOL_STATS
+  ircd_log(LOG_DBG, "%llu cell allocations ever; "
+       "%llu chunk allocations ever; "
+       "%llu chunk frees ever.",
+       (long long)pool->total_items_allocated,
+       (long long)pool->total_chunks_allocated,
+       (long long)pool->total_chunks_freed);
+#endif
+}
+#endif
diff --git a/src/misc.c b/src/misc.c
new file mode 100644
index 0000000..5b723e5
--- /dev/null
+++ b/src/misc.c
@@ -0,0 +1,1914 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/misc.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *   Copyright (C) 1999-present UnrealIRCd team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Miscellaneous functions that don't fit in other files.
+ * Generally these are either simple helper functions or larger
+ * functions that don't fit in either user.c, channel.c.
+ */
+
+#include "unrealircd.h"
+
+static void exit_one_client(Client *, MessageTag *mtags_i, const char *);
+
+static char *months[] = {
+	"January", "February", "March", "April",
+	"May", "June", "July", "August",
+	"September", "October", "November", "December"
+};
+
+static char *weekdays[] = {
+	"Sunday", "Monday", "Tuesday", "Wednesday",
+	"Thursday", "Friday", "Saturday"
+};
+
+typedef struct {
+	int value;			/** Unique integer value of item */
+	char character;		/** Unique character assigned to item */
+	char *name;			/** Name of item */
+} BanActTable;
+
+static BanActTable banacttable[] = {
+	{ BAN_ACT_KILL,		'K',	"kill" },
+	{ BAN_ACT_SOFT_KILL,	'i',	"soft-kill" },
+	{ BAN_ACT_TEMPSHUN,	'S',	"tempshun" },
+	{ BAN_ACT_SOFT_TEMPSHUN,'T',	"soft-tempshun" },
+	{ BAN_ACT_SHUN,		's',	"shun" },
+	{ BAN_ACT_SOFT_SHUN,	'H',	"soft-shun" },
+	{ BAN_ACT_KLINE,	'k',	"kline" },
+	{ BAN_ACT_SOFT_KLINE,	'I',	"soft-kline" },
+	{ BAN_ACT_ZLINE,	'z',	"zline" },
+	{ BAN_ACT_GLINE,	'g',	"gline" },
+	{ BAN_ACT_SOFT_GLINE,	'G',	"soft-gline" },
+	{ BAN_ACT_GZLINE,	'Z',	"gzline" },
+	{ BAN_ACT_BLOCK,	'b',	"block" },
+	{ BAN_ACT_SOFT_BLOCK,	'B',	"soft-block" },
+	{ BAN_ACT_DCCBLOCK,	'd',	"dccblock" },
+	{ BAN_ACT_SOFT_DCCBLOCK,'D',	"soft-dccblock" },
+	{ BAN_ACT_VIRUSCHAN,	'v',	"viruschan" },
+	{ BAN_ACT_SOFT_VIRUSCHAN,'V',	"soft-viruschan" },
+	{ BAN_ACT_WARN,		'w',	"warn" },
+	{ BAN_ACT_SOFT_WARN,	'W',	"soft-warn" },
+	{ 0, 0, 0 }
+};
+
+typedef struct {
+	int value;			/** Unique integer value of item */
+	char character;		/** Unique character assigned to item */
+	char *name;			/** Name of item */
+	char *irccommand;	/** Raw IRC command of item (not unique!) */
+} SpamfilterTargetTable;
+
+SpamfilterTargetTable spamfiltertargettable[] = {
+	{ SPAMF_CHANMSG,	'c',	"channel",			"PRIVMSG" },
+	{ SPAMF_USERMSG,	'p',	"private",			"PRIVMSG" },
+	{ SPAMF_USERNOTICE,	'n',	"private-notice",	"NOTICE" },
+	{ SPAMF_CHANNOTICE,	'N',	"channel-notice",	"NOTICE" },
+	{ SPAMF_PART,		'P',	"part",				"PART" },
+	{ SPAMF_QUIT,		'q',	"quit",				"QUIT" },
+	{ SPAMF_DCC,		'd',	"dcc",				"PRIVMSG" },
+	{ SPAMF_USER,		'u',	"user",				"NICK" },
+	{ SPAMF_AWAY,		'a',	"away",				"AWAY" },
+	{ SPAMF_TOPIC,		't',	"topic",			"TOPIC" },
+	{ 0, 0, 0, 0 }
+};
+
+/** IRC Statistics (quite useless?) */
+struct IRCStatistics ircstats;
+
+/** Main IRCd logging function.
+ * @param flags		One of LOG_* (eg: LOG_ERROR)
+ * @param format	Format string
+ * @param ...		Arguments
+ * @note This function is safe to call at all times. It provides
+ *       protection against recursion.
+ */
+void ircd_log(int flags, FORMAT_STRING(const char *format), ...)
+{
+	static int last_log_file_warning = 0;
+	static char recursion_trap=0;
+
+	va_list ap;
+	ConfigItem_log *logs;
+	char buf[2048], timebuf[128];
+	struct stat fstats;
+	int written = 0;
+	int n;
+
+	/* Trap infinite recursions to avoid crash if log file is unavailable,
+	 * this will also avoid calling ircd_log from anything else called
+	 */
+	if (recursion_trap == 1)
+		return;
+
+	recursion_trap = 1;
+
+	/* NOTE: past this point you CANNOT just 'return'.
+	 * You must set 'recursion_trap = 0;' before 'return'!
+	 */
+
+	va_start(ap, format);
+	ircvsnprintf(buf, sizeof(buf), format, ap);
+	va_end(ap);
+	snprintf(timebuf, sizeof(timebuf), "[%s] - ", myctime(TStime()));
+
+	RunHook3(HOOKTYPE_LOG, flags, timebuf, buf);
+	strlcat(buf, "\n", sizeof(buf));
+
+	if (!loop.ircd_forked && (flags & LOG_ERROR))
+		fprintf(stderr, "%s", buf);
+
+	/* In case of './unrealircd configtest': don't write to log file, only to stderr */
+	if (loop.config_test)
+	{
+		recursion_trap = 0;
+		return;
+	}
+
+	for (logs = conf_log; logs; logs = logs->next) {
+#ifdef HAVE_SYSLOG
+		if (!strcasecmp(logs->file, "syslog") && logs->flags & flags) {
+			syslog(LOG_INFO, "%s", buf);
+			written++;
+			continue;
+		}
+#endif
+		if (logs->flags & flags)
+		{
+			if (stat(logs->file, &fstats) != -1 && logs->maxsize && fstats.st_size >= logs->maxsize)
+			{
+				char oldlog[512];
+				if (logs->logfd == -1)
+				{
+					/* Try to open, so we can write the 'Max file size reached' message. */
+#ifndef _WIN32
+					logs->logfd = fd_fileopen(logs->file, O_CREAT|O_APPEND|O_WRONLY);
+#else
+					logs->logfd = fd_fileopen(logs->file, O_CREAT|O_APPEND|O_WRONLY);
+#endif
+				}
+				if (logs->logfd != -1)
+				{
+					if (write(logs->logfd, "Max file size reached, starting new log file\n", 45) < 0)
+					{
+						/* We already handle the unable to write to log file case for normal data.
+						 * I think we can get away with not handling this one.
+						 */
+						;
+					}
+					fd_close(logs->logfd);
+				}
+
+				/* Rename log file to xxxxxx.old */
+				snprintf(oldlog, sizeof(oldlog), "%s.old", logs->file);
+				rename(logs->file, oldlog);
+
+				logs->logfd = fd_fileopen(logs->file, O_CREAT|O_WRONLY|O_TRUNC);
+				if (logs->logfd == -1)
+					continue;
+			}
+			else if (logs->logfd == -1) {
+#ifndef _WIN32
+				logs->logfd = fd_fileopen(logs->file, O_CREAT|O_APPEND|O_WRONLY);
+#else
+				logs->logfd = fd_fileopen(logs->file, O_CREAT|O_APPEND|O_WRONLY);
+#endif
+				if (logs->logfd == -1)
+				{
+					if (!loop.ircd_booted)
+					{
+						config_status("WARNING: Unable to write to '%s': %s", logs->file, strerror(ERRNO));
+					} else {
+						if (last_log_file_warning + 300 < TStime())
+						{
+							config_status("WARNING: Unable to write to '%s': %s. This warning will not re-appear for at least 5 minutes.", logs->file, strerror(ERRNO));
+							last_log_file_warning = TStime();
+						}
+					}
+					continue;
+				}
+			}
+			/* this shouldn't happen, but lets not waste unnecessary syscalls... */
+			if (logs->logfd == -1)
+				continue;
+			if (write(logs->logfd, timebuf, strlen(timebuf)) < 0)
+			{
+				/* Let's ignore any write errors for this one. Next write() will catch it... */
+				;
+			}
+			n = write(logs->logfd, buf, strlen(buf));
+			if (n == strlen(buf))
+			{
+				written++;
+			}
+			else
+			{
+				if (!loop.ircd_booted)
+				{
+					config_status("WARNING: Unable to write to '%s': %s", logs->file, strerror(ERRNO));
+				} else {
+					if (last_log_file_warning + 300 < TStime())
+					{
+						config_status("WARNING: Unable to write to '%s': %s. This warning will not re-appear for at least 5 minutes.", logs->file, strerror(ERRNO));
+						last_log_file_warning = TStime();
+					}
+				}
+			}
+		}
+	}
+
+	recursion_trap = 0;
+}
+
+/** Returns the date in rather long string */
+char *long_date(time_t clock)
+{
+	static char buf[80], plus;
+	struct tm *lt, *gm;
+	struct tm gmbuf;
+	int  minswest;
+
+	if (!clock)
+		time(&clock);
+	gm = gmtime(&clock);
+	memcpy(&gmbuf, gm, sizeof(gmbuf));
+	gm = &gmbuf;
+	lt = localtime(&clock);
+#ifndef _WIN32
+	if (lt->tm_yday == gm->tm_yday)
+		minswest = (gm->tm_hour - lt->tm_hour) * 60 +
+		    (gm->tm_min - lt->tm_min);
+	else if (lt->tm_yday > gm->tm_yday)
+		minswest = (gm->tm_hour - (lt->tm_hour + 24)) * 60;
+	else
+		minswest = ((gm->tm_hour + 24) - lt->tm_hour) * 60;
+#else
+	minswest = (_timezone / 60);
+#endif
+	plus = (minswest > 0) ? '-' : '+';
+	if (minswest < 0)
+		minswest = -minswest;
+	ircsnprintf(buf, sizeof(buf), "%s %s %d %d -- %02d:%02d %c%02d:%02d",
+	    weekdays[lt->tm_wday], months[lt->tm_mon], lt->tm_mday,
+	    1900 + lt->tm_year,
+	    lt->tm_hour, lt->tm_min, plus, minswest / 60, minswest % 60);
+
+	return buf;
+}
+
+/** Convert timestamp to a short date, a la: Wed Jun 30 21:49:08 1993
+ * @returns A short date string, or NULL if the timestamp is invalid
+ * (out of range)
+ * @param ts   The timestamp
+ * @param buf  The buffer to store the string (minimum size: 128 bytes),
+ *             or NULL to use temporary static storage.
+ */
+char *short_date(time_t ts, char *buf)
+{
+	struct tm *t = gmtime(&ts);
+	char *timestr;
+	static char retbuf[128];
+
+	if (!buf)
+		buf = retbuf;
+
+	*buf = '\0';
+	if (!t)
+		return NULL;
+
+	timestr = asctime(t);
+	if (!timestr)
+		return NULL;
+
+	strlcpy(buf, timestr, 128);
+	stripcrlf(buf);
+	return buf;
+}
+
+/** Return a string with the "pretty date" - yeah, another variant */
+char *pretty_date(time_t t)
+{
+	static char buf[128];
+	struct tm *tm;
+
+	if (!t)
+		time(&t);
+	tm = gmtime(&t);
+	snprintf(buf, sizeof(buf), "%04d-%02d-%02d %02d:%02d:%02d GMT",
+	         1900 + tm->tm_year,
+	         tm->tm_mon + 1,
+	         tm->tm_mday,
+	         tm->tm_hour,
+	         tm->tm_min,
+	         tm->tm_sec);
+
+	return buf;
+}
+
+/** Helper function for make_user_host() and friends.
+ * Fixes a string so that the first white space found becomes an end of
+ * string marker (`\-`).  returns the 'fixed' string or "*" if the string
+ * was NULL length or a NULL pointer.
+ */
+char *check_string(char *s)
+{
+	static char star[2] = "*";
+	char *str = s;
+
+	if (BadPtr(s))
+		return star;
+
+	for (; *s; s++)
+		if (isspace(*s))
+		{
+			*s = '\0';
+			break;
+		}
+
+	return (BadPtr(str)) ? star : str;
+}
+
+/** Create a user@host based on the provided name and host */
+char *make_user_host(char *name, char *host)
+{
+	static char namebuf[USERLEN + HOSTLEN + 6];
+	char *s = namebuf;
+
+	memset(namebuf, 0, sizeof(namebuf));
+	name = check_string(name);
+	strlcpy(s, name, USERLEN + 1);
+	s += strlen(s);
+	*s++ = '@';
+	host = check_string(host);
+	strlcpy(s, host, HOSTLEN + 1);
+	s += strlen(s);
+	*s = '\0';
+	return (namebuf);
+}
+
+/** Create a nick!user@host string based on the provided variables.
+ * If any of the variables are NULL, it becomes * (asterisk)
+ * This is the reentrant safe version.
+ */
+char *make_nick_user_host_r(char *namebuf, char *nick, char *name, char *host)
+{
+	char *s = namebuf;
+
+	nick = check_string(nick);
+	strlcpy(namebuf, nick, NICKLEN + 1);
+	s += strlen(s);
+	*s++ = '!';
+	name = check_string(name);
+	strlcpy(s, name, USERLEN + 1);
+	s += strlen(s);
+	*s++ = '@';
+	host = check_string(host);
+	strlcpy(s, host, HOSTLEN + 1);
+	s += strlen(s);
+	*s = '\0';
+	return namebuf;
+}
+
+/** Create a nick!user@host string based on the provided variables.
+ * If any of the variables are NULL, it becomes * (asterisk)
+ * This version uses static storage.
+ */
+char *make_nick_user_host(char *nick, char *name, char *host)
+{
+	static char namebuf[NICKLEN + USERLEN + HOSTLEN + 24];
+
+	return make_nick_user_host_r(namebuf, nick, name, host);
+}
+
+
+/** Similar to ctime() but without a potential newline and
+ * also takes a time_t value rather than a pointer.
+ */
+char *myctime(time_t value)
+{
+	static char buf[28];
+	char *p;
+
+	strlcpy(buf, ctime(&value), sizeof buf);
+	if ((p = strchr(buf, '\n')) != NULL)
+		*p = '\0';
+
+	return buf;
+}
+
+/*
+** get_client_name
+**      Return the name of the client for various tracking and
+**      admin purposes. The main purpose of this function is to
+**      return the "socket host" name of the client, if that
+**	differs from the advertised name (other than case).
+**	But, this can be used to any client structure.
+**
+**	Returns:
+**	  "name[user@ip#.port]" if 'showip' is true;
+**	  "name[sockethost]", if name and sockhost are different and
+**	  showip is false; else
+**	  "name".
+**
+** NOTE 1:
+**	Watch out the allocation of "nbuf", if either client->name
+**	or client->local->sockhost gets changed into pointers instead of
+**	directly allocated within the structure...
+**
+** NOTE 2:
+**	Function return either a pointer to the structure (client) or
+**	to internal buffer (nbuf). *NEVER* use the returned pointer
+**	to modify what it points!!!
+*/
+char *get_client_name(Client *client, int showip)
+{
+	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
+
+	if (MyConnect(client))
+	{
+		if (showip)
+			ircsnprintf(nbuf, sizeof(nbuf), "%s[%s@%s.%u]",
+			    client->name,
+			    IsIdentSuccess(client) ? client->ident : "",
+			    client->ip ? client->ip : "???",
+			    (unsigned int)client->local->port);
+		else
+		{
+			if (mycmp(client->name, client->local->sockhost))
+				ircsnprintf(nbuf, sizeof(nbuf), "%s[%s]",
+				    client->name, client->local->sockhost);
+			else
+				return client->name;
+		}
+		return nbuf;
+	}
+	return client->name;
+}
+
+char *get_client_host(Client *client)
+{
+	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
+
+	if (!MyConnect(client))
+		return client->name;
+	if (!client->local->hostp)
+		return get_client_name(client, FALSE);
+	ircsnprintf(nbuf, sizeof(nbuf), "%s[%-.*s@%-.*s]",
+	    client->name, USERLEN,
+  	    IsIdentSuccess(client) ? client->ident : "",
+	    HOSTLEN, client->local->hostp->h_name);
+	return nbuf;
+}
+
+/*
+ * Set sockhost to 'host'. Skip the user@ part of 'host' if necessary.
+ */
+void set_sockhost(Client *client, char *host)
+{
+	char *s;
+	if ((s = strchr(host, '@')))
+		s++;
+	else
+		s = host;
+	strlcpy(client->local->sockhost, s, sizeof(client->local->sockhost));
+}
+
+/** Returns 1 if 'from' is on the allow list of 'to' */
+int on_dccallow_list(Client *to, Client *from)
+{
+	Link *lp;
+
+	for(lp = to->user->dccallow; lp; lp = lp->next)
+		if(lp->flags == DCC_LINK_ME && lp->value.client == from)
+			return 1;
+	return 0;
+}
+
+/** Delete all DCCALLOW references.
+ * Ultimately, this should be moved to modules/dccallow.c
+ */
+void remove_dcc_references(Client *client)
+{
+	Client *acptr;
+	Link *lp, *nextlp;
+	Link **lpp, *tmp;
+	int found;
+
+	lp = client->user->dccallow;
+	while(lp)
+	{
+		nextlp = lp->next;
+		acptr = lp->value.client;
+		for(found = 0, lpp = &(acptr->user->dccallow); *lpp; lpp=&((*lpp)->next))
+		{
+			if(lp->flags == (*lpp)->flags)
+				continue; /* match only opposite types for sanity */
+			if((*lpp)->value.client == client)
+			{
+				if((*lpp)->flags == DCC_LINK_ME)
+				{
+					sendto_one(acptr, NULL, ":%s %d %s :%s has been removed from "
+						"your DCC allow list for signing off",
+						me.name, RPL_DCCINFO, acptr->name, client->name);
+				}
+				tmp = *lpp;
+				*lpp = tmp->next;
+				free_link(tmp);
+				found++;
+				break;
+			}
+		}
+
+		if(!found)
+			sendto_realops("[BUG] remove_dcc_references:  %s was in dccallowme "
+				"list[%d] of %s but not in dccallowrem list!",
+				acptr->name, lp->flags, client->name);
+
+		free_link(lp);
+		lp = nextlp;
+	}
+}
+
+/*
+ * Recursively send QUITs and SQUITs for cptr and all of it's dependent
+ * clients.  A server needs the client QUITs if it does not support NOQUIT.
+ *    - kaniini
+ */
+static void recurse_send_quits(Client *cptr, Client *client, Client *from, Client *to,
+                               MessageTag *mtags, const char *comment, const char *splitstr)
+{
+	Client *acptr, *next;
+
+	list_for_each_entry_safe(acptr, next, &global_server_list, client_node)
+	{
+		if (acptr->srvptr != client)
+			continue;
+
+		recurse_send_quits(cptr, acptr, from, to, mtags, comment, splitstr);
+	}
+
+	if (cptr == client && to != from)
+		sendto_one(to, mtags, "SQUIT %s :%s", client->name, comment);
+}
+
+/*
+ * Remove all clients that depend on source_p; assumes all (S)QUITs have
+ * already been sent.  we make sure to exit a server's dependent clients
+ * and servers before the server itself; exit_one_client takes care of
+ * actually removing things off llists.   tweaked from +CSr31  -orabidoo
+ */
+static void recurse_remove_clients(Client *client, MessageTag *mtags, const char *comment)
+{
+	Client *acptr, *next;
+
+	list_for_each_entry_safe(acptr, next, &client_list, client_node)
+	{
+		if (acptr->srvptr != client)
+			continue;
+
+		exit_one_client(acptr, mtags, comment);
+	}
+
+	list_for_each_entry_safe(acptr, next, &global_server_list, client_node)
+	{
+		if (acptr->srvptr != client)
+			continue;
+
+		recurse_remove_clients(acptr, mtags, comment);
+		exit_one_client(acptr, mtags, comment);
+	}
+}
+
+/*
+** Remove *everything* that depends on source_p, from all lists, and sending
+** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
+** and its SQUITs have been sent except for the upstream one  -orabidoo
+*/
+static void remove_dependents(Client *client, Client *from, MessageTag *mtags, const char *comment, const char *splitstr)
+{
+	Client *acptr;
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+		recurse_send_quits(client, client, from, acptr, mtags, comment, splitstr);
+
+	recurse_remove_clients(client, mtags, splitstr);
+}
+
+/*
+** Exit one client, local or remote. Assuming all dependants have
+** been already removed, and socket closed for local client.
+*/
+static void exit_one_client(Client *client, MessageTag *mtags_i, const char *comment)
+{
+	Link *lp;
+	Membership *mp;
+
+	assert(!IsMe(client));
+
+	if (IsUser(client))
+	{
+		MessageTag *mtags_o = NULL;
+
+		if (!MyUser(client))
+			RunHook3(HOOKTYPE_REMOTE_QUIT, client, mtags_i, comment);
+
+		new_message_special(client, mtags_i, &mtags_o, ":%s QUIT", client->name);
+		sendto_local_common_channels(client, NULL, 0, mtags_o, ":%s QUIT :%s", client->name, comment);
+		free_message_tags(mtags_o);
+
+		while ((mp = client->user->channel))
+			remove_user_from_channel(client, mp->channel);
+
+		/* Clean up invitefield */
+		while ((lp = client->user->invited))
+			del_invite(client, lp->value.channel);
+		/* again, this is all that is needed */
+
+		/* Clean up dccallow list and (if needed) notify other clients
+		 * that have this person on DCCALLOW that the user just left/got removed.
+		 */
+		remove_dcc_references(client);
+
+		/* For remote clients, we need to check for any outstanding async
+		 * connects attached to this 'client', and set those records to NULL.
+		 * Why not for local? Well, we already do that in close_connection ;)
+		 */
+		if (!MyConnect(client))
+			unrealdns_delreq_bycptr(client);
+	}
+
+	/* Free module related data for this client */
+	moddata_free_client(client);
+	if (MyConnect(client))
+		moddata_free_local_client(client);
+
+	/* Remove client from the client list */
+	if (*client->id)
+	{
+		del_from_id_hash_table(client->id, client);
+		*client->id = '\0';
+	}
+	if (*client->name)
+		del_from_client_hash_table(client->name, client);
+	if (IsUser(client))
+		hash_check_watch(client, RPL_LOGOFF);
+	if (remote_rehash_client == client)
+		remote_rehash_client = NULL; /* client did a /REHASH and QUIT before rehash was complete */
+	remove_client_from_list(client);
+}
+
+/** Exit this IRC client, and all the dependents (users, servers) if this is a server.
+ * @param client        The client to exit.
+ * @param recv_mtags  Message tags to use as a base (if any).
+ * @param comment     The (s)quit message
+ */
+void exit_client(Client *client, MessageTag *recv_mtags, char *comment)
+{
+	long long on_for;
+	ConfigItem_listen *listen_conf;
+	MessageTag *mtags_generated = NULL;
+
+	if (IsDead(client))
+		return; /* Already marked as exited */
+
+	/* We replace 'recv_mtags' here with a newly
+	 * generated id if 'recv_mtags' is NULL or is
+	 * non-NULL and contains no msgid etc.
+	 * This saves us from doing a new_message()
+	 * prior to the exit_client() call at around
+	 * 100+ places elsewhere in the code.
+	 */
+	new_message(client, recv_mtags, &mtags_generated);
+	recv_mtags = mtags_generated;
+
+	if (MyConnect(client))
+	{
+		if (client->local->class)
+		{
+			client->local->class->clients--;
+			if ((client->local->class->flag.temporary) && !client->local->class->clients && !client->local->class->xrefcount)
+			{
+				delete_classblock(client->local->class);
+				client->local->class = NULL;
+			}
+		}
+		if (IsUser(client))
+			irccounts.me_clients--;
+		if (client->serv && client->serv->conf)
+		{
+			client->serv->conf->refcount--;
+			Debug((DEBUG_ERROR, "reference count for %s (%s) is now %d",
+				client->name, client->serv->conf->servername, client->serv->conf->refcount));
+			if (!client->serv->conf->refcount
+			  && client->serv->conf->flag.temporary)
+			{
+				Debug((DEBUG_ERROR, "deleting temporary block %s", client->serv->conf->servername));
+				delete_linkblock(client->serv->conf);
+				client->serv->conf = NULL;
+			}
+		}
+		if (IsServer(client))
+		{
+			irccounts.me_servers--;
+			ircd_log(LOG_SERVER, "SQUIT %s (%s)", client->name, comment);
+		}
+		free_pending_net(client);
+		if (client->local->listener)
+			if (client->local->listener && !IsOutgoing(client))
+			{
+				listen_conf = client->local->listener;
+				listen_conf->clients--;
+				if (listen_conf->flag.temporary && (listen_conf->clients == 0))
+				{
+					/* Call listen cleanup */
+					listen_cleanup();
+				}
+			}
+		SetClosing(client);
+		if (IsUser(client))
+		{
+			RunHook3(HOOKTYPE_LOCAL_QUIT, client, recv_mtags, comment);
+			sendto_connectnotice(client, 1, comment);
+			/* Clean out list and watch structures -Donwulff */
+			hash_del_watch_list(client);
+			on_for = TStime() - client->local->firsttime;
+			if (IsHidden(client))
+				ircd_log(LOG_CLIENT, "Disconnect - (%lld:%lld:%lld) %s!%s@%s [VHOST %s] (%s)",
+					on_for / 3600, (on_for % 3600) / 60, on_for % 60,
+					client->name, client->user->username,
+					client->user->realhost, client->user->virthost, comment);
+			else
+				ircd_log(LOG_CLIENT, "Disconnect - (%lld:%lld:%lld) %s!%s@%s (%s)",
+					on_for / 3600, (on_for % 3600) / 60, on_for % 60,
+					client->name, client->user->username, client->user->realhost, comment);
+		} else
+		if (IsUnknown(client))
+		{
+			RunHook3(HOOKTYPE_UNKUSER_QUIT, client, recv_mtags, comment);
+		}
+
+		if (client->local->fd >= 0 && !IsConnecting(client))
+		{
+			sendto_one(client, NULL, "ERROR :Closing Link: %s (%s)",
+			    get_client_name(client, FALSE), comment);
+		}
+		close_connection(client);
+	}
+	else if (IsUser(client) && !IsULine(client))
+	{
+		if (client->srvptr != &me)
+			sendto_fconnectnotice(client, 1, comment);
+	}
+
+	/*
+	 * Recurse down the client list and get rid of clients who are no
+	 * longer connected to the network (from my point of view)
+	 * Only do this expensive stuff if exited==server -Donwulff
+	 */
+	if (IsServer(client))
+	{
+		char splitstr[HOSTLEN + HOSTLEN + 2];
+
+		assert(client->serv != NULL && client->srvptr != NULL);
+
+		if (FLAT_MAP)
+			strlcpy(splitstr, "*.net *.split", sizeof splitstr);
+		else
+			ircsnprintf(splitstr, sizeof splitstr, "%s %s", client->srvptr->name, client->name);
+
+		remove_dependents(client, client->direction, recv_mtags, comment, splitstr);
+
+		RunHook2(HOOKTYPE_SERVER_QUIT, client, recv_mtags);
+	}
+	else if (IsUser(client) && !IsKilled(client))
+	{
+		sendto_server(client, 0, 0, recv_mtags, ":%s QUIT :%s", client->id, comment);
+	}
+
+	/* Finally, the client/server itself exits.. */
+	exit_one_client(client, recv_mtags, comment);
+
+	free_message_tags(mtags_generated);
+	
+}
+
+/** Initialize the (quite useless) IRC statistics */
+void initstats(void)
+{
+	memset(&ircstats, 0, sizeof(ircstats));
+}
+
+/** Verify operator count, to catch bugs introduced by flawed services */
+void verify_opercount(Client *orig, char *tag)
+{
+	int counted = 0;
+	Client *client;
+	char text[2048];
+
+	list_for_each_entry(client, &client_list, client_node)
+	{
+		if (IsOper(client) && !IsHideOper(client))
+			counted++;
+	}
+	if (counted == irccounts.operators)
+		return;
+	snprintf(text, sizeof(text), "[BUG] operator count bug! value in /lusers is '%d', we counted '%d', "
+	               "user='%s', userserver='%s', tag=%s. Corrected. ",
+	               irccounts.operators, counted, orig->name,
+	               orig->srvptr ? orig->srvptr->name : "<null>", tag ? tag : "<null>");
+#ifdef DEBUGMODE
+	sendto_realops("%s", text);
+#endif
+	ircd_log(LOG_ERROR, "%s", text);
+	irccounts.operators = counted;
+}
+
+/** Check if the specified hostname does not contain forbidden characters.
+ * RETURNS:
+ * 1 if ok, 0 if rejected.
+ */
+int valid_host(char *host)
+{
+	char *p;
+	
+	if (strlen(host) > HOSTLEN)
+		return 0; /* too long hosts are invalid too */
+
+	for (p=host; *p; p++)
+		if (!isalnum(*p) && (*p != '_') && (*p != '-') && (*p != '.') && (*p != ':') && (*p != '/'))
+			return 0;
+
+	return 1;
+}
+
+/*|| BAN ACTION ROUTINES FOLLOW ||*/
+
+/** Converts a banaction string (eg: "kill") to an integer value (eg: BAN_ACT_KILL) */
+BanAction banact_stringtoval(char *s)
+{
+	BanActTable *b;
+
+	for (b = &banacttable[0]; b->value; b++)
+		if (!strcasecmp(s, b->name))
+			return b->value;
+	return 0;
+}
+
+/** Converts a banaction character (eg: 'K') to an integer value (eg: BAN_ACT_KILL) */
+BanAction banact_chartoval(char c)
+{
+	BanActTable *b;
+
+	for (b = &banacttable[0]; b->value; b++)
+		if (b->character == c)
+			return b->value;
+	return 0;
+}
+
+/** Converts a banaction value (eg: BAN_ACT_KILL) to a character value (eg: 'k') */
+char banact_valtochar(BanAction val)
+{
+	BanActTable *b;
+
+	for (b = &banacttable[0]; b->value; b++)
+		if (b->value == val)
+			return b->character;
+	return '\0';
+}
+
+/** Converts a banaction value (eg: BAN_ACT_KLINE) to a string (eg: "kline") */
+char *banact_valtostring(BanAction val)
+{
+	BanActTable *b;
+
+	for (b = &banacttable[0]; b->value; b++)
+		if (b->value == val)
+			return b->name;
+	return "UNKNOWN";
+}
+
+/*|| BAN TARGET ROUTINES FOLLOW ||*/
+
+/** Extract target flags from string 's'. */
+int spamfilter_gettargets(char *s, Client *client)
+{
+SpamfilterTargetTable *e;
+int flags = 0;
+
+	for (; *s; s++)
+	{
+		for (e = &spamfiltertargettable[0]; e->value; e++)
+			if (e->character == *s)
+			{
+				flags |= e->value;
+				break;
+			}
+		if (!e->value && client)
+		{
+			sendnotice(client, "Unknown target type '%c'", *s);
+			return 0;
+		}
+	}
+	return flags;
+}
+
+/** Convert a string with a targetname to an integer value */
+int spamfilter_getconftargets(char *s)
+{
+SpamfilterTargetTable *e;
+
+	for (e = &spamfiltertargettable[0]; e->value; e++)
+		if (!strcmp(s, e->name))
+			return e->value;
+	return 0;
+}
+
+/** Create a string with (multiple) targets from an integer mask */
+char *spamfilter_target_inttostring(int v)
+{
+static char buf[128];
+SpamfilterTargetTable *e;
+char *p = buf;
+
+	for (e = &spamfiltertargettable[0]; e->value; e++)
+		if (v & e->value)
+			*p++ = e->character;
+	*p = '\0';
+	return buf;
+}
+
+/** Replace underscores back to the space character.
+ * This is used for the spamfilter reason.
+ */
+char *unreal_decodespace(char *s)
+{
+	static char buf[512], *i, *o;
+
+	for (i = s, o = buf; (*i) && (o < buf+510); i++)
+		if (*i == '_')
+		{
+			if (i[1] != '_')
+				*o++ = ' ';
+			else {
+				*o++ = '_';
+				i++;
+			}
+		}
+		else
+			*o++ = *i;
+	*o = '\0';
+	return buf;
+}
+
+/** Replace spaces to underscore characters.
+ * This is used for the spamfilter reason.
+ */
+char *unreal_encodespace(char *s)
+{
+	static char buf[512], *i, *o;
+
+	if (!s)
+		return NULL; /* NULL in = NULL out */
+
+	for (i = s, o = buf; (*i) && (o < buf+509); i++)
+	{
+		if (*i == ' ')
+			*o++ = '_';
+		else if (*i == '_')
+		{
+			*o++ = '_';
+			*o++ = '_';
+		}
+		else
+			*o++ = *i;
+	}
+	*o = '\0';
+	return buf;
+}
+
+/** This is basically only used internally by match_spamfilter()... */
+char *cmdname_by_spamftarget(int target)
+{
+	SpamfilterTargetTable *e;
+
+	for (e = &spamfiltertargettable[0]; e->value; e++)
+		if (e->value == target)
+			return e->irccommand;
+	return "???";
+}
+
+/** Returns 1 if this is a channel from set::auto-join or set::oper-auto-join */
+int is_autojoin_chan(char *chname)
+{
+	char buf[512];
+	char *p, *name;
+
+	if (OPER_AUTO_JOIN_CHANS)
+	{
+		strlcpy(buf, OPER_AUTO_JOIN_CHANS, sizeof(buf));
+
+		for (name = strtoken(&p, buf, ","); name; name = strtoken(&p, NULL, ","))
+			if (!strcasecmp(name, chname))
+				return 1;
+	}
+	
+	if (AUTO_JOIN_CHANS)
+	{
+		strlcpy(buf, AUTO_JOIN_CHANS, sizeof(buf));
+
+		for (name = strtoken(&p, buf, ","); name; name = strtoken(&p, NULL, ","))
+			if (!strcasecmp(name, chname))
+				return 1;
+	}
+
+	return 0;
+}
+
+/** Convert a character like 'o' to the corresponding channel flag
+ *  like CHFL_CHANOP.
+ * @param c   The mode character. The only valid values are: vhoaq
+ * @returns One of CHFL_* or 0 if an invalid mode character is specified.
+ */
+int char_to_channelflag(char c)
+{
+	if (c == 'v')
+		return CHFL_VOICE;
+	else if (c == 'h')
+		return CHFL_HALFOP;
+	else if (c == 'o')
+		return CHFL_CHANOP;
+	else if (c == 'a')
+		return CHFL_CHANADMIN;
+	else if (c == 'q')
+		return CHFL_CHANOWNER;
+	return 0;
+}
+
+// FIXME: should detect <U5 ;)
+int mixed_network(void)
+{
+	Client *client;
+	
+	list_for_each_entry(client, &server_list, special_node)
+	{
+		if (!IsServer(client) || IsULine(client))
+			continue; /* skip u-lined servers (=non-unreal, unless you configure your ulines badly, that is) */
+		// uh.. right.. bit hard to detect u4 this way now :D
+	}
+	return 0;
+}
+
+/** Free all masks in the mask list */
+void unreal_delete_masks(ConfigItem_mask *m)
+{
+	ConfigItem_mask *m_next;
+	
+	for (; m; m = m_next)
+	{
+		m_next = m->next;
+
+		safe_free(m->mask);
+
+		safe_free(m);
+	}
+}
+
+/** Internal function to add one individual mask to the list */
+static void unreal_add_mask(ConfigItem_mask **head, ConfigEntry *ce)
+{
+	ConfigItem_mask *m = safe_alloc(sizeof(ConfigItem_mask));
+
+	/* Since we allow both mask "xyz"; and mask { abc; def; };... */
+	if (ce->ce_vardata)
+		safe_strdup(m->mask, ce->ce_vardata);
+	else
+		safe_strdup(m->mask, ce->ce_varname);
+	
+	add_ListItem((ListStruct *)m, (ListStruct **)head);
+}
+
+/** Add mask entries from config */
+void unreal_add_masks(ConfigItem_mask **head, ConfigEntry *ce)
+{
+	if (ce->ce_entries)
+	{
+		ConfigEntry *cep;
+		for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			unreal_add_mask(head, cep);
+	} else
+	{
+		unreal_add_mask(head, ce);
+	}
+}
+
+/** Check if a client matches any of the masks in the mask list */
+int unreal_mask_match(Client *client, ConfigItem_mask *m)
+{
+	for (; m; m = m->next)
+	{
+		/* With special support for '!' prefix (negative matching like "!192.168.*") */
+		if (m->mask[0] == '!')
+		{
+			if (!match_user(m->mask+1, client, MATCH_CHECK_REAL))
+				return 1;
+		} else {
+			if (match_user(m->mask, client, MATCH_CHECK_REAL))
+				return 1;
+		}
+	}
+	
+	return 0;
+}
+
+/** Our own strcasestr implementation because strcasestr is
+ * often not available or is not working correctly.
+ */
+char *our_strcasestr(char *haystack, char *needle)
+{
+	int i;
+	int nlength = strlen(needle);
+	int hlength = strlen(haystack);
+
+	if (nlength > hlength)
+		return NULL;
+
+	if (hlength <= 0)
+		return NULL;
+
+	if (nlength <= 0)
+		return haystack;
+
+	for (i = 0; i <= (hlength - nlength); i++)
+	{
+		if (strncasecmp (haystack + i, needle, nlength) == 0)
+			return haystack + i;
+	}
+
+	return NULL; /* not found */
+}
+
+/** Add a title to the users' WHOIS ("special whois"). Broadcast change to servers.
+ * @param client	The client
+ * @param tag		A tag used internally and for server-to-server traffic,
+ *			not visible to end-users.
+ * @param priority	Priority - for ordering multiple swhois entries
+ * @param swhois	The actual special whois title (string) you want to add to the user
+ * @param from		Who added this entry
+ * @param skip		Which server(-side) to skip broadcasting this entry to.
+ */
+int swhois_add(Client *client, char *tag, int priority, char *swhois, Client *from, Client *skip)
+{
+	SWhois *s;
+
+	/* Make sure the line isn't added yet. If so, then bail out silently. */
+	for (s = client->user->swhois; s; s = s->next)
+		if (!strcmp(s->line, swhois))
+			return -1; /* exists */
+
+	s = safe_alloc(sizeof(SWhois));
+	safe_strdup(s->line, swhois);
+	safe_strdup(s->setby, tag);
+	s->priority = priority;
+	AddListItemPrio(s, client->user->swhois, s->priority);
+	
+	sendto_server(skip, 0, PROTO_EXTSWHOIS, NULL, ":%s SWHOIS %s :%s",
+		from->id, client->id, swhois);
+
+	sendto_server(skip, PROTO_EXTSWHOIS, 0, NULL, ":%s SWHOIS %s + %s %d :%s",
+		from->id, client->id, tag, priority, swhois);
+
+	return 0;
+}
+
+/** Delete swhois title(s).
+ * Delete swhois by tag and swhois. Then broadcast this change to all other servers.
+ * @param client	The client
+ * @param tag		A tag used internally and for server-to-server traffic,
+ *			not visible to end-users.
+ * @param swhois	The actual special whois title (string) you are removing
+ * @param from		Who added this entry earlier on
+ * @param skip		Which server(-side) to skip broadcasting this entry to.
+ * @note If you use swhois "*" then it will remove all swhois titles for that tag
+ */
+int swhois_delete(Client *client, char *tag, char *swhois, Client *from, Client *skip)
+{
+	SWhois *s, *s_next;
+	int ret = -1; /* default to 'not found' */
+	
+	for (s = client->user->swhois; s; s = s_next)
+	{
+		s_next = s->next;
+		
+		/* If ( same swhois or "*" ) AND same tag */
+		if ( ((!strcmp(s->line, swhois) || !strcmp(swhois, "*")) &&
+		    !strcmp(s->setby, tag)))
+		{
+			DelListItem(s, client->user->swhois);
+			safe_free(s->line);
+			safe_free(s->setby);
+			safe_free(s);
+
+			sendto_server(skip, 0, PROTO_EXTSWHOIS, NULL, ":%s SWHOIS %s :",
+				from->id, client->id);
+
+			sendto_server(skip, PROTO_EXTSWHOIS, 0, NULL, ":%s SWHOIS %s - %s %d :%s",
+				from->id, client->id, tag, 0, swhois);
+			
+			ret = 0;
+		}
+	}
+
+	return ret;
+}
+
+/** Is this user using a websocket? (LOCAL USERS ONLY) */
+int IsWebsocket(Client *client)
+{
+	ModDataInfo *md = findmoddata_byname("websocket", MODDATATYPE_CLIENT);
+	if (!md)
+		return 0; /* websocket module not loaded */
+	return (MyConnect(client) && moddata_client(client, md).ptr) ? 1 : 0;
+}
+
+extern void send_raw_direct(Client *user, FORMAT_STRING(const char *pattern), ...);
+
+/** Generic function to inform the user he/she has been banned.
+ * @param client   The affected client.
+ * @param bantype  The ban type, such as: "K-Lined", "G-Lined" or "realname".
+ * @param reason   The specified reason.
+ * @param global   Whether the ban is global (1) or for this server only (0)
+ * @param noexit   Set this to NO_EXIT_CLIENT to make us not call exit_client().
+ *                 This is really only needed from the accept code, do not
+ *                 use it anywhere else. No really, never.
+ *
+ * @note This function will call exit_client() appropriately.
+ */
+void banned_client(Client *client, char *bantype, char *reason, int global, int noexit)
+{
+	char buf[512];
+	char *fmt = global ? iConf.reject_message_gline : iConf.reject_message_kline;
+	const char *vars[6], *values[6];
+
+	if (!MyConnect(client))
+		abort(); /* hmm... or be more flexible? */
+
+	/* This was: "You are not welcome on this %s. %s: %s. %s" but is now dynamic: */
+	vars[0] = "bantype";
+	values[0] = bantype;
+	vars[1] = "banreason";
+	values[1] = reason;
+	vars[2] = "klineaddr";
+	values[2] = KLINE_ADDRESS;
+	vars[3] = "glineaddr";
+	values[3] = GLINE_ADDRESS ? GLINE_ADDRESS : KLINE_ADDRESS; /* fallback to klineaddr */
+	vars[4] = "ip";
+	values[4] = GetIP(client);
+	vars[5] = NULL;
+	values[5] = NULL;
+	buildvarstring(fmt, buf, sizeof(buf), vars, values);
+
+	/* This is a bit extensive but we will send both a YOUAREBANNEDCREEP
+	 * and a notice to the user.
+	 * The YOUAREBANNEDCREEP will be helpful for the client since it makes
+	 * clear the user should not quickly reconnect, as (s)he is banned.
+	 * The notice still needs to be there because it stands out well
+	 * at most IRC clients.
+	 */
+	if (noexit != NO_EXIT_CLIENT)
+	{
+		sendnumeric(client, ERR_YOUREBANNEDCREEP, buf);
+		sendnotice(client, "%s", buf);
+	} else {
+		send_raw_direct(client, ":%s %d %s :%s",
+		         me.name, ERR_YOUREBANNEDCREEP,
+		         (*client->name ? client->name : "*"),
+		         buf);
+		send_raw_direct(client, ":%s NOTICE %s :%s",
+		         me.name, (*client->name ? client->name : "*"), buf);
+	}
+
+	/* The final message in the ERROR is shorter. */
+	if (HIDE_BAN_REASON && IsRegistered(client))
+		snprintf(buf, sizeof(buf), "Banned (%s)", bantype);
+	else
+		snprintf(buf, sizeof(buf), "Banned (%s): %s", bantype, reason);
+
+	if (noexit != NO_EXIT_CLIENT)
+	{
+		exit_client(client, NULL, buf);
+	} else {
+		/* Special handling for direct Z-line code */
+		send_raw_direct(client, "ERROR :Closing Link: [%s] (%s)",
+		           client->ip, buf);
+	}
+}
+
+/** Our stpcpy implementation - discouraged due to lack of bounds checking */
+char *mystpcpy(char *dst, const char *src)
+{
+	for (; *src; src++)
+		*dst++ = *src;
+	*dst = '\0';
+	return dst;
+}
+
+/** Helper function for send_channel_modes_sjoin3() and cmd_sjoin()
+ * to build the SJSBY prefix which is <seton,setby> to
+ * communicate when the ban was set and by whom.
+ * @param buf   The buffer to write to
+ * @param setby The setter of the "ban"
+ * @param seton The time the "ban" was set
+ * @retval The number of bytes written EXCLUDING the NUL byte,
+ *         so similar to what strlen() would have returned.
+ * @note Caller must ensure that the buffer 'buf' is of sufficient size.
+ */
+size_t add_sjsby(char *buf, char *setby, time_t seton)
+{
+	char tbuf[32];
+	char *p = buf;
+
+	snprintf(tbuf, sizeof(tbuf), "%ld", (long)seton);
+
+	*p++ = '<';
+	p = mystpcpy(p, tbuf);
+	*p++ = ',';
+	p = mystpcpy(p, setby);
+	*p++ = '>';
+	*p = '\0';
+
+	return p - buf;
+}
+
+/** Concatenate the entire parameter string.
+ * The function will take care of spaces in the final parameter (if any).
+ * @param buf   The buffer to output in.
+ * @param len   Length of the buffer.
+ * @param parc  Parameter count, ircd style.
+ * @param parv  Parameters, ircd style, so we will start at parv[1].
+ * @section ex1 Example
+ * @code
+ * char buf[512];
+ * concat_params(buf, sizeof(buf), parc, parv);
+ * sendto_server(client, 0, 0, recv_mtags, ":%s SOMECOMMAND %s", client->name, buf);
+ * @endcode
+ */
+void concat_params(char *buf, int len, int parc, char *parv[])
+{
+	int i;
+
+	*buf = '\0';
+	for (i = 1; i < parc; i++)
+	{
+		char *param = parv[i];
+
+		if (!param)
+			break;
+
+		if (*buf)
+			strlcat(buf, " ", len);
+
+		if (strchr(param, ' ') || (*param == ':'))
+		{
+			/* Last parameter, with : */
+			strlcat(buf, ":", len);
+			strlcat(buf, parv[i], len);
+			break;
+		}
+		strlcat(buf, parv[i], len);
+	}
+}
+
+/** Find a particular message-tag in the 'mtags' list */
+MessageTag *find_mtag(MessageTag *mtags, const char *token)
+{
+	for (; mtags; mtags = mtags->next)
+		if (!strcmp(mtags->name, token))
+			return mtags;
+	return NULL;
+}
+
+/** Free all message tags in the list 'm' */
+void free_message_tags(MessageTag *m)
+{
+	MessageTag *m_next;
+
+	for (; m; m = m_next)
+	{
+		m_next = m->next;
+		safe_free(m->name);
+		safe_free(m->value);
+		safe_free(m);
+	}
+}
+
+/** Duplicate a MessageTag structure.
+ * @note  This duplicate a single MessageTag.
+ *        It does not duplicate an entire linked list.
+ */
+MessageTag *duplicate_mtag(MessageTag *mtag)
+{
+	MessageTag *m = safe_alloc(sizeof(MessageTag));
+	safe_strdup(m->name, mtag->name);
+	safe_strdup(m->value, mtag->value);
+	return m;
+}
+
+/** New message. Either really brand new, or inherited from other servers.
+ * This function calls modules so they can add tags, such as:
+ * msgid, time and account.
+ */
+void new_message(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list)
+{
+	Hook *h;
+	for (h = Hooks[HOOKTYPE_NEW_MESSAGE]; h; h = h->next)
+		(*(h->func.voidfunc))(sender, recv_mtags, mtag_list, NULL);
+}
+
+/** New message - SPECIAL edition. Either really brand new, or inherited
+ * from other servers.
+ * This function calls modules so they can add tags, such as:
+ * msgid, time and account.
+ * This special version deals in a special way with msgid in particular.
+ * TODO: document
+ * The pattern and vararg create a 'signature', this is normally
+ * identical to the message that is sent to clients (end-users).
+ * For example ":xyz JOIN #chan".
+ */
+void new_message_special(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, FORMAT_STRING(const char *pattern), ...)
+{
+	Hook *h;
+	va_list vl;
+	char buf[512];
+
+	va_start(vl, pattern);
+	ircvsnprintf(buf, sizeof(buf), pattern, vl);
+	va_end(vl);
+
+	for (h = Hooks[HOOKTYPE_NEW_MESSAGE]; h; h = h->next)
+		(*(h->func.voidfunc))(sender, recv_mtags, mtag_list, buf);
+}
+
+/** Default handler for parse_message_tags().
+ * This is only used if the 'mtags' module is NOT loaded,
+ * which would be quite unusual, but possible.
+ */
+void parse_message_tags_default_handler(Client *client, char **str, MessageTag **mtag_list)
+{
+	/* Just skip everything until the space character */
+	for (; **str && **str != ' '; *str = *str + 1);
+}
+
+/** Default handler for mtags_to_string().
+ * This is only used if the 'mtags' module is NOT loaded,
+ * which would be quite unusual, but possible.
+ */
+char *mtags_to_string_default_handler(MessageTag *m, Client *client)
+{
+	return NULL;
+}
+
+/** Default handler for add_silence().
+ * This is only used if the 'silence' module is NOT loaded,
+ * which would be unusual, but possible.
+ */
+int add_silence_default_handler(Client *client, const char *mask, int senderr)
+{
+	return 0;
+}
+
+/** Default handler for del_silence().
+ * This is only used if the 'silence' module is NOT loaded,
+ * which would be unusual, but possible.
+ */
+int del_silence_default_handler(Client *client, const char *mask)
+{
+	return 0;
+}
+
+/** Default handler for is_silenced().
+ * This is only used if the 'silence' module is NOT loaded,
+ * which would be unusual, but possible.
+ */
+int is_silenced_default_handler(Client *client, Client *acptr)
+{
+	return 0;
+}
+
+/** Generate a BATCH id.
+ * This can be used in a :serv BATCH +%s ... message
+ */
+void generate_batch_id(char *str)
+{
+	gen_random_alnum(str, BATCHLEN);
+}
+
+/** A default handler if labeled-response module is not loaded.
+ * Normally a NOOP, but since caller will safe_free it
+ * later we do actually allocate something.
+ */
+void *labeled_response_save_context_default_handler(void)
+{
+	return safe_alloc(8);
+}
+
+/** A default handler for if labeled-response module is not loaded */
+void labeled_response_set_context_default_handler(void *ctx)
+{
+}
+
+/** A default handler for if labeled-response module is not loaded */
+void labeled_response_force_end_default_handler(void)
+{
+}
+
+/** my_timegm: mktime()-like function which will use GMT/UTC.
+ * Strangely enough there is no standard function for this.
+ * On some *NIX OS's timegm() may be available, sometimes only
+ * with the help of certain #define's which we may or may
+ * not do.
+ * Windows provides _mkgmtime().
+ * In the other cases the man pages and basically everyone
+ * suggests to set TZ to empty prior to calling mktime and
+ * restoring it after the call. Whut? How ridiculous is that?
+ */
+time_t my_timegm(struct tm *tm)
+{
+#if HAVE_TIMEGM
+	return timegm(tm);
+#elif defined(_WIN32)
+	return _mkgmtime(tm);
+#else
+	time_t ret;
+	char *tz = NULL;
+
+	safe_strdup(tz, getenv("TZ"));
+	setenv("TZ", "", 1);
+	ret = mktime(tm);
+	if (tz)
+	{
+		setenv("TZ", tz, 1);
+		safe_free(tz);
+	} else {
+		unsetenv("TZ");
+	}
+	tzset();
+
+	return ret;
+#endif
+}
+
+/** Convert an ISO 8601 timestamp ('server-time') to UNIX time */
+time_t server_time_to_unix_time(const char *tbuf)
+{
+	struct tm tm;
+	int dontcare = 0;
+	time_t ret;
+
+	if (!tbuf)
+	{
+		ircd_log(LOG_ERROR, "[BUG] server_time_to_unix_time() failed for NULL item. Incorrect S2S traffic?");
+		return 0;
+	}
+
+	if (strlen(tbuf) < 20)
+	{
+		ircd_log(LOG_ERROR, "[BUG] server_time_to_unix_time() failed for short item '%s'", tbuf);
+		return 0;
+	}
+
+	memset(&tm, 0, sizeof(tm));
+	ret = sscanf(tbuf, "%d-%d-%dT%d:%d:%d.%dZ",
+		&tm.tm_year,
+		&tm.tm_mon,
+		&tm.tm_mday,
+		&tm.tm_hour,
+		&tm.tm_min,
+		&tm.tm_sec,
+		&dontcare);
+
+	if (ret != 7)
+	{
+		ircd_log(LOG_ERROR, "[BUG] server_time_to_unix_time() failed for '%s'", tbuf);
+		return 0;
+	}
+
+	tm.tm_year -= 1900;
+	tm.tm_mon -= 1;
+
+	ret = my_timegm(&tm);
+	return ret;
+}
+
+/** Write a 64 bit integer to a file.
+ * @param fd   File descriptor
+ * @param t    The value to write
+ * @returns 1 on success, 0 on failure.
+ */
+int write_int64(FILE *fd, uint64_t t)
+{
+	if (fwrite(&t, 1, sizeof(t), fd) < sizeof(t))
+		return 0;
+	return 1;
+}
+
+/** Write a 32 bit integer to a file.
+ * @param fd   File descriptor
+ * @param t    The value to write
+ * @returns 1 on success, 0 on failure.
+ */
+int write_int32(FILE *fd, uint32_t t)
+{
+	if (fwrite(&t, 1, sizeof(t), fd) < sizeof(t))
+		return 0;
+	return 1;
+}
+
+/** Read a 64 bit integer from a file.
+ * @param fd   File descriptor
+ * @param t    The value to write
+ * @returns 1 on success, 0 on failure.
+ */
+int read_int64(FILE *fd, uint64_t *t)
+{
+	if (fread(t, 1, sizeof(uint64_t), fd) < sizeof(uint64_t))
+		return 0;
+	return 1;
+}
+
+/** Read a 32 bit integer from a file.
+ * @param fd   File descriptor
+ * @param t    The value to write
+ * @returns 1 on success, 0 on failure.
+ */
+int read_int32(FILE *fd, uint32_t *t)
+{
+	if (fread(t, 1, sizeof(uint32_t), fd) < sizeof(uint32_t))
+		return 0;
+	return 1;
+}
+
+/** Read binary data from a file.
+ * @param fd   File descriptor
+ * @param buf  Pointer to buffer
+ * @param len  Size of buffer
+ * @note  This function is not used much, in most cases
+ *        you should use read_str(), read_int32() or
+ *        read_int64() instead.
+ * @returns 1 on success, 0 on failure.
+ */
+int read_data(FILE *fd, void *buf, size_t len)
+{
+	if (fread(buf, 1, len, fd) < len)
+		return 0;
+	return 1;
+}
+
+/** Write binary data to a file.
+ * @param fd   File descriptor
+ * @param buf  Pointer to buffer
+ * @param len  Size of buffer
+ * @note  This function is not used much, in most cases
+ *        you should use write_str(), write_int32() or
+ *        write_int64() instead.
+ * @returns 1 on success, 0 on failure.
+ */
+int write_data(FILE *fd, const void *buf, size_t len)
+{
+	if (fwrite(buf, 1, len, fd) < len)
+		return 0;
+	return 1;
+}
+
+/** Write a string to a file.
+ * @param fd   File descriptor
+ * @param x    Pointer to string
+ * @note  This function can write a string up to 65534
+ *        characters, which should be plenty for usage
+ *        in UnrealIRCd.
+ *        Note that 'x' can safely be NULL.
+ * @returns 1 on success, 0 on failure.
+ */
+int write_str(FILE *fd, char *x)
+{
+	uint16_t len;
+
+	len = x ? strlen(x) : 0xffff;
+	if (!write_data(fd, &len, sizeof(len)))
+		return 0;
+	if ((len > 0) && (len < 0xffff))
+	{
+		if (!write_data(fd, x, len))
+			return 0;
+	}
+	return 1;
+}
+
+/** Read a string from a file.
+ * @param fd   File descriptor
+ * @param x    Pointer to string pointer
+ * @note  This function will allocate memory for the data
+ *        and set the string pointer to this value.
+ *        If a NULL pointer was written via write_str()
+ *        then read_str() may also return a NULL pointer.
+ * @returns 1 on success, 0 on failure.
+ */
+int read_str(FILE *fd, char **x)
+{
+	uint16_t len;
+	size_t size;
+
+	*x = NULL;
+
+	if (!read_data(fd, &len, sizeof(len)))
+		return 0;
+
+	if (len == 0xffff)
+	{
+		/* Magic value meaning NULL */
+		*x = NULL;
+		return 1;
+	}
+
+	if (len == 0)
+	{
+		/* 0 means empty string */
+		safe_strdup(*x, "");
+		return 1;
+	}
+
+	if (len > 10000)
+		return 0;
+
+	size = len;
+	*x = safe_alloc(size + 1);
+	if (!read_data(fd, *x, size))
+	{
+		safe_free(*x);
+		return 0;
+	}
+	(*x)[len] = 0;
+	return 1;
+}
+
+/** Generates an MD5 checksum.
+ * @param mdout[out] Buffer to store result in, the result will be 16 bytes in binary
+ *                   (not ascii printable!).
+ * @param src[in]    The input data used to generate the checksum.
+ * @param n[in]      Length of data.
+ */
+void DoMD5(char *mdout, const char *src, unsigned long n)
+{
+	MD5_CTX hash;
+
+	MD5_Init(&hash);
+	MD5_Update(&hash, src, n);
+	MD5_Final(mdout, &hash);
+}
+
+/** Generates an MD5 checksum - ASCII printable string (0011223344..etc..).
+ * @param dst[out]  Buffer to store result in, this will be the result will be
+ *                  32 characters + nul terminator, so needs to be at least 33 characters.
+ * @param src[in]   The input data used to generate the checksum.
+ * @param n[in]     Length of data.
+ */
+char *md5hash(char *dst, const char *src, unsigned long n)
+{
+	char tmp[16];
+	SHA256_CTX hash;
+
+	DoMD5(tmp, src, n);
+	sprintf(dst, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+		tmp[0], tmp[1], tmp[2], tmp[3], tmp[4], tmp[5], tmp[6], tmp[7], tmp[8],
+		tmp[9], tmp[10], tmp[11], tmp[12], tmp[13], tmp[14], tmp[15]);
+
+	return dst;
+}
+
+/** Convert binary 'data' of size 'len' to a hexadecimal string 'str'.
+ * The caller is responsible to ensure that 'str' is sufficiently large.
+ */
+void binarytohex(void *data, size_t len, char *str)
+{
+	const char hexchars[16] = "0123456789abcdef";
+	char *datastr = (char *)data;
+	int i, n = 0;
+
+	for (i=0; i<len; i++)
+	{
+		str[n++] = hexchars[(datastr[i] >> 4) & 0xF];
+		str[n++] = hexchars[datastr[i] & 0xF];
+	}
+	str[n] = '\0';
+}
+
+/** Calculate the SHA256 checksum of a file */
+char *sha256sum_file(const char *fname)
+{
+	FILE *fd;
+	char buf[2048];
+	SHA256_CTX hash;
+	char binaryhash[SHA256_DIGEST_LENGTH];
+	static char hexhash[SHA256_DIGEST_LENGTH*2+1];
+	int n;
+
+	fd = fopen(fname, "rb");
+	if (!fd)
+		return NULL;
+
+	SHA256_Init(&hash);
+	while ((n = fread(buf, 1, sizeof(buf), fd)) > 0)
+	{
+		SHA256_Update(&hash, buf, n);
+	}
+	fclose(fd);
+	SHA256_Final(binaryhash, &hash);
+	binarytohex(binaryhash, sizeof(binaryhash), hexhash);
+	return hexhash;
+}
+
+/** Remove a suffix from a filename, eg ".c" (if it is present) */
+char *filename_strip_suffix(const char *fname, const char *suffix)
+{
+	static char buf[512];
+
+	strlcpy(buf, fname, sizeof(buf));
+
+	if (suffix)
+	{
+		int buf_len = strlen(buf);
+		int suffix_len = strlen(suffix);
+		if (buf_len >= suffix_len)
+		{
+			if (!strncmp(buf+buf_len-suffix_len, suffix, suffix_len))
+				buf[buf_len-suffix_len] = '\0';
+		}
+	} else {
+		char *p = strrchr(buf, '.');
+		if (p)
+			*p = '\0';
+	}
+	return buf;
+}
+
+/** Add a suffix to a filename, eg ".c" */
+char *filename_add_suffix(const char *fname, const char *suffix)
+{
+	static char buf[512];
+	snprintf(buf, sizeof(buf), "%s%s", fname, suffix);
+	return buf;
+}
+
+/* Returns 1 if the filename has the suffix, eg ".c" */
+int filename_has_suffix(const char *fname, const char *suffix)
+{
+	char buf[256];
+	char *p;
+	strlcpy(buf, fname, sizeof(buf));
+	p = strrchr(buf, '.');
+	if (!p)
+		return 0;
+	if (!strcmp(p, suffix))
+		return 1;
+	return 0;
+}
+
+/** Add a line to a MultiLine list */
+void addmultiline(MultiLine **l, char *line)
+{
+	MultiLine *m = safe_alloc(sizeof(MultiLine));
+	safe_strdup(m->line, line);
+	append_ListItem((ListStruct *)m, (ListStruct **)l);
+}
+
+/** Free an entire MultiLine list */
+void freemultiline(MultiLine *l)
+{
+	MultiLine *l_next;
+	for (; l; l = l_next)
+	{
+		l_next = l->next;
+		safe_free(l->line);
+		safe_free(l);
+	}
+}
diff --git a/src/modulemanager.c b/src/modulemanager.c
new file mode 100644
index 0000000..6012bda
--- /dev/null
+++ b/src/modulemanager.c
@@ -0,0 +1,1692 @@
+/* UnrealIRCd module manager.
+ * (C) Copyright 2019 Bram Matthys ("Syzop") and the UnrealIRCd Team.
+ * License: GPLv2
+ * See https://www.unrealircd.org/docs/Module_manager for user documentation.
+ */
+
+#include "unrealircd.h"
+#ifndef _WIN32
+#include <dirent.h>
+
+#define MODULEMANAGER_CONNECT_TIMEOUT	7
+#define MODULEMANAGER_READ_TIMEOUT	20
+
+typedef struct ManagedModule ManagedModule;
+
+struct ManagedModule
+{
+	ManagedModule *prev, *next;
+	char *repo_url;
+	char *name;
+	char *author;
+	char *troubleshooting;
+	char *documentation;
+	char *version;
+	char *source;
+	char *sha256sum;
+	char *min_unrealircd_version;
+	char *max_unrealircd_version;
+	char *description;
+	MultiLine *post_install_text;
+};
+
+static ManagedModule *managed_modules = NULL;
+
+/* We normally do a 'make install' after upgrading a module.
+ * However we will skip it if --no-install is done.
+ * This is only done during 'make', as it is unexpected to
+ * already install modules at the final location before
+ * 'make install' was issued.
+ */
+static int no_make_install = 0;
+
+/* Forward declarations */
+int mm_valid_module_name(char *name);
+void free_managed_module(ManagedModule *m);
+
+
+SSL_CTX *mm_init_ssl(void)
+{
+	SSL_CTX *ctx_client;
+	char buf1[512], buf2[512];
+	char *curl_ca_bundle = buf1;
+	
+	SSL_load_error_strings();
+	SSLeay_add_ssl_algorithms();
+
+	ctx_client = SSL_CTX_new(SSLv23_client_method());
+	if (!ctx_client)
+		return NULL;
+#ifdef HAS_SSL_CTX_SET_MIN_PROTO_VERSION
+	SSL_CTX_set_min_proto_version(ctx_client, TLS1_2_VERSION);
+#endif
+	SSL_CTX_set_options(ctx_client, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1);
+
+	/* Verify peer certificate */
+	snprintf(buf1, sizeof(buf1), "%s/tls/curl-ca-bundle.crt", CONFDIR);
+	if (!file_exists(buf1))
+	{
+		snprintf(buf2, sizeof(buf2), "%s/doc/conf/tls/curl-ca-bundle.crt", BUILDDIR);
+		if (!file_exists(buf2))
+		{
+			fprintf(stderr, "ERROR: Neither %s nor %s exist.\n"
+			                "Cannot use module manager without curl-ca-bundle.crt\n",
+			                buf1, buf2);
+			exit(-1);
+		}
+		curl_ca_bundle = buf2;
+	}
+	SSL_CTX_load_verify_locations(ctx_client, curl_ca_bundle, NULL);
+	SSL_CTX_set_verify(ctx_client, SSL_VERIFY_PEER, NULL);
+
+	/* Limit ciphers as well */
+	SSL_CTX_set_cipher_list(ctx_client, UNREALIRCD_DEFAULT_CIPHERS);
+
+	return ctx_client;
+}	
+
+int parse_url(const char *url, char **host, int *port, char **document)
+{
+	char *p;
+	static char hostbuf[256];
+	static char documentbuf[512];
+
+	if (strncmp(url, "https://", 8))
+	{
+		fprintf(stderr, "ERROR: URL Must start with https! URL: %s\n", url);
+		return 0;
+	}
+	url += 8; /* skip over https:// part */
+
+	p = strchr(url, '/');
+	if (!p)
+		return 0;
+
+	*hostbuf = '\0';
+	strlncat(hostbuf, url, sizeof(hostbuf), p - url);
+
+	strlcpy(documentbuf, p, sizeof(documentbuf));
+
+	*host = hostbuf;
+	*document = documentbuf;
+	// TODO: parse port, rather than hardcode:
+	*port = 443;
+	return 1;
+}
+
+int mm_http_request(char *url, char *fname, int follow_redirects)
+{
+	char *host = NULL;
+	int port = 0;
+	char *document = NULL;
+	char hostandport[256];
+	char buf[1024];
+	int n;
+	FILE *fd;
+	SSL_CTX *ctx_client;
+	SSL *ssl = NULL;
+	BIO *socket = NULL;
+	char *errstr = NULL;
+	int got_data = 0, first_line = 1;
+	int http_redirect = 0;
+
+	if (!parse_url(url, &host, &port, &document))
+		return 0;
+
+	snprintf(hostandport, sizeof(hostandport), "%s:%d", host, port);
+
+	ctx_client = mm_init_ssl();
+	if (!ctx_client)
+	{
+		fprintf(stderr, "ERROR: TLS initalization failure (I)\n");
+		return 0;
+	}
+
+	alarm(MODULEMANAGER_CONNECT_TIMEOUT);
+
+	socket = BIO_new_ssl_connect(ctx_client);
+	if (!socket)
+	{
+		fprintf(stderr, "ERROR: TLS initalization failure (II)\n");
+		goto out1;
+	}
+
+	BIO_get_ssl(socket, &ssl);
+	if (!ssl)
+	{
+		fprintf(stderr, "ERROR: Could not get TLS connection from BIO -- strange\n");
+		goto out2;
+	}
+	
+	BIO_set_conn_hostname(socket, hostandport);
+	SSL_set_tlsext_host_name(ssl, host);
+
+	if (BIO_do_connect(socket) != 1)
+	{
+		fprintf(stderr, "ERROR: Could not connect to %s\n", hostandport);
+		config_report_ssl_error();
+		goto out2;
+	}
+	
+	if (BIO_do_handshake(socket) != 1)
+	{
+		fprintf(stderr, "ERROR: Could not connect to %s (TLS handshake failed)\n", hostandport);
+		config_report_ssl_error();
+		goto out2;
+	}
+
+	if (!verify_certificate(ssl, host, &errstr))
+	{
+		fprintf(stderr, "Certificate problem for %s: %s\n", host, errstr);
+		goto out2;
+	}
+
+	snprintf(buf, sizeof(buf), "GET %s HTTP/1.1\r\n"
+	                    "User-Agent: UnrealIRCd %s\r\n"
+	                    "Host: %s\r\n"
+	                    "Connection: close\r\n"
+	                    "\r\n",
+	                    document,
+	                    VERSIONONLY,
+	                    hostandport);
+
+	BIO_puts(socket, buf);
+	
+	fd = fopen(fname, "wb");
+	if (!fd)
+	{
+		fprintf(stderr, "Could not write to temporary file '%s': %s\n",
+			fname, strerror(errno));
+		goto out2;
+	}
+
+	alarm(MODULEMANAGER_READ_TIMEOUT);
+	while ((n = BIO_read(socket, buf, sizeof(buf)-1)) > 0)
+	{
+		buf[n] = '\0';
+		if (got_data)
+		{
+			fwrite(buf, n, 1, fd); // TODO: check for write errors
+		} else {
+			/* Still need to parse header */
+			char *line, *p = NULL;
+
+			for (line = strtoken(&p, buf, "\n"); line; line = strtoken(&p, NULL, "\n"))
+			{
+				if (first_line)
+				{
+					if (http_redirect)
+					{
+						if (!strncmp(line, "Location: ", 10))
+						{
+							line += 10;
+							stripcrlf(line);
+							fclose(fd);
+							BIO_free_all(socket);
+							SSL_CTX_free(ctx_client);
+							if (strncmp(line, "https://", 8))
+							{
+								fprintf(stderr, "Invalid HTTP Redirect to '%s' -- must start with https://\n", line);
+								return 0;
+							}
+							printf("Following redirect to %s\n", line);
+							return mm_http_request(line, fname, 0);
+						}
+						continue;
+					}
+					if (!strncmp(line, "HTTP/1.1 301", 12) ||
+					    !strncmp(line, "HTTP/1.1 302", 12) ||
+					    !strncmp(line, "HTTP/1.1 303", 12) ||
+					    !strncmp(line, "HTTP/1.1 307", 12) ||
+					    !strncmp(line, "HTTP/1.1 308", 12))
+					{
+						if (!follow_redirects)
+						{
+							fprintf(stderr, "ERROR: received HTTP(S) redirect while already following another HTTP(S) redirect.\n");
+							goto out3;
+						}
+						http_redirect = 1;
+						continue;
+					}
+					if (strncmp(line, "HTTP/1.1 200", 12))
+					{
+						stripcrlf(line);
+						if (strlen(line) > 128)
+							line[128] = '\0';
+						fprintf(stderr, "Error while fetching %s: %s\n", url, line);
+						goto out3;
+					}
+					first_line = 0;
+				}
+				if (!*line || !strcmp(line, "\r"))
+				{
+					int remaining_bytes;
+
+					got_data = 1;
+					/* Bit of a hack here to write part of the data
+					 * that is not part of the header but the data response..
+					 * We need to jump over the NUL byte and then check
+					 * to see if we can access it.. since it could be either
+					 * a NUL byte due to the strtoken() or a NUL byte simply
+					 * because that was all the data from BIO_read() at this point.
+					 */
+					if (*line == '\0')
+						line += 1; /* jump over \0 */
+					else
+						line += 2; /* jump over \r\0 */
+					remaining_bytes = n - (line - buf);
+					if (remaining_bytes > 0)
+						fwrite(line, remaining_bytes, 1, fd);
+					break; /* must break the for loop here */
+				}
+			}
+		}
+	}
+
+	if (!got_data)
+	{
+		fprintf(stderr, "Error while fetching %s: unable to retrieve data\n", url);
+		goto out3;
+	}
+
+	fclose(fd);
+	BIO_free_all(socket);
+	SSL_CTX_free(ctx_client);
+	return 1;
+out3:
+	fclose(fd);
+out2:
+	BIO_free_all(socket);
+out1:
+	SSL_CTX_free(ctx_client);
+	alarm(0);
+	return 0;
+}
+
+typedef enum ParseModuleHeaderStage {
+	PMH_STAGE_LOOKING		= 0,
+	PMH_STAGE_MODULEHEADER		= 1,
+	PMH_STAGE_MOD_HEADER		= 2,
+	PMH_STAGE_GOT_NAME		= 3,
+	PMH_STAGE_GOT_VERSION		= 4,
+	PMH_STAGE_GOT_DESCRIPTION	= 5,
+	PMH_STAGE_GOT_AUTHOR		= 6,
+	PMT_STAGE_DONE			= 7,
+} ParseModuleHeaderStage;
+
+typedef enum ParseModuleConfigStage {
+	PMC_STAGE_LOOKING	= 0,
+	PMC_STAGE_STARTED	= 1,
+	PMC_STAGE_FINISHED	= 2,
+} ParseModuleConfigStage;
+
+int parse_quoted_string(char *buf, char *dest, size_t destlen)
+{
+	char *p, *p2;
+	size_t max;
+	char *i, *o;
+
+	p = strchr(buf, '"');
+	if (!p)
+		return 0;
+	p2 = strrchr(p+1, '"');
+	if (!p2)
+		return 0;
+	max = p2 - p;
+	if (max > destlen)
+		max = destlen;
+	strlcpy(dest, p+1, max);
+	unreal_del_quotes(dest);
+	return 1;
+}
+
+#define CheckNull(x) if ((!(x)->ce_vardata) || (!(*((x)->ce_vardata)))) { config_error("%s:%i: missing parameter", m->name, (x)->ce_varlinenum); return 0; }
+
+/** Parse a module { } line from a module (not repo!!) */
+int mm_module_file_config(ManagedModule *m, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+
+	if (ce->ce_vardata)
+	{
+		config_error("%s:%d: module { } block should not have a name.",
+			m->name, ce->ce_varlinenum);
+		return 0;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "source") ||
+		    !strcmp(cep->ce_varname, "version") ||
+		    !strcmp(cep->ce_varname, "author") ||
+		    !strcmp(cep->ce_varname, "sha256sum") || 
+		    !strcmp(cep->ce_varname, "description")
+		    )
+		{
+			config_error("%s:%d: module::%s should not be in here (it only exists in repository entries)",
+				m->name, cep->ce_varlinenum, cep->ce_varname);
+			return 0;
+		}
+		else if (!strcmp(cep->ce_varname, "troubleshooting"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->troubleshooting, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "documentation"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->documentation, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "min-unrealircd-version"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->min_unrealircd_version, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "max-unrealircd-version"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->max_unrealircd_version, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "post-install-text"))
+		{
+			if (cep->ce_entries)
+			{
+				ConfigEntry *cepp;
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					addmultiline(&m->post_install_text, cepp->ce_varname);
+			} else {
+				CheckNull(cep);
+				addmultiline(&m->post_install_text, cep->ce_vardata);
+			}
+		}
+		/* unknown items are silently ignored for future compatibility */
+	}
+
+	if (!m->documentation)
+	{
+		config_error("%s:%d: module::documentation missing", m->name, ce->ce_varlinenum);
+		return 0;
+	}
+
+	if (!m->troubleshooting)
+	{
+		config_error("%s:%d: module::troubleshooting missing", m->name, ce->ce_varlinenum);
+		return 0;
+	}
+
+	if (!m->min_unrealircd_version)
+	{
+		config_error("%s:%d: module::min-unrealircd-version missing", m->name, ce->ce_varlinenum);
+		return 0;
+	}
+
+	/* max_unrealircd_version is optional */
+
+	/* post_install_text is optional */
+
+	return 1;
+}
+
+#undef CheckNull
+
+int mm_parse_module_file(ManagedModule *m, char *buf, unsigned int line_offset)
+{
+	ConfigFile *cf;
+	ConfigEntry *ce;
+
+	cf = config_parse_with_offset(m->name, buf, line_offset);
+	if (!cf)
+		return 0; /* eg: parse errors */
+
+	/* Parse the module { } block (only one!) */
+	for (ce = cf->cf_entries; ce; ce = ce->ce_next)
+	{
+		if (!strcmp(ce->ce_varname, "module"))
+		{
+			int n = mm_module_file_config(m, ce);
+			config_free(cf);
+			return n;
+		}
+	}
+
+	config_free(cf);
+	config_error("No module block found within module source file. Contact author.\n");
+	return 1;
+}
+
+#define MODULECONFIGBUFFER 16384
+ManagedModule *mm_parse_module_c_file(char *modulename, char *fname)
+{
+	char buf[1024];
+	FILE *fd;
+	ParseModuleHeaderStage parse_module_header = PMH_STAGE_LOOKING;
+	ParseModuleConfigStage parse_module_config = PMC_STAGE_LOOKING;
+	char *moduleconfig = NULL;
+	int linenr = 0, module_config_start_line = 0;
+	char module_header_name[128];
+	char module_header_version[64];
+	char module_header_description[256];
+	char module_header_author[128];
+	ManagedModule *m = NULL;
+
+	*module_header_name = *module_header_version = *module_header_description = *module_header_author = '\0';
+
+	if (!mm_valid_module_name(modulename))
+	{
+		fprintf(stderr, "Module file '%s' contains forbidden characters\n", modulename);
+		return NULL;
+	}
+
+	fd = fopen(fname, "r");
+	if (!fd)
+	{
+		fprintf(stderr, "Unable to open module '%s', file '%s': %s\n",
+			modulename, fname, strerror(errno));
+		return NULL;
+	}
+
+	moduleconfig = safe_alloc(MODULECONFIGBUFFER); /* should be sufficient */
+	while ((fgets(buf, sizeof(buf), fd)))
+	{
+		linenr++;
+		stripcrlf(buf);
+		/* parse module header stuff: */
+		switch (parse_module_header)
+		{
+			case PMH_STAGE_LOOKING:
+				if (strstr(buf, "ModuleHeader"))
+					parse_module_header = PMH_STAGE_MODULEHEADER;
+				else
+					break;
+				/*fallthrough*/
+			case PMH_STAGE_MODULEHEADER:
+				if (strstr(buf, "MOD_HEADER"))
+					parse_module_header = PMH_STAGE_MOD_HEADER;
+				break;
+			case PMH_STAGE_MOD_HEADER:
+				if (parse_quoted_string(buf, module_header_name, sizeof(module_header_name)))
+					parse_module_header = PMH_STAGE_GOT_NAME;
+				break;
+			case PMH_STAGE_GOT_NAME:
+				if (parse_quoted_string(buf, module_header_version, sizeof(module_header_version)))
+					parse_module_header = PMH_STAGE_GOT_VERSION;
+				break;
+			case PMH_STAGE_GOT_VERSION:
+				if (parse_quoted_string(buf, module_header_description, sizeof(module_header_description)))
+					parse_module_header = PMH_STAGE_GOT_DESCRIPTION;
+				break;
+			case PMH_STAGE_GOT_DESCRIPTION:
+				if (parse_quoted_string(buf, module_header_author, sizeof(module_header_author)))
+					parse_module_header = PMH_STAGE_GOT_AUTHOR;
+				break;
+			default:
+				break;
+		}
+		/* parse module config stuff: */
+		switch (parse_module_config)
+		{
+			case PMC_STAGE_LOOKING:
+				if (strstr(buf, "<<<MODULE MANAGER START>>>")){
+					module_config_start_line = linenr;
+					parse_module_config = PMC_STAGE_STARTED;
+				}
+				break;
+			case PMC_STAGE_STARTED:
+				if (!strstr(buf, "<<<MODULE MANAGER END>>>"))
+				{
+					strlcat(moduleconfig, buf, MODULECONFIGBUFFER);
+					strlcat(moduleconfig, "\n", MODULECONFIGBUFFER);
+				} else
+				{
+					parse_module_config = PMC_STAGE_FINISHED;
+				}
+				break;
+			default:
+				/* Nothing to be done anymore */
+				break;
+		}
+	}
+	fclose(fd);
+
+	if (!*module_header_name || !*module_header_version ||
+	    !*module_header_description || !*module_header_author)
+	{
+		fprintf(stderr, "Error parsing module header in %s\n", modulename);
+		safe_free(moduleconfig);
+		return NULL;
+	}
+
+	if (strcmp(module_header_name, modulename))
+	{
+		fprintf(stderr, "ERROR: Mismatch in module name in header (%s) and filename (%s)\n",
+			module_header_name, modulename);
+		safe_free(moduleconfig);
+		return NULL;
+	}
+
+	if (!*moduleconfig)
+	{
+		fprintf(stderr, "ERROR: Module does not contain module config data (<<<MODULE MANAGER START>>>)\n"
+		                "This means it is not meant to be managed by the module manager\n");
+		safe_free(moduleconfig);
+		return NULL;
+	}
+
+	/* Fill in the fields from MOD_HEADER() */
+	m = safe_alloc(sizeof(ManagedModule));
+	safe_strdup(m->name, module_header_name);
+	safe_strdup(m->version, module_header_version);
+	safe_strdup(m->description, module_header_description);
+	safe_strdup(m->author, module_header_author);
+
+	if (!mm_parse_module_file(m, moduleconfig, module_config_start_line))
+	{
+		fprintf(stderr, "ERROR: Problem with module manager data block within the %s module C source file.\n"
+		                "You are suggested to contact the module author and paste the above to him/her\n",
+		                m->name);
+		free_managed_module(m);
+		safe_free(moduleconfig);
+		return NULL;
+	}
+	
+	safe_free(moduleconfig);
+	return m;
+}
+
+void print_documentation(void)
+{
+	fprintf(stderr, "See https://www.unrealircd.org/docs/Module_manager for more information.\n");
+}
+
+char *mm_sourceslist_file(void)
+{
+	static char buf1[512], buf2[512];
+	snprintf(buf1, sizeof(buf1), "%s/modules.sources.list", CONFDIR);
+	if (!file_exists(buf1))
+	{
+		/* Possibly UnrealIRCd is not installed yet, so use this one */
+		snprintf(buf2, sizeof(buf2), "%s/doc/conf/modules.sources.list", BUILDDIR);
+		if (!file_exists(buf2))
+		{
+			fprintf(stderr, "ERROR: Neither '%s' nor '%s' exist.\n"
+			                "No module repositories configured.\n",
+			                buf1, buf2);
+			print_documentation();
+			exit(-1);
+		}
+		return buf2;
+	}
+	return buf1;
+}
+
+/** Free a managed module struct */
+void free_managed_module(ManagedModule *m)
+{
+	safe_free(m->repo_url);
+	safe_free(m->name);
+	safe_free(m->source);
+	safe_free(m->sha256sum);
+	safe_free(m->version);
+	safe_free(m->author);
+	safe_free(m->troubleshooting);
+	safe_free(m->documentation);
+	safe_free(m->min_unrealircd_version);
+	safe_free(m->max_unrealircd_version);
+	safe_free(m->description);
+	freemultiline(m->post_install_text);
+	safe_free(m);
+}
+
+/** Check for valid module name */
+int mm_valid_module_name(char *name)
+{
+	char *p;
+
+	if (strncmp(name, "third/", 6))
+		return 0;
+	name += 6;
+	if (strstr(name, ".."))
+		return 0;
+	for (p = name; *p; p++)
+		if (!isalnum(*p) && !strchr("._-", *p))
+			return 0;
+	return 1;
+}
+
+#define CheckNull(x) if ((!(x)->ce_vardata) || (!(*((x)->ce_vardata)))) { config_error("%s:%i: missing parameter", repo_url, (x)->ce_varlinenum); goto fail_mm_repo_module_config; }
+
+/** Parse a module { } line from a repository */
+ManagedModule *mm_repo_module_config(char *repo_url, ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	ManagedModule *m = safe_alloc(sizeof(ManagedModule));
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%d: module { } with no name",
+			repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (strncmp(ce->ce_vardata, "third/", 6))
+	{
+		config_error("%s:%d: module { } name must start with: third/",
+			repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!mm_valid_module_name(ce->ce_vardata))
+	{
+		config_error("%s:%d: module { } with illegal name: %s",
+			repo_url, ce->ce_varlinenum, ce->ce_vardata);
+		goto fail_mm_repo_module_config;
+	}
+	safe_strdup(m->name, ce->ce_vardata);
+	safe_strdup(m->repo_url, repo_url);
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "source"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->source, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "sha256sum"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->sha256sum, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "version"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->version, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "author"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->author, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "troubleshooting"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->troubleshooting, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "documentation"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->documentation, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "min-unrealircd-version"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->min_unrealircd_version, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "max-unrealircd-version"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->max_unrealircd_version, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "description"))
+		{
+			CheckNull(cep);
+			safe_strdup(m->description, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "post-install-text"))
+		{
+			if (cep->ce_entries)
+			{
+				ConfigEntry *cepp;
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					addmultiline(&m->post_install_text, cepp->ce_varname);
+			} else {
+				CheckNull(cep);
+				addmultiline(&m->post_install_text, cep->ce_vardata);
+			}
+		}
+		/* unknown items are silently ignored for future compatibility */
+	}
+
+	if (!m->source)
+	{
+		config_error("%s:%d: module::source missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!m->sha256sum)
+	{
+		config_error("%s:%d: module::sha256sum missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!m->version)
+	{
+		config_error("%s:%d: module::version missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!m->author)
+	{
+		config_error("%s:%d: module::author missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!m->documentation)
+	{
+		config_error("%s:%d: module::documentation missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!m->troubleshooting)
+	{
+		config_error("%s:%d: module::troubleshooting missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	if (!m->min_unrealircd_version)
+	{
+		config_error("%s:%d: module::min-unrealircd-version missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	/* max_unrealircd_version is optional */
+	if (!m->description)
+	{
+		config_error("%s:%d: module::description missing", repo_url, ce->ce_varlinenum);
+		goto fail_mm_repo_module_config;
+	}
+	/* post_install_text is optional */
+
+	return m;
+
+fail_mm_repo_module_config:
+	free_managed_module(m);
+	return NULL;
+}
+
+#undef CheckNull
+
+int mm_parse_repo_db(char *url, char *filename)
+{
+	ConfigFile *cf;
+	ConfigEntry *ce;
+	ManagedModule *m;
+
+	cf = config_load(filename, url);
+	if (!cf)
+		return 0; /* eg: parse errors */
+
+	for (ce = cf->cf_entries; ce; ce = ce->ce_next)
+	{
+		if (!strcmp(ce->ce_varname, "module"))
+		{
+			m = mm_repo_module_config(url, ce);
+			if (!m)
+			{
+				config_free(cf);
+				return 0;
+			}
+			AddListItem(m, managed_modules);
+		}
+	}
+	config_free(cf);
+	return 1;
+}
+
+int mm_refresh_repository(void)
+{
+	char *sourceslist = mm_sourceslist_file();
+	FILE *fd;
+	char buf[512];
+	char *tmpfile;
+	int linenr = 0;
+	int success = 0;
+	int numrepos = 0;
+
+	if (!file_exists(TMPDIR))
+	{
+		(void)mkdir(TMPDIR, S_IRUSR|S_IWUSR|S_IXUSR); /* Create the tmp dir, if it doesn't exist */
+		if (!file_exists(TMPDIR))
+		{
+			/* This is possible if the directory structure does not exist,
+			 * eg if ~/unrealircd does not exist at all then ~/unrealircd/tmp
+			 * cannot be mkdir'ed either.
+			 */
+			fprintf(stderr, "ERROR: %s does not exist (yet?), cannot use module manager\n", TMPDIR);
+			fprintf(stderr, "       This can only happen if you did not use ./Config or if you rm -rf'ed after running ./Config.\n");
+			exit(-1);
+		}
+	}
+
+	printf("Reading module repository list from '%s'...\n", mm_sourceslist_file());
+	fd = fopen(sourceslist, "r");
+	if (!fd)
+	{
+		fprintf(stderr, "ERROR: Could not open '%s': %s\n", sourceslist, strerror(errno));
+		return 0;
+	}
+
+	while ((fgets(buf, sizeof(buf), fd)))
+	{
+		char *line = buf;
+		linenr++;
+		stripcrlf(line);
+		/* Skip whitespace */
+		while (*line == ' ')
+			line++;
+		/* Skip empty lines and ones that start with a hash mark (#) */
+		if (!*line || (*line == '#'))
+			continue;
+		if (strncmp(line, "https://", 8))
+		{
+			fprintf(stderr, "ERROR in %s on line %d: URL should start with https://",
+				sourceslist, linenr);
+			fclose(fd);
+			return 0;
+		}
+		printf("Checking module repository %s...\n", line);
+		numrepos++;
+		tmpfile = unreal_mktemp(TMPDIR, "mm");
+		if (mm_http_request(line, tmpfile, 1))
+		{
+			if (!mm_parse_repo_db(line, tmpfile))
+			{
+				fclose(fd);
+				return 0;
+			}
+			success++;
+		}
+	}
+	fclose(fd);
+
+	if (numrepos == 0)
+	{
+		fprintf(stderr, "ERROR: No repositories listed in module repository list. "
+		                "Did you remove the default UnrealIRCd repository?\n"
+		                "All commands, except for './unrealircd module uninstall third/name-of-module', are unavailable.\n");
+		return 0;
+	}
+
+	return success ? 1 : 0;
+}
+
+#define COLUMN_STATUS	0
+#define COLUMN_NAME	1
+#define COLUMN_VERSION	2
+
+void mm_list_print(char *status, char *name, char *version, char *description, int largest_column[3])
+{
+	int padstatus = MAX(largest_column[COLUMN_STATUS] - strlen(status), 0);
+	int padname = MAX(largest_column[COLUMN_NAME] - strlen(name), 0);
+	int padversion = MAX(largest_column[COLUMN_VERSION] - strlen(version), 0);
+
+	printf("| %s%*s | %s%*s | %s%*s | %s\n",
+	       status,
+	       padstatus, "",
+	       name,
+	       padname, "",
+	       version,
+	       padversion, "",
+	       description);
+}
+
+int mm_check_module_compatibility(ManagedModule *m)
+{
+	if (strchr(m->min_unrealircd_version, '*'))
+	{
+		/* By wildcard, eg: "5.*" */
+		if (!match_simple(m->min_unrealircd_version, VERSIONONLY))
+			return 0;
+	} else
+	{
+		/* By strcmp, eg: "5.0.0" */
+		if (strnatcasecmp(m->min_unrealircd_version, VERSIONONLY) > 0)
+			return 0;
+	}
+	if (m->max_unrealircd_version)
+	{
+		if (strchr(m->max_unrealircd_version, '*'))
+		{
+			/* By wildcard, eg: "5.*" */
+			if (!match_simple(m->max_unrealircd_version, VERSIONONLY))
+				return 0;
+		} else
+		{
+			/* By strcmp, eg: "5.0.5" */
+			if (strnatcasecmp(m->max_unrealircd_version, VERSIONONLY) <= 0)
+				return 0;
+		}
+	}
+	return 1;
+}
+
+#define MMMS_INSTALLED		0x0001
+#define MMMS_UPGRADE_AVAILABLE	0x0002
+#define MMMS_UNAVAILABLE	0x0004
+
+int mm_get_module_status(ManagedModule *m)
+{
+	FILE *fd;
+	char fname[512];
+	char *our_sha256sum;
+
+	snprintf(fname, sizeof(fname), "%s/src/modules/%s.c", BUILDDIR, m->name);
+	if (!file_exists(fname))
+	{
+		if (!mm_check_module_compatibility(m))
+			return MMMS_UNAVAILABLE;
+		return 0;
+	}
+
+	our_sha256sum = sha256sum_file(fname);
+	if (!strcasecmp(our_sha256sum, m->sha256sum))
+	{
+		return MMMS_INSTALLED;
+	} else {
+		if (!mm_check_module_compatibility(m))
+			return MMMS_INSTALLED|MMMS_UNAVAILABLE;
+		return MMMS_INSTALLED|MMMS_UPGRADE_AVAILABLE;
+	}
+
+	return 0;
+}
+
+char *mm_get_module_status_string(ManagedModule *m)
+{
+	int status = mm_get_module_status(m);
+	if (status == 0)
+		return "";
+	else if (status == MMMS_UNAVAILABLE)
+		return "unav";
+	else if (status == MMMS_INSTALLED)
+		return "inst";
+	else if (status == (MMMS_INSTALLED|MMMS_UNAVAILABLE))
+		return "inst/UNAV";
+	else if (status == (MMMS_INSTALLED|MMMS_UPGRADE_AVAILABLE))
+		return "inst/UPD";
+	return "UNKNOWN?";
+}
+
+char *mm_get_module_status_string_long(ManagedModule *m)
+{
+	int status = mm_get_module_status(m);
+	if (status == 0)
+		return "Not installed";
+	else if (status == MMMS_UNAVAILABLE)
+		return "Unavailable for your UnrealIRCd version";
+	else if (status == MMMS_INSTALLED)
+		return "Installed and up to date";
+	else if (status == (MMMS_INSTALLED|MMMS_UNAVAILABLE))
+		return "Installed, an upgrade is available but not for your UnrealIRCd version";
+	else if (status == (MMMS_INSTALLED|MMMS_UPGRADE_AVAILABLE))
+		return "Installed, upgrade available";
+	return "UNKNOWN?";
+}
+
+/** Find a module by name, return NULL if not found. */
+ManagedModule *mm_find_module(char *name)
+{
+	ManagedModule *m;
+
+	for (m = managed_modules; m; m = m->next)
+		if (!strcasecmp(name, m->name))
+			return m;
+	return NULL;
+}
+
+/** Count the unknown modules (untracked modules) */
+int count_unknown_modules(void)
+{
+	DIR *fd;
+	struct dirent *dir;
+	int count = 0;
+	char dirname[512];
+
+	snprintf(dirname, sizeof(dirname), "%s/src/modules/third", BUILDDIR);
+
+	fd = opendir(dirname);
+	if (fd)
+	{
+		while ((dir = readdir(fd)))
+		{
+			char *fname = dir->d_name;
+			if (filename_has_suffix(fname, ".c"))
+			{
+				char modname[512], *p;
+				snprintf(modname, sizeof(modname), "third/%s", filename_strip_suffix(fname, ".c"));
+				if (!mm_find_module(modname))
+					count++;
+			}
+		}
+		closedir(fd);
+	}
+	return count;
+}
+
+void mm_list(char *searchname)
+{
+	ManagedModule *m;
+	int largest_column[3];
+	int padname;
+	int padversion;
+	struct dirent *dir;
+	DIR *fd;
+	char dirname[512];
+	char *status;
+	int first_unknown = 1;
+
+	if (searchname)
+		printf("Searching for '%s' in names of all available modules...\n", searchname);
+
+	memset(&largest_column, 0, sizeof(largest_column));
+	largest_column[COLUMN_STATUS] = strlen("inst/UNAV");
+	largest_column[COLUMN_NAME] = strlen("Name:");
+	largest_column[COLUMN_VERSION] = strlen("Version:");
+
+	for (m = managed_modules; m; m = m->next)
+	{
+		if (strlen(m->name) > largest_column[COLUMN_NAME])
+			largest_column[COLUMN_NAME] = strlen(m->name);
+		if (strlen(m->version) > largest_column[COLUMN_VERSION])
+			largest_column[COLUMN_VERSION] = strlen(m->version);
+	}
+	/* We try to produce neat output, but not at all costs */
+	if (largest_column[COLUMN_NAME] > 32)
+		largest_column[COLUMN_NAME] = 32;
+	if (largest_column[COLUMN_VERSION] > 16)
+		largest_column[COLUMN_VERSION] = 16;
+
+	mm_list_print("Status:", "Name:", "Version:", "Description:", largest_column);
+	printf("|=======================================================================================\n");
+
+	for (m = managed_modules; m; m = m->next)
+	{
+		if (searchname && !strstr(m->name, searchname))
+			continue;
+
+		status = mm_get_module_status_string(m);
+		mm_list_print(status, m->name, m->version, m->description, largest_column);
+	}
+
+	snprintf(dirname, sizeof(dirname), "%s/src/modules/third", BUILDDIR);
+	fd = opendir(dirname);
+	if (fd)
+	{
+		while ((dir = readdir(fd)))
+		{
+			char *fname = dir->d_name;
+			if (filename_has_suffix(fname, ".c"))
+			{
+				char modname[512], *p;
+				snprintf(modname, sizeof(modname), "third/%s", filename_strip_suffix(fname, ".c"));
+				if (searchname && !strstr(searchname, modname))
+					continue;
+				if (!mm_find_module(modname))
+				{
+					if (first_unknown)
+					{
+						printf("|---------------------------------------------------------------------------------------\n");
+						first_unknown = 0;
+					}
+					mm_list_print("UNKNOWN", modname, "", "", largest_column);
+				}
+			}
+		}
+		closedir(fd);
+	}
+
+	printf("|=======================================================================================\n");
+
+	printf("\nStatus column legend:\n"
+	       "          : not installed\n"
+	       "inst      : module installed\n"
+	       "inst/UPD  : module installed, upgrade available (latest version differs from yours)\n"
+	       "unav      : module not available for your UnrealIRCd version\n"
+	       "inst/UNAV : module installed, upgrade exists but is not available for your UnrealIRCd version (too old UnrealIRCd version?)\n"
+	       "UNKNOWN   : module does not exist in any repository (perhaps you installed it manually?), module will be left untouched\n");
+
+	printf("\nFor more information about a particular module, use './unrealircd module info name-of-module'\n\n");
+	print_documentation();
+}
+
+int mm_compile(ManagedModule *m, char *tmpfile, int test)
+{
+	char newpath[512];
+	char cmd[512];
+	char *basename;
+	char *p;
+	FILE *fd;
+	char buf[512];
+	int n;
+
+	if (test)
+		printf("Test compiling %s...\n", m->name);
+	else
+		printf("Compiling %s...\n", m->name);
+
+	basename = unreal_getfilename(test ? tmpfile : m->name);
+	snprintf(newpath, sizeof(newpath), "%s/src/modules/third/%s%s", BUILDDIR, basename, test ? "" : ".c");
+	if (!test)
+	{
+		/* If the file already exists then we are upgrading.
+		 * It's a good idea to backup the file rather than
+		 * just delete it. Perhaps the user had local changes
+		 * he/she wished to preserve and accidently went
+		 * through the upgrade procedure.
+		 */
+		char backupfile[512];
+		snprintf(backupfile, sizeof(backupfile), "%s.bak", newpath);
+		unlink(backupfile);
+		(void)rename(newpath, backupfile);
+	}
+	if (!unreal_copyfileex(tmpfile, newpath, 0))
+		return 0;
+
+	snprintf(cmd, sizeof(cmd),
+	         "cd \"%s\"; make custommodule MODULEFILE=\"%s\"",
+	         BUILDDIR,
+	         filename_strip_suffix(basename, ".c")
+	         );
+	fd = popen(cmd, "r");
+	if (!fd)
+	{
+		fprintf(stderr, "ERROR: Could not issue command: %s\n", cmd);
+		unlink(newpath);
+		return 0;
+	}
+	while((fgets(buf, sizeof(buf), fd)))
+	{
+		printf("%s", buf);
+	}
+	n = pclose(fd);
+
+	if (test)
+	{
+		/* Remove the XXXXXXX.modname.c file */
+		unlink(newpath);
+		/* Remove the XXXXXXX.modname.so file */
+		newpath[strlen(newpath)-2] = '\0'; // cut off .c
+		strlcat(newpath, ".so", sizeof(newpath));
+		unlink(newpath);
+	}
+
+	if (WIFEXITED(n) && (WEXITSTATUS(n) == 0))
+		return 1;
+
+	fprintf(stderr, "ERROR: Compile errors encountered while compiling module '%s'\n"
+	                "You are suggested to contact the author (%s) of this module:\n%s\n",
+	                m->name, m->author, m->troubleshooting);
+	return 1;
+}
+
+/** Actually download and install the module.
+ * This assumes compatibility checks have already been done.
+ */
+void mm_install_module(ManagedModule *m)
+{
+	char *basename = unreal_getfilename(m->source);
+	char *tmpfile;
+	char *sha256;
+
+	if (!basename)
+		basename = "mod.c";
+	tmpfile = unreal_mktemp(TMPDIR, basename);
+
+	printf("Downloading %s from %s...\n", m->name, m->source);
+	if (!mm_http_request(m->source, tmpfile, 1))
+	{
+		fprintf(stderr, "Repository %s seems to list a module file that cannot be retrieved (%s).\n", m->repo_url, m->source);
+		fprintf(stderr, "Fatal error encountered. Contact %s: %s\n", m->author, m->troubleshooting);
+		exit(-1);
+	}
+
+	sha256 = sha256sum_file(tmpfile);
+	if (!sha256)
+	{
+		fprintf(stderr, "ERROR: Temporary file '%s' has disappeared -- strange\n", tmpfile);
+		fprintf(stderr, "Fatal error encountered. Check for errors above. Perhaps try running the command again?\n");
+		exit(-1);
+	}
+	if (strcasecmp(sha256, m->sha256sum))
+	{
+		fprintf(stderr, "ERROR: SHA256 Checksum mismatch\n"
+		                "Expected (value in repository list): %s\n"
+		                "Received (value of downloaded file): %s\n",
+		                m->sha256sum, sha256);
+		fprintf(stderr, "Fatal error encountered, see above. Try running the command again in 5-10 minutes.\n"
+		                "If the issue persists, contact the repository manager of %s\n",
+		                m->repo_url);
+		exit(-1);
+	}
+	if (!mm_compile(m, tmpfile, 1))
+	{
+		fprintf(stderr, "Fatal error encountered, see above.\n");
+		exit(-1);
+	}
+
+	if (!mm_compile(m, tmpfile, 0))
+	{
+		fprintf(stderr, "The test compile went OK earlier, but the final compile did not. BAD!!\n");
+		exit(-1);
+	}
+	printf("Module %s compiled successfully\n", m->name);
+}
+
+/** Uninstall a module.
+ * This function takes a string rather than a ManagedModule
+ * because it also allows uninstalling of unmanaged (local) modules.
+ */
+void mm_uninstall_module(char *modulename)
+{
+	struct dirent *dir;
+	DIR *fd;
+	char dirname[512], fullname[512];
+	int found = 0;
+
+	snprintf(dirname, sizeof(dirname), "%s/src/modules/third", BUILDDIR);
+	fd = opendir(dirname);
+	if (fd)
+	{
+		while ((dir = readdir(fd)))
+		{
+			char *fname = dir->d_name;
+			if (filename_has_suffix(fname, ".c") || filename_has_suffix(fname, ".so") || filename_has_suffix(fname, ".dll"))
+			{
+				char modname[512], *p;
+				snprintf(modname, sizeof(modname), "third/%s", filename_strip_suffix(fname, NULL));
+				if (!strcasecmp(modname, modulename))
+				{
+					found = 1;
+					snprintf(fullname, sizeof(fullname), "%s/%s", dirname, fname);
+					//printf("Deleting '%s'\n", fullname);
+					unlink(fullname);
+				}
+			}
+		}
+		closedir(fd);
+	}
+
+	if (!found)
+	{
+		fprintf(stderr, "ERROR: Module '%s' is not installed, so can't uninstall.\n", modulename);
+		exit(-1);
+	}
+
+	printf("Module '%s' uninstalled successfully\n", modulename);
+}
+
+void mm_make_install(void)
+{
+	char cmd[512];
+	int n;
+	if (no_make_install)
+		return;
+	printf("Running 'make install'...\n");
+	snprintf(cmd, sizeof(cmd), "cd \"%s\"; make install 1>/dev/null 2>&1", BUILDDIR);
+	n = system(cmd);
+}
+
+void mm_install(int argc, char *args[], int upgrade)
+{
+	ManagedModule *m;
+	MultiLine *l;
+	char *name = args[1];
+	int status;
+
+	if (!name)
+	{
+		fprintf(stderr, "ERROR: Use: module install third/name-of-module\n");
+		exit(-1);
+	}
+
+	if (strncmp(name, "third/", 6))
+	{
+		fprintf(stderr, "ERROR: Use: module install third/name-of-module\nYou must prefix the modulename with third/\n");
+		exit(-1);
+	}
+
+	m = mm_find_module(name);
+	if (!m)
+	{
+		fprintf(stderr, "ERROR: Module '%s' not found\n", name);
+		exit(-1);
+	}
+	status = mm_get_module_status(m);
+	if (status == MMMS_UNAVAILABLE)
+	{
+		fprintf(stderr, "ERROR: Module '%s' exists, but is not compatible with your UnrealIRCd version:\n"
+		                "Your UnrealIRCd version  : %s\n"
+		                "Minimum version required : %s\n",
+		                name,
+		                VERSIONONLY,
+		                m->min_unrealircd_version);
+		if (m->max_unrealircd_version)
+			fprintf(stderr, "Maximum version          : %s\n", m->max_unrealircd_version);
+		exit(-1);
+	}
+	if (upgrade && (status == MMMS_INSTALLED))
+	{
+		/* If updating, and we are already on latest version, then don't upgrade */
+		printf("Module %s is the latest version, no upgrade needed\n", m->name);
+	}
+	mm_install_module(m);
+	mm_make_install();
+	if (m->post_install_text)
+	{
+		printf("Post-installation information for %s from the author:\n", m->name);
+		printf("---\n");
+		for (l = m->post_install_text; l; l = l->next)
+			printf(" %s\n", l->line);
+		printf("---\n");
+	} else {
+		printf("Don't forget to add a 'loadmodule' line for the module and rehash\n");
+	}
+}
+
+void mm_uninstall(int argc, char *args[])
+{
+	ManagedModule *m;
+	char *name = args[1];
+
+	if (!name)
+	{
+		fprintf(stderr, "ERROR: Use: module uninstall third/name-of-module\n");
+		exit(-1);
+	}
+
+	if (strncmp(name, "third/", 6))
+	{
+		fprintf(stderr, "ERROR: Use: module uninstall third/name-of-module\nYou must prefix the modulename with third/\n");
+		exit(-1);
+	}
+
+	mm_uninstall_module(name);
+	mm_make_install();
+	exit(0);
+}
+
+void mm_upgrade(int argc, char *args[])
+{
+	ManagedModule *m;
+	char *name = args[1];
+	int upgraded = 0;
+	int uptodate_already = 0;
+	int update_unavailable = 0;
+	int i = 1, n;
+
+	if (args[i] && !strcmp(args[i], "--no-install"))
+	{
+		no_make_install = 1;
+		i++;
+	}
+
+	name = args[i];
+	if (name)
+	{
+		// TODO: First check if it needs an upgrade? ;)
+		mm_install(argc, args, 1);
+		exit(0);
+	}
+
+	/* Without arguments means: check all installed modules */
+	for (m = managed_modules; m; m = m->next)
+	{
+		int status = mm_get_module_status(m);
+		if (status == (MMMS_INSTALLED|MMMS_UPGRADE_AVAILABLE))
+		{
+			args[1] = m->name;
+			mm_install(1, args, 1);
+			upgraded++;
+		} else
+		if (status == MMMS_INSTALLED)
+		{
+			uptodate_already++;
+		} else
+		if (status == (MMMS_INSTALLED|MMMS_UNAVAILABLE))
+		{
+			update_unavailable++;
+		}
+	}
+	printf("All actions were successful. %d module(s) upgraded, %d already up-to-date\n",
+		upgraded, uptodate_already);
+	if (update_unavailable)
+		printf("%d module(s) have updates but not for your UnrealIRCd version\n", update_unavailable);
+	if ((n = count_unknown_modules()))
+		printf("%d module(s) are unknown/untracked\n", n);
+
+	printf("For more details, you can always run ./unrealircd module list\n");
+}
+
+void mm_info(int argc, char *args[])
+{
+	ManagedModule *m;
+	MultiLine *l;
+	char *name = args[1];
+
+	if (!name)
+	{
+		fprintf(stderr, "ERROR: Use: unrealircd module info name-of-module\n");
+		exit(-1);
+	}
+
+	m = mm_find_module(name);
+	if (!m)
+	{
+		// TODO: we should probably be a bit more specific if the module exists locally (UNAV) */
+		fprintf(stderr, "ERROR: Module '%s' not found in any repository\n", name);
+		exit(-1);
+	}
+	printf("Name:                    %s\n"
+	       "Version:                 %s\n"
+	       "Description:             %s\n"
+	       "Author:                  %s\n"
+	       "Documentation:           %s\n"
+	       "Troubleshooting:         %s\n"
+	       "Source:                  %s\n"
+	       "Min. UnrealIRCd version: %s\n",
+	       m->name,
+	       m->version,
+	       m->description,
+	       m->author,
+	       m->documentation,
+	       m->troubleshooting,
+	       m->source,
+	       m->min_unrealircd_version);
+	if (m->max_unrealircd_version)
+		printf("Min. UnrealIRCd version: %s\n", m->max_unrealircd_version);
+	printf("Status:                  %s\n", mm_get_module_status_string_long(m));
+	if (m->post_install_text)
+	{
+		printf("------  Post-installation text  ------\n");
+		for (l = m->post_install_text; l; l = l->next)
+			printf(" %s\n", l->line);
+		printf("------ End of post-install text ------\n");
+	}
+}
+
+void mm_usage(void)
+{
+	fprintf(stderr, "Use any of the following actions:\n"
+	                "unrealircd module list                     List all the available and installed modules\n"
+	                "unrealircd module info name-of-module      Show more information about the module\n"
+	                "unrealircd module install name-of-module   Install the specified module\n"
+	                "unrealircd module uninstall name-of-module Uninstall the specified module\n"
+	                "unrealircd module upgrade name-of-module   Upgrade the specified module (if needed)\n"
+	                "unrealircd module upgrade                  Upgrade all modules (if needed)\n"
+	                "unrealircd module generate-repository      Generate a repository index (you are\n"
+	                "                                           unlikely to need this, only for repo admins)\n");
+	print_documentation();
+	exit(-1);
+}
+
+void print_md_block(FILE *fdo, ManagedModule *m)
+{
+	fprintf(fdo, "module \"%s\"\n{\n", m->name);
+	fprintf(fdo, "\tdescription \"%s\";\n", unreal_add_quotes(m->description));
+	fprintf(fdo, "\tversion \"%s\";\n", unreal_add_quotes(m->version));
+	fprintf(fdo, "\tauthor \"%s\";\n", unreal_add_quotes(m->author));
+	fprintf(fdo, "\tdocumentation \"%s\";\n", unreal_add_quotes(m->documentation));
+	fprintf(fdo, "\ttroubleshooting \"%s\";\n", unreal_add_quotes(m->troubleshooting));
+	fprintf(fdo, "\tsource \"%s\";\n", unreal_add_quotes(m->source));
+	fprintf(fdo, "\tsha256sum \"%s\";\n", unreal_add_quotes(m->sha256sum));
+	fprintf(fdo, "\tmin-unrealircd-version \"%s\";\n", unreal_add_quotes(m->min_unrealircd_version));
+	if (m->max_unrealircd_version)
+		fprintf(fdo, "\tmax-unrealircd-version \"%s\";\n", unreal_add_quotes(m->max_unrealircd_version));
+	if (m->post_install_text)
+	{
+		MultiLine *l;
+		fprintf(fdo, "\tpost-install-text\n"
+		             "\t{\n");
+		for (l = m->post_install_text; l; l = l->next)
+			fprintf(fdo, "\t\t\"%s\";\n", unreal_add_quotes(l->line));
+		fprintf(fdo, "\t}\n");
+	}
+	fprintf(fdo, "}\n\n");
+}
+
+void mm_generate_repository_usage(void)
+{
+	fprintf(stderr, "Usage: ./unrealircd module generate-repository <url base path> <directory-with-modules> <name of output file>\n");
+	fprintf(stderr, "For example: ./unrealircd module generate-repository https://www.unrealircd.org/modules/ src/modules/third modules.lst\n");
+}
+
+void mm_generate_repository(int argc, char *args[])
+{
+	DIR *fd;
+	struct dirent *dir;
+	int count = 0;
+	char *urlbasepath;
+	char *dirname;
+	char *outputfile;
+	char modname[128];
+	char fullname[512];
+	ManagedModule *m;
+	FILE *fdo;
+
+	urlbasepath = args[1];
+	dirname = args[2];
+	outputfile = args[3];
+	if (!urlbasepath || !dirname || !outputfile)
+	{
+		mm_generate_repository_usage();
+		exit(-1);
+	}
+
+	if ((strlen(urlbasepath) < 2) || (urlbasepath[strlen(urlbasepath)-1] != '/'))
+	{
+		fprintf(stderr, "Error: the URL base path must end with a slash\n");
+		mm_generate_repository_usage();
+		exit(-1);
+	}
+
+	fd = opendir(dirname);
+	if (!fd)
+	{
+		fprintf(stderr, "Cannot open directory '%s': %s\n", dirname, strerror(errno));
+		exit(-1);
+	}
+
+	fdo = fopen(outputfile, "w");
+	if (!fdo)
+	{
+		fprintf(stderr, "Could not open file '%s' for writing: %s\n", outputfile, strerror(errno));
+		exit(-1);
+	}
+
+	while ((dir = readdir(fd)))
+	{
+		char *fname = dir->d_name;
+		if (filename_has_suffix(fname, ".c"))
+		{
+			snprintf(fullname, sizeof(fullname), "%s/%s", dirname, fname);
+			snprintf(modname, sizeof(modname), "third/%s", filename_strip_suffix(fname, ".c"));
+			printf("Processing: %s\n", modname);
+			m = mm_parse_module_c_file(modname, fullname);
+			if (!m)
+			{
+				fprintf(stderr, "WARNING: Skipping module '%s' due to errors\n", modname);
+				continue;
+			}
+			m->sha256sum = strdup(sha256sum_file(fullname));
+			m->source = safe_alloc(512);
+			snprintf(m->source, 512, "%s%s.c", urlbasepath, modname + 6);
+			print_md_block(fdo, m);
+			free_managed_module(m);
+			m = NULL;
+		}
+	}
+	closedir(fd);
+	fclose(fdo);
+}
+
+void mm_parse_c_file(int argc, char *args[])
+{
+	char *fullname = args[1];
+	char *basename;
+	char modname[256];
+	ManagedModule *m;
+
+	if (!fullname)
+	{
+		fprintf(stderr, "Usage: ./unrealircd module parse-c-file path/to/file.c\n");
+		exit(-1);
+	}
+	if (!file_exists(fullname))
+	{
+		fprintf(stderr, "ERROR: Unable to open C file '%s'\n", fullname);
+		exit(-1);
+	}
+	basename = unreal_getfilename(fullname);
+
+	snprintf(modname, sizeof(modname), "third/%s", filename_strip_suffix(basename, ".c"));
+	printf("Processing: %s\n", modname);
+	m = mm_parse_module_c_file(modname, fullname);
+	if (!m)
+	{
+		fprintf(stderr, "Errors encountered. See above\n");
+		exit(-1);
+	}
+	m->sha256sum = strdup(sha256sum_file(fullname));
+	m->source = strdup("...");
+	print_md_block(stdout, m);
+	free_managed_module(m);
+	exit(0);
+}
+
+void modulemanager(int argc, char *args[])
+{
+	if (!args[0])
+		mm_usage();
+
+	/* The following operations do not require reading
+	 * of the repository list and are always available:
+	 */
+	if (!strcasecmp(args[0], "uninstall") ||
+	    !strcasecmp(args[0], "remove"))
+	{
+		mm_uninstall(argc, args);
+		exit(0);
+	}
+	else if (!strcasecmp(args[0], "generate-repository"))
+	{
+		mm_generate_repository(argc, args);
+		exit(0);
+	}
+	else if (!strcasecmp(args[0], "parse-c-file"))
+	{
+		mm_parse_c_file(argc, args);
+		exit(0);
+	}
+
+	/* Fetch the repository list */
+	if (!mm_refresh_repository())
+	{
+		fprintf(stderr, "Fatal error encountered\n");
+		exit(-1);
+	}
+
+	if (!strcasecmp(args[0], "list"))
+		mm_list(args[1]);
+	else if (!strcasecmp(args[0], "info"))
+		mm_info(argc, args);
+	else if (!strcasecmp(args[0], "install"))
+	{
+		mm_install(argc, args, 0);
+		fprintf(stderr, "All actions were successful.\n");
+	}
+	else if (!strcasecmp(args[0], "upgrade"))
+		mm_upgrade(argc, args);
+	else
+		mm_usage();
+}
+#endif
diff --git a/src/modules.c b/src/modules.c
new file mode 100644
index 0000000..df0b078
--- /dev/null
+++ b/src/modules.c
@@ -0,0 +1,1454 @@
+/************************************************************************
+ *   UnrealIRCd - Unreal Internet Relay Chat Daemon - src/modules.c
+ *   (C) 2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define UNREALCORE
+#include "unrealircd.h"
+#ifdef _WIN32
+#define RTLD_NOW 0
+#elif defined(HPUX)
+#include <dl.h>
+#define RTLD_NOW BIND_IMMEDIATE
+#else
+#include <dlfcn.h>
+#endif
+#ifndef _WIN32
+#include <dirent.h>
+#endif
+#ifndef RTLD_NOW
+#define RTLD_NOW RTLD_LAZY
+#endif
+#include "modversion.h"
+
+Hook	   	*Hooks[MAXHOOKTYPES];
+Hooktype	Hooktypes[MAXCUSTOMHOOKS];
+Callback	*Callbacks[MAXCALLBACKS];	/* Callback objects for modules, used for rehashing etc (can be multiple) */
+Callback	*RCallbacks[MAXCALLBACKS];	/* 'Real' callback function, used for callback function calls */
+MODVAR Module          *Modules = NULL;
+MODVAR Versionflag     *Versionflags = NULL;
+
+Module *Module_make(ModuleHeader *header, 
+#ifdef _WIN32
+       HMODULE mod
+#else
+       void *mod
+#endif
+       );
+
+#ifdef UNDERSCORE
+/* dlsym for OpenBSD */
+void *obsd_dlsym(void *handle, char *symbol)
+{
+	size_t buflen = strlen(symbol) + 2;
+	char *obsdsymbol = safe_alloc(buflen);
+	void *symaddr = NULL;
+
+	if (obsdsymbol)
+	{
+		ircsnprintf(obsdsymbol, buflen, "_%s", symbol);
+		symaddr = dlsym(handle, obsdsymbol);
+		safe_free(obsdsymbol);
+	}
+
+	return symaddr;
+}
+#endif
+
+void deletetmp(char *path)
+{
+#ifndef NOREMOVETMP
+	if (!loop.config_test)
+		remove(path);
+#endif
+}
+
+void DeleteTempModules(void)
+{
+	char tempbuf[PATH_MAX+1];
+#ifndef _WIN32
+	DIR *fd = opendir(TMPDIR);
+	struct dirent *dir;
+
+	if (!fd) /* Ouch.. this is NOT good!! */
+	{
+		config_error("Unable to open temp directory %s: %s, please create one with the appropriate permissions",
+			TMPDIR, strerror(errno));
+		if (!loop.ircd_booted)
+			exit(7);
+		return; 
+	}
+
+	while ((dir = readdir(fd)))
+	{
+		char *fname = dir->d_name;
+		if (!strcmp(fname, ".") || !strcmp(fname, ".."))
+			continue;
+		if (!strstr(fname, ".so") && !strstr(fname, ".conf") &&
+		    (strstr(fname, "core") || strstr(fname, "unrealircd_asan.")))
+			continue; /* core dump or ASan log */
+		ircsnprintf(tempbuf, sizeof(tempbuf), "%s/%s", TMPDIR, fname);
+		deletetmp(tempbuf);
+	}
+	closedir(fd);
+#else
+	WIN32_FIND_DATA hData;
+	HANDLE hFile;
+	
+	snprintf(tempbuf, sizeof(tempbuf), "%s/*", TMPDIR);
+	
+	hFile = FindFirstFile(tempbuf, &hData);
+	if (hFile != INVALID_HANDLE_VALUE)
+	{
+		if (strcmp(hData.cFileName, ".") || strcmp(hData.cFileName, ".."))
+		{
+			ircsnprintf(tempbuf, sizeof(tempbuf), "%s/%s", TMPDIR, hData.cFileName);
+			deletetmp(tempbuf);
+		}
+	}
+	while (FindNextFile(hFile, &hData))
+	{
+		if (!strcmp(hData.cFileName, ".") || !strcmp(hData.cFileName, ".."))
+			continue;
+		ircsnprintf(tempbuf, sizeof(tempbuf), "%s/%s", TMPDIR, hData.cFileName);
+		deletetmp(tempbuf);
+	}
+	FindClose(hFile);
+#endif	
+}
+
+Module *Module_Find(char *name)
+{
+	Module *p;
+	
+	for (p = Modules; p; p = p->next)
+	{
+		if (!(p->options & MOD_OPT_PERM) &&
+		    (!(p->flags & MODFLAG_TESTING) || (p->flags & MODFLAG_DELAYED)))
+			continue;
+		if (!strcmp(p->header->name, name))
+		{
+			return (p);
+		}
+	}
+	return NULL;
+	
+}
+
+int parse_modsys_version(char *version)
+{
+	if (!strcmp(version, "unrealircd-5"))
+		return 0x500000;
+	return 0;
+}
+
+void make_compiler_string(char *buf, size_t buflen, unsigned int ver)
+{
+unsigned int maj, min, plevel;
+
+	if (ver == 0)
+	{
+		strlcpy(buf, "0", buflen);
+		return;
+	}
+	
+	maj = ver >> 16;
+	min = (ver >> 8) & 0xff;
+	plevel = ver & 0xff;
+	
+	if (plevel == 0)
+		snprintf(buf, buflen, "%d.%d", maj, min);
+	else
+		snprintf(buf, buflen, "%d.%d.%d", maj, min, plevel);
+}
+
+/** Transform a loadmodule path like "third/la" to
+ * something like "/home/xyz/unrealircd/modules/third/la.so
+ * (and other tricks)
+ */
+char *Module_TransformPath(char *path_)
+{
+	static char path[1024];
+
+	/* Prefix the module path with MODULESDIR, unless it's an absolute path
+	 * (we check for "/", "\" and things like "C:" to detect absolute paths).
+	 */
+	if ((*path_ != '/') && (*path_ != '\\') && !(*path_ && (path_[1] == ':')))
+	{
+		snprintf(path, sizeof(path), "%s/%s", MODULESDIR, path_);
+	} else {
+		strlcpy(path, path_, sizeof(path));
+	}
+
+	/* Auto-suffix .dll / .so */
+	if (!strstr(path, MODULE_SUFFIX))
+		strlcat(path, MODULE_SUFFIX, sizeof(path));
+
+	return path;
+}
+
+/** This function is the inverse of Module_TransformPath() */
+char *Module_GetRelPath(char *fullpath)
+{
+	static char buf[512];
+	char prefix[512];
+	char *s = fullpath;
+
+	/* Strip the prefix */
+	snprintf(prefix, sizeof(prefix), "%s/", MODULESDIR);
+	if (!strncasecmp(fullpath, prefix, strlen(prefix)))
+		s += strlen(prefix);
+	strlcpy(buf, s, sizeof(buf));
+
+	/* Strip the suffix */
+	s = strstr(buf, MODULE_SUFFIX);
+	if (s)
+		*s = '\0';
+
+	return buf;
+}
+
+/** Validate a modules' ModuleHeader.
+ * @returns Error message is returned, or NULL if everything is OK.
+ */
+static char *validate_mod_header(char *relpath, ModuleHeader *mod_header)
+{
+	char *p;
+	static char buf[256];
+
+	if (!mod_header->name || !mod_header->version || !mod_header->author || !mod_header->description)
+		return "NULL values encountered in Mod_Header struct members";
+
+	/* Validate module name */
+	if (strcmp(mod_header->name, relpath))
+	{
+		snprintf(buf, sizeof(buf), "Module has path '%s' but uses name '%s' in MOD_HEADER. These should be the same!",
+			relpath, mod_header->name);
+		return buf;
+	}
+	/* This too, just to be sure.. we never ever want other characters
+	 * than these, since it may break the S2S SMOD command or /MODULE
+	 * output etc.
+	 */
+	for (p = mod_header->name; *p; p++)
+		if (!isalnum(*p) && !strchr("._-/", *p))
+			return "ModuleHeader.name contains illegal characters (must be: a-zA-Z0-9._-/)";
+
+	/* Validate version, even more strict */
+	if (!isdigit(mod_header->version[0]))
+		return "ModuleHeader.version must start with a digit";
+	for (p = mod_header->version; *p; p++)
+		if (!isalnum(*p) && !strchr("._-", *p))
+			return "ModuleHeader.version contains illegal characters (must be: a-zA-Z0-9._-)";
+
+	/* Author and description are not checked, has no constraints */
+
+	return NULL; /* SUCCESS */
+}
+
+int module_already_in_testing(char *relpath)
+{
+	Module *m;
+	for (m = Modules; m; m = m->next)
+	{
+		if (!(m->options & MOD_OPT_PERM) &&
+		    (!(m->flags & MODFLAG_TESTING) || (m->flags & MODFLAG_DELAYED)))
+			continue;
+		if (!strcmp(m->relpath, relpath))
+			return 1;
+	}
+	return 0;
+}
+
+/*
+ * Returns an error if insucessful .. yes NULL is OK! 
+*/
+char  *Module_Create(char *path_)
+{
+#ifdef _WIN32
+	HMODULE 	Mod;
+#else /* _WIN32 */
+	void   		*Mod;
+#endif /* _WIN32 */
+	int		(*Mod_Test)();
+	int		(*Mod_Init)();
+	int             (*Mod_Load)();
+	int             (*Mod_Unload)();
+	char    *Mod_Version;
+	unsigned int *compiler_version;
+	static char 	errorbuf[1024];
+	char 		*path, *relpath, *tmppath;
+	ModuleHeader    *mod_header = NULL;
+	int		ret = 0;
+	char		*reterr;
+	Module          *mod = NULL, **Mod_Handle = NULL;
+	char *expectedmodversion = our_mod_version;
+	unsigned int expectedcompilerversion = our_compiler_version;
+	long modsys_ver = 0;
+	Debug((DEBUG_DEBUG, "Attempting to load module from %s", path_));
+
+	path = Module_TransformPath(path_);
+
+	relpath = Module_GetRelPath(path);
+	if (module_already_in_testing(relpath))
+		return 0;
+
+	if (!file_exists(path))
+	{
+		snprintf(errorbuf, sizeof(errorbuf), "Cannot open module file: %s", strerror(errno));
+		return errorbuf;
+	}
+
+	if (loop.config_test)
+	{
+		/* For './unrealircd configtest' we don't have to do any copying and shit */
+		tmppath = path;
+	} else {
+		tmppath = unreal_mktemp(TMPDIR, unreal_getmodfilename(path));
+		if (!tmppath)
+			return "Unable to create temporary file!";
+
+		/* We have to copy the module, because otherwise the dynamic loader
+		 * will not load the new .so if we rehash while holding the original .so
+		 * We used to hardlink here instead of copy, but then OpenBSD and Linux
+		 * got smart and detected that, so now we always copy.
+		 */
+		ret = unreal_copyfileex(path, tmppath, 0);
+		if (!ret)
+		{
+			snprintf(errorbuf, sizeof(errorbuf), "Failed to copy module file.");
+			return errorbuf;
+		}
+	}
+
+	if ((Mod = irc_dlopen(tmppath, RTLD_NOW)))
+	{
+		/* We have engaged the borg cube. Scan for lifesigns. */
+		irc_dlsym(Mod, "Mod_Version", Mod_Version);
+		if (Mod_Version && strcmp(Mod_Version, expectedmodversion))
+		{
+			snprintf(errorbuf, sizeof(errorbuf),
+			         "Module was compiled for '%s', we were configured for '%s'. SOLUTION: Recompile the module(s).",
+			         Mod_Version, expectedmodversion);
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return errorbuf;
+		}
+		if (!Mod_Version)
+		{
+			snprintf(errorbuf, sizeof(errorbuf),
+				"Module is lacking Mod_Version. Perhaps a very old one you forgot to recompile?");
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return errorbuf;
+		}
+		irc_dlsym(Mod, "compiler_version", compiler_version);
+		if (compiler_version && ( ((*compiler_version) & 0xffff00) != (expectedcompilerversion & 0xffff00) ) )
+		{
+			char theyhad[64], wehave[64];
+			make_compiler_string(theyhad, sizeof(theyhad), *compiler_version);
+			make_compiler_string(wehave, sizeof(wehave), expectedcompilerversion);
+			snprintf(errorbuf, sizeof(errorbuf),
+			         "Module was compiled with GCC %s, core was compiled with GCC %s. SOLUTION: Recompile your UnrealIRCd and all its modules by doing a 'make clean; ./Config -quick && make'.",
+			         theyhad, wehave);
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return errorbuf;
+		}
+		irc_dlsym(Mod, "Mod_Header", mod_header);
+		if (!mod_header)
+		{
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return ("Unable to locate Mod_Header");
+		}
+		if (!mod_header->modversion)
+		{
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return ("Lacking mod_header->modversion");
+		}
+		if (!(modsys_ver = parse_modsys_version(mod_header->modversion)))
+		{
+			snprintf(errorbuf, 1023, "Unsupported module system version '%s'",
+				   mod_header->modversion);
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return(errorbuf);
+		}
+		if ((reterr = validate_mod_header(relpath, mod_header)))
+		{
+			irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return(reterr);
+		}
+		if (Module_Find(mod_header->name))
+		{
+		        irc_dlclose(Mod);
+			deletetmp(tmppath);
+			return (NULL);
+		}
+		mod = (Module *)Module_make(mod_header, Mod);
+		safe_strdup(mod->tmp_file, tmppath);
+		mod->mod_sys_version = modsys_ver;
+		mod->compiler_version = compiler_version ? *compiler_version : 0;
+		safe_strdup(mod->relpath, relpath);
+
+		irc_dlsym(Mod, "Mod_Init", Mod_Init);
+		if (!Mod_Init)
+		{
+			Module_free(mod);
+			return ("Unable to locate Mod_Init");
+		}
+		irc_dlsym(Mod, "Mod_Unload", Mod_Unload);
+		if (!Mod_Unload)
+		{
+			Module_free(mod);
+			return ("Unable to locate Mod_Unload");
+		}
+		irc_dlsym(Mod, "Mod_Load", Mod_Load);
+		if (!Mod_Load)
+		{
+			Module_free(mod);
+			return ("Unable to locate Mod_Load"); 
+		}
+		irc_dlsym(Mod, "Mod_Handle", Mod_Handle);
+		if (Mod_Handle)
+			*Mod_Handle = mod;
+		irc_dlsym(Mod, "Mod_Test", Mod_Test);
+		if (Mod_Test)
+		{
+			if ((ret = (*Mod_Test)(&mod->modinfo)) < MOD_SUCCESS) {
+				ircsnprintf(errorbuf, sizeof(errorbuf), "Mod_Test returned %i",
+					   ret);
+				/* We EXPECT the module to have cleaned up its mess */
+				Module_free(mod);
+				return (errorbuf);
+			}
+		}
+		mod->flags = MODFLAG_TESTING;		
+		AddListItem(mod, Modules);
+		return NULL;
+	}
+	else
+	{
+		/* Return the error .. */
+		return ((char *)irc_dlerror());
+	}
+}
+
+void Module_DelayChildren(Module *m)
+{
+	ModuleChild *c;
+	for (c = m->children; c; c = c->next)
+	{
+		c->child->flags |= MODFLAG_DELAYED;
+		Module_DelayChildren(c->child);
+	}
+}
+
+Module *Module_make(ModuleHeader *header, 
+#ifdef _WIN32
+       HMODULE mod
+#else
+       void *mod
+#endif
+       )
+{
+	Module *modp = NULL;
+	
+	modp = safe_alloc(sizeof(Module));
+	modp->header = header;
+	modp->dll = mod;
+	modp->flags = MODFLAG_NONE;
+	modp->options = 0;
+	modp->errorcode = MODERR_NOERROR;
+	modp->children = NULL;
+	modp->modinfo.size = sizeof(ModuleInfo);
+	modp->modinfo.module_load = 0;
+	modp->modinfo.handle = modp;
+		
+	return (modp);
+}
+
+void Init_all_testing_modules(void)
+{
+	
+	Module *mi, *next;
+	int ret;
+	iFP Mod_Init;
+	for (mi = Modules; mi; mi = next)
+	{
+		next = mi->next;
+		if (!(mi->flags & MODFLAG_TESTING))
+			continue;
+		irc_dlsym(mi->dll, "Mod_Init", Mod_Init);
+		if ((ret = (*Mod_Init)(&mi->modinfo)) < MOD_SUCCESS) {
+			config_error("Error loading %s: Mod_Init returned %i",
+			    mi->header->name, ret);
+			Module_free(mi);
+			continue;
+		}
+		mi->flags = MODFLAG_INIT;
+	}
+}	
+
+void FreeModObj(ModuleObject *obj, Module *m)
+{
+	if (obj->type == MOBJ_EVENT) {
+		EventDel(obj->object.event);
+	}
+	else if (obj->type == MOBJ_HOOK) {
+		HookDel(obj->object.hook);
+	}
+	else if (obj->type == MOBJ_COMMAND) {
+		CommandDel(obj->object.command);
+	}
+	else if (obj->type == MOBJ_HOOKTYPE) {
+		//HooktypeDel(obj->object.hooktype, m); -- reinstate if we audited this code
+	}
+	else if (obj->type == MOBJ_VERSIONFLAG) {
+		VersionflagDel(obj->object.versionflag, m);
+	}
+	else if (obj->type == MOBJ_SNOMASK) {
+		SnomaskDel(obj->object.snomask);
+	}
+	else if (obj->type == MOBJ_UMODE) {
+		UmodeDel(obj->object.umode);
+	}
+	else if (obj->type == MOBJ_CMODE) {
+		CmodeDel(obj->object.cmode);
+	}
+	else if (obj->type == MOBJ_COMMANDOVERRIDE) {
+		CommandOverrideDel(obj->object.cmdoverride);
+	}
+	else if (obj->type == MOBJ_EXTBAN) {
+		ExtbanDel(obj->object.extban);
+	}
+	else if (obj->type == MOBJ_CALLBACK) {
+		CallbackDel(obj->object.callback);
+	}
+	else if (obj->type == MOBJ_EFUNCTION) {
+		EfunctionDel(obj->object.efunction);
+	}
+	else if (obj->type == MOBJ_ISUPPORT) {
+		ISupportDel(obj->object.isupport);
+	}
+	else if (obj->type == MOBJ_MODDATA) {
+		ModDataDel(obj->object.moddata);
+	}
+	else if (obj->type == MOBJ_VALIDATOR) {
+		OperClassValidatorDel(obj->object.validator);
+	}
+	else if (obj->type == MOBJ_CLICAP) {
+		ClientCapabilityDel(obj->object.clicap);
+	}
+	else if (obj->type == MOBJ_MTAG) {
+		MessageTagHandlerDel(obj->object.mtag);
+	}
+	else if (obj->type == MOBJ_HISTORY_BACKEND) {
+		HistoryBackendDel(obj->object.history_backend);
+	}
+	else
+	{
+		ircd_log(LOG_ERROR, "FreeModObj() called for unknown object");
+		abort();
+	}
+}
+
+void Unload_all_loaded_modules(void)
+{
+	Module *mi, *next;
+	ModuleChild *child, *childnext;
+	ModuleObject *objs, *objnext;
+	iFP Mod_Unload;
+	int ret;
+
+	for (mi = Modules; mi; mi = next)
+	{
+		next = mi->next;
+		if (!(mi->flags & MODFLAG_LOADED) || (mi->flags & MODFLAG_DELAYED) || (mi->options & MOD_OPT_PERM))
+			continue;
+		irc_dlsym(mi->dll, "Mod_Unload", Mod_Unload);
+		if (Mod_Unload)
+		{
+			ret = (*Mod_Unload)(&mi->modinfo);
+			if (ret == MOD_DELAY)
+			{
+				mi->flags |= MODFLAG_DELAYED;
+				Module_DelayChildren(mi);
+			}
+		}
+		for (objs = mi->objects; objs; objs = objnext) {
+			objnext = objs->next;
+			FreeModObj(objs, mi);
+		}
+		for (child = mi->children; child; child = childnext)
+		{
+			childnext = child->next;
+			DelListItem(child,mi->children);
+			safe_free(child);
+		}
+		DelListItem(mi,Modules);
+		irc_dlclose(mi->dll);
+		deletetmp(mi->tmp_file);
+		safe_free(mi->tmp_file);
+		safe_free(mi->relpath);
+		safe_free(mi);
+	}
+}
+
+void Unload_all_testing_modules(void)
+{
+	Module *mi, *next;
+	ModuleChild *child, *childnext;
+	ModuleObject *objs, *objnext;
+
+	for (mi = Modules; mi; mi = next)
+	{
+		next = mi->next;
+		if (!(mi->flags & MODFLAG_TESTING))
+			continue;
+		for (objs = mi->objects; objs; objs = objnext) {
+			objnext = objs->next;
+			FreeModObj(objs, mi);
+		}
+		for (child = mi->children; child; child = childnext)
+		{
+			childnext = child->next;
+			DelListItem(child,mi->children);
+			safe_free(child);
+		}
+		DelListItem(mi,Modules);
+		irc_dlclose(mi->dll);
+		deletetmp(mi->tmp_file);
+		safe_free(mi->tmp_file);
+		safe_free(mi->relpath);
+		safe_free(mi);
+	}
+}
+
+/* 
+ * Returns -1 if you cannot unload due to children still alive 
+ * Returns 1 if successful 
+ */
+int    Module_free(Module *mod)
+{
+	Module *p;
+	ModuleChild *cp, *cpnext;
+	ModuleObject *objs, *next;
+	/* Do not kill parent if children still alive */
+
+	for (cp = mod->children; cp; cp = cp->next)
+	{
+		sendto_realops("Unloading child module %s",
+			      cp->child->header->name);
+		Module_Unload(cp->child->header->name);
+	}
+	for (objs = mod->objects; objs; objs = next) {
+		next = objs->next;
+		FreeModObj(objs, mod);
+	}
+	for (p = Modules; p; p = p->next)
+	{
+		for (cp = p->children; cp; cp = cpnext)
+		{
+			cpnext = cp->next;
+			if (cp->child == mod)
+			{
+				DelListItem(mod, p->children);
+				safe_free(cp);
+				/* We can assume there can be only one. */
+				break;
+			}
+		}
+	}
+	DelListItem(mod, Modules);
+	irc_dlclose(mod->dll);
+	safe_free(mod->tmp_file);
+	safe_free(mod->relpath);
+	safe_free(mod);
+	return 1;
+}
+
+/*
+ *  Module_Unload ()
+ *     char *name        Internal module name
+ *  Returns:
+ *     -1                Not able to locate module, severe failure, anything
+ *      1                Module unloaded
+ *      2                Module wishes delayed unloading, has placed event
+ */
+int Module_Unload(char *name)
+{
+	Module *m;
+	int    (*Mod_Unload)();
+	int    ret;
+	for (m = Modules; m; m = m->next)
+	{
+		if (!strcmp(m->header->name, name))
+		{
+		       break;
+		}
+	}      
+	if (!m)
+		return -1;
+	irc_dlsym(m->dll, "Mod_Unload", Mod_Unload);
+	if (!Mod_Unload)
+	{
+		return -1;
+	}
+	ret = (*Mod_Unload)(&m->modinfo);
+	if (ret == MOD_DELAY)
+	{
+		m->flags |= MODFLAG_DELAYED;
+		Module_DelayChildren(m);
+		return 2;
+	}
+	if (ret == MOD_FAILED)
+	{
+		return -1;
+	}
+	/* No more pain detected, let's unload */
+	DelListItem(m, Modules);
+	Module_free(m);
+	return 1;
+}
+
+void module_loadall(void)
+{
+	iFP	fp;
+	Module *mi, *next;
+	
+	if (!loop.ircd_booted)
+	{
+		sendto_realops("Ehh, !loop.ircd_booted in module_loadall()");
+		return ;
+	}
+	/* Run through all modules and check for module load */
+	for (mi = Modules; mi; mi = next)
+	{
+		next = mi->next;
+		if (mi->flags & MODFLAG_LOADED)
+			continue;
+		irc_dlsym(mi->dll, "Mod_Load", fp);
+		/* Call the module_load */
+		if ((*fp)(&mi->modinfo) != MOD_SUCCESS)
+		{
+			config_status("cannot load module %s", mi->header->name);
+			Module_free(mi);
+		}
+		else
+			mi->flags = MODFLAG_LOADED;
+	}
+}
+
+int	Module_IsAlreadyChild(Module *parent, Module *child)
+{
+	ModuleChild *mcp;
+	
+	for (mcp = parent->children; mcp; mcp = mcp->next)
+	{
+		if (mcp->child == child) 
+			return 1;
+	}
+	return 0;
+}
+
+void	Module_AddAsChild(Module *parent, Module *child)
+{
+	ModuleChild	*childp = NULL;
+	
+	childp = safe_alloc(sizeof(ModuleChild));
+	childp->child = child;
+	AddListItem(childp, parent->children);
+}
+
+/* cmd_module.
+ * by Stskeeps, codemastr, Syzop.
+ * Changed it so it's now public for users too, as quite some people
+ * (and users) requested they should have the right to see what kind 
+ * of weird modules are loaded on the server, especially since people
+ * like to load spy modules these days.
+ * I do not consider this sensitive information, but just in case
+ * I stripped the version string for non-admins (eg: normal users). -- Syzop
+ */
+CMD_FUNC(cmd_module)
+{
+	Module *mi;
+	int i;
+	char tmp[1024], *p;
+	RealCommand *mptr;
+	int all = 0;
+
+	if ((parc > 1) && !strcmp(parv[1], "-all"))
+		all = 1;
+
+	if (MyUser(client) && !IsOper(client) && all)
+		client->local->since += 7; /* Lag them up. Big list. */
+
+	if ((parc > 2) && (hunt_server(client, recv_mtags, ":%s MODULE %s :%s", 2, parc, parv) != HUNTED_ISME))
+		return;
+
+	if ((parc == 2) && (parv[1][0] != '-') && (hunt_server(client, recv_mtags, ":%s MODULE :%s", 1, parc, parv) != HUNTED_ISME))
+		return;
+
+	if (all)
+		sendtxtnumeric(client, "Showing ALL loaded modules:");
+	else
+		sendtxtnumeric(client, "Showing loaded 3rd party modules (use \"MODULE -all\" to show all modules):");
+
+	for (mi = Modules; mi; mi = mi->next)
+	{
+		/* Skip official modules unless "MODULE -all" */
+		if (!all && (mi->options & MOD_OPT_OFFICIAL))
+			continue;
+
+		tmp[0] = '\0';
+		if (mi->flags & MODFLAG_DELAYED)
+			strlcat(tmp, "[Unloading] ", sizeof(tmp));
+		if (mi->options & MOD_OPT_PERM_RELOADABLE)
+			strlcat(tmp, "[PERM-BUT-RELOADABLE] ", sizeof(tmp));
+		if (mi->options & MOD_OPT_PERM)
+			strlcat(tmp, "[PERM] ", sizeof(tmp));
+		if (!(mi->options & MOD_OPT_OFFICIAL))
+			strlcat(tmp, "[3RD] ", sizeof(tmp));
+		if (!ValidatePermissionsForPath("server:module",client,NULL,NULL,NULL))
+			sendtxtnumeric(client, "*** %s - %s - by %s %s",
+				mi->header->name,
+				mi->header->description,
+				mi->header->author,
+				mi->options & MOD_OPT_OFFICIAL ? "" : "[3RD]");
+		else
+			sendtxtnumeric(client, "*** %s %s - %s - by %s %s",
+				mi->header->name,
+				mi->header->version,
+				mi->header->description,
+				mi->header->author,
+				tmp);
+	}
+
+	sendtxtnumeric(client, "End of module list");
+
+	if (!ValidatePermissionsForPath("server:module",client,NULL,NULL,NULL))
+		return;
+
+	tmp[0] = '\0';
+	p = tmp;
+	for (i=0; i < MAXHOOKTYPES; i++)
+	{
+		if (!Hooks[i])
+			continue;
+		ircsnprintf(p, sizeof(tmp) - strlen(tmp), "%d ", i);
+		p += strlen(p);
+		if (p > tmp + 380)
+		{
+			sendtxtnumeric(client, "Hooks: %s", tmp);
+			tmp[0] = '\0';
+			p = tmp;
+		}
+	}
+	sendtxtnumeric(client, "Hooks: %s ", tmp);
+
+	tmp[0] = '\0';
+	p = tmp;
+	for (i=0; i < 256; i++)
+	{
+		for (mptr = CommandHash[i]; mptr; mptr = mptr->next)
+			if (mptr->overriders)
+			{
+				ircsnprintf(p, sizeof(tmp)-strlen(tmp), "%s ", mptr->cmd);
+				p += strlen(p);
+				if (p > tmp+380)
+				{
+					sendtxtnumeric(client, "Override: %s", tmp);
+					tmp[0] = '\0';
+					p = tmp;
+				}
+			}
+	}
+	sendtxtnumeric(client, "Override: %s", tmp);
+}
+
+Hooktype *HooktypeFind(char *string) {
+	Hooktype *hooktype;
+	for (hooktype = Hooktypes; hooktype->string ;hooktype++) {
+		if (!strcasecmp(hooktype->string, string))
+			return hooktype;
+	}
+	return NULL;
+}
+
+Versionflag *VersionflagFind(char flag)
+{
+	Versionflag *vflag;
+	for (vflag = Versionflags; vflag; vflag = vflag->next)
+	{
+		if (vflag->flag == flag)
+			return vflag;
+	}
+	return NULL;
+}
+
+Versionflag *VersionflagAdd(Module *module, char flag)
+{
+	Versionflag *vflag;
+	ModuleChild *parent;
+	if ((vflag = VersionflagFind(flag)))
+	{
+		ModuleChild *child;
+		for (child = vflag->parents; child; child = child->next) {
+			if (child->child == module)
+				break;
+		}
+		if (!child)
+		{
+			parent = safe_alloc(sizeof(ModuleChild));
+			parent->child = module;
+			if (module) {
+				ModuleObject *vflagobj;
+				vflagobj = safe_alloc(sizeof(ModuleObject));
+				vflagobj->type = MOBJ_VERSIONFLAG;
+				vflagobj->object.versionflag = vflag;
+				AddListItem(vflagobj, module->objects);
+				module->errorcode = MODERR_NOERROR;
+			}
+			AddListItem(parent,vflag->parents);
+		}
+		return vflag;
+	}
+	vflag = safe_alloc(sizeof(Versionflag));
+	vflag->flag = flag;
+	parent = safe_alloc(sizeof(ModuleChild));
+	parent->child = module;
+	if (module)
+	{
+		ModuleObject *vflagobj;
+		vflagobj = safe_alloc(sizeof(ModuleObject));
+		vflagobj->type = MOBJ_VERSIONFLAG;
+		vflagobj->object.versionflag = vflag;
+		AddListItem(vflagobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	flag_add(flag);
+	AddListItem(parent,vflag->parents);
+	AddListItem(vflag, Versionflags);
+	return vflag;
+}
+	
+void VersionflagDel(Versionflag *vflag, Module *module)
+{
+	ModuleChild *owner;
+	if (!vflag)
+		return;
+
+	for (owner = vflag->parents; owner; owner = owner->next)
+	{
+		if (owner->child == module)
+		{
+			DelListItem(owner,vflag->parents);
+			safe_free(owner);
+			break;
+		}
+	}
+	if (module)
+	{
+		ModuleObject *objs;
+		for (objs = module->objects; objs; objs = objs->next) {
+			if (objs->type == MOBJ_VERSIONFLAG && objs->object.versionflag == vflag) {
+				DelListItem(objs,module->objects);
+				safe_free(objs);
+				break;
+			}
+		}
+	}
+	if (!vflag->parents)
+	{
+		flag_del(vflag->flag);
+		DelListItem(vflag, Versionflags);
+		safe_free(vflag);
+	}
+}
+
+Hook *HookAddMain(Module *module, int hooktype, int priority, int (*func)(), void (*vfunc)(), char *(*cfunc)())
+{
+	Hook *p;
+	
+	p = (Hook *) safe_alloc(sizeof(Hook));
+	if (func)
+		p->func.intfunc = func;
+	if (vfunc)
+		p->func.voidfunc = vfunc;
+	if (cfunc)
+		p->func.pcharfunc = cfunc;
+	p->type = hooktype;
+	p->owner = module;
+	p->priority = priority;
+
+	if (module) {
+		ModuleObject *hookobj = (ModuleObject *)safe_alloc(sizeof(ModuleObject));
+		hookobj->object.hook = p;
+		hookobj->type = MOBJ_HOOK;
+		AddListItem(hookobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	
+	AddListItemPrio(p, Hooks[hooktype], p->priority);
+
+	return p;
+}
+
+Hook *HookDel(Hook *hook)
+{
+	Hook *p, *q;
+	for (p = Hooks[hook->type]; p; p = p->next) {
+		if (p == hook) {
+			q = p->next;
+			DelListItem(p, Hooks[hook->type]);
+			if (p->owner) {
+				ModuleObject *hookobj;
+				for (hookobj = p->owner->objects; hookobj; hookobj = hookobj->next) {
+					if (hookobj->type == MOBJ_HOOK && hookobj->object.hook == p) {
+						DelListItem(hookobj, hook->owner->objects);
+						safe_free(hookobj);
+						break;
+					}
+				}
+			}
+			safe_free(p);
+			return q;
+		}
+	}
+	return NULL;
+}
+
+Callback	*CallbackAddMain(Module *module, int cbtype, int (*func)(), void (*vfunc)(), char *(*cfunc)())
+{
+	Callback *p;
+	
+	p = safe_alloc(sizeof(Callback));
+	if (func)
+		p->func.intfunc = func;
+	if (vfunc)
+		p->func.voidfunc = vfunc;
+	if (cfunc)
+		p->func.pcharfunc = cfunc;
+	p->type = cbtype;
+	p->owner = module;
+	AddListItem(p, Callbacks[cbtype]);
+	if (module) {
+		ModuleObject *cbobj = safe_alloc(sizeof(ModuleObject));
+		cbobj->object.callback = p;
+		cbobj->type = MOBJ_CALLBACK;
+		AddListItem(cbobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	return p;
+}
+
+Callback *CallbackDel(Callback *cb)
+{
+	Callback *p, *q;
+	for (p = Callbacks[cb->type]; p; p = p->next) {
+		if (p == cb) {
+			q = p->next;
+			DelListItem(p, Callbacks[cb->type]);
+			if (RCallbacks[cb->type] == p)
+				RCallbacks[cb->type] = NULL;
+			if (p->owner) {
+				ModuleObject *cbobj;
+				for (cbobj = p->owner->objects; cbobj; cbobj = cbobj->next) {
+					if ((cbobj->type == MOBJ_CALLBACK) && (cbobj->object.callback == p)) {
+						DelListItem(cbobj, cb->owner->objects);
+						safe_free(cbobj);
+						break;
+					}
+				}
+			}
+			safe_free(p);
+			return q;
+		}
+	}
+	return NULL;
+}
+
+CommandOverride *CommandOverrideAddEx(Module *module, char *name, int priority, OverrideCmdFunc function)
+{
+	RealCommand *p;
+	CommandOverride *ovr;
+	
+	if (!(p = find_command_simple(name)))
+	{
+		if (module)
+			module->errorcode = MODERR_NOTFOUND;
+		return NULL;
+	}
+	for (ovr=p->overriders; ovr; ovr=ovr->next)
+	{
+		if ((ovr->owner == module) && (ovr->func == function))
+		{
+			if (module)
+				module->errorcode = MODERR_EXISTS;
+			return NULL;
+		}
+	}
+	ovr = safe_alloc(sizeof(CommandOverride));
+	ovr->func = function;
+	ovr->owner = module; /* TODO: module objects */
+	ovr->priority = priority;
+	if (module)
+	{
+		ModuleObject *cmdoverobj = safe_alloc(sizeof(ModuleObject));
+		cmdoverobj->type = MOBJ_COMMANDOVERRIDE;
+		cmdoverobj->object.cmdoverride = ovr;
+		AddListItem(cmdoverobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+	ovr->command = p;
+	AddListItemPrio(ovr, p->overriders, ovr->priority);
+	if (p->friend)
+	{
+		AddListItem(ovr, p->friend->overriders);
+	}
+	return ovr;
+}
+
+CommandOverride *CommandOverrideAdd(Module *module, char *name, OverrideCmdFunc function)
+{
+	return CommandOverrideAddEx(module, name, 0, function);
+}
+
+void CommandOverrideDel(CommandOverride *cmd)
+{
+	DelListItem(cmd, cmd->command->overriders);
+	if (cmd->command->friend)
+	{
+		DelListItem(cmd, cmd->command->friend->overriders);
+	}
+	if (cmd->owner)
+	{
+		ModuleObject *obj;
+		for (obj = cmd->owner->objects; obj; obj = obj->next)
+		{
+			if (obj->type != MOBJ_COMMANDOVERRIDE)
+				continue;
+			if (obj->object.cmdoverride == cmd)
+			{
+				DelListItem(obj, cmd->owner->objects);
+				safe_free(obj);
+				break;
+			}
+		}
+	}
+	safe_free(cmd);
+}
+
+void CallCommandOverride(CommandOverride *ovr, Client *client, MessageTag *mtags, int parc, char *parv[])
+{
+	if (ovr->next)
+		ovr->next->func(ovr->next, client, mtags, parc, parv);
+	else
+		ovr->command->func(client, mtags, parc, parv);
+}
+
+EVENT(e_unload_module_delayed)
+{
+	char *name = (char *)data;
+	int i; 
+	i = Module_Unload(name);
+	if (i == 1)
+		sendto_realops("Unloaded module %s", name);
+	safe_free(name);
+	extcmodes_check_for_changes();
+	umodes_check_for_changes();
+	return;
+}
+
+void	unload_all_modules(void)
+{
+	Module *m;
+	int	(*Mod_Unload)();
+	for (m = Modules; m; m = m->next)
+	{
+		irc_dlsym(m->dll, "Mod_Unload", Mod_Unload);
+		if (Mod_Unload)
+			(*Mod_Unload)(&m->modinfo);
+		deletetmp(m->tmp_file);
+	}
+}
+
+unsigned int ModuleSetOptions(Module *module, unsigned int options, int action)
+{
+	unsigned int oldopts = module->options;
+
+	if (action)
+        	module->options |= options;
+        else
+        	module->options &= ~options;
+	return oldopts;
+}
+
+unsigned int ModuleGetOptions(Module *module)
+{
+	return module->options;
+}
+
+unsigned int ModuleGetError(Module *module)
+{
+	return module->errorcode;
+}
+
+static const char *module_error_str[] = {
+	"No error",
+	"Object already exists",
+	"No space available",
+	"Invalid parameter(s)",
+	"Object was not found"
+};
+
+const char *ModuleGetErrorStr(Module *module)
+{
+	if (module->errorcode >= sizeof(module_error_str)/sizeof(module_error_str[0]))
+		return NULL;
+
+	return module_error_str[module->errorcode];
+}
+
+static int num_callbacks(int cbtype)
+{
+Callback *e;
+int cnt = 0;
+
+	for (e = Callbacks[cbtype]; e; e = e->next)
+		if (!e->willberemoved)
+			cnt++;
+			
+	return cnt;
+}
+
+/** Ensure that all required callbacks are in place and meet
+ * all specified requirements
+ */
+int callbacks_check(void)
+{
+int i;
+
+	for (i=0; i < MAXCALLBACKS; i++)
+	{
+		if (num_callbacks(i) > 1)
+		{
+			config_error("ERROR: Multiple callbacks loaded for type %d. "
+			             "Make sure you only load 1 module of 1 type (eg: only 1 cloaking module)",
+			             i); /* TODO: make more clear? */
+			return -1;
+		}
+	}
+		
+	return 0;
+}
+
+void callbacks_switchover(void)
+{
+Callback *e;
+int i;
+
+	/* Now set the real callback, and tag the new one
+	 * as 'willberemoved' if needed.
+	 */
+
+	for (i=0; i < MAXCALLBACKS; i++)
+		for (e = Callbacks[i]; e; e = e->next)
+			if (!e->willberemoved)
+			{
+				RCallbacks[i] = e; /* This is the new one. */
+				if (!(e->owner->options & MOD_OPT_PERM))
+					e->willberemoved = 1;
+				break;
+			}
+}
+
+#ifdef _WIN32
+const char *our_dlerror(void)
+{
+	static char errbuf[513];
+	DWORD err = GetLastError();
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS, NULL, err,
+		0, errbuf, 512, NULL);
+	if (err == ERROR_MOD_NOT_FOUND)
+		strlcat(errbuf, " This could be because the DLL depends on another DLL, for example if you "
+		               "are trying to load a 3rd party module which was compiled with a different compiler version.",
+		               sizeof(errbuf));
+	return errbuf;
+}
+#endif
+
+/** Check if a module is loaded.
+ * @param name Name of the module by relative path (eg: 'extbans/timedban')
+ * @returns 1 if module is loaded, 0 if not.
+ * @note  The name is checked against the module name,
+ *        this can be a problem if two modules have the same name.
+ */
+int is_module_loaded(char *name)
+{
+	Module *mi;
+	for (mi = Modules; mi; mi = mi->next)
+	{
+		if (mi->flags & MODFLAG_DELAYED)
+			continue; /* unloading (delayed) */
+
+		if (!strcasecmp(mi->relpath, name))
+			return 1;
+	}
+	return 0;
+}
+
+static char *mod_var_name(ModuleInfo *modinfo, char *varshortname)
+{
+	static char fullname[512];
+	snprintf(fullname, sizeof(fullname), "%s:%s", modinfo->handle->header->name, varshortname);
+	return fullname;
+}
+
+int LoadPersistentPointerX(ModuleInfo *modinfo, char *varshortname, void **var, void (*free_variable)(ModData *m))
+{
+	ModDataInfo *m;
+	char *fullname = mod_var_name(modinfo, varshortname);
+
+	m = findmoddata_byname(fullname, MODDATATYPE_LOCAL_VARIABLE);
+	if (m)
+	{
+		*var = moddata_local_variable(m).ptr;
+		return 1;
+	} else {
+		ModDataInfo mreq;
+		memset(&mreq, 0, sizeof(mreq));
+		mreq.type = MODDATATYPE_LOCAL_VARIABLE;
+		mreq.name = fullname;
+		mreq.free = free_variable;
+		m = ModDataAdd(modinfo->handle, mreq);
+		moddata_local_variable(m).ptr = NULL;
+		return 0;
+	}
+}
+
+void SavePersistentPointerX(ModuleInfo *modinfo, char *varshortname, void *var)
+{
+	ModDataInfo *m;
+	char *fullname = mod_var_name(modinfo, varshortname);
+
+	m = findmoddata_byname(fullname, MODDATATYPE_LOCAL_VARIABLE);
+	moddata_local_variable(m).ptr = var;
+}
+
+int LoadPersistentIntX(ModuleInfo *modinfo, char *varshortname, int *var)
+{
+	ModDataInfo *m;
+	char *fullname = mod_var_name(modinfo, varshortname);
+
+	m = findmoddata_byname(fullname, MODDATATYPE_LOCAL_VARIABLE);
+	if (m)
+	{
+		*var = moddata_local_variable(m).i;
+		return 1;
+	} else {
+		ModDataInfo mreq;
+		memset(&mreq, 0, sizeof(mreq));
+		mreq.type = MODDATATYPE_LOCAL_VARIABLE;
+		mreq.name = fullname;
+		mreq.free = NULL;
+		m = ModDataAdd(modinfo->handle, mreq);
+		moddata_local_variable(m).i = 0;
+		return 0;
+	}
+}
+
+void SavePersistentIntX(ModuleInfo *modinfo, char *varshortname, int var)
+{
+	ModDataInfo *m;
+	char *fullname = mod_var_name(modinfo, varshortname);
+
+	m = findmoddata_byname(fullname, MODDATATYPE_LOCAL_VARIABLE);
+	moddata_local_variable(m).i = var;
+}
+
+int LoadPersistentLongX(ModuleInfo *modinfo, char *varshortname, long *var)
+{
+	ModDataInfo *m;
+	char *fullname = mod_var_name(modinfo, varshortname);
+
+	m = findmoddata_byname(fullname, MODDATATYPE_LOCAL_VARIABLE);
+	if (m)
+	{
+		*var = moddata_local_variable(m).l;
+		return 1;
+	} else {
+		ModDataInfo mreq;
+		memset(&mreq, 0, sizeof(mreq));
+		mreq.type = MODDATATYPE_LOCAL_VARIABLE;
+		mreq.name = fullname;
+		mreq.free = NULL;
+		m = ModDataAdd(modinfo->handle, mreq);
+		moddata_local_variable(m).l = 0;
+		return 0;
+	}
+}
+
+void SavePersistentLongX(ModuleInfo *modinfo, char *varshortname, long var)
+{
+	ModDataInfo *m;
+	char *fullname = mod_var_name(modinfo, varshortname);
+
+	m = findmoddata_byname(fullname, MODDATATYPE_LOCAL_VARIABLE);
+	moddata_local_variable(m).l = var;
+}
+
+extern int module_has_moddata(Module *mod);
+extern int module_has_extcmode_param_mode(Module *mod);
+
+/** Special hack for unloading modules with moddata and parameter extcmodes */
+void special_delayed_unloading(void)
+{
+	Module *m, *m2;
+	extern Module *Modules;
+
+	for (m = Modules; m; m = m->next)
+	{
+		if (!(m->flags & MODFLAG_LOADED))
+			continue;
+		if ((m->options & MOD_OPT_PERM) || (m->options & MOD_OPT_PERM_RELOADABLE))
+			continue;
+		if (module_has_moddata(m) || module_has_extcmode_param_mode(m))
+		{
+			int found = 0;
+			for (m2 = Modules; m2; m2 = m2->next)
+			{
+				if ((m != m2) && !strcmp(m->header->name, m2->header->name))
+					found = 1;
+			}
+			if (!found)
+			{
+				char *name = strdup(m->header->name);
+				config_warn("Delaying module unloading of '%s' for a millisecond...", name);
+				m->flags |= MODFLAG_DELAYED;
+				EventAdd(NULL, "e_unload_module_delayed", e_unload_module_delayed, name, 0, 1);
+			}
+		}
+	}
+}
diff --git a/src/modules/Makefile.in b/src/modules/Makefile.in
new file mode 100644
index 0000000..5e749e3
--- /dev/null
+++ b/src/modules/Makefile.in
@@ -0,0 +1,647 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/modules/Makefile
+#*   Copyright (C) Carsten V. Munk 2001
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*   
+#*   $Id$
+#*/
+# major edit from fez - to compile objects individually...
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+INCLUDES = ../include/channel.h \
+	../include/common.h ../include/config.h ../include/dbuf.h \
+	../include/dynconf.h ../include/fdlist.h ../include/h.h \
+	../include/ircsprintf.h \
+	../include/license.h \
+	../include/modules.h ../include/modversion.h ../include/msg.h \
+	../include/numeric.h ../include/proto.h ../include/dns.h \
+	../include/resource.h ../include/setup.h \
+	../include/struct.h ../include/sys.h \
+	../include/types.h ../include/url.h \
+	../include/version.h ../include/whowas.h
+
+R_MODULES= \
+	sethost.so chghost.so chgident.so setname.so \
+	setident.so sdesc.so svsmode.so swhois.so\
+	svsmotd.so svsnline.so who_old.so whox.so mkpasswd.so \
+	away.so svsnoop.so svsnick.so \
+	chgname.so kill.so \
+	lag.so message.so oper.so pingpong.so \
+	quit.so sendumode.so sqline.so \
+	tsctl.so unsqline.so whois.so \
+	tkl.so vhost.so cycle.so svsjoin.so svspart.so \
+	svswatch.so svssilence.so sendsno.so svssno.so \
+	sajoin.so sapart.so samode.so kick.so topic.so \
+	invite.so list.so time.so svskill.so sjoin.so \
+	pass.so userhost.so ison.so silence.so knock.so \
+	umode2.so squit.so protoctl.so addomotd.so \
+	wallops.so admin.so globops.so locops.so \
+	trace.so netinfo.so links.so help.so rules.so \
+	close.so map.so eos.so server.so stats.so \
+	dccdeny.so whowas.so \
+	connect.so dccallow.so userip.so nick.so user.so \
+	mode.so watch.so part.so join.so motd.so opermotd.so \
+	botmotd.so lusers.so names.so svsnolag.so addmotd.so \
+	svslusers.so starttls.so webredir.so cap.so \
+	sasl.so md.so certfp.so \
+	tls_antidos.so webirc.so websocket.so \
+	blacklist.so jointhrottle.so \
+	antirandom.so hideserver.so jumpserver.so \
+	ircops.so staff.so nocodes.so \
+	charsys.so antimixedutf8.so authprompt.so sinfo.so \
+	reputation.so connthrottle.so history_backend_mem.so \
+	history_backend_null.so tkldb.so channeldb.so \
+	restrict-commands.so rmtkl.so require-module.so \
+	account-notify.so \
+	message-tags.so batch.so \
+	account-tag.so labeled-response.so link-security.so \
+	message-ids.so plaintext-policy.so server-time.so sts.so \
+	echo-message.so userip-tag.so userhost-tag.so \
+	ident_lookup.so history.so
+
+MODULES=cloak.so $(R_MODULES)
+MODULEFLAGS=@MODULEFLAGS@
+RM=@RM@
+
+all: build
+
+build: $(MODULES)
+	cd chanmodes; $(MAKE) all
+	cd usermodes; $(MAKE) all
+	cd snomasks; $(MAKE) all
+	cd extbans; $(MAKE) all
+	cd third; $(MAKE) all
+
+#############################################################################
+#             .so's section
+#############################################################################
+
+chgname.so: chgname.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o chgname.so chgname.c
+
+kill.so: kill.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o kill.so kill.c
+
+lag.so: lag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o lag.so lag.c
+
+message.so: message.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o message.so message.c
+
+oper.so: oper.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o oper.so oper.c
+
+pingpong.so: pingpong.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o pingpong.so pingpong.c
+
+quit.so: quit.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o quit.so quit.c
+
+sendumode.so: sendumode.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sendumode.so sendumode.c
+
+sqline.so: sqline.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sqline.so sqline.c
+
+tsctl.so: tsctl.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o tsctl.so tsctl.c
+
+unsqline.so: unsqline.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o unsqline.so unsqline.c
+
+whois.so: whois.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o whois.so whois.c
+
+sethost.so: sethost.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sethost.so sethost.c
+
+chghost.so: chghost.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o chghost.so chghost.c
+
+chgident.so: chgident.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o chgident.so chgident.c
+
+setident.so: setident.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o setident.so setident.c
+
+setname.so: setname.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o setname.so setname.c
+
+sdesc.so: sdesc.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o sdesc.so sdesc.c
+
+svsmode.so: svsmode.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o svsmode.so svsmode.c
+
+swhois.so: swhois.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o swhois.so swhois.c
+
+svsmotd.so: svsmotd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o svsmotd.so svsmotd.c
+
+svsnline.so: svsnline.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o svsnline.so svsnline.c
+
+who_old.so: who_old.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o who_old.so who_old.c
+
+whox.so: whox.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		 -o whox.so whox.c
+
+mkpasswd.so: mkpasswd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o mkpasswd.so mkpasswd.c
+
+away.so: away.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o away.so away.c
+
+svsnoop.so: svsnoop.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svsnoop.so svsnoop.c
+
+svsnick.so: svsnick.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svsnick.so svsnick.c
+
+tkl.so: tkl.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o tkl.so tkl.c
+
+vhost.so: vhost.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o vhost.so vhost.c
+
+cycle.so: cycle.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o cycle.so cycle.c
+
+svsjoin.so: svsjoin.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svsjoin.so svsjoin.c
+
+svspart.so: svspart.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svspart.so svspart.c
+
+svslusers.so: svslusers.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svslusers.so svslusers.c
+
+svswatch.so: svswatch.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svswatch.so svswatch.c
+
+svssilence.so: svssilence.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svssilence.so svssilence.c
+
+sendsno.so: sendsno.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sendsno.so sendsno.c
+
+svssno.so: svssno.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svssno.so svssno.c
+
+sajoin.so: sajoin.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sajoin.so sajoin.c
+
+sapart.so: sapart.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sapart.so sapart.c
+
+samode.so: samode.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o samode.so samode.c
+
+kick.so: kick.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o kick.so kick.c
+
+topic.so: topic.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o topic.so topic.c
+
+invite.so: invite.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o invite.so invite.c
+
+list.so: list.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o list.so list.c
+
+time.so: time.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o time.so time.c
+
+svskill.so: svskill.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svskill.so svskill.c
+
+sjoin.so: sjoin.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sjoin.so sjoin.c
+
+pass.so: pass.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o pass.so pass.c
+
+userhost.so: userhost.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o userhost.so userhost.c
+
+ison.so: ison.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o ison.so ison.c
+
+silence.so: silence.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o silence.so silence.c
+
+knock.so: knock.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o knock.so knock.c
+
+umode2.so: umode2.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o umode2.so umode2.c
+
+squit.so: squit.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o squit.so squit.c
+
+protoctl.so: protoctl.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o protoctl.so protoctl.c
+
+addmotd.so: addmotd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o addmotd.so addmotd.c
+
+addomotd.so: addomotd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o addomotd.so addomotd.c
+
+wallops.so: wallops.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o wallops.so wallops.c
+
+admin.so: admin.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o admin.so admin.c
+		
+globops.so: globops.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o globops.so globops.c
+
+locops.so: locops.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o locops.so locops.c
+
+trace.so: trace.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o trace.so trace.c
+
+netinfo.so: netinfo.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o netinfo.so netinfo.c
+
+links.so: links.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o links.so links.c
+
+help.so: help.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o help.so help.c
+
+rules.so: rules.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o rules.so rules.c
+
+close.so: close.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o close.so close.c
+
+map.so: map.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o map.so map.c
+
+eos.so: eos.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o eos.so eos.c
+
+server.so: server.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o server.so server.c
+
+stats.so: stats.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o stats.so stats.c
+
+dccdeny.so: dccdeny.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o dccdeny.so dccdeny.c
+
+whowas.so: whowas.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o whowas.so whowas.c
+
+connect.so: connect.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o connect.so connect.c
+
+dccallow.so: dccallow.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o dccallow.so dccallow.c
+
+userip.so: userip.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o userip.so userip.c
+
+nick.so: nick.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o nick.so nick.c
+
+user.so: user.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o user.so user.c
+
+mode.so: mode.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o mode.so mode.c
+
+watch.so: watch.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o watch.so watch.c
+
+part.so: part.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o part.so part.c
+
+join.so: join.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o join.so join.c
+
+motd.so: motd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o motd.so motd.c
+
+opermotd.so: opermotd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o opermotd.so opermotd.c
+
+botmotd.so: botmotd.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o botmotd.so botmotd.c
+
+lusers.so: lusers.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o lusers.so lusers.c
+
+names.so: names.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+	       -o names.so names.c
+
+svsnolag.so: svsnolag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o svsnolag.so svsnolag.c
+
+starttls.so: starttls.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o starttls.so starttls.c
+
+webredir.so: webredir.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o webredir.so webredir.c
+
+cap.so: cap.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o cap.so cap.c
+
+sasl.so: sasl.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sasl.so sasl.c
+
+md.so: md.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o md.so md.c
+
+certfp.so: certfp.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o certfp.so certfp.c
+
+tls_antidos.so: tls_antidos.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o tls_antidos.so tls_antidos.c
+
+webirc.so: webirc.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o webirc.so webirc.c
+
+websocket.so: websocket.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o websocket.so websocket.c
+
+blacklist.so: blacklist.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o blacklist.so blacklist.c
+
+jointhrottle.so: jointhrottle.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o jointhrottle.so jointhrottle.c
+
+antirandom.so: antirandom.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o antirandom.so antirandom.c
+
+hideserver.so: hideserver.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o hideserver.so hideserver.c
+
+jumpserver.so: jumpserver.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o jumpserver.so jumpserver.c
+
+ircops.so: ircops.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o ircops.so ircops.c
+
+staff.so: staff.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o staff.so staff.c
+
+nocodes.so: nocodes.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nocodes.so nocodes.c
+
+charsys.so: charsys.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o charsys.so charsys.c
+
+antimixedutf8.so: antimixedutf8.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o antimixedutf8.so antimixedutf8.c
+
+authprompt.so: authprompt.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o authprompt.so authprompt.c
+
+sinfo.so: sinfo.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sinfo.so sinfo.c
+
+reputation.so: reputation.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o reputation.so reputation.c
+
+connthrottle.so: connthrottle.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o connthrottle.so connthrottle.c
+
+history_backend_mem.so: history_backend_mem.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o history_backend_mem.so history_backend_mem.c
+
+history_backend_null.so: history_backend_null.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o history_backend_null.so history_backend_null.c
+
+tkldb.so: tkldb.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o tkldb.so tkldb.c
+
+channeldb.so: channeldb.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o channeldb.so channeldb.c
+
+restrict-commands.so: restrict-commands.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o restrict-commands.so restrict-commands.c
+
+rmtkl.so: rmtkl.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o rmtkl.so rmtkl.c
+
+message-tags.so: message-tags.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o message-tags.so message-tags.c
+
+batch.so: batch.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o batch.so batch.c
+
+account-tag.so: account-tag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o account-tag.so account-tag.c
+
+labeled-response.so: labeled-response.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o labeled-response.so labeled-response.c
+
+link-security.so: link-security.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o link-security.so link-security.c
+
+message-ids.so: message-ids.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o message-ids.so message-ids.c
+
+plaintext-policy.so: plaintext-policy.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o plaintext-policy.so plaintext-policy.c
+
+server-time.so: server-time.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o server-time.so server-time.c
+
+sts.so: sts.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o sts.so sts.c
+
+echo-message.so: echo-message.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o echo-message.so echo-message.c
+
+userip-tag.so: userip-tag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o userip-tag.so userip-tag.c
+
+userhost-tag.so: userhost-tag.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o userhost-tag.so userhost-tag.c
+
+require-module.so: require-module.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o require-module.so require-module.c
+
+account-notify.so: account-notify.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o account-notify.so account-notify.c
+
+ident_lookup.so: ident_lookup.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o ident_lookup.so ident_lookup.c
+
+history.so: history.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o history.so history.c
+
+#############################################################################
+# capabilities
+#############################################################################
+
+#############################################################################
+#             and now the remaining modules...
+#############################################################################
+
+cloak.so: cloak.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o cloak.so cloak.c
+
+clean:
+	$(RM) -f *.o *.so *~ core
+	cd chanmodes; $(MAKE) clean
+	cd usermodes; $(MAKE) clean
+	cd snomasks; $(MAKE) clean
+	cd extbans; $(MAKE) clean
+	cd third; $(MAKE) clean
diff --git a/src/modules/account-notify.c b/src/modules/account-notify.c
new file mode 100644
index 0000000..b2e9c3b
--- /dev/null
+++ b/src/modules/account-notify.c
@@ -0,0 +1,76 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/account-notify.c
+ *   (C) 2012-2020 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"account-notify",	/* Name of module */
+	"5.0", 			/* Version */
+	"account-notify CAP",	/* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Variables */
+long CAP_ACCOUNT_NOTIFY = 0L;
+
+/* Forward declarations */
+int account_notify_account_login(Client *client, MessageTag *mtags);
+
+MOD_INIT()
+{
+	ClientCapabilityInfo c;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "account-notify";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_ACCOUNT_NOTIFY);
+
+	HookAdd(modinfo->handle, HOOKTYPE_ACCOUNT_LOGIN, 0, account_notify_account_login);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int account_notify_account_login(Client *client, MessageTag *recv_mtags)
+{
+	MessageTag *mtags = NULL;
+	new_message(client, recv_mtags, &mtags);
+	sendto_local_common_channels(client, client,
+				     CAP_ACCOUNT_NOTIFY, mtags,
+				     ":%s ACCOUNT %s",
+				     client->name,
+				     !isdigit(*client->user->svid) ? client->user->svid : "*");
+	free_message_tags(mtags);
+	return 0;
+}
diff --git a/src/modules/account-tag.c b/src/modules/account-tag.c
new file mode 100644
index 0000000..523da07
--- /dev/null
+++ b/src/modules/account-tag.c
@@ -0,0 +1,98 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/account-tag.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"account-tag",
+	"5.0",
+	"account-tag CAP",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Variables */
+long CAP_ACCOUNT_TAG = 0L;
+
+int account_tag_mtag_is_ok(Client *client, char *name, char *value);
+void mtag_add_account(Client *client, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature);
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+	ClientCapability *c;
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "account-tag";
+	c = ClientCapabilityAdd(modinfo->handle, &cap, &CAP_ACCOUNT_TAG);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "account";
+	mtag.is_ok = account_tag_mtag_is_ok;
+	mtag.clicap_handler = c;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	HookAddVoid(modinfo->handle, HOOKTYPE_NEW_MESSAGE, 0, mtag_add_account);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This function verifies if the client sending
+ * 'account-tag' is permitted to do so and uses a permitted
+ * syntax.
+ * We simply allow account-tag ONLY from servers and with any syntax.
+ */
+int account_tag_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (IsServer(client))
+		return 1;
+
+	return 0;
+}
+
+void mtag_add_account(Client *client, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature)
+{
+	MessageTag *m;
+
+	if (client && client->user && (*client->user->svid != '*') && !isdigit(*client->user->svid))
+	{
+		m = safe_alloc(sizeof(MessageTag));
+		safe_strdup(m->name, "account");
+		safe_strdup(m->value, client->user->svid);
+
+		AddListItem(m, *mtag_list);
+	}
+}
diff --git a/src/modules/addmotd.c b/src/modules/addmotd.c
new file mode 100644
index 0000000..51d5b6f
--- /dev/null
+++ b/src/modules/addmotd.c
@@ -0,0 +1,88 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_addmotd);
+
+#define MSG_ADDMOTD 	"ADDMOTD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"addmotd",
+	"5.0",
+	"command /addmotd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_ADDMOTD, cmd_addmotd, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_addmotd (write a line to ircd.motd)
+**
+** De-Potvinized by codemastr
+*/
+CMD_FUNC(cmd_addmotd)
+{
+	FILE *conf;
+	char *text;
+
+	text = parc > 1 ? parv[1] : NULL;
+
+	if (!MyConnect(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server:addmotd",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "ADDMOTD");
+		return;
+	}
+
+	conf = fopen(MOTD, "a");
+	if (conf == NULL)
+		return;
+	fprintf(conf, "%s\n", text);
+	fclose(conf);
+
+	sendnotice(client, "*** Wrote (%s) to file: ircd.motd", text);
+}
diff --git a/src/modules/addomotd.c b/src/modules/addomotd.c
new file mode 100644
index 0000000..ea0f1e8
--- /dev/null
+++ b/src/modules/addomotd.c
@@ -0,0 +1,88 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_addomotd);
+
+#define MSG_ADDOMOTD 	"ADDOMOTD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"addomotd",
+	"5.0",
+	"command /addomotd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_ADDOMOTD, cmd_addomotd, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_addomotd (write a line to opermotd)
+**
+** De-Potvinized by codemastr
+*/
+CMD_FUNC(cmd_addomotd)
+{
+	FILE *conf;
+	char *text;
+
+	text = parc > 1 ? parv[1] : NULL;
+
+	if (!MyConnect(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server:addomotd",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "ADDOMOTD");
+		return;
+	}
+
+	conf = fopen(conf_files->opermotd_file, "a");
+	if (conf == NULL)
+		return;
+	fprintf(conf, "%s\n", text);
+	fclose(conf);
+
+	sendnotice(client, "*** Wrote (%s) to OperMotd", text);
+}
diff --git a/src/modules/admin.c b/src/modules/admin.c
new file mode 100644
index 0000000..6b79c39
--- /dev/null
+++ b/src/modules/admin.c
@@ -0,0 +1,86 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_admin);
+
+#define MSG_ADMIN 	"ADMIN"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"admin",
+	"5.0",
+	"command /admin", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_ADMIN, cmd_admin, MAXPARA, CMD_USER|CMD_SHUN|CMD_VIRUS);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** ADMIN [servername].
+ * Shows administrative information about this server to users.
+ */
+CMD_FUNC(cmd_admin)
+{
+	ConfigItem_admin *admin;
+
+	if (IsUser(client))
+	{
+		if (hunt_server(client, recv_mtags, ":%s ADMIN :%s", 1, parc, parv) != HUNTED_ISME)
+			return;
+	}
+
+	if (!conf_admin_tail)
+	{
+		sendnumeric(client, ERR_NOADMININFO, me.name);
+		return;
+	}
+
+	sendnumeric(client, RPL_ADMINME, me.name);
+
+	/* cycle through the list backwards */
+	for (admin = conf_admin_tail; admin; admin = admin->prev)
+	{
+		if (!admin->next)
+			sendnumeric(client, RPL_ADMINLOC1, admin->line);
+		else if (!admin->next->next)
+			sendnumeric(client, RPL_ADMINLOC2, admin->line);
+		else
+			sendnumeric(client, RPL_ADMINEMAIL, admin->line);
+	}
+}
diff --git a/src/modules/antimixedutf8.c b/src/modules/antimixedutf8.c
new file mode 100644
index 0000000..40e3836
--- /dev/null
+++ b/src/modules/antimixedutf8.c
@@ -0,0 +1,344 @@
+/*
+ * Anti mixed UTF8 - a filter written by Bram Matthys ("Syzop").
+ * Reported by Mr_Smoke in https://bugs.unrealircd.org/view.php?id=5163
+ * Tested by PeGaSuS (The_Myth) with some of the most used spam lines.
+ * Help with testing and fixing Cyrillic from 'i' <info@servx.org>
+ *
+ * ==[ ABOUT ]==
+ * This module will detect and stop spam containing of characters of
+ * mixed "scripts", where some characters are in Latin script and other
+ * characters are in Cyrillic.
+ * This unusual behavior can be detected easily and action can be taken.
+ *
+ * ==[ MODULE LOADING AND CONFIGURATION ]==
+ * loadmodule "antimixedutf8";
+ * set {
+ *         antimixedutf8 {
+ *                 score 10;
+ *                 ban-action block;
+ *                 ban-reason "Possible mixed character spam";
+ *                 ban-time 4h; // For other types
+ *         };
+ * };
+ *
+ * ==[ LICENSE AND PORTING ]==
+ * Feel free to copy/move the idea or code to other IRCds.
+ * The license is GPLv1 (or later, at your option):
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"antimixedutf8",
+	"1.0",
+	"Mixed UTF8 character filter (look-alike character spam) - by Syzop",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+struct {
+	int score;
+	BanAction ban_action;
+	char *ban_reason;
+	long ban_time;
+} cfg;
+
+static void free_config(void);
+static void init_config(void);
+int antimixedutf8_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int antimixedutf8_config_run(ConfigFile *, ConfigEntry *, int);
+
+#define SCRIPT_UNDEFINED	0
+#define SCRIPT_LATIN		1
+#define SCRIPT_CYRILLIC		2
+
+/**** the detection algorithm follows first, the module/config code is at the end ****/
+
+/** Detect which script the current character is,
+ * such as latin script or cyrillic script.
+ * @retval See SCRIPT_*
+ */
+int detect_script(const char *t)
+{
+	/* Safety: as long as *t is never \0 then at worst
+	 * the character after this will be \0 and since we
+	 * only look at 2 characters (at most) at a time
+	 * this will be safe.
+	 */
+
+	/* Currently we only detect cyrillic and call all the
+	 * rest latin (which is not true). This can always
+	 * be enhanced later.
+	 */
+
+	if ((t[0] == 0xd0) && (t[1] >= 0x80) && (t[1] <= 0xbf))
+		return SCRIPT_CYRILLIC;
+	else if ((t[0] == 0xd1) && (t[1] >= 0x80) && (t[1] <= 0xbf))
+		return SCRIPT_CYRILLIC;
+	else if ((t[0] == 0xd2) && (t[1] >= 0x80) && (t[1] <= 0xbf))
+		return SCRIPT_CYRILLIC;
+	else if ((t[0] == 0xd3) && (t[1] >= 0x80) && (t[1] <= 0xbf))
+		return SCRIPT_CYRILLIC;
+
+	if ((t[0] >= 'a') && (t[0] <= 'z'))
+		return SCRIPT_LATIN;
+	if ((t[0] >= 'A') && (t[0] <= 'Z'))
+		return SCRIPT_LATIN;
+
+	return SCRIPT_UNDEFINED;
+}
+
+/** Returns length of an (UTF8) character. May return <1 for error conditions.
+ * Made by i <info@servx.org>
+ */
+static int utf8_charlen(const char *str)
+{
+	struct { char mask; char val; } t[4] =
+	{ { 0x80, 0x00 }, { 0xE0, 0xC0 }, { 0xF0, 0xE0 }, { 0xF8, 0xF0 } };
+	unsigned k, j;
+
+	for (k = 0; k < 4; k++)
+	{
+		if ((*str & t[k].mask) == t[k].val)
+		{
+			for (j = 0; j < k; j++)
+			{
+				if ((*(++str) & 0xC0) != 0x80)
+					return -1;
+			}
+			return k + 1;
+		}
+	}
+	return 1;
+}
+
+int lookalikespam_score(const char *text)
+{
+	const char *p;
+	int last_script = SCRIPT_UNDEFINED;
+	int current_script;
+	int points = 0;
+	int last_character_was_word_separator = 0;
+	int skip = 0;
+
+	for (p = text; *p; p++)
+	{
+		current_script = detect_script(p);
+
+		if (current_script != SCRIPT_UNDEFINED)
+		{
+			if ((current_script != last_script) && (last_script != SCRIPT_UNDEFINED))
+			{
+				/* A script change = 1 point */
+				points++;
+
+				/* Give an additional point if the script change happened
+				 * within the same word, as that would be rather unusual
+				 * in normal cases.
+				 */
+				if (!last_character_was_word_separator)
+					points++;
+			}
+			last_script = current_script;
+		}
+
+		if (strchr("., ", *p))
+			last_character_was_word_separator = 1;
+		else
+			last_character_was_word_separator = 0;
+
+		skip = utf8_charlen(p);
+		if (skip > 1)
+			p += skip - 1;
+	}
+
+	return points;
+}
+
+CMD_OVERRIDE_FUNC(override_msg)
+{
+	int score, ret;
+	
+	if (!MyUser(client) || (parc < 3) || BadPtr(parv[2]))
+	{
+		/* Short circuit for: remote clients or insufficient parameters */
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
+
+	score = lookalikespam_score(StripControlCodes(parv[2]));
+	if ((score >= cfg.score) && !find_tkl_exception(TKL_ANTIMIXEDUTF8, client))
+	{
+		if (cfg.ban_action == BAN_ACT_KILL)
+		{
+			sendto_realops("[antimixedutf8] Killed connection from %s (score %d)",
+				GetIP(client), score);
+		} /* no else here!! */
+
+		if ((cfg.ban_action == BAN_ACT_BLOCK) ||
+		    ((cfg.ban_action == BAN_ACT_SOFT_BLOCK) && !IsLoggedIn(client)))
+		{
+			sendnotice(client, "%s", cfg.ban_reason);
+			return;
+		} else {
+			if (place_host_ban(client, cfg.ban_action, cfg.ban_reason, cfg.ban_time))
+				return;
+			/* a return value of 0 means the user is exempted, so fallthrough.. */
+		}
+	}
+
+	CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+}
+
+/*** rest is module and config stuff ****/
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, antimixedutf8_config_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	init_config();
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, antimixedutf8_config_run);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	if (!CommandOverrideAdd(modinfo->handle, "PRIVMSG", override_msg))
+		return MOD_FAILED;
+
+	if (!CommandOverrideAdd(modinfo->handle, "NOTICE", override_msg))
+		return MOD_FAILED;
+
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	free_config();
+	return MOD_SUCCESS;
+}
+
+static void init_config(void)
+{
+	memset(&cfg, 0, sizeof(cfg));
+	/* Default values */
+	cfg.score = 10;
+	safe_strdup(cfg.ban_reason, "Possible mixed character spam");
+	cfg.ban_action = BAN_ACT_BLOCK;
+	cfg.ban_time = 60 * 60 * 4; /* irrelevant for block, but some default for others */
+}
+
+static void free_config(void)
+{
+	safe_free(cfg.ban_reason);
+	memset(&cfg, 0, sizeof(cfg)); /* needed! */
+}
+
+int antimixedutf8_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::antimixedutf8... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "antimixedutf8"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+		{
+			config_error("%s:%i: set::antimixedutf8::%s with no value",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		} else
+		if (!strcmp(cep->ce_varname, "score"))
+		{
+			int v = atoi(cep->ce_vardata);
+			if ((v < 1) || (v > 99))
+			{
+				config_error("%s:%i: set::antimixedutf8::score: must be between 1 - 99 (got: %d)",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, v);
+				errors++;
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "ban-action"))
+		{
+			if (!banact_stringtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: set::antimixedutf8::ban-action: unknown action '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "ban-reason"))
+		{
+		} else
+		if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+		} else
+		{
+			config_error("%s:%i: unknown directive set::antimixedutf8::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+	}
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int antimixedutf8_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::antimixedutf8... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "antimixedutf8"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "score"))
+		{
+			cfg.score = atoi(cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "ban-action"))
+		{
+			cfg.ban_action = banact_stringtoval(cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "ban-reason"))
+		{
+			safe_strdup(cfg.ban_reason, cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			cfg.ban_time = config_checkval(cep->ce_vardata, CFG_TIME);
+		}
+	}
+	return 1;
+}
diff --git a/src/modules/antirandom.c b/src/modules/antirandom.c
new file mode 100644
index 0000000..176351c
--- /dev/null
+++ b/src/modules/antirandom.c
@@ -0,0 +1,1003 @@
+/*
+ * IRC - Internet Relay Chat, antirandom.c
+ * (C) Copyright 2004-2016, Bram Matthys (Syzop) <syzop@vulnscan.org>
+ *
+ * Contains ideas from Keith Dunnett <keith@dunnett.org>
+ * Most of the detection mechanisms come from SpamAssassin FVGT_Tripwire.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* You can change this '//#undef' into '#define' if you want to see quite
+ * a flood for every user that connects (and on-load if cfg.fullstatus_on_load).
+ * Obviously only recommended for testing, use with care!
+ */
+#undef  DEBUGMODE
+
+/** Change this 'undef' to 'define' to get performance information.
+ * This really only meant for debugging purposes.
+ */
+#undef TIMING
+
+ModuleHeader MOD_HEADER
+  = {
+	"antirandom",
+	"1.4",
+	"Detect and ban users with random names",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+#ifndef MAX
+ #define MAX(x,y) ((x) > (y) ? (x) : (y))
+#endif
+
+/* "<char1><char2>" followed by "<rest>" */
+static char *triples_txt[] = {
+	"aj", "fqtvxz",
+	"aq", "deghjkmnprtxyz",
+	"av", "bfhjqwxz",
+	"az", "jwx",
+	"bd", "bghjkmpqvxz",
+	"bf", "bcfgjknpqvwxyz",
+	"bg", "bdfghjkmnqstvxz",
+	"bh", "bfhjkmnqvwxz",
+	"bj", "bcdfghjklmpqtvwxyz",
+	"bk", "dfjkmqrvwxyz",
+	"bl", "bgpqwxz",
+	"bm", "bcdflmnqz",
+	"bn", "bghjlmnpqtvwx",
+	"bp", "bfgjknqvxz",
+	"bq", "bcdefghijklmnopqrstvwxyz",
+	"bt", "dgjkpqtxz",
+	"bv", "bfghjklnpqsuvwxz",
+	"bw", "bdfjknpqsuwxyz",
+	"bx", "abcdfghijklmnopqtuvwxyz",
+	"bz", "bcdfgjklmnpqrstvwxz",
+	"cb", "bfghjkpqyz",
+	"cc", "gjqxz",
+	"cd", "hjkqvwxz",
+	"cf", "gjknqvwyz",
+	"cg", "bdfgjkpqvz",
+	"cl", "fghjmpqxz",
+	"cm", "bjkqv",
+	"cn", "bghjkpqwxz",
+	"cp", "gjkvxyz",
+	"cq", "abcdefghijklmnopqsvwxyz",
+	"cr", "gjqx",
+	"cs", "gjxz",
+	"cv", "bdfghjklmnquvwxyz",
+	"cx", "abdefghjklmnpqrstuvwxyz",
+	"cy", "jqy",
+	"cz", "bcdfghjlpqrtvwxz",
+	"db", "bdgjnpqtxz",
+	"dc", "gjqxz",
+	"dd", "gqz",
+	"df", "bghjknpqvxyz",
+	"dg", "bfgjqvxz",
+	"dh", "bfkmnqwxz",
+	"dj", "bdfghjklnpqrwxz",
+	"dk", "cdhjkpqrtuvwxz",
+	"dl", "bfhjknqwxz",
+	"dm", "bfjnqw",
+	"dn", "fgjkmnpqvwz",
+	"dp", "bgjkqvxz",
+	"dq", "abcefghijkmnopqtvwxyz",
+	"dr", "bfkqtvx",
+	"dt", "qtxz",
+	"dv", "bfghjknqruvwyz",
+	"dw", "cdfjkmnpqsvwxz",
+	"dx", "abcdeghjklmnopqrsuvwxyz",
+	"dy", "jyz",
+	"dz", "bcdfgjlnpqrstvxz",
+	"eb", "jqx",
+	"eg", "cjvxz",
+	"eh", "hxz",
+	"ej", "fghjpqtwxyz",
+	"ek", "jqxz",
+	"ep", "jvx",
+	"eq", "bcghijkmotvxyz",
+	"ev", "bfpq",
+	"fc", "bdjkmnqvxz",
+	"fd", "bgjklqsvyz",
+	"fg", "fgjkmpqtvwxyz",
+	"fh", "bcfghjkpqvwxz",
+	"fj", "bcdfghijklmnpqrstvwxyz",
+	"fk", "bcdfghjkmpqrstvwxz",
+	"fl", "fjkpqxz",
+	"fm", "dfhjlmvwxyz",
+	"fn", "bdfghjklnqrstvwxz",
+	"fp", "bfjknqtvwxz",
+	"fq", "abcefghijklmnopqrstvwxyz",
+	"fr", "nqxz",
+	"fs", "gjxz",
+	"ft", "jqx",
+	"fv", "bcdfhjklmnpqtuvwxyz",
+	"fw", "bcfgjklmpqstuvwxyz",
+	"fx", "bcdfghjklmnpqrstvwxyz",
+	"fy", "ghjpquvxy",
+	"fz", "abcdfghjklmnpqrtuvwxyz",
+	"gb", "bcdknpqvwx",
+	"gc", "gjknpqwxz",
+	"gd", "cdfghjklmqtvwxz",
+	"gf", "bfghjkmnpqsvwxyz",
+	"gg", "jkqvxz",
+	"gj", "bcdfghjklmnpqrstvwxyz",
+	"gk", "bcdfgjkmpqtvwxyz",
+	"gl", "fgjklnpqwxz",
+	"gm", "dfjkmnqvxz",
+	"gn", "jkqvxz",
+	"gp", "bjknpqtwxyz",
+	"gq", "abcdefghjklmnopqrsvwxyz",
+	"gr", "jkqt",
+	"gt", "fjknqvx",
+	"gu", "qwx",
+	"gv", "bcdfghjklmpqstvwxyz",
+	"gw", "bcdfgjknpqtvwxz",
+	"gx", "abcdefghjklmnopqrstvwxyz",
+	"gy", "jkqxy",
+	"gz", "bcdfgjklmnopqrstvxyz",
+	"hb", "bcdfghjkqstvwxz",
+	"hc", "cjknqvwxz",
+	"hd", "fgjnpvz",
+	"hf", "bfghjkmnpqtvwxyz",
+	"hg", "bcdfgjknpqsxyz",
+	"hh", "bcgklmpqrtvwxz",
+	"hj", "bcdfgjkmpqtvwxyz",
+	"hk", "bcdgkmpqrstvwxz",
+	"hl", "jxz",
+	"hm", "dhjqrvwxz",
+	"hn", "jrxz",
+	"hp", "bjkmqvwxyz",
+	"hq", "abcdefghijklmnopqrstvwyz",
+	"hr", "cjqx",
+	"hs", "jqxz",
+	"hv", "bcdfgjklmnpqstuvwxz",
+	"hw", "bcfgjklnpqsvwxz",
+	"hx", "abcdefghijklmnopqrstuvwxyz",
+	"hz", "bcdfghjklmnpqrstuvwxz",
+	"ib", "jqx",
+	"if", "jqvwz",
+	"ih", "bgjqx",
+	"ii", "bjqxy",
+	"ij", "cfgqxy",
+	"ik", "bcfqx",
+	"iq", "cdefgjkmnopqtvxyz",
+	"iu", "hiwxy",
+	"iv", "cfgmqx",
+	"iw", "dgjkmnpqtvxz",
+	"ix", "jkqrxz",
+	"iy", "bcdfghjklpqtvwx",
+	"jb", "bcdghjklmnopqrtuvwxyz",
+	"jc", "cfgjkmnopqvwxy",
+	"jd", "cdfghjlmnpqrtvwx",
+	"jf", "abcdfghjlnopqrtuvwxyz",
+	"jg", "bcdfghijklmnopqstuvwxyz",
+	"jh", "bcdfghjklmnpqrxyz",
+	"jj", "bcdfghjklmnopqrstuvwxyz",
+	"jk", "bcdfghjknqrtwxyz",
+	"jl", "bcfghjmnpqrstuvwxyz",
+	"jm", "bcdfghiklmnqrtuvwyz",
+	"jn", "bcfjlmnpqsuvwxz",
+	"jp", "bcdfhijkmpqstvwxyz",
+	"jq", "abcdefghijklmnopqrstuvwxyz",
+	"jr", "bdfhjklpqrstuvwxyz",
+	"js", "bfgjmoqvxyz",
+	"jt", "bcdfghjlnpqrtvwxz",
+	"jv", "abcdfghijklpqrstvwxyz",
+	"jw", "bcdefghijklmpqrstuwxyz",
+	"jx", "abcdefghijklmnopqrstuvwxyz",
+	"jy", "bcdefghjkpqtuvwxyz",
+	"jz", "bcdfghijklmnopqrstuvwxyz",
+	"kb", "bcdfghjkmqvwxz",
+	"kc", "cdfgjknpqtwxz",
+	"kd", "bfghjklmnpqsvwxyz",
+	"kf", "bdfghjkmnpqsvwxyz",
+	"kg", "cghjkmnqtvwxyz",
+	"kh", "cfghjkqx",
+	"kj", "bcdfghjkmnpqrstwxyz",
+	"kk", "bcdfgjmpqswxz",
+	"kl", "cfghlmqstwxz",
+	"km", "bdfghjknqrstwxyz",
+	"kn", "bcdfhjklmnqsvwxz",
+	"kp", "bdfgjkmpqvxyz",
+	"kq", "abdefghijklmnopqrstvwxyz",
+	"kr", "bcdfghjmqrvwx",
+	"ks", "jqx",
+	"kt", "cdfjklqvx",
+	"ku", "qux",
+	"kv", "bcfghjklnpqrstvxyz",
+	"kw", "bcdfgjklmnpqsvwxz",
+	"kx", "abcdefghjklmnopqrstuvwxyz",
+	"ky", "vxy",
+	"kz", "bcdefghjklmnpqrstuvwxyz",
+	"lb", "cdgkqtvxz",
+	"lc", "bqx",
+	"lg", "cdfgpqvxz",
+	"lh", "cfghkmnpqrtvx",
+	"lk", "qxz",
+	"ln", "cfjqxz",
+	"lp", "jkqxz",
+	"lq", "bcdefhijklmopqrstvwxyz",
+	"lr", "dfgjklmpqrtvwx",
+	"lv", "bcfhjklmpwxz",
+	"lw", "bcdfgjknqxz",
+	"lx", "bcdfghjklmnpqrtuwz",
+	"lz", "cdjptvxz",
+	"mb", "qxz",
+	"md", "hjkpvz",
+	"mf", "fkpqvwxz",
+	"mg", "cfgjnpqsvwxz",
+	"mh", "bchjkmnqvx",
+	"mj", "bcdfghjknpqrstvwxyz",
+	"mk", "bcfgklmnpqrvwxz",
+	"ml", "jkqz",
+	"mm", "qvz",
+	"mn", "fhjkqxz",
+	"mq", "bdefhjklmnopqtwxyz",
+	"mr", "jklqvwz",
+	"mt", "jkq",
+	"mv", "bcfghjklmnqtvwxz",
+	"mw", "bcdfgjklnpqsuvwxyz",
+	"mx", "abcefghijklmnopqrstvwxyz",
+	"mz", "bcdfghjkmnpqrstvwxz",
+	"nb", "hkmnqxz",
+	"nf", "bghqvxz",
+	"nh", "fhjkmqtvxz",
+	"nk", "qxz",
+	"nl", "bghjknqvwxz",
+	"nm", "dfghjkqtvwxz",
+	"np", "bdjmqwxz",
+	"nq", "abcdfghjklmnopqrtvwxyz",
+	"nr", "bfjkqstvx",
+	"nv", "bcdfgjkmnqswxz",
+	"nw", "dgjpqvxz",
+	"nx", "abfghjknopuyz",
+	"nz", "cfqrxz",
+	"oc", "fjvw",
+	"og", "qxz",
+	"oh", "fqxz",
+	"oj", "bfhjmqrswxyz",
+	"ok", "qxz",
+	"oq", "bcdefghijklmnopqrstvwxyz",
+	"ov", "bfhjqwx",
+	"oy", "qxy",
+	"oz", "fjpqtvx",
+	"pb", "fghjknpqvwz",
+	"pc", "gjq",
+	"pd", "bgjkvwxz",
+	"pf", "hjkmqtvwyz",
+	"pg", "bdfghjkmqsvwxyz",
+	"ph", "kqvx",
+	"pk", "bcdfhjklmpqrvx",
+	"pl", "ghkqvwx",
+	"pm", "bfhjlmnqvwyz",
+	"pn", "fjklmnqrtvwz",
+	"pp", "gqwxz",
+	"pq", "abcdefghijklmnopqstvwxyz",
+	"pr", "hjkqrwx",
+	"pt", "jqxz",
+	"pv", "bdfghjklquvwxyz",
+	"pw", "fjkmnpqsuvwxz",
+	"px", "abcdefghijklmnopqrstuvwxyz",
+	"pz", "bdefghjklmnpqrstuvwxyz",
+	"qa", "ceghkopqxy",
+	"qb", "bcdfghjklmnqrstuvwxyz",
+	"qc", "abcdfghijklmnopqrstuvwxyz",
+	"qd", "defghijklmpqrstuvwxyz",
+	"qe", "abceghjkmopquwxyz",
+	"qf", "abdfghijklmnopqrstuvwxyz",
+	"qg", "abcdefghijklmnopqrtuvwxz",
+	"qh", "abcdefghijklmnopqrstuvwxyz",
+	"qi", "efgijkmpwx",
+	"qj", "abcdefghijklmnopqrstuvwxyz",
+	"qk", "abcdfghijklmnopqrsuvwxyz",
+	"ql", "abcefghjklmnopqrtuvwxyz",
+	"qm", "bdehijklmnoqrtuvxyz",
+	"qn", "bcdefghijklmnoqrtuvwxyz",
+	"qo", "abcdefgijkloqstuvwxyz",
+	"qp", "abcdefghijkmnopqrsuvwxyz",
+	"qq", "bcdefghijklmnopstwxyz",
+	"qr", "bdefghijklmnoqruvwxyz",
+	"qs", "bcdefgijknqruvwxz",
+	"qt", "befghjklmnpqtuvwxz",
+	"qu", "cfgjkpwz",
+	"qv", "abdefghjklmnopqrtuvwxyz",
+	"qw", "bcdfghijkmnopqrstuvwxyz",
+	"qx", "abcdefghijklmnopqrstuvwxyz",
+	"qy", "abcdefghjklmnopqrstuvwxyz",
+	"qz", "abcdefghijklmnopqrstuvwxyz",
+	"rb", "fxz",
+	"rg", "jvxz",
+	"rh", "hjkqrxz",
+	"rj", "bdfghjklmpqrstvwxz",
+	"rk", "qxz",
+	"rl", "jnq",
+	"rp", "jxz",
+	"rq", "bcdefghijklmnopqrtvwxy",
+	"rr", "jpqxz",
+	"rv", "bcdfghjmpqrvwxz",
+	"rw", "bfgjklqsvxz",
+	"rx", "bcdfgjkmnopqrtuvwxz",
+	"rz", "djpqvxz",
+	"sb", "kpqtvxz",
+	"sd", "jqxz",
+	"sf", "bghjkpqw",
+	"sg", "cgjkqvwxz",
+	"sj", "bfghjkmnpqrstvwxz",
+	"sk", "qxz",
+	"sl", "gjkqwxz",
+	"sm", "fkqwxz",
+	"sn", "dhjknqvwxz",
+	"sq", "bfghjkmopstvwxz",
+	"sr", "jklqrwxz",
+	"sv", "bfhjklmnqtwxyz",
+	"sw", "jkpqvwxz",
+	"sx", "bcdefghjklmnopqrtuvwxyz",
+	"sy", "qxy",
+	"sz", "bdfgjpqsvxz",
+	"tb", "cghjkmnpqtvwx",
+	"tc", "jnqvx",
+	"td", "bfgjkpqtvxz",
+	"tf", "ghjkqvwyz",
+	"tg", "bdfghjkmpqsx",
+	"tj", "bdfhjklmnpqstvwxyz",
+	"tk", "bcdfghjklmpqvwxz",
+	"tl", "jkqwxz",
+	"tm", "bknqtwxz",
+	"tn", "fhjkmqvwxz",
+	"tp", "bjpqvwxz",
+	"tq", "abdefhijklmnopqrstvwxyz",
+	"tr", "gjqvx",
+	"tv", "bcfghjknpquvwxz",
+	"tw", "bcdfjknqvz",
+	"tx", "bcdefghjklmnopqrsuvwxz",
+	"tz", "jqxz",
+	"uc", "fjmvx",
+	"uf", "jpqvx",
+	"ug", "qvx",
+	"uh", "bcgjkpvxz",
+	"uj", "wbfghklmqvwx",
+	"uk", "fgqxz",
+	"uq", "bcdfghijklmnopqrtwxyz",
+	"uu", "fijkqvwyz",
+	"uv", "bcdfghjkmpqtwxz",
+	"uw", "dgjnquvxyz",
+	"ux", "jqxz",
+	"uy", "jqxyz",
+	"uz", "fgkpqrx",
+	"vb", "bcdfhijklmpqrtuvxyz",
+	"vc", "bgjklnpqtvwxyz",
+	"vd", "bdghjklnqvwxyz",
+	"vf", "bfghijklmnpqtuvxz",
+	"vg", "bcdgjkmnpqtuvwxyz",
+	"vh", "bcghijklmnpqrtuvwxyz",
+	"vj", "abcdfghijklmnpqrstuvwxyz",
+	"vk", "bcdefgjklmnpqruvwxyz",
+	"vl", "hjkmpqrvwxz",
+	"vm", "bfghjknpquvxyz",
+	"vn", "bdhjkmnpqrtuvwxz",
+	"vp", "bcdeghjkmopqtuvwyz",
+	"vq", "abcdefghijklmnopqrstvwxyz",
+	"vr", "fghjknqrtvwxz",
+	"vs", "dfgjmqz",
+	"vt", "bdfgjklmnqtx",
+	"vu", "afhjquwxy",
+	"vv", "cdfghjkmnpqrtuwxz",
+	"vw", "abcdefghijklmnopqrtuvwxyz",
+	"vx", "abcefghjklmnopqrstuvxyz",
+	"vy", "oqx",
+	"vz", "abcdefgjklmpqrstvwxyz",
+	"wb", "bdfghjpqtvxz",
+	"wc", "bdfgjkmnqvwx",
+	"wd", "dfjpqvxz",
+	"wf", "cdghjkmqvwxyz",
+	"wg", "bcdfgjknpqtvwxyz",
+	"wh", "cdghjklpqvwxz",
+	"wj", "bfghijklmnpqrstvwxyz",
+	"wk", "cdfgjkpqtuvxz",
+	"wl", "jqvxz",
+	"wm", "dghjlnqtvwxz",
+	"wp", "dfgjkpqtvwxz",
+	"wq", "abcdefghijklmnopqrstvwxyz",
+	"wr", "cfghjlmpqwx",
+	"wt", "bdgjlmnpqtvx",
+	"wu", "aikoquvwy",
+	"wv", "bcdfghjklmnpqrtuvwxyz",
+	"ww", "bcdgkpqstuvxyz",
+	"wx", "abcdefghijklmnopqrstuvwxz",
+	"wy", "jquwxy",
+	"wz", "bcdfghjkmnopqrstuvwxz",
+	"xa", "ajoqy",
+	"xb", "bcdfghjkmnpqsvwxz",
+	"xc", "bcdgjkmnqsvwxz",
+	"xd", "bcdfghjklnpqstuvwxyz",
+	"xf", "bcdfghjkmnpqtvwxyz",
+	"xg", "bcdfghjkmnpqstvwxyz",
+	"xh", "cdfghjkmnpqrstvwxz",
+	"xi", "jkqy",
+	"xj", "abcdefghijklmnopqrstvwxyz",
+	"xk", "abcdfghjkmnopqrstuvwxyz",
+	"xl", "bcdfghjklmnpqrvwxz",
+	"xm", "bcdfghjknpqvwxz",
+	"xn", "bcdfghjklmnpqrvwxyz",
+	"xp", "bcfjknpqvxz",
+	"xq", "abcdefghijklmnopqrstvwxyz",
+	"xr", "bcdfghjklnpqrsvwyz",
+	"xs", "bdfgjmnqrsvxz",
+	"xt", "jkpqvwxz",
+	"xu", "fhjkquwx",
+	"xv", "bcdefghjklmnpqrsuvwxyz",
+	"xw", "bcdfghjklmnpqrtuvwxyz",
+	"xx", "bcdefghjkmnpqrstuwyz",
+	"xy", "jxy",
+	"xz", "abcdefghjklmnpqrstuvwxyz",
+	"yb", "cfghjmpqtvwxz",
+	"yc", "bdfgjmpqsvwx",
+	"yd", "chjkpqvwx",
+	"yf", "bcdghjmnpqsvwx",
+	"yg", "cfjkpqtxz",
+	"yh", "bcdfghjkpqx",
+	"yi", "hjqwxy",
+	"yj", "bcdfghjklmnpqrstvwxyz",
+	"yk", "bcdfgpqvwxz",
+	"ym", "dfgjqvxz",
+	"yp", "bcdfgjkmqxz",
+	"yq", "abcdefghijklmnopqrstvwxyz",
+	"yr", "jqx",
+	"yt", "bcfgjnpqx",
+	"yv", "bcdfghjlmnpqstvwxz",
+	"yw", "bfgjklmnpqstuvwxz",
+	"yx", "bcdfghjknpqrstuvwxz",
+	"yy", "bcdfghjklpqrstvwxz",
+	"yz", "bcdfjklmnpqtvwx",
+	"zb", "dfgjklmnpqstvwxz",
+	"zc", "bcdfgjmnpqstvwxy",
+	"zd", "bcdfghjklmnpqstvwxy",
+	"zf", "bcdfghijkmnopqrstvwxyz",
+	"zg", "bcdfgjkmnpqtvwxyz",
+	"zh", "bcfghjlpqstvwxz",
+	"zj", "abcdfghjklmnpqrstuvwxyz",
+	"zk", "bcdfghjklmpqstvwxz",
+	"zl", "bcdfghjlnpqrstvwxz",
+	"zm", "bdfghjklmpqstvwxyz",
+	"zn", "bcdfghjlmnpqrstuvwxz",
+	"zp", "bcdfhjklmnpqstvwxz",
+	"zq", "abcdefghijklmnopqrstvwxyz",
+	"zr", "bcfghjklmnpqrstvwxyz",
+	"zs", "bdfgjmnqrsuwxyz",
+	"zt", "bcdfgjkmnpqtuvwxz",
+	"zu", "ajqx",
+	"zv", "bcdfghjklmnpqrstuvwxyz",
+	"zw", "bcdfghjklmnpqrstuvwxyz",
+	"zx", "abcdefghijklmnopqrstuvwxyz",
+	"zy", "fxy",
+	"zz", "cdfhjnpqrvx",
+	NULL, NULL
+};
+
+/* Used for parsed triples: */
+#define TRIPLES_REST_SIZE	32
+typedef struct Triples Triples;
+struct Triples {
+	Triples *next;
+	char two[3];
+	char rest[TRIPLES_REST_SIZE];
+};
+
+Triples *triples = NULL;
+
+struct {
+	int threshold;
+	int ban_action;
+	int ban_reason;
+	int ban_time;
+} req;
+
+struct {
+	int threshold;
+	BanAction ban_action;
+	char *ban_reason;
+	long ban_time;
+	int convert_to_lowercase;
+	int show_failedconnects;
+	int fullstatus_on_load;
+	ConfigItem_mask *except_hosts;
+	int except_webirc;
+} cfg;
+
+/* Forward declarations */
+static int init_stuff(void);
+static int init_triples(void);
+static void free_stuff(void);
+static void free_config(void);
+int antirandom_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int antirandom_config_run(ConfigFile *, ConfigEntry *, int);
+int antirandom_config_posttest(int *);
+int antirandom_preconnect(Client *client);
+static int is_exempt(Client *client);
+
+MOD_TEST()
+{
+	memset(&req, 0, sizeof(req));
+	memset(&cfg, 0, sizeof(cfg));
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, antirandom_config_test);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, antirandom_config_posttest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	if (!init_stuff())
+	{
+		config_error("antirandom: loading aborted");
+		free_stuff();
+		return MOD_FAILED;
+	}
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CONNECT, 0, antirandom_preconnect);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, antirandom_config_run);
+
+	/* Some default values: */
+	cfg.fullstatus_on_load = 1;
+	cfg.convert_to_lowercase = 1;
+	cfg.except_webirc = 1;
+
+	return MOD_SUCCESS;
+}
+
+void check_all_users(void);
+
+MOD_LOAD()
+{
+	if (cfg.fullstatus_on_load)
+		check_all_users();
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	free_stuff();
+	free_config();
+	return MOD_SUCCESS;
+}
+
+static void free_config(void)
+{
+	safe_free(cfg.ban_reason);
+	unreal_delete_masks(cfg.except_hosts);
+	memset(&cfg, 0, sizeof(cfg)); /* needed! */
+}
+
+int antirandom_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::antirandom... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "antirandom"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "except-hosts"))
+		{
+		} else
+		if (!strcmp(cep->ce_varname, "except-webirc"))
+		{
+			/* This should normally be UNDER the generic 'set::antirandom::%s with no value'
+			 * stuff but I put it here because people may think it's a hostlist and then
+			 * the error can be a tad confusing. -- Syzop
+			 */
+			if (!cep->ce_vardata)
+			{
+				config_error("%s:%i: set::antirandom::except-webirc should be 'yes' or 'no'",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+		} else
+		if (!cep->ce_vardata)
+		{
+			config_error("%s:%i: set::antirandom::%s with no value",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		} else
+		if (!strcmp(cep->ce_varname, "threshold"))
+		{
+			req.threshold = 1;
+		} else
+		if (!strcmp(cep->ce_varname, "ban-action"))
+		{
+			if (!banact_stringtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: set::antirandom::ban-action: unknown action '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			} else
+				req.ban_action = 1;
+		} else
+		if (!strcmp(cep->ce_varname, "ban-reason"))
+		{
+			req.ban_reason = 1;
+		} else
+		if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			req.ban_time = 1;
+		} else
+		if (!strcmp(cep->ce_varname, "convert-to-lowercase"))
+		{
+		} else
+		if (!strcmp(cep->ce_varname, "fullstatus-on-load"))
+		{
+		} else
+		if (!strcmp(cep->ce_varname, "show-failedconnects"))
+		{
+		} else
+		{
+			config_error("%s:%i: unknown directive set::antirandom::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+	}
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int antirandom_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *cep2;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::antirandom... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "antirandom"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "except-hosts"))
+		{
+			for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+				unreal_add_masks(&cfg.except_hosts, cep2);
+		} else
+		if (!strcmp(cep->ce_varname, "except-webirc"))
+		{
+			cfg.except_webirc = config_checkval(cep->ce_vardata, CFG_YESNO);
+		} else
+		if (!strcmp(cep->ce_varname, "threshold"))
+		{
+			cfg.threshold = atoi(cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "ban-action"))
+		{
+			cfg.ban_action = banact_stringtoval(cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "ban-reason"))
+		{
+			safe_strdup(cfg.ban_reason, cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			cfg.ban_time = config_checkval(cep->ce_vardata, CFG_TIME);
+		} else
+		if (!strcmp(cep->ce_varname, "convert-to-lowercase"))
+		{
+			cfg.convert_to_lowercase = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+		if (!strcmp(cep->ce_varname, "show-failedconnects"))
+		{
+			cfg.show_failedconnects = config_checkval(cep->ce_vardata, CFG_YESNO);
+		} else
+		if (!strcmp(cep->ce_varname, "fullstatus-on-load"))
+		{
+			cfg.fullstatus_on_load = config_checkval(cep->ce_vardata, CFG_YESNO);
+		}
+	}
+	return 1;
+}
+
+int antirandom_config_posttest(int *errs)
+{
+	int errors = 0;
+
+	if (!req.threshold) { config_error("set::antirandom::threshold missing"); errors++; }
+	if (!req.ban_action) { config_error("set::antirandom::ban-action missing"); errors++; }
+	if (!req.ban_time) { config_error("set::antirandom::ban-time missing"); errors++; }
+	if (!req.ban_reason) { config_error("set::antirandom::ban-reason missing"); errors++; }
+	
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+static int init_stuff(void)
+{
+	if (!init_triples())
+		return 0;
+	return 1;
+}
+
+/** Initializes the triples list. */
+static int init_triples(void)
+{
+	char **s;
+	Triples *e, *last=NULL;
+	int cnt=0;
+
+	for (s=triples_txt; *s; s++)
+	{
+		cnt++;
+		e = safe_alloc(sizeof(Triples));
+		if (strlen(*s) > 2)
+		{
+			config_error("init_triples: error parsing triples_txt, cnt=%d, item='%s' (length>2)",
+				cnt, *s);
+			return 0;
+		}
+		strcpy(e->two, *s); /* (SAFE) */
+		s++;
+		if (!*s)
+		{
+			config_error("init_triples: error parsing triples_txt, cnt=%d, got NULL expected param",
+				cnt);
+			return 0;
+		}
+		if (strlen(*s) > TRIPLES_REST_SIZE-1)
+		{
+			config_error("init_triples: error parsing triples_txt, cnt=%d, item='%s' (length>%d)",
+				cnt, *s, TRIPLES_REST_SIZE-1);
+			return 0;
+		}
+		strcpy(e->rest, *s); /* (SAFE) */
+
+		/* Append at end of list (to keep it in order, not importent yet, but..) */
+		if (last)
+			last->next = e;
+		else
+			triples = e; /*(head)*/
+		last = e;
+	}
+	return 1;
+}
+
+/** Run the actual tests over this string.
+ * There are 3 tests:
+ * - weird chars (not used)
+ * - sregexes (not used)
+ * - triples (three-letter combinations)
+ */
+static int internal_getscore(char *str)
+{
+	Triples *t;
+	register char *s;
+	int score = 0;
+	int highest_vowels=0, highest_consonants=0, highest_digits=0;
+	int vowels=0, consonants=0, digits=0;
+
+	/* Fast digit/consonant/vowel checks... */
+	for (s=str; *s; s++)
+	{
+		if ((*s >= '0') && (*s <= '9'))
+			digits++;
+		else {
+			highest_digits = MAX(highest_digits, digits);
+			digits = 0;
+		}
+		if (strchr("bcdfghjklmnpqrstvwxz", *s))
+			consonants++;
+		else {
+			highest_consonants = MAX(highest_consonants, consonants);
+			consonants = 0;
+		}
+		if (strchr("aeiou", *s))
+			vowels++;
+		else {
+			highest_vowels = MAX(highest_vowels, vowels);
+			vowels = 0;
+		}
+	}
+
+	digits = MAX(highest_digits, digits);
+	consonants = MAX(highest_consonants, consonants);
+	vowels = MAX(highest_vowels, vowels);
+	
+	if (digits >= 5)
+	{
+		score += 5 + (digits - 5);
+#ifdef DEBUGMODE
+		sendto_ops_and_log("score@'%s': MATCH for digits check", str);
+#endif
+	}
+	if (vowels >= 4)
+	{
+		score += 4 + (vowels - 4);
+#ifdef DEBUGMODE
+		sendto_ops_and_log("score@'%s': MATCH for vowels check", str);
+#endif
+	}
+	if (consonants >= 4)
+	{
+		score += 4 + (consonants - 4);
+#ifdef DEBUGMODE
+		sendto_ops_and_log("score@'%s': MATCH for consonants check", str);
+#endif
+	}
+	
+	for (t=triples; t; t=t->next)
+	{
+		for (s=str; *s; s++)
+			if ((t->two[0] == s[0]) && (t->two[1] == s[1]) && s[2] && strchr(t->rest, s[2]))
+			{
+				score++; /* OK */
+#ifdef DEBUGMODE
+				sendto_ops_and_log("score@'%s': MATCH for '%s[%s]' %c/%c/%c", str, t->two, t->rest,
+					s[0], s[1], s[2]);
+#endif
+			}
+	}
+
+	
+	
+	return score;
+}
+
+void strtolower_safe(char *dst, char *src, int size)
+{
+	if (!size)
+		return; /* size of 0 is unworkable */
+	size--; /* for \0 */
+	
+	for (; *src && size; src++)
+	{
+		*dst++ = tolower(*src);
+		size--;
+	}
+	*dst = '\0';
+}
+
+/** Returns "spam score".
+ * @note a user is expected, do not call for anything else (eg: servers)
+ */
+static int get_spam_score(Client *client)
+{
+	char *nick = client->name;
+	char *user = client->user->username;
+	char *gecos = client->info;
+	char nbuf[NICKLEN+1], ubuf[USERLEN+1], rbuf[REALLEN+1];
+	int nscore, uscore, gscore, score;
+#ifdef TIMING
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	if (cfg.convert_to_lowercase)
+	{
+		strtolower_safe(nbuf, nick, sizeof(nbuf));
+		strtolower_safe(ubuf, user, sizeof(ubuf));
+		strtolower_safe(rbuf, gecos, sizeof(rbuf));
+		nick = nbuf;
+		user = ubuf;
+		gecos = rbuf;
+	}
+
+	nscore = internal_getscore(nick);
+	uscore = internal_getscore(user);
+	gscore = internal_getscore(gecos);
+	score = nscore + uscore + gscore;
+
+#ifdef TIMING
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "AntiRandom Timing: %ld microseconds",
+		((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec));
+#endif
+#ifdef DEBUGMODE
+	sendto_ops_and_log("got score: %d/%d/%d = %d",
+		nscore, uscore, gscore, score);
+#endif
+
+	return score;
+}
+
+void check_all_users(void)
+{
+	Client *client;
+	int matches=0, score;
+	
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (IsUser(client))
+		{
+			if (is_exempt(client))
+				continue;
+
+			score = get_spam_score(client);
+			if (score > cfg.threshold)
+			{
+				if (!matches)
+					sendto_realops("[antirandom] Full status report follows:");
+				sendto_realops("%d points: %s!%s@%s:%s",
+					score, client->name, client->user->username, client->user->realhost, client->info);
+				matches++;
+			}
+		}
+	}
+	if (matches)
+		sendto_realops("[antirandom] %d match%s", matches, matches == 1 ? "" : "es");
+}
+
+int antirandom_preconnect(Client *client)
+{
+	int score;
+
+	if (is_exempt(client))
+		return HOOK_CONTINUE;
+
+	score = get_spam_score(client);
+	if (score > cfg.threshold)
+	{
+		if (cfg.ban_action == BAN_ACT_WARN)
+		{
+			sendto_ops_and_log("[antirandom] would have denied access to user with score %d: %s!%s@%s:%s",
+				score, client->name, client->user->username, client->user->realhost, client->info);
+			return HOOK_CONTINUE;
+		}
+		if (cfg.show_failedconnects)
+			sendto_ops_and_log("[antirandom] denied access to user with score %d: %s!%s@%s:%s",
+				score, client->name, client->user->username, client->user->realhost, client->info);
+		place_host_ban(client, cfg.ban_action, cfg.ban_reason, cfg.ban_time);
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
+
+static void free_stuff(void)
+{
+	Triples *t, *t_next;
+
+	for (t=triples; t; t=t_next)
+	{
+		t_next = t->next;
+		safe_free(t);
+	}
+	triples = NULL;
+}
+
+/** Is this user exempt from antirandom interventions? */
+static int is_exempt(Client *client)
+{
+	/* WEBIRC gateway and exempt? */
+	if (cfg.except_webirc)
+	{
+		char *val = moddata_client_get(client, "webirc");
+		if (val && (atoi(val)>0))
+			return 1;
+	}
+
+	if (find_tkl_exception(TKL_ANTIRANDOM, client))
+		return 1;
+
+	/* Soft ban and logged in? */
+	if (IsSoftBanAction(cfg.ban_action) && IsLoggedIn(client))
+		return 1;
+
+	/* On except host? */
+	return unreal_mask_match(client, cfg.except_hosts);
+}
diff --git a/src/modules/authprompt.c b/src/modules/authprompt.c
new file mode 100644
index 0000000..132abda
--- /dev/null
+++ b/src/modules/authprompt.c
@@ -0,0 +1,479 @@
+/*
+ * Auth prompt: SASL authentication for clients that don't support SASL
+ * (C) Copyright 2018 Bram Matthys ("Syzop") and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"authprompt",
+	"1.0",
+	"SASL authentication for clients that don't support SASL",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/** Configuration settings */
+struct {
+	int enabled;
+	MultiLine *message;
+	MultiLine *fail_message;
+} cfg;
+
+/** User struct */
+typedef struct APUser APUser;
+struct APUser {
+	char *authmsg;
+};
+
+/* Global variables */
+ModDataInfo *authprompt_md = NULL;
+
+/* Forward declarations */
+static void free_config(void);
+static void init_config(void);
+static void config_postdefaults(void);
+int authprompt_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int authprompt_config_run(ConfigFile *, ConfigEntry *, int);
+int authprompt_require_sasl(Client *client, char *reason);
+int authprompt_sasl_continuation(Client *client, char *buf);
+int authprompt_sasl_result(Client *client, int success);
+int authprompt_place_host_ban(Client *client, int action, char *reason, long duration);
+int authprompt_find_tkline_match(Client *client, TKL *tk);
+int authprompt_pre_connect(Client *client);
+CMD_FUNC(cmd_auth);
+void authprompt_md_free(ModData *md);
+
+/* Some macros */
+#define SetAPUser(x, y) do { moddata_client(x, authprompt_md).ptr = y; } while(0)
+#define SEUSER(x)       ((APUser *)moddata_client(x, authprompt_md).ptr)
+#define AGENT_SID(agent_p)      (agent_p->user != NULL ? agent_p->user->server : agent_p->name)
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, authprompt_config_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "authprompt";
+	mreq.type = MODDATATYPE_CLIENT;
+	mreq.free = authprompt_md_free;
+	authprompt_md = ModDataAdd(modinfo->handle, mreq);
+	if (!authprompt_md)
+	{
+		config_error("could not register authprompt moddata");
+		return MOD_FAILED;
+	}
+
+	init_config();
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, authprompt_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_REQUIRE_SASL, 0, authprompt_require_sasl);
+	HookAdd(modinfo->handle, HOOKTYPE_SASL_CONTINUATION, 0, authprompt_sasl_continuation);
+	HookAdd(modinfo->handle, HOOKTYPE_SASL_RESULT, 0, authprompt_sasl_result);
+	HookAdd(modinfo->handle, HOOKTYPE_PLACE_HOST_BAN, 0, authprompt_place_host_ban);
+	HookAdd(modinfo->handle, HOOKTYPE_FIND_TKLINE_MATCH, 0, authprompt_find_tkline_match);
+	/* For HOOKTYPE_PRE_LOCAL_CONNECT we want a low priority, so we are called last.
+	 * This gives hooks like the one from the blacklist module (pending softban)
+	 * a chance to be handled first.
+	 */
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CONNECT, -1000000, authprompt_pre_connect);
+	CommandAdd(modinfo->handle, "AUTH", cmd_auth, 1, CMD_UNREGISTERED);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	config_postdefaults();
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	free_config();
+	return MOD_SUCCESS;
+}
+
+static void init_config(void)
+{
+	/* This sets some default values */
+	memset(&cfg, 0, sizeof(cfg));
+	cfg.enabled = 0;
+}
+
+static void config_postdefaults(void)
+{
+	if (!cfg.message)
+	{
+		addmultiline(&cfg.message, "The server requires clients from this IP address to authenticate with a registered nickname and password.");
+		addmultiline(&cfg.message, "Please reconnect using SASL, or authenticate now by typing: /QUOTE AUTH nick:password");
+	}
+	if (!cfg.fail_message)
+	{
+		addmultiline(&cfg.fail_message, "Authentication failed.");
+	}
+}
+
+static void free_config(void)
+{
+	freemultiline(cfg.message);
+	freemultiline(cfg.fail_message);
+	memset(&cfg, 0, sizeof(cfg)); /* needed! */
+}
+
+int authprompt_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+
+	/* We are only interrested in set::authentication-prompt... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "authentication-prompt"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+		{
+			config_error("%s:%i: set::authentication-prompt::%s with no value",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		} else
+		if (!strcmp(cep->ce_varname, "enabled"))
+		{
+		} else
+		if (!strcmp(cep->ce_varname, "message"))
+		{
+		} else
+		if (!strcmp(cep->ce_varname, "fail-message"))
+		{
+		} else
+		{
+			config_error("%s:%i: unknown directive set::authentication-prompt::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+	}
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int authprompt_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+
+	/* We are only interrested in set::authentication-prompt... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "authentication-prompt"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "enabled"))
+		{
+			cfg.enabled = config_checkval(cep->ce_vardata, CFG_YESNO);
+		} else
+		if (!strcmp(cep->ce_varname, "message"))
+		{
+			addmultiline(&cfg.message, cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "fail-message"))
+		{
+			addmultiline(&cfg.fail_message, cep->ce_vardata);
+		}
+	}
+	return 1;
+}
+
+void authprompt_md_free(ModData *md)
+{
+	APUser *se = md->ptr;
+
+	if (se)
+	{
+		safe_free(se->authmsg);
+		safe_free(se);
+		md->ptr = se = NULL;
+	}
+}
+
+/** Parse an authentication request from the user (form: <user>:<pass>).
+ * @param str      The input string with the request.
+ * @param username Pointer to the username string.
+ * @param password Pointer to the password string.
+ * @retval 1 if the format is correct, 0 if not.
+ * @note The returned 'username' and 'password' are valid until next call to parse_nickpass().
+ */
+int parse_nickpass(const char *str, char **username, char **password)
+{
+	static char buf[250];
+	char *p;
+
+	strlcpy(buf, str, sizeof(buf));
+
+	p = strchr(buf, ':');
+	if (!p)
+		return 0;
+
+	*p++ = '\0';
+	*username = buf;
+	*password = p;
+
+	if (!*username[0] || !*password[0])
+		return 0;
+
+	return 1;
+}
+
+char *make_authbuf(const char *username, const char *password)
+{
+	char inbuf[256];
+	static char outbuf[512];
+	int size;
+
+	size = strlen(username) + 1 + strlen(username) + 1 + strlen(password);
+	if (size >= sizeof(inbuf))
+		return NULL; /* too long */
+
+	/* Because size limits are already checked above, we can cut some corners here: */
+	memset(inbuf, 0, sizeof(inbuf));
+	strcpy(inbuf, username);
+	strcpy(inbuf+strlen(username)+1, username);
+	strcpy(inbuf+strlen(username)+1+strlen(username)+1, password);
+	/* ^ normal people use stpcpy here ;) */
+
+	if (b64_encode(inbuf, size, outbuf, sizeof(outbuf)) < 0)
+		return NULL; /* base64 encoding error */
+
+	return outbuf;
+}
+
+/** Send first SASL authentication request (AUTHENTICATE PLAIN).
+ * Among other things, this is used to discover the agent
+ * which will later be used for this session.
+ */
+void send_first_auth(Client *client)
+{
+	Client *sasl_server;
+	char *addr = BadPtr(client->ip) ? "0" : client->ip;
+	char *certfp = moddata_client_get(client, "certfp");
+	sasl_server = find_client(SASL_SERVER, NULL);
+	if (!sasl_server)
+	{
+		/* Services down. */
+		return;
+	}
+
+	sendto_one(sasl_server, NULL, ":%s SASL %s %s H %s %s",
+	    me.id, SASL_SERVER, client->id, addr, addr);
+
+	if (certfp)
+		sendto_one(sasl_server, NULL, ":%s SASL %s %s S %s %s",
+		    me.id, SASL_SERVER, client->id, "PLAIN", certfp);
+	else
+		sendto_one(sasl_server, NULL, ":%s SASL %s %s S %s",
+		    me.id, SASL_SERVER, client->id, "PLAIN");
+
+	/* The rest is sent from authprompt_sasl_continuation() */
+
+	client->local->sasl_out++;
+}
+
+CMD_FUNC(cmd_auth)
+{
+	char *username = NULL;
+	char *password = NULL;
+	char *authbuf;
+
+	if (!SEUSER(client))
+	{
+		if (HasCapability(client, "sasl"))
+			sendnotice(client, "ERROR: Cannot use /AUTH when your client is doing SASL.");
+		else
+			sendnotice(client, "ERROR: /AUTH authentication request received before authentication prompt (too early!)");
+		return;
+	}
+
+	if ((parc < 2) || BadPtr(parv[1]) || !parse_nickpass(parv[1], &username, &password))
+	{
+		sendnotice(client, "ERROR: Syntax is: /AUTH <nickname>:<password>");
+		sendnotice(client, "Example: /AUTH mynick:secretpass");
+		return;
+	}
+
+	if (!SASL_SERVER)
+	{
+		sendnotice(client, "ERROR: SASL is not configured on this server, or services are down.");
+		// numeric instead? SERVICESDOWN?
+		return;
+	}
+
+	/* Presumably if the user is really fast, this could happen.. */
+	if (*client->local->sasl_agent || SEUSER(client)->authmsg)
+	{
+		sendnotice(client, "ERROR: Previous authentication request is still in progress. Please wait.");
+		return;
+	}
+
+	authbuf = make_authbuf(username, password);
+	if (!authbuf)
+	{
+		sendnotice(client, "ERROR: Internal error. Oversized username/password?");
+		return;
+	}
+
+	safe_strdup(SEUSER(client)->authmsg, authbuf);
+
+	send_first_auth(client);
+}
+
+void authprompt_tag_as_auth_required(Client *client)
+{
+	/* Allocate, and therefore indicate, that we are going to handle SASL for this user */
+	if (!SEUSER(client))
+		SetAPUser(client, safe_alloc(sizeof(APUser)));
+}
+
+void authprompt_send_auth_required_message(Client *client)
+{
+	/* Display set::authentication-prompt::message */
+	sendnotice_multiline(client, cfg.message);
+}
+
+int authprompt_require_sasl(Client *client, char *reason)
+{
+	/* If the client did SASL then we (authprompt) will not kick in */
+	if (HasCapability(client, "sasl"))
+		return 0;
+
+	authprompt_tag_as_auth_required(client);
+
+	/* Display the require authentication::reason */
+	if (reason && strcmp(reason, "-") && strcmp(reason, "*"))
+		sendnotice(client, "%s", reason);
+
+	authprompt_send_auth_required_message(client);
+
+	return 1;
+}
+
+/* Called upon "place a host ban on this user" (eg: spamfilter, blacklist, ..) */
+int authprompt_place_host_ban(Client *client, int action, char *reason, long duration)
+{
+	/* If it's a soft-xx action and the user is not logged in
+	 * and the user is not yet online, then we will handle this user.
+	 */
+	if (IsSoftBanAction(action) && !IsLoggedIn(client) && !IsUser(client))
+	{
+		/* Send ban reason */
+		if (reason)
+			sendnotice(client, "%s", reason);
+
+		/* And tag the user */
+		authprompt_tag_as_auth_required(client);
+		authprompt_send_auth_required_message(client);
+		return 1; /* pretend user is killed */
+	}
+	return 99; /* no action taken, proceed normally */
+}
+
+/** Called upon "check for KLINE/GLINE" */
+int authprompt_find_tkline_match(Client *client, TKL *tkl)
+{
+	/* If it's a soft-xx action and the user is not logged in
+	 * and the user is not yet online, then we will handle this user.
+	 */
+	if (TKLIsServerBan(tkl) &&
+	   (tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) &&
+	   !IsLoggedIn(client) &&
+	   !IsUser(client))
+	{
+		/* Send ban reason */
+		if (tkl->ptr.serverban->reason)
+			sendnotice(client, "%s", tkl->ptr.serverban->reason);
+
+		/* And tag the user */
+		authprompt_tag_as_auth_required(client);
+		authprompt_send_auth_required_message(client);
+		return 1; /* pretend user is killed */
+	}
+	return 99; /* no action taken, proceed normally */
+}
+
+int authprompt_pre_connect(Client *client)
+{
+	/* If the user is tagged as auth required and not logged in, then.. */
+	if (SEUSER(client) && !IsLoggedIn(client))
+	{
+		authprompt_send_auth_required_message(client);
+		return HOOK_DENY; /* do not process register_user() */
+	}
+
+	return HOOK_CONTINUE; /* no action taken, proceed normally */
+}
+
+int authprompt_sasl_continuation(Client *client, char *buf)
+{
+	/* If it's not for us (eg: user is doing real SASL) then return 0. */
+	if (!SEUSER(client) || !SEUSER(client)->authmsg)
+		return 0;
+
+	if (!strcmp(buf, "+"))
+	{
+		Client *agent = find_client(client->local->sasl_agent, NULL);
+		if (agent)
+		{
+			sendto_one(agent, NULL, ":%s SASL %s %s C %s",
+				me.id, AGENT_SID(agent), client->id, SEUSER(client)->authmsg);
+		}
+		SEUSER(client)->authmsg = NULL;
+	}
+	return 1; /* inhibit displaying of message */
+}
+
+int authprompt_sasl_result(Client *client, int success)
+{
+	/* If it's not for us (eg: user is doing real SASL) then return 0. */
+	if (!SEUSER(client))
+		return 0;
+
+	if (!success)
+	{
+		sendnotice_multiline(client, cfg.fail_message);
+		return 1;
+	}
+
+	/* Authentication was a success */
+	if (*client->name && client->user && *client->user->username && IsNotSpoof(client))
+	{
+		register_user(client, client->name, client->user->username, NULL, NULL, NULL);
+		/* User MAY be killed now. But since we 'return 1' below, it's safe */
+	}
+
+	return 1; /* inhibit success/failure message */
+}
diff --git a/src/modules/away.c b/src/modules/away.c
new file mode 100644
index 0000000..0f6cc18
--- /dev/null
+++ b/src/modules/away.c
@@ -0,0 +1,147 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/away.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   away command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_away);
+
+#define MSG_AWAY 	"AWAY"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"away",
+	"5.0",
+	"command /away", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_AWAY, cmd_away, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Mark client as AWAY or mark them as back (in case of empty reason) */
+CMD_FUNC(cmd_away)
+{
+	char *new_reason = parv[1];
+	int n, already_as_away = 0;
+	MessageTag *mtags = NULL;
+
+	if (IsServer(client))
+		return;
+
+	if (parc < 2 || !*new_reason)
+	{
+		/* Marking as not away */
+		if (client->user->away)
+		{
+			safe_free(client->user->away);
+
+			new_message(client, recv_mtags, &mtags);
+			sendto_server(client, 0, 0, mtags, ":%s AWAY", client->name);
+			hash_check_watch(client, RPL_NOTAWAY);
+			sendto_local_common_channels(client, client, ClientCapabilityBit("away-notify"), mtags,
+			                             ":%s AWAY", client->name);
+			RunHook3(HOOKTYPE_AWAY, client, mtags, NULL);
+			free_message_tags(mtags);
+		}
+
+		if (MyConnect(client))
+			sendnumeric(client, RPL_UNAWAY);
+		return;
+	}
+
+	/* Check spamfilters */
+	if (MyUser(client) && match_spamfilter(client, new_reason, SPAMF_AWAY, NULL, 0, NULL))
+		return;
+
+	/* Check set::anti-flood::away-flood */
+	if (MyUser(client) && AWAY_PERIOD && !ValidatePermissionsForPath("immune:away-flood",client,NULL,NULL,NULL))
+	{
+		if ((client->user->flood.away_t + AWAY_PERIOD) <= timeofday)
+		{
+			client->user->flood.away_c = 0;
+			client->user->flood.away_t = timeofday;
+		}
+		if (client->user->flood.away_c <= AWAY_COUNT)
+			client->user->flood.away_c++;
+		if (client->user->flood.away_c > AWAY_COUNT)
+		{
+			sendnumeric(client, ERR_TOOMANYAWAY);
+			return;
+		}
+	}
+
+	/* Obey set::away-length */
+	if (strlen(new_reason) > iConf.away_length)
+		new_reason[iConf.away_length] = '\0';
+
+	/* Check if the new away reason is the same as the current reason - if so then return (no change) */
+	if ((client->user->away) && !strcmp(client->user->away, new_reason))
+		return;
+
+	/* All tests passed. Now marking as away (or still away but changing the away reason) */
+
+	client->user->lastaway = TStime();
+	
+	new_message(client, recv_mtags, &mtags);
+
+	sendto_server(client, 0, 0, mtags, ":%s AWAY :%s", client->id, new_reason);
+
+	if (client->user->away)
+	{
+		safe_free(client->user->away);
+		already_as_away = 1;
+	}
+	
+	safe_strdup(client->user->away, new_reason);
+
+	if (MyConnect(client))
+		sendnumeric(client, RPL_NOWAWAY);
+
+	hash_check_watch(client, already_as_away ? RPL_REAWAY : RPL_GONEAWAY);
+
+	sendto_local_common_channels(client, client,
+	                             ClientCapabilityBit("away-notify"), mtags,
+	                             ":%s AWAY :%s", client->name, client->user->away);
+
+	RunHook3(HOOKTYPE_AWAY, client, mtags, client->user->away);
+
+	free_message_tags(mtags);
+
+	return;
+}
diff --git a/src/modules/batch.c b/src/modules/batch.c
new file mode 100644
index 0000000..e1ca1a8
--- /dev/null
+++ b/src/modules/batch.c
@@ -0,0 +1,120 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/batch.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"batch",
+	"5.0",
+	"Batch CAP", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Forward declarations */
+CMD_FUNC(cmd_batch);
+
+/* Variables */
+long CAP_BATCH = 0L;
+
+int batch_mtag_is_ok(Client *client, char *name, char *value);
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+	ClientCapability *c;
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "batch";
+	c = ClientCapabilityAdd(modinfo->handle, &cap, &CAP_BATCH);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "batch";
+	mtag.is_ok = batch_mtag_is_ok;
+	mtag.clicap_handler = c;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	CommandAdd(modinfo->handle, "BATCH", cmd_batch, MAXPARA, CMD_USER|CMD_SERVER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* BATCH:
+ * As an intra-server command:
+ * :sender BATCH target +xxxxx [etc etc etc]
+ */
+CMD_FUNC(cmd_batch)
+{
+	Client *target;
+	char buf[512];
+
+	if (MyUser(client) || (parc < 3))
+		return;
+
+	target = find_client(parv[1], NULL);
+	if (!target)
+		return; /* race condition */
+
+	/* If the recipient does not support message tags or
+	 * does not support batch, then don't do anything.
+	 */
+	if (MyConnect(target) && !IsServer(target) && !HasCapability(target, "batch"))
+		return;
+
+	if (MyUser(target))
+	{
+		/* Send the batch message to the client */
+		parv[1] = "BATCH";
+		concat_params(buf, sizeof(buf), parc, parv);
+		sendto_prefix_one(target, client, recv_mtags, ":%s %s", client->name, buf);
+	} else {
+		/* Relay the batch message to the server */
+		concat_params(buf, sizeof(buf), parc, parv);
+		sendto_prefix_one(target, client, recv_mtags, ":%s BATCH %s", client->name, buf);
+	}
+}
+
+/** This function verifies if the client sending
+ * 'batch' is permitted to do so and uses a permitted
+ * syntax.
+ * We simply allow batch ONLY from servers and with any syntax.
+ */
+int batch_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (IsServer(client))
+		return 1;
+
+	return 0;
+}
diff --git a/src/modules/blacklist.c b/src/modules/blacklist.c
new file mode 100644
index 0000000..d38ce3e
--- /dev/null
+++ b/src/modules/blacklist.c
@@ -0,0 +1,841 @@
+/*
+ * Blacklist support (currently only DNS Blacklists)
+ * (C) Copyright 2015-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+#include "dns.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"blacklist",
+	"5.0",
+	"Check connecting users against DNS Blacklists",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* In this module and the config syntax I tried to 'abstract' things
+ * a little, so things could later be extended if we ever want
+ * to introduce another blacklist type (other than DNSBL).
+ * Once that happens, best to re-check/audit the source.
+ */
+
+/* Types */
+
+typedef enum {
+	DNSBL_RECORD=1, DNSBL_BITMASK=2
+} DNSBLType;
+
+typedef struct DNSBL DNSBL;
+struct DNSBL {
+	char *name;
+	DNSBLType type;
+	int *reply;
+};
+
+typedef union BlacklistBackend BlacklistBackend;
+union BlacklistBackend
+{
+	DNSBL *dns;
+};
+
+typedef enum {
+	BLACKLIST_BACKEND_DNS = 1
+} BlacklistBackendType;
+
+typedef struct Blacklist Blacklist;
+struct Blacklist {
+	Blacklist *prev, *next;
+	char *name;
+	BlacklistBackendType backend_type;
+	BlacklistBackend *backend;
+	int action;
+	long ban_time;
+	char *reason;
+};
+
+/* Blacklist user struct. In the c-ares DNS reply callback we need to pass
+ * some metadata. We can't use client directly there as the client may
+ * be gone already by the time we receive the DNS reply.
+ */
+typedef struct BLUser BLUser;
+struct BLUser {
+	Client *client;
+	int is_ipv6;
+	int refcnt;
+	/* The following save_* fields are used by softbans: */
+	int save_action;
+	long save_tkltime;
+	char *save_opernotice;
+	char *save_reason;
+};
+
+/* Global variables */
+ModDataInfo *blacklist_md = NULL;
+Blacklist *conf_blacklist = NULL;
+
+/* Forward declarations */
+int blacklist_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int blacklist_config_run(ConfigFile *, ConfigEntry *, int);
+void blacklist_free_conf(void);
+void delete_blacklist_block(Blacklist *e);
+void blacklist_md_free(ModData *md);
+int blacklist_handshake(Client *client);
+int blacklist_quit(Client *client, MessageTag *mtags, char *comment);
+int blacklist_preconnect(Client *client);
+void blacklist_resolver_callback(void *arg, int status, int timeouts, struct hostent *he);
+int blacklist_start_check(Client *client);
+int blacklist_dns_request(Client *client, Blacklist *bl);
+int blacklist_rehash(void);
+int blacklist_rehash_complete(void);
+void blacklist_set_handshake_delay(void);
+void blacklist_free_bluser_if_able(BLUser *bl);
+
+#define SetBLUser(x, y)	do { moddata_client(x, blacklist_md).ptr = y; } while(0)
+#define BLUSER(x)	((BLUser *)moddata_client(x, blacklist_md).ptr)
+
+long SNO_BLACKLIST = 0L;
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, blacklist_config_test);
+
+	CallbackAddEx(modinfo->handle, CALLBACKTYPE_BLACKLIST_CHECK, blacklist_start_check);
+	return MOD_SUCCESS;
+}
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	/* This module needs to be permanent.
+	 * Not because of UnrealIRCd restrictions,
+	 * but because we use c-ares callbacks and the address
+	 * of those functions will change if we REHASH.
+	 */
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1);
+	
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "blacklist";
+	mreq.type = MODDATATYPE_CLIENT;
+	mreq.free = blacklist_md_free;
+	blacklist_md = ModDataAdd(modinfo->handle, mreq);
+	if (!blacklist_md)
+	{
+		config_error("could not register blacklist moddata");
+		return MOD_FAILED;
+	}
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, blacklist_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_HANDSHAKE, 0, blacklist_handshake);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CONNECT, 0, blacklist_preconnect);
+	HookAdd(modinfo->handle, HOOKTYPE_REHASH, 0, blacklist_rehash);
+	HookAdd(modinfo->handle, HOOKTYPE_REHASH_COMPLETE, 0, blacklist_rehash_complete);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_QUIT, 0, blacklist_quit);
+
+	SnomaskAdd(modinfo->handle, 'b', umode_allow_opers, &SNO_BLACKLIST);
+
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	blacklist_set_handshake_delay();
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	blacklist_free_conf();
+	return MOD_SUCCESS;
+}
+
+int blacklist_rehash(void)
+{
+	blacklist_free_conf();
+	return 0;
+}
+
+int blacklist_rehash_complete(void)
+{
+	blacklist_set_handshake_delay();
+	return 0;
+}
+
+void blacklist_set_handshake_delay(void)
+{
+	if ((iConf.handshake_delay == -1) && conf_blacklist)
+	{
+		/*
+		Too noisy?
+		config_status("[blacklist] I'm setting set::handshake-delay to 2 seconds. "
+		              "You may wish to set an explicit setting in the configuration file.");
+		config_status("See https://www.unrealircd.org/docs/Set_block#set::handshake-delay");
+		*/
+		iConf.handshake_delay = 2;
+	}
+}
+
+/** Find blacklist { } block */
+Blacklist *blacklist_find_block_by_dns(char *name)
+{
+	Blacklist *d;
+	
+	for (d = conf_blacklist; d; d = d->next)
+		if ((d->backend_type == BLACKLIST_BACKEND_DNS) && !strcmp(name, d->backend->dns->name))
+			return d;
+
+	return NULL;
+}
+
+void blacklist_free_conf(void)
+{
+	Blacklist *d, *d_next;
+
+	for (d = conf_blacklist; d; d = d_next)
+	{
+		d_next = d->next;
+		delete_blacklist_block(d);
+	}
+	conf_blacklist = NULL;
+}
+
+void delete_blacklist_block(Blacklist *e)
+{
+	if (e->backend_type == BLACKLIST_BACKEND_DNS)
+	{
+		if (e->backend->dns)
+		{
+			safe_free(e->backend->dns->name);
+			safe_free(e->backend->dns->reply);
+			safe_free(e->backend->dns);
+		}
+	}
+	
+	safe_free(e->backend);
+
+	safe_free(e->name);
+	safe_free(e->reason);
+	safe_free(e);
+}
+
+int blacklist_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry	*cep, *cepp, *ceppp;
+	int errors = 0;
+	char has_reason = 0, has_ban_time = 0, has_action = 0;
+	char has_dns_type = 0, has_dns_reply = 0, has_dns_name = 0;
+
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce)
+		return 0;
+	
+	if (strcmp(ce->ce_varname, "blacklist"))
+		return 0; /* not interested in non-blacklist stuff.. */
+	
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: blacklist block without name (use: blacklist somename { })",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		*errs = 1;
+		return -1;
+	}
+
+	/* Now actually go parse the blacklist { } block */
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "dns"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "reply"))
+				{
+					if (has_dns_reply)
+					{
+						/* this is an error (not a warning) */
+						config_error("%s:%i: blacklist block may contain only one blacklist::dns::reply item. "
+									 "You can specify multiple replies by using: reply { 1; 2; 4; };",
+									 cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+						continue;
+					}
+					if (!cepp->ce_vardata && !cepp->ce_entries)
+					{
+						config_error_blank(cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, "blacklist::dns::reply");
+						errors++;
+						continue;
+					}
+					has_dns_reply = 1; /* we have a reply. now whether it's actually valid is another story.. */
+					if (cepp->ce_vardata && cepp->ce_entries)
+					{
+						config_error("%s:%i: blacklist::dns::reply must be either using format 'reply 1;' or "
+									 "'reply { 1; 2; 4; }; but not both formats at the same time.",
+									 cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+						continue;
+					}
+					if (cepp->ce_vardata)
+					{
+						if (atoi(cepp->ce_vardata) <= 0)
+						{
+							config_error("%s:%i: blacklist::dns::reply must be >0",
+								cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+							errors++;
+							continue;
+						}
+					}
+					if (cepp->ce_entries)
+					{
+						for (ceppp = cepp->ce_entries; ceppp; ceppp=ceppp->ce_next)
+						{
+							if (atoi(ceppp->ce_varname) <= 0)
+							{
+								config_error("%s:%i: all items in blacklist::dns::reply must be >0",
+									cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+								errors++;
+							}
+						}
+					}
+				} else
+				if (!cepp->ce_vardata)
+				{
+					config_error_empty(cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+						"blacklist::dns", cepp->ce_varname);
+					errors++;
+					continue;
+				} else
+				if (!strcmp(cepp->ce_varname, "name"))
+				{
+					if (has_dns_name)
+					{
+						config_warn_duplicate(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum, "blacklist::dns::name");
+					}
+					has_dns_name = 1;
+				} else
+				if (!strcmp(cepp->ce_varname, "type"))
+				{
+					if (has_dns_type)
+					{
+						config_warn_duplicate(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum, "blacklist::dns::type");
+					}
+					has_dns_type = 1;
+					if (!strcmp(cepp->ce_vardata, "record"))
+						;
+					else if (!strcmp(cepp->ce_vardata, "bitmask"))
+						;
+					else
+					{
+						config_error("%s:%i: unknown blacklist::dns::type '%s', must be either 'record' or 'bitmask'",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_vardata);
+						errors++;
+					}
+				}
+			}
+		} else
+		if (!cep->ce_vardata)
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"blacklist", cep->ce_varname);
+			errors++;
+			continue;
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (has_action)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "blacklist::action");
+				continue;
+			}
+			has_action = 1;
+			if (!banact_stringtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: blacklist::action has unknown action type '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			if (has_ban_time)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "blacklist::ban-time");
+				continue;
+			}
+			has_ban_time = 1;
+		} else
+		if (!strcmp(cep->ce_varname, "reason"))
+		{
+			if (has_reason)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "blacklist::reason");
+				continue;
+			}
+			has_reason = 1;
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"blacklist", cep->ce_varname);
+			errors++;
+		}
+	}
+
+	if (!has_action)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"blacklist::action");
+		errors++;
+	}
+
+	if (!has_reason)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"blacklist::reason");
+		errors++;
+	}
+
+	if (!has_dns_name)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"blacklist::dns::name");
+		errors++;
+	}
+
+	if (!has_dns_type)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"blacklist::dns::type");
+		errors++;
+	}
+
+	if (!has_dns_reply)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"blacklist::dns::reply");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int blacklist_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *cepp, *ceppp;
+	Blacklist *d = NULL;
+	
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "blacklist"))
+		return 0; /* not interested */
+
+	d = safe_alloc(sizeof(Blacklist));
+	safe_strdup(d->name, ce->ce_vardata);
+	/* set some defaults. TODO: use set::blacklist or something ? */
+	d->action = BAN_ACT_KILL;
+	safe_strdup(d->reason, "Your IP is on a DNS Blacklist");
+	d->ban_time = 3600;
+	
+	/* assume dns for now ;) */
+	d->backend_type = BLACKLIST_BACKEND_DNS;
+	d->backend = safe_alloc(sizeof(BlacklistBackend));
+	d->backend->dns = safe_alloc(sizeof(DNSBL));
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "dns"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "reply"))
+				{
+					if (cepp->ce_vardata)
+					{
+						/* single reply */
+						d->backend->dns->reply = safe_alloc(sizeof(int)*2);
+						d->backend->dns->reply[0] = atoi(cepp->ce_vardata);
+						d->backend->dns->reply[1] = 0;
+					} else
+					if (cepp->ce_entries)
+					{
+						/* (potentially) multiple reply values */
+						int cnt = 0;
+						for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+						{
+							if (ceppp->ce_varname)
+								cnt++;
+						}
+						
+						if (cnt == 0)
+							abort(); /* impossible */
+						
+						d->backend->dns->reply = safe_alloc(sizeof(int)*(cnt+1));
+						
+						cnt = 0;
+						for (ceppp = cepp->ce_entries; ceppp; ceppp = ceppp->ce_next)
+						{
+							d->backend->dns->reply[cnt++] = atoi(ceppp->ce_varname);
+						}
+						d->backend->dns->reply[cnt] = 0;
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "type"))
+				{
+					if (!strcmp(cepp->ce_vardata, "record"))
+						d->backend->dns->type = DNSBL_RECORD;
+					else if (!strcmp(cepp->ce_vardata, "bitmask"))
+						d->backend->dns->type = DNSBL_BITMASK;
+				} else
+				if (!strcmp(cepp->ce_varname, "name"))
+				{
+					safe_strdup(d->backend->dns->name, cepp->ce_vardata);
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			d->action = banact_stringtoval(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			safe_strdup(d->reason, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			d->ban_time = config_checkval(cep->ce_vardata, CFG_TIME);
+		}
+	}
+
+	AddListItem(d, conf_blacklist);
+	
+	return 0;
+}
+
+void blacklist_md_free(ModData *md)
+{
+	BLUser *bl = md->ptr;
+
+	/* Mark bl->client as dead. Free the struct, if able. */
+	blacklist_free_bluser_if_able(bl);
+
+	md->ptr = NULL;
+}
+
+int blacklist_handshake(Client *client)
+{
+	blacklist_start_check(client);
+	return 0;
+}
+
+int blacklist_start_check(Client *client)
+{
+	Blacklist *bl;
+
+	/* If the user is on 'except blacklist' then don't bother checking... */
+	if (find_tkl_exception(TKL_BLACKLIST, client))
+		return 0;
+	
+	if (!BLUSER(client))
+	{
+		SetBLUser(client, safe_alloc(sizeof(BLUser)));
+		BLUSER(client)->client = client;
+	}
+
+	for (bl = conf_blacklist; bl; bl = bl->next)
+	{
+		/* Stop processing if client is (being) killed already */
+		if (!BLUSER(client))
+			break;
+
+		/* Initiate blacklist requests */
+		if (bl->backend_type == BLACKLIST_BACKEND_DNS)
+			blacklist_dns_request(client, bl);
+	}
+	
+	return 0;
+}
+
+int blacklist_dns_request(Client *client, Blacklist *d)
+{
+	char buf[256], wbuf[128];
+	unsigned int e[8];
+	char *ip = GetIP(client);
+	
+	if (!ip)
+		return 0;
+
+	memset(&e, 0, sizeof(e));
+
+	if (strchr(ip, '.'))
+	{
+		/* IPv4 */
+		if (sscanf(ip, "%u.%u.%u.%u", &e[0], &e[1], &e[2], &e[3]) != 4)
+			return 0;
+	
+		snprintf(buf, sizeof(buf), "%u.%u.%u.%u.%s", e[3], e[2], e[1], e[0], d->backend->dns->name);
+	} else
+	if (strchr(ip, ':'))
+	{
+		/* IPv6 */
+		int i;
+		BLUSER(client)->is_ipv6 = 1;
+		if (sscanf(ip, "%x:%x:%x:%x:%x:%x:%x:%x",
+		    &e[0], &e[1], &e[2], &e[3], &e[4], &e[5], &e[6], &e[7]) != 8)
+		{
+			return 0;
+		}
+		*buf = '\0';
+		for (i = 7; i >= 0; i--)
+		{
+			snprintf(wbuf, sizeof(wbuf), "%x.%x.%x.%x.",
+				(unsigned int)(e[i] & 0xf),
+				(unsigned int)((e[i] >> 4) & 0xf),
+				(unsigned int)((e[i] >> 8) & 0xf),
+				(unsigned int)((e[i] >> 12) & 0xf));
+			strlcat(buf, wbuf, sizeof(buf));
+		}
+		strlcat(buf, d->backend->dns->name, sizeof(buf));
+	}
+	else
+		return 0; /* unknown IP format */
+
+	BLUSER(client)->refcnt++; /* one (more) blacklist result remaining */
+	
+	unreal_gethostbyname(buf, AF_INET, blacklist_resolver_callback, BLUSER(client));
+	
+	return 0;
+}
+
+void blacklist_cancel(BLUser *bl)
+{
+	bl->client = NULL;
+}
+
+int blacklist_quit(Client *client, MessageTag *mtags, char *comment)
+{
+	if (BLUSER(client))
+		blacklist_cancel(BLUSER(client));
+
+	return 0;
+}
+
+/** Free the BLUSER() struct, if we are able to do so.
+ * This should only be called if the underlying client is dead or dyeing
+ * and not earlier.
+ * Reasons why we 'are not able' are: refcnt is non-zero, that is:
+ * there is still an outstanding resolver request (eg: slow blacklist).
+ * In that case, no worries, we will be called again after that request
+ * is finished.
+ */
+void blacklist_free_bluser_if_able(BLUser *bl)
+{
+	if (bl->client)
+		bl->client = NULL;
+
+	if (bl->refcnt > 0)
+		return; /* unable, still have DNS requests/replies in-flight */
+
+	safe_free(bl->save_opernotice);
+	safe_free(bl->save_reason);
+	safe_free(bl);
+}
+
+char *getdnsblname(char *p, Client *client)
+{
+	int dots = 0;
+	int dots_count;
+
+	if (!client)
+		return NULL;
+
+	if (BLUSER(client)->is_ipv6)
+		dots_count = 32;
+	else
+		dots_count = 4;
+
+	for (; *p; p++)
+	{
+		if (*p == '.')
+		{
+			dots++;
+			if (dots == dots_count)
+				return p+1;
+		}
+	}
+	return NULL;
+}
+
+/* Parse DNS reply.
+ * A reply will be an A record in the format x.x.x.<reply>
+ */
+int blacklist_parse_reply(struct hostent *he, int entry)
+{
+	char ipbuf[64];
+	char *p;
+
+	if ((he->h_addrtype != AF_INET) || (he->h_length != 4))
+		return 0;
+
+	*ipbuf = '\0';
+	if (!inet_ntop(AF_INET, he->h_addr_list[entry], ipbuf, sizeof(ipbuf)))
+		return 0;
+	
+	p = strrchr(ipbuf, '.');
+	if (!p)
+		return 0;
+	
+	return atoi(p+1);
+}
+
+/** Take the actual ban action.
+ * Called from blacklist_hit() and for immediate bans and
+ * from blacklist_preconnect() for softbans that need to be delayed
+ * as to give the user the opportunity to do SASL Authentication.
+ */
+int blacklist_action(Client *client, char *opernotice, BanAction ban_action, char *ban_reason, long ban_time)
+{
+	sendto_snomask(SNO_BLACKLIST, "%s", opernotice);
+	ircd_log(LOG_KILL, "%s", opernotice);
+	if (ban_action == BAN_ACT_WARN)
+		return 0;
+	return place_host_ban(client, ban_action, ban_reason, ban_time);
+}
+
+void blacklist_hit(Client *client, Blacklist *bl, int reply)
+{
+	char opernotice[512], banbuf[512];
+	const char *name[4], *value[4];
+	BLUser *blu = BLUSER(client);
+
+	if (find_tkline_match(client, 1))
+		return; /* already klined/glined. Don't send the warning from below. */
+
+	if (IsUser(client))
+		snprintf(opernotice, sizeof(opernotice), "[Blacklist] IP %s (%s) matches blacklist %s (%s/reply=%d)",
+			GetIP(client), client->name, bl->name, bl->backend->dns->name, reply);
+	else
+		snprintf(opernotice, sizeof(opernotice), "[Blacklist] IP %s matches blacklist %s (%s/reply=%d)",
+			GetIP(client), bl->name, bl->backend->dns->name, reply);
+
+	name[0] = "ip";
+	value[0] = GetIP(client);
+	name[1] = "server";
+	value[1] = me.name;
+	name[2] = NULL;
+	value[2] = NULL;
+
+	buildvarstring(bl->reason, banbuf, sizeof(banbuf), name, value);
+
+	if (IsSoftBanAction(bl->action) && blu)
+	{
+		/* For soft bans, delay the action until later (so user can do SASL auth) */
+		blu->save_action = bl->action;
+		blu->save_tkltime = bl->ban_time;
+		safe_strdup(blu->save_opernotice, opernotice);
+		safe_strdup(blu->save_reason, banbuf);
+	} else {
+		/* Otherwise, execute the action immediately */
+		blacklist_action(client, opernotice, bl->action, banbuf, bl->ban_time);
+	}
+}
+
+void blacklist_process_result(Client *client, int status, struct hostent *he)
+{
+	Blacklist *bl;
+	char *domain;
+	int reply;
+	int i;
+	int replycnt;
+	
+	if ((status != 0) || (he->h_length != 4) || !he->h_name)
+		return; /* invalid reply */
+	
+	domain = getdnsblname(he->h_name, client);
+	if (!domain)
+		return; /* odd */
+	bl = blacklist_find_block_by_dns(domain);
+	if (!bl)
+		return; /* possibly just rehashed and the blacklist block is gone now */
+	
+	/* walk through all replies for this record... until we have a hit */
+	for (replycnt=0; he->h_addr_list[replycnt]; replycnt++)
+	{
+		reply = blacklist_parse_reply(he, replycnt);
+
+		for (i = 0; bl->backend->dns->reply[i]; i++)
+		{
+			if ((bl->backend->dns->reply[i] == -1) ||
+				( (bl->backend->dns->type == DNSBL_BITMASK) && (reply & bl->backend->dns->reply[i]) ) ||
+				( (bl->backend->dns->type == DNSBL_RECORD) && (bl->backend->dns->reply[i] == reply) ) )
+			{
+				blacklist_hit(client, bl, reply);
+				return;
+			}
+		}
+	}
+}
+
+void blacklist_resolver_callback(void *arg, int status, int timeouts, struct hostent *he)
+{
+	BLUser *blu = (BLUser *)arg;
+	Client *client = blu->client;
+
+	blu->refcnt--; /* one less outstanding DNS request remaining */
+
+	/* If we are the last to resolve something and the client is gone
+	 * already then free the struct.
+	 */
+	if ((blu->refcnt == 0) && !client)
+		blacklist_free_bluser_if_able(blu);
+
+	blu = NULL;
+
+	if (!client)
+		return; /* Client left already */
+	/* ^^ note: do not merge this with the other 'if' a few lines up (refcnt!) */
+
+	blacklist_process_result(client, status, he);
+}
+
+int blacklist_preconnect(Client *client)
+{
+	BLUser *blu = BLUSER(client);
+
+	if (!blu || !blu->save_action)
+		return HOOK_CONTINUE;
+
+	/* There was a pending softban... has the user authenticated via SASL by now? */
+	if (IsLoggedIn(client))
+		return HOOK_CONTINUE; /* yup, so the softban does not apply. */
+
+	if (blacklist_action(client, blu->save_opernotice, blu->save_action, blu->save_reason, blu->save_tkltime))
+		return HOOK_DENY;
+	return HOOK_CONTINUE; /* exempt */
+}
diff --git a/src/modules/botmotd.c b/src/modules/botmotd.c
new file mode 100644
index 0000000..a36248b
--- /dev/null
+++ b/src/modules/botmotd.c
@@ -0,0 +1,90 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/botmotd.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_botmotd);
+
+#define MSG_BOTMOTD 	"BOTMOTD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"botmotd",
+	"5.0",
+	"command /botmotd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_BOTMOTD, cmd_botmotd, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * Modified from comstud by codemastr
+ */
+CMD_FUNC(cmd_botmotd)
+{
+	MOTDLine *motdline;
+	ConfigItem_tld *tld;
+
+	if (hunt_server(client, recv_mtags, ":%s BOTMOTD :%s", 1, parc, parv) != HUNTED_ISME)
+		return;
+
+	if (!IsUser(client))
+		return;
+
+	tld = find_tld(client);
+
+	motdline = NULL;
+	if (tld)
+		motdline = tld->botmotd.lines;
+	if (!motdline)
+		motdline = botmotd.lines;
+
+	if (!motdline)
+	{
+		sendnotice(client, "BOTMOTD File not found");
+		return;
+	}
+	sendnotice(client, "- %s Bot Message of the Day - ", me.name);
+
+	while (motdline)
+	{
+		sendnotice(client, "- %s", motdline->line);
+		motdline = motdline->next;
+	}
+	sendnotice(client, "End of /BOTMOTD command.");
+}
diff --git a/src/modules/cap.c b/src/modules/cap.c
new file mode 100644
index 0000000..7b886a3
--- /dev/null
+++ b/src/modules/cap.c
@@ -0,0 +1,419 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/cap.c
+ *   (C) 2012 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+typedef int (*bqcmp)(const void *, const void *);
+
+CMD_FUNC(cmd_cap);
+
+#define MSG_CAP 	"CAP"
+
+ModuleHeader MOD_HEADER
+  = {
+	"cap",	/* Name of module */
+	"5.0", /* Version */
+	"command /cap", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Forward declarations */
+int cap_is_handshake_finished(Client *client);
+int cap_never_visible(Client *client);
+
+/* Variables */
+long CAP_IN_PROGRESS = 0L;
+long CAP_ACCOUNT_NOTIFY = 0L;
+long CAP_AWAY_NOTIFY = 0L;
+long CAP_MULTI_PREFIX = 0L;
+long CAP_USERHOST_IN_NAMES = 0L;
+long CAP_NOTIFY = 0L;
+long CAP_CHGHOST = 0L;
+long CAP_EXTENDED_JOIN = 0L;
+
+MOD_INIT()
+{
+	ClientCapabilityInfo c;
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	CommandAdd(modinfo->handle, MSG_CAP, cmd_cap, MAXPARA, CMD_UNREGISTERED|CMD_USER|CMD_NOLAG);
+
+	/* This first cap is special, in the sense that it is hidden
+	 * and indicates a cap exchange is in progress.
+	 */
+	memset(&c, 0, sizeof(c));
+	c.name = "cap";
+	c.visible = cap_never_visible;
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_IN_PROGRESS);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "account-notify";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_ACCOUNT_NOTIFY);
+	
+	memset(&c, 0, sizeof(c));
+	c.name = "away-notify";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_AWAY_NOTIFY);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "multi-prefix";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_MULTI_PREFIX);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "userhost-in-names";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_USERHOST_IN_NAMES);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "cap-notify";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_NOTIFY);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "chghost";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_CHGHOST);
+
+	memset(&c, 0, sizeof(c));
+	c.name = "extended-join";
+	ClientCapabilityAdd(modinfo->handle, &c, &CAP_EXTENDED_JOIN);
+
+	HookAdd(modinfo->handle, HOOKTYPE_IS_HANDSHAKE_FINISHED, 0, cap_is_handshake_finished);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static ClientCapability *clicap_find(Client *client, const char *data, int *negate, int *finished, int *errors)
+{
+	static char buf[BUFSIZE];
+	static char *p;
+	ClientCapability *cap;
+	char *s;
+
+	*negate = 0;
+
+	if (data)
+	{
+		strlcpy(buf, data, sizeof(buf));
+		p = buf;
+		*finished = 0;
+		*errors = 0;
+	}
+
+	if (*finished)
+		return NULL;
+
+	/* skip any whitespace */
+	while(*p && isspace(*p))
+		p++;
+
+	if (BadPtr(p))
+	{
+		*finished = 1;
+		return NULL;
+	}
+
+	if(*p == '-')
+	{
+		*negate = 1;
+		p++;
+
+		/* someone sent a '-' without a parameter.. */
+		if(*p == '\0')
+			return NULL;
+	}
+
+	if((s = strchr(p, ' ')))
+		*s++ = '\0';
+
+	cap = ClientCapabilityFind(p, client);
+	if (!s)
+		*finished = 1;
+	
+	p = s; /* point to next token for next iteration */
+
+	if (cap && (cap->flags & CLICAP_FLAGS_ADVERTISE_ONLY))
+		cap = NULL;
+
+	if (!cap)
+		*errors = 1;
+
+	return cap;
+}
+
+static void clicap_generate(Client *client, const char *subcmd, int flags)
+{
+	ClientCapability *cap;
+	char buf[BUFSIZE];
+	char capbuf[BUFSIZE];
+	char *p;
+	int buflen = 0;
+	int curlen, mlen;
+
+	mlen = snprintf(buf, BUFSIZE, ":%s CAP %s %s", me.name,	BadPtr(client->name) ? "*" : client->name, subcmd);
+
+	p = capbuf;
+	buflen = mlen;
+
+	if (flags == -1)
+	{
+		sendto_one(client, NULL, "%s :", buf);
+		return;
+	}
+
+	for (cap = clicaps; cap; cap = cap->next)
+	{
+		char name[256];
+		char *param;
+
+		if (cap->visible && !cap->visible(client))
+			continue; /* hidden */
+
+		if (flags)
+		{
+			if (!cap->cap || !(client->local->caps & cap->cap))
+				continue;
+		}
+
+		if ((client->local->cap_protocol >= 302) && cap->parameter && (param = cap->parameter(client)))
+			snprintf(name, sizeof(name), "%s=%s", cap->name, param);
+		else
+			strlcpy(name, cap->name, sizeof(name));
+
+		/* \r\n\0, possible "-~=", space, " *" */
+		if (buflen + strlen(name) >= BUFSIZE - 10)
+		{
+			if (buflen != mlen)
+				*(p - 1) = '\0';
+			else
+				*p = '\0';
+
+			sendto_one(client, NULL, "%s * :%s", buf, capbuf);
+			p = capbuf;
+			buflen = mlen;
+		}
+
+		curlen = snprintf(p, (capbuf + BUFSIZE) - p, "%s ", name);
+		p += curlen;
+		buflen += curlen;
+	}
+
+	if (buflen != mlen)
+		*(p - 1) = '\0';
+	else
+		*p = '\0';
+
+	sendto_one(client, NULL, "%s :%s", buf, capbuf);
+}
+
+static void cap_end(Client *client, const char *arg)
+{
+	if (IsUser(client))
+		return;
+
+	ClearCapabilityFast(client, CAP_IN_PROGRESS);
+
+	if (*client->name && client->user && *client->user->username && IsNotSpoof(client))
+		register_user(client, client->name, client->user->username, NULL, NULL, NULL);
+}
+
+static void cap_list(Client *client, const char *arg)
+{
+	clicap_generate(client, "LIST", client->local->caps ? client->local->caps : -1);
+}
+
+static void cap_ls(Client *client, const char *arg)
+{
+	if (!IsUser(client))
+		SetCapabilityFast(client, CAP_IN_PROGRESS);
+
+	if (arg)
+		client->local->cap_protocol = atoi(arg);
+
+	/* Since the client did a "CAP LS" it apparently supports CAP
+	 * and thus at least protocol version 300.
+	 */
+	if (client->local->cap_protocol < 300)
+		client->local->cap_protocol = 300;
+
+	if (client->local->cap_protocol >= 302)
+		SetCapabilityFast(client, CAP_NOTIFY); /* Implicit support (JIT) */
+
+	clicap_generate(client, "LS", 0);
+}
+
+static void cap_req(Client *client, const char *arg)
+{
+	char buf[BUFSIZE];
+	char pbuf[2][BUFSIZE];
+	ClientCapability *cap;
+	int buflen, plen;
+	int i = 0;
+	int capadd = 0, capdel = 0;
+	int finished = 0, negate;
+	int errors = 0;
+
+	if (!IsUser(client))
+		SetCapabilityFast(client, CAP_IN_PROGRESS);
+
+	if (BadPtr(arg))
+		return;
+
+	buflen = snprintf(buf, sizeof(buf), ":%s CAP %s ACK",
+			  me.name, BadPtr(client->name) ? "*" : client->name);
+
+	pbuf[0][0] = '\0';
+	plen = 0;
+
+	for(cap = clicap_find(client, arg, &negate, &finished, &errors); cap;
+	    cap = clicap_find(client, NULL, &negate, &finished, &errors))
+	{
+		/* filled the first array, but cant send it in case the
+		 * request fails.  one REQ should never fill more than two
+		 * buffers --fl
+		 */
+		if (buflen + plen + strlen(cap->name) + 6 >= BUFSIZE)
+		{
+			pbuf[1][0] = '\0';
+			plen = 0;
+			i = 1;
+		}
+
+		if (negate)
+		{
+			strcat(pbuf[i], "-");
+			plen++;
+
+			capdel |= cap->cap;
+		}
+		else
+		{
+			capadd |= cap->cap;
+		}
+
+		strcat(pbuf[i], cap->name);
+		strcat(pbuf[i], " ");
+		plen += (strlen(cap->name) + 1);
+	}
+
+	/* This one is special */
+	if ((client->local->cap_protocol >= 302) && (capdel & CAP_NOTIFY))
+		errors++; /* Reject "CAP REQ -cap-notify" */
+
+	if (errors)
+	{
+		sendto_one(client, NULL, ":%s CAP %s NAK :%s", me.name, BadPtr(client->name) ? "*" : client->name, arg);
+		return;
+	}
+
+	if (i)
+	{
+		sendto_one(client, NULL, "%s * :%s", buf, pbuf[0]);
+		sendto_one(client, NULL, "%s :%s", buf, pbuf[1]);
+	}
+	else
+		sendto_one(client, NULL, "%s :%s", buf, pbuf[0]);
+
+	client->local->caps |= capadd;
+	client->local->caps &= ~capdel;
+}
+
+struct clicap_cmd {
+	const char *cmd;
+	void (*func)(Client *source_p, const char *arg);
+};
+
+static struct clicap_cmd clicap_cmdtable[] = {
+	{ "END",	cap_end		},
+	{ "LIST",	cap_list	},
+	{ "LS",		cap_ls		},
+	{ "REQ",	cap_req		},
+};
+
+static int clicap_cmd_search(const char *command, struct clicap_cmd *entry)
+{
+	return strcasecmp(command, entry->cmd);
+}
+
+int cap_never_visible(Client *client)
+{
+	return 0;
+}
+
+/** Is our handshake done? */
+int cap_is_handshake_finished(Client *client)
+{
+	if (HasCapabilityFast(client, CAP_IN_PROGRESS))
+		return 0; /* We are in CAP LS stage, waiting for a CAP END */
+
+	return 1;
+}
+
+CMD_FUNC(cmd_cap)
+{
+	struct clicap_cmd *cmd;
+
+	if (!MyConnect(client))
+		return;
+
+	/* CAP is marked as "no fake lag" because we use custom fake lag rules:
+	 * Only add a 1 second fake lag penalty if this is the XXth command.
+	 * This will speed up connections considerably.
+	 */
+	if (client->local->receiveM > 15)
+		client->local->since++;
+
+	if (DISABLE_CAP)
+	{
+		/* I know nothing! */
+		if (IsUser(client))
+			sendnumeric(client, ERR_UNKNOWNCOMMAND, "CAP");
+		else
+			sendnumeric(client, ERR_NOTREGISTERED);
+		return;
+	}
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "CAP");
+
+		return;
+	}
+
+	if(!(cmd = bsearch(parv[1], clicap_cmdtable,
+			   sizeof(clicap_cmdtable) / sizeof(struct clicap_cmd),
+			   sizeof(struct clicap_cmd), (bqcmp) clicap_cmd_search)))
+	{
+		sendnumeric(client, ERR_INVALIDCAPCMD, parv[1]);
+
+		return;
+	}
+
+	cmd->func(client, parv[2]);
+}
diff --git a/src/modules/certfp.c b/src/modules/certfp.c
new file mode 100644
index 0000000..1ec8b9a
--- /dev/null
+++ b/src/modules/certfp.c
@@ -0,0 +1,157 @@
+/*
+ * Certificate Fingerprint Module
+ * This grabs the SHA256 fingerprint of the SSL/TLS client certificate
+ * the user is using, shares it with the other servers (and rest of
+ * UnrealIRCd) and shows it in /WHOIS etc.
+ *
+ * (C) Copyright 2014-2015 The UnrealIRCd team (Syzop, DBoyz, Nath and others)
+ * 
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"certfp",
+	"5.0",
+	"Certificate fingerprint",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+void certfp_free(ModData *m);
+char *certfp_serialize(ModData *m);
+void certfp_unserialize(char *str, ModData *m);
+int certfp_handshake(Client *client);
+int certfp_connect(Client *client);
+int certfp_whois(Client *client, Client *target);
+
+ModDataInfo *certfp_md; /* Module Data structure which we acquire */
+
+#define WHOISCERTFP_STRING ":%s 276 %s %s :has client certificate fingerprint %s"
+
+MOD_INIT()
+{
+ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "certfp";
+	mreq.free = certfp_free;
+	mreq.serialize = certfp_serialize;
+	mreq.unserialize = certfp_unserialize;
+	mreq.sync = 1;
+	mreq.type = MODDATATYPE_CLIENT;
+	certfp_md = ModDataAdd(modinfo->handle, mreq);
+	if (!certfp_md)
+		abort();
+
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_CONNECT, 0, certfp_connect);
+	HookAdd(modinfo->handle, HOOKTYPE_HANDSHAKE, 0, certfp_handshake);
+	HookAdd(modinfo->handle, HOOKTYPE_SERVER_HANDSHAKE_OUT, 0, certfp_handshake);
+	HookAdd(modinfo->handle, HOOKTYPE_WHOIS, 0, certfp_whois);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* 
+ * Obtain client's fingerprint.
+ */
+char *get_fingerprint_for_client(Client *client)
+{
+	unsigned int n;
+	unsigned int l;
+	unsigned char md[EVP_MAX_MD_SIZE];
+	static char hex[EVP_MAX_MD_SIZE * 2 + 1];
+	char hexchars[16] = "0123456789abcdef";
+	const EVP_MD *digest = EVP_sha256();
+	X509 *x509_clientcert = NULL;
+
+	if (!MyConnect(client) || !client->local->ssl)
+		return NULL;
+	
+	x509_clientcert = SSL_get_peer_certificate(client->local->ssl);
+
+	if (x509_clientcert)
+	{
+		if (X509_digest(x509_clientcert, digest, md, &n)) {
+			int j = 0;
+			for	(l=0; l<n; l++) {
+				hex[j++] = hexchars[(md[l] >> 4) & 0xF];
+				hex[j++] = hexchars[md[l] & 0xF];
+			}
+			hex[j] = '\0';
+			X509_free(x509_clientcert);
+			return hex;
+		}
+		X509_free(x509_clientcert);
+	}
+	return NULL;
+}
+
+int certfp_handshake(Client *client)
+{
+	if (client->local->ssl)
+	{
+		char *fp = get_fingerprint_for_client(client);
+
+		if (!fp)
+			return 0;
+
+		moddata_client_set(client, "certfp", fp); /* set & broadcast */
+	}
+	return 0;
+}
+
+int certfp_connect(Client *client)
+{
+	if (IsSecure(client))
+	{
+		char *fp = moddata_client_get(client, "certfp");
+	
+		if (fp && !iConf.no_connect_tls_info)
+			sendnotice(client, "*** Your TLS certificate fingerprint is %s", fp);
+	}
+
+	return 0;
+}
+
+int certfp_whois(Client *client, Client *target)
+{
+	char *fp = moddata_client_get(target, "certfp");
+	
+	if (fp)
+		sendnumeric(client, RPL_WHOISCERTFP, target->name, fp);
+	return 0;
+}
+
+void certfp_free(ModData *m)
+{
+	safe_free(m->str);
+}
+
+char *certfp_serialize(ModData *m)
+{
+	if (!m->str)
+		return NULL;
+	return m->str;
+}
+
+void certfp_unserialize(char *str, ModData *m)
+{
+	safe_strdup(m->str, str);
+}
diff --git a/src/modules/chanmodes/Makefile.in b/src/modules/chanmodes/Makefile.in
new file mode 100644
index 0000000..a493260
--- /dev/null
+++ b/src/modules/chanmodes/Makefile.in
@@ -0,0 +1,129 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/modules/chanmodes/Makefile
+#*   Copyright (C) The UnrealIRCd Team
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*/
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+INCLUDES = ../../include/channel.h \
+	../../include/common.h ../../include/config.h ../../include/dbuf.h \
+	../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \
+	../../include/ircsprintf.h \
+	../../include/license.h \
+	../../include/modules.h ../../include/modversion.h ../../include/msg.h \
+	../../include/numeric.h ../../include/proto.h ../../include/dns.h \
+	../../include/resource.h ../../include/setup.h \
+	../../include/struct.h ../../include/sys.h \
+	../../include/types.h ../../include/url.h \
+	../../include/version.h ../../include/whowas.h
+
+R_MODULES= \
+	nocolor.so stripcolor.so issecure.so permanent.so floodprot.so \
+	noctcp.so link.so censor.so delayjoin.so noknock.so noinvite.so operonly.so \
+	nonotice.so regonly.so nonickchange.so nokick.so regonlyspeak.so \
+	secureonly.so history.so
+
+MODULES=$(R_MODULES)
+MODULEFLAGS=@MODULEFLAGS@
+RM=@RM@
+
+all: build
+
+build: $(MODULES)
+
+clean:
+	$(RM) -f *.o *.so *~ core
+
+#############################################################################
+#             .so's section
+#############################################################################
+
+issecure.so: issecure.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o issecure.so issecure.c
+
+nocolor.so: nocolor.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nocolor.so nocolor.c
+
+stripcolor.so: stripcolor.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o stripcolor.so stripcolor.c
+
+permanent.so: permanent.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o permanent.so permanent.c
+
+floodprot.so: floodprot.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o floodprot.so floodprot.c
+
+noctcp.so: noctcp.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o noctcp.so noctcp.c
+
+link.so: link.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o link.so link.c
+
+censor.so: censor.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o censor.so censor.c
+
+delayjoin.so: delayjoin.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o delayjoin.so delayjoin.c
+
+noknock.so: noknock.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o noknock.so noknock.c
+		
+noinvite.so: noinvite.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o noinvite.so noinvite.c
+		
+operonly.so: operonly.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o operonly.so operonly.c
+		
+nonotice.so: nonotice.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nonotice.so nonotice.c
+		
+regonly.so: regonly.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o regonly.so regonly.c
+		
+nonickchange.so: nonickchange.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nonickchange.so nonickchange.c
+		
+nokick.so: nokick.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nokick.so nokick.c
+		
+regonlyspeak.so: regonlyspeak.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o regonlyspeak.so regonlyspeak.c
+		
+secureonly.so: secureonly.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o secureonly.so secureonly.c
+
+history.so: history.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o history.so history.c
diff --git a/src/modules/chanmodes/censor.c b/src/modules/chanmodes/censor.c
new file mode 100644
index 0000000..52cabb6
--- /dev/null
+++ b/src/modules/chanmodes/censor.c
@@ -0,0 +1,335 @@
+/*
+ * Channel Mode +G
+ * (C) Copyright 2005-current Bram Matthys and The UnrealIRCd team.
+ */
+
+#include "unrealircd.h"
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/censor",
+	"4.2",
+	"Channel Mode +G",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+
+Cmode_t EXTMODE_CENSOR = 0L;
+
+#define IsCensored(x) ((x)->mode.extmode & EXTMODE_CENSOR)
+
+int censor_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+char *censor_pre_local_part(Client *client, Channel *channel, char *text);
+char *censor_pre_local_quit(Client *client, char *text);
+
+int censor_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int censor_config_run(ConfigFile *, ConfigEntry *, int);
+
+ModuleInfo *ModInfo = NULL;
+
+ConfigItem_badword *conf_badword_channel = NULL;
+
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, censor_config_test);
+	return MOD_SUCCESS;
+}
+	
+MOD_INIT()
+{
+	CmodeInfo req;
+
+	ModInfo = modinfo;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.is_ok = extcmode_default_requirechop;
+	req.flag = 'G';
+	CmodeAdd(modinfo->handle, req, &EXTMODE_CENSOR);
+
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, censor_can_send_to_channel);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_PART, 0, censor_pre_local_part);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_QUIT, 0, censor_pre_local_quit);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, censor_config_run);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+MOD_UNLOAD()
+{
+	ConfigItem_badword *badword, *next;
+
+	for (badword = conf_badword_channel; badword; badword = next)
+	{
+		next = badword->next;
+		DelListItem(badword, conf_badword_channel);
+		badword_config_free(badword);
+	}
+	return MOD_SUCCESS;
+}
+
+int censor_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+	char has_word = 0, has_replace = 0, has_action = 0, action = 'r';
+
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "badword"))
+		return 0; /* not interested */
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: badword without type",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	else if (strcmp(ce->ce_vardata, "channel") && 
+	         strcmp(ce->ce_vardata, "quit") && strcmp(ce->ce_vardata, "all")) {
+/*			config_error("%s:%i: badword with unknown type",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum); -- can't do that.. */
+		return 0; /* unhandled */
+	}
+	
+	if (!strcmp(ce->ce_vardata, "quit"))
+	{
+		config_error("%s:%i: badword quit has been removed. We just use the bad words from "
+		             "badword channel { } instead.",
+		             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 0; /* pretend unhandled.. ok not just pretend.. ;) */
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "badword"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "word"))
+		{
+			char *errbuf;
+			if (has_word)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "badword::word");
+				continue;
+			}
+			has_word = 1;
+			if ((errbuf = badword_config_check_regex(cep->ce_vardata,1,1)))
+			{
+				config_error("%s:%i: badword::%s contains an invalid regex: %s",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum,
+					cep->ce_varname, errbuf);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "replace"))
+		{
+			if (has_replace)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "badword::replace");
+				continue;
+			}
+			has_replace = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (has_action)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "badword::action");
+				continue;
+			}
+			has_action = 1;
+			if (!strcmp(cep->ce_vardata, "replace"))
+				action = 'r';
+			else if (!strcmp(cep->ce_vardata, "block"))
+				action = 'b';
+			else
+			{
+				config_error("%s:%d: Unknown badword::action '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata);
+				errors++;
+			}
+				
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"badword", cep->ce_varname);
+			errors++;
+		}
+	}
+
+	if (!has_word)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"badword::word");
+		errors++;
+	}
+	if (has_action)
+	{
+		if (has_replace && action == 'b')
+		{
+			config_error("%s:%i: badword::action is block but badword::replace exists",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+			errors++;
+		}
+	}
+	
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+
+int censor_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *word = NULL;
+	ConfigItem_badword *ca;
+
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "badword"))
+		return 0; /* not interested */
+
+	if (strcmp(ce->ce_vardata, "channel") && strcmp(ce->ce_vardata, "all"))
+	        return 0; /* not for us */
+
+	ca = safe_alloc(sizeof(ConfigItem_badword));
+	ca->action = BADWORD_REPLACE;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (!strcmp(cep->ce_vardata, "block"))
+			{
+				ca->action = BADWORD_BLOCK;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "replace"))
+		{
+			safe_strdup(ca->replace, cep->ce_vardata);
+		} else
+		if (!strcmp(cep->ce_varname, "word"))
+		{
+			word = cep;
+		}
+	}
+
+	badword_config_process(ca, word->ce_vardata);
+
+	if (!strcmp(ce->ce_vardata, "channel"))
+		AddListItem(ca, conf_badword_channel);
+	else if (!strcmp(ce->ce_vardata, "all"))
+	{
+		AddListItem(ca, conf_badword_channel);
+		return 0; /* pretend we didn't see it, so other modules can handle 'all' as well */
+	}
+
+	return 1;
+}
+
+char *stripbadwords_channel(char *str, int *blocked)
+{
+	return stripbadwords(str, conf_badword_channel, blocked);
+}
+
+int censor_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	int blocked;
+	Hook *h;
+	int i;
+
+	if (!IsCensored(channel))
+		return HOOK_CONTINUE;
+
+	for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+	{
+		i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_CENSOR);
+		if (i == HOOK_ALLOW)
+			return HOOK_CONTINUE; /* bypass censor restriction */
+		if (i != HOOK_CONTINUE)
+			break;
+	}
+
+	*msg = stripbadwords_channel(*msg, &blocked);
+	if (blocked)
+	{
+		*errmsg = "Swearing is not permitted in this channel";
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
+
+char *censor_pre_local_part(Client *client, Channel *channel, char *text)
+{
+	int blocked;
+
+	if (!text)
+		return NULL;
+
+	if (!IsCensored(channel))
+		return text;
+
+	text = stripbadwords_channel(text, &blocked);
+	return blocked ? NULL : text;
+}
+
+/** Is any channel where the user is in +G? */
+static int IsAnyChannelCensored(Client *client)
+{
+	Membership *lp;
+
+	for (lp = client->user->channel; lp; lp = lp->next)
+		if (IsCensored(lp->channel))
+			return 1;
+	return 0;
+}
+
+char *censor_pre_local_quit(Client *client, char *text)
+{
+	int blocked = 0;
+
+	if (!text)
+		return NULL;
+
+	if (IsAnyChannelCensored(client))
+		text = stripbadwords_channel(text, &blocked);
+
+	return blocked ? NULL : text;
+}
+
+// TODO: when stats is modular, make it call this for badwords
+int stats_badwords(Client *client, char *para)
+{
+	ConfigItem_badword *words;
+
+	for (words = conf_badword_channel; words; words = words->next)
+	{
+		sendtxtnumeric(client, "c %c %s%s%s %s", words->type & BADW_TYPE_REGEX ? 'R' : 'F',
+		           (words->type & BADW_TYPE_FAST_L) ? "*" : "", words->word,
+		           (words->type & BADW_TYPE_FAST_R) ? "*" : "",
+		           words->action == BADWORD_REPLACE ? (words->replace ? words->replace : "<censored>") : "");
+	}
+	return 0;
+}
diff --git a/src/modules/chanmodes/delayjoin.c b/src/modules/chanmodes/delayjoin.c
new file mode 100644
index 0000000..c16fad4
--- /dev/null
+++ b/src/modules/chanmodes/delayjoin.c
@@ -0,0 +1,386 @@
+/*
+ * Channel mode +D/+d: delayed join
+ * except from opers, U-lines and servers.
+ * Copyright 2014 Travis Mcarthur <Heero> and UnrealIRCd Team
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/delayjoin",   /* Name of module */
+	"5.0", /* Version */
+	"delayed join (+D,+d)", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+#define MOD_DATA_STR "delayjoin"
+#define MOD_DATA_INVISIBLE "1"
+
+static long UMODE_PRIVDEAF = 0;
+static Cmode *CmodeDelayed = NULL;
+static Cmode *CmodePostDelayed = NULL;
+static Cmode_t EXTMODE_DELAYED;
+static Cmode_t EXTMODE_POST_DELAYED;
+
+int visible_in_channel(Client *client, Channel *channel);
+int moded_check_part(Client *client, Channel *channel);
+int moded_join(Client *client, Channel *channel);
+int moded_part(Client *client, Channel *channel, MessageTag *mtags, char *comment);
+int deny_all(Client *client, Channel *channel, char mode, char *para, int checkt, int what);
+int moded_chanmode(Client *client, Channel *channel,
+                   MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode);
+int moded_prechanmsg(Client *client, Channel *channel, MessageTag *mtags, char *text, int notice);
+char *moded_serialize(ModData *m);
+void moded_unserialize(char *str, ModData *m);
+
+MOD_INIT()
+{
+	CmodeInfo req;
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM_RELOADABLE, 1);
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.is_ok = extcmode_default_requirechop;
+	req.flag = 'D';
+	CmodeDelayed = CmodeAdd(modinfo->handle, req, &EXTMODE_DELAYED);
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.is_ok = deny_all;
+	req.flag = 'd';
+	CmodePostDelayed = CmodeAdd(modinfo->handle, req, &EXTMODE_POST_DELAYED);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = MOD_DATA_STR;
+	mreq.serialize = moded_serialize;
+	mreq.unserialize = moded_unserialize;
+	mreq.sync = 0;
+	mreq.type = MODDATATYPE_MEMBER;
+	if (!ModDataAdd(modinfo->handle, mreq))
+		abort();
+
+	if (!CmodeDelayed || !CmodePostDelayed)
+	{
+		/* I use config_error() here because it's printed to stderr in case of a load
+		 * on cmd line, and to all opers in case of a /rehash.
+		 */
+		config_error("delayjoin: Could not add channel mode '+D' or '+d': %s", ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+
+	HookAdd(modinfo->handle, HOOKTYPE_VISIBLE_IN_CHANNEL, 0, visible_in_channel);
+	HookAdd(modinfo->handle, HOOKTYPE_JOIN_DATA, 0, moded_join);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_PART, 0, moded_part);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_PART, 0, moded_part);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CHANMODE, 0, moded_chanmode);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_REMOTE_CHANMODE, 0, moded_chanmode);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_CHANMSG, 0, moded_prechanmsg);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void set_post_delayed(Channel *channel)
+{
+	MessageTag *mtags = NULL;
+
+	channel->mode.extmode |= EXTMODE_POST_DELAYED;
+
+	new_message(&me, NULL, &mtags);
+	sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s +d", me.name, channel->chname);
+	free_message_tags(mtags);
+}
+
+void clear_post_delayed(Channel *channel)
+{
+	MessageTag *mtags = NULL;
+
+	channel->mode.extmode &= ~EXTMODE_POST_DELAYED;
+
+	new_message(&me, NULL, &mtags);
+	sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s -d", me.name, channel->chname);
+	free_message_tags(mtags);
+}
+
+bool moded_member_invisible(Member* m, Channel *channel)
+{
+	ModDataInfo *md;
+
+	if (!m)
+		return false;
+
+	md = findmoddata_byname(MOD_DATA_STR, MODDATATYPE_MEMBER);
+	if (!md)
+		return false;
+
+	if (!moddata_member(m, md).str)
+		return false;
+
+	return true;
+
+}
+
+bool moded_user_invisible(Client *client, Channel *channel)
+{
+	return moded_member_invisible(find_member_link(channel->members, client), channel);
+}
+
+bool channel_has_invisible_users(Channel *channel)
+{
+	Member* i;
+	for (i = channel->members; i; i = i->next)
+	{
+		if (moded_member_invisible(i, channel))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+bool channel_is_post_delayed(Channel *channel)
+{
+	if (channel->mode.extmode & EXTMODE_POST_DELAYED)
+		return true;
+	return false;
+}
+
+bool channel_is_delayed(Channel *channel)
+{
+	if (channel->mode.extmode & EXTMODE_DELAYED)
+		return true;
+	return false;
+}
+
+void clear_user_invisible(Channel *channel, Client *client)
+{
+	Member *i;
+	ModDataInfo *md;
+	bool should_clear = true, found_member = false;
+
+	md = findmoddata_byname(MOD_DATA_STR, MODDATATYPE_MEMBER);
+	if (!md)
+		return;
+	for (i = channel->members; i; i = i->next)
+	{
+		if (i->client == client)
+		{
+
+			if (md)
+				memset(&moddata_member(i, md), 0, sizeof(ModData));
+
+			found_member = true;
+
+			if (!should_clear)
+				break;
+		}
+
+		else if (moddata_member(i, md).str)
+		{
+			should_clear = false;
+			if (found_member)
+				break;
+		}
+	}
+
+	if (should_clear && (channel->mode.extmode & EXTMODE_POST_DELAYED))
+	{
+		clear_post_delayed(channel);
+	}
+}
+
+void clear_user_invisible_announce(Channel *channel, Client *client, MessageTag *recv_mtags)
+{
+	Member *i;
+	MessageTag *mtags = NULL;
+	char joinbuf[512];
+	char exjoinbuf[512];
+	long CAP_EXTENDED_JOIN = ClientCapabilityBit("extended-join");
+
+	clear_user_invisible(channel, client);
+
+	ircsnprintf(joinbuf, sizeof(joinbuf), ":%s!%s@%s JOIN %s",
+				client->name, client->user->username, GetHost(client), channel->chname);
+
+	ircsnprintf(exjoinbuf, sizeof(exjoinbuf), ":%s!%s@%s JOIN %s %s :%s",
+		client->name, client->user->username, GetHost(client), channel->chname,
+		!isdigit(*client->user->svid) ? client->user->svid : "*",
+		client->info);
+
+	new_message_special(client, recv_mtags, &mtags, ":%s JOIN %s", client->name, channel->chname);
+	for (i = channel->members; i; i = i->next)
+	{
+		Client *acptr = i->client;
+		if (!is_skochanop(acptr, channel) && acptr != client && MyConnect(acptr))
+		{
+			if (HasCapabilityFast(acptr, CAP_EXTENDED_JOIN))
+				sendto_one(acptr, mtags, "%s", exjoinbuf);
+			else
+				sendto_one(acptr, mtags, "%s", joinbuf);
+		}
+	}
+	free_message_tags(mtags);
+}
+
+void set_user_invisible(Channel *channel, Client *client)
+{
+	Member *m = find_member_link(channel->members, client);
+	ModDataInfo *md;
+
+	if (!m)
+		return;
+
+	md = findmoddata_byname(MOD_DATA_STR, MODDATATYPE_MEMBER);
+
+	if (!md || !md->unserialize)
+		return;
+
+	md->unserialize(MOD_DATA_INVISIBLE, &moddata_member(m, md));
+}
+
+
+int deny_all(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	return EX_ALWAYS_DENY;
+}
+
+
+int visible_in_channel(Client *client, Channel *channel)
+{
+	return channel_is_delayed(channel) && moded_user_invisible(client, channel);
+}
+
+
+int moded_join(Client *client, Channel *channel)
+{
+	if (channel_is_delayed(channel))
+		set_user_invisible(channel, client);
+
+	return 0;
+}
+
+int moded_part(Client *client, Channel *channel, MessageTag *mtags, char *comment)
+{
+	if (channel_is_delayed(channel) || channel_is_post_delayed(channel))
+		clear_user_invisible(channel, client);
+
+	return 0;
+}
+
+int moded_chanmode(Client *client, Channel *channel, MessageTag *recv_mtags, char *modebuf, char *parabuf, time_t sendts, int samode)
+{
+	long CAP_EXTENDED_JOIN = ClientCapabilityBit("extended-join");
+
+	// Handle case where we just unset +D but have invisible users
+	if (!channel_is_delayed(channel) && !channel_is_post_delayed(channel) && channel_has_invisible_users(channel))
+		set_post_delayed(channel);
+	else if (channel_is_delayed(channel) && channel_is_post_delayed(channel))
+		clear_post_delayed(channel);
+
+	if ((channel_is_delayed(channel) || channel_is_post_delayed(channel)))
+	{
+		ParseMode pm;
+		int ret;
+		for (ret = parse_chanmode(&pm, modebuf, parabuf); ret; ret = parse_chanmode(&pm, NULL, NULL))
+		{
+			if (pm.what == MODE_ADD && (pm.modechar == 'o' || pm.modechar == 'h' || pm.modechar == 'a' || pm.modechar == 'q' || pm.modechar == 'v'))
+			{
+				Member* i;
+				Client *user = find_client(pm.param,NULL);
+				if (!user)
+					continue;
+
+				if (moded_user_invisible(user, channel))
+					clear_user_invisible_announce(channel, user, recv_mtags);
+
+				if (pm.modechar == 'v' || !MyConnect(user))
+					continue;
+
+				/* Our user 'user' just got ops (oaq) - send the joins for all the users (s)he doesn't know about */
+				for (i = channel->members; i; i = i->next)
+				{
+					if (i->client == user)
+						continue;
+					if (moded_user_invisible(i->client, channel))
+					{
+						MessageTag *mtags = NULL;
+						new_message_special(i->client, recv_mtags, &mtags, ":%s JOIN %s", i->client->name, channel->chname);
+						if (HasCapabilityFast(user, CAP_EXTENDED_JOIN))
+						{
+							sendto_one(user, mtags, ":%s!%s@%s JOIN %s %s :%s",
+							           i->client->name, i->client->user->username, GetHost(i->client),
+							           channel->chname,
+							           !isdigit(*i->client->user->svid) ? i->client->user->svid : "*",
+							           i->client->info);
+						} else {
+							sendto_one(user, mtags, ":%s!%s@%s JOIN :%s", i->client->name, i->client->user->username, GetHost(i->client), channel->chname);
+						}
+						free_message_tags(mtags);
+					}
+				}
+
+			}
+			if (pm.what == MODE_DEL && (pm.modechar == 'o' || pm.modechar == 'h' || pm.modechar == 'a' || pm.modechar == 'q' || pm.modechar == 'v'))
+			{
+				Member* i;
+				Client *user = find_client(pm.param,NULL);
+				if (!user)
+					continue;
+
+				if (moded_user_invisible(user, channel))
+					clear_user_invisible_announce(channel, user, recv_mtags);
+
+				if (pm.modechar == 'v' || !MyConnect(user))
+					continue;
+
+				/* Our user 'user' just lost ops (oaq) - send the parts for all users (s)he won't see anymore */
+				for (i = channel->members; i; i = i->next)
+				{
+					if (i->client == user)
+						continue;
+					if (moded_user_invisible(i->client, channel))
+					{
+						MessageTag *mtags = NULL;
+						new_message_special(i->client, recv_mtags, &mtags, ":%s PART %s", i->client->name, channel->chname);
+						sendto_one(user, mtags, ":%s!%s@%s PART :%s", i->client->name, i->client->user->username, GetHost(i->client), channel->chname);
+						free_message_tags(mtags);
+					}
+				}
+
+			}
+		}
+	}
+
+	return 0;
+}
+
+int moded_prechanmsg(Client *client, Channel *channel, MessageTag *mtags, char *text, int notice)
+{
+	if ((channel_is_delayed(channel) || channel_is_post_delayed(channel)) && (moded_user_invisible(client, channel)))
+		clear_user_invisible_announce(channel, client, mtags);
+
+	return 0;
+}
+
+char *moded_serialize(ModData *m)
+{
+	return m->i ? "1" : "0";
+}
+
+void moded_unserialize(char *str, ModData *m)
+{
+	m->i = atoi(str);
+}
diff --git a/src/modules/chanmodes/floodprot.c b/src/modules/chanmodes/floodprot.c
new file mode 100644
index 0000000..d3bbc97
--- /dev/null
+++ b/src/modules/chanmodes/floodprot.c
@@ -0,0 +1,1490 @@
+/*
+ * Channel Mode +f
+ * (C) Copyright 2019 Syzop and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/floodprot",
+	"5.0",
+	"Channel Mode +f",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+#define FLD_CTCP	0 /* c */
+#define FLD_JOIN	1 /* j */
+#define FLD_KNOCK	2 /* k */
+#define FLD_MSG		3 /* m */
+#define FLD_NICK	4 /* n */
+#define FLD_TEXT	5 /* t */
+#define FLD_REPEAT	6 /* r */
+
+#define NUMFLD	7 /* 7 flood types */
+
+/** Configuration settings */
+struct {
+	unsigned char modef_default_unsettime;
+	unsigned char modef_max_unsettime;
+	long modef_boot_delay;
+} cfg;
+
+#define MODEF_DEFAULT_UNSETTIME		cfg.modef_default_unsettime
+#define MODEF_MAX_UNSETTIME		cfg.modef_max_unsettime
+#define MODEF_BOOT_DELAY		cfg.modef_boot_delay
+
+typedef struct ChannelFloodProtection ChannelFloodProtection;
+typedef struct RemoveChannelModeTimer RemoveChannelModeTimer;
+
+struct RemoveChannelModeTimer {
+	struct RemoveChannelModeTimer *prev, *next;
+	Channel *channel;
+	char m; /* mode to be removed */
+	time_t when; /* scheduled at */
+};
+
+typedef struct MemberFlood MemberFlood;
+struct MemberFlood {
+	unsigned short nmsg;
+	unsigned short nmsg_repeat;
+	time_t firstmsg;
+	uint64_t lastmsg;
+	uint64_t prevmsg;
+};
+
+/* Maximum timers, iotw: max number of possible actions.
+ * Currently this is: CNmMKiRd (8)
+ */
+#define MAXCHMODEFACTIONS 8
+
+/** Per-channel flood protection settings and counters */
+struct ChannelFloodProtection {
+	unsigned short	per; /**< setting: per <XX> seconds */
+	time_t		timer[NUMFLD]; /**< runtime: timers */
+	unsigned short	counter[NUMFLD]; /**< runtime: counters */
+	unsigned short	limit[NUMFLD]; /**< setting: limit */
+	unsigned char	action[NUMFLD]; /**< setting: action */
+	unsigned char	remove_after[NUMFLD]; /**< setting: remove-after <this> minutes */
+	unsigned char   timers_running[MAXCHMODEFACTIONS+1]; /**< if for example a '-m' timer is running then this contains 'm' */
+};
+
+/* Global variables */
+ModDataInfo *mdflood = NULL;
+Cmode_t EXTMODE_FLOODLIMIT = 0L;
+static int timedban_available = 0; /**< Set to 1 if extbans/timedban module is loaded. */
+RemoveChannelModeTimer *removechannelmodetimer_list = NULL;
+char *floodprot_msghash_key = NULL;
+
+#define IsFloodLimit(x)	((x)->mode.extmode & EXTMODE_FLOODLIMIT)
+
+/* Forward declarations */
+static void init_config(void);
+int floodprot_rehash_complete(void);
+int floodprot_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int floodprot_config_run(ConfigFile *, ConfigEntry *, int);
+void floodprottimer_del(Channel *channel, char mflag);
+void floodprottimer_stopchantimers(Channel *channel);
+static inline char *chmodefstrhelper(char *buf, char t, char tdef, unsigned short l, unsigned char a, unsigned char r);
+static int compare_floodprot_modes(ChannelFloodProtection *a, ChannelFloodProtection *b);
+static int do_floodprot(Channel *channel, int what);
+char *channel_modef_string(ChannelFloodProtection *x, char *str);
+void do_floodprot_action(Channel *channel, int what, char *text);
+void floodprottimer_add(Channel *channel, char mflag, time_t when);
+uint64_t gen_floodprot_msghash(char *text);
+int cmodef_is_ok(Client *client, Channel *channel, char mode, char *para, int type, int what);
+void *cmodef_put_param(void *r_in, char *param);
+char *cmodef_get_param(void *r_in);
+char *cmodef_conv_param(char *param_in, Client *client);
+void cmodef_free_param(void *r);
+void *cmodef_dup_struct(void *r_in);
+int cmodef_sjoin_check(Channel *channel, void *ourx, void *theirx);
+int floodprot_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[]);
+EVENT(modef_event);
+int cmodef_channel_destroy(Channel *channel, int *should_destroy);
+int floodprot_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+int floodprot_post_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice);
+int floodprot_knock(Client *client, Channel *channel, MessageTag *mtags, char *comment);
+int floodprot_nickchange(Client *client, char *oldnick);
+int floodprot_chanmode_del(Channel *channel, int m);
+void memberflood_free(ModData *md);
+int floodprot_stats(Client *client, char *flag);
+void floodprot_free_removechannelmodetimer_list(ModData *m);
+void floodprot_free_msghash_key(ModData *m);
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, floodprot_config_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo creq;
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&creq, 0, sizeof(creq));
+	creq.paracount = 1;
+	creq.is_ok = cmodef_is_ok;
+	creq.flag = 'f';
+	creq.unset_with_param = 1; /* ah yeah, +f is special! */
+	creq.put_param = cmodef_put_param;
+	creq.get_param = cmodef_get_param;
+	creq.conv_param = cmodef_conv_param;
+	creq.free_param = cmodef_free_param;
+	creq.dup_struct = cmodef_dup_struct;
+	creq.sjoin_check = cmodef_sjoin_check;
+	CmodeAdd(modinfo->handle, creq, &EXTMODE_FLOODLIMIT);
+
+	init_config();
+
+	LoadPersistentPointer(modinfo, removechannelmodetimer_list, floodprot_free_removechannelmodetimer_list);
+	LoadPersistentPointer(modinfo, floodprot_msghash_key, floodprot_free_msghash_key);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "floodprot";
+	mreq.type = MODDATATYPE_MEMBERSHIP;
+	mreq.free = memberflood_free;
+	mdflood = ModDataAdd(modinfo->handle, mreq);
+	if (!mdflood)
+	        abort();
+	if (!floodprot_msghash_key)
+	{
+		floodprot_msghash_key = safe_alloc(16);
+		siphash_generate_key(floodprot_msghash_key);
+	}
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, floodprot_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, floodprot_can_send_to_channel);
+	HookAdd(modinfo->handle, HOOKTYPE_CHANMSG, 0, floodprot_post_chanmsg);
+	HookAdd(modinfo->handle, HOOKTYPE_KNOCK, 0, floodprot_knock);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_NICKCHANGE, 0, floodprot_nickchange);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_NICKCHANGE, 0, floodprot_nickchange);
+	HookAdd(modinfo->handle, HOOKTYPE_MODECHAR_DEL, 0, floodprot_chanmode_del);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_JOIN, 0, floodprot_join);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_JOIN, 0, floodprot_join);
+	HookAdd(modinfo->handle, HOOKTYPE_CHANNEL_DESTROY, 0, cmodef_channel_destroy);
+	HookAdd(modinfo->handle, HOOKTYPE_REHASH_COMPLETE, 0, floodprot_rehash_complete);
+	HookAdd(modinfo->handle, HOOKTYPE_STATS, 0, floodprot_stats);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(modinfo->handle, "modef_event", modef_event, NULL, 10000, 0);
+	floodprot_rehash_complete();
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	SavePersistentPointer(modinfo, removechannelmodetimer_list);
+	SavePersistentPointer(modinfo, floodprot_msghash_key);
+	return MOD_SUCCESS;
+}
+
+int floodprot_rehash_complete(void)
+{
+	timedban_available = is_module_loaded("extbans/timedban");
+	return 0;
+}
+
+static void init_config(void)
+{
+	/* This sets some default values */
+	memset(&cfg, 0, sizeof(cfg));
+	cfg.modef_default_unsettime = 0;
+	cfg.modef_max_unsettime = 60; /* 1 hour seems enough :p */
+	cfg.modef_boot_delay = 75;
+}
+
+int floodprot_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!strcmp(ce->ce_varname, "modef-default-unsettime"))
+	{
+		if (!ce->ce_vardata)
+		{
+			config_error_empty(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"set", ce->ce_varname);
+			errors++;
+		} else {
+			int v = atoi(ce->ce_vardata);
+			if ((v <= 0) || (v > 255))
+			{
+				config_error("%s:%i: set::modef-default-unsettime: value '%d' out of range (should be 1-255)",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum, v);
+				errors++;
+			}
+		}
+	} else
+	if (!strcmp(ce->ce_varname, "modef-max-unsettime"))
+	{
+		if (!ce->ce_vardata)
+		{
+			config_error_empty(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"set", ce->ce_varname);
+			errors++;
+		} else {
+			int v = atoi(ce->ce_vardata);
+			if ((v <= 0) || (v > 255))
+			{
+				config_error("%s:%i: set::modef-max-unsettime: value '%d' out of range (should be 1-255)",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum, v);
+				errors++;
+			}
+		}
+	} else
+	if (!strcmp(ce->ce_varname, "modef-boot-delay"))
+	{
+		if (!ce->ce_vardata)
+		{
+			config_error_empty(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				"set", ce->ce_varname);
+			errors++;
+		} else {
+			long v = config_checkval(ce->ce_vardata, CFG_TIME);
+			if ((v < 0) || (v > 600))
+			{
+				config_error("%s:%i: set::modef-boot-delay: value '%ld' out of range (should be 0-600)",
+					ce->ce_fileptr->cf_filename, ce->ce_varlinenum, v);
+				errors++;
+			}
+		}
+	} else
+	{
+		/* Not handled by us */
+		return 0;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int floodprot_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!strcmp(ce->ce_varname, "modef-default-unsettime"))
+		cfg.modef_default_unsettime = (unsigned char)atoi(ce->ce_vardata);
+	else if (!strcmp(ce->ce_varname, "modef-max-unsettime"))
+		cfg.modef_max_unsettime = (unsigned char)atoi(ce->ce_vardata);
+	else if (!strcmp(ce->ce_varname, "modef-boot-delay"))
+		cfg.modef_boot_delay = config_checkval(ce->ce_vardata, CFG_TIME);
+	else
+		return 0; /* not handled by us */
+
+	return 1;
+}
+
+int cmodef_is_ok(Client *client, Channel *channel, char mode, char *param, int type, int what)
+{
+	if ((type == EXCHK_ACCESS) || (type == EXCHK_ACCESS_ERR))
+	{
+		if (IsUser(client) && is_chan_op(client, channel))
+			return EX_ALLOW;
+		if (type == EXCHK_ACCESS_ERR) /* can only be due to being halfop */
+			sendnumeric(client, ERR_NOTFORHALFOPS, 'f');
+		return EX_DENY;
+	} else
+	if (type == EXCHK_PARAM)
+	{
+		ChannelFloodProtection newf;
+		char xbuf[256], c, a, *p, *p2, *x = xbuf+1;
+		int v;
+		unsigned short warnings = 0, breakit;
+		unsigned char r;
+
+		memset(&newf, 0, sizeof(newf));
+
+		/* old +f was like +f 10:5 or +f *10:5 - no longer supported */
+		if ((param[0] != '[') || strlen(param) < 3)
+			goto invalidsyntax;;
+
+		/* '['<number><1 letter>[optional: '#'+1 letter],[next..]']'':'<number> */
+		strlcpy(xbuf, param, sizeof(xbuf));
+		p2 = strchr(xbuf+1, ']');
+		if (!p2)
+			goto invalidsyntax;
+		*p2 = '\0';
+		if (*(p2+1) != ':')
+			goto invalidsyntax;
+
+		breakit = 0;
+		for (x = strtok(xbuf+1, ","); x; x = strtok(NULL, ","))
+		{
+			/* <number><1 letter>[optional: '#'+1 letter] */
+			p = x;
+			while(isdigit(*p)) { p++; }
+			if ((*p == '\0') ||
+			    !((*p == 'c') || (*p == 'j') || (*p == 'k') ||
+			      (*p == 'm') || (*p == 'n') || (*p == 't') ||
+			      (*p == 'r')))
+			{
+				if (MyUser(client) && *p && (warnings++ < 3))
+					sendnotice(client, "warning: channelmode +f: floodtype '%c' unknown, ignored.", *p);
+				continue; /* continue instead of break for forward compatability. */
+			}
+			c = *p;
+			*p = '\0';
+			v = atoi(x);
+			if ((v < 1) || (v > 999)) /* out of range... */
+			{
+				if (MyUser(client))
+				{
+					sendnumeric(client, ERR_CANNOTCHANGECHANMODE,
+						   'f', "value should be from 1-999");
+					goto invalidsyntax;
+				} else
+					continue; /* just ignore for remote servers */
+			}
+			p++;
+			a = '\0';
+			r = MyUser(client) ? MODEF_DEFAULT_UNSETTIME : 0;
+			if (*p != '\0')
+			{
+				if (*p == '#')
+				{
+					p++;
+					a = *p;
+					p++;
+					if (*p != '\0')
+					{
+						int tv;
+						tv = atoi(p);
+						if (tv <= 0)
+							tv = 0; /* (ignored) */
+						if (tv > (MyUser(client) ? MODEF_MAX_UNSETTIME : 255))
+							tv = (MyUser(client) ? MODEF_MAX_UNSETTIME : 255); /* set to max */
+						r = (unsigned char)tv;
+					}
+				}
+			}
+
+			switch(c)
+			{
+				case 'c':
+					newf.limit[FLD_CTCP] = v;
+					if ((a == 'm') || (a == 'M'))
+						newf.action[FLD_CTCP] = a;
+					else
+						newf.action[FLD_CTCP] = 'C';
+					newf.remove_after[FLD_CTCP] = r;
+					break;
+				case 'j':
+					newf.limit[FLD_JOIN] = v;
+					if (a == 'R')
+						newf.action[FLD_JOIN] = a;
+					else
+						newf.action[FLD_JOIN] = 'i';
+					newf.remove_after[FLD_JOIN] = r;
+					break;
+				case 'k':
+					newf.limit[FLD_KNOCK] = v;
+					newf.action[FLD_KNOCK] = 'K';
+					newf.remove_after[FLD_KNOCK] = r;
+					break;
+				case 'm':
+					newf.limit[FLD_MSG] = v;
+					if (a == 'M')
+						newf.action[FLD_MSG] = a;
+					else
+						newf.action[FLD_MSG] = 'm';
+					newf.remove_after[FLD_MSG] = r;
+					break;
+				case 'n':
+					newf.limit[FLD_NICK] = v;
+					newf.action[FLD_NICK] = 'N';
+					newf.remove_after[FLD_NICK] = r;
+					break;
+				case 't':
+					newf.limit[FLD_TEXT] = v;
+					if (a == 'b' || a == 'd')
+						newf.action[FLD_TEXT] = a;
+					if (timedban_available)
+						newf.remove_after[FLD_TEXT] = r;
+					break;
+				case 'r':
+					newf.limit[FLD_REPEAT] = v;
+					if (a == 'b' || a == 'd')
+						newf.action[FLD_REPEAT] = a;
+					if (timedban_available)
+						newf.remove_after[FLD_REPEAT] = r;
+					break;
+				default:
+					goto invalidsyntax;
+			}
+		} /* for */
+		/* parse 'per' */
+		p2++;
+		if (*p2 != ':')
+			goto invalidsyntax;
+		p2++;
+		if (!*p2)
+			goto invalidsyntax;
+		v = atoi(p2);
+		if ((v < 1) || (v > 999)) /* 'per' out of range */
+		{
+			if (MyUser(client))
+				sendnumeric(client, ERR_CANNOTCHANGECHANMODE, 'f',
+					   "time range should be 1-999");
+			goto invalidsyntax;
+		}
+		newf.per = v;
+
+		/* Is anything turned on? (to stop things like '+f []:15' */
+		breakit = 1;
+		for (v=0; v < NUMFLD; v++)
+			if (newf.limit[v])
+				breakit=0;
+		if (breakit)
+			goto invalidsyntax;
+
+		return EX_ALLOW;
+invalidsyntax:
+		sendnumeric(client, ERR_CANNOTCHANGECHANMODE, 'f', "Invalid syntax for MODE +f");
+		return EX_DENY;
+	}
+
+	/* fallthrough -- should not be used */
+	return EX_DENY;
+}
+
+void *cmodef_put_param(void *fld_in, char *param)
+{
+	ChannelFloodProtection *fld = (ChannelFloodProtection *)fld_in;
+	char xbuf[256], c, a, *p, *p2, *x = xbuf+1;
+	int v;
+	unsigned short breakit;
+	unsigned char r;
+
+	strlcpy(xbuf, param, sizeof(xbuf));
+
+	if (!fld)
+	{
+		/* Need to create one */
+		fld = safe_alloc(sizeof(ChannelFloodProtection));
+	}
+
+	/* always reset settings (l, a, r) */
+	for (v=0; v < NUMFLD; v++)
+	{
+		fld->limit[v] = 0;
+		fld->action[v] = 0;
+		fld->remove_after[v] = 0;
+	}
+
+	/* '['<number><1 letter>[optional: '#'+1 letter],[next..]']'':'<number> */
+	p2 = strchr(xbuf+1, ']');
+	if (!p2)
+	{
+		memset(fld, 0, sizeof(ChannelFloodProtection));
+		return fld; /* FAIL */
+	}
+	*p2 = '\0';
+	if (*(p2+1) != ':')
+	{
+		memset(fld, 0, sizeof(ChannelFloodProtection));
+		return fld; /* FAIL */
+	}
+	breakit = 0;
+	for (x = strtok(xbuf+1, ","); x; x = strtok(NULL, ","))
+	{
+		/* <number><1 letter>[optional: '#'+1 letter] */
+		p = x;
+		while(isdigit(*p)) { p++; }
+		if ((*p == '\0') ||
+		    !((*p == 'c') || (*p == 'j') || (*p == 'k') ||
+		      (*p == 'm') || (*p == 'n') || (*p == 't') ||
+		      (*p == 'r')))
+		{
+			/* (unknown type) */
+			continue; /* continue instead of break for forward compatability. */
+		}
+		c = *p;
+		*p = '\0';
+		v = atoi(x);
+		if (v < 1)
+			v = 1;
+		p++;
+		a = '\0';
+		r = 0;
+		if (*p != '\0')
+		{
+			if (*p == '#')
+			{
+				p++;
+				a = *p;
+				p++;
+				if (*p != '\0')
+				{
+					int tv;
+					tv = atoi(p);
+					if (tv <= 0)
+						tv = 0; /* (ignored) */
+					r = (unsigned char)tv;
+				}
+			}
+		}
+
+		switch(c)
+		{
+			case 'c':
+				fld->limit[FLD_CTCP] = v;
+				if ((a == 'm') || (a == 'M'))
+					fld->action[FLD_CTCP] = a;
+				else
+					fld->action[FLD_CTCP] = 'C';
+				fld->remove_after[FLD_CTCP] = r;
+				break;
+			case 'j':
+				fld->limit[FLD_JOIN] = v;
+				if (a == 'R')
+					fld->action[FLD_JOIN] = a;
+				else
+					fld->action[FLD_JOIN] = 'i';
+				fld->remove_after[FLD_JOIN] = r;
+				break;
+			case 'k':
+				fld->limit[FLD_KNOCK] = v;
+				fld->action[FLD_KNOCK] = 'K';
+				fld->remove_after[FLD_KNOCK] = r;
+				break;
+			case 'm':
+				fld->limit[FLD_MSG] = v;
+				if (a == 'M')
+					fld->action[FLD_MSG] = a;
+				else
+					fld->action[FLD_MSG] = 'm';
+				fld->remove_after[FLD_MSG] = r;
+				break;
+			case 'n':
+				fld->limit[FLD_NICK] = v;
+				fld->action[FLD_NICK] = 'N';
+				fld->remove_after[FLD_NICK] = r;
+				break;
+			case 't':
+				fld->limit[FLD_TEXT] = v;
+				if (a == 'b' || a == 'd')
+					fld->action[FLD_TEXT] = a;
+				if (timedban_available)
+					fld->remove_after[FLD_TEXT] = r;
+				break;
+			case 'r':
+				fld->limit[FLD_REPEAT] = v;
+				if (a == 'b' || a == 'd')
+					fld->action[FLD_REPEAT] = a;
+				if (timedban_available)
+					fld->remove_after[FLD_REPEAT] = r;
+				break;
+			default:
+				/* NOOP */
+				break;
+		}
+	} /* for */
+	/* parse 'per' */
+	p2++;
+	if (*p2 != ':')
+	{
+		memset(fld, 0, sizeof(ChannelFloodProtection));
+		return fld; /* FAIL */
+	}
+	p2++;
+	if (!*p2)
+	{
+		memset(fld, 0, sizeof(ChannelFloodProtection));
+		return fld; /* FAIL */
+	}
+	v = atoi(p2);
+	if (v < 1)
+		v = 1;
+	/* if new 'per xxx seconds' is smaller than current 'per' then reset timers/counters (t, c) */
+	if (v < fld->per)
+	{
+		for (v=0; v < NUMFLD; v++)
+		{
+			fld->timer[v] = 0;
+			fld->counter[v] = 0;
+		}
+	}
+	fld->per = v;
+
+	/* Is anything turned on? (to stop things like '+f []:15' */
+	breakit = 1;
+	for (v=0; v < NUMFLD; v++)
+		if (fld->limit[v])
+			breakit=0;
+	if (breakit)
+	{
+		memset(fld, 0, sizeof(ChannelFloodProtection));
+		return fld; /* FAIL */
+	}
+
+	return (void *)fld;
+}
+
+char *cmodef_get_param(void *r_in)
+{
+	ChannelFloodProtection *r = (ChannelFloodProtection *)r_in;
+	static char retbuf[512];
+
+	if (!r)
+		return NULL;
+
+	channel_modef_string(r, retbuf);
+	return retbuf;
+}
+
+/** Convert parameter to something proper.
+ * NOTE: client may be NULL if called for e.g. set::modes-on-join
+ */
+char *cmodef_conv_param(char *param_in, Client *client)
+{
+	static char retbuf[256];
+	char param[256];
+	ChannelFloodProtection newf;
+	int localclient = (!client || MyUser(client)) ? 1 : 0;
+	char xbuf[256], c, a, *p, *p2, *x = xbuf+1;
+	int v;
+	unsigned short breakit;
+	unsigned char r;
+
+	memset(&newf, 0, sizeof(newf));
+
+	strlcpy(param, param_in, sizeof(param));
+
+	/* old +f was like +f 10:5 or +f *10:5 - no longer supported */
+	if (param[0] != '[')
+		return NULL;
+
+	/* '['<number><1 letter>[optional: '#'+1 letter],[next..]']'':'<number> */
+	strlcpy(xbuf, param, sizeof(xbuf));
+	p2 = strchr(xbuf+1, ']');
+	if (!p2)
+		return NULL;
+	*p2 = '\0';
+	if (*(p2+1) != ':')
+		return NULL;
+	breakit = 0;
+	for (x = strtok(xbuf+1, ","); x; x = strtok(NULL, ","))
+	{
+		/* <number><1 letter>[optional: '#'+1 letter] */
+		p = x;
+		while(isdigit(*p)) { p++; }
+		if ((*p == '\0') ||
+		    !((*p == 'c') || (*p == 'j') || (*p == 'k') ||
+		      (*p == 'm') || (*p == 'n') || (*p == 't') ||
+		      (*p == 'r')))
+		{
+			/* (unknown type) */
+			continue; /* continue instead of break for forward compatability. */
+		}
+		c = *p;
+		*p = '\0';
+		v = atoi(x);
+		if ((v < 1) || (v > 999)) /* out of range... */
+		{
+			if (localclient || (v < 1))
+				return NULL;
+		}
+		p++;
+		a = '\0';
+		r = localclient ? MODEF_DEFAULT_UNSETTIME : 0;
+		if (*p != '\0')
+		{
+			if (*p == '#')
+			{
+				p++;
+				a = *p;
+				p++;
+				if (*p != '\0')
+				{
+					int tv;
+					tv = atoi(p);
+					if (tv <= 0)
+						tv = 0; /* (ignored) */
+					if (tv > (localclient ? MODEF_MAX_UNSETTIME : 255))
+						tv = (localclient ? MODEF_MAX_UNSETTIME : 255); /* set to max */
+					r = (unsigned char)tv;
+				}
+			}
+		}
+
+		switch(c)
+		{
+			case 'c':
+				newf.limit[FLD_CTCP] = v;
+				if ((a == 'm') || (a == 'M'))
+					newf.action[FLD_CTCP] = a;
+				else
+					newf.action[FLD_CTCP] = 'C';
+				newf.remove_after[FLD_CTCP] = r;
+				break;
+			case 'j':
+				newf.limit[FLD_JOIN] = v;
+				if (a == 'R')
+					newf.action[FLD_JOIN] = a;
+				else
+					newf.action[FLD_JOIN] = 'i';
+				newf.remove_after[FLD_JOIN] = r;
+				break;
+			case 'k':
+				newf.limit[FLD_KNOCK] = v;
+				newf.action[FLD_KNOCK] = 'K';
+				newf.remove_after[FLD_KNOCK] = r;
+				break;
+			case 'm':
+				newf.limit[FLD_MSG] = v;
+				if (a == 'M')
+					newf.action[FLD_MSG] = a;
+				else
+					newf.action[FLD_MSG] = 'm';
+				newf.remove_after[FLD_MSG] = r;
+				break;
+			case 'n':
+				newf.limit[FLD_NICK] = v;
+				newf.action[FLD_NICK] = 'N';
+				newf.remove_after[FLD_NICK] = r;
+				break;
+			case 't':
+				newf.limit[FLD_TEXT] = v;
+				if (a == 'b' || a == 'd')
+					newf.action[FLD_TEXT] = a;
+				if (timedban_available)
+					newf.remove_after[FLD_TEXT] = r;
+				break;
+			case 'r':
+				newf.limit[FLD_REPEAT] = v;
+				if (a == 'b' || a == 'd')
+					newf.action[FLD_REPEAT] = a;
+				if (timedban_available)
+					newf.remove_after[FLD_REPEAT] = r;
+				break;
+			default:
+				return NULL;
+		}
+	} /* for */
+	/* parse 'per' */
+	p2++;
+	if (*p2 != ':')
+		return NULL;
+	p2++;
+	if (!*p2)
+		return NULL;
+	v = atoi(p2);
+	if ((v < 1) || (v > 999)) /* 'per' out of range */
+	{
+		if (localclient || (v < 1))
+			return NULL;
+	}
+	newf.per = v;
+
+	/* Is anything turned on? (to stop things like '+f []:15' */
+	breakit = 1;
+	for (v=0; v < NUMFLD; v++)
+		if (newf.limit[v])
+			breakit=0;
+	if (breakit)
+		return NULL;
+
+	channel_modef_string(&newf, retbuf);
+	return retbuf;
+}
+
+void cmodef_free_param(void *r)
+{
+	// TODO: consider cancelling timers just to e sure? or maybe in DEBUGMODE?
+	safe_free(r);
+}
+
+void *cmodef_dup_struct(void *r_in)
+{
+	ChannelFloodProtection *r = (ChannelFloodProtection *)r_in;
+	ChannelFloodProtection *w = safe_alloc(sizeof(ChannelFloodProtection));
+
+	memcpy(w, r, sizeof(ChannelFloodProtection));
+	return (void *)w;
+}
+
+int cmodef_sjoin_check(Channel *channel, void *ourx, void *theirx)
+{
+	ChannelFloodProtection *our = (ChannelFloodProtection *)ourx;
+	ChannelFloodProtection *their = (ChannelFloodProtection *)theirx;
+	int i;
+
+	if (compare_floodprot_modes(our, their) == 0)
+		return EXSJ_SAME;
+
+	our->per = MAX(our->per, their->per);
+	for (i=0; i < NUMFLD; i++)
+	{
+		our->limit[i] = MAX(our->limit[i], their->limit[i]);
+		our->action[i] = MAX(our->action[i], their->action[i]);
+		our->remove_after[i] = MAX(our->remove_after[i], their->remove_after[i]);
+	}
+
+	return EXSJ_MERGE;
+}
+
+int floodprot_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[])
+{
+	/* I'll explain this only once:
+	 * 1. if channel is +f
+	 * 2. local client OR synced server
+	 * 3. server uptime more than XX seconds (if this information is available)
+	 * 4. is not a uline
+	 * 5. then, increase floodcounter
+	 * 6. if we reached the limit AND only if source was a local client.. do the action (+i).
+	 * Nr 6 is done because otherwise you would have a noticeflood with 'joinflood detected'
+	 * from all servers.
+	 */
+	if (IsFloodLimit(channel) &&
+	    (MyUser(client) || client->srvptr->serv->flags.synced) &&
+	    (client->srvptr->serv->boottime && (TStime() - client->srvptr->serv->boottime >= MODEF_BOOT_DELAY)) &&
+	    !IsULine(client) &&
+	    do_floodprot(channel, FLD_JOIN) &&
+	    MyUser(client))
+	{
+		do_floodprot_action(channel, FLD_JOIN, "join");
+	}
+	return 0;
+}
+
+int cmodef_cleanup_user2(Client *client)
+{
+	return 0;
+}
+
+int cmodef_channel_destroy(Channel *channel, int *should_destroy)
+{
+	floodprottimer_stopchantimers(channel);
+	return 0;
+}
+
+/* [just a helper for channel_modef_string()] */
+static inline char *chmodefstrhelper(char *buf, char t, char tdef, unsigned short l, unsigned char a, unsigned char r)
+{
+char *p;
+char tmpbuf[16], *p2 = tmpbuf;
+
+	sprintf(buf, "%hd", l);
+	p = buf + strlen(buf);
+	*p++ = t;
+	if (a && ((a != tdef) || r))
+	{
+		*p++ = '#';
+		*p++ = a;
+		if (r)
+		{
+			sprintf(tmpbuf, "%hd", (short)r);
+			while ((*p = *p2++))
+				p++;
+		}
+	}
+	*p++ = ',';
+	return p;
+}
+
+/** returns the channelmode +f string (ie: '[5k,40j]:10').
+ * 'retbuf' is suggested to be of size 512, which is more than X times the maximum (for safety).
+ */
+char *channel_modef_string(ChannelFloodProtection *x, char *retbuf)
+{
+	char *p = retbuf;
+
+	*p++ = '[';
+
+	/* (alphabetized) */
+	if (x->limit[FLD_CTCP])
+		p = chmodefstrhelper(p, 'c', 'C', x->limit[FLD_CTCP], x->action[FLD_CTCP], x->remove_after[FLD_CTCP]);
+	if (x->limit[FLD_JOIN])
+		p = chmodefstrhelper(p, 'j', 'i', x->limit[FLD_JOIN], x->action[FLD_JOIN], x->remove_after[FLD_JOIN]);
+	if (x->limit[FLD_KNOCK])
+		p = chmodefstrhelper(p, 'k', 'K', x->limit[FLD_KNOCK], x->action[FLD_KNOCK], x->remove_after[FLD_KNOCK]);
+	if (x->limit[FLD_MSG])
+		p = chmodefstrhelper(p, 'm', 'm', x->limit[FLD_MSG], x->action[FLD_MSG], x->remove_after[FLD_MSG]);
+	if (x->limit[FLD_NICK])
+		p = chmodefstrhelper(p, 'n', 'N', x->limit[FLD_NICK], x->action[FLD_NICK], x->remove_after[FLD_NICK]);
+	if (x->limit[FLD_TEXT])
+		p = chmodefstrhelper(p, 't', '\0', x->limit[FLD_TEXT], x->action[FLD_TEXT], x->remove_after[FLD_TEXT]);
+	if (x->limit[FLD_REPEAT])
+		p = chmodefstrhelper(p, 'r', '\0', x->limit[FLD_REPEAT], x->action[FLD_REPEAT], x->remove_after[FLD_REPEAT]);
+
+	if (*(p - 1) == ',')
+		p--;
+	*p++ = ']';
+	sprintf(p, ":%hd", x->per);
+	return retbuf;
+}
+
+int floodprot_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	Membership *mb;
+	ChannelFloodProtection *chp;
+	MemberFlood *memberflood;
+	uint64_t msghash;
+	unsigned char is_flooding_text=0, is_flooding_repeat=0;
+	static char errbuf[256];
+
+	/* This is redundant, right? */
+	if (!MyUser(client))
+		return HOOK_CONTINUE;
+
+
+	if (ValidatePermissionsForPath("channel:override:flood",client,NULL,channel,NULL) || !IsFloodLimit(channel) || is_skochanop(client, channel))
+		return HOOK_CONTINUE;
+
+	if (!(mb = find_membership_link(client->user->channel, channel)))
+		return HOOK_CONTINUE; /* not in channel */
+
+	chp = (ChannelFloodProtection *)GETPARASTRUCT(channel, 'f');
+
+	if (!chp || !(chp->limit[FLD_TEXT] || chp->limit[FLD_REPEAT]))
+		return HOOK_CONTINUE;
+
+	if (moddata_membership(mb, mdflood).ptr == NULL)
+	{
+		/* Alloc a new entry if it doesn't exist yet */
+		moddata_membership(mb, mdflood).ptr = safe_alloc(sizeof(MemberFlood));
+	}
+
+	memberflood = (MemberFlood *)moddata_membership(mb, mdflood).ptr;
+
+	if ((TStime() - memberflood->firstmsg) >= chp->per)
+	{
+		/* Reset due to moving into a new time slot */
+		memberflood->firstmsg = TStime();
+		memberflood->nmsg = 1;
+		memberflood->nmsg_repeat = 1;
+		if (chp->limit[FLD_REPEAT])
+		{
+			memberflood->lastmsg = gen_floodprot_msghash(*msg);
+			memberflood->prevmsg = 0;
+		}
+		return HOOK_CONTINUE; /* forget about it.. */
+	}
+
+	/* Anti-repeat ('r') */
+	if (chp->limit[FLD_REPEAT])
+	{
+		msghash = gen_floodprot_msghash(*msg);
+		if (memberflood->lastmsg)
+		{
+			if ((memberflood->lastmsg == msghash) || (memberflood->prevmsg == msghash))
+			{
+				memberflood->nmsg_repeat++;
+				if (memberflood->nmsg_repeat > chp->limit[FLD_REPEAT])
+					is_flooding_repeat = 1;
+			}
+			memberflood->prevmsg = memberflood->lastmsg;
+		}
+		memberflood->lastmsg = msghash;
+	}
+
+	if (chp->limit[FLD_TEXT])
+	{
+		/* increase msgs */
+		memberflood->nmsg++;
+		if (memberflood->nmsg > chp->limit[FLD_TEXT])
+			is_flooding_text = 1;
+	}
+
+	/* Do we need to take any action? */
+	if (is_flooding_text || is_flooding_repeat)
+	{
+		char mask[256];
+		MessageTag *mtags;
+		int flood_type;
+
+		/* Repeat takes precedence over text flood */
+		if (is_flooding_repeat)
+		{
+			snprintf(errbuf, sizeof(errbuf), "Flooding (Your last message is too similar to previous ones)");
+			flood_type = FLD_REPEAT;
+		} else
+		{
+			snprintf(errbuf, sizeof(errbuf), "Flooding (Limit is %i lines per %i seconds)", chp->limit[FLD_TEXT], chp->per);
+			flood_type = FLD_TEXT;
+		}
+
+		if (chp->action[flood_type] == 'd')
+		{
+			/* Drop the message */
+			*errmsg = errbuf;
+			return HOOK_DENY;
+		}
+
+		if (chp->action[flood_type] == 'b')
+		{
+			/* Ban the user */
+			if (timedban_available && (chp->remove_after[flood_type] > 0))
+				snprintf(mask, sizeof(mask), "~t:%d:*!*@%s", chp->remove_after[flood_type], GetHost(client));
+			else
+				snprintf(mask, sizeof(mask), "*!*@%s", GetHost(client));
+			if (add_listmode(&channel->banlist, &me, channel, mask) == 0)
+			{
+				mtags = NULL;
+				new_message(&me, NULL, &mtags);
+				sendto_server(NULL, 0, 0, mtags, ":%s MODE %s +b %s 0", me.id, channel->chname, mask);
+				sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
+				    ":%s MODE %s +b %s", me.name, channel->chname, mask);
+				free_message_tags(mtags);
+			} /* else.. ban list is full */
+		}
+		mtags = NULL;
+		kick_user(NULL, channel, &me, client, errbuf);
+		*errmsg = errbuf; /* not used, but needs to be set */
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
+
+int floodprot_post_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice)
+{
+	if (!IsFloodLimit(channel) || is_skochanop(client, channel) || IsULine(client))
+		return 0;
+
+	/* HINT: don't be so stupid to reorder the items in the if's below.. you'll break things -- Syzop. */
+
+	if (do_floodprot(channel, FLD_MSG) && MyUser(client))
+		do_floodprot_action(channel, FLD_MSG, "msg/notice");
+
+	if ((text[0] == '\001') && strncmp(text+1, "ACTION ", 7) &&
+	    do_floodprot(channel, FLD_CTCP) && MyUser(client))
+	{
+		do_floodprot_action(channel, FLD_CTCP, "CTCP");
+	}
+
+	return 0;
+}
+
+int floodprot_knock(Client *client, Channel *channel, MessageTag *mtags, char *comment)
+{
+	if (IsFloodLimit(channel) && !IsULine(client) && do_floodprot(channel, FLD_KNOCK) && MyUser(client))
+		do_floodprot_action(channel, FLD_KNOCK, "knock");
+	return 0;
+}
+
+int floodprot_nickchange(Client *client, char *oldnick)
+{
+	Membership *mp;
+
+	if (IsULine(client))
+		return 0;
+
+	for (mp = client->user->channel; mp; mp = mp->next)
+	{
+		Channel *channel = mp->channel;
+		if (channel && IsFloodLimit(channel) &&
+		    !(mp->flags & (CHFL_CHANOP|CHFL_VOICE|CHFL_CHANOWNER|CHFL_HALFOP|CHFL_CHANADMIN)) &&
+		    do_floodprot(channel, FLD_NICK) && MyUser(client))
+		{
+			do_floodprot_action(channel, FLD_NICK, "nick");
+		}
+	}
+	return 0;
+}
+
+int floodprot_chanmode_del(Channel *channel, int modechar)
+{
+	ChannelFloodProtection *chp;
+
+	if (!IsFloodLimit(channel))
+		return 0;
+
+	chp = (ChannelFloodProtection *)GETPARASTRUCT(channel, 'f');
+	if (!chp)
+		return 0;
+
+	/* reset joinflood on -i, reset msgflood on -m, etc.. */
+	switch(modechar)
+	{
+		case 'C':
+			chp->counter[FLD_CTCP] = 0;
+			break;
+		case 'N':
+			chp->counter[FLD_NICK] = 0;
+			break;
+		case 'm':
+			chp->counter[FLD_MSG] = 0;
+			chp->counter[FLD_CTCP] = 0;
+			break;
+		case 'K':
+			chp->counter[FLD_KNOCK] = 0;
+			break;
+		case 'i':
+			chp->counter[FLD_JOIN] = 0;
+			break;
+		case 'M':
+			chp->counter[FLD_MSG] = 0;
+			chp->counter[FLD_CTCP] = 0;
+			break;
+		case 'R':
+			chp->counter[FLD_JOIN] = 0;
+			break;
+		default:
+			break;
+	}
+	floodprottimer_del(channel, modechar);
+	return 0;
+}
+
+RemoveChannelModeTimer *floodprottimer_find(Channel *channel, char mflag)
+{
+	RemoveChannelModeTimer *e;
+
+	for (e=removechannelmodetimer_list; e; e=e->next)
+	{
+		if ((e->channel == channel) && (e->m == mflag))
+			return e;
+	}
+	return NULL;
+}
+
+/** strcat-like */
+void strccat(char *s, char c)
+{
+	for (; *s; s++);
+	*s++ = c;
+	*s++ = '\0';
+}
+
+/*
+ * Adds a "remove channelmode set by +f" timer.
+ * channel	Channel
+ * mflag	Mode flag, eg 'C'
+ * when		when it should be removed
+ * NOTES:
+ * - This function takes care of overwriting of any previous timer
+ *   for the same modechar.
+ * - The function takes care of channel->mode.floodprot->timers_running,
+ *   do not modify it yourself.
+ * - channel->mode.floodprot is asumed to be non-NULL.
+ */
+void floodprottimer_add(Channel *channel, char mflag, time_t when)
+{
+	RemoveChannelModeTimer *e = NULL;
+	unsigned char add=1;
+	ChannelFloodProtection *chp = (ChannelFloodProtection *)GETPARASTRUCT(channel, 'f');
+
+	if (strchr(chp->timers_running, mflag))
+	{
+		/* Already exists... */
+		e = floodprottimer_find(channel, mflag);
+		if (e)
+			add = 0;
+	}
+
+	if (!strchr(chp->timers_running, mflag))
+	{
+		if (strlen(chp->timers_running)+1 >= sizeof(chp->timers_running))
+		{
+			sendto_realops_and_log("floodprottimer_add: too many timers running for %s (%s)!!!",
+				channel->chname, chp->timers_running);
+			return;
+		}
+		strccat(chp->timers_running, mflag); /* bounds already checked ^^ */
+	}
+
+	if (add)
+		e = safe_alloc(sizeof(RemoveChannelModeTimer));
+
+	e->channel = channel;
+	e->m = mflag;
+	e->when = when;
+
+	if (add)
+		AddListItem(e, removechannelmodetimer_list);
+}
+
+void floodprottimer_del(Channel *channel, char mflag)
+{
+	RemoveChannelModeTimer *e;
+	ChannelFloodProtection *chp = (ChannelFloodProtection *)GETPARASTRUCT(channel, 'f');
+
+	if (chp && !strchr(chp->timers_running, mflag))
+		return; /* nothing to remove.. */
+	e = floodprottimer_find(channel, mflag);
+	if (!e)
+		return;
+
+	DelListItem(e, removechannelmodetimer_list);
+	safe_free(e);
+
+	if (chp)
+        {
+                char newtf[MAXCHMODEFACTIONS+1];
+                char *i, *o;
+                for (i=chp->timers_running, o=newtf; *i; i++)
+                        if (*i != mflag)
+                                *o++ = *i;
+                *o = '\0';
+                strcpy(chp->timers_running, newtf); /* always shorter (or equal) */
+        }
+}
+
+EVENT(modef_event)
+{
+	RemoveChannelModeTimer *e, *e_next;
+	time_t now;
+
+	now = TStime();
+
+	for (e = removechannelmodetimer_list; e; e = e_next)
+	{
+		e_next = e->next;
+		if (e->when <= now)
+		{
+			/* Remove chanmode... */
+			long mode = 0;
+			Cmode_t extmode = 0;
+#ifdef NEWFLDDBG
+			sendto_realops("modef_event: chan %s mode -%c EXPIRED", e->channel->chname, e->m);
+#endif
+			mode = get_mode_bitbychar(e->m);
+			if (mode == 0)
+			        extmode = get_extmode_bitbychar(e->m);
+
+			if ((mode && (e->channel->mode.mode & mode)) ||
+			    (extmode && (e->channel->mode.extmode & extmode)))
+			{
+				MessageTag *mtags = NULL;
+
+				new_message(&me, NULL, &mtags);
+				sendto_server(NULL, 0, 0, mtags, ":%s MODE %s -%c 0", me.id, e->channel->chname, e->m);
+				sendto_channel(e->channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
+				               ":%s MODE %s -%c",
+				               me.name, e->channel->chname, e->m);
+				free_message_tags(mtags);
+
+				e->channel->mode.mode &= ~mode;
+				e->channel->mode.extmode &= ~extmode;
+			}
+
+			/* And delete... */
+			DelListItem(e, removechannelmodetimer_list);
+			safe_free(e);
+		} else {
+#ifdef NEWFLDDBG
+			sendto_realops("modef_event: chan %s mode -%c about %d seconds",
+				e->channel->chname, e->m, e->when - now);
+#endif
+		}
+	}
+}
+
+void floodprottimer_stopchantimers(Channel *channel)
+{
+	RemoveChannelModeTimer *e, *e_next;
+
+	for (e = removechannelmodetimer_list; e; e = e_next)
+	{
+		e_next = e->next;
+		if (e->channel == channel)
+		{
+			DelListItem(e, removechannelmodetimer_list);
+			safe_free(e);
+		}
+	}
+}
+
+int do_floodprot(Channel *channel, int what)
+{
+	ChannelFloodProtection *chp = (ChannelFloodProtection *)GETPARASTRUCT(channel, 'f');
+
+	if (!chp || !chp->limit[what]) /* no +f or not restricted */
+		return 0;
+	if (TStime() - chp->timer[what] >= chp->per)
+	{
+		chp->timer[what] = TStime();
+		chp->counter[what] = 1;
+	} else
+	{
+		chp->counter[what]++;
+		if ((chp->counter[what] > chp->limit[what]) &&
+		    (TStime() - chp->timer[what] < chp->per))
+		{
+			/* reset it too (makes it easier for chanops to handle the situation) */
+			/*
+			 *XXchp->timer[what] = TStime();
+			 *XXchp->counter[what] = 1;
+			 *
+			 * BAD.. there are some situations where we might 'miss' a flood
+			 * because of this. The reset has been moved to -i,-m,-N,-C,etc.
+			*/
+			return 1; /* flood detected! */
+		}
+	}
+	return 0;
+}
+
+void do_floodprot_action(Channel *channel, int what, char *text)
+{
+	char m;
+	int mode = 0;
+	Cmode_t extmode = 0;
+	ChannelFloodProtection *chp = (ChannelFloodProtection *)GETPARASTRUCT(channel, 'f');
+
+	m = chp->action[what];
+	if (!m)
+		return;
+
+	/* For drop action we don't actually have to do anything here, but we still have to prevent Unreal
+	 * from setting chmode +d (which is useless against floods anyways) =]
+	 */
+	if (chp->action[what] == 'd')
+		return;
+
+	mode = get_mode_bitbychar(m);
+	if (mode == 0)
+		extmode = get_extmode_bitbychar(m);
+
+	if (!mode && !extmode)
+		return;
+
+	if (!(mode && (channel->mode.mode & mode)) &&
+		!(extmode && (channel->mode.extmode & extmode)))
+	{
+		char comment[512], target[CHANNELLEN + 8];
+		MessageTag *mtags;
+
+		/* First the notice to the chanops */
+		mtags = NULL;
+		new_message(&me, NULL, &mtags);
+		ircsnprintf(comment, sizeof(comment), "*** Channel %sflood detected (limit is %d per %d seconds), setting mode +%c",
+			text, chp->limit[what], chp->per, m);
+		ircsnprintf(target, sizeof(target), "%%%s", channel->chname);
+		sendto_channel(channel, &me, NULL, PREFIX_HALFOP|PREFIX_OP|PREFIX_ADMIN|PREFIX_OWNER,
+		               0, SEND_ALL, mtags,
+		               ":%s NOTICE %s :%s", me.name, target, comment);
+		free_message_tags(mtags);
+
+		/* Then the MODE broadcast */
+		mtags = NULL;
+		new_message(&me, NULL, &mtags);
+		sendto_server(NULL, 0, 0, mtags, ":%s MODE %s +%c 0", me.id, channel->chname, m);
+		sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s +%c", me.name, channel->chname, m);
+		free_message_tags(mtags);
+
+		/* Actually set the mode internally */
+		channel->mode.mode |= mode;
+		channel->mode.extmode |= extmode;
+
+		/* Add remove-chanmode timer */
+		if (chp->remove_after[what])
+		{
+			floodprottimer_add(channel, m, TStime() + ((long)chp->remove_after[what] * 60) - 5);
+			/* (since the floodprot timer event is called every 10s, we do -5 here so the accurancy will
+			 *  be -5..+5, without it it would be 0..+10.)
+			 */
+		}
+	}
+}
+
+uint64_t gen_floodprot_msghash(char *text)
+{
+	int i;
+	int is_ctcp, is_action;
+	char *plaintext;
+	size_t len;
+
+	is_ctcp = is_action = 0;
+	// Remove any control chars (colours/bold/CTCP/etc) and convert it to lowercase before hashing it
+	if (text[0] == '\001')
+	{
+		if (!strncmp(text + 1, "ACTION ", 7))
+			is_action = 1;
+		else
+			is_ctcp = 1;
+	}
+	plaintext = (char *)StripControlCodes(text);
+	for (i = 0; plaintext[i]; i++)
+	{
+		// Don't need to bother with non-printables and various symbols and numbers
+		if (plaintext[i] > 64)
+			plaintext[i] = tolower(plaintext[i]);
+	}
+	if (is_ctcp || is_action)
+	{
+		// Remove the \001 chars around the message
+		if((len = strlen(plaintext)) && plaintext[len - 1] == '\001')
+			plaintext[len - 1] = '\0';
+		plaintext++;
+		if(is_action)
+			plaintext += 7;
+	}
+
+	return siphash(text, floodprot_msghash_key);
+}
+
+// FIXME: REMARK: make sure you can only do a +f/-f once (latest in line wins).
+
+/* Checks if 2 ChannelFloodProtection modes (chmode +f) are different.
+ * This is a bit more complicated than 1 simple memcmp(a,b,..) because
+ * counters are also stored in this struct so we have to do
+ * it manually :( -- Syzop.
+ */
+static int compare_floodprot_modes(ChannelFloodProtection *a, ChannelFloodProtection *b)
+{
+	if (memcmp(a->limit, b->limit, sizeof(a->limit)) ||
+	    memcmp(a->action, b->action, sizeof(a->action)) ||
+	    memcmp(a->remove_after, b->remove_after, sizeof(a->remove_after)))
+		return 1;
+	else
+		return 0;
+}
+
+void memberflood_free(ModData *md)
+{
+	/* We don't have any struct members (anymore) that need freeing */
+	safe_free(md->ptr);
+}
+
+int floodprot_stats(Client *client, char *flag)
+{
+	if (*flag != 'S')
+		return 0;
+
+	sendtxtnumeric(client, "modef-default-unsettime: %hd", (unsigned short)MODEF_DEFAULT_UNSETTIME);
+	sendtxtnumeric(client, "modef-max-unsettime: %hd", (unsigned short)MODEF_MAX_UNSETTIME);
+	return 1;
+}
+
+/** Admin unloading the floodprot module for good. Bad. */
+void floodprot_free_removechannelmodetimer_list(ModData *m)
+{
+	RemoveChannelModeTimer *e, *e_next;
+
+	for (e=removechannelmodetimer_list; e; e=e_next)
+	{
+		e_next = e->next;
+		safe_free(e);
+	}
+}
+
+void floodprot_free_msghash_key(ModData *m)
+{
+	safe_free(floodprot_msghash_key);
+}
diff --git a/src/modules/chanmodes/history.c b/src/modules/chanmodes/history.c
new file mode 100644
index 0000000..d948713
--- /dev/null
+++ b/src/modules/chanmodes/history.c
@@ -0,0 +1,537 @@
+/*
+ * modules/chanmodes/history - Channel History
+ * (C) Copyright 2009-2019 Bram Matthys (Syzop) and the UnrealIRCd team
+ * License: GPLv2
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/history",
+	"1.0",
+	"Channel Mode +H",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+typedef struct ConfigHistoryExt ConfigHistoryExt;
+struct ConfigHistoryExt {
+	int lines; /**< number of lines */
+	long time; /**< seconds */
+};
+struct {
+	ConfigHistoryExt playback_on_join; /**< Maximum number of lines & time to playback on-join */
+	ConfigHistoryExt max_storage_per_channel; /**< Maximum number of lines & time to record */
+} cfg;
+
+typedef struct HistoryChanMode HistoryChanMode;
+struct HistoryChanMode {
+	unsigned int max_lines; /**< Maximum number of messages to record */
+	unsigned long max_time; /**< Maximum number of time (in seconds) to record */
+};
+
+Cmode_t EXTMODE_HISTORY = 0L;
+#define HistoryEnabled(channel)    (channel->mode.extmode & EXTMODE_HISTORY)
+
+/* Forward declarations */
+static void init_config(void);
+int history_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int history_config_run(ConfigFile *, ConfigEntry *, int);
+int history_chanmode_change(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode);
+static int compare_history_modes(HistoryChanMode *a, HistoryChanMode *b);
+int history_chanmode_is_ok(Client *client, Channel *channel, char mode, char *para, int type, int what);
+void *history_chanmode_put_param(void *r_in, char *param);
+char *history_chanmode_get_param(void *r_in);
+char *history_chanmode_conv_param(char *param, Client *client);
+void history_chanmode_free_param(void *r);
+void *history_chanmode_dup_struct(void *r_in);
+int history_chanmode_sjoin_check(Channel *channel, void *ourx, void *theirx);
+int history_channel_destroy(Channel *channel, int *should_destroy);
+int history_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice);
+int history_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[]);
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, history_config_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo creq;
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&creq, 0, sizeof(creq));
+	creq.paracount = 1;
+	creq.is_ok = history_chanmode_is_ok;
+	creq.flag = 'H';
+	creq.put_param = history_chanmode_put_param;
+	creq.get_param = history_chanmode_get_param;
+	creq.conv_param = history_chanmode_conv_param;
+	creq.free_param = history_chanmode_free_param;
+	creq.dup_struct = history_chanmode_dup_struct;
+	creq.sjoin_check = history_chanmode_sjoin_check;
+	CmodeAdd(modinfo->handle, creq, &EXTMODE_HISTORY);
+
+	init_config();
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, history_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_CHANMODE, 0, history_chanmode_change);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_CHANMODE, 0, history_chanmode_change);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_JOIN, 0, history_join);
+	HookAdd(modinfo->handle, HOOKTYPE_CHANMSG, 0, history_chanmsg);
+	HookAdd(modinfo->handle, HOOKTYPE_CHANNEL_DESTROY, 1000000, history_channel_destroy);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static void init_config(void)
+{
+	/* Set default values */
+	memset(&cfg, 0, sizeof(cfg));
+	cfg.playback_on_join.lines = 15;
+	cfg.playback_on_join.time = 86400;
+	cfg.max_storage_per_channel.lines = 200;
+	cfg.max_storage_per_channel.time = 86400*7;
+}
+
+#define CheckNull(x) if ((!(x)->ce_vardata) || (!(*((x)->ce_vardata)))) { config_error("%s:%i: missing parameter", (x)->ce_fileptr->cf_filename, (x)->ce_varlinenum); errors++; continue; }
+
+int history_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep, *cepp, *cep4;
+	int on_join_lines=0, maximum_storage_lines=0;
+	long on_join_time=0L, maximum_storage_time=0L;
+
+	/* We only care about set::history */
+	if ((type != CONFIG_SET) || strcmp(ce->ce_varname, "history"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "channel"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "playback-on-join"))
+				{
+					for (cep4 = cepp->ce_entries; cep4; cep4 = cep4->ce_next)
+					{
+						if (!strcmp(cep4->ce_varname, "lines"))
+						{
+							int v;
+							CheckNull(cep4);
+							v = atoi(cep4->ce_vardata);
+							if ((v < 1) || (v > 1000000000))
+							{
+								config_error("%s:%i: set::history::channel::playback-on-join::lines must be between 1 and 1000. "
+								             "Recommended values are 10-50. Got: %d.",
+								             cep4->ce_fileptr->cf_filename, cep4->ce_varlinenum, v);
+								errors++;
+								continue;
+							}
+							on_join_lines = v;
+						} else
+						if (!strcmp(cep4->ce_varname, "time"))
+						{
+							long v;
+							CheckNull(cep4);
+							v = config_checkval(cep4->ce_vardata, CFG_TIME);
+							if (v < 1)
+							{
+								config_error("%s:%i: set::history::channel::playback-on-join::time must be a positive number.",
+								             cep4->ce_fileptr->cf_filename, cep4->ce_varlinenum);
+								errors++;
+								continue;
+							}
+							on_join_time = v;
+						} else
+						{
+							config_error_unknown(cep4->ce_fileptr->cf_filename,
+								cep4->ce_varlinenum, "set::history::channel::playback-on-join", cep4->ce_varname);
+							errors++;
+						}
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "max-storage-per-channel"))
+				{
+					for (cep4 = cepp->ce_entries; cep4; cep4 = cep4->ce_next)
+					{
+						if (!strcmp(cep4->ce_varname, "lines"))
+						{
+							int v;
+							CheckNull(cep4);
+							v = atoi(cep4->ce_vardata);
+							if (v < 1)
+							{
+								config_error("%s:%i: set::history::channel::max-storage-per-channel::lines must be a positive number.",
+								             cep4->ce_fileptr->cf_filename, cep4->ce_varlinenum);
+								errors++;
+								continue;
+							}
+							maximum_storage_lines = v;
+						} else
+						if (!strcmp(cep4->ce_varname, "time"))
+						{
+							long v;
+							CheckNull(cep4);
+							v = config_checkval(cep4->ce_vardata, CFG_TIME);
+							if (v < 1)
+							{
+								config_error("%s:%i: set::history::channel::max-storage-per-channel::time must be a positive number.",
+								             cep4->ce_fileptr->cf_filename, cep4->ce_varlinenum);
+								errors++;
+								continue;
+							}
+							maximum_storage_time = v;
+						} else
+						{
+							config_error_unknown(cep4->ce_fileptr->cf_filename,
+								cep4->ce_varlinenum, "set::history::channel::max-storage-per-channel", cep4->ce_varname);
+							errors++;
+						}
+					}
+				} else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename,
+						cepp->ce_varlinenum, "set::history::channel", cepp->ce_varname);
+					errors++;
+				}
+			}
+		} else {
+			config_error_unknown(cep->ce_fileptr->cf_filename,
+				cep->ce_varlinenum, "set::history", cep->ce_varname);
+			errors++;
+		}
+	}
+
+	if ((on_join_time && maximum_storage_time) && (on_join_time > maximum_storage_time))
+	{
+		config_error("set::history::channel::playback-on-join::time cannot be higher than set::history::channel::max-storage-per-channel::time. Either set the playback-on-join::time lower or the maximum::time higher.");
+		errors++;
+	}
+	if ((on_join_lines && maximum_storage_lines) && (on_join_lines > maximum_storage_lines))
+	{
+		config_error("set::history::channel::playback-on-join::lines cannot be higher than set::history::channel::max-storage-per-channel::lines. Either set the playback-on-join::lines lower or the maximum::lines higher.");
+		errors++;
+	}
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int history_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *cepp, *cep4;
+
+	if ((type != CONFIG_SET) || strcmp(ce->ce_varname, "history"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "channel"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "playback-on-join"))
+				{
+					for (cep4 = cepp->ce_entries; cep4; cep4 = cep4->ce_next)
+					{
+						if (!strcmp(cep4->ce_varname, "lines"))
+						{
+							cfg.playback_on_join.lines = atoi(cep4->ce_vardata);
+						} else
+						if (!strcmp(cep4->ce_varname, "time"))
+						{
+							cfg.playback_on_join.time = config_checkval(cep4->ce_vardata, CFG_TIME);
+						}
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "max-storage-per-channel"))
+				{
+					for (cep4 = cepp->ce_entries; cep4; cep4 = cep4->ce_next)
+					{
+						if (!strcmp(cep4->ce_varname, "lines"))
+						{
+							cfg.max_storage_per_channel.lines = atoi(cep4->ce_vardata);
+						} else
+						if (!strcmp(cep4->ce_varname, "time"))
+						{
+							cfg.max_storage_per_channel.time = config_checkval(cep4->ce_vardata, CFG_TIME);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	return 0; /* Retval 0 = trick so other modules can see the same configuration */
+}
+
+/** Helper function for .is_ok(), .conv_param() and .put_param().
+ * @param param: The mode parameter.
+ * @param lines: The number of lines (the X in +H X:Y)
+ * @param t:     The time value (the Y in +H X:Y)
+  */
+int history_parse_chanmode(char *param, int *lines, long *t)
+{
+	char buf[64], *p, *q;
+	char contains_non_digit = 0;
+
+	/* Work on a copy */
+	strlcpy(buf, param, sizeof(buf));
+
+	/* Initialize, to be safe */
+	*lines = 0;
+	*t = 0;
+
+	p = strchr(buf, ':');
+	if (!p)
+		return 0;
+
+	/* Parse lines */
+	*p++ = '\0';
+	*lines = atoi(buf);
+
+	/* Parse time value */
+	/* If it is all digits then it is in minutes */
+	for (q=p; *q; q++)
+	{
+		if (!isdigit(*q))
+		{
+			contains_non_digit = 1;
+			break;
+		}
+	}
+	if (contains_non_digit)
+		*t = config_checkval(p, CFG_TIME);
+	else
+		*t = atoi(p) * 60;
+
+	/* Sanity checking... */
+	if (*lines < 1)
+		return 0;
+
+	if (*t < 60)
+		return 0;
+
+	/* Check imposed configuration limits... */
+	if (*lines > cfg.max_storage_per_channel.lines)
+		*lines = cfg.max_storage_per_channel.lines;
+
+	if (*t > cfg.max_storage_per_channel.time)
+		*t = cfg.max_storage_per_channel.time;
+
+	return 1;
+}
+
+/** Channel Mode +H check:
+ * Does the user have rights to add/remove this channel mode?
+ * Is the supplied mode parameter ok?
+ */
+int history_chanmode_is_ok(Client *client, Channel *channel, char mode, char *param, int type, int what)
+{
+	if ((type == EXCHK_ACCESS) || (type == EXCHK_ACCESS_ERR))
+	{
+		if (IsUser(client) && is_chan_op(client, channel))
+			return EX_ALLOW;
+		if (type == EXCHK_ACCESS_ERR) /* can only be due to being halfop */
+			sendnumeric(client, ERR_NOTFORHALFOPS, 'H');
+		return EX_DENY;
+	} else
+	if (type == EXCHK_PARAM)
+	{
+		int lines = 0;
+		long t = 0L;
+
+		if (!history_parse_chanmode(param, &lines, &t))
+		{
+			sendnumeric(client, ERR_CANNOTCHANGECHANMODE, 'H', "Invalid syntax for MODE +H. Use +H lines:period. The period must be in minutes (eg: 10) or a time value (eg: 1h).");
+			return EX_DENY;
+		}
+		/* Don't bother about lines/t limits here, we will auto-convert in .conv_param */
+
+		return EX_ALLOW;
+	}
+
+	/* fallthrough -- should not be used */
+	return EX_DENY;
+}
+
+/** Convert channel parameter to something proper.
+ * NOTE: client may be NULL if called for e.g. set::modes-playback-on-join
+ */
+char *history_chanmode_conv_param(char *param, Client *client)
+{
+	static char buf[64];
+	int lines = 0;
+	long t = 0L;
+
+	if (!history_parse_chanmode(param, &lines, &t))
+		return NULL;
+
+	snprintf(buf, sizeof(buf), "%d:%ldm", lines, t / 60);
+	return buf;
+}
+
+/** Store the +H x:y channel mode */
+void *history_chanmode_put_param(void *mode_in, char *param)
+{
+	HistoryChanMode *h = (HistoryChanMode *)mode_in;
+	int lines = 0;
+	long t = 0L;
+
+	if (!history_parse_chanmode(param, &lines, &t))
+		return NULL;
+
+	if (!h)
+	{
+		/* Need to create one */
+		h = safe_alloc(sizeof(HistoryChanMode));
+	}
+
+	h->max_lines = lines;
+	h->max_time = t;
+
+	return (void *)h;
+}
+
+/** Retrieve the +H settings (the X:Y string) */
+char *history_chanmode_get_param(void *h_in)
+{
+	HistoryChanMode *h = (HistoryChanMode *)h_in;
+	static char buf[64];
+
+	if (!h_in)
+		return NULL;
+
+	/* For now we convert the time to minutes for displaying purposes
+	 * and show it as eg 5:10m.
+	 * In a later release we can have a go at converting to '1h', '1d'
+	 * and such, but not before most people run 5.0.2+ as otherwise you
+	 * get desyncs in channel history retention times.
+	 */
+	snprintf(buf, sizeof(buf), "%d:%ldm", h->max_lines, h->max_time / 60);
+	return buf;
+}
+
+/** Free channel mode */
+void history_chanmode_free_param(void *r)
+{
+	safe_free(r);
+}
+
+/** Duplicate the channel mode +H settings */
+void *history_chanmode_dup_struct(void *r_in)
+{
+	HistoryChanMode *r = (HistoryChanMode *)r_in;
+	HistoryChanMode *w = safe_alloc(sizeof(HistoryChanMode));
+
+	memcpy(w, r, sizeof(HistoryChanMode));
+	return (void *)w;
+}
+
+/** If two servers with an identical creation time stamp connect,
+ * we have to deal with merging the settings on different sides
+ * (if they differ at all). That's what we do here.
+ */
+int history_chanmode_sjoin_check(Channel *channel, void *ourx, void *theirx)
+{
+	HistoryChanMode *our = (HistoryChanMode *)ourx;
+	HistoryChanMode *their = (HistoryChanMode *)theirx;
+
+	if ((our->max_lines == their->max_lines) && (our->max_time == their->max_time))
+		return EXSJ_SAME;
+
+	our->max_lines = MAX(our->max_lines, their->max_lines);
+	our->max_time = MAX(our->max_time, their->max_time);
+
+	return EXSJ_MERGE;
+}
+
+/** On channel mode change, communicate the +H limits to the history backend layer */
+int history_chanmode_change(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode)
+{
+	HistoryChanMode *settings;
+
+	/* Did anything change, with regards to channel mode H ? */
+	if (!strchr(modebuf, 'H'))
+		return 0;
+
+	/* If so, grab the settings, and communicate them */
+	settings = (HistoryChanMode *)GETPARASTRUCT(channel, 'H');
+	if (settings)
+		history_set_limit(channel->chname, settings->max_lines, settings->max_time);
+	else
+		history_destroy(channel->chname);
+
+	return 0;
+}
+
+/** Channel is destroyed (or is it?) */
+int history_channel_destroy(Channel *channel, int *should_destroy)
+{
+	if (*should_destroy == 0)
+		return 0; /* channel will not be destroyed */
+
+	history_destroy(channel->chname);
+
+	return 0;
+}
+
+int history_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice)
+{
+	char buf[512];
+	char source[64];
+	HistoryChanMode *settings;
+
+	if (!HistoryEnabled(channel))
+		return 0;
+
+	/* Filter out CTCP / CTCP REPLY */
+	if ((*text == '\001') && strncmp(text+1, "ACTION", 6))
+		return 0;
+
+	/* Lazy: if any prefix is addressed (eg: @#channel) then don't record it.
+	 * This so we don't have to check privileges during history playback etc.
+	 */
+	if (prefix)
+		return 0;
+
+	if (IsUser(client))
+		snprintf(source, sizeof(source), "%s!%s@%s", client->name, client->user->username, GetHost(client));
+	else
+		strlcpy(source, client->name, sizeof(source));
+
+	snprintf(buf, sizeof(buf), ":%s %s %s :%s",
+		source,
+		notice ? "NOTICE" : "PRIVMSG",
+		channel->chname,
+		text);
+
+	history_add(channel->chname, mtags, buf);
+
+	return 0;
+}
+
+int history_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[])
+{
+	if (!HistoryEnabled(channel))
+		return 0;
+
+	if (MyUser(client))
+		history_request(client, channel->chname, NULL);
+
+	return 0;
+}
diff --git a/src/modules/chanmodes/issecure.c b/src/modules/chanmodes/issecure.c
new file mode 100644
index 0000000..56320ab
--- /dev/null
+++ b/src/modules/chanmodes/issecure.c
@@ -0,0 +1,278 @@
+/*
+ * Channel Is Secure UnrealIRCd module (Channel Mode +Z)
+ * (C) Copyright 2010-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This module will indicate if a channel is secure, and if so will set +Z.
+ * Secure is defined as: all users on the channel are connected through SSL/TLS
+ * Additionally, the channel has to be +z (only allow secure users to join).
+ * Suggested on http://bugs.unrealircd.org/view.php?id=3720
+ * Thanks go to fez for pushing us for some kind of method to indicate
+ * this 'secure channel state', and to Stealth for suggesting this method.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(issecure);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/issecure",
+	"4.2",
+	"Channel Mode +Z", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_ISSECURE;
+
+#define IsSecureChanIndicated(channel)	(channel->mode.extmode & EXTCMODE_ISSECURE)
+
+int IsSecureJoin(Channel *channel);
+int modeZ_is_ok(Client *client, Channel *channel, char mode, char *para, int checkt, int what);
+int issecure_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[]);
+int issecure_part(Client *client, Channel *channel, MessageTag *mtags, char *comment);
+int issecure_quit(Client *client, MessageTag *mtags, char *comment);
+int issecure_kick(Client *client, Client *victim, Channel *channel, MessageTag *mtags, char *comment);
+int issecure_chanmode(Client *client, Channel *channel, MessageTag *mtags,
+                             char *modebuf, char *parabuf, time_t sendts, int samode);
+                             
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	/* Channel mode */
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.is_ok = modeZ_is_ok;
+	req.flag = 'Z';
+	req.local = 1; /* local channel mode */
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_ISSECURE);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_JOIN, 0, issecure_join);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_JOIN, 0, issecure_join);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_PART, 0, issecure_part);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_PART, 0, issecure_part);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_QUIT, 0, issecure_quit);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_QUIT, 0, issecure_quit);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_KICK, 0, issecure_kick);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_KICK, 0, issecure_kick);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_CHANMODE, 0, issecure_chanmode);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_CHANMODE, 0, issecure_chanmode);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int IsSecureJoin(Channel *channel)
+{
+	Hook *h;
+	int i = 0;
+
+	for (h = Hooks[HOOKTYPE_IS_CHANNEL_SECURE]; h; h = h->next)
+	{
+		i = (*(h->func.intfunc))(channel);
+		if (i != 0)
+			break;
+	}
+
+	return i;
+}
+
+int modeZ_is_ok(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	/* Reject any attempt to set or unset our mode. Even to IRCOps */
+	return EX_ALWAYS_DENY;
+}
+
+int channel_has_insecure_users_butone(Channel *channel, Client *skip)
+{
+Member *member;
+
+	for (member = channel->members; member; member = member->next)
+	{
+		if (member->client == skip)
+			continue;
+		if (IsULine(member->client))
+			continue;
+		if (!IsSecureConnect(member->client))
+			return 1;
+	}
+	return 0;
+}
+
+#define channel_has_insecure_users(x) channel_has_insecure_users_butone(x, NULL)
+
+/* Set channel status of 'channel' to be no longer secure (-Z) due to 'client'.
+ * client MAY be null!
+ */
+void issecure_unset(Channel *channel, Client *client, MessageTag *recv_mtags, int notice)
+{
+	Hook *h;
+	MessageTag *mtags;
+
+	if (notice)
+	{
+		mtags = NULL;
+		new_message_special(&me, recv_mtags, &mtags, "NOTICE %s :setting -Z", channel->chname);
+		sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags,
+		               ":%s NOTICE %s :User '%s' joined and is not connected through SSL/TLS, setting channel -Z (insecure)",
+		               me.id, channel->chname, client->name);
+		free_message_tags(mtags);
+	}
+		
+	channel->mode.extmode &= ~EXTCMODE_ISSECURE;
+	mtags = NULL;
+	new_message_special(&me, recv_mtags, &mtags, "MODE %s -Z", channel->chname);
+	sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s -Z", me.name, channel->chname);
+	free_message_tags(mtags);
+}
+
+
+/* Set channel status of 'channel' to be secure (+Z).
+ * Channel might have been insecure (or might not have been +z) and is
+ * now considered secure. If 'client' is non-NULL then we are now secure
+ * thanks to this user leaving the chat.
+ */
+void issecure_set(Channel *channel, Client *client, MessageTag *recv_mtags, int notice)
+{
+	MessageTag *mtags;
+
+	mtags = NULL;
+	new_message_special(&me, recv_mtags, &mtags, "NOTICE %s :setting +Z", channel->chname);
+	if (notice && client)
+	{
+		/* note that we have to skip 'client', since when this call is being made
+		 * he is still considered a member of this channel.
+		 */
+		sendto_channel(channel, &me, client, 0, 0, SEND_LOCAL, NULL,
+		               ":%s NOTICE %s :Now all users in the channel are connected through SSL/TLS, setting channel +Z (secure)",
+		               me.name, channel->chname);
+	} else if (notice)
+	{
+		/* note the missing word 'now' in next line */
+		sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, NULL,
+		               ":%s NOTICE %s :All users in the channel are connected through SSL/TLS, setting channel +Z (secure)",
+		               me.name, channel->chname);
+	}
+	free_message_tags(mtags);
+
+	channel->mode.extmode |= EXTCMODE_ISSECURE;
+
+	mtags = NULL;
+	new_message_special(&me, recv_mtags, &mtags, "MODE %s +Z", channel->chname);
+	sendto_channel(channel, &me, client, 0, 0, SEND_LOCAL, mtags,
+	               ":%s MODE %s +Z",
+	               me.name, channel->chname);
+	free_message_tags(mtags);
+}
+
+/* Note: the routines below (notably the 'if's) are written with speed in mind,
+ *       so while they can be written shorter, they would only take longer to execute!
+ */
+
+int issecure_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[])
+{
+	/* Check only if chan already +zZ and the user joining is insecure (no need to count) */
+	if (IsSecureJoin(channel) && IsSecureChanIndicated(channel) && !IsSecureConnect(client) && !IsULine(client))
+		issecure_unset(channel, client, mtags, 1);
+
+	/* Special case for +z in modes-on-join and first user creating the channel */
+	if ((channel->users == 1) && IsSecureJoin(channel) && !IsSecureChanIndicated(channel) && !channel_has_insecure_users(channel))
+		issecure_set(channel, NULL, mtags, 0);
+
+	return 0;
+}
+
+int issecure_part(Client *client, Channel *channel, MessageTag *mtags, char *comment)
+{
+	/* Only care if chan is +z-Z and the user leaving is insecure, then count */
+	if (IsSecureJoin(channel) && !IsSecureChanIndicated(channel) && !IsSecureConnect(client) &&
+	    !channel_has_insecure_users_butone(channel, client))
+		issecure_set(channel, client, mtags, 1);
+	return 0;
+}
+
+int issecure_quit(Client *client, MessageTag *mtags, char *comment)
+{
+Membership *membership;
+Channel *channel;
+
+	for (membership = client->user->channel; membership; membership=membership->next)
+	{
+		channel = membership->channel;
+		/* Identical to part */
+		if (IsSecureJoin(channel) && !IsSecureChanIndicated(channel) && 
+		    !IsSecureConnect(client) && !channel_has_insecure_users_butone(channel, client))
+			issecure_set(channel, client, mtags, 1);
+	}
+	return 0;
+}
+
+int issecure_kick(Client *client, Client *victim, Channel *channel, MessageTag *mtags, char *comment)
+{
+	/* Identical to part&quit, except we care about 'victim' and not 'client' */
+	if (IsSecureJoin(channel) && !IsSecureChanIndicated(channel) &&
+	    !IsSecureConnect(victim) && !channel_has_insecure_users_butone(channel, victim))
+		issecure_set(channel, victim, mtags, 1);
+	return 0;
+}
+
+int issecure_chanmode(Client *client, Channel *channel, MessageTag *mtags,
+                             char *modebuf, char *parabuf, time_t sendts, int samode)
+{
+	if (!strchr(modebuf, 'z'))
+		return 0; /* don't care */
+
+	if (IsSecureJoin(channel))
+	{
+		/* +z is set, check if we need to +Z
+		 * Note that we need to be careful as there is a possibility that we got here
+		 * but the channel is ALREADY +z. Due to server2server MODE's.
+		 */
+		if (channel_has_insecure_users(channel))
+		{
+			/* Should be -Z, if not already */
+			if (IsSecureChanIndicated(channel))
+				issecure_unset(channel, NULL, mtags, 0); /* would be odd if we got here ;) */
+		} else {
+			/* Should be +Z, but check if it isn't already.. */
+			if (!IsSecureChanIndicated(channel))
+				issecure_set(channel, NULL, mtags, 0);
+		}
+	} else {
+		/* there was a -z, check if the channel is currently +Z and if so, set it -Z */
+		if (IsSecureChanIndicated(channel))
+			issecure_unset(channel, NULL, mtags, 0);
+	}
+	return 0;
+}
diff --git a/src/modules/chanmodes/link.c b/src/modules/chanmodes/link.c
new file mode 100644
index 0000000..12d738a
--- /dev/null
+++ b/src/modules/chanmodes/link.c
@@ -0,0 +1,439 @@
+/*
+ * Robust channel forwarding system
+ * (C) Copyright 2019 Syzop, Gottem and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MAX_EB_LEN 128 // Max extban length
+
+ModuleHeader MOD_HEADER = {
+	"chanmodes/link",
+	"5.0",
+	"Channel Mode +L",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+Cmode_t EXTMODE_LINK = 0L;
+
+typedef struct {
+	char linked[CHANNELLEN + 1];
+} aModeLEntry;
+
+typedef enum {
+	LINKTYPE_BAN = 1, // +b
+	LINKTYPE_INVITE = 2, // +i
+	LINKTYPE_OPER = 3, // +O
+	LINKTYPE_SSL = 4, // +z
+	LINKTYPE_REG = 5, // +R
+	LINKTYPE_LIMIT = 6, // +l
+	LINKTYPE_BADKEY = 7, // +k
+} linkType;
+
+int cmodeL_is_ok(Client *client, Channel *channel, char mode, char *para, int type, int what);
+void *cmodeL_put_param(void *r_in, char *param);
+char *cmodeL_get_param(void *r_in);
+char *cmodeL_conv_param(char *param_in, Client *client);
+void cmodeL_free_param(void *r);
+void *cmodeL_dup_struct(void *r_in);
+int cmodeL_sjoin_check(Channel *channel, void *ourx, void *theirx);
+
+int extban_link_syntax(Client *client, int checkt, char *reason);
+int extban_link_is_ok(Client *client, Channel *channel, char *param, int checkt, int what, int what2);
+char *extban_link_conv_param(char *param);
+int extban_link_is_banned(Client *client, Channel *channel, char *ban, int type, char **msg, char **errmsg);
+int link_doforward(Client *client, Channel *channel, char *linked, linkType linktype);
+int link_pre_localjoin_cb(Client *client, Channel *channel, char *parv[]);
+
+MOD_INIT()
+{
+	CmodeInfo req;
+	ExtbanInfo req_extban;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 1;
+	req.is_ok = cmodeL_is_ok;
+	req.flag = 'L';
+	req.unset_with_param = 1; /* Oh yeah, we are special! */
+	req.put_param = cmodeL_put_param;
+	req.get_param = cmodeL_get_param;
+	req.conv_param = cmodeL_conv_param;
+	req.free_param = cmodeL_free_param;
+	req.dup_struct = cmodeL_dup_struct;
+	req.sjoin_check = cmodeL_sjoin_check;
+	CmodeAdd(modinfo->handle, req, &EXTMODE_LINK);
+
+	memset(&req_extban, 0, sizeof(ExtbanInfo));
+	req_extban.flag = 'f';
+	req_extban.is_ok = extban_link_is_ok;
+	req_extban.conv_param = extban_link_conv_param;
+	req_extban.is_banned = extban_link_is_banned;
+	req_extban.options = EXTBOPT_ACTMODIFIER;
+	if (!ExtbanAdd(modinfo->handle, req_extban))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_JOIN, -99, link_pre_localjoin_cb);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int cmodeL_is_ok(Client *client, Channel *channel, char mode, char *para, int type, int what)
+{
+	if ((type == EXCHK_ACCESS) || (type == EXCHK_ACCESS_ERR))
+	{
+		if (IsUser(client) && is_chan_op(client, channel))
+			return EX_ALLOW;
+		if (type == EXCHK_ACCESS_ERR) /* can only be due to being halfop */
+			sendnumeric(client, ERR_NOTFORHALFOPS, 'H');
+		return EX_DENY;
+	} else
+	if (type == EXCHK_PARAM)
+	{
+		/* Check parameter.. syntax is +L #channel */
+		if (strchr(para, ','))
+			return EX_DENY; /* multiple channels not permitted */
+		if (!valid_channelname(para))
+		{
+			if (MyUser(client))
+				sendnumeric(client, ERR_NOSUCHCHANNEL, para);
+			return EX_DENY;
+		}
+
+		if (find_channel(para, NULL) == channel)
+		{
+			if (MyUser(client))
+				sendnumeric(client, ERR_CANNOTCHANGECHANMODE, 'L',
+					   "a channel cannot be linked to itself");
+			return EX_DENY;
+		}
+		return EX_ALLOW;
+	}
+
+	/* fallthrough -- should not be used */
+	return EX_DENY;
+}
+
+void *cmodeL_put_param(void *r_in, char *param)
+{
+	aModeLEntry *r = (aModeLEntry *)r_in;
+
+	if (!r)
+	{
+		/* Need to create one */
+		r = safe_alloc(sizeof(aModeLEntry));
+	}
+	strlcpy(r->linked, param, sizeof(r->linked));
+	return (void *)r;
+}
+
+char *cmodeL_get_param(void *r_in)
+{
+	aModeLEntry *r = (aModeLEntry *)r_in;
+	static char retbuf[CHANNELLEN+1];
+
+	if (!r)
+		return NULL;
+
+	strlcpy(retbuf, r->linked, sizeof(retbuf));
+	return retbuf;
+}
+
+/** Convert parameter to something proper.
+ * NOTE: client may be NULL
+ */
+char *cmodeL_conv_param(char *param, Client *client)
+{
+	char *p;
+
+	if (!valid_channelname(param))
+		return NULL;
+
+	return param;
+}
+
+void cmodeL_free_param(void *r)
+{
+	safe_free(r);
+}
+
+void *cmodeL_dup_struct(void *r_in)
+{
+	aModeLEntry *r = (aModeLEntry *)r_in;
+	aModeLEntry *w = safe_alloc(sizeof(aModeLEntry));
+
+	memcpy(w, r, sizeof(aModeLEntry));
+	return (void *)w;
+}
+
+int cmodeL_sjoin_check(Channel *channel, void *ourx, void *theirx)
+{
+	aModeLEntry *our = (aModeLEntry *)ourx;
+	aModeLEntry *their = (aModeLEntry *)theirx;
+
+	if (!strcmp(our->linked, their->linked))
+		return EXSJ_SAME;
+	if (strcmp(our->linked, their->linked) > 0)
+		return EXSJ_WEWON;
+	return EXSJ_THEYWON;
+}
+
+int extban_link_syntax(Client *client, int checkt, char *reason)
+{
+	if (MyUser(client) && (checkt == EXBCHK_PARAM))
+	{
+		sendnotice(client, "Error when setting ban: %s", reason);
+		sendnotice(client, "  Syntax: +b ~f:#channel:mask");
+		sendnotice(client, "Examples:");
+		sendnotice(client, "  +b ~f:#public:*!*@badisp.org");
+		sendnotice(client, "  +b ~f:#public:~c:#badchannel");
+		sendnotice(client, "Multiple channels are not supported");
+		sendnotice(client, "Valid masks are nick!user@host or another extban type such as ~a, ~c, ~S, etc");
+	}
+	return 0; // Reject ban
+}
+
+int extban_link_is_ok(Client *client, Channel *channel, char *param, int checkt, int what, int what2)
+{
+	char paramtmp[MAX_EB_LEN + 1];
+	char tmpmask[MAX_EB_LEN + 1];
+	char *matchby; // Matching method, such as 'n!u@h'
+	char *chan;
+
+	// Always permit deletion
+	if (what == MODE_DEL)
+		return 1;
+
+	if (what2 != EXBTYPE_BAN)
+	{
+		if (checkt == EXBCHK_PARAM)
+			sendnotice(client, "Ban type ~f only works with bans (+b) and not with exceptions or invex (+e/+I)");
+		return 0; // Reject
+	}
+
+	strlcpy(paramtmp, param + 3, sizeof(paramtmp)); // Work on a size-truncated copy
+	chan = paramtmp;
+	matchby = strchr(paramtmp, ':');
+	if (!matchby || !matchby[1])
+		return extban_link_syntax(client, checkt, "Invalid syntax");
+	*matchby++ = '\0';
+
+	if (*chan != '#' || strchr(param, ','))
+		return extban_link_syntax(client, checkt, "Invalid channel");
+
+	// Possibly stack multiple extbans, this is a little convoluted due to extban API limitations
+	snprintf(tmpmask, sizeof(tmpmask), "~?:%s", matchby);
+	if (extban_is_ok_nuh_extban(client, channel, tmpmask, checkt, what, what2) == 0)
+		return extban_link_syntax(client, checkt, "Invalid matcher");
+
+	return 1; // Is ok
+}
+
+char *extban_link_conv_param(char *param)
+{
+	static char retbuf[MAX_EB_LEN + 1];
+	char paramtmp[MAX_EB_LEN + 1];
+	char tmpmask[MAX_EB_LEN + 1];
+	char *matchby; // Matching method, such as 'n!u@h'
+	char *newmask; // Cleaned matching method, such as 'n!u@h'
+	char *chan;
+
+	strlcpy(paramtmp, param + 3, sizeof(paramtmp)); // Work on a size-truncated copy
+	chan = paramtmp;
+	matchby = strchr(paramtmp, ':');
+	if (!matchby || !matchby[1])
+		return NULL;
+	*matchby++ = '\0';
+
+	if (!valid_channelname(chan))
+		return NULL;
+
+	// Possibly stack multiple extbans, this is a little convoluted due to extban API limitations
+	snprintf(tmpmask, sizeof(tmpmask), "~?:%s", matchby);
+	newmask = extban_conv_param_nuh_or_extban(tmpmask);
+	if (!newmask || (strlen(newmask) <= 3))
+		return NULL;
+
+	snprintf(retbuf, sizeof(retbuf), "~f:%s:%s", chan, newmask + 3);
+	return retbuf;
+}
+
+int extban_link_is_banned(Client *client, Channel *channel, char *ban, int type, char **msg, char **errmsg)
+{
+	// We don't actually ban here because we have to extract the channel name in PRE_LOCAL_JOIN anyways
+	return 0;
+}
+
+int link_doforward(Client *client, Channel *channel, char *linked, linkType type)
+{
+	char desc[64];
+	char *parv[3];
+
+	switch (type)
+	{
+		case LINKTYPE_BAN:
+			strncpy(desc, "you are banned", sizeof(desc));
+			break;
+
+		case LINKTYPE_INVITE:
+			strncpy(desc, "channel is invite only", sizeof(desc));
+			break;
+
+		case LINKTYPE_OPER:
+			strncpy(desc, "channel is oper only", sizeof(desc));
+			break;
+
+		case LINKTYPE_SSL:
+			strncpy(desc, "channel requires SSL", sizeof(desc));
+			break;
+
+		case LINKTYPE_REG:
+			strncpy(desc, "channel requires registration", sizeof(desc));
+			break;
+
+		case LINKTYPE_LIMIT:
+			strncpy(desc, "channel has become full", sizeof(desc));
+			break;
+
+		case LINKTYPE_BADKEY:
+			strncpy(desc, "invalid channel key", sizeof(desc));
+			break;
+
+		default:
+			strncpy(desc, "no reason specified", sizeof(desc));
+			break;
+	}
+
+	sendto_one(client, NULL,
+	           ":%s %d %s %s %s :[Link] Cannot join channel %s (%s) -- transferring you to %s",
+	           me.name, ERR_LINKCHANNEL, client->name, channel->chname, linked,
+	           channel->chname, desc, linked);
+	parv[0] = client->name;
+	parv[1] = linked;
+	parv[2] = NULL;
+	do_join(client, 2, parv);
+	return HOOK_DENY; // Original channel join = ignored
+}
+
+int link_pre_localjoin_cb(Client *client, Channel *channel, char *parv[])
+{
+	char *linked;
+	int canjoin;
+	Ban *ban;
+	char bantmp[MAX_EB_LEN + 1];
+	char *banchan;
+	char *banmask;
+
+	// User might already be on this channel, let's also exclude any possible services bots early
+	if (IsULine(client) || find_membership_link(client->user->channel, channel))
+		return HOOK_CONTINUE;
+
+	// Extbans take precedence over +L #channel and other restrictions
+	for(ban = channel->banlist; ban; ban = ban->next)
+	{
+		if (!strncmp(ban->banstr, "~f:", 3))
+		{
+			strlcpy(bantmp, ban->banstr + 3, sizeof(bantmp));
+		} else
+		if (!strncmp(ban->banstr, "~t:", 3))
+		{
+			/* A timed ban, but is it for us? Need to parse a little:
+			 * ~t:dddd:~f:...
+			 */
+			char *p = strchr(ban->banstr + 3, ':');
+			if (p && !strncmp(p, ":~f:", 4))
+			{
+				strlcpy(bantmp, p + 4, sizeof(bantmp));
+			} else {
+				/* Not for us - some other ~t ban */
+				continue;
+			}
+		} else
+		{
+			/* Not for us */
+			continue;
+		}
+		banchan = bantmp;
+		banmask = strchr(bantmp, ':');
+		if (!banmask || !banmask[1])
+			continue;
+		*banmask++ = '\0';
+
+		if (ban_check_mask(client, channel, banmask, BANCHK_JOIN, NULL, NULL, 0))
+			return link_doforward(client, channel, banchan, LINKTYPE_BAN);
+	}
+
+	// Either +L is not set, or it is set but the parameter isn't stored somehow
+	if (!(channel->mode.extmode & EXTMODE_LINK) || !(linked = cm_getparameter(channel, 'L')))
+		return HOOK_CONTINUE;
+
+	// can_join() actually returns 0 if we *can* join a channel, so we don't need to bother checking any further conditions
+	if (!(canjoin = can_join(client, channel, NULL, parv)))
+		return HOOK_CONTINUE;
+
+	// Oper only channel
+	if (has_channel_mode(channel, 'O') && !IsOper(client))
+		return link_doforward(client, channel, linked, LINKTYPE_OPER);
+
+	// SSL/TLS connected users only
+	if (has_channel_mode(channel, 'z') && !IsSecureConnect(client))
+		return link_doforward(client, channel, linked, LINKTYPE_SSL);
+
+	// Registered/identified users only
+	if (has_channel_mode(channel, 'R') && !IsRegNick(client))
+		return link_doforward(client, channel, linked, LINKTYPE_REG);
+
+	// For a couple of conditions we can use the return value from can_join() =]
+	switch(canjoin) {
+		// Any ban other than our own ~f: extban
+		case ERR_BANNEDFROMCHAN:
+			return link_doforward(client, channel, linked, LINKTYPE_BAN);
+
+		// Invite only
+		case ERR_INVITEONLYCHAN:
+			return link_doforward(client, channel, linked, LINKTYPE_INVITE);
+
+		// User limit
+		case ERR_CHANNELISFULL:
+			return link_doforward(client, channel, linked, LINKTYPE_LIMIT);
+
+		// Specified channel key doesn't match
+		case ERR_BADCHANNELKEY:
+			return link_doforward(client, channel, linked, LINKTYPE_BADKEY);
+
+		default:
+			break;
+	}
+
+	// Let any other errors be handled by their respective modules
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/chanmodes/nocolor.c b/src/modules/chanmodes/nocolor.c
new file mode 100644
index 0000000..781f983
--- /dev/null
+++ b/src/modules/chanmodes/nocolor.c
@@ -0,0 +1,142 @@
+/*
+ * Block Color UnrealIRCd Module (Channel Mode +c)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(nocolor);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/nocolor",
+	"4.2",
+	"Channel Mode +c",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NOCOLOR;
+
+#define IsNoColor(channel)    (channel->mode.extmode & EXTCMODE_NOCOLOR)
+
+int nocolor_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+char *nocolor_prelocalpart(Client *client, Channel *channel, char *comment);
+char *nocolor_prelocalquit(Client *client, char *comment);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	/* Channel mode */
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'c';
+	req.is_ok = extcmode_default_requirechop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NOCOLOR);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, nocolor_can_send_to_channel);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_PART, 0, nocolor_prelocalpart);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_QUIT_CHAN, 0, nocolor_prelocalpart);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_QUIT, 0, nocolor_prelocalquit);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static int IsUsingColor(char *s)
+{
+        if (!s)
+                return 0;
+
+        for (; *s; s++)
+                if (*s == 3 || *s == 27 || *s == 4 || *s == 22) /* mirc color, ansi, rgb, reverse */
+                        return 1;
+
+        return 0;
+}
+
+int nocolor_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	Hook *h;
+	int i;
+
+	if (MyUser(client) && IsNoColor(channel) && IsUsingColor(*msg))
+	{
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_COLOR);
+			if (i == HOOK_ALLOW)
+				return HOOK_CONTINUE; /* bypass this restriction */
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+
+		*errmsg = "Color is not permitted in this channel";
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
+
+char *nocolor_prelocalpart(Client *client, Channel *channel, char *comment)
+{
+	if (!comment)
+		return NULL;
+
+	if (MyUser(client) && IsNoColor(channel) && IsUsingColor(comment))
+		return NULL;
+
+	return comment;
+}
+
+/** Is any channel where the user is in +c? */
+static int IsAnyChannelNoColor(Client *client)
+{
+	Membership *lp;
+
+	for (lp = client->user->channel; lp; lp = lp->next)
+		if (IsNoColor(lp->channel))
+			return 1;
+	return 0;
+}
+
+char *nocolor_prelocalquit(Client *client, char *comment)
+{
+	if (!comment)
+		return NULL;
+
+	if (MyUser(client) && !BadPtr(comment) && IsUsingColor(comment) && IsAnyChannelNoColor(client))
+		return NULL;
+
+	return comment;
+}
diff --git a/src/modules/chanmodes/noctcp.c b/src/modules/chanmodes/noctcp.c
new file mode 100644
index 0000000..0402ed7
--- /dev/null
+++ b/src/modules/chanmodes/noctcp.c
@@ -0,0 +1,89 @@
+/*
+ * Block CTCP UnrealIRCd Module (Channel Mode +C)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(noctcp);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/noctcp",
+	"4.2",
+	"Channel Mode +C",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NOCTCP;
+
+#define IsNoCTCP(channel)    (channel->mode.extmode & EXTCMODE_NOCTCP)
+
+int noctcp_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'C';
+	req.is_ok = extcmode_default_requirehalfop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NOCTCP);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, noctcp_can_send_to_channel);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static int IsACTCP(char *s)
+{
+	if (!s)
+		return 0;
+
+	if ((*s == '\001') && strncmp(&s[1], "ACTION ", 7))
+		return 1;
+
+	return 0;
+}
+
+int noctcp_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	if (IsNoCTCP(channel) && IsACTCP(*msg))
+	{
+		*errmsg = "CTCPs are not permitted in this channel";
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/chanmodes/noinvite.c b/src/modules/chanmodes/noinvite.c
new file mode 100644
index 0000000..d6874aa
--- /dev/null
+++ b/src/modules/chanmodes/noinvite.c
@@ -0,0 +1,99 @@
+/*
+ * Disallow invites UnrealIRCd Module (Channel Mode +V)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(noinvite);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/noinvite",
+	"4.2",
+	"Channel Mode +V",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NOINVITE;
+
+#define IsNoInvite(channel)    (channel->mode.extmode & EXTCMODE_NOINVITE)
+
+int noinvite_pre_knock(Client *client, Channel *channel);
+int noinvite_pre_invite(Client *client, Client *target, Channel *channel, int *override);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'V';
+	req.is_ok = extcmode_default_requirechop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NOINVITE);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_KNOCK, 0, noinvite_pre_knock);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_INVITE, 0, noinvite_pre_invite);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+int noinvite_pre_knock(Client *client, Channel *channel)
+{
+	if (MyUser(client) && IsNoInvite(channel))
+	{
+		sendnumeric(client, ERR_CANNOTKNOCK,
+				    channel->chname, "The channel does not allow invites (+V)");
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
+
+int noinvite_pre_invite(Client *client, Client *target, Channel *channel, int *override)
+{
+	if (MyUser(client) && IsNoInvite(channel))
+	{
+		if (ValidatePermissionsForPath("channel:override:invite:noinvite",client,NULL,channel,NULL) && client == target)
+		{
+			*override = 1;
+		} else {
+			sendnumeric(client, ERR_NOINVITE, channel->chname);
+			return HOOK_DENY;
+		}
+	}
+
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/chanmodes/nokick.c b/src/modules/chanmodes/nokick.c
new file mode 100644
index 0000000..899d7c9
--- /dev/null
+++ b/src/modules/chanmodes/nokick.c
@@ -0,0 +1,85 @@
+/*
+ * No kicks in channel UnrealIRCd Module (Channel Mode +Q)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/nokick",
+	"4.2",
+	"Channel Mode +Q",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NOKICK;
+
+#define IsNoKick(channel)    (channel->mode.extmode & EXTCMODE_NOKICK)
+
+int nokick_check (Client *client, Client *who, Channel *channel, char *comment, long client_flags, long who_flags, char **reject_reason);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'Q';
+	req.is_ok = extcmode_default_requirechop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NOKICK);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_KICK, 0, nokick_check);
+
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int nokick_check (Client *client, Client *who, Channel *channel, char *comment, long client_flags, long who_flags, char **reject_reason)
+{
+	static char errmsg[256];
+
+	if (MyUser(client) && IsNoKick(channel))
+	{
+		ircsnprintf(errmsg, sizeof(errmsg), ":%s %d %s %s :%s",
+		            me.name, ERR_CANNOTDOCOMMAND, client->name,
+		            "KICK", "channel is +Q");
+		*reject_reason = errmsg;
+		return EX_DENY; /* Deny, but let opers override if necessary. */
+	}
+
+	return EX_ALLOW;
+}
+
diff --git a/src/modules/chanmodes/noknock.c b/src/modules/chanmodes/noknock.c
new file mode 100644
index 0000000..d5b36a4
--- /dev/null
+++ b/src/modules/chanmodes/noknock.c
@@ -0,0 +1,105 @@
+/*
+ * Disallow knocks UnrealIRCd Module (Channel Mode +K)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/noknock",
+	"4.2",
+	"Channel Mode +K",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NOKNOCK;
+
+#define IsNoKnock(channel)    (channel->mode.extmode & EXTCMODE_NOKNOCK)
+
+int noknock_check (Client *client, Channel *channel);
+int noknock_mode_allow(Client *client, Channel *channel, char mode, char *para, int checkt, int what);
+int noknock_mode_del (Channel *channel, int modeChar);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'K';
+	req.is_ok = noknock_mode_allow;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NOKNOCK);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_KNOCK, 0, noknock_check);
+	HookAdd(modinfo->handle, HOOKTYPE_MODECHAR_DEL, 0, noknock_mode_del);
+
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+int noknock_check (Client *client, Channel *channel)
+{
+	if (MyUser(client) && IsNoKnock(channel))
+	{
+		sendnumeric(client, ERR_CANNOTKNOCK, channel->chname, "No knocks are allowed! (+K)");
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
+
+int noknock_mode_del (Channel *channel, int modeChar)
+{
+	// Remove noknock when we're removing invite only
+	if (modeChar == 'i')
+		channel->mode.extmode &= ~EXTCMODE_NOKNOCK;
+
+	return 0;
+}
+
+int noknock_mode_allow(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	if (!(channel->mode.mode & MODE_INVITEONLY))
+	{
+		if (checkt == EXCHK_ACCESS_ERR)
+		{
+			sendnumeric(client, ERR_CANNOTCHANGECHANMODE, 'K', "+i must be set");
+		}
+		return EX_DENY;
+	}
+
+	return extcmode_default_requirehalfop(client, channel, mode, para, checkt, what);
+}
diff --git a/src/modules/chanmodes/nonickchange.c b/src/modules/chanmodes/nonickchange.c
new file mode 100644
index 0000000..1d28e38
--- /dev/null
+++ b/src/modules/chanmodes/nonickchange.c
@@ -0,0 +1,81 @@
+/*
+ * No nick changes in channel UnrealIRCd Module (Channel Mode +N)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/nonickchange",
+	"4.2",
+	"Channel Mode +N",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NONICKCHANGE;
+
+#define IsNoNickChange(channel)    (channel->mode.extmode & EXTCMODE_NONICKCHANGE)
+
+int nonickchange_check (Client *client, Channel *channel);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'N';
+	req.is_ok = extcmode_default_requirehalfop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NONICKCHANGE);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CHAN_PERMIT_NICK_CHANGE, 0, nonickchange_check);
+
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int nonickchange_check (Client *client, Channel *channel)
+{
+	if (!IsOper(client) && !IsULine(client)
+		&& IsNoNickChange(channel)
+		&& !is_chan_op(client, channel))
+	{
+		return HOOK_DENY;
+	}
+
+	return HOOK_ALLOW;
+}
+
diff --git a/src/modules/chanmodes/nonotice.c b/src/modules/chanmodes/nonotice.c
new file mode 100644
index 0000000..deadff9
--- /dev/null
+++ b/src/modules/chanmodes/nonotice.c
@@ -0,0 +1,89 @@
+/*
+ * Disallow notices in channel UnrealIRCd Module (Channel Mode +T)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/nonotice",
+	"4.2",
+	"Channel Mode +T",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_NONOTICE;
+
+#define IsNoNotice(channel)    (channel->mode.extmode & EXTCMODE_NONOTICE)
+
+int nonotice_check_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'T';
+	req.is_ok = extcmode_default_requirechop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_NONOTICE);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, nonotice_check_can_send_to_channel);
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int nonotice_check_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	Hook *h;
+	int i;
+
+	if (notice && IsNoNotice(channel) &&
+	   (!lp || !(lp->flags & (CHFL_CHANOP | CHFL_CHANOWNER | CHFL_CHANADMIN))))
+	{
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_NOTICE);
+			if (i == HOOK_ALLOW)
+				return HOOK_CONTINUE; /* bypass restriction */
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+		*errmsg = "NOTICEs are not permitted in this channel";
+		return HOOK_DENY; /* block notice */
+	}
+
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/chanmodes/operonly.c b/src/modules/chanmodes/operonly.c
new file mode 100644
index 0000000..4b959c0
--- /dev/null
+++ b/src/modules/chanmodes/operonly.c
@@ -0,0 +1,108 @@
+/*
+ * Disallow knocks UnrealIRCd Module (Channel Mode +K)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(operonly);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/operonly",
+	"4.2",
+	"Channel Mode +O",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_OPERONLY;
+
+int operonly_require_oper(Client *client, Channel *channel, char mode, char *para, int checkt, int what);
+int operonly_check (Client *client, Channel *channel, char *key, char *parv[]);
+int operonly_topic_allow (Client *client, Channel *channel);
+int operonly_check_ban(Client *client, Channel *channel);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'O';
+	req.is_ok = operonly_require_oper;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_OPERONLY);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_JOIN, 0, operonly_check);
+	HookAdd(modinfo->handle, HOOKTYPE_OPER_INVITE_BAN, 0, operonly_check_ban);
+	HookAdd(modinfo->handle, HOOKTYPE_VIEW_TOPIC_OUTSIDE_CHANNEL, 0, operonly_topic_allow);
+
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int operonly_check (Client *client, Channel *channel, char *key, char *parv[])
+{
+	if ((channel->mode.extmode & EXTCMODE_OPERONLY) && !ValidatePermissionsForPath("channel:operonly:join",client,NULL,channel,NULL))
+		return ERR_OPERONLY;
+	return 0;
+}
+
+int operonly_check_ban(Client *client, Channel *channel)
+{
+	 if ((channel->mode.extmode & EXTCMODE_OPERONLY) &&
+		    !ValidatePermissionsForPath("channel:operonly:ban",client,NULL,NULL,NULL))
+		 return HOOK_DENY;
+
+	 return HOOK_CONTINUE;
+}
+
+int operonly_topic_allow (Client *client, Channel *channel)
+{
+	if (channel->mode.extmode & EXTCMODE_OPERONLY && !ValidatePermissionsForPath("channel:operonly:topic",client,NULL,channel,NULL))
+		return HOOK_DENY;
+
+	return HOOK_CONTINUE;
+}
+
+int operonly_require_oper(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	if (!MyUser(client) || ValidatePermissionsForPath("channel:operonly:set",client,NULL,channel,NULL))
+		return EX_ALLOW;
+
+	if (checkt == EXCHK_ACCESS_ERR)
+		sendnumeric(client, ERR_CANNOTCHANGECHANMODE, 'O', "You are not an IRC operator");
+
+	return EX_DENY;
+}
+
diff --git a/src/modules/chanmodes/permanent.c b/src/modules/chanmodes/permanent.c
new file mode 100644
index 0000000..bccc443
--- /dev/null
+++ b/src/modules/chanmodes/permanent.c
@@ -0,0 +1,97 @@
+/*
+ * UnrealIRCd, src/modules/chanmodes/permanent.c
+ * Copyright (c) 2013 William Pitcock <nenolod@dereferenced.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/permanent",
+	"4.2",
+	"Permanent channel mode (+P)", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+static Cmode_t EXTMODE_PERMANENT = 0L;
+
+static int permanent_channel_destroy(Channel *channel, int *should_destroy)
+{
+	if (channel->mode.extmode & EXTMODE_PERMANENT)
+		*should_destroy = 0;
+	
+	return 0;
+}
+
+static int permanent_is_ok(Client *client, Channel *channel, char mode, char *para, int checkt, int what)
+{
+	if (!IsOper(client))
+	{
+		if (checkt == EXCHK_ACCESS_ERR)
+			sendnumeric(client, ERR_NOPRIVILEGES);
+
+		return EX_DENY;
+	}
+
+	return EX_ALLOW;
+}
+
+int permanent_chanmode(Client *client, Channel *channel, MessageTag *mtags, char *modebuf, char *parabuf, time_t sendts, int samode)
+{
+	if (samode == -1)
+		return 0; /* SJOIN server-sync, already has its own way of destroying the channel */
+
+	/* Destroy the channel if it was set '(SA)MODE #chan -P' with nobody in it (#4442) */
+	if (!(channel->mode.extmode & EXTMODE_PERMANENT) && (channel->users <= 0))
+		sub1_from_channel(channel);
+	
+	return 0;
+}
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+CmodeInfo req;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'P';
+	req.is_ok = permanent_is_ok;
+	CmodeAdd(modinfo->handle, req, &EXTMODE_PERMANENT);
+
+	HookAdd(modinfo->handle, HOOKTYPE_CHANNEL_DESTROY, -100000, permanent_channel_destroy);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_CHANMODE, 1000000, permanent_chanmode);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_CHANMODE, 1000000, permanent_chanmode);
+
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
diff --git a/src/modules/chanmodes/regonly.c b/src/modules/chanmodes/regonly.c
new file mode 100644
index 0000000..8b1b559
--- /dev/null
+++ b/src/modules/chanmodes/regonly.c
@@ -0,0 +1,77 @@
+/*
+ * Registered users only UnrealIRCd Module (Channel Mode +R)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/regonly",
+	"4.2",
+	"Channel Mode +R",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_REGONLY;
+
+#define IsRegOnly(channel)    (channel->mode.extmode & EXTCMODE_REGONLY)
+
+int regonly_check (Client *client, Channel *channel, char *key, char *parv[]);
+
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'R';
+	req.is_ok = extcmode_default_requirehalfop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_REGONLY);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_JOIN, 0, regonly_check);
+
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int regonly_check (Client *client, Channel *channel, char *key, char *parv[])
+{
+	if (IsRegOnly(channel) && !IsLoggedIn(client))
+		return ERR_NEEDREGGEDNICK;
+	return 0;
+}
+
diff --git a/src/modules/chanmodes/regonlyspeak.c b/src/modules/chanmodes/regonlyspeak.c
new file mode 100644
index 0000000..b703bb4
--- /dev/null
+++ b/src/modules/chanmodes/regonlyspeak.c
@@ -0,0 +1,108 @@
+/*
+ * Only registered users can speak UnrealIRCd Module (Channel Mode +M)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/regonlyspeak",
+	"4.2",
+	"Channel Mode +M",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_REGONLYSPEAK;
+static char errMsg[2048];
+
+#define IsRegOnlySpeak(channel)    (channel->mode.extmode & EXTCMODE_REGONLYSPEAK)
+
+int regonlyspeak_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+char *regonlyspeak_part_message (Client *client, Channel *channel, char *comment);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'M';
+	req.is_ok = extcmode_default_requirehalfop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_REGONLYSPEAK);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, regonlyspeak_can_send_to_channel);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_PART, 0, regonlyspeak_part_message);
+
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+char *regonlyspeak_part_message (Client *client, Channel *channel, char *comment)
+{
+	if (!comment)
+		return NULL;
+
+	if (IsRegOnlySpeak(channel) && !IsLoggedIn(client) && !ValidatePermissionsForPath("channel:override:message:regonlyspeak",client,NULL,NULL,NULL))
+		return NULL;
+
+	return comment;
+}
+
+int regonlyspeak_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	Hook *h;
+	int i;
+
+	if (IsRegOnlySpeak(channel) && !op_can_override("channel:override:message:regonlyspeak",client,channel,NULL) && !IsLoggedIn(client) &&
+		    (!lp
+		    || !(lp->flags & (CHFL_CHANOP | CHFL_VOICE | CHFL_CHANOWNER |
+		    CHFL_HALFOP | CHFL_CHANADMIN))))
+	{
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_MODERATED);
+			if (i == HOOK_ALLOW)
+				return HOOK_CONTINUE; /* bypass +M restriction */
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+
+		*errmsg = "You must have a registered nick (+r) to talk on this channel";
+		return HOOK_DENY; /* BLOCK message */
+	}
+
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/chanmodes/secureonly.c b/src/modules/chanmodes/secureonly.c
new file mode 100644
index 0000000..0330e70
--- /dev/null
+++ b/src/modules/chanmodes/secureonly.c
@@ -0,0 +1,201 @@
+/*
+ * Only allow secure users to join UnrealIRCd Module (Channel Mode +z)
+ * (C) Copyright 2014 Travis McArthur (Heero) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/secureonly",
+	"4.2",
+	"Channel Mode +z",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_SECUREONLY;
+
+#define IsSecureOnly(channel)    (channel->mode.extmode & EXTCMODE_SECUREONLY)
+
+int secureonly_check_join(Client *client, Channel *channel, char *key, char *parv[]);
+int secureonly_channel_sync (Channel *channel, int merge, int removetheirs, int nomode);
+int secureonly_send_channel(Client *client, Channel *channel);
+int secureonly_check_secure(Channel *channel);
+int secureonly_check_sajoin(Client *target, Channel *channel, Client *requester);
+int secureonly_specialcheck(Client *client, Channel *channel, char *parv[]);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CmodeInfo req;
+
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'z';
+	req.is_ok = extcmode_default_requirechop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_SECUREONLY);
+
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_JOIN, 0, secureonly_specialcheck);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_JOIN, 0, secureonly_check_join);
+	HookAdd(modinfo->handle, HOOKTYPE_CHANNEL_SYNCED, 0, secureonly_channel_sync);
+	HookAdd(modinfo->handle, HOOKTYPE_IS_CHANNEL_SECURE, 0, secureonly_check_secure);
+	HookAdd(modinfo->handle, HOOKTYPE_SEND_CHANNEL, 0, secureonly_send_channel);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SAJOIN, 0, secureonly_check_sajoin);
+
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/** Kicks all insecure users on a +z channel
+ * Returns 1 if the channel was destroyed as a result of this.
+ */
+static int secureonly_kick_insecure_users(Channel *channel)
+{
+	Member *member, *mb2;
+	Client *client;
+	int i = 0;
+	Hook *h;
+	char *comment = "Insecure user not allowed on secure channel (+z)";
+
+	if (!IsSecureOnly(channel))
+		return 0;
+
+	for (member = channel->members; member; member = mb2)
+	{
+		mb2 = member->next;
+		client = member->client;
+		if (MyUser(client) && !IsSecureConnect(client) && !IsULine(client))
+		{
+			int prefix = 0;
+			MessageTag *mtags = NULL;
+
+			if (invisible_user_in_channel(client, channel))
+			{
+				/* Send only to chanops */
+				prefix = CHFL_HALFOP|CHFL_CHANOP|CHFL_CHANOWNER|CHFL_CHANADMIN;
+			}
+
+			new_message(&me, NULL, &mtags);
+
+			RunHook6(HOOKTYPE_LOCAL_KICK, &me, &me, client, channel, mtags, comment);
+
+			sendto_channel(channel, &me, client,
+				       prefix, 0,
+				       SEND_LOCAL, mtags,
+				       ":%s KICK %s %s :%s",
+				       me.name, channel->chname, client->name, comment);
+
+			sendto_prefix_one(client, &me, mtags, ":%s KICK %s %s :%s", me.name, channel->chname, client->name, comment);
+
+			sendto_server(NULL, 0, 0, mtags, ":%s KICK %s %s :%s", me.id, channel->chname, client->id, comment);
+
+			free_message_tags(mtags);
+
+			if (remove_user_from_channel(client, channel) == 1)
+				return 1; /* channel was destroyed */
+		}
+	}
+	return 0;
+}
+
+int secureonly_check_join(Client *client, Channel *channel, char *key, char *parv[])
+{
+	Link *lp;
+
+	if (IsSecureOnly(channel) && !(client->umodes & UMODE_SECURE))
+	{
+		if (ValidatePermissionsForPath("channel:override:secureonly",client,NULL,channel,NULL))
+		{
+			/* if the channel is +z we still allow an ircop to bypass it
+			 * if they are invited.
+			 */
+			for (lp = client->user->invited; lp; lp = lp->next)
+				if (lp->value.channel == channel)
+					return HOOK_CONTINUE;
+		}
+		return (ERR_SECUREONLYCHAN);
+	}
+	return 0;
+}
+
+int secureonly_check_secure(Channel *channel)
+{
+	if (IsSecureOnly(channel))
+	{
+		return 1;
+	}
+
+	return 0;
+}
+
+int secureonly_channel_sync(Channel *channel, int merge, int removetheirs, int nomode)
+{
+	if (!merge && !removetheirs && !nomode)
+		return secureonly_kick_insecure_users(channel); /* may return 1, meaning channel is destroyed */
+	return 0;
+}
+
+int secureonly_send_channel(Client *client, Channel *channel)
+{
+	if (IsSecureOnly(channel))
+		if (!IsSecure(client))
+			return HOOK_DENY;
+
+	return HOOK_CONTINUE;
+}
+
+int secureonly_check_sajoin(Client *target, Channel *channel, Client *requester)
+{
+	if (IsSecureOnly(channel) && !IsSecure(target))
+	{
+		sendnotice(requester, "You cannot SAJOIN %s to %s because the channel is +z and the user is not connected via SSL/TLS",
+			target->name, channel->chname);
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
+
+/* Special check for +z in set::modes-on-join. Needs to be done early.
+ * Perhaps one day this will be properly handled in the core so this can be removed.
+ */
+int secureonly_specialcheck(Client *client, Channel *channel, char *parv[])
+{
+	if ((channel->users == 0) && (iConf.modes_on_join.extmodes & EXTCMODE_SECUREONLY) && !IsSecure(client) && !IsOper(client))
+	{
+		sendnumeric(client, ERR_SECUREONLYCHAN, channel->chname);
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/chanmodes/stripcolor.c b/src/modules/chanmodes/stripcolor.c
new file mode 100644
index 0000000..c12b6cc
--- /dev/null
+++ b/src/modules/chanmodes/stripcolor.c
@@ -0,0 +1,131 @@
+/*
+ * Strip Color UnrealIRCd Module (Channel Mode +S)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(stripcolor);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chanmodes/stripcolor",
+	"4.2",
+	"Channel Mode +S",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+Cmode_t EXTCMODE_STRIPCOLOR;
+
+#define IsStripColor(channel)    (channel->mode.extmode & EXTCMODE_STRIPCOLOR)
+
+int stripcolor_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+char *stripcolor_prelocalpart(Client *client, Channel *channel, char *comment);
+char *stripcolor_prelocalquit(Client *client, char *comment);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	/* Channel mode */
+	memset(&req, 0, sizeof(req));
+	req.paracount = 0;
+	req.flag = 'S';
+	req.is_ok = extcmode_default_requirechop;
+	CmodeAdd(modinfo->handle, req, &EXTCMODE_STRIPCOLOR);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, stripcolor_can_send_to_channel);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_PART, 0, stripcolor_prelocalpart);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_QUIT_CHAN, 0, stripcolor_prelocalpart);
+	HookAddPChar(modinfo->handle, HOOKTYPE_PRE_LOCAL_QUIT, 0, stripcolor_prelocalquit);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int stripcolor_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	Hook *h;
+	int i;
+
+	if (MyUser(client) && IsStripColor(channel))
+	{
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_COLOR);
+			if (i == HOOK_ALLOW)
+				return HOOK_CONTINUE; /* bypass this restriction */
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+
+		*msg = StripColors(*msg);
+	}
+
+	return HOOK_CONTINUE;
+}
+
+char *stripcolor_prelocalpart(Client *client, Channel *channel, char *comment)
+{
+	if (!comment)
+		return NULL;
+
+	if (MyUser(client) && IsStripColor(channel))
+		comment = StripColors(comment);
+
+	return comment;
+}
+
+/** Is any channel where the user is in +S? */
+static int IsAnyChannelStripColor(Client *client)
+{
+	Membership *lp;
+
+	for (lp = client->user->channel; lp; lp = lp->next)
+		if (IsStripColor(lp->channel))
+			return 1;
+	return 0;
+}
+
+
+char *stripcolor_prelocalquit(Client *client, char *comment)
+{
+	if (!comment)
+		return NULL;
+
+	if (MyUser(client) && !BadPtr(comment) && IsAnyChannelStripColor(client))
+		comment = StripColors(comment);
+        
+	return comment;
+}
+
diff --git a/src/modules/channeldb.c b/src/modules/channeldb.c
new file mode 100644
index 0000000..51a77ae
--- /dev/null
+++ b/src/modules/channeldb.c
@@ -0,0 +1,499 @@
+/*
+ * Stores channel settings for +P channels in a .db file
+ * (C) Copyright 2019 Syzop, Gottem and the UnrealIRCd team
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER = {
+	"channeldb",
+	"1.0",
+	"Stores and retrieves channel settings for persistent (+P) channels",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+#define CHANNELDB_VERSION 100
+#define CHANNELDB_SAVE_EVERY 299
+
+#define MAGIC_CHANNEL_START	0x11111111
+#define MAGIC_CHANNEL_END	0x22222222
+
+#ifdef DEBUGMODE
+ #define BENCHMARK
+#endif
+
+#define WARN_WRITE_ERROR(fname) \
+	do { \
+		sendto_realops_and_log("[channeldb] Error writing to temporary database file " \
+		                       "'%s': %s (DATABASE NOT SAVED)", \
+		                       fname, strerror(errno)); \
+	} while(0)
+
+#define W_SAFE(x) \
+	do { \
+		if (!(x)) { \
+			WARN_WRITE_ERROR(tmpfname); \
+			fclose(fd); \
+			return 0; \
+		} \
+	} while(0)
+
+#define IsMDErr(x, y, z) \
+	do { \
+		if (!(x)) { \
+			config_error("A critical error occurred when registering ModData for %s: %s", MOD_HEADER.name, ModuleGetErrorStr((z)->handle)); \
+			return MOD_FAILED; \
+		} \
+	} while(0)
+
+/* Forward declarations */
+void channeldb_moddata_free(ModData *md);
+void setcfg(void);
+void freecfg(void);
+int channeldb_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int channeldb_configrun(ConfigFile *cf, ConfigEntry *ce, int type);
+EVENT(write_channeldb_evt);
+int write_channeldb(void);
+int write_channel_entry(FILE *fd, const char *tmpfname, Channel *channel);
+int read_channeldb(void);
+static void set_channel_mode(Channel *channel, char *modes, char *parameters);
+
+/* Global variables */
+static uint32_t channeldb_version = CHANNELDB_VERSION;
+struct cfgstruct {
+	char *database;
+};
+static struct cfgstruct cfg;
+
+static int channeldb_loaded = 0;
+
+MOD_TEST()
+{
+	memset(&cfg, 0, sizeof(cfg));
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, channeldb_configtest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	LoadPersistentInt(modinfo, channeldb_loaded);
+
+	setcfg();
+
+	if (!channeldb_loaded)
+	{
+		/* If this is the first time that our module is loaded, then read the database. */
+		if (!read_channeldb())
+		{
+			char fname[512];
+			snprintf(fname, sizeof(fname), "%s.corrupt", cfg.database);
+			if (rename(cfg.database, fname) == 0)
+				config_warn("[channeldb] Existing database renamed to %s and starting a new one...", fname);
+			else
+				config_warn("[channeldb] Failed to rename database from %s to %s: %s", cfg.database, fname, strerror(errno));
+		}
+		channeldb_loaded = 1;
+	}
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, channeldb_configrun);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(modinfo->handle, "channeldb_write_channeldb", write_channeldb_evt, NULL, CHANNELDB_SAVE_EVERY*1000, 0);
+	if (ModuleGetError(modinfo->handle) != MODERR_NOERROR)
+	{
+		config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	write_channeldb();
+	freecfg();
+	SavePersistentInt(modinfo, channeldb_loaded);
+	return MOD_SUCCESS;
+}
+
+void channeldb_moddata_free(ModData *md)
+{
+	if (md->i)
+		md->i = 0;
+}
+
+void setcfg(void)
+{
+	// Default: data/channel.db
+	safe_strdup(cfg.database, "channel.db");
+	convert_to_absolute_path(&cfg.database, PERMDATADIR);
+}
+
+void freecfg(void)
+{
+	safe_free(cfg.database);
+}
+
+int channeldb_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	// We are only interested in set::channeldb::database
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!ce || strcmp(ce->ce_varname, "channeldb"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata) {
+			config_error("%s:%i: blank set::channeldb::%s without value", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "database")) {
+			convert_to_absolute_path(&cep->ce_vardata, PERMDATADIR);
+			continue;
+		}
+		config_error("%s:%i: unknown directive set::channeldb::%s", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int channeldb_configrun(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	// We are only interested in set::channeldb::database
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!ce || strcmp(ce->ce_varname, "channeldb"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "database"))
+			safe_strdup(cfg.database, cep->ce_vardata);
+	}
+	return 1;
+}
+
+EVENT(write_channeldb_evt)
+{
+	write_channeldb();
+}
+
+int write_channeldb(void)
+{
+	char tmpfname[512];
+	FILE *fd;
+	Channel *channel;
+	int cnt = 0;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	// Write to a tempfile first, then rename it if everything succeeded
+	snprintf(tmpfname, sizeof(tmpfname), "%s.tmp", cfg.database);
+	fd = fopen(tmpfname, "wb");
+	if (!fd)
+	{
+		WARN_WRITE_ERROR(tmpfname);
+		return 0;
+	}
+
+	W_SAFE(write_data(fd, &channeldb_version, sizeof(channeldb_version)));
+
+	/* First, count +P channels and write the count to the database */
+	for (channel = channels; channel; channel=channel->nextch)
+		if (has_channel_mode(channel, 'P'))
+			cnt++;
+	W_SAFE(write_int64(fd, cnt));
+
+	for (channel = channels; channel; channel=channel->nextch)
+	{
+		/* We only care about +P (persistent) channels */
+		if (has_channel_mode(channel, 'P'))
+		{
+			if (!write_channel_entry(fd, tmpfname, channel))
+				return 0;
+		}
+	}
+
+	// Everything seems to have gone well, attempt to close and rename the tempfile
+	if (fclose(fd) != 0)
+	{
+		WARN_WRITE_ERROR(tmpfname);
+		return 0;
+	}
+
+#ifdef _WIN32
+	/* The rename operation cannot be atomic on Windows as it will cause a "file exists" error */
+	unlink(cfg.database);
+#endif
+	if (rename(tmpfname, cfg.database) < 0)
+	{
+		sendto_realops_and_log("[channeldb] Error renaming '%s' to '%s': %s (DATABASE NOT SAVED)", tmpfname, cfg.database, strerror(errno));
+		return 0;
+	}
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	config_status("[channeldb] Benchmark: SAVE DB: %ld microseconds",
+		((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec));
+#endif
+	return 1;
+}
+
+int write_listmode(FILE *fd, const char *tmpfname, Ban *lst)
+{
+	Ban *l;
+	int cnt = 0;
+
+	/* First count and write the list count */
+	for (l = lst; l; l = l->next)
+		cnt++;
+	W_SAFE(write_int32(fd, cnt));
+
+	for (l = lst; l; l = l->next)
+	{
+		/* The entry, setby, seton */
+		W_SAFE(write_str(fd, l->banstr));
+		W_SAFE(write_str(fd, l->who));
+		W_SAFE(write_int64(fd, l->when));
+	}
+	return 1;
+}
+
+int write_channel_entry(FILE *fd, const char *tmpfname, Channel *channel)
+{
+	W_SAFE(write_int32(fd, MAGIC_CHANNEL_START));
+	/* Channel name */
+	W_SAFE(write_str(fd, channel->chname));
+	/* Channel creation time */
+	W_SAFE(write_int64(fd, channel->creationtime));
+	/* Topic (topic, setby, seton) */
+	W_SAFE(write_str(fd, channel->topic));
+	W_SAFE(write_str(fd, channel->topic_nick));
+	W_SAFE(write_int64(fd, channel->topic_time));
+	/* Basic channel modes (eg: +sntkl key 55) */
+	channel_modes(&me, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), channel);
+	W_SAFE(write_str(fd, modebuf));
+	W_SAFE(write_str(fd, parabuf));
+	/* Mode lock */
+	W_SAFE(write_str(fd, channel->mode_lock));
+	/* List modes (bans, exempts, invex) */
+	if (!write_listmode(fd, tmpfname, channel->banlist))
+		return 0;
+	if (!write_listmode(fd, tmpfname, channel->exlist))
+		return 0;
+	if (!write_listmode(fd, tmpfname, channel->invexlist))
+		return 0;
+	W_SAFE(write_int32(fd, MAGIC_CHANNEL_END));
+	return 1;
+}
+
+#define R_SAFE(x) \
+	do { \
+		if (!(x)) { \
+			config_warn("[channeldb] Read error from database file '%s' (possible corruption): %s", cfg.database, strerror(errno)); \
+			if (e) \
+			{ \
+				safe_free(e->banstr); \
+				safe_free(e->who); \
+				safe_free(e); \
+			} \
+			return 0; \
+		} \
+	} while(0)
+
+int read_listmode(FILE *fd, Ban **lst)
+{
+	uint32_t total;
+	uint64_t when;
+	int i;
+	Ban *e = NULL;
+
+	R_SAFE(read_data(fd, &total, sizeof(total)));
+
+	for (i = 0; i < total; i++)
+	{
+		e = safe_alloc(sizeof(Ban));
+		R_SAFE(read_str(fd, &e->banstr));
+		R_SAFE(read_str(fd, &e->who));
+		R_SAFE(read_data(fd, &when, sizeof(when)));
+		e->when = when;
+		e->next = *lst;
+		*lst = e;
+	}
+
+	return 1;
+}
+#undef R_SAFE
+
+#define FreeChannelEntry() \
+ 	do { \
+		/* Some of these might be NULL */ \
+		safe_free(chname); \
+		safe_free(topic); \
+		safe_free(topic_nick); \
+		safe_free(modes1); \
+		safe_free(modes2); \
+		safe_free(mode_lock); \
+	} while(0)
+
+#define R_SAFE(x) \
+	do { \
+		if (!(x)) { \
+			config_warn("[channeldb] Read error from database file '%s' (possible corruption): %s", cfg.database, strerror(errno)); \
+			fclose(fd); \
+			FreeChannelEntry(); \
+			return 0; \
+		} \
+	} while(0)
+
+int read_channeldb(void)
+{
+	FILE *fd;
+	uint32_t version;
+	int added = 0;
+	int i;
+	uint64_t count = 0;
+	uint32_t magic;
+	// Variables for the channels
+	// Some of them need to be declared and NULL initialised early due to the macro FreeChannelEntry() being used by R_SAFE() on error
+	char *chname = NULL;
+	uint64_t creationtime = 0;
+	char *topic = NULL;
+	char *topic_nick = NULL;
+	uint64_t topic_time = 0;
+	char *modes1 = NULL;
+	char *modes2 = NULL;
+	char *mode_lock = NULL;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	fd = fopen(cfg.database, "rb");
+	if (!fd)
+	{
+		if (errno == ENOENT)
+		{
+			/* Database does not exist. Could be first boot */
+			config_warn("[channeldb] No database present at '%s', will start a new one", cfg.database);
+			return 1;
+		} else {
+			config_warn("[channeldb] Unable to open the database file '%s' for reading: %s", cfg.database, strerror(errno));
+			return 0;
+		}
+	}
+
+	R_SAFE(read_data(fd, &version, sizeof(version)));
+	if (version > channeldb_version)
+	{
+		config_warn("[channeldb] Database '%s' has a wrong version: expected it to be <= %u but got %u instead", cfg.database, channeldb_version, version);
+		fclose(fd);
+		return 0;
+	}
+
+	R_SAFE(read_data(fd, &count, sizeof(count)));
+
+	for (i=1; i <= count; i++)
+	{
+		// Variables
+		chname = NULL;
+		creationtime = 0;
+		topic = NULL;
+		topic_nick = NULL;
+		topic_time = 0;
+		modes1 = NULL;
+		modes2 = NULL;
+		mode_lock = NULL;
+		
+		Channel *channel;
+		R_SAFE(read_data(fd, &magic, sizeof(magic)));
+		if (magic != MAGIC_CHANNEL_START)
+		{
+			config_error("[channeldb] Corrupt database (%s) - channel magic start is 0x%x. Further reading aborted.", cfg.database, magic);
+			break;
+		}
+		R_SAFE(read_str(fd, &chname));
+		R_SAFE(read_data(fd, &creationtime, sizeof(creationtime)));
+		R_SAFE(read_str(fd, &topic));
+		R_SAFE(read_str(fd, &topic_nick));
+		R_SAFE(read_data(fd, &topic_time, sizeof(topic_time)));
+		R_SAFE(read_str(fd, &modes1));
+		R_SAFE(read_str(fd, &modes2));
+		R_SAFE(read_str(fd, &mode_lock));
+		/* If we got this far, we can create/initialize the channel with the above */
+		channel = get_channel(&me, chname, CREATE);
+		channel->creationtime = creationtime;
+		safe_strdup(channel->topic, topic);
+		safe_strdup(channel->topic_nick, topic_nick);
+		channel->topic_time = topic_time;
+		safe_strdup(channel->mode_lock, mode_lock);
+		set_channel_mode(channel, modes1, modes2);
+		R_SAFE(read_listmode(fd, &channel->banlist));
+		R_SAFE(read_listmode(fd, &channel->exlist));
+		R_SAFE(read_listmode(fd, &channel->invexlist));
+		R_SAFE(read_data(fd, &magic, sizeof(magic)));
+		FreeChannelEntry();
+		added++;
+		if (magic != MAGIC_CHANNEL_END)
+		{
+			config_error("[channeldb] Corrupt database (%s) - channel magic end is 0x%x. Further reading aborted.", cfg.database, magic);
+			break;
+		}
+	}
+
+	fclose(fd);
+
+	if (added)
+		sendto_realops_and_log("[channeldb] Added %d persistent channels (+P)", added);
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "[channeldb] Benchmark: LOAD DB: %ld microseconds",
+		((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec));
+#endif
+	return 1;
+}
+#undef FreeChannelEntry
+#undef R_SAFE
+
+static void set_channel_mode(Channel *channel, char *modes, char *parameters)
+{
+	char buf[512];
+	char *p, *param;
+	int myparc = 1, i;
+	char *myparv[64];
+
+	memset(&myparv, 0, sizeof(myparv));
+	myparv[0] = raw_strdup(modes);
+
+	strlcpy(buf, parameters, sizeof(buf));
+	for (param = strtoken(&p, buf, " "); param; param = strtoken(&p, NULL, " "))
+		myparv[myparc++] = raw_strdup(param);
+	myparv[myparc] = NULL;
+
+	SetULine(&me); // hack for crash.. set ulined so no access checks.
+	do_mode(channel, &me, NULL, myparc, myparv, 0, 0);
+	ClearULine(&me); // and clear it again..
+
+	for (i = 0; i < myparc; i++)
+		safe_free(myparv[i]);
+}
+// FIXME: move above function to m_mode and make efunc, available for all modules anyway
diff --git a/src/modules/charsys.c b/src/modules/charsys.c
new file mode 100644
index 0000000..6d29e20
--- /dev/null
+++ b/src/modules/charsys.c
@@ -0,0 +1,1233 @@
+/*
+ * Unreal Internet Relay Chat Daemon, src/charsys.c
+ * (C) Copyright 2005-2017 Bram Matthys and The UnrealIRCd Team.
+ *
+ * Character system: This subsystem deals with finding out wheter a
+ * character should be allowed or not in nicks (nicks only for now).
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#ifndef ARRAY_SIZEOF
+ #define ARRAY_SIZEOF(x) (sizeof((x))/sizeof((x)[0]))
+#endif
+
+ModuleHeader MOD_HEADER
+= {
+	"charsys",	/* Name of module */
+	"5.0", /* Version */
+	"Character System (set::allowed-nickchars)", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* NOTE: it is guaranteed that char is unsigned by compiling options
+ *       (-funsigned-char @ gcc, /J @ MSVC)
+ * NOTE2: Original credit for supplying the correct chinese
+ *        coderanges goes to: RexHsu, Mr.WebBar and Xuefer
+ */
+
+/** Our multibyte structure */
+typedef struct MBList MBList;
+struct MBList
+{
+	MBList *next;
+	char s1, e1, s2, e2;
+};
+MBList *mblist = NULL, *mblist_tail = NULL;
+
+/* Use this to prevent mixing of certain combinations
+ * (such as GBK & high-ascii, etc)
+ */
+static int langav = 0;
+char langsinuse[4096];
+
+/* bitmasks: */
+#define LANGAV_ASCII			0x000001 /* 8 bit ascii */
+#define LANGAV_LATIN1			0x000002 /* latin1 (western europe) */
+#define LANGAV_LATIN2			0x000004 /* latin2 (eastern europe, eg: polish) */
+#define LANGAV_ISO8859_7		0x000008 /* greek */
+#define LANGAV_ISO8859_8I		0x000010 /* hebrew */
+#define LANGAV_ISO8859_9		0x000020 /* turkish */
+#define LANGAV_W1250			0x000040 /* windows-1250 (eg: polish-w1250) */
+#define LANGAV_W1251			0x000080 /* windows-1251 (eg: russian) */
+#define LANGAV_LATIN2W1250		0x000100 /* Compatible with both latin2 AND windows-1250 (eg: hungarian) */
+#define LANGAV_ISO8859_6		0x000200 /* arabic */
+#define LANGAV_GBK			0x001000 /* (Chinese) GBK encoding */
+#define LANGAV_UTF8			0x002000 /* any UTF8 encoding */
+#define LANGAV_LATIN_UTF8		0x004000 /* UTF8: latin script */
+#define LANGAV_CYRILLIC_UTF8		0x008000 /* UTF8: cyrillic script */
+#define LANGAV_GREEK_UTF8		0x010000 /* UTF8: greek script */
+#define LANGAV_HEBREW_UTF8		0x020000 /* UTF8: hebrew script */
+typedef struct LangList LangList;
+struct LangList
+{
+	char *directive;
+	char *code;
+	int setflags;
+};
+
+/* MUST be alphabetized (first column) */
+static LangList langlist[] = {
+/*	{ "arabic",       "ara", LANGAV_ASCII|LANGAV_ISO8859_6 }, -- TODO: check if this has issues first! */
+	{ "belarussian-utf8", "blr-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_CYRILLIC_UTF8 },
+	{ "belarussian-w1251", "blr", LANGAV_ASCII|LANGAV_W1251 },
+	{ "catalan",      "cat", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "catalan-utf8", "cat-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "chinese",      "chi-j,chi-s,chi-t", LANGAV_GBK },
+	{ "chinese-ja",   "chi-j", LANGAV_GBK },
+	{ "chinese-simp", "chi-s", LANGAV_GBK },
+	{ "chinese-trad", "chi-t", LANGAV_GBK },
+	{ "cyrillic-utf8", "blr-utf8,rus-utf8,ukr-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_CYRILLIC_UTF8 },
+	{ "czech",        "cze-m", LANGAV_ASCII|LANGAV_W1250 },
+	{ "czech-utf8",   "cze-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "danish",       "dan", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "danish-utf8",  "dan-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "dutch",        "dut", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "dutch-utf8",   "dut-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "french",       "fre", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "french-utf8",  "fre-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "gbk",          "chi-s,chi-t,chi-j", LANGAV_GBK },
+	{ "german",       "ger", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "german-utf8",  "ger-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "greek",        "gre", LANGAV_ASCII|LANGAV_ISO8859_7 },
+	{ "greek-utf8",   "gre-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_GREEK_UTF8 },
+	{ "hebrew",       "heb", LANGAV_ASCII|LANGAV_ISO8859_8I },
+	{ "hebrew-utf8",  "heb-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_HEBREW_UTF8 },
+	{ "hungarian",    "hun", LANGAV_ASCII|LANGAV_LATIN2W1250 },
+	{ "hungarian-utf8","hun-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "icelandic",    "ice", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "icelandic-utf8","ice-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "italian",      "ita", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "italian-utf8", "ita-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "latin-utf8",   "cat-utf8,cze-utf8,dan-utf8,dut-utf8,fre-utf8,ger-utf8,hun-utf8,ice-utf8,ita-utf8,pol-utf8,rum-utf8,slo-utf8,spa-utf8,swe-utf8,tur-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "latin1",       "cat,dut,fre,ger,ita,spa,swe", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "latin2",       "hun,pol,rum", LANGAV_ASCII|LANGAV_LATIN2 },
+	{ "polish",       "pol", LANGAV_ASCII|LANGAV_LATIN2 },
+	{ "polish-utf8",  "pol-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "polish-w1250", "pol-m", LANGAV_ASCII|LANGAV_W1250 },
+	{ "romanian",     "rum", LANGAV_ASCII|LANGAV_LATIN2W1250 },
+	{ "romanian-utf8","rum-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "russian-utf8", "rus-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_CYRILLIC_UTF8 },
+	{ "russian-w1251","rus", LANGAV_ASCII|LANGAV_W1251 },
+	{ "slovak",       "slo-m", LANGAV_ASCII|LANGAV_W1250 },
+	{ "slovak-utf8",  "slo-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "spanish",      "spa", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "spanish-utf8", "spa-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "swedish",      "swe", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "swedish-utf8", "swe-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "swiss-german", "swg", LANGAV_ASCII|LANGAV_LATIN1 },
+	{ "swiss-german-utf8", "swg-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "turkish",      "tur", LANGAV_ASCII|LANGAV_ISO8859_9 },
+	{ "turkish-utf8", "tur-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_LATIN_UTF8 },
+	{ "ukrainian-utf8", "ukr-utf8", LANGAV_ASCII|LANGAV_UTF8|LANGAV_CYRILLIC_UTF8 },
+	{ "ukrainian-w1251", "ukr", LANGAV_ASCII|LANGAV_W1251 },
+	{ "windows-1250", "cze-m,pol-m,rum,slo-m,hun",  LANGAV_ASCII|LANGAV_W1250 },
+	{ "windows-1251", "rus,ukr,blr", LANGAV_ASCII|LANGAV_W1251 },
+	{ NULL, NULL, 0 }
+};
+
+/* For temporary use during config_run */
+typedef struct ILangList ILangList;
+struct ILangList
+{
+	ILangList *prev, *next;
+	char *name;
+};
+ILangList *ilanglist = NULL;
+
+/* These characters are ALWAYS disallowed... from remote, in
+ * multibyte, etc.. even though this might mean a certain
+ * (legit) character cannot be used (eg: in chinese GBK).
+ * - ! (nick!user seperator)
+ * - prefix chars: +, %, @, &, ~
+ * - channel chars: #
+ * - scary chars: $, :, ', ", ?, *, ',', '.'
+ * NOTE: the caller should also check for ascii <= 32.
+ * [CHANGING THIS WILL CAUSE SECURITY/SYNCH PROBLEMS AND WILL
+ *  VIOLATE YOUR ""RIGHT"" ON SUPPORT IMMEDIATELY]
+ */
+const char *illegalnickchars = "!+%@&~#$:'\"?*,.";
+
+/* Forward declarations */
+int _do_nick_name(char *nick);
+int _do_remote_nick_name(char *nick);
+static int do_nick_name_multibyte(char *nick);
+static int do_nick_name_standard(char *nick);
+void charsys_reset(void);
+void charsys_reset_pretest(void);
+void charsys_finish(void);
+void charsys_addmultibyterange(char s1, char e1, char s2, char e2);
+void charsys_addallowed(char *s);
+int charsys_test_language(char *name);
+void charsys_add_language(char *name);
+static void charsys_doadd_language(char *name);
+int charsys_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int charsys_config_run(ConfigFile *cf, ConfigEntry *ce, int type);
+int charsys_config_posttest(int *errs);
+char *_charsys_get_current_languages(void);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAdd(modinfo->handle, EFUNC_DO_NICK_NAME, _do_nick_name);
+	EfunctionAdd(modinfo->handle, EFUNC_DO_REMOTE_NICK_NAME, _do_remote_nick_name);
+	EfunctionAddPChar(modinfo->handle, EFUNC_CHARSYS_GET_CURRENT_LANGUAGES, _charsys_get_current_languages);
+	charsys_reset();
+	charsys_reset_pretest();
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, charsys_config_test);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, charsys_config_posttest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, charsys_config_run);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	charsys_finish();
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int charsys_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+
+	/* We are only interrested in set::allowed-nickchars... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "allowed-nickchars"))
+		return 0;
+
+	if (ce->ce_vardata)
+	{
+		config_error("%s:%i: set::allowed-nickchars: please use 'allowed-nickchars { name; };' "
+					 "and not 'allowed-nickchars name;'",
+					 ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		/* Give up immediately. Don't bother the user with any other errors. */
+		errors++;
+		*errs = errors;
+		return -1;
+	}
+
+	for (cep = ce->ce_entries; cep; cep=cep->ce_next)
+	{
+		if (!charsys_test_language(cep->ce_varname))
+		{
+			config_error("%s:%i: set::allowed-nickchars: Unknown (sub)language '%s'",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int charsys_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::allowed-nickchars... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "allowed-nickchars"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+		charsys_add_language(cep->ce_varname);
+
+	return 1;
+}
+
+/** Check if the specified charsets during the TESTING phase can be
+ * premitted without getting into problems.
+ * RETURNS: -1 in case of failure, 1 if ok
+ */
+int charsys_config_posttest(int *errs)
+{
+	int errors = 0;
+	int x=0;
+
+	if ((langav & LANGAV_ASCII) && (langav & LANGAV_GBK))
+	{
+		config_error("ERROR: set::allowed-nickchars specifies incorrect combination "
+		             "of languages: high-ascii languages (such as german, french, etc) "
+		             "cannot be mixed with chinese/..");
+		return -1;
+	}
+	if (langav & LANGAV_LATIN_UTF8)
+		x++;
+	if (langav & LANGAV_GREEK_UTF8)
+		x++;
+	if (langav & LANGAV_CYRILLIC_UTF8)
+		x++;
+	if (langav & LANGAV_HEBREW_UTF8)
+		x++;
+	if (langav & LANGAV_LATIN1)
+		x++;
+	if (langav & LANGAV_LATIN2)
+		x++;
+	if (langav & LANGAV_ISO8859_6)
+		x++;
+	if (langav & LANGAV_ISO8859_7)
+		x++;
+	if (langav & LANGAV_ISO8859_9)
+		x++;
+	if (langav & LANGAV_W1250)
+		x++;
+	if (langav & LANGAV_W1251)
+		x++;
+	if ((langav & LANGAV_LATIN2W1250) && !(langav & LANGAV_LATIN2) && !(langav & LANGAV_W1250))
+	    x++;
+	if (x > 1)
+	{
+		if (langav & LANGAV_LATIN_UTF8)
+		{
+			config_error("ERROR: set::allowed-nickchars: you cannot combine 'latin-utf8' with any other character set");
+			errors++;
+		}
+		if (langav & LANGAV_GREEK_UTF8)
+		{
+			config_error("ERROR: set::allowed-nickchars: you cannot combine 'greek-utf8' with any other character set");
+			errors++;
+		}
+		if (langav & LANGAV_CYRILLIC_UTF8)
+		{
+			config_error("ERROR: set::allowed-nickchars: you cannot combine 'cyrillic-utf8' with any other character set");
+			errors++;
+		}
+		if (langav & LANGAV_HEBREW_UTF8)
+		{
+			config_error("ERROR: set::allowed-nickchars: you cannot combine 'hebrew-utf8' with any other character set");
+			errors++;
+		}
+		config_status("WARNING: set::allowed-nickchars: "
+		            "Mixing of charsets (eg: latin1+latin2) can cause display problems");
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+/** Called on boot and just before config run */
+void charsys_reset(void)
+{
+	int i;
+	MBList *m, *m_next;
+
+	/* First, reset everything */
+	for (i=0; i < 256; i++)
+		char_atribs[i] &= ~ALLOWN;
+	for (m=mblist; m; m=m_next)
+	{
+		m_next = m->next;
+		safe_free(m);
+	}
+	mblist=mblist_tail=NULL;
+	/* Then add the default which will always be allowed */
+	charsys_addallowed("0123456789-ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyzy{|}");
+	langav = 0;
+	langsinuse[0] = '\0';
+#ifdef DEBUGMODE
+	if (ilanglist)
+		abort();
+#endif
+}
+
+void charsys_reset_pretest(void)
+{
+	langav = 0;
+	non_utf8_nick_chars_in_use = 0;
+}
+
+static inline void ilang_swap(ILangList *one, ILangList *two)
+{
+	char *tmp = one->name;
+	one->name = two->name;
+	two->name = tmp;
+}
+
+static void ilang_sort(void)
+{
+	ILangList *outer, *inner;
+
+	/* Selection sort -- perhaps optimize to qsort/whatever if
+     * possible? ;)
+     */
+	for (outer=ilanglist; outer; outer=outer->next)
+	{
+		for (inner=outer->next; inner; inner=inner->next)
+		{
+			if (strcmp(outer->name, inner->name) > 0)
+				ilang_swap(outer, inner);
+		}
+	}
+}
+
+void charsys_finish(void)
+{
+	ILangList *e, *e_next;
+
+	/* Sort alphabetically */
+	ilang_sort();
+
+	/* [note: this can be optimized] */
+	langsinuse[0] = '\0';
+	for (e=ilanglist; e; e=e->next)
+	{
+		strlcat(langsinuse, e->name, sizeof(langsinuse));
+		if (e->next)
+			strlcat(langsinuse, ",", sizeof(langsinuse));
+	}
+	
+	/* Free everything */
+	for (e=ilanglist; e; e=e_next)
+	{
+		e_next=e->next;
+		safe_free(e->name);
+		safe_free(e);
+	}
+	ilanglist = NULL;
+#ifdef DEBUGMODE
+	if (strlen(langsinuse) > 490)
+		abort();
+#endif
+	charsys_check_for_changes();
+}
+
+/** Add a character range to the multibyte list.
+ * Eg: charsys_addmultibyterange(0xaa, 0xbb, 0x00, 0xff) for 0xaa00-0xbbff.
+ * @param s1 Start of highest byte
+ * @param e1 End of highest byte
+ * @param s2 Start of lowest byte
+ * @param e2 End of lowest byte
+ */
+void charsys_addmultibyterange(char s1, char e1, char s2, char e2)
+{
+MBList *m = safe_alloc(sizeof(MBList));
+
+	m->s1 = s1;
+	m->e1 = e1;
+	m->s2 = s2;
+	m->e2 = e2;
+
+	if (mblist_tail)
+		mblist_tail->next = m;
+	else
+		mblist = m;
+	mblist_tail = m;
+}
+
+/** Adds all characters in the specified string to the allowed list. */
+void charsys_addallowed(char *s)
+{
+	for (; *s; s++)
+	{
+		if ((*s <= 32) || strchr(illegalnickchars, *s))
+		{
+			config_error("INTERNAL ERROR: charsys_addallowed() called for illegal characters: %s", s);
+#ifdef DEBUGMODE
+			abort();
+#endif
+		}
+		char_atribs[(unsigned char)*s] |= ALLOWN;
+	}
+}
+
+void charsys_addallowed_range(unsigned char from, unsigned char to)
+{
+	unsigned char i;
+
+	for (i = from; i != to; i++)
+		char_atribs[i] |= ALLOWN;
+}
+
+int _do_nick_name(char *nick)
+{
+	if (mblist)
+		return do_nick_name_multibyte(nick);
+	else
+		return do_nick_name_standard(nick);
+}
+
+static int do_nick_name_standard(char *nick)
+{
+	int len;
+	char *ch;
+
+	if ((*nick == '-') || isdigit(*nick))
+		return 0;
+
+	for (ch=nick,len=0; *ch && len <= NICKLEN; ch++, len++)
+		if (!isvalid(*ch))
+			return 0; /* reject the full nick */
+	*ch = '\0';
+	return len;
+}
+
+static int isvalidmbyte(unsigned char c1, unsigned char c2)
+{
+	MBList *m;
+
+	for (m=mblist; m; m=m->next)
+	{
+		if ((c1 >= m->s1) && (c1 <= m->e1) &&
+		    (c2 >= m->s2) && (c2 <= m->e2))
+		    return 1;
+	}
+	return 0;
+}
+
+/* hmmm.. there must be some problems with multibyte &
+ * other high ascii characters I think (such as german etc).
+ * Not sure if this can be solved? I don't think so... -- Syzop.
+ */
+static int do_nick_name_multibyte(char *nick)
+{
+	int len;
+	char *ch;
+	int firstmbchar = 0;
+
+	if ((*nick == '-') || isdigit(*nick))
+		return 0;
+
+	for (ch=nick,len=0; *ch && len <= NICKLEN; ch++, len++)
+	{
+		/* Some characters are ALWAYS illegal, so they have to be disallowed here */
+		if ((*ch <= 32) || strchr(illegalnickchars, *ch))
+			return 0;
+		if (firstmbchar)
+		{
+			if (!isvalidmbyte(ch[-1], *ch))
+				return 0;
+			firstmbchar = 0;
+		} else if ((*ch) & 0x80)
+			firstmbchar = 1;
+		else if (!isvalid(*ch))
+			return 0;
+	}
+	if (firstmbchar)
+	{
+		ch--;
+		len--;
+	}
+	*ch = '\0';
+	return len;
+}
+
+/** Does some very basic checking on remote nickname.
+ * It's only purpose is not to cause the whole network
+ * to fall down in pieces, that's all. Display problems
+ * are not really handled here. They are assumed to have been
+ * checked by PROTOCTL NICKCHARS= -- Syzop.
+ */
+int _do_remote_nick_name(char *nick)
+{
+	char *c;
+
+	/* Don't allow nicks to start with a digit, ever. */
+	if ((*nick == '-') || isdigit(*nick))
+		return 0;
+
+	/* Now the other, more relaxed checks.. */
+	for (c=nick; *c; c++)
+		if ((*c <= 32) || strchr(illegalnickchars, *c))
+			return 0;
+
+	return (c - nick);
+}
+
+static LangList *charsys_find_language(char *name)
+{
+	int start = 0;
+	int stop = ARRAY_SIZEOF(langlist)-1;
+	int mid;
+
+	while (start <= stop)
+	{
+		mid = (start+stop)/2;
+		if (!langlist[mid].directive || smycmp(name, langlist[mid].directive) < 0)
+			stop = mid-1;
+		else if (strcmp(name, langlist[mid].directive) == 0)
+			return &langlist[mid];
+		else
+			start = mid+1;
+	}
+	return NULL;
+}
+
+static LangList *charsys_find_language_code(char *code)
+{
+	int i;
+	for (i = 0; langlist[i].code; i++)
+		if (!strcasecmp(langlist[i].code, code))
+			return &langlist[i];
+	return NULL;
+}
+
+/** Check if language is available. */
+int charsys_test_language(char *name)
+{
+	LangList *l = charsys_find_language(name);
+
+	if (l)
+	{
+		langav |= l->setflags;
+		if (!(l->setflags & LANGAV_UTF8))
+			non_utf8_nick_chars_in_use = 1;
+		return 1;
+	}
+	if (!strcmp(name, "euro-west"))
+	{
+		config_error("set::allowed-nickchars: ERROR: 'euro-west' got renamed to 'latin1'");
+		return 0;
+	}
+	return 0;
+}
+
+static void charsys_doadd_language(char *name)
+{
+LangList *l;
+ILangList *li;
+int found;
+char tmp[512], *lang, *p;
+
+	l = charsys_find_language(name);
+	if (!l)
+	{
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return;
+	}
+
+	strlcpy(tmp, l->code, sizeof(tmp));
+	for (lang = strtoken(&p, tmp, ","); lang; lang = strtoken(&p, NULL, ","))
+	{
+		/* Check if present... */
+		found=0;
+		for (li=ilanglist; li; li=li->next)
+			if (!strcmp(li->name, lang))
+			{
+				found = 1;
+				break;
+			}
+		if (!found)
+		{
+			/* Add... */
+			li = safe_alloc(sizeof(ILangList));
+			safe_strdup(li->name, lang);
+			AddListItem(li, ilanglist);
+		}
+	}
+}
+
+void charsys_add_language(char *name)
+{
+	char latin1=0, latin2=0, w1250=0, w1251=0, chinese=0;
+	char latin_utf8=0, cyrillic_utf8=0;
+
+	/** Note: there could well be some characters missing in the lists below.
+	 *        While I've seen other altnernatives that just allow pretty much
+	 *        every accent that exists even for dutch (where we rarely use
+	 *        accents except for like 3 types), I rather prefer to use a bit more
+	 *        reasonable aproach ;). That said, anyone is welcome to make
+	 *        suggestions about characters that should be added (or removed)
+	 *        of course. -- Syzop
+	 */
+
+	/* Add our language to our list */
+	charsys_doadd_language(name);
+
+	/* GROUPS */
+	if (!strcmp(name, "latin-utf8"))
+		latin_utf8 = 1;
+	else if (!strcmp(name, "cyrillic-utf8"))
+		cyrillic_utf8 = 1;
+	else if (!strcmp(name, "latin1"))
+		latin1 = 1;
+	else if (!strcmp(name, "latin2"))
+		latin2 = 1;
+	else if (!strcmp(name, "windows-1250"))
+		w1250 = 1;
+	else if (!strcmp(name, "windows-1251"))
+		w1251 = 1;
+	else if (!strcmp(name, "chinese") || !strcmp(name, "gbk"))
+		chinese = 1;
+	
+	/* INDIVIDUAL CHARSETS */
+
+	/* [LATIN1] and [LATIN-UTF8] */
+	if (latin1 || !strcmp(name, "german"))
+	{
+		/* a", A", o", O", u", U" and es-zett */
+		charsys_addallowed("äÄöÖüÜß");
+	}
+	if (latin_utf8 || !strcmp(name, "german-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x84, 0x84);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x96, 0x96);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9c, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9f, 0x9f);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa4, 0xa4);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbc, 0xbc);
+	}
+	if (latin1 || !strcmp(name, "swiss-german"))
+	{
+		/* a", A", o", O", u", U"  */
+		charsys_addallowed("äÄöÖüÜ");
+	}
+	if (latin_utf8 || !strcmp(name, "swiss-german-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x84, 0x84);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x96, 0x96);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9c, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa4, 0xa4);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbc, 0xbc);
+	}
+	if (latin1 || !strcmp(name, "dutch"))
+	{
+		/* Ok, even though I'm Dutch myself, I've trouble getting
+		 * a proper list of this ;). I think I got them all now, but
+		 * I did not include "borrow-words" like words we use in Dutch
+		 * that are literal French. So if you really want to use them all,
+		 * I suggest you to use just latin1 :P.
+		 */
+		/* e', e", o", i", u", e`. */
+		charsys_addallowed("éëöïüè");
+	}
+	if (latin_utf8 || !strcmp(name, "dutch-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa8, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xab, 0xab);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xaf, 0xaf);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbc, 0xbc);
+	}
+	if (latin1 || !strcmp(name, "danish"))
+	{
+		/* supplied by klaus:
+		 * <ae>, <AE>, ao, Ao, o/, O/ */
+		charsys_addallowed("æÆåÅøØ");
+	}
+	if (latin_utf8 || !strcmp(name, "danish-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x85, 0x86);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x98, 0x98);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa5, 0xa6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb8, 0xb8);
+	}
+	if (latin1 || !strcmp(name, "french"))
+	{
+		/* A`, A^, a`, a^, weird-C, weird-c, E`, E', E^, E", e`, e', e^, e",
+		 * I^, I", i^, i", O^, o^, U`, U^, U", u`, u", u`, y" [not in that order, sry]
+		 * Hmm.. there might be more, but I'm not sure how common they are
+		 * and I don't think they are always displayed correctly (?).
+		 */
+		charsys_addallowed("ÀÂàâÇçÈÉÊËèéêëÎÏîïÔôÙÛÜùûüÿ");
+	}
+	if (latin_utf8 || !strcmp(name, "french-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x80, 0x80);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x82, 0x82);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x87, 0x8b);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8e, 0x8f);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x94, 0x94);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x99, 0x99);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9b, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa0, 0xa0);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa2, 0xa2);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa7, 0xab);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xae, 0xaf);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb4, 0xb4);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb9, 0xb9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbb, 0xbc);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbf, 0xbf);
+	}
+	if (latin1 || !strcmp(name, "spanish"))
+	{
+		/* a', A', e', E', i', I', o', O', u', U', u", U", n~, N~ */
+		charsys_addallowed("áÁéÉíÍóÓúÚüÜñÑ");
+	}
+	if (latin_utf8 || !strcmp(name, "spanish-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x81, 0x81);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x89, 0x89);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8d, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x91, 0x91);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x93, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9a, 0x9a);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9c, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa1, 0xa1);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa9, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xad, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb1, 0xb1);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb3, 0xb3);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xba, 0xba);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbc, 0xbc);
+	}
+	if (latin1 || !strcmp(name, "italian"))
+	{
+		/* A`, E`, E', I`, I', O`, O', U`, U', a`, e`, e', i`, i', o`, o', u`, u' */
+		charsys_addallowed("ÀÈÉÌÍÒÓÙÚàèéìíòóùú");
+	}
+	if (latin_utf8 || !strcmp(name, "italian-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x80, 0x80);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x88, 0x89);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8c, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x92, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x99, 0x9a);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa0, 0xa0);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa8, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xac, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb2, 0xb3);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb9, 0xba);
+	}
+	if (latin1 || !strcmp(name, "catalan"))
+	{
+		/* supplied by Trocotronic */
+		/* a`, A`, e`, weird-c, weird-C, E`, e', E', i', I', o`, O`, o', O', u', U', i", I", u", U", weird-dot */
+		charsys_addallowed("àÀçÇèÈéÉíÍòÒóÓúÚïÏüÜ");
+	}
+	if (latin_utf8 || !strcmp(name, "catalan-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x80, 0x80);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x87, 0x89);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8d, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8f, 0x8f);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x92, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9a, 0x9a);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9c, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa0, 0xa0);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa7, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xad, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xaf, 0xaf);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb2, 0xb3);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xba, 0xba);
+	}
+	if (latin1 || !strcmp(name, "swedish"))
+	{
+		/* supplied by Tank */
+		/* ao, Ao, a", A", o", O" */ 
+		charsys_addallowed("åÅäÄöÖ");
+	}
+	if (latin_utf8 || !strcmp(name, "swedish-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x84, 0x85);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x96, 0x96);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa4, 0xa5);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+	}
+	if (latin1 || !strcmp(name, "icelandic"))
+	{
+		/* supplied by Saevar */
+		charsys_addallowed("ÆæÖöÁáÍíÐðÚúÓóÝýÞþ");
+	}
+	if (latin_utf8 || !strcmp(name, "icelandic-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x81, 0x81);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x86, 0x86);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8d, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x90, 0x90);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x93, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x96, 0x96);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9a, 0x9a);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9d, 0x9e);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa1, 0xa1);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa6, 0xa6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xad, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb0, 0xb0);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb3, 0xb3);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xba, 0xba);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbd, 0xbe);
+	}
+/*	if (latin1 || !strcmp(name, "arabic")) -- Since when is arabic considered latin(1)??? oh man...
+	{
+		char bytes[] = { 0xa0, 0xa4, 0xac, 0xad, 0xbb, 0xbf, 0x00 };
+		charsys_addallowed(bytes);
+		charsys_addallowed_range(0xc1, 0xda);
+		charsys_addallowed_range(0xe0, 0xf2);
+	} */
+
+	/* [LATIN2] and rest of [LATIN-UTF8] */
+	/* actually hungarian is a special case, include it in both w1250 and latin2 ;p */
+	if (latin2 || w1250 || !strcmp(name, "hungarian"))
+	{
+		/* supplied by AngryWolf */
+		/* a', e', i', o', o", o~, u', u", u~, A', E', I', O', O", O~, U', U", U~ */
+		charsys_addallowed("áéíóöõúüûÁÉÍÓÖÕÚÜÛ");
+	}
+	if (latin_utf8 || !strcmp(name, "hungarian-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x81, 0x81);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x89, 0x89);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8d, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x93, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x96, 0x96);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9a, 0x9a);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9c, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa1, 0xa1);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa9, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xad, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb3, 0xb3);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xba, 0xba);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbc, 0xbc);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x90, 0x91);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xb0, 0xb1);
+	}
+	/* same is true for romanian: latin2 & w1250 compatible */
+	if (latin2 || w1250 || !strcmp(name, "romanian"))
+	{
+		/* With some help from crazytoon */
+		/* 'S,' 's,' 'A^' 'A<' 'I^' 'T,' 'a^' 'a<' 'i^' 't,' */
+		charsys_addallowed("ªºÂÃÎÞâãîþ");
+	}
+	if (latin_utf8 || !strcmp(name, "romanian-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x82, 0x82);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8e, 0x8e);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa2, 0xa2);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xae, 0xae);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x82, 0x83);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x9e, 0x9f);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xa2, 0xa3);
+	}
+	
+	if (latin2 || !strcmp(name, "polish"))
+	{
+		/* supplied by k4be */
+		charsys_addallowed("±æê³ñ󶿼¡ÆÊ£ÑÓ¦¯¬");
+	}
+	if (latin_utf8 || !strcmp(name, "polish-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x93, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb3, 0xb3);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x84, 0x87);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x98, 0x99);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x81, 0x84);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x9a, 0x9b);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xb9, 0xbc);
+	}
+	/* [windows 1250] */
+	if (w1250 || !strcmp(name, "polish-w1250"))
+	{
+		/* supplied by k4be */
+		charsys_addallowed("¹æê³ñ󜿟¥ÆÊ£ÑÓŒ¯�");
+	}
+	if (w1250 || !strcmp(name, "czech-w1250"))
+	{
+		/* Syzop [probably incomplete] */
+		charsys_addallowed("Š�Žš�žÁÈÉÌÍÏÒÓØÙÚÝáèéìíïòóøùúý");
+	}
+	if (latin_utf8 || !strcmp(name, "czech-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x81, 0x81);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x89, 0x89);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8d, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x93, 0x93);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9a, 0x9a);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9d, 0x9d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa1, 0xa1);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa9, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xad, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb3, 0xb3);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xba, 0xba);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbd, 0xbd);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x8c, 0x8f);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x9a, 0x9b);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x87, 0x88);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x98, 0x99);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xa0, 0xa1);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xa4, 0xa5);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xae, 0xaf);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xbd, 0xbe);
+	}
+	if (w1250 || !strcmp(name, "slovak-w1250"))
+	{
+		/* Syzop [probably incomplete] */
+		charsys_addallowed("Š�Žš�ž¼¾ÀÁÄÅÈÉÍÏàáäåèéíïòóôúý");
+	}
+	if (latin_utf8 || !strcmp(name, "slovak-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x81, 0x81);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x84, 0x84);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x89, 0x89);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x8d, 0x8d);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa1, 0xa1);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa4, 0xa4);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa9, 0xa9);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xad, 0xad);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb3, 0xb4);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xba, 0xba);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbd, 0xbd);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x8c, 0x8f);
+		charsys_addmultibyterange(0xc4, 0xc4, 0xb9, 0xba);
+		charsys_addmultibyterange(0xc4, 0xc4, 0xbd, 0xbe);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x88, 0x88);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x94, 0x95);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xa0, 0xa1);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xa4, 0xa5);
+		charsys_addmultibyterange(0xc5, 0xc5, 0xbd, 0xbe);
+	}
+
+	/* [windows 1251] */
+	if (w1251 || !strcmp(name, "russian-w1251"))
+	{
+		/* supplied by Roman Parkin:
+		 * 128-159 and 223-254
+		 */
+		charsys_addallowed("ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ¨¸");
+	}
+	if (cyrillic_utf8 || !strcmp(name, "russian-utf8"))
+	{
+		charsys_addmultibyterange(0xd0, 0xd0, 0x81, 0x81);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x90, 0xbf);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x80, 0x8f);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x91, 0x91);
+	}
+	
+	if (w1251 || !strcmp(name, "belarussian-w1251"))
+	{
+		/* supplied by Bock (Samets Anton) & ss:
+		 * 128-159, 161, 162, 178, 179 and 223-254
+		 * Corrected 01.11.2006 to more "correct" behavior by Bock
+		 */
+		charsys_addallowed("ÀÁÂÃÄŨÆDzÉÊËÌÍÎÏÐÑÒÓ¡ÔÕÖ×ØÛÜÝÞßàáâãäå¸æç³éêëìíîïðñòó¢ôõö÷øûüýþÿ");
+	}
+	if (cyrillic_utf8 || !strcmp(name, "belarussian-utf8"))
+	{
+		charsys_addmultibyterange(0xd0, 0xd0, 0x81, 0x81);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x86, 0x86);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x8e, 0x8e);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x90, 0x97);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x99, 0xa8);
+		charsys_addmultibyterange(0xd0, 0xd0, 0xab, 0xb7);
+		charsys_addmultibyterange(0xd0, 0xd0, 0xb9, 0xbf);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x80, 0x88);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x8b, 0x8f);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x91, 0x91);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x96, 0x96);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x9e, 0x9e);
+	}
+	
+	if (w1251 || !strcmp(name, "ukrainian-w1251"))
+	{
+		/* supplied by Anton Samets & ss:
+		 * 128-159, 170, 175, 178, 179, 186, 191 and 223-254
+		 * Corrected 01.11.2006 to more "correct" behavior by core
+		 */
+		charsys_addallowed("ÀÁÂÃ¥ÄŪÆÇȲ¯ÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÜÞßàáâã´äåºæç賿éêëìíîïðñòóôõö÷øùüþÿ");
+	}
+	if (cyrillic_utf8 || !strcmp(name, "ukrainian-utf8"))
+	{
+		charsys_addmultibyterange(0xd0, 0xd0, 0x84, 0x84);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x86, 0x87);
+		charsys_addmultibyterange(0xd0, 0xd0, 0x90, 0xa9);
+		charsys_addmultibyterange(0xd0, 0xd0, 0xac, 0xac);
+		charsys_addmultibyterange(0xd0, 0xd0, 0xae, 0xbf);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x80, 0x89);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x8c, 0x8c);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x8e, 0x8f);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x94, 0x94);
+		charsys_addmultibyterange(0xd1, 0xd1, 0x96, 0x97);
+		charsys_addmultibyterange(0xd2, 0xd2, 0x90, 0x91);
+	}
+
+	/* [GREEK] */	
+	if (!strcmp(name, "greek"))
+	{
+		/* supplied by GSF */
+		/* ranges from rfc1947 / iso 8859-7 */
+		charsys_addallowed("¶¸¹º¼¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóô");
+	}
+	if (!strcmp(name, "greek-utf8"))
+	{
+		charsys_addmultibyterange(0xce, 0xce, 0x86, 0x86);
+		charsys_addmultibyterange(0xce, 0xce, 0x88, 0x8a);
+		charsys_addmultibyterange(0xce, 0xce, 0x8c, 0x8c);
+		charsys_addmultibyterange(0xce, 0xce, 0x8e, 0xa1);
+		charsys_addmultibyterange(0xce, 0xce, 0xa3, 0xbf);
+		charsys_addmultibyterange(0xcf, 0xcf, 0x80, 0x84);
+	}
+
+	/* [TURKISH] */
+	if (!strcmp(name, "turkish"))
+	{
+		/* Supplied by Ayberk Yancatoral */
+		charsys_addallowed("öÖçÇþÞüÜðÐý");
+	}
+	if (!strcmp(name, "turkish-utf8"))
+	{
+		charsys_addmultibyterange(0xc3, 0xc3, 0x87, 0x87);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x96, 0x96);
+		charsys_addmultibyterange(0xc3, 0xc3, 0x9c, 0x9c);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xa7, 0xa7);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xb6, 0xb6);
+		charsys_addmultibyterange(0xc3, 0xc3, 0xbc, 0xbc);
+		charsys_addmultibyterange(0xc4, 0xc4, 0x9e, 0x9f);
+		charsys_addmultibyterange(0xc4, 0xc4, 0xb1, 0xb1);
+		charsys_addmultibyterange(0xc5, 0xc5, 0x9e, 0x9f);
+	}
+
+	/* [HEBREW] */
+	if (!strcmp(name, "hebrew"))
+	{
+		/* Supplied by PHANTOm. */
+		/* 0xE0 - 0xFE */
+		charsys_addallowed("àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ");
+	}
+	if (!strcmp(name, "hebrew-utf8"))
+	{
+		/* Supplied by Lion-O */
+		charsys_addmultibyterange(0xd7, 0xd7, 0x90, 0xaa);
+	}
+
+	/* [CHINESE] */
+	if (chinese || !strcmp(name, "chinese-ja"))
+	{
+		charsys_addmultibyterange(0xa4, 0xa4, 0xa1, 0xf3); /* JIS_PIN */
+		charsys_addmultibyterange(0xa5, 0xa5, 0xa1, 0xf6); /* JIS_PIN */
+	}
+	if (chinese || !strcmp(name, "chinese-simp"))
+	{
+		charsys_addmultibyterange(0xb0, 0xd6, 0xa1, 0xfe); /* GBK/2 BC with GB2312 */
+		charsys_addmultibyterange(0xd7, 0xd7, 0xa1, 0xf9); /* GBK/2 BC with GB2312 */
+		charsys_addmultibyterange(0xd8, 0xf7, 0xa1, 0xfe); /* GBK/2 BC with GB2312 */
+	}
+	if (chinese || !strcmp(name, "chinese-trad"))
+	{
+		charsys_addmultibyterange(0x81, 0xa0, 0x40, 0x7e); /* GBK/3 - lower half */
+		charsys_addmultibyterange(0x81, 0xa0, 0x80, 0xfe); /* GBK/3 - upper half */
+		charsys_addmultibyterange(0xaa, 0xfe, 0x40, 0x7e); /* GBK/4 - lower half */
+		charsys_addmultibyterange(0xaa, 0xfe, 0x80, 0xa0); /* GBK/4 - upper half */
+	}
+}
+
+/** This displays all the nick characters that are permitted */
+char *charsys_displaychars(void)
+{
+#if 0
+	MBList *m;
+	unsigned char hibyte, lobyte;
+#endif
+	static char buf[512];
+	int n = 0;
+	int i, j;
+
+	// 		char_atribs[(unsigned char)*s] |= ALLOWN;
+	for (i = 0; i <= 255; i++)
+	{
+		if (char_atribs[i] & ALLOWN)
+			buf[n++] = i;
+		/* (no bounds checking: first 255 characters always fit a 512 byte buffer) */
+	}
+
+#if 0
+	for (m=mblist; m; m=m->next)
+	{
+		for (hibyte = m->s1; hibyte <= m->e1; hibyte++)
+		{
+			for (lobyte = m->s2; lobyte <= m->e2; lobyte++)
+			{
+				if (n >= sizeof(buf) - 3)
+					break; // break, or an attempt anyway
+				buf[n++] = hibyte;
+				buf[n++] = lobyte;
+			}
+		}
+	}
+#endif
+	/* above didn't work due to multiple overlapping ranges permitted.
+	 * try this instead (lazy).. this is only used in DEBUGMODE
+	 * via a command line option anyway:
+	 */
+	for (i=0; i <= 255; i++)
+	{
+		for (j=0; j <= 255; j++)
+		{
+			if (isvalidmbyte(i, j))
+			{
+				if (n >= sizeof(buf) - 3)
+					break; // break, or an attempt anyway
+				buf[n++] = i;
+				buf[n++] = j;
+			}
+		}
+	}
+
+	buf[n] = '\0'; /* there's always room for a NUL */
+	
+	return buf;
+}
+
+char *charsys_group(int v)
+{
+	if (v & LANGAV_LATIN_UTF8)
+		return "Latin script";
+	if (v & LANGAV_CYRILLIC_UTF8)
+		return "Cyrillic script";
+	if (v & LANGAV_GREEK_UTF8)
+		return "Greek script";
+	if (v & LANGAV_HEBREW_UTF8)
+		return "Hebrew script";
+	
+	return "Other";
+}
+
+void charsys_dump_table(char *filter)
+{
+	int i = 0;
+
+	for (i = 0; langlist[i].directive; i++)
+	{
+		char *charset = langlist[i].directive;
+		
+		if (!match_simple(filter, charset))
+			continue; /* skip */
+
+		charsys_reset();
+		charsys_add_language(charset);
+		charsys_finish();
+		printf("%s;%s;%s\n", charset, charsys_group(langlist[i].setflags), charsys_displaychars());
+	}
+}
+
+/** Get current languages (the 'langsinuse' variable) */
+char *_charsys_get_current_languages(void)
+{
+	return langsinuse;
+}
diff --git a/src/modules/chghost.c b/src/modules/chghost.c
new file mode 100644
index 0000000..8d3e3f0
--- /dev/null
+++ b/src/modules/chghost.c
@@ -0,0 +1,157 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/chghost.c
+ *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MSG_CHGHOST 	"CHGHOST"
+
+CMD_FUNC(cmd_chghost);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chghost",	/* Name of module */
+	"5.0", /* Version */
+	"/chghost", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_CHGHOST, cmd_chghost, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+	
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+/* 
+ * cmd_chghost - 12/07/1999 (two months after I made SETIDENT) - Stskeeps
+ * :prefix CHGHOST <nick> <new hostname>
+ * parv[1] - target user
+ * parv[2] - hostname
+ *
+*/
+
+CMD_FUNC(cmd_chghost)
+{
+	Client *target;
+
+	if (MyUser(client) && !ValidatePermissionsForPath("client:set:host",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 3) || BadPtr(parv[2]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "CHGHOST");
+		return;
+	}
+
+	if (strlen(parv[2]) > (HOSTLEN))
+	{
+		sendnotice(client, "*** ChgName Error: Requested hostname too long -- rejected.");
+		return;
+	}
+
+	if (!valid_host(parv[2]))
+	{
+		sendnotice(client, "*** /ChgHost Error: A hostname may contain a-z, A-Z, 0-9, '-' & '.' - Please only use them");
+		return;
+	}
+
+	if (parv[2][0] == ':')
+	{
+		sendnotice(client, "*** A hostname cannot start with ':'");
+		return;
+	}
+
+	if (!(target = find_person(parv[1], NULL)))
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+		return;
+	}
+
+	if (!strcmp(GetHost(target), parv[2]))
+	{
+		sendnotice(client, "*** /ChgHost Error: requested host is same as current host.");
+		return;
+	}
+
+	userhost_save_current(target);
+
+	switch (UHOST_ALLOWED)
+	{
+		case UHALLOW_NEVER:
+			if (MyUser(client))
+			{
+				sendnumeric(client, ERR_DISABLED, "CHGHOST",
+					"This command is disabled on this server");
+				return;
+			}
+			break;
+		case UHALLOW_ALWAYS:
+			break;
+		case UHALLOW_NOCHANS:
+			if (IsUser(target) && MyUser(client) && target->user->joined)
+			{
+				sendnotice(client, "*** /ChgHost can not be used while %s is on a channel", target->name);
+				return;
+			}
+			break;
+		case UHALLOW_REJOIN:
+			/* rejoin sent later when the host has been changed */
+			break;
+	}
+
+	if (!IsULine(client))
+	{
+		sendto_snomask(SNO_EYES,
+		    "%s changed the virtual hostname of %s (%s@%s) to be %s",
+		    client->name, target->name, target->user->username,
+		    target->user->realhost, parv[2]);
+		/* Logging added by XeRXeS */
+		ircd_log(LOG_CHGCMDS,                                         
+			"CHGHOST: %s changed the virtual hostname of %s (%s@%s) to be %s",
+			client->name, target->name, target->user->username, target->user->realhost, parv[2]); 
+	}
+
+	target->umodes |= UMODE_HIDE;
+	target->umodes |= UMODE_SETHOST;
+	sendto_server(client, 0, 0, NULL, ":%s CHGHOST %s %s", client->id, target->id, parv[2]);
+	safe_strdup(target->user->virthost, parv[2]);
+	
+	userhost_changed(target);
+
+	if (MyUser(target))
+		sendnumeric(target, RPL_HOSTHIDDEN, parv[2]);
+}
diff --git a/src/modules/chgident.c b/src/modules/chgident.c
new file mode 100644
index 0000000..923ec39
--- /dev/null
+++ b/src/modules/chgident.c
@@ -0,0 +1,153 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/chgident.c
+ *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MSG_CHGIDENT 	"CHGIDENT"
+
+CMD_FUNC(cmd_chgident);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chgident",	/* Name of module */
+	"5.0", /* Version */
+	"/chgident", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_CHGIDENT, cmd_chgident, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* 
+ * cmd_chgident - 12/07/1999 (two months after I made SETIDENT) - Stskeeps
+ * :prefix CHGIDENT <nick> <new identname>
+ * parv[1] - nickname
+ * parv[2] - identname
+ *
+*/
+
+CMD_FUNC(cmd_chgident)
+{
+	Client *target;
+	char *s;
+	int legalident = 1;
+
+	if (!ValidatePermissionsForPath("client:set:ident",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+
+	if ((parc < 3) || !*parv[2])
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "CHGIDENT");
+		return;
+	}
+
+	if (strlen(parv[2]) > (USERLEN))
+	{
+		sendnotice(client, "*** ChgIdent Error: Requested ident too long -- rejected.");
+		return;
+	}
+
+	/* illegal?! */
+	for (s = parv[2]; *s; s++)
+	{
+		if ((*s == '~') && (s == parv[2]))
+			continue;
+		if (!isallowed(*s))
+		{
+			legalident = 0;
+		}
+	}
+
+	if (legalident == 0)
+	{
+		sendnotice(client, "*** /ChgIdent Error: A ident may contain a-z, A-Z, 0-9, '-' & '.' - Please only use them");
+		return;
+	}
+
+	if (!(target = find_person(parv[1], NULL)))
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+		return;
+	}
+	userhost_save_current(target);
+
+	switch (UHOST_ALLOWED)
+	{
+		case UHALLOW_NEVER:
+			if (MyUser(client))
+			{
+				sendnumeric(client, ERR_DISABLED, "CHGIDENT",
+					"This command is disabled on this server");
+				return;
+			}
+			break;
+		case UHALLOW_ALWAYS:
+			break;
+		case UHALLOW_NOCHANS:
+			if (IsUser(target) && MyUser(client) && target->user->joined)
+			{
+				sendnotice(client, "*** /ChgIdent can not be used while %s is on a channel", target->name);
+				return;
+			}
+			break;
+		case UHALLOW_REJOIN:
+			/* join sent later when the ident has been changed */
+			break;
+	}
+	if (!IsULine(client))
+	{
+		sendto_snomask(SNO_EYES,
+		    "%s changed the virtual ident of %s (%s@%s) to be %s",
+		    client->name, target->name, target->user->username,
+		    GetHost(target), parv[2]);
+		/* Logging ability added by XeRXeS */
+		ircd_log(LOG_CHGCMDS,
+			"CHGIDENT: %s changed the virtual ident of %s (%s@%s) to be %s",
+			client->name, target->name, target->user->username,    
+			GetHost(target), parv[2]);
+	}
+
+	sendto_server(client, 0, 0, NULL, ":%s CHGIDENT %s %s",
+	    client->id, target->id, parv[2]);
+	ircsnprintf(target->user->username, sizeof(target->user->username), "%s", parv[2]);
+
+	userhost_changed(target);
+}
diff --git a/src/modules/chgname.c b/src/modules/chgname.c
new file mode 100644
index 0000000..2866117
--- /dev/null
+++ b/src/modules/chgname.c
@@ -0,0 +1,127 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/chgname.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MSG_CHGNAME     "CHGNAME"
+#define MSG_SVSNAME     "SVSNAME"
+
+CMD_FUNC(cmd_chgname);
+
+ModuleHeader MOD_HEADER
+  = {
+	"chgname",	/* Name of module */
+	"5.0", /* Version */
+	"command /chgname", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_CHGNAME, cmd_chgname, 2, CMD_USER|CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVSNAME, cmd_chgname, 2, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/*
+ * cmd_chgname - Tue May 23 13:06:35 BST 200 (almost a year after I made CHGIDENT) - Stskeeps
+ * :prefix CHGNAME <nick> <new realname>
+ * parv[1] - nickname
+ * parv[2] - realname
+ *
+*/
+CMD_FUNC(cmd_chgname)
+{
+	Client *target;
+	ConfigItem_ban *bconf;
+
+	if (!ValidatePermissionsForPath("client:set:name",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 3) || !*parv[2])
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "CHGNAME");
+		return;
+	}
+
+	if (strlen(parv[2]) > (REALLEN))
+	{
+		sendnotice(client, "*** ChgName Error: Requested realname too long -- rejected.");
+		return;
+	}
+
+	if (!(target = find_person(parv[1], NULL)))
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+		return;
+	}
+
+	/* Let's log this first */
+	if (!IsULine(client))
+	{
+		sendto_snomask(SNO_EYES,
+		    "%s changed the GECOS of %s (%s@%s) to be %s",
+		    client->name, target->name, target->user->username,
+		    GetHost(target), parv[2]);
+		/* Logging ability added by XeRXeS */
+		ircd_log(LOG_CHGCMDS,
+			"CHGNAME: %s changed the GECOS of %s (%s@%s) to be %s",
+			client->name, target->name, target->user->username,
+			GetHost(target), parv[2]);
+	}
+
+	/* set the realname to make ban checking work */
+	ircsnprintf(target->info, sizeof(target->info), "%s", parv[2]);
+
+	if (MyUser(target))
+	{
+		/* only check for realname bans if the person who's name is being changed is NOT an oper */
+		if (!ValidatePermissionsForPath("immune:server-ban:ban-realname",target,NULL,NULL,NULL) &&
+		    ((bconf = find_ban(NULL, target->info, CONF_BAN_REALNAME))))
+		{
+			banned_client(target, "realname", bconf->reason?bconf->reason:"", 0, 0);
+			return;
+		}
+	}
+
+	sendto_server(client, 0, 0, NULL, ":%s CHGNAME %s :%s",
+	    client->id, target->name, parv[2]);
+}
diff --git a/src/modules/cloak.c b/src/modules/cloak.c
new file mode 100644
index 0000000..738db54
--- /dev/null
+++ b/src/modules/cloak.c
@@ -0,0 +1,419 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/cloak.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+static char *cloak_key1 = NULL, *cloak_key2 = NULL, *cloak_key3 = NULL;
+static char cloak_checksum[64];
+static int nokeys = 1;
+
+int CLOAK_IP_ONLY = 0;
+
+#undef KEY1
+#undef KEY2
+#undef KEY3
+#define KEY1 cloak_key1
+#define KEY2 cloak_key2
+#define KEY3 cloak_key3
+
+char *hidehost(Client *client, char *host);
+char *cloakcsum();
+int cloak_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int cloak_config_run(ConfigFile *, ConfigEntry *, int);
+int cloak_config_posttest(int *);
+
+static char *hidehost_ipv4(char *host);
+static char *hidehost_ipv6(char *host);
+static char *hidehost_normalhost(char *host);
+static inline unsigned int downsample(char *i);
+
+Callback *cloak = NULL, *cloak_csum = NULL;
+
+ModuleHeader MOD_HEADER = {
+	"cloak",
+	"1.0",
+	"Official cloaking module (md5)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+MOD_TEST()
+{
+	cloak = CallbackAddPCharEx(modinfo->handle, CALLBACKTYPE_CLOAK_EX, hidehost);
+	if (!cloak)
+	{
+		config_error("cloak: Error while trying to install cloaking callback!");
+		return MOD_FAILED;
+	}
+	cloak_csum = CallbackAddPCharEx(modinfo->handle, CALLBACKTYPE_CLOAKKEYCSUM, cloakcsum);
+	if (!cloak_csum)
+	{
+		config_error("cloak: Error while trying to install cloaking checksum callback!");
+		return MOD_FAILED;
+	}
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, cloak_config_test);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, cloak_config_posttest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, cloak_config_run);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	if (cloak_key1)
+	{
+		safe_free(cloak_key1);
+		safe_free(cloak_key2);
+		safe_free(cloak_key3);
+	}
+	return MOD_SUCCESS;
+}
+
+static int check_badrandomness(char *key)
+{
+char gotlowcase=0, gotupcase=0, gotdigit=0;
+char *p;
+	for (p=key; *p; p++)
+		if (islower(*p))
+			gotlowcase = 1;
+		else if (isupper(*p))
+			gotupcase = 1;
+		else if (isdigit(*p))
+			gotdigit = 1;
+
+	if (gotlowcase && gotupcase && gotdigit)
+		return 0;
+	return 1;
+}
+
+
+int cloak_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep;
+	int keycnt = 0, errors = 0;
+	char *keys[3];
+
+	if (type == CONFIG_SET)
+	{
+		/* set::cloak-method */
+		if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "cloak-method"))
+			return 0;
+
+		if (strcmp(ce->ce_vardata, "ip") && strcmp(ce->ce_vardata, "host"))
+		{
+			config_error("%s:%i: set::cloak-method: unknown method '%s'. The only supported methods are: 'ip' and 'host'",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum, ce->ce_vardata);
+			errors++;
+		}
+
+		*errs = errors;
+		return errors ? -1 : 1;
+	}
+
+	if (type != CONFIG_CLOAKKEYS)
+		return 0;
+
+	nokeys = 0;
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		keycnt++;
+		/* TODO: check randomness */
+		if (check_badrandomness(cep->ce_varname))
+		{
+			config_error("%s:%i: set::cloak-keys: (key %d) Keys should be mixed a-zA-Z0-9, "
+			             "like \"a2JO6fh3Q6w4oN3s7\"", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, keycnt);
+			errors++;
+		}
+		if (strlen(cep->ce_varname) < 5)
+		{
+			config_error("%s:%i: set::cloak-keys: (key %d) Each key should be at least 5 characters",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, keycnt);
+			errors++;
+		}
+		if (strlen(cep->ce_varname) > 100)
+		{
+			config_error("%s:%i: set::cloak-keys: (key %d) Each key should be less than 100 characters",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, keycnt);
+			errors++;
+		}
+		if (keycnt < 4)
+			keys[keycnt-1] = cep->ce_varname;
+	}
+	if (keycnt != 3)
+	{
+		config_error("%s:%i: set::cloak-keys: we want 3 values, not %i!",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum, keycnt);
+		errors++;
+	}
+	if ((keycnt == 3) && (!strcmp(keys[0], keys[1]) || !strcmp(keys[1], keys[2])))
+	{
+		config_error("%s:%i: set::cloak-keys: All your 3 keys should be RANDOM, they should not be equal",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int cloak_config_posttest(int *errs)
+{
+int errors = 0;
+
+	if (nokeys)
+	{
+		config_error("set::cloak-keys missing!");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int cloak_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+ConfigEntry *cep;
+char buf[512], result[16];
+
+	if (type == CONFIG_SET)
+	{
+		/* set::cloak-method */
+		if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "cloak-method"))
+			return 0;
+
+		if (!strcmp(ce->ce_vardata, "ip"))
+			CLOAK_IP_ONLY = 1;
+
+		return 0;
+	}
+
+	if (type != CONFIG_CLOAKKEYS)
+		return 0;
+
+	/* config test should ensure this goes fine... */
+	cep = ce->ce_entries;
+	safe_strdup(cloak_key1, cep->ce_varname);
+	cep = cep->ce_next;
+	safe_strdup(cloak_key2, cep->ce_varname);
+	cep = cep->ce_next;
+	safe_strdup(cloak_key3, cep->ce_varname);
+
+	/* Calculate checksum */
+	ircsnprintf(buf, sizeof(buf), "%s:%s:%s", KEY1, KEY2, KEY3);
+	DoMD5(result, buf, strlen(buf));
+	ircsnprintf(cloak_checksum, sizeof(cloak_checksum),
+		"MD5:%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x%x",
+		(u_int)(result[0] & 0xf), (u_int)(result[0] >> 4),
+		(u_int)(result[1] & 0xf), (u_int)(result[1] >> 4),
+		(u_int)(result[2] & 0xf), (u_int)(result[2] >> 4),
+		(u_int)(result[3] & 0xf), (u_int)(result[3] >> 4),
+		(u_int)(result[4] & 0xf), (u_int)(result[4] >> 4),
+		(u_int)(result[5] & 0xf), (u_int)(result[5] >> 4),
+		(u_int)(result[6] & 0xf), (u_int)(result[6] >> 4),
+		(u_int)(result[7] & 0xf), (u_int)(result[7] >> 4),
+		(u_int)(result[8] & 0xf), (u_int)(result[8] >> 4),
+		(u_int)(result[9] & 0xf), (u_int)(result[9] >> 4),
+		(u_int)(result[10] & 0xf), (u_int)(result[10] >> 4),
+		(u_int)(result[11] & 0xf), (u_int)(result[11] >> 4),
+		(u_int)(result[12] & 0xf), (u_int)(result[12] >> 4),
+		(u_int)(result[13] & 0xf), (u_int)(result[13] >> 4),
+		(u_int)(result[14] & 0xf), (u_int)(result[14] >> 4),
+		(u_int)(result[15] & 0xf), (u_int)(result[15] >> 4));
+	return 1;
+}
+
+char *hidehost(Client *client, char *host)
+{
+	char *p;
+	int host_type;
+
+	if (CLOAK_IP_ONLY)
+		host = GetIP(client);
+
+	host_type = is_valid_ip(host);
+
+	if (host_type == 4)
+		return hidehost_ipv4(host);
+	else if (host_type == 6)
+		return hidehost_ipv6(host);
+	else
+		return hidehost_normalhost(host);
+}
+
+char *cloakcsum()
+{
+	return cloak_checksum;
+}
+
+/** Downsamples a 128bit result to 32bits (md5 -> unsigned int) */
+static inline unsigned int downsample(char *i)
+{
+char r[4];
+
+	r[0] = i[0] ^ i[1] ^ i[2] ^ i[3];
+	r[1] = i[4] ^ i[5] ^ i[6] ^ i[7];
+	r[2] = i[8] ^ i[9] ^ i[10] ^ i[11];
+	r[3] = i[12] ^ i[13] ^ i[14] ^ i[15];
+	
+	return ( ((unsigned int)r[0] << 24) +
+	         ((unsigned int)r[1] << 16) +
+	         ((unsigned int)r[2] << 8) +
+	         (unsigned int)r[3]);
+}
+
+static char *hidehost_ipv4(char *host)
+{
+unsigned int a, b, c, d;
+static char buf[512], res[512], res2[512], result[128];
+unsigned long n;
+unsigned int alpha, beta, gamma;
+
+	/* 
+	 * Output: ALPHA.BETA.GAMMA.IP
+	 * ALPHA is unique for a.b.c.d
+	 * BETA  is unique for a.b.c.*
+	 * GAMMA is unique for a.b.*
+	 * We cloak like this:
+	 * ALPHA = downsample(md5(md5("KEY2:A.B.C.D:KEY3")+"KEY1"));
+	 * BETA  = downsample(md5(md5("KEY3:A.B.C:KEY1")+"KEY2"));
+	 * GAMMA = downsample(md5(md5("KEY1:A.B:KEY2")+"KEY3"));
+	 */
+	sscanf(host, "%u.%u.%u.%u", &a, &b, &c, &d);
+
+	/* ALPHA... */
+	ircsnprintf(buf, sizeof(buf), "%s:%s:%s", KEY2, host, KEY3);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY1, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	alpha = downsample(res2);
+
+	/* BETA... */
+	ircsnprintf(buf, sizeof(buf), "%s:%d.%d.%d:%s", KEY3, a, b, c, KEY1);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY2, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	beta = downsample(res2);
+
+	/* GAMMA... */
+	ircsnprintf(buf, sizeof(buf), "%s:%d.%d:%s", KEY1, a, b, KEY2);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY3, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	gamma = downsample(res2);
+
+	ircsnprintf(result, sizeof(result), "%X.%X.%X.IP", alpha, beta, gamma);
+	return result;
+}
+
+static char *hidehost_ipv6(char *host)
+{
+unsigned int a, b, c, d, e, f, g, h;
+static char buf[512], res[512], res2[512], result[128];
+unsigned long n;
+unsigned int alpha, beta, gamma;
+
+	/* 
+	 * Output: ALPHA:BETA:GAMMA:IP
+	 * ALPHA is unique for a:b:c:d:e:f:g:h
+	 * BETA  is unique for a:b:c:d:e:f:g
+	 * GAMMA is unique for a:b:c:d
+	 * We cloak like this:
+	 * ALPHA = downsample(md5(md5("KEY2:a:b:c:d:e:f:g:h:KEY3")+"KEY1"));
+	 * BETA  = downsample(md5(md5("KEY3:a:b:c:d:e:f:g:KEY1")+"KEY2"));
+	 * GAMMA = downsample(md5(md5("KEY1:a:b:c:d:KEY2")+"KEY3"));
+	 */
+	sscanf(host, "%x:%x:%x:%x:%x:%x:%x:%x",
+		&a, &b, &c, &d, &e, &f, &g, &h);
+
+	/* ALPHA... */
+	ircsnprintf(buf, sizeof(buf), "%s:%s:%s", KEY2, host, KEY3);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY1, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	alpha = downsample(res2);
+
+	/* BETA... */
+	ircsnprintf(buf, sizeof(buf), "%s:%x:%x:%x:%x:%x:%x:%x:%s", KEY3, a, b, c, d, e, f, g, KEY1);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY2, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	beta = downsample(res2);
+
+	/* GAMMA... */
+	ircsnprintf(buf, sizeof(buf), "%s:%x:%x:%x:%x:%s", KEY1, a, b, c, d, KEY2);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY3, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	gamma = downsample(res2);
+
+	ircsnprintf(result, sizeof(result), "%X:%X:%X:IP", alpha, beta, gamma);
+	return result;
+}
+
+static char *hidehost_normalhost(char *host)
+{
+char *p;
+static char buf[512], res[512], res2[512], result[HOSTLEN+1];
+unsigned int alpha, n;
+
+	ircsnprintf(buf, sizeof(buf), "%s:%s:%s", KEY1, host, KEY2);
+	DoMD5(res, buf, strlen(buf));
+	strlcpy(res+16, KEY3, sizeof(res)-16); /* first 16 bytes are filled, append our key.. */
+	n = strlen(res+16) + 16;
+	DoMD5(res2, res, n);
+	alpha = downsample(res2);
+
+	for (p = host; *p; p++)
+		if (*p == '.')
+			if (isalpha(*(p + 1)))
+				break;
+
+	if (*p)
+	{
+		unsigned int len;
+		p++;
+		ircsnprintf(result, sizeof(result), "%s-%X.", hidden_host, alpha);
+		len = strlen(result) + strlen(p);
+		if (len <= HOSTLEN)
+			strlcat(result, p, sizeof(result));
+		else
+			strlcat(result, p + (len - HOSTLEN), sizeof(result));
+	} else
+		ircsnprintf(result, sizeof(result),  "%s-%X", hidden_host, alpha);
+
+	return result;
+}
diff --git a/src/modules/close.c b/src/modules/close.c
new file mode 100644
index 0000000..e9f988e
--- /dev/null
+++ b/src/modules/close.c
@@ -0,0 +1,81 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_close);
+
+#define MSG_CLOSE 	"CLOSE"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"close",
+	"5.0",
+	"command /close", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_CLOSE, cmd_close, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_close - added by Darren Reed Jul 13 1992.
+*/
+CMD_FUNC(cmd_close)
+{
+	Client *target, *next;
+	int  closed = 0;
+
+	if (!ValidatePermissionsForPath("server:close",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	list_for_each_entry_safe(target, next, &unknown_list, lclient_node)
+	{
+		sendnumeric(client, RPL_CLOSING,
+		    get_client_name(target, TRUE), target->status);
+		exit_client(target, NULL, "Oper Closing");
+		closed++;
+	}
+
+	sendnumeric(client, RPL_CLOSEEND, closed);
+	sendto_realops("%s!%s@%s closed %d unknown connections", client->name,
+	    client->user->username, GetHost(client), closed);
+	irccounts.unknown = 0;
+}
diff --git a/src/modules/connect.c b/src/modules/connect.c
new file mode 100644
index 0000000..306998e
--- /dev/null
+++ b/src/modules/connect.c
@@ -0,0 +1,155 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_connect);
+
+#define MSG_CONNECT 	"CONNECT"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"connect",
+	"5.0",
+	"command /connect", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_CONNECT, cmd_connect, MAXPARA, CMD_USER|CMD_SERVER); /* hmm.. server.. really? */
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/***********************************************************************
+ * cmd_connect() - Added by Jto 11 Feb 1989
+ ***********************************************************************//*
+   ** cmd_connect
+   **  parv[1] = servername
+ */
+CMD_FUNC(cmd_connect)
+{
+	int  retval;
+	ConfigItem_link	*aconf;
+	ConfigItem_deny_link *deny;
+	Client *server;
+
+	if (!IsServer(client) && MyConnect(client) && !ValidatePermissionsForPath("route:global",client,NULL,NULL,NULL) && parc > 3)
+	{			/* Only allow LocOps to make */
+		/* local CONNECTS --SRB      */
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	if (!IsServer(client) && MyUser(client) && !ValidatePermissionsForPath("route:local",client,NULL,NULL,NULL) && parc <= 3)
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	if (hunt_server(client, recv_mtags, ":%s CONNECT %s %s :%s", 3, parc, parv) != HUNTED_ISME)
+		return;
+
+	if (parc < 2 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "CONNECT");
+		return;
+	}
+
+	if ((server = find_server_quick(parv[1])))
+	{
+		sendnotice(client, "*** Connect: Server %s already exists from %s.",
+		    parv[1], server->direction->name);
+		return;
+	}
+
+	for (aconf = conf_link; aconf; aconf = aconf->next)
+		if (match_simple(parv[1], aconf->servername))
+			break;
+
+	/* Checked first servernames, then try hostnames. */
+
+	if (!aconf)
+	{
+		sendnotice(client,
+		    "*** Connect: Server %s is not configured for linking",
+		    parv[1]);
+		return;
+	}
+
+	if (!aconf->outgoing.hostname)
+	{
+		sendnotice(client,
+		    "*** Connect: Server %s is not configured to be an outgoing link (has a link block, but no link::outgoing::hostname)",
+		    parv[1]);
+		return;
+	}
+
+	/* Evaluate deny link */
+	for (deny = conf_deny_link; deny; deny = deny->next)
+	{
+		if (deny->flag.type == CRULE_ALL && match_simple(deny->mask, aconf->servername)
+			&& crule_eval(deny->rule))
+		{
+			sendnotice(client, "*** Connect: Disallowed by connection rule");
+			return;
+		}
+	}
+
+	/* Notify all operators about remote connect requests */
+	if (!MyUser(client))
+	{
+		sendto_server(NULL, 0, 0, NULL,
+		    ":%s SENDUMODE o :Remote CONNECT %s %s from %s",
+		    me.id, parv[1], parv[2] ? parv[2] : "",
+		    get_client_name(client, FALSE));
+	}
+
+	switch (retval = connect_server(aconf, client, NULL))
+	{
+	  case 0:
+		  sendnotice(client, "*** Connecting to %s[%s].",
+		      aconf->servername, aconf->outgoing.hostname);
+		  break;
+	  case -1:
+		  sendnotice(client, "*** Couldn't connect to %s[%s]",
+		  	aconf->servername, aconf->outgoing.hostname);
+		  break;
+	  case -2:
+		  sendnotice(client, "*** Resolving hostname '%s'...",
+		  	aconf->outgoing.hostname);
+		  break;
+	  default:
+		  sendnotice(client, "*** Connection to %s[%s] failed: %s",
+		  	aconf->servername, aconf->outgoing.hostname, STRERROR(retval));
+	}
+}
diff --git a/src/modules/connthrottle.c b/src/modules/connthrottle.c
new file mode 100644
index 0000000..b86feff
--- /dev/null
+++ b/src/modules/connthrottle.c
@@ -0,0 +1,636 @@
+/*
+ * connthrottle - Connection throttler
+ * (C) Copyright 2004-2020 Bram Matthys (Syzop) and the UnrealIRCd team
+ * License: GPLv2
+ * See https://www.unrealircd.org/docs/Connthrottle
+ */
+
+#include "unrealircd.h"
+
+#define CONNTHROTTLE_VERSION "1.3"
+
+#ifndef CALLBACKTYPE_REPUTATION_STARTTIME
+ #define CALLBACKTYPE_REPUTATION_STARTTIME 5
+#endif
+
+ModuleHeader MOD_HEADER
+  = {
+	"connthrottle",
+	CONNTHROTTLE_VERSION,
+	"Connection throttler - by Syzop",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+typedef struct {
+	int count;
+	int period;
+} ThrottleSetting;
+
+struct cfgstruct {
+	/* set::connthrottle::known-users: */
+	ThrottleSetting local;
+	ThrottleSetting global;
+	/* set::connthrottle::new-users: */
+	int minimum_reputation_score;
+	int sasl_bypass;
+	int webirc_bypass;
+	/* set::connthrottle::disabled-when: */
+	long reputation_gathering;
+	int start_delay;
+	/* set::connthrottle (generic): */
+	char *reason;
+};
+static struct cfgstruct cfg;
+
+typedef struct {
+	int count;
+	long t;
+} ThrottleCounter;
+
+typedef struct UCounter UCounter;
+struct UCounter {
+	ThrottleCounter local;		/**< Local counter */
+	ThrottleCounter global;		/**< Global counter */
+	int rejected_clients;		/**< Number of rejected clients this minute */
+	int allowed_score;		/**< Number of allowed clients of type known-user */
+	int allowed_sasl;		/**< Number of allowed clients of type SASL */
+	int allowed_webirc;		/**< Number of allowed clients of type WEBIRC */
+	int allowed_other;		/**< Number of allowed clients of type other (new) */
+	char disabled;			/**< Module disabled by oper? */
+	int throttling_this_minute;	/**< Did we do any throttling this minute? */
+	int throttling_previous_minute;	/**< Did we do any throttling previous minute? */
+	int throttling_banner_displayed;/**< Big we-are-now-throttling banner displayed? */
+	time_t next_event;		/**< When is next event? (for "last 60 seconds" stats) */
+};
+UCounter *ucounter = NULL;
+
+#define MSG_THROTTLE "THROTTLE"
+
+#define GetReputation(client)     (moddata_client_get(client, "reputation") ? atoi(moddata_client_get(client, "reputation")) : 0)
+
+/* Forward declarations */
+int ct_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int ct_config_posttest(int *errs);
+int ct_config_run(ConfigFile *cf, ConfigEntry *ce, int type);
+int ct_pre_lconnect(Client *client);
+int ct_lconnect(Client *);
+int ct_rconnect(Client *);
+CMD_FUNC(ct_throttle);
+EVENT(connthrottle_evt);
+void ucounter_free(ModData *m);
+
+MOD_TEST()
+{
+	memset(&cfg, 0, sizeof(cfg));
+	
+	/* Defaults: */
+	cfg.local.count = 20; cfg.local.period = 60;
+	cfg.global.count = 30; cfg.global.period = 60;
+	cfg.start_delay = 180;		/* 3 minutes */
+	safe_strdup(cfg.reason, "Throttled: Too many users trying to connect, please wait a while and try again");
+	cfg.minimum_reputation_score = 24;
+	cfg.sasl_bypass = 1;
+	cfg.webirc_bypass = 0;
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, ct_config_test);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, ct_config_posttest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	LoadPersistentPointer(modinfo, ucounter, ucounter_free);
+	if (!ucounter)
+		ucounter = safe_alloc(sizeof(UCounter));
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, ct_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CONNECT, 0, ct_pre_lconnect);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_CONNECT, 0, ct_lconnect);
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_CONNECT, 0, ct_rconnect);
+	CommandAdd(modinfo->handle, MSG_THROTTLE, ct_throttle, MAXPARA, CMD_USER|CMD_SERVER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(modinfo->handle, "connthrottle_evt", connthrottle_evt, NULL, 1000, 0);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	SavePersistentPointer(modinfo, ucounter);
+	safe_free(cfg.reason);
+	return MOD_SUCCESS;
+}
+
+/** This function checks if the reputation module is loaded.
+ * If not, then the module will error, since we depend on it.
+ */
+int ct_config_posttest(int *errs)
+{
+	int errors = 0;
+
+	/* Note: we use Callbacks[] here, but this is only for checking. Don't
+	 * let this confuse you. At any other place you must use RCallbacks[].
+	 */
+	if (Callbacks[CALLBACKTYPE_REPUTATION_STARTTIME] == NULL)
+	{
+		config_error("The 'connthrottle' module requires the 'reputation' "
+		             "module to be loaded as well.");
+		config_error("Add the following to your configuration file: "
+		             "loadmodule \"reputation\";");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+#ifndef CheckNull
+ #define CheckNull(x) if ((!(x)->ce_vardata) || (!(*((x)->ce_vardata)))) { config_error("%s:%i: missing parameter", (x)->ce_fileptr->cf_filename, (x)->ce_varlinenum); errors++; continue; }
+#endif
+/** Test the set::connthrottle configuration */
+int ct_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep, *cepp;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::connthrottle.. */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "connthrottle"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "known-users"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "minimum-reputation-score"))
+				{
+					int cnt = atoi(cepp->ce_vardata);
+					if (cnt < 1)
+					{
+						config_error("%s:%i: set::connthrottle::known-users::minimum-reputation-score should be at least 1",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+						continue;
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "sasl-bypass"))
+				{
+				} else
+				if (!strcmp(cepp->ce_varname, "webirc-bypass"))
+				{
+				} else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+					                     "set::connthrottle::known-users", cepp->ce_varname);
+					errors++;
+				}
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "new-users"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "local-throttle"))
+				{
+					int cnt, period;
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 2000000000) || (period > 2000000000))
+					{
+						config_error("%s:%i: set::connthrottle::new-users::local-throttle error. "
+							     "Syntax is <count>:<period> (eg 6:60), "
+							     "and count and period should be non-zero.",
+							     cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+						continue;
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "global-throttle"))
+				{
+					int cnt, period;
+					if (!config_parse_flood(cepp->ce_vardata, &cnt, &period) ||
+					    (cnt < 1) || (cnt > 2000000000) || (period > 2000000000))
+					{
+						config_error("%s:%i: set::connthrottle::new-users::global-throttle error. "
+							     "Syntax is <count>:<period> (eg 6:60), "
+							     "and count and period should be non-zero.",
+							     cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+						continue;
+					}
+				} else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+					                     "set::connthrottle::new-users", cepp->ce_varname);
+					errors++;
+				}
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "disabled-when"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				CheckNull(cepp);
+				if (!strcmp(cepp->ce_varname, "start-delay"))
+				{
+					int cnt = config_checkval(cepp->ce_vardata, CFG_TIME);
+					if ((cnt < 0) || (cnt > 3600))
+					{
+						config_error("%s:%i: set::connthrottle::disabled-when::start-delay should be in range 0-3600",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum);
+						errors++;
+						continue;
+					}
+				} else
+				if (!strcmp(cepp->ce_varname, "reputation-gathering"))
+				{
+				} else
+				{
+					config_error_unknown(cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum,
+					                     "set::connthrottle::disabled-when", cepp->ce_varname);
+					errors++;
+				}
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "reason"))
+		{
+			CheckNull(cep);
+		} else
+		{
+			config_error("%s:%i: unknown directive set::connthrottle::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+	
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+/* Configure ourselves based on the set::connthrottle settings */
+int ct_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *cepp;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::connthrottle.. */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "connthrottle"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "known-users"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "minimum-reputation-score"))
+					cfg.minimum_reputation_score = atoi(cepp->ce_vardata);
+				else if (!strcmp(cepp->ce_varname, "sasl-bypass"))
+					cfg.sasl_bypass = config_checkval(cepp->ce_vardata, CFG_YESNO);
+				else if (!strcmp(cepp->ce_varname, "webirc-bypass"))
+					cfg.webirc_bypass = config_checkval(cepp->ce_vardata, CFG_YESNO);
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "new-users"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "local-throttle"))
+					config_parse_flood(cepp->ce_vardata, &cfg.local.count, &cfg.local.period);
+				else if (!strcmp(cepp->ce_varname, "global-throttle"))
+					config_parse_flood(cepp->ce_vardata, &cfg.global.count, &cfg.global.period);
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "disabled-when"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "start-delay"))
+					cfg.start_delay = config_checkval(cepp->ce_vardata, CFG_TIME);
+				else if (!strcmp(cepp->ce_varname, "reputation-gathering"))
+					cfg.reputation_gathering = config_checkval(cepp->ce_vardata, CFG_TIME);
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "reason"))
+		{
+			safe_free(cfg.reason);
+			cfg.reason = safe_alloc(strlen(cep->ce_vardata)+16);
+			sprintf(cfg.reason, "Throttled: %s", cep->ce_vardata);
+		}
+	}
+	return 1;
+}
+
+/** Returns 1 if the 'reputation' module is still gathering
+ * data, such as in the first week of when it is loaded.
+ * This behavior is configured via set::disabled-when::reputation-gathering
+ */
+int still_reputation_gathering(void)
+{
+	int v;
+
+	if (RCallbacks[CALLBACKTYPE_REPUTATION_STARTTIME] == NULL)
+		return 1; /* Reputation module not loaded, disable us */
+
+	v = RCallbacks[CALLBACKTYPE_REPUTATION_STARTTIME]->func.intfunc();
+
+	if (TStime() - v < cfg.reputation_gathering)
+		return 1; /* Still gathering reputation data (eg: first week) */
+
+	return 0;
+}
+
+EVENT(connthrottle_evt)
+{
+	char buf[512];
+
+	if (ucounter->next_event > TStime())
+		return;
+	ucounter->next_event = TStime() + 60;
+
+	if (ucounter->rejected_clients)
+	{
+		snprintf(buf, sizeof(buf),
+		         "[ConnThrottle] Stats for this server past 60 secs: Connections rejected: %d. Accepted: %d known user(s), %d SASL, %d WEBIRC and %d new user(s).",
+		         ucounter->rejected_clients,
+		         ucounter->allowed_score,
+		         ucounter->allowed_sasl,
+			 ucounter->allowed_webirc,
+		         ucounter->allowed_other);
+
+		sendto_realops("%s", buf);
+		ircd_log(LOG_ERROR, "%s", buf);
+	}
+
+	/* Reset stats for next message */
+	ucounter->rejected_clients = 0;
+	ucounter->allowed_score = 0;
+	ucounter->allowed_sasl = 0;
+	ucounter->allowed_webirc = 0;
+	ucounter->allowed_other = 0;
+
+	ucounter->throttling_previous_minute = ucounter->throttling_this_minute;
+	ucounter->throttling_this_minute = 0; /* reset */
+	ucounter->throttling_banner_displayed = 0; /* reset */
+}
+
+#define THROT_LOCAL 1
+#define THROT_GLOBAL 2
+int ct_pre_lconnect(Client *client)
+{
+	int throttle=0;
+	int score;
+
+	if (me.local->firsttime + cfg.start_delay > TStime())
+		return HOOK_CONTINUE; /* no throttle: start delay */
+
+	if (ucounter->disabled)
+		return HOOK_CONTINUE; /* protection disabled: allow user */
+
+	if (still_reputation_gathering())
+		return HOOK_CONTINUE; /* still gathering reputation data */
+
+	if (cfg.sasl_bypass && IsLoggedIn(client))
+	{
+		/* Allowed in: user authenticated using SASL */
+		return HOOK_CONTINUE;
+	}
+	
+	if (cfg.webirc_bypass && moddata_client_get(client, "webirc"))
+	{
+		/* Allowed in: user using WEBIRC */
+		return HOOK_CONTINUE;
+	}
+
+	score = GetReputation(client);
+	if (score >= cfg.minimum_reputation_score)
+	{
+		/* Allowed in: IP has enough reputation ("known user") */
+		return HOOK_CONTINUE;
+	}
+
+	/* If we reach this then the user is NEW */
+
+	/* +1 global client would reach global limit? */
+	if ((TStime() - ucounter->global.t < cfg.global.period) && (ucounter->global.count+1 > cfg.global.count))
+		throttle |= THROT_GLOBAL;
+
+	/* +1 local client would reach local limit? */
+	if ((TStime() - ucounter->local.t < cfg.local.period) && (ucounter->local.count+1 > cfg.local.count))
+		throttle |= THROT_LOCAL;
+
+	if (throttle)
+	{
+		ucounter->throttling_this_minute = 1;
+		ucounter->rejected_clients++;
+		/* We send the LARGE banner if throttling was activated */
+		if (!ucounter->throttling_previous_minute && !ucounter->throttling_banner_displayed)
+		{
+			ircd_log(LOG_ERROR, "[ConnThrottle] Connection throttling has been ACTIVATED due to a HIGH CONNECTION RATE.");
+			sendto_realops("[ConnThrottle] Connection throttling has been ACTIVATED due to a HIGH CONNECTION RATE.");
+			sendto_realops("[ConnThrottle] Users with IP addresses that have not been seen before will be rejected above the set connection rate. Known users can still get in.");
+			sendto_realops("[ConnThrottle] For more information see https://www.unrealircd.org/docs/ConnThrottle");
+			ucounter->throttling_banner_displayed = 1;
+		}
+		exit_client(client, NULL, cfg.reason);
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
+
+/** Increase the connect counter(s), nothing else. */
+void bump_connect_counter(int local_connect)
+{
+	if (local_connect)
+	{
+		/* Bump local connect counter */
+		if (TStime() - ucounter->local.t >= cfg.local.period)
+		{
+			ucounter->local.t = TStime();
+			ucounter->local.count = 1;
+		} else {
+			ucounter->local.count++;
+		}
+	}
+
+	/* Bump global connect counter */
+	if (TStime() - ucounter->global.t >= cfg.global.period)
+	{
+		ucounter->global.t = TStime();
+		ucounter->global.count = 1;
+	} else {
+		ucounter->global.count++;
+	}
+}
+
+int ct_lconnect(Client *client)
+{
+	int score;
+
+	if (me.local->firsttime + cfg.start_delay > TStime())
+		return 0; /* no throttle: start delay */
+
+	if (ucounter->disabled)
+		return 0; /* protection disabled: allow user */
+
+	if (still_reputation_gathering())
+		return 0; /* still gathering reputation data */
+
+	if (cfg.sasl_bypass && IsLoggedIn(client))
+	{
+		/* Allowed in: user authenticated using SASL */
+		ucounter->allowed_sasl++;
+		return 0;
+	}
+	
+	if (cfg.webirc_bypass && moddata_client_get(client, "webirc"))
+	{
+		/* Allowed in: user using WEBIRC */
+		ucounter->allowed_webirc++;
+		return 0;
+	}
+
+	score = GetReputation(client);
+	if (score >= cfg.minimum_reputation_score)
+	{
+		/* Allowed in: IP has enough reputation ("known user") */
+		ucounter->allowed_score++;
+		return 0;
+	}
+
+	/* Allowed NEW user */
+	ucounter->allowed_other++;
+
+	bump_connect_counter(1);
+
+	return 0;
+}
+
+int ct_rconnect(Client *client)
+{
+	int score;
+
+	if (client->srvptr && !IsSynched(client->srvptr))
+		return 0; /* Netmerge: skip */
+
+	if (IsULine(client))
+		return 0; /* U:lined, such as services: skip */
+
+#if UNREAL_VERSION_TIME >= 201915
+	/* On UnrealIRCd 4.2.3+ we can see the boot time (start time)
+	 * of the remote server. This way we can apply the
+	 * set::disabled-when::start-delay restriction on remote
+	 * servers as well.
+	 */
+	if (client->srvptr && client->srvptr->serv && client->srvptr->serv->boottime &&
+	    (TStime() - client->srvptr->serv->boottime < cfg.start_delay))
+	{
+		return 0;
+	}
+#endif
+
+	score = GetReputation(client);
+	if (score >= cfg.minimum_reputation_score)
+		return 0; /* sufficient reputation: "known-user" */
+
+	bump_connect_counter(0);
+
+	return 0;
+}
+
+static void ct_throttle_usage(Client *client)
+{
+	sendnotice(client, "Usage: /THROTTLE [ON|OFF|STATUS|RESET]");
+	sendnotice(client, " ON:     Enabled protection");
+	sendnotice(client, " OFF:    Disables protection");
+	sendnotice(client, " STATUS: Status report");
+	sendnotice(client, " RESET:  Resets all counters(&more)");
+	sendnotice(client, "NOTE: All commands only affect this server. Remote servers are not affected.");
+}
+
+CMD_FUNC(ct_throttle)
+{
+	if (!IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		ct_throttle_usage(client);
+		return;
+	}
+
+	if (!strcasecmp(parv[1], "STATS") || !strcasecmp(parv[1], "STATUS"))
+	{
+		sendnotice(client, "STATUS:");
+		if (ucounter->disabled)
+		{
+			sendnotice(client, "Module DISABLED on oper request. To re-enable, type: /THROTTLE ON");
+		} else {
+			if (still_reputation_gathering())
+			{
+				sendnotice(client, "Module DISABLED because the 'reputation' module has not gathered enough data yet (set::connthrottle::disabled-when::reputation-gathering).");
+			} else
+			if (me.local->firsttime + cfg.start_delay > TStime())
+			{
+				sendnotice(client, "Module DISABLED due to start-delay (set::connthrottle::disabled-when::start-delay), will be enabled in %lld second(s).",
+					(long long)((me.local->firsttime + cfg.start_delay) - TStime()));
+			} else
+			{
+				sendnotice(client, "Module ENABLED");
+			}
+		}
+	} else 
+	if (!strcasecmp(parv[1], "OFF"))
+	{
+		if (ucounter->disabled == 1)
+		{
+			sendnotice(client, "Already OFF");
+			return;
+		}
+		ucounter->disabled = 1;
+		sendto_realops("[connthrottle] %s (%s@%s) DISABLED the connthrottle module.",
+			client->name, client->user->username, client->user->realhost);
+	} else
+	if (!strcasecmp(parv[1], "ON"))
+	{
+		if (ucounter->disabled == 0)
+		{
+			sendnotice(client, "Already ON");
+			return;
+		}
+		sendto_realops("[connthrottle] %s (%s@%s) ENABLED the connthrottle module.",
+			client->name, client->user->username, client->user->realhost);
+		ucounter->disabled = 0;
+	} else
+	if (!strcasecmp(parv[1], "RESET"))
+	{
+		memset(ucounter, 0, sizeof(UCounter));
+		sendto_realops("[connthrottle] %s (%s@%s) did a RESET on the stats/counters!!",
+			client->name, client->user->username, client->user->realhost);
+	} else
+	{
+		sendnotice(client, "Unknown option '%s'", parv[1]);
+		ct_throttle_usage(client);
+	}
+}
+
+void ucounter_free(ModData *m)
+{
+	safe_free(ucounter);
+}
diff --git a/src/modules/cycle.c b/src/modules/cycle.c
new file mode 100644
index 0000000..8953609
--- /dev/null
+++ b/src/modules/cycle.c
@@ -0,0 +1,81 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/cycle.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_cycle);
+
+/* Place includes here */
+#define MSG_CYCLE       "CYCLE"
+
+ModuleHeader MOD_HEADER
+  = {
+	"cycle",	/* Name of module */
+	"5.0", /* Version */
+	"command /cycle", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_CYCLE, cmd_cycle, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+	
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+/*
+ * cmd_cycle() - Stskeeps
+ * parv[1] = channels
+*/
+
+CMD_FUNC(cmd_cycle)
+{
+	char channels[BUFSIZE];
+	int n;
+	
+	if (parc < 2)
+		return;
+
+	/* First PART the user... */
+	parv[2] = "cycling";
+	strlcpy(channels, parv[1], sizeof(channels));
+	do_cmd(client, recv_mtags, "PART", 3, parv);
+	if (IsDead(client))
+		return;
+
+	/* Then JOIN the user again... */
+	parv[1] = channels;
+	parv[2] = NULL;
+	do_cmd(client, recv_mtags, "JOIN", 2, parv);
+}
diff --git a/src/modules/dccallow.c b/src/modules/dccallow.c
new file mode 100644
index 0000000..ffeffd4
--- /dev/null
+++ b/src/modules/dccallow.c
@@ -0,0 +1,252 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/m_dccallow
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_dccallow);
+
+#define MSG_DCCALLOW 	"DCCALLOW"
+
+ModuleHeader MOD_HEADER
+  = {
+	"dccallow",
+	"5.0",
+	"command /dccallow", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_DCCALLOW, cmd_dccallow, 1, CMD_USER);
+	ISupportAdd(modinfo->handle, "USERIP", NULL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_dccallow:
+ * HISTORY:
+ * Taken from bahamut 1.8.1
+ */
+CMD_FUNC(cmd_dccallow)
+{
+	Link *lp;
+	char *p, *s;
+	Client *friend;
+	int didlist = 0, didhelp = 0, didanything = 0;
+	char **ptr;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("WHOIS");
+	static char *dcc_help[] =
+	{
+		"/DCCALLOW [<+|->nick[,<+|->nick, ...]] [list] [help]",
+		"You may allow DCCs of files which are otherwise blocked by the IRC server",
+		"by specifying a DCC allow for the user you want to recieve files from.",
+		"For instance, to allow the user Bob to send you file.exe, you would type:",
+		"/DCCALLOW +bob",
+		"and Bob would then be able to send you files. Bob will have to resend the file",
+		"if the server gave him an error message before you added him to your allow list.",
+		"/DCCALLOW -bob",
+		"Will do the exact opposite, removing him from your dcc allow list.",
+		"/dccallow list",
+		"Will list the users currently on your dcc allow list.",
+		NULL
+	};
+
+	if (!MyUser(client))
+		return;
+	
+	if (parc < 2)
+	{
+		sendnotice(client, "No command specified for DCCALLOW. "
+			"Type '/DCCALLOW HELP' for more information.");
+		return;
+	}
+
+	for (p = NULL, s = strtoken(&p, parv[1], ", "); s; s = strtoken(&p, NULL, ", "))
+	{
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, s, maxtargets, "DCCALLOW");
+			break;
+		}
+		if (*s == '+')
+		{
+			didanything = 1;
+			if (!*++s)
+				continue;
+			
+			friend = find_person(s, NULL);
+			
+			if (friend == client)
+				continue;
+			
+			if (!friend)
+			{
+				sendnumeric(client, ERR_NOSUCHNICK, s);
+				continue;
+			}
+			add_dccallow(client, friend);
+		} else
+		if (*s == '-')
+		{
+			didanything = 1;
+			if (!*++s)
+				continue;
+			
+			friend = find_person(s, NULL);
+			if (friend == client)
+				continue;
+			if (!friend)
+			{
+				sendnumeric(client, ERR_NOSUCHNICK, s);
+				continue;
+			}
+			del_dccallow(client, friend);
+		} else
+		if (!didlist && !strncasecmp(s, "list", 4))
+		{
+			didanything = didlist = 1;
+			sendnumeric(client, RPL_DCCINFO, "The following users are on your dcc allow list:");
+			for(lp = client->user->dccallow; lp; lp = lp->next)
+			{
+				if (lp->flags == DCC_LINK_REMOTE)
+					continue;
+				sendnumericfmt(client, RPL_DCCLIST, ":%s (%s@%s)", lp->value.client->name,
+					lp->value.client->user->username,
+					GetHost(lp->value.client));
+			}
+			sendnumeric(client, RPL_ENDOFDCCLIST, s);
+		} else
+		if (!didhelp && !strncasecmp(s, "help", 4))
+		{
+			didanything = didhelp = 1;
+			for(ptr = dcc_help; *ptr; ptr++)
+				sendnumeric(client, RPL_DCCINFO, *ptr);
+			sendnumeric(client, RPL_ENDOFDCCLIST, s);
+		}
+	}
+	if (!didanything)
+	{
+		sendnotice(client, "Invalid syntax for DCCALLOW. Type '/DCCALLOW HELP' for more information.");
+		return;
+	}
+}
+
+/* The dccallow functions below are all taken from bahamut (1.8.1).
+ * Well, with some small modifications of course. -- Syzop
+ */
+
+/** Adds 'optr' to the DCCALLOW list of 'client' */
+int add_dccallow(Client *client, Client *optr)
+{
+	Link *lp;
+	int cnt = 0;
+
+	for (lp = client->user->dccallow; lp; lp = lp->next)
+	{
+		if (lp->flags != DCC_LINK_ME)
+			continue;
+		cnt++;
+		if (lp->value.client == optr)
+			return 0;
+	}
+
+	if (cnt >= MAXDCCALLOW)
+	{
+		sendnumeric(client, ERR_TOOMANYDCC,
+			optr->name, MAXDCCALLOW);
+		return 0;
+	}
+
+	lp = make_link();
+	lp->value.client = optr;
+	lp->flags = DCC_LINK_ME;
+	lp->next = client->user->dccallow;
+	client->user->dccallow = lp;
+
+	lp = make_link();
+	lp->value.client = client;
+	lp->flags = DCC_LINK_REMOTE;
+	lp->next = optr->user->dccallow;
+	optr->user->dccallow = lp;
+
+	sendnumeric(client, RPL_DCCSTATUS, optr->name, "added to");
+	return 0;
+}
+
+/** Removes 'optr' from the DCCALLOW list of 'client' */
+int del_dccallow(Client *client, Client *optr)
+{
+	Link **lpp, *lp;
+	int found = 0;
+
+	for (lpp = &(client->user->dccallow); *lpp; lpp=&((*lpp)->next))
+	{
+		if ((*lpp)->flags != DCC_LINK_ME)
+			continue;
+		if ((*lpp)->value.client == optr)
+		{
+			lp = *lpp;
+			*lpp = lp->next;
+			free_link(lp);
+			found++;
+			break;
+		}
+	}
+	if (!found)
+	{
+		sendnumericfmt(client, RPL_DCCINFO, ":%s is not in your DCC allow list", optr->name);
+		return 0;
+	}
+
+	for (found = 0, lpp = &(optr->user->dccallow); *lpp; lpp=&((*lpp)->next))
+	{
+		if ((*lpp)->flags != DCC_LINK_REMOTE)
+			continue;
+		if ((*lpp)->value.client == client)
+		{
+			lp = *lpp;
+			*lpp = lp->next;
+			free_link(lp);
+			found++;
+			break;
+		}
+	}
+	if (!found)
+		sendto_realops("[BUG!] %s was in dccallowme list of %s but not in dccallowrem list!",
+			optr->name, client->name);
+
+	sendnumeric(client, RPL_DCCSTATUS, optr->name, "removed from");
+
+	return 0;
+}
diff --git a/src/modules/dccdeny.c b/src/modules/dccdeny.c
new file mode 100644
index 0000000..f1c32e0
--- /dev/null
+++ b/src/modules/dccdeny.c
@@ -0,0 +1,862 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/dccdeny.c
+ *   (C) 2004-2019 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"dccdeny",
+	"5.0",
+	"command /dccdeny", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Variables */
+ConfigItem_deny_dcc     *conf_deny_dcc = NULL;
+ConfigItem_allow_dcc    *conf_allow_dcc = NULL;
+
+/* Forward declarions */
+int dccdeny_configtest_deny_dcc(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int dccdeny_configtest_allow_dcc(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int dccdeny_configrun_deny_dcc(ConfigFile *cf, ConfigEntry *ce, int type);
+int dccdeny_configrun_allow_dcc(ConfigFile *cf, ConfigEntry *ce, int type);
+int dccdeny_stats(Client *client, char *para);
+CMD_FUNC(cmd_dccdeny);
+CMD_FUNC(cmd_undccdeny);
+CMD_FUNC(cmd_svsfline);
+int dccdeny_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+int dccdeny_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+int dccdeny_server_sync(Client *client);
+static ConfigItem_deny_dcc *dcc_isforbidden(Client *client, char *filename);
+static ConfigItem_deny_dcc *dcc_isdiscouraged(Client *client, char *filename);
+static void DCCdeny_add(char *filename, char *reason, int type, int type2);
+static void DCCdeny_del(ConfigItem_deny_dcc *deny);
+static void dcc_wipe_services(void);
+static char *get_dcc_filename(const char *text);
+static int can_dcc(Client *client, char *target, Client *targetcli, char *filename, char **errmsg);
+static int can_dcc_soft(Client *from, Client *to, char *filename, char **errmsg);
+static void free_dcc_config_blocks(void);
+void dccdeny_unload_free_all_conf_deny_dcc(ModData *m);
+void dccdeny_unload_free_all_conf_allow_dcc(ModData *m);
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, dccdeny_configtest_deny_dcc);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, dccdeny_configtest_allow_dcc);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	LoadPersistentPointer(modinfo, conf_deny_dcc, dccdeny_unload_free_all_conf_deny_dcc);
+	LoadPersistentPointer(modinfo, conf_allow_dcc, dccdeny_unload_free_all_conf_allow_dcc);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, dccdeny_configrun_deny_dcc);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, dccdeny_configrun_allow_dcc);
+	CommandAdd(modinfo->handle, "DCCDENY", cmd_dccdeny, 2, CMD_USER);
+	CommandAdd(modinfo->handle, "UNDCCDENY", cmd_undccdeny, MAXPARA, CMD_USER);
+	CommandAdd(modinfo->handle, "SVSFLINE", cmd_svsfline, MAXPARA, CMD_SERVER);
+	HookAdd(modinfo->handle, HOOKTYPE_STATS, 0, dccdeny_stats);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, 0, dccdeny_can_send_to_user);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, dccdeny_can_send_to_channel);
+	HookAdd(modinfo->handle, HOOKTYPE_SERVER_SYNC, 0, dccdeny_server_sync);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	free_dcc_config_blocks();
+	SavePersistentPointer(modinfo, conf_deny_dcc);
+	SavePersistentPointer(modinfo, conf_allow_dcc);
+
+	return MOD_SUCCESS;
+}
+
+int dccdeny_configtest_deny_dcc(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep;
+	int errors = 0;
+	char has_filename = 0, has_reason = 0, has_soft = 0;
+
+	/* We are only interested in deny dcc { } */
+	if ((type != CONFIG_DENY) || strcmp(ce->ce_vardata, "dcc"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "deny dcc"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "filename"))
+		{
+			if (has_filename)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "deny dcc::filename");
+				continue;
+			}
+			has_filename = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			if (has_reason)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "deny dcc::reason");
+				continue;
+			}
+			has_reason = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "soft"))
+		{
+			if (has_soft)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "deny dcc::soft");
+				continue;
+			}
+			has_soft = 1;
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename,
+				cep->ce_varlinenum, "deny dcc", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_filename)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"deny dcc::filename");
+		errors++;
+	}
+	if (!has_reason)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"deny dcc::reason");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int dccdeny_configtest_allow_dcc(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep;
+	int errors = 0, has_filename = 0, has_soft = 0;
+
+	/* We are only interested in allow dcc { } */
+	if ((type != CONFIG_ALLOW) || strcmp(ce->ce_vardata, "dcc"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "allow dcc"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "filename"))
+		{
+			if (has_filename)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow dcc::filename");
+				continue;
+			}
+			has_filename = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "soft"))
+		{
+			if (has_soft)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "allow dcc::soft");
+				continue;
+			}
+			has_soft = 1;
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"allow dcc", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_filename)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"allow dcc::filename");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int dccdeny_configrun_deny_dcc(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigItem_deny_dcc 	*deny = NULL;
+	ConfigEntry 	    	*cep;
+
+	/* We are only interested in deny dcc { } */
+	if ((type != CONFIG_DENY) || strcmp(ce->ce_vardata, "dcc"))
+		return 0;
+
+	deny = safe_alloc(sizeof(ConfigItem_deny_dcc));
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "filename"))
+		{
+			safe_strdup(deny->filename, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			safe_strdup(deny->reason, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "soft"))
+		{
+			int x = config_checkval(cep->ce_vardata,CFG_YESNO);
+			if (x == 1)
+				deny->flag.type = DCCDENY_SOFT;
+		}
+	}
+	if (!deny->reason)
+	{
+		if (deny->flag.type == DCCDENY_HARD)
+			safe_strdup(deny->reason, "Possible infected virus file");
+		else
+			safe_strdup(deny->reason, "Possible executable content");
+	}
+	AddListItem(deny, conf_deny_dcc);
+	return 0;
+}
+
+int dccdeny_configrun_allow_dcc(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigItem_allow_dcc *allow = NULL;
+	ConfigEntry *cep;
+
+	/* We are only interested in allow dcc { } */
+	if ((type != CONFIG_ALLOW) || strcmp(ce->ce_vardata, "dcc"))
+		return 0;
+
+	allow = safe_alloc(sizeof(ConfigItem_allow_dcc));
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "filename"))
+			safe_strdup(allow->filename, cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "soft"))
+		{
+			int x = config_checkval(cep->ce_vardata,CFG_YESNO);
+			if (x)
+				allow->flag.type = DCCDENY_SOFT;
+		}
+	}
+	AddListItem(allow, conf_allow_dcc);
+	return 1;
+}
+
+/** Free allow dcc { } and deny dcc { } blocks, called on REHASH */
+void free_dcc_config_blocks(void)
+{
+	ConfigItem_deny_dcc *d, *d_next;
+	ConfigItem_allow_dcc *a, *a_next;
+
+	for (d = conf_deny_dcc; d; d = d_next)
+	{
+		d_next = d->next;
+		if (d->flag.type2 == CONF_BAN_TYPE_CONF)
+		{
+			safe_free(d->filename);
+			safe_free(d->reason);
+			DelListItem(d, conf_deny_dcc);
+			safe_free(d);
+		}
+	}
+	for (a = conf_allow_dcc; a; a = a_next)
+	{
+		a_next = a->next;
+		if (a->flag.type2 == CONF_BAN_TYPE_CONF)
+		{
+			safe_free(a->filename);
+			DelListItem(a, conf_allow_dcc);
+			safe_free(a);
+		}
+	}
+}
+
+/** Free all deny dcc { } blocks - only called on permanent module unload (rare) */
+void dccdeny_unload_free_all_conf_deny_dcc(ModData *m)
+{
+	ConfigItem_deny_dcc *d, *d_next;
+
+	for (d = conf_deny_dcc; d; d = d_next)
+	{
+		d_next = d->next;
+		safe_free(d->filename);
+		safe_free(d->reason);
+		DelListItem(d, conf_deny_dcc);
+		safe_free(d);
+	}
+	conf_deny_dcc = NULL;
+}
+
+/** Free all allow dcc { } blocks - only called on permanent module unload (rare) */
+void dccdeny_unload_free_all_conf_allow_dcc(ModData *m)
+{
+	ConfigItem_allow_dcc *a, *a_next;
+
+	for (a = conf_allow_dcc; a; a = a_next)
+	{
+		a_next = a->next;
+		safe_free(a->filename);
+		DelListItem(a, conf_allow_dcc);
+		safe_free(a);
+	}
+	conf_allow_dcc = NULL;
+}
+
+
+/* Add a temporary dccdeny line
+ *
+ * parv[1] - file
+ * parv[2] - reason
+ */
+CMD_FUNC(cmd_dccdeny)
+{
+	if (!MyUser(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:dccdeny",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 2) || BadPtr(parv[2]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "DCCDENY");
+		return;
+	}
+
+	if (!find_deny_dcc(parv[1]))
+	{
+		sendto_ops("%s added a temp dccdeny for %s (%s)", client->name,
+		    parv[1], parv[2]);
+		DCCdeny_add(parv[1], parv[2], DCCDENY_HARD, CONF_BAN_TYPE_TEMPORARY);
+		return;
+	} else
+	{
+		sendnotice(client, "*** %s already has a dccdeny", parv[1]);
+	}
+}
+
+/* Remove a temporary dccdeny line
+ * parv[1] - file/mask
+ */
+CMD_FUNC(cmd_undccdeny)
+{
+	ConfigItem_deny_dcc *d;
+
+	if (!MyUser(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:dccdeny",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "UNDCCDENY");
+		return;
+	}
+
+	if ((d = find_deny_dcc(parv[1])) && d->flag.type2 == CONF_BAN_TYPE_TEMPORARY)
+	{
+		sendto_ops("%s removed a temp dccdeny for %s", client->name, parv[1]);
+		DCCdeny_del(d);
+		return;
+	} else
+	{
+		sendnotice(client, "*** Unable to find a temp dccdeny matching %s", parv[1]);
+	}
+}
+
+CMD_FUNC(cmd_svsfline)
+{
+	if (parc < 2)
+		return;
+
+	switch (*parv[1])
+	{
+		/* Allow non-U-Lines to send ONLY SVSFLINE +, but don't send it out
+		 * unless it is from a U-Line -- codemastr
+		 */
+		case '+':
+		{
+			if (parc < 4)
+				return;
+
+			if (!find_deny_dcc(parv[2]))
+				DCCdeny_add(parv[2], parv[3], DCCDENY_HARD, CONF_BAN_TYPE_AKILL);
+
+			if (IsULine(client))
+			{
+				sendto_server(client, 0, 0, NULL, ":%s SVSFLINE + %s :%s",
+				    client->id, parv[2], parv[3]);
+			}
+
+			break;
+		}
+
+		case '-':
+		{
+			ConfigItem_deny_dcc *deny;
+
+			if (!IsULine(client))
+				return;
+
+			if (parc < 3)
+				return;
+
+			if (!(deny = find_deny_dcc(parv[2])))
+				break;
+
+			DCCdeny_del(deny);
+
+			sendto_server(client, 0, 0, NULL, ":%s SVSFLINE %s", client->id, parv[2]);
+
+			break;
+		}
+
+		case '*':
+		{
+			if (!IsULine(client))
+				return;
+
+			dcc_wipe_services();
+
+			sendto_server(client, 0, 0, NULL, ":%s SVSFLINE *", client->id);
+
+			break;
+		}
+	}
+}
+
+/** Sync the DCC entries on server connect */
+int dccdeny_server_sync(Client *client)
+{
+	ConfigItem_deny_dcc *p;
+	for (p = conf_deny_dcc; p; p = p->next)
+	{
+		if (p->flag.type2 == CONF_BAN_TYPE_AKILL)
+			sendto_one(client, NULL, ":%s SVSFLINE + %s :%s", me.id,
+			    p->filename, p->reason);
+	}
+	return 0;
+}
+
+/** Check if a DCC should be blocked (user-to-user) */
+int dccdeny_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	if (**text == '\001')
+	{
+		char *filename = get_dcc_filename(*text);
+		if (filename)
+		{
+			if (MyUser(client) && !can_dcc(client, target->name, target, filename, errmsg))
+				return HOOK_DENY;
+			if (MyUser(target) && !can_dcc_soft(client, target, filename, errmsg))
+				return HOOK_DENY;
+		}
+	}
+
+	return HOOK_CONTINUE;
+}
+
+/** Check if a DCC should be blocked (user-to-channel, unusual) */
+int dccdeny_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	static char errbuf[512];
+
+	if (MyUser(client) && (**msg == '\001'))
+	{
+		char *err = NULL;
+		char *filename = get_dcc_filename(*msg);
+		if (filename && !can_dcc(client, channel->chname, NULL, filename, &err))
+		{
+			if (!IsDead(client) && !notice)
+			{
+				strlcpy(errbuf, err, sizeof(errbuf));
+				*errmsg = errbuf;
+			}
+			return HOOK_DENY;
+		}
+	}
+	return HOOK_CONTINUE;
+}
+
+/* e->flag.type2:
+ * CONF_BAN_TYPE_AKILL		banned by SVSFLINE ('global')
+ * CONF_BAN_TYPE_CONF		banned by conf
+ * CONF_BAN_TYPE_TEMPORARY	banned by /DCCDENY ('temporary')
+ * e->flag.type:
+ * DCCDENY_HARD				Fully denied
+ * DCCDENY_SOFT				Denied, but allowed to override via /DCCALLOW
+ */
+
+/** Make a viewable dcc filename.
+ * This is to protect a bit against tricks like 'flood-it-off-the-buffer'
+ * and color 1,1 etc...
+ */
+static char *dcc_displayfile(char *f)
+{
+	static char buf[512];
+	char *i, *o = buf;
+	size_t n = strlen(f);
+
+	if (n < 300)
+	{
+		for (i = f; *i; i++)
+			if (*i < 32)
+				*o++ = '?';
+			else
+				*o++ = *i;
+		*o = '\0';
+		return buf;
+	}
+
+	/* Else, we show it as: [first 256 chars]+"[..TRUNCATED..]"+[last 20 chars] */
+	for (i = f; i < f+256; i++)
+		if (*i < 32)
+			*o++ = '?';
+		else
+			*o++ = *i;
+	strcpy(o, "[..TRUNCATED..]");
+	o += sizeof("[..TRUNCATED..]");
+	for (i = f+n-20; *i; i++)
+		if (*i < 32)
+			*o++ = '?';
+		else
+			*o++ = *i;
+	*o = '\0';
+	return buf;
+}
+
+static char *get_dcc_filename(const char *text)
+{
+	static char filename[BUFSIZE+1];
+	char *end;
+	int size_string;
+
+	if (*text != '\001')
+		return 0;
+
+	if (!strncasecmp(text+1, "DCC SEND ", 9))
+		text = text + 10;
+	else if (!strncasecmp(text+1, "DCC RESUME ", 11))
+		text = text + 12;
+	else
+		return 0;
+
+	for (; *text == ' '; text++); /* skip leading spaces */
+
+	if (*text == '"' && *(text+1))
+		end = strchr(text+1, '"');
+	else
+		end = strchr(text, ' ');
+
+	if (!end || (end < text))
+		return 0;
+
+	size_string = (int)(end - text);
+
+	if (!size_string || (size_string > (BUFSIZE - 1)))
+		return 0;
+
+	strlcpy(filename, text, size_string+1);
+	return filename;
+}
+
+/** Checks if a DCC SEND is allowed.
+ * @param client      Sending client
+ * @param target      Target name (user or channel)
+ * @param targetcli   Target client (NULL in case of channel!)
+ * @param text        The entire message
+ * @returns 1 if DCC SEND allowed, 0 if rejected
+ */
+static int can_dcc(Client *client, char *target, Client *targetcli, char *filename, char **errmsg)
+{
+	ConfigItem_deny_dcc *fl;
+	static char errbuf[256];
+	int size_string, ret;
+
+	/* User (IRCOp) may bypass send restrictions */
+	if (ValidatePermissionsForPath("immune:dcc",client,targetcli,NULL,NULL))
+		return 1;
+
+	/* User (IRCOp) likes to receive bad dcc's */
+	if (targetcli && ValidatePermissionsForPath("self:getbaddcc",targetcli,NULL,NULL,NULL))
+		return 1;
+
+	/* Check if user is already blocked (from the past) */
+	if (IsDCCBlock(client))
+	{
+		*errmsg = "*** You are blocked from sending files as you have tried to "
+		          "send a forbidden file - reconnect to regain ability to send";
+		return 0;
+	}
+
+	if (match_spamfilter(client, filename, SPAMF_DCC, target, 0, NULL))
+		return 0;
+
+	if ((fl = dcc_isforbidden(client, filename)))
+	{
+		char *displayfile = dcc_displayfile(filename);
+
+		RunHook5(HOOKTYPE_DCC_DENIED, client, target, filename, displayfile, fl);
+
+		ircsnprintf(errbuf, sizeof(errbuf), "Cannot DCC SEND file: %s", fl->reason);
+		*errmsg = errbuf;
+		SetDCCBlock(client);
+		return 0;
+	}
+
+	/* Channel dcc (???) and discouraged? just block */
+	if (!targetcli && ((fl = dcc_isdiscouraged(client, filename))))
+	{
+		ircsnprintf(errbuf, sizeof(errbuf), "Cannot DCC SEND file: %s", fl->reason);
+		*errmsg = errbuf;
+		return 0;
+	}
+
+	/* If we get here, the file is allowed */
+	return 1;
+}
+
+/** Checks if a DCC is allowed by DCCALLOW rules (only SOFT bans are checked).
+ * PARAMETERS:
+ * from:		the sender client (possibly remote)
+ * to:			the target client (always local)
+ * text:		the whole msg
+ * RETURNS:
+ * 1:			allowed
+ * 0:			block
+ */
+static int can_dcc_soft(Client *from, Client *to, char *filename, char **errmsg)
+{
+	ConfigItem_deny_dcc *fl;
+	char *displayfile;
+	static char errbuf[256];
+
+	/* User (IRCOp) may bypass send restrictions */
+	if (ValidatePermissionsForPath("immune:dcc",from,to,NULL,NULL))
+		return 1;
+
+	/* User (IRCOp) likes to receive bad dcc's */
+	if (ValidatePermissionsForPath("self:getbaddcc",to,NULL,NULL,NULL))
+		return 1;
+
+	/* On the 'soft' blocklist ? */
+	if (!(fl = dcc_isdiscouraged(from, filename)))
+		return 1; /* No, so is OK */
+
+	/* If on DCCALLOW list then the user is OK with it */
+	if (on_dccallow_list(to, from))
+		return 1;
+
+	/* Soft-blocked */
+	displayfile = dcc_displayfile(filename);
+
+	ircsnprintf(errbuf, sizeof(errbuf), "Cannot DCC SEND file: %s", fl->reason);
+	*errmsg = errbuf;
+
+	/* Inform target ('to') about the /DCCALLOW functionality */
+	sendnotice(to, "%s (%s@%s) tried to DCC SEND you a file named '%s', the request has been blocked.",
+		from->name, from->user->username, GetHost(from), displayfile);
+	if (!IsDCCNotice(to))
+	{
+		SetDCCNotice(to);
+		sendnotice(to, "Files like these might contain malicious content (viruses, trojans). "
+			"Therefore, you must explicitly allow anyone that tries to send you such files.");
+		sendnotice(to, "If you trust %s, and want him/her to send you this file, you may obtain "
+			"more information on using the dccallow system by typing '/DCCALLOW HELP'", from->name);
+	}
+	return 0;
+}
+
+/** Checks if the dcc is blacklisted. */
+static ConfigItem_deny_dcc *dcc_isforbidden(Client *client, char *filename)
+{
+	ConfigItem_deny_dcc *d;
+	ConfigItem_allow_dcc *a;
+
+	if (!conf_deny_dcc || !filename)
+		return NULL;
+
+	for (d = conf_deny_dcc; d; d = d->next)
+	{
+		if ((d->flag.type == DCCDENY_HARD) && match_simple(d->filename, filename))
+		{
+			for (a = conf_allow_dcc; a; a = a->next)
+			{
+				if ((a->flag.type == DCCDENY_HARD) && match_simple(a->filename, filename))
+					return NULL;
+			}
+			return d;
+		}
+	}
+
+	return NULL;
+}
+
+/** checks if the dcc is discouraged ('soft bans'). */
+static ConfigItem_deny_dcc *dcc_isdiscouraged(Client *client, char *filename)
+{
+	ConfigItem_deny_dcc *d;
+	ConfigItem_allow_dcc *a;
+
+	if (!conf_deny_dcc || !filename)
+		return NULL;
+
+	for (d = conf_deny_dcc; d; d = d->next)
+	{
+		if ((d->flag.type == DCCDENY_SOFT) && match_simple(d->filename, filename))
+		{
+			for (a = conf_allow_dcc; a; a = a->next)
+			{
+				if ((a->flag.type == DCCDENY_SOFT) && match_simple(a->filename, filename))
+					return NULL;
+			}
+			return d;
+		}
+	}
+
+	return NULL;
+}
+
+static void DCCdeny_add(char *filename, char *reason, int type, int type2)
+{
+	ConfigItem_deny_dcc *deny = NULL;
+
+	deny = safe_alloc(sizeof(ConfigItem_deny_dcc));
+	safe_strdup(deny->filename, filename);
+	safe_strdup(deny->reason, reason);
+	deny->flag.type = type;
+	deny->flag.type2 = type2;
+	AddListItem(deny, conf_deny_dcc);
+}
+
+static void DCCdeny_del(ConfigItem_deny_dcc *deny)
+{
+	DelListItem(deny, conf_deny_dcc);
+	safe_free(deny->filename);
+	safe_free(deny->reason);
+	safe_free(deny);
+}
+
+ConfigItem_deny_dcc *find_deny_dcc(char *name)
+{
+	ConfigItem_deny_dcc	*e;
+
+	if (!name)
+		return NULL;
+
+	for (e = conf_deny_dcc; e; e = e->next)
+	{
+		if (match_simple(name, e->filename))
+			return e;
+	}
+	return NULL;
+}
+
+static void dcc_wipe_services(void)
+{
+	ConfigItem_deny_dcc *dconf, *next;
+
+	for (dconf = conf_deny_dcc; dconf; dconf = next)
+	{
+		next = dconf->next;
+		if (dconf->flag.type2 == CONF_BAN_TYPE_AKILL)
+		{
+			DelListItem(dconf, conf_deny_dcc);
+			safe_free(dconf->filename);
+			safe_free(dconf->reason);
+			safe_free(dconf);
+		}
+	}
+
+}
+
+int dccdeny_stats(Client *client, char *para)
+{
+	ConfigItem_deny_dcc *denytmp;
+	ConfigItem_allow_dcc *allowtmp;
+	char *filemask, *reason;
+	char a = 0;
+
+	/* '/STATS F' or '/STATS denydcc' is for us... */
+	if (strcmp(para, "F") && strcasecmp(para, "denydcc"))
+		return 0;
+
+	for (denytmp = conf_deny_dcc; denytmp; denytmp = denytmp->next)
+	{
+		filemask = BadPtr(denytmp->filename) ? "<NULL>" : denytmp->filename;
+		reason = BadPtr(denytmp->reason) ? "<NULL>" : denytmp->reason;
+		if (denytmp->flag.type2 == CONF_BAN_TYPE_CONF)
+			a = 'c';
+		if (denytmp->flag.type2 == CONF_BAN_TYPE_AKILL)
+			a = 's';
+		if (denytmp->flag.type2 == CONF_BAN_TYPE_TEMPORARY)
+			a = 'o';
+		/* <d> <s|h> <howadded> <filemask> <reason> */
+		sendtxtnumeric(client, "d %c %c %s %s", (denytmp->flag.type == DCCDENY_SOFT) ? 's' : 'h',
+			a, filemask, reason);
+	}
+	for (allowtmp = conf_allow_dcc; allowtmp; allowtmp = allowtmp->next)
+	{
+		filemask = BadPtr(allowtmp->filename) ? "<NULL>" : allowtmp->filename;
+		if (allowtmp->flag.type2 == CONF_BAN_TYPE_CONF)
+			a = 'c';
+		if (allowtmp->flag.type2 == CONF_BAN_TYPE_AKILL)
+			a = 's';
+		if (allowtmp->flag.type2 == CONF_BAN_TYPE_TEMPORARY)
+			a = 'o';
+		/* <a> <s|h> <howadded> <filemask> */
+		sendtxtnumeric(client, "a %c %c %s", (allowtmp->flag.type == DCCDENY_SOFT) ? 's' : 'h',
+			a, filemask);
+	}
+	return 1;
+}
diff --git a/src/modules/echo-message.c b/src/modules/echo-message.c
new file mode 100644
index 0000000..20d8565
--- /dev/null
+++ b/src/modules/echo-message.c
@@ -0,0 +1,91 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/echo-message.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"echo-message",
+	"5.0",
+	"Batch CAP", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Variables */
+long CAP_ECHO_MESSAGE = 0L;
+
+/* Forward declarations */
+int em_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice);
+int em_usermsg(Client *client, Client *to, MessageTag *mtags, char *text, int notice);
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "echo-message";
+	ClientCapabilityAdd(modinfo->handle, &cap, &CAP_ECHO_MESSAGE);
+
+	HookAdd(modinfo->handle, HOOKTYPE_CHANMSG, 0, em_chanmsg);
+	HookAdd(modinfo->handle, HOOKTYPE_USERMSG, 0, em_usermsg);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int em_chanmsg(Client *client, Channel *channel, int sendflags, int prefix, char *target, MessageTag *mtags, char *text, int notice)
+{
+	if (MyUser(client) && HasCapabilityFast(client, CAP_ECHO_MESSAGE))
+	{
+		sendto_prefix_one(client, client, mtags, ":%s %s %s :%s",
+			client->name,
+			notice ? "NOTICE" : "PRIVMSG",
+			target,
+			text);
+	}
+	return 0;
+}
+
+int em_usermsg(Client *client, Client *to, MessageTag *mtags, char *text, int notice)
+{
+	if (MyUser(client) && HasCapabilityFast(client, CAP_ECHO_MESSAGE))
+	{
+		sendto_prefix_one(client, client, mtags, ":%s %s %s :%s",
+			client->name,
+			notice ? "NOTICE" : "PRIVMSG",
+			to->name,
+			text);
+	}
+	return 0;
+}
diff --git a/src/modules/eos.c b/src/modules/eos.c
new file mode 100644
index 0000000..157c9f0
--- /dev/null
+++ b/src/modules/eos.c
@@ -0,0 +1,75 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_eos);
+
+#define MSG_EOS 	"EOS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"eos",
+	"5.0",
+	"command /eos", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_EOS, cmd_eos, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * EOS (End Of Sync) command.
+ * Type: Broadcast
+ * Purpose: Broadcasted over a network if a server is synced (after the users, channels,
+ *          etc are introduced). Makes us able to know if a server is linked.
+ * History: Added in beta18 (in cvs since 2003-08-11) by Syzop
+ */
+CMD_FUNC(cmd_eos)
+{
+	if (!IsServer(client))
+		return;
+	client->serv->flags.synced = 1;
+	/* pass it on ^_- */
+#ifdef DEBUGMODE
+	ircd_log(LOG_ERROR, "[EOSDBG] cmd_eos: got sync from %s (path:%s)", client->name, client->direction->name);
+	ircd_log(LOG_ERROR, "[EOSDBG] cmd_eos: broadcasting it back to everyone except route from %s", client->direction->name);
+#endif
+	sendto_server(client, 0, 0, NULL, ":%s EOS", client->id);
+
+	RunHook(HOOKTYPE_SERVER_SYNCED, client);
+}
diff --git a/src/modules/extbans/Makefile.in b/src/modules/extbans/Makefile.in
new file mode 100644
index 0000000..fa85302
--- /dev/null
+++ b/src/modules/extbans/Makefile.in
@@ -0,0 +1,104 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/modules/chanmodes/Makefile
+#*   Copyright (C) Carsten V. Munk 2001 & The UnrealIRCd Team
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*/
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+INCLUDES = ../../include/channel.h \
+	../../include/common.h ../../include/config.h ../../include/dbuf.h \
+	../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \
+	../../include/ircsprintf.h \
+	../../include/license.h \
+	../../include/modules.h ../../include/modversion.h ../../include/msg.h \
+	../../include/numeric.h ../../include/proto.h ../../include/dns.h \
+	../../include/resource.h ../../include/setup.h \
+	../../include/struct.h ../../include/sys.h \
+	../../include/types.h ../../include/url.h \
+	../../include/version.h ../../include/whowas.h
+
+R_MODULES= \
+	join.so quiet.so nickchange.so inchannel.so realname.so \
+	account.so operclass.so certfp.so textban.so msgbypass.so \
+	timedban.so partmsg.so
+
+MODULES=$(R_MODULES)
+MODULEFLAGS=@MODULEFLAGS@
+RM=@RM@
+
+all: build
+
+build: $(MODULES)
+
+clean:
+	$(RM) -f *.o *.so *~ core
+
+#############################################################################
+#             .so's section
+#############################################################################
+
+skel.so: skel.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o skel.so skel.c
+
+join.so: join.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o join.so join.c
+
+quiet.so: quiet.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o quiet.so quiet.c
+
+nickchange.so: nickchange.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nickchange.so nickchange.c
+
+inchannel.so: inchannel.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o inchannel.so inchannel.c
+
+realname.so: realname.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o realname.so realname.c
+
+account.so: account.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o account.so account.c
+
+operclass.so: operclass.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o operclass.so operclass.c
+
+certfp.so: certfp.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o certfp.so certfp.c
+
+textban.so: textban.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o textban.so textban.c
+
+msgbypass.so: msgbypass.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o msgbypass.so msgbypass.c
+
+timedban.so: timedban.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o timedban.so timedban.c
+
+partmsg.so: partmsg.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o partmsg.so partmsg.c
diff --git a/src/modules/extbans/account.c b/src/modules/extbans/account.c
new file mode 100644
index 0000000..3e4877d
--- /dev/null
+++ b/src/modules/extbans/account.c
@@ -0,0 +1,92 @@
+/*
+ * Extended ban to ban/exempt by services account (~b ~a:accountname)
+ * (C) Copyright 2011-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/account",
+	"4.2",
+	"ExtBan ~a - Ban/exempt by services account name",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+char *extban_account_conv_param(char *para);
+int extban_account_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'a';
+	req.is_ok = NULL;
+	req.conv_param = extban_account_conv_param;
+	req.is_banned = extban_account_is_banned;
+	req.options = EXTBOPT_INVEX|EXTBOPT_TKL;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Account bans */
+char *extban_account_conv_param(char *para)
+{
+	char *mask, *acc;
+	static char retbuf[NICKLEN + 4];
+
+	strlcpy(retbuf, para, sizeof(retbuf)); /* truncate */
+
+	acc = retbuf+3;
+	if (!*acc)
+		return NULL; /* don't allow "~a:" */
+	if (!strcmp(acc, "0"))
+		return NULL; /* ~a:0 would mean ban all non-regged, but we already have +R for that. */
+
+	return retbuf;
+}
+
+int extban_account_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *ban = banin+3;
+
+	if (!strcasecmp(ban, client->user->svid))
+		return 1;
+
+	return 0;
+}
diff --git a/src/modules/extbans/certfp.c b/src/modules/extbans/certfp.c
new file mode 100644
index 0000000..c3f4103
--- /dev/null
+++ b/src/modules/extbans/certfp.c
@@ -0,0 +1,125 @@
+/*
+ * Extended ban to ban/exempt by certificate fingerprint (+b ~S:certfp)
+ * (C) Copyright 2015 The UnrealIRCd Team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/certfp",
+	"4.2",
+	"ExtBan ~S - Ban/exempt by SHA256 TLS certificate fingerprint",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int extban_certfp_is_ok(Client *client, Channel *channel, char *para, int checkt, int what, int what2);
+char *extban_certfp_conv_param(char *para);
+int extban_certfp_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/* Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'S';
+	req.is_ok = extban_certfp_is_ok;
+	req.conv_param = extban_certfp_conv_param;
+	req.is_banned = extban_certfp_is_banned;
+	req.options = EXTBOPT_INVEX|EXTBOPT_TKL;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/* Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+#define CERT_FP_LEN 64
+
+int extban_certfp_usage(Client *client)
+{
+	sendnotice(client, "ERROR: ExtBan ~S expects an SHA256 fingerprint in hexadecimal format (no colons). "
+					 "For example: +e ~S:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef)");
+	return EX_DENY;
+}
+
+int extban_certfp_is_ok(Client *client, Channel *channel, char *para, int checkt, int what, int what2)
+{
+	if (checkt == EXCHK_PARAM)
+	{
+		char *p;
+		
+		if (strlen(para) != 3 + CERT_FP_LEN)
+			return extban_certfp_usage(client);
+		
+		for (p = para + 3; *p; p++)
+			if (!isxdigit(*p))
+				return extban_certfp_usage(client);
+
+		return EX_ALLOW;
+	}
+	return EX_ALLOW;
+}
+
+/* Obtain targeted certfp from the ban string */
+char *extban_certfp_conv_param(char *para)
+{
+	static char retbuf[EVP_MAX_MD_SIZE * 2 + 1];
+	char *p;
+	
+	strlcpy(retbuf, para, sizeof(retbuf));
+	
+	for (p = retbuf+3; *p; p++)
+	{
+		*p = tolower(*p);
+	}
+
+	return retbuf;
+}
+
+int extban_certfp_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *ban = banin+3;
+	char *fp;
+
+	fp = moddata_client_get(client, "certfp");
+
+	if (!fp)
+		return 0; /* not using TLS */
+
+	if (!strcmp(ban, fp))
+		return 1;
+
+	return 0;
+}
diff --git a/src/modules/extbans/inchannel.c b/src/modules/extbans/inchannel.c
new file mode 100644
index 0000000..e8755f4
--- /dev/null
+++ b/src/modules/extbans/inchannel.c
@@ -0,0 +1,163 @@
+/*
+ * Extended ban: "in channel?" (+b ~c:#chan)
+ * (C) Copyright 2003-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/inchannel",
+	"4.2",
+	"ExtBan ~c - banned when in specified channel",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int extban_inchannel_is_ok(Client *client, Channel *channel, char *para, int checkt, int what, int what2);
+char *extban_inchannel_conv_param(char *para);
+int extban_inchannel_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'c';
+	req.is_ok = extban_inchannel_is_ok;
+	req.conv_param = extban_inchannel_conv_param;
+	req.is_banned = extban_inchannel_is_banned;
+	req.options = EXTBOPT_INVEX; /* for +I too */
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+char *extban_inchannel_conv_param(char *para)
+{
+	static char retbuf[CHANNELLEN+6];
+	char *chan, *p, symbol='\0';
+
+	strlcpy(retbuf, para, sizeof(retbuf));
+	chan = retbuf+3;
+
+	if ((*chan == '+') || (*chan == '%') || (*chan == '%') ||
+	    (*chan == '@') || (*chan == '&') || (*chan == '~'))
+	    chan++;
+
+	if ((*chan != '#') && (*chan != '*') && (*chan != '?'))
+		return NULL;
+
+	if (!valid_channelname(chan))
+		return NULL;
+
+	p = strchr(chan, ':'); /* ~r:#chan:*.blah.net is not allowed (for now) */
+	if (p)
+		*p = '\0';
+
+	/* on a sidenote '#' is allowed because it's a valid channel (atm) */
+	return retbuf;
+}
+
+/* The only purpose of this function is a temporary workaround to prevent a desync.. pfff */
+int extban_inchannel_is_ok(Client *client, Channel *channel, char *para, int checkt, int what, int what2)
+{
+	char *p;
+
+	if ((checkt == EXBCHK_PARAM) && MyUser(client) && (what == MODE_ADD) && (strlen(para) > 3))
+	{
+		p = para + 3;
+		if ((*p == '+') || (*p == '%') || (*p == '%') ||
+		    (*p == '@') || (*p == '&') || (*p == '~'))
+		    p++;
+
+		if (*p != '#')
+		{
+			sendnotice(client, "Please use a # in the channelname (eg: ~c:#*blah*)");
+			return 0;
+		}
+	}
+	return 1;
+}
+
+static int extban_inchannel_compareflags(char symbol, int flags)
+{
+	int require=0;
+
+	if (symbol == '+')
+		require = CHFL_VOICE|CHFL_HALFOP|CHFL_CHANOP|CHFL_CHANADMIN|CHFL_CHANOWNER;
+	else if (symbol == '%')
+		require = CHFL_HALFOP|CHFL_CHANOP|CHFL_CHANADMIN|CHFL_CHANOWNER;
+	else if (symbol == '@')
+		require = CHFL_CHANOP|CHFL_CHANADMIN|CHFL_CHANOWNER;
+	else if (symbol == '&')
+		require = CHFL_CHANADMIN|CHFL_CHANOWNER;
+	else if (symbol == '~')
+		require = CHFL_CHANOWNER;
+
+	if (flags & require)
+		return 1;
+
+	return 0;
+}
+
+int extban_inchannel_is_banned(Client *client, Channel *channel, char *ban, int type, char **msg, char **errmsg)
+{
+	Membership *lp;
+	char *p = ban+3, symbol = '\0';
+
+	if (*p != '#')
+	{
+		symbol = *p;
+		p++;
+	}
+
+	for (lp = client->user->channel; lp; lp = lp->next)
+	{
+		if (match_esc(p, lp->channel->chname))
+		{
+			/* Channel matched, check symbol if needed (+/%/@/etc) */
+			if (symbol)
+			{
+				if (extban_inchannel_compareflags(symbol, lp->flags))
+					return 1;
+			} else
+				return 1;
+		}
+	}
+
+	return 0;
+}
+
diff --git a/src/modules/extbans/join.c b/src/modules/extbans/join.c
new file mode 100644
index 0000000..050b43e
--- /dev/null
+++ b/src/modules/extbans/join.c
@@ -0,0 +1,78 @@
+/*
+ * Extended ban that affects JOIN only (+b ~j)
+ * (C) Copyright 2003-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/join",
+	"4.2",
+	"Extban ~j - prevent join only",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int extban_modej_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'j';
+	req.is_ok = extban_is_ok_nuh_extban;
+	req.conv_param = extban_conv_param_nuh_or_extban;
+	req.is_banned = extban_modej_is_banned;
+	req.options = EXTBOPT_ACTMODIFIER;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This ban that affects JOINs only */
+int extban_modej_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *sub_ban;
+
+	if (type != BANCHK_JOIN)
+		return 0;
+
+	sub_ban = banin + 3;
+
+	return ban_check_mask(client, channel, sub_ban, type, msg, errmsg, 0);
+}
+
diff --git a/src/modules/extbans/msgbypass.c b/src/modules/extbans/msgbypass.c
new file mode 100644
index 0000000..167bf64
--- /dev/null
+++ b/src/modules/extbans/msgbypass.c
@@ -0,0 +1,224 @@
+/*
+ * Extended ban that allows user to bypass message restrictions
+ * (C) Copyright 2017-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/msgbypass",
+	"4.2",
+	"ExtBan ~m - bypass +m/+n/+c/+S/+T (msgbypass)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int extban_msgbypass_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+int msgbypass_can_bypass(Client *client, Channel *channel, BypassChannelMessageRestrictionType bypass_type);
+int msgbypass_extban_is_ok(Client *client, Channel* channel, char *para, int checkt, int what, int what2);
+char *msgbypass_extban_conv_param(char *para);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'm';
+	req.is_ok = msgbypass_extban_is_ok;
+	req.conv_param = msgbypass_extban_conv_param;
+	req.is_banned = extban_msgbypass_is_banned;
+	req.options = EXTBOPT_ACTMODIFIER;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type ~m");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION, 0, msgbypass_can_bypass);
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Is the user banned? No, never by us anyway. */
+int extban_msgbypass_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	return 0; /* not banned by us */
+}
+
+/** Can the user bypass restrictions? */
+int msgbypass_can_bypass(Client *client, Channel *channel, BypassChannelMessageRestrictionType bypass_type)
+{
+	Ban *ban;
+	char *p;
+	
+	for (ban = channel->exlist; ban; ban=ban->next)
+	{
+		if (!strncmp(ban->banstr, "~m:", 3))
+		{
+			char *type = ban->banstr + 3;
+			char *matchby;
+			
+			if (((bypass_type == BYPASS_CHANMSG_EXTERNAL) && !strncmp(type, "external:", 9)) ||
+			    ((bypass_type == BYPASS_CHANMSG_MODERATED) && !strncmp(type, "moderated:", 10)) ||
+			    ((bypass_type == BYPASS_CHANMSG_COLOR) && !strncmp(type, "color:", 6)) || 
+			    ((bypass_type == BYPASS_CHANMSG_CENSOR) && !strncmp(type, "censor:", 7)) ||
+			    ((bypass_type == BYPASS_CHANMSG_NOTICE) && !strncmp(type, "notice:", 7)))
+			{
+				matchby = strchr(type, ':');
+				if (!matchby)
+					continue;
+				matchby++;
+				
+				if (ban_check_mask(client, channel, matchby, BANCHK_MSG, NULL, NULL, 0))
+					return HOOK_ALLOW; /* Yes, user may bypass */
+			}
+		}
+	}
+
+	return HOOK_CONTINUE; /* No, may NOT bypass. */
+}
+
+/** Does this bypass type exist? (eg: 'external') */
+int msgbypass_extban_type_ok(char *type)
+{
+	if (!strcmp(type, "external") ||
+	    !strcmp(type, "moderated") ||
+	    !strcmp(type, "censor") ||
+	    !strcmp(type, "color") ||
+	    !strcmp(type, "notice"))
+	{
+		return 1; /* Yes, OK type */
+	}
+	return 0; /* NOMATCH */
+}
+
+#define MAX_LENGTH 128
+char *msgbypass_extban_conv_param(char *para_in)
+{
+	static char retbuf[MAX_LENGTH+1];
+	char para[MAX_LENGTH+1];
+	char tmpmask[MAX_LENGTH+1];
+	char *type; /**< Type, such as 'external' */
+	char *matchby; /**< Matching method, such as 'n!u@h' */
+	char *newmask; /**< Cleaned matching method, such as 'n!u@h' */
+
+	strlcpy(para, para_in+3, sizeof(para)); /* work on a copy (and truncate it) */
+	
+	/* ~m:type:n!u@h   for direct matching
+	 * ~m:type:~x:.... when calling another bantype
+	 */
+
+	type = para;
+	matchby = strchr(para, ':');
+	if (!matchby || !matchby[1])
+		return NULL;
+	*matchby++ = '\0';
+
+	if (!msgbypass_extban_type_ok(type))
+		return NULL;
+
+	/* This is quite silly, we have to create a fake extban here due to
+	 * the current API of extban_conv_param_nuh and extban_conv_param_nuh_or_extban
+	 * expecting the full banmask rather than the portion that actually matters.
+	 */
+	snprintf(tmpmask, sizeof(tmpmask), "~?:%s", matchby);
+	newmask = extban_conv_param_nuh_or_extban(tmpmask);
+	if (!newmask || (strlen(newmask) <= 3))
+		return NULL;
+
+	snprintf(retbuf, sizeof(retbuf), "~m:%s:%s", type, newmask+3);
+	return retbuf;
+}
+
+int msgbypass_extban_syntax(Client *client, int checkt, char *reason)
+{
+	if (MyUser(client) && (checkt == EXBCHK_PARAM))
+	{
+		sendnotice(client, "Error when setting ban exception: %s", reason);
+		sendnotice(client, " Syntax: +e ~m:type:mask");
+		sendnotice(client, "Example: +e ~m:moderated:~a:TrustedUser");
+		sendnotice(client, "Valid types are: external, moderated, color, notice");
+		sendnotice(client, "Valid masks are: nick!user@host or another extban type such as ~a, ~c, ~S, ..");
+	}
+	return 0; /* FAIL: ban rejected */
+}
+
+int msgbypass_extban_is_ok(Client *client, Channel* channel, char *para_in, int checkt, int what, int what2)
+{
+	char para[MAX_LENGTH+1];
+	char tmpmask[MAX_LENGTH+1];
+	char *type; /**< Type, such as 'external' */
+	char *matchby; /**< Matching method, such as 'n!u@h' */
+	char *newmask; /**< Cleaned matching method, such as 'n!u@h' */
+
+	/* Always permit deletion */
+	if (what == MODE_DEL)
+		return 1;
+	
+	if (what2 != EXBTYPE_EXCEPT)
+	{
+		if (checkt == EXBCHK_PARAM)
+			sendnotice(client, "Ban type ~m only works with exceptions (+e) and not with bans or invex (+b/+I)");
+		return 0; /* reject */
+	}
+
+	strlcpy(para, para_in+3, sizeof(para)); /* work on a copy (and truncate it) */
+	
+	/* ~m:type:n!u@h   for direct matching
+	 * ~m:type:~x:.... when calling another bantype
+	 */
+
+	type = para;
+	matchby = strchr(para, ':');
+	if (!matchby || !matchby[1])
+		return msgbypass_extban_syntax(client, checkt, "Invalid syntax");
+	*matchby++ = '\0';
+
+	if (!msgbypass_extban_type_ok(type))
+		return msgbypass_extban_syntax(client, checkt, "Unknown type");
+
+	/* This is quite silly, we have to create a fake extban here due to
+	 * the current API of extban_conv_param_nuh and extban_conv_param_nuh_or_extban
+	 * expecting the full banmask rather than the portion that actually matters.
+	 */
+	snprintf(tmpmask, sizeof(tmpmask), "~?:%s", matchby);
+	if (extban_is_ok_nuh_extban(client, channel, tmpmask, checkt, what, what2) == 0)
+	{
+		/* This could be anything ranging from:
+		 * invalid n!u@h syntax, unknown (sub)extbantype,
+		 * disabled extban type in conf, too much recursion, etc.
+		 */
+		return msgbypass_extban_syntax(client, checkt, "Invalid matcher");
+	}
+
+	return 1; /* OK */
+}
+
diff --git a/src/modules/extbans/nickchange.c b/src/modules/extbans/nickchange.c
new file mode 100644
index 0000000..164fbc0
--- /dev/null
+++ b/src/modules/extbans/nickchange.c
@@ -0,0 +1,81 @@
+/*
+ * Extended ban that affects nick-changes only (+b ~n)
+ * (C) Copyright 2003-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/nickchange",
+	"4.2",
+	"ExtBan ~n - prevent nick-changes only",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int extban_nickchange_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'n';
+	req.is_ok = extban_is_ok_nuh_extban;
+	req.conv_param = extban_conv_param_nuh_or_extban;
+	req.is_banned = extban_nickchange_is_banned;
+	req.options = EXTBOPT_ACTMODIFIER;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This ban that affects nick-changes only */
+int extban_nickchange_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *sub_ban;
+
+	if (type != BANCHK_NICK)
+		return 0;
+
+	if (has_voice(client, channel))
+		return 0;
+
+	sub_ban = banin + 3;
+
+	return ban_check_mask(client, channel, sub_ban, type, msg, errmsg, 0);
+}
+
diff --git a/src/modules/extbans/operclass.c b/src/modules/extbans/operclass.c
new file mode 100644
index 0000000..b5469cc
--- /dev/null
+++ b/src/modules/extbans/operclass.c
@@ -0,0 +1,104 @@
+/*
+ * Extended ban type: ban (or rather: exempt or invex) an operclass.
+ * (C) Copyright 2003-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/operclass",
+	"4.2",
+	"ExtBan ~O - Ban/exempt operclass",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+char *extban_operclass_conv_param(char *para);
+int extban_operclass_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'O';
+	req.is_ok = NULL;
+	req.conv_param = extban_operclass_conv_param;
+	req.is_banned = extban_operclass_is_banned;
+	req.options = EXTBOPT_INVEX;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+#define OPERCLASSLEN 64
+
+char *extban_operclass_conv_param(char *para)
+{
+	static char retbuf[OPERCLASSLEN + 4];
+	char *p;
+
+	strlcpy(retbuf, para, sizeof(retbuf));
+
+	/* allow alpha, numeric, -, _, * and ? wildcards */
+	for (p = retbuf+3; *p; p++)
+		if (!strchr("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_?*", *p))
+			*p = '\0';
+
+	if (retbuf[3] == '\0')
+		return NULL; /* just "~O:" is invalid */
+
+	return retbuf;
+}
+
+int extban_operclass_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *ban = banin+3;
+
+	if (MyUser(client) && IsOper(client))
+	{
+		char *operclass = NULL;
+		ConfigItem_oper *oper = find_oper(client->user->operlogin);
+		if (oper && oper->operclass)
+			operclass = oper->operclass;
+		
+		if (operclass && match_simple(ban, operclass))
+			return 1;
+	}
+
+	return 0;
+}
diff --git a/src/modules/extbans/partmsg.c b/src/modules/extbans/partmsg.c
new file mode 100644
index 0000000..10c3651
--- /dev/null
+++ b/src/modules/extbans/partmsg.c
@@ -0,0 +1,71 @@
+/*
+ * Hide Part/Quit message extended ban (+b ~p:nick!user@host)
+ * (C) Copyright i <info@servx.org> and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/partmsg",
+	"4.2",
+	"ExtBan ~p - Ban/exempt Part/Quit message",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+int extban_partmsg_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+MOD_INIT()
+{
+	ExtbanInfo req;
+
+	req.flag = 'p';
+	req.is_ok = extban_is_ok_nuh_extban;
+	req.conv_param = extban_conv_param_nuh_or_extban;
+	req.options = EXTBOPT_ACTMODIFIER;
+	req.is_banned = extban_partmsg_is_banned;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int extban_partmsg_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	if (type == BANCHK_LEAVE_MSG)
+		*msg = NULL;
+
+	return 0;
+}
diff --git a/src/modules/extbans/quiet.c b/src/modules/extbans/quiet.c
new file mode 100644
index 0000000..2f7d787
--- /dev/null
+++ b/src/modules/extbans/quiet.c
@@ -0,0 +1,77 @@
+/*
+ * Extended ban that affects messages/notices only (+b ~q)
+ * (C) Copyright 2003-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/quiet",
+	"4.2",
+	"ExtBan ~q - prevent messages only (quiet)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int extban_quiet_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'q';
+	req.is_ok = extban_is_ok_nuh_extban;
+	req.conv_param = extban_conv_param_nuh_or_extban;
+	req.is_banned = extban_quiet_is_banned;
+	req.options = EXTBOPT_ACTMODIFIER;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This ban that affects messages/notices only */
+int extban_quiet_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *sub_ban;
+
+	if (type != BANCHK_MSG)
+		return 0;
+
+	sub_ban = banin + 3;
+
+	return ban_check_mask(client, channel, sub_ban, type, msg, errmsg, 0);
+}
diff --git a/src/modules/extbans/realname.c b/src/modules/extbans/realname.c
new file mode 100644
index 0000000..8181716
--- /dev/null
+++ b/src/modules/extbans/realname.c
@@ -0,0 +1,97 @@
+/*
+ * Extended ban to ban based on real name / gecos field (+b ~r)
+ * (C) Copyright 2003-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"extbans/realname",
+	"4.2",
+	"ExtBan ~r - Ban based on realname/gecos field",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+char *extban_realname_conv_param(char *para);
+int extban_realname_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg);
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ExtbanInfo req;
+	
+	req.flag = 'r';
+	req.is_ok = NULL;
+	req.conv_param = extban_realname_conv_param;
+	req.is_banned = extban_realname_is_banned;
+	req.options = EXTBOPT_CHSVSMODE|EXTBOPT_INVEX|EXTBOPT_TKL;
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("could not register extended ban type");
+		return MOD_FAILED;
+	}
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Realname bans - conv_param */
+char *extban_realname_conv_param(char *para)
+{
+	static char retbuf[REALLEN + 8];
+	char *mask;
+
+	strlcpy(retbuf, para, sizeof(retbuf));
+
+	mask = retbuf+3;
+
+	if (!*mask)
+		return NULL; /* don't allow "~r:" */
+
+	if (strlen(mask) > REALLEN + 3)
+		mask[REALLEN + 3] = '\0';
+
+	if (*mask == '~')
+		*mask = '?'; /* Is this good? No ;) */
+
+	return retbuf;
+}
+
+int extban_realname_is_banned(Client *client, Channel *channel, char *banin, int type, char **msg, char **errmsg)
+{
+	char *ban = banin+3;
+
+	if (match_esc(ban, client->info))
+		return 1;
+
+	return 0;
+}
diff --git a/src/modules/extbans/textban.c b/src/modules/extbans/textban.c
new file mode 100644
index 0000000..c5eeab6
--- /dev/null
+++ b/src/modules/extbans/textban.c
@@ -0,0 +1,499 @@
+/*
+ * Text ban. (C) Copyright 2004-2016 Bram Matthys.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#include "unrealircd.h"
+
+/** Max number of text bans per channel.
+ * This is basically the most important setting. It directly affects
+ * how much CPU you want to spend on text processing.
+ * For comparison: with 10 textbans of max length (150), and messages said in
+ * the channel with max length (~500 bytes), on an A1800+ (1.53GHz) machine
+ * this consumes 30 usec per-channel message PEAK/MAX (usec = 1/1000000 of a
+ * second), and in normal (non-supersize messages) count on 10-15 usec.
+ * Basically this means this allows for like >25000 messages per second at
+ * 100% CPU usage in a worth case scenario. Which seems by far sufficient to me.
+ * Also note that (naturally) only local clients are processed, only people
+ * that do not have halfops or higher, and only channels that have any
+ * textbans set.
+ * UPDATE: The speed impact for 15 bans per channel is 42 usec PEAK.
+ * HINT: If you are hitting the "normal banlimit" before you actually hit this
+ *       one, then you might want to tweak the #define MAXBANS and #define
+ *       MAXBANLENGTH in include/struct.h. Doubling MAXBANLENGTH is usually
+ *       a good idea, and then you can enlarge MAXBANS too a bit if you want to.
+ */
+#define MAX_EXTBANT_PER_CHAN     15 /* Max number of ~T bans in a channel. */
+
+/** Max length of a ban.
+ * NOTE: This is mainly for 'cosmetic' purposes. Lowering it does not
+ *       decrease CPU usage for text processing.
+ */
+#define MAX_LENGTH               150 /* Max length of a ban */
+
+/** Allow user@host in the textban? This changes the syntax! */
+#undef UHOSTFEATURE
+
+/** Enable 'censor' support. What this type will do is replace the
+ * matched word with "<censored>" (or another word, see later)
+ * Like:
+ * <Idiot> hey check out my fucking new car
+ * will become:
+ * <Idiot> hey check out my <censored> new car
+ *
+ * SPEED: See README
+ */
+#define CENSORFEATURE
+
+/** Which censor replace word to use when CENSORFEATURE is enabled. */
+#define CENSORWORD "<censored>"
+
+/** Benchmark mode.
+ * Should never be used on production servers.
+ * Mainly meant for debugging/profiling purposes for myself, but if you
+ * have a test server and are curious about the speed of this module,
+ * then you can enable it of course ;).
+ */
+#undef BENCHMARK
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"extbans/textban",
+	"2.2",
+	"ExtBan ~T (textban) by Syzop",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+char *extban_modeT_conv_param(char *para_in);
+int extban_modeT_is_banned(Client *client, Channel *channel, char *ban, int type, char **msg, char **errmsg);
+int extban_modeT_is_ok(Client *client, Channel *channel, char *para, int checkt, int what, int what2);
+void parse_word(const char *s, char **word, int *type);
+
+MOD_INIT()
+{
+	ExtbanInfo req;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&req, 0, sizeof(ExtbanInfo));
+	req.flag = 'T';
+	req.conv_param = extban_modeT_conv_param;
+	req.is_banned = extban_modeT_is_banned;
+	req.is_ok = extban_modeT_is_ok;
+
+	if (!ExtbanAdd(modinfo->handle, req))
+	{
+		config_error("textban module: adding extban ~T failed! module NOT loaded");
+		return MOD_FAILED;
+	}
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+#if defined(CENSORFEATURE) || defined(STRIPFEATURE)
+static char *my_strcasestr(char *haystack, char *needle)
+{
+	int i;
+	int nlength = strlen (needle);
+	int hlength = strlen (haystack);
+
+	if (nlength > hlength)
+		return NULL;
+	if (hlength <= 0)
+		return NULL;
+	if (nlength <= 0)
+		return haystack;
+	for (i = 0; i <= (hlength - nlength); i++)
+	{
+		if (strncasecmp (haystack + i, needle, nlength) == 0)
+			return haystack + i;
+	}
+	return NULL; /* not found */
+}
+
+#define TEXTBAN_WORD_LEFT	0x1
+#define TEXTBAN_WORD_RIGHT	0x2
+
+/* textban_replace:
+ * a fast replace routine written by Syzop used for replacing.
+ * searches in line for huntw and replaces it with replacew,
+ * buf is used for the result and max is sizeof(buf).
+ * (Internal assumptions: size of 'buf' is 512 characters or more)
+ */
+int textban_replace(int type, char *badword, char *line, char *buf)
+{
+	char *replacew;
+	char *pold = line, *pnew = buf; /* Pointers to old string and new string */
+	char *poldx = line;
+	int replacen;
+	int searchn = -1;
+	char *startw, *endw;
+	char *c_eol = buf + 510 - 1; /* Cached end of (new) line */
+	int cleaned = 0;
+
+	replacew = CENSORWORD;
+	replacen = sizeof(CENSORWORD)-1;
+
+	while (1)
+	{
+		pold = my_strcasestr(pold, badword);
+		if (!pold)
+			break;
+		if (searchn == -1)
+			searchn = strlen(badword);
+		/* Hunt for start of word */
+ 		if (pold > line)
+ 		{
+			for (startw = pold; (!iswseperator(*startw) && (startw != line)); startw--);
+			if (iswseperator(*startw))
+				startw++; /* Don't point at the space/seperator but at the word! */
+		} else {
+			startw = pold;
+		}
+
+		if (!(type & TEXTBAN_WORD_LEFT) && (pold != startw))
+		{
+			/* not matched */
+			pold++;
+			continue;
+		}
+
+		/* Hunt for end of word
+		 * Fix for bug #4909: word will be at least 'searchn' long so we can skip
+		 * 'searchn' bytes and avoid stopping half-way the badword.
+		 */
+		for (endw = pold+searchn; ((*endw != '\0') && (!iswseperator(*endw))); endw++);
+
+		if (!(type & TEXTBAN_WORD_RIGHT) && (pold+searchn != endw))
+		{
+			/* not matched */
+			pold++;
+			continue;
+		}
+
+		cleaned = 1; /* still too soon? Syzop/20050227 */
+
+		/* Do we have any not-copied-yet data? */
+		if (poldx != startw)
+		{
+			int tmp_n = startw - poldx;
+			if (pnew + tmp_n >= c_eol)
+			{
+				/* Partial copy and return... */
+				memcpy(pnew, poldx, c_eol - pnew);
+				*c_eol = '\0';
+				return 1;
+			}
+
+			memcpy(pnew, poldx, tmp_n);
+			pnew += tmp_n;
+		}
+		/* Now update the word in buf (pnew is now something like startw-in-new-buffer */
+
+		if (replacen)
+		{
+			if ((pnew + replacen) >= c_eol)
+			{
+				/* Partial copy and return... */
+				memcpy(pnew, replacew, c_eol - pnew);
+				*c_eol = '\0';
+				return 1;
+			}
+			memcpy(pnew, replacew, replacen);
+			pnew += replacen;
+		}
+		poldx = pold = endw;
+	}
+	/* Copy the last part */
+	if (*poldx)
+	{
+		strncpy(pnew, poldx, c_eol - pnew);
+		*(c_eol) = '\0';
+	} else {
+		*pnew = '\0';
+	}
+	return cleaned;
+}
+#endif
+
+unsigned int counttextbans(Channel *channel)
+{
+	Ban *ban;
+	unsigned int cnt = 0;
+
+	for (ban = channel->banlist; ban; ban=ban->next)
+		if ((ban->banstr[0] == '~') && (ban->banstr[1] == 'T') && (ban->banstr[2] == ':'))
+			cnt++;
+	for (ban = channel->exlist; ban; ban=ban->next)
+		if ((ban->banstr[0] == '~') && (ban->banstr[1] == 'T') && (ban->banstr[2] == ':'))
+			cnt++;
+	return cnt;
+}
+
+
+int extban_modeT_is_ok(Client *client, Channel *channel, char *para, int checkt, int what, int what2)
+{
+	int n;
+
+	if ((what == MODE_ADD) && (what2 == EXBTYPE_EXCEPT) && MyUser(client))
+		return 0; /* except is not supported */
+
+	/* We check the # of bans in the channel, may not exceed MAX_EXTBANT_PER_CHAN */
+	if ((what == MODE_ADD) && (checkt == EXBCHK_PARAM) &&
+	     MyUser(client) && !IsOper(client) &&
+	    ((n = counttextbans(channel)) >= MAX_EXTBANT_PER_CHAN))
+	{
+		/* We check the # of bans in the channel, may not exceed MAX_EXTBANT_PER_CHAN */
+		sendnumeric(client, ERR_BANLISTFULL, channel->chname, para);
+		sendnotice(client, "Too many textbans for this channel");
+		return 0;
+	}
+	return 1;
+}
+
+char *conv_pattern_asterisks(const char *pattern)
+{
+	static char buf[512];
+	char missing_prefix = 0, missing_suffix = 0;
+	if (*pattern != '*')
+		missing_prefix = 1;
+	if (*pattern && (pattern[strlen(pattern)-1] != '*'))
+		missing_suffix = 1;
+	snprintf(buf, sizeof(buf), "%s%s%s",
+		missing_prefix ? "*" : "",
+		pattern,
+		missing_suffix ? "*" : "");
+	return buf;
+}
+
+/** Ban callbacks */
+char *extban_modeT_conv_param(char *para_in)
+{
+	static char retbuf[MAX_LENGTH+1];
+	char para[MAX_LENGTH+1], *action, *text, *p;
+#ifdef UHOSTFEATURE
+	char *uhost;
+	int ap = 0;
+#endif
+
+	strlcpy(para, para_in+3, sizeof(para)); /* work on a copy (and truncate it) */
+
+	/* ~T:<action>:<text>
+	 * ~T:user@host:<action>:<text> if UHOSTFEATURE is enabled
+	 */
+
+#ifdef UHOSTFEATURE
+	action = strchr(para, ':');
+	if (!action)
+		return NULL;
+	*action++ = '\0';
+	if (!*action)
+		return NULL;
+	text = strchr(action, ':');
+	if (!text || !text[1])
+		return NULL;
+	*text++ = '\0';
+	uhost = para;
+
+	for (p = uhost; *p; p++)
+	{
+		if (*p == '@')
+			ap++;
+		else if ((*p <= ' ') || (*p > 128))
+			return NULL; /* cannot be in a username/host */
+	}
+	if (ap != 1)
+		return NULL; /* no @ */
+#else
+	text = strchr(para, ':');
+	if (!text)
+		return NULL;
+	*text++ = '\0';
+	/* para=action, text=text */
+	if (!*text)
+		return NULL; /* empty text */
+	action = para;
+#endif
+
+	/* ~T:<action>:<text> */
+	if (!strcasecmp(action, "block"))
+	{
+		action = "block"; /* ok */
+		text = conv_pattern_asterisks(text);
+	}
+#ifdef CENSORFEATURE
+	else if (!strcasecmp(action, "censor"))
+	{
+		char *p;
+		action = "censor";
+		for (p = text; *p; p++)
+			if ((*p == '*') && !(p == text) && !(p[1] == '\0'))
+				return NULL; /* can only be *word, word* or *word* or word */
+		if (!strcmp(p, "*") || !strcmp(p, "**"))
+			return NULL; /* cannot match everything ;p */
+	}
+#endif
+	else
+		return NULL; /* unknown action */
+
+	/* check the string.. */
+	for (p=text; *p; p++)
+	{
+		if ((*p == '\003') || (*p == '\002') || 
+		    (*p == '\037') || (*p == '\026') ||
+		    (*p == ' '))
+		{
+			return NULL; /* codes not permitted, would be confusing since they are stripped */
+		}
+	}
+
+	/* Rebuild the string.. can be cut off if too long. */
+#ifdef UHOSTFEATURE
+	snprintf(retbuf, sizeof(retbuf), "~T:%s:%s:%s", uhost, action, text);
+#else
+	snprintf(retbuf, sizeof(retbuf), "~T:%s:%s", action, text);
+#endif
+	return retbuf;
+}
+
+int extban_modeT_is_banned(Client *client, Channel *channel, char *ban, int checktype, char **msg, char **errmsg)
+{
+	static char filtered[512]; /* temp buffer */
+	long fl;
+	int cleaned=0;
+	char *p;
+#ifdef UHOSTFEATURE
+	char buf[512], uhost[USERLEN + HOSTLEN + 16];
+#endif
+	char tmp[1024], *word;
+	int type;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	/* We only filter on BANCHK_MSG, and we can only filter on non-NULL text of course */
+	if ((checktype != BANCHK_MSG) || (msg == NULL) || (*msg == NULL))
+		return 0;
+
+	filtered[0] = '\0'; /* NOT needed, but... :P */
+
+#ifdef UHOSTFEATURE
+	ircsprintf(uhost, "%s@%s", client->user->username, GetHost(client));
+#endif
+	strlcpy(filtered, StripControlCodes(*msg), sizeof(filtered));
+
+	p = ban + 3;
+#ifdef UHOSTFEATURE
+	/* First.. deal with userhost... */
+	strcpy(buf, p);
+	p = strchr(buf, ':');
+	if (!p)
+		return 0; /* invalid format */
+	*p++ = '\0';
+
+	if (match_simple(buf, uhost))
+#else
+	if (1)
+#endif
+	{
+		if (!strncasecmp(p, "block:", 6))
+		{
+			if (match_simple(p+6, filtered))
+			{
+				if (errmsg)
+					*errmsg = "Message blocked due to a text ban";
+				return 1; /* BLOCK */
+			}
+		}
+#ifdef CENSORFEATURE
+		else if (!strncasecmp(p, "censor:", 7))
+		{
+			parse_word(p+7, &word, &type);
+			if (textban_replace(type, word, filtered, tmp))
+			{
+				strlcpy(filtered, tmp, sizeof(filtered));
+				cleaned = 1;
+			}
+		}
+#endif
+	}
+
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "TextBan Timing: %ld microseconds (%s / %s / %d)",
+		((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec),
+		client->name, channel->chname, strlen(*msg));
+#endif
+
+	if (cleaned)
+	{
+		/* check for null string */
+		char *p;
+		for (p = filtered; *p; p++)
+		{
+			if (*p != ' ')
+			{
+				*msg = filtered;
+				return 0; /* allow through, but filtered */
+			}
+		}
+		return 1; /* nothing but spaces found.. */
+	}
+	return 0; /* nothing blocked */
+}
+
+#ifdef CENSORFEATURE
+void parse_word(const char *s, char **word, int *type)
+{
+	static char buf[512];
+	const char *tmp;
+	int len;
+	int tpe = 0;
+	char *o = buf;
+
+	for (tmp = s; *tmp; tmp++)
+	{
+		if (*tmp != '*')
+			*o++ = *tmp;
+		else
+		{
+			if (s == tmp)
+				tpe |= TEXTBAN_WORD_LEFT;
+			if (*(tmp + 1) == '\0')
+				tpe |= TEXTBAN_WORD_RIGHT;
+		}
+	}
+	*o = '\0';
+
+	*word = buf;
+	*type = tpe;
+}
+#endif
diff --git a/src/modules/extbans/timedban.c b/src/modules/extbans/timedban.c
new file mode 100644
index 0000000..1b5f130
--- /dev/null
+++ b/src/modules/extbans/timedban.c
@@ -0,0 +1,505 @@
+/*
+ * timedban - Timed bans that are automatically unset.
+ * (C) Copyright 2009-2017 Bram Matthys (Syzop) and the UnrealIRCd team.
+ * License: GPLv2
+ *
+ * This module adds an extended ban ~t:time:mask
+ * Where 'time' is the time in minutes after which the ban will be removed.
+ * Where 'mask' is any banmask that is normally valid.
+ *
+ * Note that this extended ban is rather special in the sense that
+ * it permits (crazy) triple-extbans to be set, such as:
+ * +b ~t:1:~q:~a:Account
+ * (=a temporary 1min ban to mute a user with services account Account)
+ * +e ~t:1440:~m:moderated:*!*@host
+ * (=user with *!*@host may speak through +m for the next 1440m / 24h)
+ *
+ * The triple-extbans / double-stacking requires special routines that
+ * are based on parts of the core and special recursion checks.
+ * If you are looking for inspiration of coding your own extended ban
+ * then look at another extended ban * module as this module is not a
+ * good starting point ;)
+ */
+   
+#include "unrealircd.h"
+
+/* Maximum time (in minutes) for a ban */
+#define TIMEDBAN_MAX_TIME	9999
+
+/* Maximum length of a ban */
+#define MAX_LENGTH 128
+
+/* Split timeout event in <this> amount of iterations */
+#define TIMEDBAN_TIMER_ITERATION_SPLIT 4
+
+/* Call timeout event every <this> seconds.
+ * NOTE: until all channels are processed it takes
+ *       TIMEDBAN_TIMER_ITERATION_SPLIT * TIMEDBAN_TIMER.
+ */
+#define TIMEDBAN_TIMER	2
+
+/* We allow a ban to (potentially) expire slightly before the deadline.
+ * For example with TIMEDBAN_TIMER_ITERATION_SPLIT=4 and TIMEDBAN_TIMER=2
+ * a 1 minute ban would expire at 56-63 seconds, rather than 60-67 seconds.
+ * This is usually preferred.
+ */
+#define TIMEDBAN_TIMER_DELTA ((TIMEDBAN_TIMER_ITERATION_SPLIT*TIMEDBAN_TIMER)/2)
+
+ModuleHeader MOD_HEADER
+  = {
+	"extbans/timedban",
+	"1.0",
+	"ExtBan ~t: automatically removed timed bans",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+char *timedban_extban_conv_param(char *para_in);
+int timedban_extban_is_ok(Client *client, Channel* channel, char *para_in, int checkt, int what, int what2);
+int timedban_is_banned(Client *client, Channel *channel, char *ban, int chktype, char **msg, char **errmsg);
+void add_send_mode_param(Channel *channel, Client *from, char what, char mode, char *param);
+char *timedban_chanmsg(Client *, Client *, Channel *, char *, int);
+
+EVENT(timedban_timeout);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+ExtbanInfo extban;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&extban, 0, sizeof(ExtbanInfo));
+	extban.flag = 't';
+	extban.options |= EXTBOPT_ACTMODIFIER; /* not really, but ours shouldn't be stacked from group 1 */
+	extban.options |= EXTBOPT_CHSVSMODE; /* so "SVSMODE -nick" will unset affected ~t extbans */
+	extban.options |= EXTBOPT_INVEX; /* also permit timed invite-only exceptions (+I) */
+	extban.conv_param = timedban_extban_conv_param;
+	extban.is_ok = timedban_extban_is_ok;
+	extban.is_banned = timedban_is_banned;
+
+	if (!ExtbanAdd(modinfo->handle, extban))
+	{
+		config_error("timedban: unable to register 't' extban type!!");
+		return MOD_FAILED;
+	}
+                
+	EventAdd(modinfo->handle, "timedban_timeout", timedban_timeout, NULL, TIMEDBAN_TIMER*1000, 0);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Generic helper for our conv_param extban function.
+ * Mostly copied from clean_ban_mask()
+ */
+char *generic_clean_ban_mask(char *mask)
+{
+	char *cp, *x;
+	char *user;
+	char *host;
+	Extban *p;
+	static char maskbuf[512];
+
+	/* Work on a copy */
+	strlcpy(maskbuf, mask, sizeof(maskbuf));
+	mask = maskbuf;
+
+	cp = strchr(mask, ' ');
+	if (cp)
+		*cp = '\0';
+
+	/* Strip any ':' at beginning since that would cause a desync */
+	for (; (*mask && (*mask == ':')); mask++);
+	if (!*mask)
+		return NULL;
+
+	/* Forbid ASCII <= 32 in all bans */
+	for (x = mask; *x; x++)
+		if (*x <= ' ')
+			return NULL;
+
+	/* Extended ban? */
+	if (is_extended_ban(mask))
+	{
+		p = findmod_by_bantype(mask[1]);
+		if (!p)
+			return NULL; /* reject unknown extban */
+		if (p->conv_param)
+			return p->conv_param(mask);
+		/* else, do some basic sanity checks and cut it off at 80 bytes */
+		if ((mask[1] != ':') || (mask[2] == '\0'))
+		    return NULL; /* require a ":<char>" after extban type */
+		if (strlen(mask) > 80)
+			mask[80] = '\0';
+		return mask;
+	}
+
+	if ((*mask == '~') && !strchr(mask, '@'))
+		return NULL; /* not an extended ban and not a ~user@host ban either. */
+
+	if ((user = strchr((cp = mask), '!')))
+		*user++ = '\0';
+	if ((host = strrchr(user ? user : cp, '@')))
+	{
+		*host++ = '\0';
+
+		if (!user)
+			return make_nick_user_host(NULL, trim_str(cp,USERLEN), 
+				trim_str(host,HOSTLEN));
+	}
+	else if (!user && strchr(cp, '.'))
+		return make_nick_user_host(NULL, NULL, trim_str(cp,HOSTLEN));
+	return make_nick_user_host(trim_str(cp,NICKLEN), trim_str(user,USERLEN), 
+		trim_str(host,HOSTLEN));
+}
+
+/** Convert ban to an acceptable format (or return NULL to fully reject it) */
+char *timedban_extban_conv_param(char *para_in)
+{
+	static char retbuf[MAX_LENGTH+1];
+	char para[MAX_LENGTH+1];
+	char tmpmask[MAX_LENGTH+1];
+	char *durationstr; /**< Duration, such as '5' */
+	int duration;
+	char *matchby; /**< Matching method, such as 'n!u@h' */
+	char *newmask; /**< Cleaned matching method, such as 'n!u@h' */
+	static int timedban_extban_conv_param_recursion = 0;
+	
+	if (timedban_extban_conv_param_recursion)
+		return NULL; /* reject: recursion detected! */
+
+	strlcpy(para, para_in+3, sizeof(para)); /* work on a copy (and truncate it) */
+	
+	/* ~t:duration:n!u@h   for direct matching
+	 * ~t:duration:~x:.... when calling another bantype
+	 */
+
+	durationstr = para;
+	matchby = strchr(para, ':');
+	if (!matchby || !matchby[1])
+		return NULL;
+	*matchby++ = '\0';
+	
+	duration = atoi(durationstr);
+
+	if ((duration <= 0) || (duration > TIMEDBAN_MAX_TIME))
+		return NULL;
+
+	strlcpy(tmpmask, matchby, sizeof(tmpmask));
+	timedban_extban_conv_param_recursion++;
+	//newmask = extban_conv_param_nuh_or_extban(tmpmask);
+	newmask = generic_clean_ban_mask(tmpmask);
+	timedban_extban_conv_param_recursion--;
+	if (!newmask || (strlen(newmask) <= 1))
+		return NULL;
+
+	snprintf(retbuf, sizeof(retbuf), "~t:%d:%s", duration, newmask);
+	return retbuf;
+}
+
+int timedban_extban_syntax(Client *client, int checkt, char *reason)
+{
+	if (MyUser(client) && (checkt == EXBCHK_PARAM))
+	{
+		sendnotice(client, "Error when setting timed ban: %s", reason);
+		sendnotice(client, " Syntax: +b ~t:duration:mask");
+		sendnotice(client, "Example: +b ~t:5:nick!user@host");
+		sendnotice(client, "Duration is the time in minutes after which the ban is removed (1-9999)");
+		sendnotice(client, "Valid masks are: nick!user@host or another extban type such as ~a, ~c, ~S, ..");
+	}
+	return 0; /* FAIL: ban rejected */
+}
+
+/** Generic helper for sub-bans, used by our "is this ban ok?" function */
+int generic_ban_is_ok(Client *client, Channel *channel, char *mask, int checkt, int what, int what2)
+{
+	if ((mask[0] == '~') && MyUser(client))
+	{
+		Extban *p;
+
+		/* This portion is copied from clean_ban_mask() */
+		if (is_extended_ban(mask) && MyUser(client))
+		{
+			if (RESTRICT_EXTENDEDBANS && !ValidatePermissionsForPath("immune:restrict-extendedbans",client,NULL,NULL,NULL))
+			{
+				if (!strcmp(RESTRICT_EXTENDEDBANS, "*"))
+				{
+					if (checkt == EXBCHK_ACCESS_ERR)
+						sendnotice(client, "Setting/removing of extended bans has been disabled");
+					return 0; /* REJECT */
+				}
+				if (strchr(RESTRICT_EXTENDEDBANS, mask[1]))
+				{
+					if (checkt == EXBCHK_ACCESS_ERR)
+						sendnotice(client, "Setting/removing of extended bantypes '%s' has been disabled", RESTRICT_EXTENDEDBANS);
+					return 0; /* REJECT */
+				}
+			}
+			/* And next is inspired by cmd_mode */
+			p = findmod_by_bantype(mask[1]);
+			if (checkt == EXBCHK_ACCESS)
+			{
+				if (p && p->is_ok && !p->is_ok(client, channel, mask, EXBCHK_ACCESS, what, what2) &&
+				    !ValidatePermissionsForPath("channel:override:mode:extban",client,NULL,channel,NULL))
+				{
+					return 0; /* REJECT */
+				}
+			} else
+			if (checkt == EXBCHK_ACCESS_ERR)
+			{
+				if (p && p->is_ok && !p->is_ok(client, channel, mask, EXBCHK_ACCESS, what, what2) &&
+				    !ValidatePermissionsForPath("channel:override:mode:extban",client,NULL,channel,NULL))
+				{
+					p->is_ok(client, channel, mask, EXBCHK_ACCESS_ERR, what, what2);
+					return 0; /* REJECT */
+				}
+			} else
+			if (checkt == EXBCHK_PARAM)
+			{
+				if (p && p->is_ok && !p->is_ok(client, channel, mask, EXBCHK_PARAM, what, what2))
+				{
+					return 0; /* REJECT */
+				}
+			}
+		}
+	}
+	
+	/* ACCEPT:
+	 * - not an extban; OR
+	 * - extban with NULL is_ok; OR
+	 * - non-existing extban character (handled by conv_param?)
+	 */
+	return 1;
+}
+
+/** Validate ban ("is this ban ok?") */
+int timedban_extban_is_ok(Client *client, Channel* channel, char *para_in, int checkt, int what, int what2)
+{
+	char para[MAX_LENGTH+1];
+	char tmpmask[MAX_LENGTH+1];
+	char *durationstr; /**< Duration, such as '5' */
+	int duration;
+	char *matchby; /**< Matching method, such as 'n!u@h' */
+	char *newmask; /**< Cleaned matching method, such as 'n!u@h' */
+	static int timedban_extban_is_ok_recursion = 0;
+	int res;
+
+	/* Always permit deletion */
+	if (what == MODE_DEL)
+		return 1;
+
+	if (timedban_extban_is_ok_recursion)
+		return 0; /* Recursion detected (~t:1:~t:....) */
+
+	strlcpy(para, para_in+3, sizeof(para)); /* work on a copy (and truncate it) */
+	
+	/* ~t:duration:n!u@h   for direct matching
+	 * ~t:duration:~x:.... when calling another bantype
+	 */
+
+	durationstr = para;
+	matchby = strchr(para, ':');
+	if (!matchby || !matchby[1])
+		return timedban_extban_syntax(client, checkt, "Invalid syntax");
+	*matchby++ = '\0';
+
+	duration = atoi(durationstr);
+
+	if ((duration <= 0) || (duration > TIMEDBAN_MAX_TIME))
+		return timedban_extban_syntax(client, checkt, "Invalid duration time");
+
+	strlcpy(tmpmask, matchby, sizeof(tmpmask));
+	timedban_extban_is_ok_recursion++;
+	//res = extban_is_ok_nuh_extban(client, channel, tmpmask, checkt, what, what2);
+	res = generic_ban_is_ok(client, channel, tmpmask, checkt, what, what2);
+	timedban_extban_is_ok_recursion--;
+	if (res == 0)
+	{
+		/* This could be anything ranging from:
+		 * invalid n!u@h syntax, unknown (sub)extbantype,
+		 * disabled extban type in conf, too much recursion, etc.
+		 */
+		return timedban_extban_syntax(client, checkt, "Invalid matcher");
+	}
+
+	return 1; /* OK */
+}
+
+/** Check if the user is currently banned */
+int timedban_is_banned(Client *client, Channel *channel, char *ban, int chktype, char **msg, char **errmsg)
+{
+	if (strncmp(ban, "~t:", 3))
+		return 0; /* not for us */
+	ban = strchr(ban+3, ':'); /* skip time argument */
+	if (!ban)
+		return 0; /* invalid fmt */
+	ban++;
+
+	return ban_check_mask(client, channel, ban, chktype, msg, errmsg, 0);
+}
+
+/** Helper to check if the ban has been expired */
+int timedban_has_ban_expired(Ban *ban)
+{
+	char *banstr = ban->banstr;
+	char *p;
+	int t;
+	time_t expire_on;
+
+	if (strncmp(banstr, "~t:", 3))
+		return 0; /* not for us */
+	p = strchr(banstr+3, ':'); /* skip time argument */
+	if (!p)
+		return 0; /* invalid fmt */
+	*p = '\0'; /* danger.. must restore!! */
+	t = atoi(banstr+3);
+	*p = ':'; /* restored.. */
+	
+	expire_on = ban->when + (t * 60) - TIMEDBAN_TIMER_DELTA;
+	
+	if (expire_on < TStime())
+		return 1;
+	return 0;
+}
+
+static char mbuf[512];
+static char pbuf[512];
+
+/** This removes any expired timedbans */
+EVENT(timedban_timeout)
+{
+	Channel *channel;
+	Ban *ban, *nextban;
+	static int current_iteration = 0;
+
+	if (++current_iteration >= TIMEDBAN_TIMER_ITERATION_SPLIT)
+		current_iteration = 0;
+
+	for (channel = channels; channel; channel = channel->nextch)
+	{
+		/* This is a very quick check, at the cost of it being
+		 * biased since there's always a tendency of more channel
+		 * names to start with one specific letter. But hashing
+		 * is too costly. So we stick with this. It should be
+		 * good enough. Alternative would be some channel->id value.
+		 */
+		if (((unsigned int)channel->chname[1] % TIMEDBAN_TIMER_ITERATION_SPLIT) != current_iteration)
+			continue; /* not this time, maybe next */
+
+		*mbuf = *pbuf = '\0';
+		for (ban = channel->banlist; ban; ban=nextban)
+		{
+			nextban = ban->next;
+			if (!strncmp(ban->banstr, "~t:", 3) && timedban_has_ban_expired(ban))
+			{
+				add_send_mode_param(channel, &me, '-',  'b', ban->banstr);
+				del_listmode(&channel->banlist, channel, ban->banstr);
+			}
+		}
+		for (ban = channel->exlist; ban; ban=nextban)
+		{
+			nextban = ban->next;
+			if (!strncmp(ban->banstr, "~t:", 3) && timedban_has_ban_expired(ban))
+			{
+				add_send_mode_param(channel, &me, '-',  'e', ban->banstr);
+				del_listmode(&channel->exlist, channel, ban->banstr);
+			}
+		}
+		for (ban = channel->invexlist; ban; ban=nextban)
+		{
+			nextban = ban->next;
+			if (!strncmp(ban->banstr, "~t:", 3) && timedban_has_ban_expired(ban))
+			{
+				add_send_mode_param(channel, &me, '-',  'I', ban->banstr);
+				del_listmode(&channel->invexlist, channel, ban->banstr);
+			}
+		}
+		if (*pbuf)
+		{
+			MessageTag *mtags = NULL;
+			new_message(&me, NULL, &mtags);
+			sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s %s %s", me.name, channel->chname, mbuf, pbuf);
+			sendto_server(NULL, 0, 0, mtags, ":%s MODE %s %s %s 0", me.id, channel->chname, mbuf, pbuf);
+			free_message_tags(mtags);
+			*pbuf = 0;
+		}
+	}
+}
+
+#if MODEBUFLEN > 512
+ #error "add_send_mode_param() is not made for MODEBUFLEN > 512"
+#endif
+
+void add_send_mode_param(Channel *channel, Client *from, char what, char mode, char *param) {
+	static char *modes = NULL, lastwhat;
+	static short count = 0;
+	short send = 0;
+	
+	if (!modes) modes = mbuf;
+	
+	if (!mbuf[0]) {
+		modes = mbuf;
+		*modes++ = what;
+		*modes = 0;
+		lastwhat = what;
+		*pbuf = 0;
+		count = 0;
+	}
+	if (lastwhat != what) {
+		*modes++ = what;
+		*modes = 0;
+		lastwhat = what;
+	}
+	if (strlen(pbuf) + strlen(param) + 11 < MODEBUFLEN) {
+		if (*pbuf) 
+			strcat(pbuf, " ");
+		strcat(pbuf, param);
+		*modes++ = mode;
+		*modes = 0;
+		count++;
+	}
+	else if (*pbuf) 
+		send = 1;
+
+	if (count == MAXMODEPARAMS)
+		send = 1;
+
+	if (send)
+	{
+		MessageTag *mtags = NULL;
+
+		new_message(&me, NULL, &mtags);
+		sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, mtags, ":%s MODE %s %s %s", me.name, channel->chname, mbuf, pbuf);
+		sendto_server(NULL, 0, 0, mtags, ":%s MODE %s %s %s 0", me.id, channel->chname, mbuf, pbuf);
+		free_message_tags(mtags);
+		send = 0;
+		*pbuf = 0;
+		modes = mbuf;
+		*modes++ = what;
+		lastwhat = what;
+		if (count != MAXMODEPARAMS)
+		{
+			strlcpy(pbuf, param, sizeof(pbuf));
+			*modes++ = mode;
+			count = 1;
+		} else {
+			count = 0;
+		}
+		*modes = 0;
+	}
+}
diff --git a/src/modules/globops.c b/src/modules/globops.c
new file mode 100644
index 0000000..8afcb1f
--- /dev/null
+++ b/src/modules/globops.c
@@ -0,0 +1,87 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_globops);
+
+#define MSG_GLOBOPS 	"GLOBOPS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"globops",
+	"5.0",
+	"command /globops", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_GLOBOPS, cmd_globops, 1, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Write message to IRCOps.
+ * parv[1] = message text
+ */
+CMD_FUNC(cmd_globops)
+{
+	char *message;
+
+	message = parc > 1 ? parv[1] : NULL;
+
+	if (BadPtr(message))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "GLOBOPS");
+		return;
+	}
+
+	if (MyUser(client) && !ValidatePermissionsForPath("chat:globops",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (MyUser(client))
+	{
+		/* Easy */
+		sendto_umode_global(UMODE_OPER, "from %s: %s", client->name, message);
+	} else
+	{
+		/* Backward-compatible (3.2.x) */
+		sendto_umode(UMODE_OPER, "from %s: %s", client->name, message);
+		sendto_server(client, 0, 0, NULL, ":%s SENDUMODE o :from %s: %s",
+		    me.id, client->name, message);
+	}
+}
diff --git a/src/modules/help.c b/src/modules/help.c
new file mode 100644
index 0000000..65f2976
--- /dev/null
+++ b/src/modules/help.c
@@ -0,0 +1,145 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_help);
+
+#define MSG_HELP 	"HELP"	
+#define MSG_HELPOP	"HELPOP"
+
+ModuleHeader MOD_HEADER
+  = {
+	"help",
+	"5.0",
+	"command /help", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_HELP, cmd_help, 1, CMD_USER);
+	CommandAdd(modinfo->handle, MSG_HELPOP, cmd_help, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+#define HDR(str) sendto_one(client, NULL, ":%s 290 %s :%s", me.name, client->name, str);
+#define SND(str) sendto_one(client, NULL, ":%s 292 %s :%s", me.name, client->name, str);
+
+ConfigItem_help *find_Help(char *command)
+{
+	ConfigItem_help *help;
+
+	if (!command)
+	{
+		for (help = conf_help; help; help = help->next)
+		{
+			if (help->command == NULL)
+				return help;
+		}
+		return NULL;
+	}
+	for (help = conf_help; help; help = help->next)
+	{
+		if (help->command == NULL)
+			continue;
+		else if (!strcasecmp(command,help->command))
+			return help;
+	}
+	return NULL;
+}
+
+void parse_help(Client *client, char *name, char *help)
+{
+	ConfigItem_help *helpitem;
+	MOTDLine *text;
+	if (BadPtr(help))
+	{
+		helpitem = find_Help(NULL);
+		if (!helpitem)
+			return;
+		SND(" -");
+		HDR("        ***** UnrealIRCd Help System *****");
+		SND(" -");
+		text = helpitem->text;
+		while (text) {
+			SND(text->line);
+			text = text->next;
+		}
+		SND(" -");
+		return;
+		
+	}
+	helpitem = find_Help(help);
+	if (!helpitem) {
+		SND(" -");
+		HDR("        ***** No Help Available *****");
+		SND(" -");
+		SND("   We're sorry, we don't have help available for the command you requested.");
+		SND(" -");
+		sendto_one(client, NULL, ":%s 292 %s : ***** Go to %s if you have any further questions *****",
+		    me.name, client->name, helpchan);
+		SND(" -");
+		return;
+	}
+	text = helpitem->text;
+	SND(" -");
+	sendto_one(client, NULL, ":%s 290 %s :***** %s *****",
+	    me.name, client->name, helpitem->command);
+	SND(" -");
+	while (text) {
+		SND(text->line);
+		text = text->next;
+	}
+	SND(" -");
+}
+
+/*
+** cmd_help (help/write to +h currently online) -Donwulff
+**	parv[1] = optional message text
+*/
+CMD_FUNC(cmd_help)
+{
+	char *helptopic;
+
+	if (!MyUser(client))
+		return; /* never remote */
+
+	helptopic = parc > 1 ? parv[1] : NULL;
+	
+	if (helptopic && (*helptopic == '?'))
+		helptopic++;
+
+	parse_help(client, client->name, BadPtr(helptopic) ? NULL : helptopic);
+}
diff --git a/src/modules/hideserver.c b/src/modules/hideserver.c
new file mode 100644
index 0000000..0170f06
--- /dev/null
+++ b/src/modules/hideserver.c
@@ -0,0 +1,395 @@
+/*
+ * hideserver.c - Hide certain or all servers from /MAP & /LINKS
+ *
+ * Note that this module simple hides servers. It does not truly
+ * increase security. Use as you wish.
+ *
+ * (C) Copyright 2003-2004 AngryWolf <angrywolf@flashmail.com>
+ * (C) Copyright 2016 Bram Matthys <syzop@vulnscan.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_OVERRIDE_FUNC(override_map);
+CMD_OVERRIDE_FUNC(override_links);
+static int cb_test(ConfigFile *, ConfigEntry *, int, int *);
+static int cb_conf(ConfigFile *, ConfigEntry *, int);
+
+ConfigItem_ulines *HiddenServers;
+
+static struct
+{
+	unsigned	disable_map : 1;
+	unsigned	disable_links : 1;
+	char		*map_deny_message;
+	char		*links_deny_message;
+} Settings;
+
+static ModuleInfo	*MyModInfo;
+#define MyMod		MyModInfo->handle
+#define SAVE_MODINFO	MyModInfo = modinfo;
+
+ModuleHeader MOD_HEADER
+  = {
+	"hideserver",
+	"5.0",
+	"Hide servers from /MAP & /LINKS",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+static void InitConf()
+{
+	memset(&Settings, 0, sizeof Settings);
+}
+
+static void FreeConf()
+{
+	ConfigItem_ulines	*h, *next;
+
+	safe_free(Settings.map_deny_message);
+	safe_free(Settings.links_deny_message);
+
+	for (h = HiddenServers; h; h = next)
+	{
+		next = h->next;
+		DelListItem(h, HiddenServers);
+		safe_free(h->servername);
+		safe_free(h);
+	}
+}
+
+MOD_TEST()
+{
+	SAVE_MODINFO
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, cb_test);
+
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	SAVE_MODINFO
+	HiddenServers = NULL;
+	InitConf();
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, cb_conf);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	if (!CommandOverrideAdd(MyMod, "MAP", override_map))
+		return MOD_FAILED;
+
+	if (!CommandOverrideAdd(MyMod, "LINKS", override_links))
+		return MOD_FAILED;
+
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	FreeConf();
+
+	return MOD_SUCCESS;
+}
+
+static int cb_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep;
+	int errors = 0;
+
+	if (type == CONFIG_MAIN)
+	{
+		if (!strcmp(ce->ce_varname, "hideserver"))
+		{
+			for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			{
+				if (!strcmp(cep->ce_varname, "hide"))
+				{
+					/* No checking needed */
+				}
+				else if (!cep->ce_vardata)
+				{
+					config_error("%s:%i: %s::%s without value",
+						cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum,
+						ce->ce_varname, cep->ce_varname);
+					errors++;
+					continue;
+				}
+				else if (!strcmp(cep->ce_varname, "disable-map"))
+					;
+				else if (!strcmp(cep->ce_varname, "disable-links"))
+					;
+				else if (!strcmp(cep->ce_varname, "map-deny-message"))
+					;
+				else if (!strcmp(cep->ce_varname, "links-deny-message"))
+					;
+				else
+				{
+					config_error("%s:%i: unknown directive hideserver::%s",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+					errors++;
+				}
+			}
+			*errs = errors;
+			return errors ? -1 : 1;
+		}
+	}
+
+	return 0;
+}
+
+static int cb_conf(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry		*cep, *cepp;
+	ConfigItem_ulines	*ca;
+
+	if (type == CONFIG_MAIN)
+	{
+		if (!strcmp(ce->ce_varname, "hideserver"))
+		{
+			for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			{
+				if (!strcmp(cep->ce_varname, "disable-map"))
+					Settings.disable_map = config_checkval(cep->ce_vardata, CFG_YESNO);
+				else if (!strcmp(cep->ce_varname, "disable-links"))
+					Settings.disable_links = config_checkval(cep->ce_vardata, CFG_YESNO);
+				else if (!strcmp(cep->ce_varname, "map-deny-message"))
+				{
+					safe_strdup(Settings.map_deny_message, cep->ce_vardata);
+				}
+				else if (!strcmp(cep->ce_varname, "links-deny-message"))
+				{
+					safe_strdup(Settings.links_deny_message, cep->ce_vardata);
+				}
+				else if (!strcmp(cep->ce_varname, "hide"))
+				{
+					for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					{
+						if (!strcasecmp(cepp->ce_varname, me.name))
+							continue;
+
+						ca = safe_alloc(sizeof(ConfigItem_ulines));
+						safe_strdup(ca->servername, cepp->ce_varname);
+						AddListItem(ca, HiddenServers);
+					}
+				}
+			}
+
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+ConfigItem_ulines *FindHiddenServer(char *servername)
+{
+	ConfigItem_ulines *h;
+
+	for (h = HiddenServers; h; h = h->next)
+		if (!strcasecmp(servername, h->servername))
+			break;
+
+	return h;
+}
+
+/*
+ * New /MAP format -Potvin
+ * dump_map function.
+ */
+static void dump_map(Client *client, Client *server, char *mask, int prompt_length, int length)
+{
+	static char prompt[64];
+	char *p = &prompt[prompt_length];
+	int  cnt = 0;
+	Client *acptr;
+
+	*p = '\0';
+
+	if (prompt_length > 60)
+		sendnumeric(client, RPL_MAPMORE, prompt, length, server->name);
+	else
+	{
+		sendnumeric(client, RPL_MAP, prompt,
+		            length, server->name, server->serv->users, IsOper(client) ? server->id : "");
+		cnt = 0;
+	}
+
+	if (prompt_length > 0)
+	{
+		p[-1] = ' ';
+		if (p[-2] == '`')
+			p[-2] = ' ';
+	}
+	if (prompt_length > 60)
+		return;
+
+	strcpy(p, "|-");
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if (acptr->srvptr != server ||
+ 		    (IsULine(acptr) && HIDE_ULINES && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL)))
+			continue;
+		if (FindHiddenServer(acptr->name))
+			break;
+		SetMap(acptr);
+		cnt++;
+	}
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if (IsULine(acptr) && HIDE_ULINES && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL))
+			continue;
+		if (FindHiddenServer(acptr->name))
+			break;
+		if (acptr->srvptr != server)
+			continue;
+		if (!IsMap(acptr))
+			continue;
+		if (--cnt == 0)
+			*p = '`';
+		dump_map(client, acptr, mask, prompt_length + 2, length - 2);
+	}
+
+	if (prompt_length > 0)
+		p[-1] = '-';
+}
+
+void dump_flat_map(Client *client, Client *server, int length)
+{
+	char buf[4];
+	Client *acptr;
+	int cnt = 0, hide_ulines;
+
+	hide_ulines = (HIDE_ULINES && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL)) ? 1 : 0;
+
+	sendnumeric(client, RPL_MAP, "", length, server->name, server->serv->users, "");
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if ((IsULine(acptr) && hide_ulines) || (acptr == server))
+			continue;
+		if (FindHiddenServer(acptr->name))
+			break;
+		cnt++;
+	}
+
+	strcpy(buf, "|-");
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if ((IsULine(acptr) && hide_ulines) || (acptr == server))
+			continue;
+		if (FindHiddenServer(acptr->name))
+			break;
+		if (--cnt == 0)
+			*buf = '`';
+		sendnumeric(client, RPL_MAP, buf, length-2, acptr->name, acptr->serv->users, "");
+	}
+}
+
+/*
+** New /MAP format. -Potvin
+** cmd_map (NEW)
+**
+**      parv[1] = server mask
+**/
+CMD_OVERRIDE_FUNC(override_map)
+{
+	Client *acptr;
+	int longest = strlen(me.name);
+
+	if (parc < 2)
+		parv[1] = "*";
+	
+	if (IsOper(client))
+	{
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
+
+	if (Settings.disable_map)
+	{
+		if (Settings.map_deny_message)
+			sendnotice(client, "%s", Settings.map_deny_message);
+		else
+			sendnumeric(client, RPL_MAPEND);
+		return;
+	}
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if (FindHiddenServer(acptr->name))
+			break;
+		if ((strlen(acptr->name) + acptr->hopcount * 2) > longest)
+			longest = strlen(acptr->name) + acptr->hopcount * 2;
+	}
+
+	if (longest > 60)
+		longest = 60;
+	longest += 2;
+
+	if (FLAT_MAP && !ValidatePermissionsForPath("server:info:map:real-map",client,NULL,NULL,NULL))
+		dump_flat_map(client, &me, longest);
+	else
+		dump_map(client, &me, "*", 0, longest);
+
+	sendnumeric(client, RPL_MAPEND);
+}
+
+CMD_OVERRIDE_FUNC(override_links)
+{
+	Client *acptr;
+	int flat = (FLAT_MAP && !IsOper(client)) ? 1 : 0;
+
+	if (IsOper(client))
+	{
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
+
+	if (Settings.disable_links)
+	{
+		if (Settings.links_deny_message)
+			sendnotice(client, "%s", Settings.links_deny_message);
+		else
+			sendnumeric(client, RPL_ENDOFLINKS, "*");
+	}
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		/* Some checks */
+		if (HIDE_ULINES && IsULine(acptr) && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL))
+			continue;
+		if (FindHiddenServer(acptr->name))
+			continue;
+		if (flat)
+			sendnumeric(client, RPL_LINKS, acptr->name, me.name,
+			    1, (acptr->info[0] ? acptr->info : "(Unknown Location)"));
+		else
+			sendnumeric(client, RPL_LINKS, acptr->name, acptr->serv->up,
+			    acptr->hopcount, (acptr->info[0] ? acptr->info : "(Unknown Location)"));
+	}
+
+	sendnumeric(client, RPL_ENDOFLINKS, "*");
+}
diff --git a/src/modules/history.c b/src/modules/history.c
new file mode 100644
index 0000000..4cf39b3
--- /dev/null
+++ b/src/modules/history.c
@@ -0,0 +1,125 @@
+/* src/modules/history.c - (C) 2020 Bram Matthys (Syzop) & The UnrealIRCd Team
+ *
+ * Simple HISTORY command to fetch channel history.
+ * This is one of the interfaces to the channel history backend.
+ * The other, most prominent, being history-on-join at the moment.
+ * In the future there will likely be an IRCv3 standard which
+ * will allow clients to fetch history automatically, which will
+ * be implemented under a different command and not really meant
+ * for end users. However, it will take a while until such a spec is
+ * finalized, let alone when major clients will finally support it.
+ *
+ * See doc/Authors and git history for additional names of the programmers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"history",
+	"5.0",
+	"Simple history command for end-users",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+#define HISTORY_LINES_DEFAULT 100
+#define HISTORY_LINES_MAX 100
+
+CMD_FUNC(cmd_history);
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	CommandAdd(modinfo->handle, "HISTORY", cmd_history, MAXPARA, CMD_USER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void history_usage(Client *client)
+{
+	sendnotice(client, " Use: /HISTORY #channel [lines-to-display]");
+	sendnotice(client, "  Ex: /HISTORY #lobby");
+	sendnotice(client, "  Ex: /HISTORY #lobby 50");
+	sendnotice(client, "The lines-to-display value must be 1-%d, the default is %d",
+		HISTORY_LINES_MAX, HISTORY_LINES_DEFAULT);
+	sendnotice(client, "Naturally, the line count and time limits in channel mode +H are obeyed");
+}
+
+CMD_FUNC(cmd_history)
+{
+	HistoryFilter filter;
+	Channel *channel;
+	int lines = HISTORY_LINES_DEFAULT;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		history_usage(client);
+		return;
+	}
+
+	channel = find_channel(parv[1], NULL);
+	if (!channel)
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, parv[1]);
+		return;
+	}
+
+	if (!IsMember(client, channel))
+	{
+		sendnumeric(client, ERR_NOTONCHANNEL, channel->chname);
+		return;
+	}
+
+	if (!has_channel_mode(channel, 'H'))
+	{
+		sendnotice(client, "Channel %s does not have channel mode +H set", channel->chname);
+		return;
+	}
+
+	if (parv[2])
+	{
+		lines = atoi(parv[2]);
+		if (lines < 1)
+		{
+			history_usage(client);
+			return;
+		}
+		if (lines > HISTORY_LINES_MAX)
+			lines = HISTORY_LINES_MAX;
+	}
+
+	if (!HasCapability(client, "server-time"))
+	{
+		sendnotice(client, "Your IRC client does not support the 'server-time' capability");
+		sendnotice(client, "https://ircv3.net/specs/extensions/server-time-3.2.html");
+		sendnotice(client, "History request refused.");
+		return;
+	}
+
+	filter.last_lines = lines;
+	history_request(client, channel->chname, &filter);
+}
diff --git a/src/modules/history_backend_mem.c b/src/modules/history_backend_mem.c
new file mode 100644
index 0000000..f2844f4
--- /dev/null
+++ b/src/modules/history_backend_mem.c
@@ -0,0 +1,446 @@
+/* src/modules/history_backend_mem.c - History Backend: memory
+ * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team
+ * License: GPLv2
+ */
+#include "unrealircd.h"
+
+/* This is the memory type backend. It is optimized for speed.
+ * For example, per-channel, it caches the field "number of lines"
+ * and "oldest record", so frequent cleaning operations such as
+ * "delete any record older than time T" or "keep only N lines"
+ * are executed as fast as possible.
+ */
+
+ModuleHeader MOD_HEADER
+= {
+	"history_backend_mem",
+	"2.0",
+	"History backend: memory",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Defines */
+#define OBJECTLEN	((NICKLEN > CHANNELLEN) ? NICKLEN : CHANNELLEN)
+#define HISTORY_BACKEND_MEM_HASH_TABLE_SIZE 1019
+
+/* The regular history cleaning (by timer) is spread out
+ * a bit, rather than doing ALL channels every T time.
+ * HISTORY_SPREAD: how much to spread the "cleaning", eg 1 would be
+ *  to clean everything in 1 go, 2 would mean the first event would
+ *  clean half of the channels, and the 2nd event would clean the rest.
+ *  Obviously more = better to spread the load, but doing a reasonable
+ *  amount of work is also benefitial for performance (think: CPU cache).
+ * HISTORY_MAX_OFF_SECS: how many seconds may the history be 'off',
+ *  that is: how much may we store the history longer than required.
+ * The other 2 macros are calculated based on that target.
+ */
+#define HISTORY_SPREAD	16
+#define HISTORY_MAX_OFF_SECS	128
+#define HISTORY_CLEAN_PER_LOOP	(HISTORY_BACKEND_MEM_HASH_TABLE_SIZE/HISTORY_SPREAD)
+#define HISTORY_TIMER_EVERY	(HISTORY_MAX_OFF_SECS/HISTORY_SPREAD)
+
+/* Definitions (structs, etc.) */
+typedef struct HistoryLogLine HistoryLogLine;
+struct HistoryLogLine {
+	HistoryLogLine *prev, *next;
+	time_t t;
+	MessageTag *mtags;
+	char line[1];
+};
+
+typedef struct HistoryLogObject HistoryLogObject;
+struct HistoryLogObject {
+	HistoryLogObject *prev, *next;
+	HistoryLogLine *head; /**< Start of the log (the earliest entry) */
+	HistoryLogLine *tail; /**< End of the log (the latest entry) */
+	int num_lines; /**< Number of lines of log */
+	time_t oldest_t; /**< Oldest time in log */
+	int max_lines; /**< Maximum number of lines permitted */
+	long max_time; /**< Maximum number of seconds to retain history */
+	char name[OBJECTLEN+1];
+};
+
+/* Global variables */
+static char siphashkey_history_backend_mem[SIPHASH_KEY_LENGTH];
+HistoryLogObject *history_hash_table[HISTORY_BACKEND_MEM_HASH_TABLE_SIZE];
+
+/* Forward declarations */
+int hbm_history_add(char *object, MessageTag *mtags, char *line);
+int hbm_history_cleanup(HistoryLogObject *h);
+int hbm_history_request(Client *client, char *object, HistoryFilter *filter);
+int hbm_history_destroy(char *object);
+int hbm_history_set_limit(char *object, int max_lines, long max_time);
+EVENT(history_mem_clean);
+
+MOD_INIT()
+{
+	HistoryBackendInfo hbi;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1);
+
+	memset(&history_hash_table, 0, sizeof(history_hash_table));
+	siphash_generate_key(siphashkey_history_backend_mem);
+
+	memset(&hbi, 0, sizeof(hbi));
+	hbi.name = "mem";
+	hbi.history_add = hbm_history_add;
+	hbi.history_request = hbm_history_request;
+	hbi.history_destroy = hbm_history_destroy;
+	hbi.history_set_limit = hbm_history_set_limit;
+	if (!HistoryBackendAdd(modinfo->handle, &hbi))
+		return MOD_FAILED;
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(modinfo->handle, "history_mem_clean", history_mem_clean, NULL, HISTORY_TIMER_EVERY*1000, 0);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+uint64_t hbm_hash(char *object)
+{
+	return siphash_nocase(object, siphashkey_history_backend_mem) % HISTORY_BACKEND_MEM_HASH_TABLE_SIZE;
+}
+
+HistoryLogObject *hbm_find_object(char *object)
+{
+	int hashv = hbm_hash(object);
+	HistoryLogObject *h;
+
+	for (h = history_hash_table[hashv]; h; h = h->next)
+	{
+		if (!strcasecmp(object, h->name))
+			return h;
+	}
+	return NULL;
+}
+
+HistoryLogObject *hbm_find_or_add_object(char *object)
+{
+	int hashv = hbm_hash(object);
+	HistoryLogObject *h;
+
+	for (h = history_hash_table[hashv]; h; h = h->next)
+	{
+		if (!strcasecmp(object, h->name))
+			return h;
+	}
+	/* Create new one */
+	h = safe_alloc(sizeof(HistoryLogObject));
+	strlcpy(h->name, object, sizeof(h->name));
+	AddListItem(h, history_hash_table[hashv]);
+	return h;
+}
+
+void hbm_delete_object_hlo(HistoryLogObject *h)
+{
+	int hashv = hbm_hash(h->name);
+
+	DelListItem(h, history_hash_table[hashv]);
+	safe_free(h);
+}
+
+void hbm_duplicate_mtags(HistoryLogLine *l, MessageTag *m)
+{
+	MessageTag *n;
+
+	/* Duplicate all message tags */
+	for (; m; m = m->next)
+	{
+		n = duplicate_mtag(m);
+		AppendListItem(n, l->mtags);
+	}
+	n = find_mtag(l->mtags, "time");
+	if (!n)
+	{
+		/* This is duplicate code from src/modules/server-time.c
+		 * which seems silly.
+		 */
+		struct timeval t;
+		struct tm *tm;
+		time_t sec;
+		char buf[64];
+
+		gettimeofday(&t, NULL);
+		sec = t.tv_sec;
+		tm = gmtime(&sec);
+		snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
+			tm->tm_year + 1900,
+			tm->tm_mon + 1,
+			tm->tm_mday,
+			tm->tm_hour,
+			tm->tm_min,
+			tm->tm_sec,
+			(int)(t.tv_usec / 1000));
+
+		n = safe_alloc(sizeof(MessageTag));
+		safe_strdup(n->name, "time");
+		safe_strdup(n->value, buf);
+		AddListItem(n, l->mtags);
+	}
+	/* Now convert the "time" message tag to something we can use in l->t */
+	l->t = server_time_to_unix_time(n->value);
+}
+
+/** Add a line to a history object */
+void hbm_history_add_line(HistoryLogObject *h, MessageTag *mtags, char *line)
+{
+	HistoryLogLine *l = safe_alloc(sizeof(HistoryLogLine) + strlen(line));
+	strcpy(l->line, line); /* safe, see memory allocation above ^ */
+	hbm_duplicate_mtags(l, mtags);
+	if (h->tail)
+	{
+		/* append to tail */
+		h->tail->next = l;
+		l->prev = h->tail;
+		h->tail = l;
+	} else {
+		/* no tail, no head */
+		h->head = h->tail = l;
+	}
+	h->num_lines++;
+	if ((l->t < h->oldest_t) || (h->oldest_t == 0))
+		h->oldest_t = l->t;
+}
+
+/** Delete a line from a history object */
+void hbm_history_del_line(HistoryLogObject *h, HistoryLogLine *l)
+{
+	if (l->prev)
+		l->prev->next = l->next;
+	if (l->next)
+		l->next->prev = l->prev;
+	if (h->head == l)
+	{
+		/* New head */
+		h->head = l->next;
+	}
+	if (h->tail == l)
+	{
+		/* New tail */
+		h->tail = l->prev; /* could be NULL now */
+	}
+
+	free_message_tags(l->mtags);
+	safe_free(l);
+
+	h->num_lines--;
+
+	/* IMPORTANT: updating h->oldest_t takes place at the caller
+	 * because it is in a better position to optimize the process
+	 */
+}
+
+/** Add history entry */
+int hbm_history_add(char *object, MessageTag *mtags, char *line)
+{
+	HistoryLogObject *h = hbm_find_or_add_object(object);
+	if (!h->max_lines)
+	{
+		sendto_realops("hbm_history_add() for '%s', which has no limit", h->name);
+#ifdef DEBUGMODE
+		abort();
+#else
+		h->max_lines = 50;
+		h->max_time = 86400;
+#endif
+	}
+	if (h->num_lines >= h->max_lines)
+	{
+		/* Delete previous line */
+		hbm_history_del_line(h, h->head);
+	}
+	hbm_history_add_line(h, mtags, line);
+	return 0;
+}
+
+int can_receive_history(Client *client)
+{
+	if (HasCapability(client, "server-time"))
+		return 1;
+	return 0;
+}
+
+void hbm_send_line(Client *client, HistoryLogLine *l, char *batchid)
+{
+	if (can_receive_history(client))
+	{
+		if (BadPtr(batchid))
+		{
+			sendto_one(client, l->mtags, "%s", l->line);
+		} else {
+			MessageTag *m = safe_alloc(sizeof(MessageTag));
+			m->name = "batch";
+			m->value = batchid;
+			AddListItem(m, l->mtags);
+			sendto_one(client, l->mtags, "%s", l->line);
+			DelListItem(m, l->mtags);
+			safe_free(m);
+		}
+	} else {
+		/* without server-time, log playback is a bit annoying, so skip it? */
+	}
+}
+
+int hbm_history_request(Client *client, char *object, HistoryFilter *filter)
+{
+	HistoryLogObject *h = hbm_find_object(object);
+	HistoryLogLine *l;
+	char batch[BATCHLEN+1];
+	long redline; /* Imaginary timestamp. Before the red line, history is too old. */
+	int lines_sendable = 0, lines_to_skip = 0, cnt = 0;
+
+	if (!h || !can_receive_history(client))
+		return 0;
+
+	batch[0] = '\0';
+
+	if (HasCapability(client, "batch"))
+	{
+		/* Start a new batch */
+		generate_batch_id(batch);
+		sendto_one(client, NULL, ":%s BATCH +%s chathistory %s", me.name, batch, object);
+	}
+
+	redline = TStime() - h->max_time;
+
+	/* Once the filter API expands, the following will change too.
+	 * For now, this is sufficient, since requests are only about lines:
+	 */
+	lines_sendable = 0;
+	for (l = h->head; l; l = l->next)
+		if (l->t >= redline)
+			lines_sendable++;
+	if (filter && (lines_sendable > filter->last_lines))
+		lines_to_skip = lines_sendable - filter->last_lines;
+
+	for (l = h->head; l; l = l->next)
+	{
+		/* Make sure we don't send too old entries:
+		 * We only have to check for time here, as line count is already
+		 * taken into account in hbm_history_add.
+		 */
+		if (l->t >= redline && (++cnt > lines_to_skip))
+			hbm_send_line(client, l, batch);
+	}
+
+	/* End of batch */
+	if (*batch)
+		sendto_one(client, NULL, ":%s BATCH -%s", me.name, batch);
+	return 1;
+}
+
+/** Clean up expired entries */
+int hbm_history_cleanup(HistoryLogObject *h)
+{
+	HistoryLogLine *l, *l_next = NULL;
+	long redline = TStime() - h->max_time;
+
+	/* First enforce 'h->max_time', after that enforce 'h->max_lines' */
+
+	/* Checking for time */
+	if (h->oldest_t < redline)
+	{
+		h->oldest_t = 0; /* recalculate in next loop */
+
+		for (l = h->head; l; l = l_next)
+		{
+			l_next = l->next;
+			if (l->t < redline)
+			{
+				hbm_history_del_line(h, l); /* too old, delete it */
+				continue;
+			}
+			if ((h->oldest_t == 0) || (l->t < h->oldest_t))
+				h->oldest_t = l->t;
+		}
+	}
+
+	if (h->num_lines > h->max_lines)
+	{
+		h->oldest_t = 0; /* recalculate in next loop */
+
+		for (l = h->head; l; l = l_next)
+		{
+			l_next = l->next;
+			if (h->num_lines > h->max_lines)
+			{
+				hbm_history_del_line(h, l);
+				continue;
+			}
+			if ((h->oldest_t == 0) || (l->t < h->oldest_t))
+				h->oldest_t = l->t;
+		}
+	}
+
+	return 1;
+}
+
+int hbm_history_destroy(char *object)
+{
+	HistoryLogObject *h = hbm_find_object(object);
+	HistoryLogLine *l, *l_next;
+
+	if (!h)
+		return 0;
+
+	for (l = h->head; l; l = l_next)
+	{
+		l_next = l->next;
+		/* We could use hbm_history_del_line() here but
+		 * it does unnecessary work, this is quicker.
+		 * The only danger is that we may forget to free some
+		 * fields that are added later there but not here.
+		 */
+		free_message_tags(l->mtags);
+		safe_free(l);
+	}
+
+	hbm_delete_object_hlo(h);
+	return 1;
+}
+
+/** Set new limit on history object */
+int hbm_history_set_limit(char *object, int max_lines, long max_time)
+{
+	HistoryLogObject *h = hbm_find_or_add_object(object);
+	h->max_lines = max_lines;
+	h->max_time = max_time;
+	hbm_history_cleanup(h); /* impose new restrictions */
+	return 1;
+}
+
+/** Periodically clean the history.
+ * Instead of doing all channels in 1 go, we do a limited number
+ * of channels each call, hence the 'static int' and the do { } while
+ * rather than a regular for loop.
+ * Note that we already impose the line limit in hbm_history_add,
+ * so this history_mem_clean is for removals due to max_time limits.
+ */
+EVENT(history_mem_clean)
+{
+	static int hashnum = 0;
+	int loopcnt = 0;
+	Channel *channel;
+	HistoryLogObject *h;
+
+	do
+	{
+		for (h = history_hash_table[hashnum++]; h; h = h->next)
+			hbm_history_cleanup(h);
+
+		hashnum++;
+
+		if (hashnum >= HISTORY_BACKEND_MEM_HASH_TABLE_SIZE)
+			hashnum = 0;
+	} while(loopcnt++ < HISTORY_CLEAN_PER_LOOP);
+}
diff --git a/src/modules/history_backend_null.c b/src/modules/history_backend_null.c
new file mode 100644
index 0000000..3f62371
--- /dev/null
+++ b/src/modules/history_backend_null.c
@@ -0,0 +1,75 @@
+/* src/modules/history_backend_null.c - History Backend: null / none
+ * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team
+ * License: GPLv2
+ */
+#include "unrealircd.h"
+
+/* This is the null backend type. It does not store anything at all.
+ * This can be useful on a hub server where you don't need channel
+ * history but still need to have a backend loaded to use the
+ * channel mode +H.
+ */
+
+ModuleHeader MOD_HEADER
+= {
+	"history_backend_null",
+	"2.0",
+	"History backend: null/none",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int hbn_history_set_limit(char *object, int max_lines, long max_time);
+int hbn_history_add(char *object, MessageTag *mtags, char *line);
+int hbn_history_request(Client *client, char *object, HistoryFilter *filter);
+int hbn_history_destroy(char *object);
+
+MOD_INIT()
+{
+	HistoryBackendInfo hbi;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1);
+
+	memset(&hbi, 0, sizeof(hbi));
+	hbi.name = "mem";
+	hbi.history_set_limit = hbn_history_set_limit;
+	hbi.history_add = hbn_history_add;
+	hbi.history_request = hbn_history_request;
+	hbi.history_destroy = hbn_history_destroy;
+	if (!HistoryBackendAdd(modinfo->handle, &hbi))
+		return MOD_FAILED;
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int hbn_history_add(char *object, MessageTag *mtags, char *line)
+{
+	return 1;
+}
+
+int hbn_history_request(Client *client, char *object, HistoryFilter *filter)
+{
+	return 0;
+}
+
+int hbn_history_set_limit(char *object, int max_lines, long max_time)
+{
+	return 1;
+}
+
+int hbn_history_destroy(char *object)
+{
+	return 1;
+}
diff --git a/src/modules/ident_lookup.c b/src/modules/ident_lookup.c
new file mode 100644
index 0000000..dd6712d
--- /dev/null
+++ b/src/modules/ident_lookup.c
@@ -0,0 +1,254 @@
+/* src/modules/ident_lookup.c - Ident lookups (RFC1413)
+ * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team
+ * License: GPLv2
+ */
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"ident_lookup",
+	"1.0",
+	"Ident lookups (RFC1413)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+static EVENT(check_ident_timeout);
+static int ident_lookup_connect(Client *client);
+static void ident_lookup_send(int fd, int revents, void *data);
+static void ident_lookup_receive(int fd, int revents, void *data);
+static char *ident_lookup_parse(Client *client, char *buf);
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1); /* needed? or not? */
+	EventAdd(NULL, "check_ident_timeout", check_ident_timeout, NULL, 1000, 0);
+	HookAdd(modinfo->handle, HOOKTYPE_IDENT_LOOKUP, 0, ident_lookup_connect);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+static void ident_lookup_failed(Client *client)
+{
+	Debug((DEBUG_NOTICE, "ident_lookup_failed() for %p", client));
+	ircstats.is_abad++;
+	if (client->local->authfd != -1)
+	{
+		fd_close(client->local->authfd);
+		--OpenFiles;
+		client->local->authfd = -1;
+	}
+	ClearIdentLookupSent(client);
+	ClearIdentLookup(client);
+	if (should_show_connect_info(client))
+		sendto_one(client, NULL, ":%s %s", me.name, REPORT_FAIL_ID);
+}
+
+static EVENT(check_ident_timeout)
+{
+	Client *client, *next;
+
+	list_for_each_entry_safe(client, next, &unknown_list, lclient_node)
+	{
+		if (IsIdentLookup(client) && ((TStime() - client->local->firsttime) > IDENT_CONNECT_TIMEOUT))
+			ident_lookup_failed(client);
+	}
+}
+
+/** Start the ident lookup for this user */
+static int ident_lookup_connect(Client *client)
+{
+	char buf[BUFSIZE];
+
+	snprintf(buf, sizeof buf, "identd: %s", get_client_name(client, TRUE));
+	if ((client->local->authfd = fd_socket(IsIPV6(client) ? AF_INET6 : AF_INET, SOCK_STREAM, 0, buf)) == -1)
+	{
+		ident_lookup_failed(client);
+		return 0;
+	}
+	if (++OpenFiles >= maxclients+1)
+	{
+		sendto_ops("Can't allocate fd, too many connections.");
+		fd_close(client->local->authfd);
+		--OpenFiles;
+		client->local->authfd = -1;
+		return 0;
+	}
+
+	if (should_show_connect_info(client))
+		sendto_one(client, NULL, ":%s %s", me.name, REPORT_DO_ID);
+
+	set_sock_opts(client->local->authfd, client, IsIPV6(client));
+
+	/* Bind to the IP the user got in */
+	unreal_bind(client->local->authfd, client->local->listener->ip, 0, IsIPV6(client));
+
+	/* And connect... */
+	if (!unreal_connect(client->local->authfd, client->ip, 113, IsIPV6(client)))
+	{
+		ident_lookup_failed(client);
+		return 0;
+	}
+	SetIdentLookupSent(client);
+	SetIdentLookup(client);
+
+	fd_setselect(client->local->authfd, FD_SELECT_WRITE, ident_lookup_send, client);
+
+	return 0;
+}
+
+/** Send the request to the ident server */
+static void ident_lookup_send(int fd, int revents, void *data)
+{
+	char authbuf[32];
+	Client *client = data;
+
+	ircsnprintf(authbuf, sizeof(authbuf), "%d , %d\r\n",
+		client->local->port,
+		client->local->listener->port);
+
+	if (WRITE_SOCK(client->local->authfd, authbuf, strlen(authbuf)) != strlen(authbuf))
+	{
+		if (ERRNO == P_EAGAIN)
+			return; /* Not connected yet, try again later */
+		ident_lookup_failed(client);
+		return;
+	}
+	ClearIdentLookupSent(client);
+
+	fd_setselect(client->local->authfd, FD_SELECT_READ, ident_lookup_receive, client);
+	fd_setselect(client->local->authfd, FD_SELECT_WRITE, NULL, client);
+
+	return;
+}
+
+/** Receive the ident response */
+static void ident_lookup_receive(int fd, int revents, void *userdata)
+{
+	Client *client = userdata;
+	char *ident = NULL;
+	char buf[512];
+	int len;
+
+	len = READ_SOCK(client->local->authfd, buf, sizeof(buf)-1);
+
+	/* We received a response. We don't bother with fragmentation
+	 * since that is not going to happen for such a short string.
+	 * Other IRCd's think the same and this simplifies things a lot.
+	 */
+
+	/* Before we continue, we can already tear down the connection
+	 * and set the appropriate flags that we are finished.
+	 */
+	fd_close(client->local->authfd);
+	--OpenFiles;
+	client->local->authfd = -1;
+	client->local->identbufcnt = 0;
+	ClearIdentLookup(client);
+
+	if (should_show_connect_info(client))
+		sendto_one(client, NULL, ":%s %s", me.name, REPORT_FIN_ID);
+
+	if (len > 0)
+	{
+		buf[len] = '\0'; /* safe, due to the READ_SOCK() being on sizeof(buf)-1 */
+		ident = ident_lookup_parse(client, buf);
+	}
+	if (ident)
+	{
+		strlcpy(client->ident, ident, USERLEN + 1);
+		SetIdentSuccess(client);
+		ircstats.is_asuc++;
+	} else {
+		ircstats.is_abad++;
+	}
+	return;
+}
+
+void skip_whitespace(char **p)
+{
+	for (; **p == ' ' || **p == '\t'; *p = *p + 1);
+}
+
+void read_until(char **p, char *stopchars)
+{
+	for (; **p && !strchr(stopchars, **p); *p = *p + 1);
+}
+
+static char *ident_lookup_parse(Client *client, char *buf)
+{
+	/* <port> , <port> : USERID : <OSTYPE>: <username>
+	 * Actually the only thing we care about is <username>
+	 */
+	int port1 = 0, port2 = 0;
+	char *ostype = NULL;
+	char *username = NULL;
+	char *p, *p2;
+
+	skip_whitespace(&buf);
+	p = strchr(buf, ',');
+	if (!p)
+		return NULL;
+	*p = '\0';
+	port1 = atoi(buf); /* port1 is set */
+
+	/*  <port> : USERID : <OSTYPE>: <username> */
+	buf = p + 1;
+	p = strchr(buf, ':');
+	if (!p)
+		return NULL;
+	*p = '\0';
+	port2 = atoi(buf); /* port2 is set */
+
+	/*  USERID : <OSTYPE>: <username> */
+	buf = p + 1;
+	skip_whitespace(&buf);
+	if (strncmp(buf, "USERID", 6))
+		return NULL;
+	buf += 6; /* skip over strlen("USERID") */
+	skip_whitespace(&buf);
+	if (*buf != ':')
+		return NULL;
+	buf++;
+	skip_whitespace(&buf);
+
+	/*  <OSTYPE>: <username> */
+	p = strchr(buf, ':');
+	if (!p)
+		return NULL;
+
+	/*  <username> */
+	buf = p+1;
+	skip_whitespace(&buf);
+
+	/* Username */
+	// A) Skip any ~ or ^ at the start
+	for (; *buf; buf++)
+		if (!strchr("~^", *buf) && (*buf > 32))
+			break;
+	// B) Stop at the end, IOTW stop at newline, space, etc.
+	for (p=buf; *p; p++)
+	{
+		if (strchr("\n\r@:", *p) || (*p <= 32))
+		{
+			*p = '\0';
+			break;
+		}
+	}
+	if (*buf == '\0')
+		return NULL;
+	return buf;
+}
diff --git a/src/modules/invite.c b/src/modules/invite.c
new file mode 100644
index 0000000..93fd7e7
--- /dev/null
+++ b/src/modules/invite.c
@@ -0,0 +1,302 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/invite.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_invite);
+
+#define MSG_INVITE 	"INVITE"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"invite",
+	"5.0",
+	"command /invite", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_INVITE, cmd_invite, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Send the user their list of active invites */
+void send_invite_list(Client *client)
+{
+	Link *inv;
+
+	for (inv = client->user->invited; inv; inv = inv->next)
+	{
+		sendnumeric(client, RPL_INVITELIST,
+			   inv->value.channel->chname);	
+	}
+	sendnumeric(client, RPL_ENDOFINVITELIST);
+}
+
+/*
+** cmd_invite
+**	parv[1] - user to invite
+**	parv[2] - channel number
+*/
+CMD_FUNC(cmd_invite)
+{
+	Client *target;
+	Channel *channel;
+	int override = 0;
+	int i = 0;
+	Hook *h;
+
+	if (parc == 1)
+	{
+		send_invite_list(client);
+		return;
+	}
+	
+	if (parc < 3 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "INVITE");
+		return;
+	}
+
+	if (!(target = find_person(parv[1], NULL)))
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+		return;
+	}
+
+	if (MyConnect(client) && !valid_channelname(parv[2]))
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, parv[2]);
+		return;
+	}
+
+	if (!(channel = find_channel(parv[2], NULL)))
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, parv[2]);
+		return;
+	}
+
+	for (h = Hooks[HOOKTYPE_PRE_INVITE]; h; h = h->next)
+	{
+		i = (*(h->func.intfunc))(client,target,channel,&override);
+		if (i == HOOK_DENY)
+			return;
+		if (i == HOOK_ALLOW)
+			break;
+	}
+
+	if (!IsMember(client, channel) && !IsULine(client))
+	{
+		if (ValidatePermissionsForPath("channel:override:invite:notinchannel",client,NULL,channel,NULL) && client == target)
+		{
+			override = 1;
+		} else {
+			sendnumeric(client, ERR_NOTONCHANNEL, parv[2]);
+			return;
+		}
+	}
+
+	if (IsMember(target, channel))
+	{
+		sendnumeric(client, ERR_USERONCHANNEL, parv[1], parv[2]);
+		return;
+	}
+
+	if (channel->mode.mode & MODE_INVITEONLY)
+	{
+		if (!is_chan_op(client, channel) && !IsULine(client))
+		{
+			if (ValidatePermissionsForPath("channel:override:invite:invite-only",client,NULL,channel,NULL) && client == target)
+			{
+				override = 1;
+			} else {
+				sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+				return;
+			}
+		}
+		else if (!IsMember(client, channel) && !IsULine(client))
+		{
+			if (ValidatePermissionsForPath("channel:override:invite:invite-only",client,NULL,channel,NULL) && client == target)
+			{
+				override = 1;
+			} else {
+				sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+				return;
+			}
+		}
+	}
+
+	if (SPAMFILTER_VIRUSCHANDENY && SPAMFILTER_VIRUSCHAN &&
+	    !strcasecmp(channel->chname, SPAMFILTER_VIRUSCHAN) &&
+	    !is_chan_op(client, channel) && !ValidatePermissionsForPath("immune:server-ban:viruschan",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+		return;
+	}
+
+	if (MyConnect(client))
+	{
+		if (target_limit_exceeded(client, target, target->name))
+			return;
+
+		if (!ValidatePermissionsForPath("immune:invite-flood",client,NULL,NULL,NULL))
+		{
+			if ((client->user->flood.invite_t + INVITE_PERIOD) <= timeofday)
+			{
+				client->user->flood.invite_c = 0;
+				client->user->flood.invite_t = timeofday;
+			}
+			if (client->user->flood.invite_c <= INVITE_COUNT)
+				client->user->flood.invite_c++;
+			if (client->user->flood.invite_c > INVITE_COUNT)
+			{
+				sendnumeric(client, RPL_TRYAGAIN, "INVITE");
+				return;
+			}
+		}
+
+		if (!override)
+		{
+			sendnumeric(client, RPL_INVITING, target->name, channel->chname);
+			if (target->user->away)
+			{
+				sendnumeric(client, RPL_AWAY, target->name, target->user->away);
+			}
+		}
+	}
+
+	/* Send OperOverride messages */
+	if (override && MyConnect(target))
+	{
+		if (is_banned(client, channel, BANCHK_JOIN, NULL, NULL))
+		{
+			sendto_snomask_global(SNO_EYES,
+			  "*** OperOverride -- %s (%s@%s) invited him/herself into %s (overriding +b).",
+			  client->name, client->user->username, client->user->realhost, channel->chname);
+
+			/* Logging implementation added by XeRXeS */
+			ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) invited him/herself into %s (Overriding Ban).",
+				client->name, client->user->username, client->user->realhost, channel->chname);
+
+		}
+		else if (channel->mode.mode & MODE_INVITEONLY)
+		{
+			sendto_snomask_global(SNO_EYES,
+			  "*** OperOverride -- %s (%s@%s) invited him/herself into %s (overriding +i).",
+			  client->name, client->user->username, client->user->realhost, channel->chname);
+
+			/* Logging implementation added by XeRXeS */
+			ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) invited him/herself into %s (Overriding Invite Only)",
+				client->name, client->user->username, client->user->realhost, channel->chname);
+
+		}
+		else if (channel->mode.limit)
+		{
+			sendto_snomask_global(SNO_EYES,
+			  "*** OperOverride -- %s (%s@%s) invited him/herself into %s (overriding +l).",
+			  client->name, client->user->username, client->user->realhost, channel->chname);
+
+			/* Logging implementation added by XeRXeS */
+			ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) invited him/herself into %s (Overriding Limit)",
+				client->name, client->user->username, client->user->realhost, channel->chname);
+
+		}
+
+		else if (*channel->mode.key)
+		{
+			sendto_snomask_global(SNO_EYES,
+			  "*** OperOverride -- %s (%s@%s) invited him/herself into %s (overriding +k).",
+			  client->name, client->user->username, client->user->realhost, channel->chname);
+
+			/* Logging implementation added by XeRXeS */
+			ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) invited him/herself into %s (Overriding Key)",
+				client->name, client->user->username, client->user->realhost, channel->chname);
+
+		}
+		else if (has_channel_mode(channel, 'z'))
+		{
+			sendto_snomask_global(SNO_EYES,
+			  "*** OperOverride -- %s (%s@%s) invited him/herself into %s (overriding +z).",
+			  client->name, client->user->username, client->user->realhost, channel->chname);
+
+			/* Logging implementation added by XeRXeS */
+			ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) invited him/herself into %s (Overriding SSL/TLS-Only)",
+				client->name, client->user->username, client->user->realhost, channel->chname);
+		}
+#ifdef OPEROVERRIDE_VERIFY
+		else if (channel->mode.mode & MODE_SECRET || channel->mode.mode & MODE_PRIVATE)
+		       override = -1;
+#endif
+		else
+			return;
+	}
+
+	if (MyConnect(target))
+	{
+		if (IsUser(client) 
+		    && (is_chan_op(client, channel)
+		    || IsULine(client)
+		    || ValidatePermissionsForPath("channel:override:invite:self",client,NULL,channel,NULL)
+		    ))
+		{
+			MessageTag *mtags = NULL;
+
+			new_message(&me, NULL, &mtags);
+			if (override == 1)
+			{
+				sendto_channel(channel, &me, NULL, PREFIX_OP|PREFIX_ADMIN|PREFIX_OWNER,
+				               0, SEND_ALL, mtags,
+				               ":%s NOTICE @%s :OperOverride -- %s invited him/herself into the channel.",
+				               me.name, channel->chname, client->name);
+			} else
+			if (override == 0)
+			{
+				sendto_channel(channel, &me, NULL, PREFIX_OP|PREFIX_ADMIN|PREFIX_OWNER,
+				               0, SEND_ALL, mtags,
+				               ":%s NOTICE @%s :%s invited %s into the channel.",
+				               me.name, channel->chname, client->name, target->name);
+			}
+			add_invite(client, target, channel, mtags);
+			free_message_tags(mtags);
+		}
+	}
+
+	/* Notify the person who got invited */
+	if (!is_silenced(client, target))
+	{
+		sendto_prefix_one(target, client, NULL, ":%s INVITE %s :%s", client->name,
+			target->name, channel->chname);
+	}
+}
diff --git a/src/modules/ircops.c b/src/modules/ircops.c
new file mode 100644
index 0000000..352208a
--- /dev/null
+++ b/src/modules/ircops.c
@@ -0,0 +1,141 @@
+/*
+ *   cmd_ircops - /IRCOPS command that lists IRC Operators
+ *   (C) Copyright 2004-2016 Syzop <syzop@vulnscan.org>
+ *   (C) Copyright 2003-2004 AngryWolf <angrywolf@flashmail.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MSG_IRCOPS        "IRCOPS"
+#define IsAway(x)         (x)->user->away
+
+CMD_FUNC(cmd_ircops);
+
+ModuleHeader MOD_HEADER
+  = {
+	"ircops",
+	"3.71",
+	"/IRCOPS command that lists IRC Operators",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	if (CommandExists(MSG_IRCOPS))
+	{
+		config_error("Command " MSG_IRCOPS " already exists");
+		return MOD_FAILED;
+	}
+	CommandAdd(modinfo->handle, MSG_IRCOPS, cmd_ircops, MAXPARA, CMD_USER);
+
+	if (ModuleGetError(modinfo->handle) != MODERR_NOERROR)
+	{
+		config_error("Error adding command " MSG_IRCOPS ": %s",
+			ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/*
+ * cmd_ircops
+ *
+ *     parv[0]: sender prefix
+ *
+ *     Originally comes from TR-IRCD, but I changed it in several places.
+ *     In addition, I didn't like to display network name. In addition,
+ *     instead of realname, servername is shown. See the original
+ *     header below.
+ */
+
+/************************************************************************
+ * IRC - Internet Relay Chat, modules/ircops.c
+ *
+ *   Copyright (C) 2000-2002 TR-IRCD Development
+ *
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Co Center
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+CMD_FUNC(cmd_ircops)
+{
+	Client *acptr;
+	char buf[512];
+	int opers = 0, total = 0, aways = 0;
+
+	list_for_each_entry(acptr, &client_list, client_node)
+	{
+		/* List only real IRC Operators */
+		if (IsULine(acptr) || !IsUser(acptr) || !IsOper(acptr))
+			continue;
+		/* Don't list +H users */
+		if (!IsOper(client) && IsHideOper(acptr))
+			continue;
+
+		sendto_one(client, NULL, ":%s %d %s :\2%s\2 is %s on %s" "%s",
+			me.name, RPL_TEXT, client->name,
+			acptr->name,
+			"an IRC Operator", /* find_otype(acptr->umodes), */
+			acptr->user->server,
+			(IsAway(acptr) ? " [Away]" : ""));
+
+		if (IsAway(acptr))
+			aways++;
+		else
+			opers++;
+
+	}
+
+	total = opers + aways;
+
+	snprintf(buf, sizeof(buf),
+		"Total: \2%d\2 IRCOP%s online - \2%d\2 Oper%s available and \2%d\2 Away",
+		total, (total) != 1 ? "s" : "",
+		opers, opers != 1 ? "s" : "",
+		aways);
+
+	sendnumericfmt(client, RPL_TEXT, ":%s", buf);
+	sendnumericfmt(client, RPL_TEXT, ":End of /IRCOPS list");
+}
diff --git a/src/modules/ison.c b/src/modules/ison.c
new file mode 100644
index 0000000..69ce42d
--- /dev/null
+++ b/src/modules/ison.c
@@ -0,0 +1,104 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/ison.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_ison);
+
+#define MSG_ISON 	"ISON"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"ison",
+	"5.0",
+	"command /ison", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_ISON, cmd_ison, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * cmd_ison added by Darren Reed 13/8/91 to act as an efficent user indicator
+ * with respect to cpu/bandwidth used. Implemented for NOTIFY feature in
+ * clients. Designed to reduce number of whois requests. Can process
+ * nicknames in batches as long as the maximum buffer length.
+ *
+ * format:
+ * ISON :nicklist
+ */
+
+static char buf[BUFSIZE];
+
+CMD_FUNC(cmd_ison)
+{
+	char namebuf[USERLEN + HOSTLEN + 4];
+	Client *acptr;
+	char *s, *user;
+	char *p = NULL;
+
+	if (!MyUser(client))
+		return;
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "ISON");
+		return;
+	}
+
+	ircsnprintf(buf, sizeof(buf), ":%s %d %s :", me.name, RPL_ISON, client->name);
+
+	for (s = strtoken(&p, parv[1], " "); s; s = strtoken(&p, NULL, " "))
+	{
+		if ((user = strchr(s, '!')))
+			*user++ = '\0';
+		if ((acptr = find_person(s, NULL)))
+		{
+			if (user)
+			{
+				ircsnprintf(namebuf, sizeof(namebuf), "%s@%s", acptr->user->username, GetHost(acptr));
+				if (!match_simple(user, namebuf)) continue;
+				*--user = '!';
+			}
+
+			strlcat(buf, s, sizeof(buf));
+			strlcat(buf, " ", sizeof(buf));
+		}
+	}
+
+	sendto_one(client, NULL, "%s", buf);
+}
diff --git a/src/modules/join.c b/src/modules/join.c
new file mode 100644
index 0000000..2ac292e
--- /dev/null
+++ b/src/modules/join.c
@@ -0,0 +1,811 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/join.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Forward declarations */
+CMD_FUNC(cmd_join);
+void _join_channel(Channel *channel, Client *client, MessageTag *mtags, int flags);
+void _do_join(Client *client, int parc, char *parv[]);
+int _can_join(Client *client, Channel *channel, char *key, char *parv[]);
+void _userhost_save_current(Client *client);
+void _userhost_changed(Client *client);
+void _send_join_to_local_users(Client *client, Channel *channel, MessageTag *mtags);
+
+/* Externs */
+extern MODVAR int spamf_ugly_vchanoverride;
+extern int find_invex(Channel *channel, Client *client);
+
+/* Local vars */
+static int bouncedtimes = 0;
+
+/* Macros */
+#define MAXBOUNCE   5 /** Most sensible */
+#define MSG_JOIN 	"JOIN"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"join",
+	"5.0",
+	"command /join", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddVoid(modinfo->handle, EFUNC_JOIN_CHANNEL, _join_channel);
+	EfunctionAddVoid(modinfo->handle, EFUNC_DO_JOIN, _do_join);
+	EfunctionAdd(modinfo->handle, EFUNC_CAN_JOIN, _can_join);
+	EfunctionAddVoid(modinfo->handle, EFUNC_USERHOST_SAVE_CURRENT, _userhost_save_current);
+	EfunctionAddVoid(modinfo->handle, EFUNC_USERHOST_CHANGED, _userhost_changed);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_JOIN_TO_LOCAL_USERS, _send_join_to_local_users);
+
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_JOIN, cmd_join, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* This function checks if a locally connected user may join the channel.
+ * It also provides an number of hooks where modules can plug in to.
+ * Note that the order of checking has been carefully thought of
+ * (eg: bans at the end), so don't change it unless you have a good reason
+ * to do so -- Syzop.
+ */
+int _can_join(Client *client, Channel *channel, char *key, char *parv[])
+{
+	Link *lp;
+	Ban *banned;
+	Hook *h;
+	int i=0, j=0;
+
+	for (h = Hooks[HOOKTYPE_CAN_JOIN]; h; h = h->next)
+	{
+		i = (*(h->func.intfunc))(client,channel,key,parv);
+		if (i != 0)
+			return i;
+	}
+
+	for (h = Hooks[HOOKTYPE_OPER_INVITE_BAN]; h; h = h->next)
+	{
+		j = (*(h->func.intfunc))(client,channel);
+		if (j != 0)
+			break;
+	}
+
+	/* See if we can evade this ban */
+	banned = is_banned(client, channel, BANCHK_JOIN, NULL, NULL);
+	if (banned && j == HOOK_DENY)
+		return (ERR_BANNEDFROMCHAN);
+
+	for (lp = client->user->invited; lp; lp = lp->next)
+		if (lp->value.channel == channel)
+			return 0;
+
+        if (channel->users >= channel->mode.limit)
+        {
+                /* Hmmm.. don't really like this.. and not at this place */
+                
+                for (h = Hooks[HOOKTYPE_CAN_JOIN_LIMITEXCEEDED]; h; h = h->next) 
+                {
+                        i = (*(h->func.intfunc))(client,channel,key,parv);
+                        if (i != 0)
+                                return i;
+                }
+
+                /* We later check again for this limit (in case +L was not set) */
+        }
+
+
+        if (*channel->mode.key && (BadPtr(key) || strcmp(channel->mode.key, key)))
+                return (ERR_BADCHANNELKEY);
+
+        if ((channel->mode.mode & MODE_INVITEONLY) && !find_invex(channel, client))
+                return (ERR_INVITEONLYCHAN);
+
+        if ((channel->mode.limit && channel->users >= channel->mode.limit))
+                return (ERR_CHANNELISFULL);
+
+        if (banned)
+                return (ERR_BANNEDFROMCHAN);
+
+#ifndef NO_OPEROVERRIDE
+#ifdef OPEROVERRIDE_VERIFY
+        if (ValidatePermissionsForPath("channel:override:privsecret",client,NULL,channel,NULL) && (channel->mode.mode & MODE_SECRET ||
+            channel->mode.mode & MODE_PRIVATE) && !is_autojoin_chan(channel->chname))
+                return (ERR_OPERSPVERIFY);
+#endif
+#endif
+
+        return 0;
+}
+
+/*
+** cmd_join
+**	parv[1] = channel
+**	parv[2] = channel password (key)
+**
+** Due to message tags, remote servers should only send 1 channel
+** per JOIN. Or even better, use SJOIN instead.
+** Otherwise we cannot use unique msgid's and such.
+** UnrealIRCd 4 and probably UnrealIRCd 3.2.something already do
+** this, so this comment is mostly for services coders, I guess.
+*/
+CMD_FUNC(cmd_join)
+{
+	int r;
+
+	if (bouncedtimes)
+		sendto_realops("join: bouncedtimes=%d??? [please report at https://bugs.unrealircd.org/]", bouncedtimes);
+
+	bouncedtimes = 0;
+	if (IsServer(client))
+		return;
+	do_join(client, parc, parv);
+	bouncedtimes = 0;
+}
+
+/** Send JOIN message for 'client' to all users in 'channel'.
+ * Taking into account that not everyone in channel should see the JOIN (mode +D)
+ * and taking into account the different types of JOIN (due to CAP extended-join).
+ */
+void _send_join_to_local_users(Client *client, Channel *channel, MessageTag *mtags)
+{
+	int chanops_only = invisible_user_in_channel(client, channel);
+	Member *lp;
+	Client *acptr;
+	char joinbuf[512];
+	char exjoinbuf[512];
+	long CAP_EXTENDED_JOIN = ClientCapabilityBit("extended-join");
+	long CAP_AWAY_NOTIFY = ClientCapabilityBit("away-notify");
+
+	ircsnprintf(joinbuf, sizeof(joinbuf), ":%s!%s@%s JOIN :%s",
+		client->name, client->user->username, GetHost(client), channel->chname);
+
+	ircsnprintf(exjoinbuf, sizeof(exjoinbuf), ":%s!%s@%s JOIN %s %s :%s",
+		client->name, client->user->username, GetHost(client), channel->chname,
+		!isdigit(*client->user->svid) ? client->user->svid : "*",
+		client->info);
+
+	for (lp = channel->members; lp; lp = lp->next)
+	{
+		acptr = lp->client;
+
+		if (!MyConnect(acptr))
+			continue; /* only locally connected clients */
+
+		if (chanops_only && !(lp->flags & (CHFL_HALFOP|CHFL_CHANOP|CHFL_CHANOWNER|CHFL_CHANADMIN)) && (client != acptr))
+			continue; /* skip non-ops if requested to (used for mode +D), but always send to 'client' */
+
+		if (HasCapabilityFast(acptr, CAP_EXTENDED_JOIN))
+			sendto_one(acptr, mtags, "%s", exjoinbuf);
+		else
+			sendto_one(acptr, mtags, "%s", joinbuf);
+
+		if (client->user->away && HasCapabilityFast(acptr, CAP_AWAY_NOTIFY))
+		{
+			MessageTag *mtags_away = NULL;
+			new_message(client, NULL, &mtags_away);
+			sendto_one(acptr, mtags_away, ":%s!%s@%s AWAY :%s",
+			           client->name, client->user->username, GetHost(client), client->user->away);
+			free_message_tags(mtags_away);
+		}
+	}
+}
+
+/* Routine that actually makes a user join the channel
+ * this does no actual checking (banned, etc.) it just adds the user
+ */
+void _join_channel(Channel *channel, Client *client, MessageTag *recv_mtags, int flags)
+{
+	MessageTag *mtags = NULL; /** Message tags to send to local users (sender is :user) */
+	MessageTag *mtags_sjoin = NULL; /* Message tags to send to remote servers for SJOIN (sender is :me.id) */
+	char *parv[] = { 0, 0 };
+
+	/* Same way as in SJOIN */
+	new_message_special(client, recv_mtags, &mtags, ":%s JOIN %s", client->name, channel->chname);
+
+	new_message(&me, recv_mtags, &mtags_sjoin);
+
+	add_user_to_channel(channel, client, flags);
+
+	send_join_to_local_users(client, channel, mtags);
+
+	sendto_server(client, 0, 0, mtags_sjoin, ":%s SJOIN %lld %s :%s%s ",
+		me.id, (long long)channel->creationtime,
+		channel->chname, chfl_to_sjoin_symbol(flags), client->id);
+
+	if (MyUser(client))
+	{
+		/*
+		   ** Make a (temporal) creationtime, if someone joins
+		   ** during a net.reconnect : between remote join and
+		   ** the mode with TS. --Run
+		 */
+		if (channel->creationtime == 0)
+		{
+			channel->creationtime = TStime();
+			sendto_server(client, 0, 0, NULL, ":%s MODE %s + %lld",
+			    me.id, channel->chname, (long long)channel->creationtime);
+		}
+		del_invite(client, channel);
+
+		if (channel->topic)
+		{
+			sendnumeric(client, RPL_TOPIC, channel->chname, channel->topic);
+			sendnumeric(client, RPL_TOPICWHOTIME, channel->chname, channel->topic_nick,
+			    channel->topic_time);
+		}
+		
+		/* Set default channel modes (set::modes-on-join).
+		 * Set only if it's the 1st user and only if no other modes have been set
+		 * already (eg: +P, permanent).
+		 */
+		if ((channel->users == 1) && !channel->mode.mode && !channel->mode.extmode &&
+		    (MODES_ON_JOIN || iConf.modes_on_join.extmodes))
+		{
+			int i;
+			MessageTag *mtags_mode = NULL;
+
+			channel->mode.extmode =  iConf.modes_on_join.extmodes;
+			/* Param fun */
+			for (i = 0; i <= Channelmode_highest; i++)
+			{
+				if (!Channelmode_Table[i].flag || !Channelmode_Table[i].paracount)
+					continue;
+				if (channel->mode.extmode & Channelmode_Table[i].mode)
+				        cm_putparameter(channel, Channelmode_Table[i].flag, iConf.modes_on_join.extparams[i]);
+			}
+
+			channel->mode.mode = MODES_ON_JOIN;
+
+			*modebuf = *parabuf = 0;
+			channel_modes(client, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), channel);
+			/* This should probably be in the SJOIN stuff */
+			new_message_special(&me, recv_mtags, &mtags_mode, ":%s MODE %s %s %s", me.name, channel->chname, modebuf, parabuf);
+			sendto_server(NULL, 0, 0, mtags_mode, ":%s MODE %s %s %s %lld",
+			    me.id, channel->chname, modebuf, parabuf, (long long)channel->creationtime);
+			sendto_one(client, mtags_mode, ":%s MODE %s %s %s", me.name, channel->chname, modebuf, parabuf);
+			free_message_tags(mtags_mode);
+		}
+
+		parv[0] = client->name;
+		parv[1] = channel->chname;
+		do_cmd(client, NULL, "NAMES", 2, parv);
+
+		RunHook4(HOOKTYPE_LOCAL_JOIN, client, channel, mtags, parv);
+	} else {
+		RunHook4(HOOKTYPE_REMOTE_JOIN, client, channel, mtags, parv);
+	}
+
+	free_message_tags(mtags);
+	free_message_tags(mtags_sjoin);
+}
+
+/** User request to join a channel.
+ * This routine is normally called from cmd_join but can also be called from
+ * do_join->can_join->link module->do_join if the channel is 'linked' (chmode +L).
+ * We therefore use a counter 'bouncedtimes' which is set to 0 in cmd_join,
+ * increased every time we enter this loop and decreased anytime we leave the
+ * loop. So be carefull not to use a simple 'return' after bouncedtimes++. -- Syzop
+ */
+void _do_join(Client *client, int parc, char *parv[])
+{
+	char jbuf[BUFSIZE], jbuf2[BUFSIZE];
+	char *orig_parv1;
+	Membership *lp;
+	Channel *channel;
+	char *name, *key = NULL;
+	int i, flags = 0, ishold;
+	char *p = NULL, *p2 = NULL;
+	TKL *tklban;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("JOIN");
+
+#define RET() do { bouncedtimes--; parv[1] = orig_parv1; return; } while(0)
+
+	if (parc < 2 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "JOIN");
+		return;
+	}
+	bouncedtimes++;
+	orig_parv1 = parv[1];
+	/* don't use 'return;' but 'RET();' from here ;p */
+
+	if (bouncedtimes > MAXBOUNCE)
+	{
+		/* bounced too many times. yeah.. should be in the link module, I know.. then again, who cares.. */
+		sendnotice(client, "*** Couldn't join %s ! - Link setting was too bouncy", parv[1]);
+		RET();
+	}
+
+	*jbuf = '\0';
+	/*
+	   ** Rebuild list of channels joined to be the actual result of the
+	   ** JOIN.  Note that "JOIN 0" is the destructive problem.
+	 */
+	for (i = 0, name = strtoken(&p, parv[1], ",");
+	     name;
+	     i++, name = strtoken(&p, NULL, ","))
+	{
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, name, maxtargets, "JOIN");
+			break;
+		}
+		if (*name == '0' && !atoi(name))
+		{
+			/* UnrealIRCd 5: we only support "JOIN 0",
+			 * "JOIN 0,#somechan" etc... so only at the beginning.
+			 * We do not support it half-way like "JOIN #a,0,#b"
+			 * since that doesn't make sense, unless you are flooding...
+			 * We still support it in remote joins for compatibility.
+			 */
+			if (MyUser(client) && (i != 0))
+				continue;
+			strlcpy(jbuf, "0", sizeof(jbuf));
+			continue;
+		} else
+		if (MyConnect(client) && !valid_channelname(name))
+		{
+			send_invalid_channelname(client, name);
+			if (IsOper(client) && find_channel(name, NULL))
+			{
+				/* Give IRCOps a bit more information */
+				sendnotice(client, "Channel '%s' is unjoinable because it contains illegal characters. "
+				                   "However, it does exist because another server in your "
+				                   "network, which has a more loose restriction, created it. "
+				                   "See https://www.unrealircd.org/docs/Set_block#set::allowed-channelchars",
+				                   name);
+			}
+			continue;
+		}
+		else if (!IsChannelName(name))
+		{
+			if (MyUser(client))
+				sendnumeric(client, ERR_NOSUCHCHANNEL, name);
+			continue;
+		}
+		if (*jbuf)
+			strlcat(jbuf, ",", sizeof jbuf);
+		strlcat(jbuf, name, sizeof(jbuf));
+	}
+
+	/* We are going to overwrite 'jbuf' with the calls to strtoken()
+	 * a few lines further down. Copy it to 'jbuf2' and make that
+	 * the new parv[1].. or at least temporarily.
+	 */
+	strlcpy(jbuf2, jbuf, sizeof(jbuf2));
+	parv[1] = jbuf2;
+
+	p = NULL;
+	if (parv[2])
+		key = strtoken(&p2, parv[2], ",");
+	parv[2] = NULL;		/* for cmd_names call later, parv[parc] must == NULL */
+
+	for (name = strtoken(&p, jbuf, ",");
+	     name;
+	     key = key ? strtoken(&p2, NULL, ",") : NULL, name = strtoken(&p, NULL, ","))
+	{
+		MessageTag *mtags = NULL;
+
+		/*
+		   ** JOIN 0 sends out a part for all channels a user
+		   ** has joined.
+		 */
+		if (*name == '0' && !atoi(name))
+		{
+			/* Rewritten so to generate a PART for each channel to servers,
+			 * so the same msgid is used for each part on all servers. -- Syzop
+			 */
+			while ((lp = client->user->channel))
+			{
+				MessageTag *mtags = NULL;
+				channel = lp->channel;
+
+				new_message(client, NULL, &mtags);
+
+				sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, NULL,
+				               ":%s PART %s :%s",
+				               client->name, channel->chname, "Left all channels");
+				sendto_server(client, 0, 0, mtags, ":%s PART %s :Left all channels", client->name, channel->chname);
+
+				if (MyConnect(client))
+					RunHook4(HOOKTYPE_LOCAL_PART, client, channel, mtags, "Left all channels");
+
+				remove_user_from_channel(client, channel);
+				free_message_tags(mtags);
+			}
+			continue;
+		}
+
+		if (MyConnect(client))
+		{
+			/*
+			   ** local client is first to enter previously nonexistant
+			   ** channel so make them (rightfully) the Channel
+			   ** Operator.
+			 */
+			/* Where did this come from? Potvin ? --Stskeeps
+			   flags = (ChannelExists(name)) ? CHFL_DEOPPED :
+			   CHFL_CHANOWNER;
+
+			 */
+
+			flags =
+			    (ChannelExists(name)) ? CHFL_DEOPPED : LEVEL_ON_JOIN;
+
+			if (!ValidatePermissionsForPath("immune:maxchannelsperuser",client,NULL,NULL,NULL))	/* opers can join unlimited chans */
+				if (client->user->joined >= MAXCHANNELSPERUSER)
+				{
+					sendnumeric(client, ERR_TOOMANYCHANNELS, name);
+					RET();
+				}
+/* RESTRICTCHAN */
+			if (conf_deny_channel)
+			{
+				if (!ValidatePermissionsForPath("immune:server-ban:deny-channel",client,NULL,NULL,NULL))
+				{
+					ConfigItem_deny_channel *d;
+					if ((d = find_channel_allowed(client, name)))
+					{
+						if (d->warn)
+						{
+							sendto_snomask(SNO_EYES, "*** %s tried to join forbidden channel %s",
+								get_client_name(client, 1), name);
+						}
+						if (d->reason)
+							sendnumeric(client, ERR_FORBIDDENCHANNEL, name, d->reason);
+						if (d->redirect)
+						{
+							sendnotice(client, "*** Redirecting you to %s", d->redirect);
+							parv[0] = NULL;
+							parv[1] = d->redirect;
+							do_join(client, 2, parv);
+						}
+						if (d->class)
+							sendnotice(client, "*** Can not join %s: Your class is not allowed", name);
+						continue;
+					}
+				}
+			}
+			if (ValidatePermissionsForPath("immune:server-ban:deny-channel",client,NULL,NULL,NULL) && (tklban = find_qline(client, name, &ishold)))
+			{
+				sendnumeric(client, ERR_FORBIDDENCHANNEL, name, tklban->ptr.nameban->reason);
+				continue;
+			}
+			/* ugly set::spamfilter::virus-help-channel-deny hack.. */
+			if (SPAMFILTER_VIRUSCHANDENY && SPAMFILTER_VIRUSCHAN &&
+			    !strcasecmp(name, SPAMFILTER_VIRUSCHAN) &&
+			    !ValidatePermissionsForPath("immune:server-ban:viruschan",client,NULL,NULL,NULL) && !spamf_ugly_vchanoverride)
+			{
+				int invited = 0;
+				Link *lp;
+				Channel *channel = find_channel(name, NULL);
+				
+				if (channel)
+				{
+					for (lp = client->user->invited; lp; lp = lp->next)
+						if (lp->value.channel == channel)
+							invited = 1;
+				}
+				if (!invited)
+				{
+					sendnotice(client, "*** Cannot join '%s' because it's the virus-help-channel which is "
+					                 "reserved for infected users only", name);
+					continue;
+				}
+			}
+		}
+
+		channel = get_channel(client, name, CREATE);
+		if (channel && (lp = find_membership_link(client->user->channel, channel)))
+			continue;
+
+		if (!channel)
+			continue;
+
+		i = HOOK_CONTINUE;
+		if (!MyConnect(client))
+			flags = CHFL_DEOPPED;
+		else
+		{
+			Hook *h;
+			for (h = Hooks[HOOKTYPE_PRE_LOCAL_JOIN]; h; h = h->next) 
+			{
+				i = (*(h->func.intfunc))(client,channel,parv);
+				if (i == HOOK_DENY || i == HOOK_ALLOW)
+					break;
+			}
+			/* Denied, get out now! */
+			if (i == HOOK_DENY)
+			{
+				/* Rejected... if we just created a new chan we should destroy it too. -- Syzop */
+				if (!channel->users)
+					sub1_from_channel(channel);
+				continue;
+			}
+			/* If they are allowed, don't check can_join */
+			if (i != HOOK_ALLOW && 
+			   (i = can_join(client, channel, key, parv)))
+			{
+				if (i != -1)
+				{
+					sendnumeric(client, i, name);
+				}
+				continue;
+			}
+		}
+
+		/* Generate a new message without inheritance.
+		 * We can do this because remote joins don't follow this code path,
+		 * or are highly discouraged to anyway.
+		 * Remote servers use SJOIN and never reach this function.
+		 * Locally we do follow this code path with JOIN and then generating
+		 * a new_message() here is exactly what we want:
+		 * Each "JOIN #a,#b,#c" gets processed individually in this loop
+		 * and is sent by join_channel() as a SJOIN for #a, then SJOIN for #b,
+		 * and so on, each with their own unique msgid and such.
+		 */
+		new_message(client, NULL, &mtags);
+		join_channel(channel, client, mtags, flags);
+		free_message_tags(mtags);
+	}
+	RET();
+#undef RET
+}
+
+/* Additional channel-related functions. I've put it here instead
+ * of the core so it could be upgraded on the fly should it be necessary.
+ */
+
+char *get_chmodes_for_user(Client *client, int flags)
+{
+	static char modebuf[512]; /* returned */
+	char flagbuf[8]; /* For holding "vhoaq" */
+	char *p = flagbuf;
+	char parabuf[512];
+	int n, i;
+
+	if (!flags)
+		return "";
+
+	if (flags & MODE_CHANOWNER)
+		*p++ = 'q';
+	if (flags & MODE_CHANADMIN)
+		*p++ = 'a';
+	if (flags & MODE_CHANOP)
+		*p++ = 'o';
+	if (flags & MODE_VOICE)
+		*p++ = 'v';
+	if (flags & MODE_HALFOP)
+		*p++ = 'h';
+	*p = '\0';
+
+	parabuf[0] = '\0';
+
+	n = strlen(flagbuf);
+	if (n)
+	{
+		for (i=0; i < n; i++)
+		{
+			strlcat(parabuf, client->name, sizeof(parabuf));
+			if (i < n - 1)
+				strlcat(parabuf, " ", sizeof(parabuf));
+		}
+		/* And we have our mode line! */
+		snprintf(modebuf, sizeof(modebuf), "+%s %s", flagbuf, parabuf);
+		return modebuf;
+	}
+
+	return "";
+}
+
+static char remember_nick[NICKLEN+1];
+static char remember_user[USERLEN+1];
+static char remember_host[HOSTLEN+1];
+
+/** Save current nick/user/host. Used later by userhost_changed(). */
+void _userhost_save_current(Client *client)
+{
+	strlcpy(remember_nick, client->name, sizeof(remember_nick));
+	strlcpy(remember_user, client->user->username, sizeof(remember_user));
+	strlcpy(remember_host, GetHost(client), sizeof(remember_host));
+}
+
+/** User/Host changed for user.
+ * Note that userhost_save_current() needs to be called before this
+ * to save the old username/hostname.
+ * This userhost_changed() function deals with notifying local clients
+ * about the user/host change by sending PART+JOIN+MODE if
+ * set::allow-userhost-change force-rejoin is in use,
+ * and it wills end "CAP chghost" to such capable clients.
+ * It will also deal with bumping fakelag for the user since a user/host
+ * change is costly, doesn't matter if it was self-induced or not.
+ *
+ * Please call this function for any user/host change by doing:
+ * userhost_save_current(client);
+ * << change username or hostname here >>
+ * userhost_changed(client);
+ */
+void _userhost_changed(Client *client)
+{
+	Membership *channels;
+	Member *lp;
+	Client *acptr;
+	int impact = 0;
+	char buf[512];
+	long CAP_EXTENDED_JOIN = ClientCapabilityBit("extended-join");
+	long CAP_CHGHOST = ClientCapabilityBit("chghost");
+
+	if (strcmp(remember_nick, client->name))
+	{
+		ircd_log(LOG_ERROR, "[BUG] userhost_changed() was called but without calling userhost_save_current() first! Affected user: %s",
+			client->name);
+		ircd_log(LOG_ERROR, "Please report above bug on https://bugs.unrealircd.org/");
+		sendto_realops("[BUG] userhost_changed() was called but without calling userhost_save_current() first! Affected user: %s",
+			client->name);
+		sendto_realops("Please report above bug on https://bugs.unrealircd.org/");
+		return; /* We cannot safely process this request anymore */
+	}
+
+	/* It's perfectly acceptable to call us even if the userhost didn't change. */
+	if (!strcmp(remember_user, client->user->username) && !strcmp(remember_host, GetHost(client)))
+		return; /* Nothing to do */
+
+	/* Most of the work is only necessary for set::allow-userhost-change force-rejoin */
+	if (UHOST_ALLOWED == UHALLOW_REJOIN)
+	{
+		/* Walk through all channels of this user.. */
+		for (channels = client->user->channel; channels; channels = channels->next)
+		{
+			Channel *channel = channels->channel;
+			int flags = channels->flags;
+			char *modes;
+			char partbuf[512]; /* PART */
+			char joinbuf[512]; /* JOIN */
+			char exjoinbuf[512]; /* JOIN (for CAP extended-join) */
+			char modebuf[512]; /* MODE (if any) */
+			int chanops_only = invisible_user_in_channel(client, channel);
+
+			modebuf[0] = '\0';
+
+			/* If the user is banned, don't send any rejoins, it would only be annoying */
+			if (is_banned(client, channel, BANCHK_JOIN, NULL, NULL))
+				continue;
+
+			/* Prepare buffers for PART, JOIN, MODE */
+			ircsnprintf(partbuf, sizeof(partbuf), ":%s!%s@%s PART %s :%s",
+						remember_nick, remember_user, remember_host,
+						channel->chname,
+						"Changing host");
+
+			ircsnprintf(joinbuf, sizeof(joinbuf), ":%s!%s@%s JOIN %s",
+						client->name, client->user->username, GetHost(client), channel->chname);
+
+			ircsnprintf(exjoinbuf, sizeof(exjoinbuf), ":%s!%s@%s JOIN %s %s :%s",
+				client->name, client->user->username, GetHost(client), channel->chname,
+				!isdigit(*client->user->svid) ? client->user->svid : "*",
+				client->info);
+
+			modes = get_chmodes_for_user(client, flags);
+			if (!BadPtr(modes))
+				ircsnprintf(modebuf, sizeof(modebuf), ":%s MODE %s %s", me.name, channel->chname, modes);
+
+			for (lp = channel->members; lp; lp = lp->next)
+			{
+				acptr = lp->client;
+
+				if (acptr == client)
+					continue; /* skip self */
+
+				if (!MyConnect(acptr))
+					continue; /* only locally connected clients */
+
+				if (chanops_only && !(lp->flags & (CHFL_CHANOP|CHFL_CHANOWNER|CHFL_CHANADMIN)))
+					continue; /* skip non-ops if requested to (used for mode +D) */
+
+				if (HasCapabilityFast(acptr, CAP_CHGHOST))
+					continue; /* we notify 'CAP chghost' users in a different way, so don't send it here. */
+
+				impact++;
+
+				/* FIXME: if a client does not have the "chghost" cap then
+				 * here we will not generate a proper new message, probably
+				 * needs to be fixed... I skipped doing it for now.
+				 */
+				sendto_one(acptr, NULL, "%s", partbuf);
+
+				if (HasCapabilityFast(acptr, CAP_EXTENDED_JOIN))
+					sendto_one(acptr, NULL, "%s", exjoinbuf);
+				else
+					sendto_one(acptr, NULL, "%s", joinbuf);
+
+				if (*modebuf)
+					sendto_one(acptr, NULL, "%s", modebuf);
+			}
+		}
+	}
+
+	/* Now deal with "CAP chghost" clients.
+	 * This only needs to be sent one per "common channel".
+	 * This would normally call sendto_common_channels_local_butone() but the user already
+	 * has the new user/host.. so we do it here..
+	 */
+	ircsnprintf(buf, sizeof(buf), ":%s!%s@%s CHGHOST %s %s",
+	            remember_nick, remember_user, remember_host,
+	            client->user->username,
+	            GetHost(client));
+	current_serial++;
+	for (channels = client->user->channel; channels; channels = channels->next)
+	{
+		for (lp = channels->channel->members; lp; lp = lp->next)
+		{
+			acptr = lp->client;
+			if (MyUser(acptr) && HasCapabilityFast(acptr, CAP_CHGHOST) &&
+			    (acptr->local->serial != current_serial) && (client != acptr))
+			{
+				/* FIXME: send mtag */
+				sendto_one(acptr, NULL, "%s", buf);
+				acptr->local->serial = current_serial;
+			}
+		}
+	}
+
+	if (MyUser(client))
+	{
+		/* We take the liberty of sending the CHGHOST to the impacted user as
+		 * well. This makes things easy for client coders.
+		 * (Note that this cannot be merged with the for loop from 15 lines up
+		 *  since the user may not be in any channels)
+		 */
+		if (HasCapabilityFast(client, CAP_CHGHOST))
+			sendto_one(client, NULL, "%s", buf);
+
+		/* A userhost change always generates the following network traffic:
+		 * server to server traffic, CAP "chghost" notifications, and
+		 * possibly PART+JOIN+MODE if force-rejoin had work to do.
+		 * We give the user a penalty so they don't flood...
+		 */
+		if (impact)
+			client->local->since += 7; /* Resulted in rejoins and such. */
+		else
+			client->local->since += 4; /* No rejoins */
+	}
+}
diff --git a/src/modules/jointhrottle.c b/src/modules/jointhrottle.c
new file mode 100644
index 0000000..eb11cf7
--- /dev/null
+++ b/src/modules/jointhrottle.c
@@ -0,0 +1,306 @@
+/*
+ * Jointhrottle (set::anti-flood::join-flood).
+ * (C) Copyright 2005-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This was PREVIOUSLY channel mode +j but has been moved to the
+ * set::anti-flood::join-flood block instead since people rarely need
+ * to tweak this per-channel and it's nice to have this on by default.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Default settings for set::anti-flood::join-flood block: */
+#define JOINTHROTTLE_DEFAULT_COUNT 3
+#define JOINTHROTTLE_DEFAULT_TIME 90
+
+ModuleHeader MOD_HEADER
+  = {
+	"jointhrottle",
+	"5.0",
+	"Join flood protection (set::anti-flood::join-flood)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+ModuleInfo *ModInfo = NULL;
+
+ModDataInfo *jointhrottle_md; /* Module Data structure which we acquire */
+
+struct {
+	unsigned short num;
+	unsigned short t;
+} cfg;
+
+typedef struct JoinFlood JoinFlood;
+
+struct JoinFlood {
+	JoinFlood *prev, *next;
+	char chname[CHANNELLEN+1];
+	time_t firstjoin;
+	unsigned short numjoins;
+};
+
+/* Forward declarations */
+int jointhrottle_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int jointhrottle_config_run(ConfigFile *, ConfigEntry *, int);
+void jointhrottle_md_free(ModData *m);
+int jointhrottle_can_join(Client *client, Channel *channel, char *key, char *parv[]);
+int jointhrottle_local_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[]);
+static int isjthrottled(Client *client, Channel *channel);
+static void jointhrottle_increase_usercounter(Client *client, Channel *channel);
+EVENT(jointhrottle_cleanup_structs);
+JoinFlood *jointhrottle_addentry(Client *client, Channel *channel);
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, jointhrottle_config_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModInfo = modinfo;
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "jointhrottle";
+	mreq.free = jointhrottle_md_free;
+	mreq.serialize = NULL; /* not supported */
+	mreq.unserialize = NULL; /* not supported */
+	mreq.sync = 0;
+	mreq.type = MODDATATYPE_LOCAL_CLIENT;
+	jointhrottle_md = ModDataAdd(modinfo->handle, mreq);
+	if (!jointhrottle_md)
+		abort();
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, jointhrottle_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_JOIN, 0, jointhrottle_can_join);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_JOIN, 0, jointhrottle_local_join);
+	
+	cfg.t = JOINTHROTTLE_DEFAULT_TIME;
+	cfg.num = JOINTHROTTLE_DEFAULT_COUNT;
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(ModInfo->handle, "jointhrottle_cleanup_structs", jointhrottle_cleanup_structs, NULL, 60000, 0);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_FAILED;
+}
+
+int jointhrottle_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	int cnt=0, period=0;
+
+	if (type != CONFIG_SET_ANTI_FLOOD)
+		return 0;
+
+	if (strcmp(ce->ce_varname, "join-flood"))
+		return 0; /* otherwise not interested */
+
+	if (!ce->ce_vardata || !config_parse_flood(ce->ce_vardata, &cnt, &period) ||
+		(cnt < 1) || (cnt > 255) || (period < 5))
+	{
+		config_error("%s:%i: set::anti-flood::join-flood. Syntax is '<count>:<period>' (eg 3:90), "
+					 "count should be 1-255, period should be greater than 4",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int jointhrottle_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	int cnt=0, period=0;
+
+	if (type != CONFIG_SET_ANTI_FLOOD)
+		return 0;
+
+	if (strcmp(ce->ce_varname, "join-flood"))
+		return 0; /* otherwise not interested */
+	
+	config_parse_flood(ce->ce_vardata, &cnt, &period);
+	
+	cfg.t = period;
+	cfg.num = cnt;
+	
+	return 0;
+}
+
+static int isjthrottled(Client *client, Channel *channel)
+{
+	JoinFlood *e;
+	int num = cfg.num;
+	int t = cfg.t;
+
+	if (!MyUser(client))
+		return 0;
+
+	/* Grab user<->chan entry.. */
+	for (e = moddata_local_client(client, jointhrottle_md).ptr; e; e=e->next)
+		if (!strcasecmp(e->chname, channel->chname))
+			break;
+	
+	if (!e)
+		return 0; /* Not present, so cannot be throttled */
+
+	/* Ok... now the actual check:
+	 * if ([timer valid] && [one more join would exceed num])
+	 */
+	if (((TStime() - e->firstjoin) < t) && (e->numjoins == num))
+		return 1; /* Throttled */
+
+	return 0;
+}
+
+static void jointhrottle_increase_usercounter(Client *client, Channel *channel)
+{
+	JoinFlood *e;
+
+	if (!MyUser(client))
+		return;
+		
+	/* Grab user<->chan entry.. */
+	for (e = moddata_local_client(client, jointhrottle_md).ptr; e; e=e->next)
+		if (!strcasecmp(e->chname, channel->chname))
+			break;
+	
+	if (!e)
+	{
+		/* Allocate one */
+		e = jointhrottle_addentry(client, channel);
+		e->firstjoin = TStime();
+		e->numjoins = 1;
+	} else
+	if ((TStime() - e->firstjoin) < cfg.t) /* still valid? */
+	{
+		e->numjoins++;
+	} else {
+		/* reset :p */
+		e->firstjoin = TStime();
+		e->numjoins = 1;
+	}
+}
+
+int jointhrottle_can_join(Client *client, Channel *channel, char *key, char *parv[])
+{
+	if (!ValidatePermissionsForPath("immune:join-flood",client,NULL,channel,NULL) && isjthrottled(client, channel))
+		return ERR_TOOMANYJOINS;
+	return 0;
+}
+
+
+int jointhrottle_local_join(Client *client, Channel *channel, MessageTag *mtags, char *parv[])
+{
+	jointhrottle_increase_usercounter(client, channel);
+	return 0;
+}
+
+/** Adds a JoinFlood entry to user & channel and returns entry.
+ * NOTE: Does not check for already-existing-entry
+ */
+JoinFlood *jointhrottle_addentry(Client *client, Channel *channel)
+{
+	JoinFlood *e;
+
+#ifdef DEBUGMODE
+	if (!IsUser(client))
+		abort();
+
+	for (e=moddata_local_client(client, jointhrottle_md).ptr; e; e=e->next)
+		if (!strcasecmp(e->chname, channel->chname))
+			abort(); /* already exists -- should never happen */
+#endif
+
+	e = safe_alloc(sizeof(JoinFlood));
+	strlcpy(e->chname, channel->chname, sizeof(e->chname));
+
+	/* Insert our new entry as (new) head */
+	if (moddata_local_client(client, jointhrottle_md).ptr)
+	{
+		JoinFlood *current_head = moddata_local_client(client, jointhrottle_md).ptr;
+		current_head->prev = e;
+		e->next = current_head;
+	}
+	moddata_local_client(client, jointhrottle_md).ptr = e;
+
+	return e;
+}
+
+/** Regularly cleans up user/chan structs */
+EVENT(jointhrottle_cleanup_structs)
+{
+	Client *client;
+	JoinFlood *jf, *jf_next;
+	
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (!MyUser(client))
+			continue; /* only (local) persons.. */
+
+		for (jf = moddata_local_client(client, jointhrottle_md).ptr; jf; jf = jf_next)
+		{
+			jf_next = jf->next;
+			
+			if (jf->firstjoin + cfg.t > TStime())
+				continue; /* still valid entry */
+#ifdef DEBUGMODE
+			ircd_log(LOG_ERROR, "jointhrottle_cleanup_structs(): freeing %s/%s (%ld[%ld], %d)",
+				client->name, jf->chname, jf->firstjoin, (long)(TStime() - jf->firstjoin), cfg.t);
+#endif
+			if (moddata_local_client(client, jointhrottle_md).ptr == jf)
+			{
+				/* change head */
+				moddata_local_client(client, jointhrottle_md).ptr = jf->next; /* could be set to NULL now */
+				if (jf->next)
+					jf->next->prev = NULL;
+			} else {
+				/* change non-head entries */
+				jf->prev->next = jf->next; /* could be set to NULL now */
+				if (jf->next)
+					jf->next->prev = jf->prev;
+			}
+			safe_free(jf);
+		}
+	}
+}
+
+void jointhrottle_md_free(ModData *m)
+{
+	JoinFlood *j, *j_next;
+
+	if (!m->ptr)
+		return;
+
+	for (j = m->ptr; j; j = j_next)
+	{
+		j_next = j->next;
+		safe_free(j);
+	}	
+
+	m->ptr = NULL;
+}
diff --git a/src/modules/jumpserver.c b/src/modules/jumpserver.c
new file mode 100644
index 0000000..8d11c53
--- /dev/null
+++ b/src/modules/jumpserver.c
@@ -0,0 +1,266 @@
+/*
+ * JumpServer: This module can redirect clients to another server.
+ * (C) Copyright 2004-2016 Bram Matthys (Syzop).
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"jumpserver",
+	"1.1",
+	"/jumpserver command",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Defines */
+#define MSG_JUMPSERVER 	"JUMPSERVER"
+
+/* Forward declarations */
+CMD_FUNC(cmd_jumpserver);
+int jumpserver_preconnect(Client *);
+void jumpserver_free_jss(ModData *m);
+
+/* Jumpserver status struct */
+typedef struct JSS JSS;
+struct JSS
+{
+	char *reason;
+	char *server;
+	int port;
+ 	char *ssl_server;
+	int ssl_port;
+};
+
+JSS *jss=NULL; /**< JumpServer Status. NULL=disabled. */
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	LoadPersistentPointer(modinfo, jss, jumpserver_free_jss);
+	CommandAdd(modinfo->handle, MSG_JUMPSERVER, cmd_jumpserver, 3, CMD_USER);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CONNECT, 0, jumpserver_preconnect);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	SavePersistentPointer(modinfo, jss);
+	return MOD_SUCCESS;
+}
+
+static void do_jumpserver_exit_client(Client *client)
+{
+	if (IsSecure(client) && jss->ssl_server)
+		sendnumeric(client, RPL_REDIR, jss->ssl_server, jss->ssl_port);
+	else
+		sendnumeric(client, RPL_REDIR, jss->server, jss->port);
+	exit_client(client, NULL, jss->reason);
+}
+
+static void redirect_all_clients(void)
+{
+	int count = 0;
+	Client *client, *next;
+
+	list_for_each_entry_safe(client, next, &lclient_list, lclient_node)
+	{
+		if (IsUser(client) && !IsOper(client))
+		{
+			do_jumpserver_exit_client(client);
+			count++;
+		}
+	}
+	sendto_realops("JUMPSERVER: Redirected %d client%s",
+		count, count == 1 ? "" : "s"); /* Language fun... ;p */
+}
+
+int jumpserver_preconnect(Client *client)
+{
+	if (jss)
+	{
+		do_jumpserver_exit_client(client);
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
+
+void free_jss(void)
+{
+	if (jss)
+	{
+		safe_free(jss->server);
+		safe_free(jss->reason);
+		safe_free(jss->ssl_server);
+		safe_free(jss);
+		jss = NULL;
+	}
+}
+
+void jumpserver_free_jss(ModData *m)
+{
+	free_jss();
+}
+
+CMD_FUNC(cmd_jumpserver)
+{
+	char *serv, *sslserv=NULL, *reason, *p;
+	int all=0, port=6667, sslport=6697;
+	char logbuf[512];
+
+	if (!IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		if (jss && jss->ssl_server)
+			sendnotice(client, "JumpServer is \002ENABLED\002 to %s:%d (SSL/TLS: %s:%d) with reason '%s'",
+				jss->server, jss->port, jss->ssl_server, jss->ssl_port, jss->reason);
+		else
+		if (jss)
+			sendnotice(client, "JumpServer is \002ENABLED\002 to %s:%d with reason '%s'",
+				jss->server, jss->port, jss->reason);
+		else
+			sendnotice(client, "JumpServer is \002DISABLED\002");
+		return;
+	}
+
+	if ((parc > 1) && (!strcasecmp(parv[1], "OFF") || !strcasecmp(parv[1], "STOP")))
+	{
+		if (!jss)
+		{
+			sendnotice(client, "JUMPSERVER: No redirect active (already OFF)");
+			return;
+		}
+		free_jss();
+		snprintf(logbuf, sizeof(logbuf), "%s (%s@%s) turned JUMPSERVER OFF",
+			client->name, client->user->username, client->user->realhost);
+		sendto_realops("%s", logbuf);
+		ircd_log(LOG_ERROR, "%s", logbuf);
+		return;
+	}
+
+	if (parc < 4)
+	{
+		/* Waah, pretty verbose usage info ;) */
+		sendnotice(client, "Use: /JUMPSERVER <server>[:port] <NEW|ALL> <reason>");
+		sendnotice(client, " Or: /JUMPSERVER <server>[:port]/<sslserver>[:port] <NEW|ALL> <reason>");
+		sendnotice(client, "if 'NEW' is chosen then only new (incoming) connections will be redirected");
+		sendnotice(client, "if 'ALL' is chosen then all clients except opers will be redirected immediately (+incoming connections)");
+		sendnotice(client, "Example: /JUMPSERVER irc2.test.net NEW This server will be upgraded, please use irc2.test.net for now");
+		sendnotice(client, "And then for example 10 minutes later...");
+		sendnotice(client, "         /JUMPSERVER irc2.test.net ALL This server will be upgraded, please use irc2.test.net for now");
+		sendnotice(client, "Use: '/JUMPSERVER OFF' to turn off any redirects");
+		return;
+	}
+
+	/* Parsing code follows...
+	 * The parsing of the SSL stuff is still done even on non-SSL,
+	 * but it's simply not used/applied :).
+	 * Reason for this is to reduce non-SSL/SSL inconsistency issues.
+	 */
+
+	serv = parv[1];
+	
+	p = strchr(serv, '/');
+	if (p)
+	{
+		*p = '\0';
+		sslserv = p+1;
+	}
+	
+	p = strchr(serv, ':');
+	if (p)
+	{
+		*p++ = '\0';
+		port = atoi(p);
+		if ((port < 1) || (port > 65535))
+		{
+			sendnotice(client, "Invalid serverport specified (%d)", port);
+			return;
+		}
+	}
+	if (sslserv)
+	{
+		p = strchr(sslserv, ':');
+		if (p)
+		{
+			*p++ = '\0';
+			sslport = atoi(p);
+			if ((sslport < 1) || (sslport > 65535))
+			{
+				sendnotice(client, "Invalid SSL/TLS serverport specified (%d)", sslport);
+				return;
+			}
+		}
+		if (!*sslserv)
+			sslserv = NULL;
+	}
+	if (!strcasecmp(parv[2], "new"))
+		all = 0;
+	else if (!strcasecmp(parv[2], "all"))
+		all = 1;
+	else {
+		sendnotice(client, "ERROR: Invalid action '%s', should be 'NEW' or 'ALL' (see /jumpserver help for usage)", parv[2]);
+		return;
+	}
+
+	reason = parv[3];
+
+	/* Free any old stuff (needed!) */
+	if (jss)
+		free_jss();
+
+	jss = safe_alloc(sizeof(JSS));
+
+	/* Set it */
+	safe_strdup(jss->server, serv);
+	jss->port = port;
+	if (sslserv)
+	{
+		safe_strdup(jss->ssl_server, sslserv);
+		jss->ssl_port = sslport;
+	}
+	safe_strdup(jss->reason, reason);
+
+	/* Broadcast/log */
+	if (sslserv)
+		snprintf(logbuf, sizeof(logbuf), "%s (%s@%s) added JUMPSERVER redirect for %s to %s:%d [SSL/TLS: %s:%d] with reason '%s'",
+			client->name, client->user->username, client->user->realhost,
+			all ? "ALL CLIENTS" : "all new clients",
+			jss->server, jss->port, jss->ssl_server, jss->ssl_port, jss->reason);
+	else
+		snprintf(logbuf, sizeof(logbuf), "%s (%s@%s) added JUMPSERVER redirect for %s to %s:%d with reason '%s'",
+			client->name, client->user->username, client->user->realhost,
+			all ? "ALL CLIENTS" : "all new clients",
+			jss->server, jss->port, jss->reason);
+
+	sendto_realops("%s", logbuf);
+	ircd_log(LOG_ERROR, "%s", logbuf);
+
+	if (all)
+		redirect_all_clients();
+}
diff --git a/src/modules/kick.c b/src/modules/kick.c
new file mode 100644
index 0000000..8545f9b
--- /dev/null
+++ b/src/modules/kick.c
@@ -0,0 +1,373 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/kick.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"kick",
+	"5.0",
+	"command /kick",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+CMD_FUNC(cmd_kick);
+void _kick_user(MessageTag *mtags, Channel *channel, Client *client, Client *victim, char *comment);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddVoid(modinfo->handle, EFUNC_KICK_USER, _kick_user);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, "KICK", cmd_kick, 3, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Kick a user from a channel.
+ * @param initial_mtags	Message tags associated with this KICK (can be NULL)
+ * @param channel	The channel where the KICK should happen
+ * @param client	The evil user doing the kick, can be &me
+ * @param victim	The target user that will be kicked
+ * @param comment	The KICK comment (cannot be NULL)
+ * @notes The msgid in initial_mtags is actually used as a prefix.
+ *        The actual mtag will be "initial_mtags_msgid-suffix_msgid"
+ *        All this is done in order for message tags to be
+ *        consistent accross servers.
+ *        The suffix is necessary to handle multi-target-kicks.
+ *        If initial_mtags is NULL then we will autogenerate one.
+ */
+void _kick_user(MessageTag *initial_mtags, Channel *channel, Client *client, Client *victim, char *comment)
+{
+	MessageTag *mtags = NULL;
+	int initial_mtags_generated = 0;
+
+	if (!initial_mtags)
+	{
+		/* Yeah, we allow callers to be lazy.. */
+		initial_mtags_generated = 1;
+		new_message(client, NULL, &initial_mtags);
+	}
+
+	new_message_special(client, initial_mtags, &mtags, ":%s KICK %s %s", client->name, channel->chname, victim->name);
+	/* The same message is actually sent at 5 places below (though max 4 at most) */
+
+	if (MyUser(client))
+		RunHook5(HOOKTYPE_LOCAL_KICK, client, victim, channel, mtags, comment);
+	else
+		RunHook5(HOOKTYPE_REMOTE_KICK, client, victim, channel, mtags, comment);
+
+	if (invisible_user_in_channel(victim, channel))
+	{
+		/* Send it only to chanops & victim */
+		sendto_channel(channel, client, victim,
+			       PREFIX_HALFOP|PREFIX_OP|PREFIX_OWNER|PREFIX_ADMIN, 0,
+			       SEND_LOCAL, mtags,
+			       ":%s KICK %s %s :%s",
+			       client->name, channel->chname, victim->name, comment);
+
+		if (MyUser(victim))
+		{
+			sendto_prefix_one(victim, client, mtags, ":%s KICK %s %s :%s",
+				client->name, channel->chname, victim->name, comment);
+		}
+	} else {
+		/* NORMAL */
+		sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+			       ":%s KICK %s %s :%s",
+			       client->name, channel->chname, victim->name, comment);
+	}
+
+	sendto_server(client, 0, 0, mtags, ":%s KICK %s %s :%s",
+	    client->id, channel->chname, victim->id, comment);
+
+	free_message_tags(mtags);
+	if (initial_mtags_generated)
+	{
+		free_message_tags(initial_mtags);
+		initial_mtags = NULL;
+	}
+
+	remove_user_from_channel(victim, channel);
+}
+
+/*
+** cmd_kick
+**	parv[1] = channel
+**	parv[2] = client to kick
+**	parv[3] = kick comment
+*/
+
+#ifdef PREFIX_AQ
+#define CHFL_ISOP (CHFL_CHANOWNER|CHFL_CHANADMIN|CHFL_CHANOP)
+#else
+#define CHFL_ISOP (CHFL_CHANOP)
+#endif
+
+CMD_FUNC(cmd_kick)
+{
+	Client *who;
+	Channel *channel;
+	int  chasing = 0;
+	char *comment, *name, *p = NULL, *user, *p2 = NULL, *badkick;
+	Membership *lp;
+	Hook *h;
+	int ret;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("KICK");
+	MessageTag *mtags;
+
+	if (parc < 3 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "KICK");
+		return;
+	}
+
+	comment = (BadPtr(parv[3])) ? client->name : parv[3];
+
+	if (!BadPtr(parv[3]) && (strlen(comment) > iConf.kick_length))
+		comment[iConf.kick_length] = '\0';
+
+	for (; (name = strtoken(&p, parv[1], ",")); parv[1] = NULL)
+	{
+		long client_flags = 0;
+		channel = get_channel(client, name, !CREATE);
+		if (!channel)
+		{
+			sendnumeric(client, ERR_NOSUCHCHANNEL, name);
+			continue;
+		}
+		/* Store "client" access flags */
+		if (IsUser(client))
+			client_flags = get_access(client, channel);
+		if (MyUser(client) && !IsULine(client) && !op_can_override("channel:override:kick:no-ops",client,channel,NULL)
+		    && !(client_flags & CHFL_ISOP) && !(client_flags & CHFL_HALFOP))
+		{
+			sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+			continue;
+		}
+
+		for (; (user = strtoken(&p2, parv[2], ",")); parv[2] = NULL)
+		{
+			long who_flags;
+
+			if (MyUser(client) && (++ntargets > maxtargets))
+			{
+				sendnumeric(client, ERR_TOOMANYTARGETS, user, maxtargets, "KICK");
+				break;
+			}
+
+			if (!(who = find_chasing(client, user, &chasing)))
+				continue;	/* No such user left! */
+
+			if (!who->user)
+				continue; /* non-user */
+
+			lp = find_membership_link(who->user->channel, channel);
+			if (!lp)
+			{
+				if (MyUser(client))
+					sendnumeric(client, ERR_USERNOTINCHANNEL, user, name);
+				continue;
+			}
+
+			if (IsULine(client) || IsServer(client))
+				goto attack;
+
+			/* Note for coders regarding oper override:
+			 * always let a remote kick (=from a user on another server) through or
+			 * else we will get desynced. In short this means all the denying should
+			 * always contain a && MyUser(client) and at the end
+			 * a remote kick should always be allowed (pass through). -- Syzop
+			 */
+
+			/* Store "who" access flags */
+			who_flags = get_access(who, channel);
+
+			badkick = NULL;
+			ret = EX_ALLOW;
+			for (h = Hooks[HOOKTYPE_CAN_KICK]; h; h = h->next) {
+				int n = (*(h->func.intfunc))(client, who, channel, comment, client_flags, who_flags, &badkick);
+
+				if (n == EX_DENY)
+					ret = n;
+				else if (n == EX_ALWAYS_DENY)
+				{
+					ret = n;
+					break;
+				}
+			}
+
+			if (ret == EX_ALWAYS_DENY)
+			{
+				if (MyUser(client) && badkick)
+					sendto_one(client, NULL, "%s", badkick); /* send error, if any */
+
+				if (MyUser(client))
+					continue; /* reject the kick (note: we never block remote kicks) */
+			}
+
+			if (ret == EX_DENY)
+			{
+				/* If set it means 'not allowed to kick'.. now check if (s)he can override that.. */
+				if (op_can_override("channel:override:kick:no-ops",client,channel,NULL))
+				{
+					sendto_snomask(SNO_EYES,
+						"*** OperOverride -- %s (%s@%s) KICK %s %s (%s)",
+						client->name, client->user->username, client->user->realhost,
+						channel->chname, who->name, comment);
+					ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) KICK %s %s (%s)",
+						client->name, client->user->username, client->user->realhost,
+						channel->chname, who->name, comment);
+					goto attack; /* all other checks don't matter anymore (and could cause double msgs) */
+				} else {
+					/* Not an oper overriding */
+					if (MyUser(client) && badkick)
+						sendto_one(client, NULL, "%s", badkick); /* send error, if any */
+
+					continue; /* reject the kick */
+				}
+			}
+
+			/* we are neither +o nor +h, OR..
+			 * we are +h but victim is +o, OR...
+			 * we are +h and victim is +h
+			 */
+			if (op_can_override("channel:override:kick:no-ops",client,channel,NULL))
+			{
+				if ((!(client_flags & CHFL_ISOP) && !(client_flags & CHFL_HALFOP)) ||
+				    ((client_flags & CHFL_HALFOP) && (who_flags & CHFL_ISOP)) ||
+				    ((client_flags & CHFL_HALFOP) && (who_flags & CHFL_HALFOP)))
+				{
+					sendto_snomask(SNO_EYES,
+					    "*** OperOverride -- %s (%s@%s) KICK %s %s (%s)",
+					    client->name, client->user->username, client->user->realhost,
+					    channel->chname, who->name, comment);
+
+					/* Logging Implementation added by XeRXeS */
+					ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) KICK %s %s (%s)",
+						client->name, client->user->username, client->user->realhost,
+						channel->chname, who->name, comment);
+
+					goto attack;
+				}	/* is_chan_op */
+
+			}
+
+			/* victim is +a or +q, we are not +q */
+			if ((who_flags & (CHFL_CHANOWNER|CHFL_CHANADMIN))
+				 && !(client_flags & CHFL_CHANOWNER)) {
+				if (client == who)
+					goto attack; /* kicking self == ok */
+				if (op_can_override("channel:override:kick:owner",client,channel,NULL)) /* (and f*ck local ops) */
+				{	/* IRCop kicking owner/prot */
+					sendto_snomask(SNO_EYES,
+					    "*** OperOverride -- %s (%s@%s) KICK %s %s (%s)",
+					    client->name, client->user->username, client->user->realhost,
+					    channel->chname, who->name, comment);
+
+					/* Logging Implementation added by XeRXeS */
+					ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) KICK %s %s (%s)",
+						client->name, client->user->username, client->user->realhost,
+						channel->chname, who->name, comment);
+
+					goto attack;
+				}
+				else if (!IsULine(client) && (who != client) && MyUser(client))
+				{
+					char errbuf[NICKLEN+25];
+					if (who_flags & CHFL_CHANOWNER)
+						ircsnprintf(errbuf, sizeof(errbuf), "%s is a channel owner",
+							   who->name);
+					else
+						ircsnprintf(errbuf, sizeof(errbuf), "%s is a channel admin",
+							   who->name);
+					sendnumeric(client, ERR_CANNOTDOCOMMAND, "KICK",
+						   errbuf);
+					goto deny;
+				}	/* chanadmin/chanowner */
+			}
+
+			/* victim is +o, we are +h [operoverride is already taken care of 2 blocks above] */
+			if ((who_flags & CHFL_ISOP) && (client_flags & CHFL_HALFOP)
+			    && !(client_flags & CHFL_ISOP) && !IsULine(client) && MyUser(client))
+			{
+				char errbuf[NICKLEN+30];
+				ircsnprintf(errbuf, sizeof(errbuf), "%s is a channel operator", who->name);
+				sendnumeric(client, ERR_CANNOTDOCOMMAND, "KICK",
+					   errbuf);
+				goto deny;
+			}
+
+			/* victim is +h, we are +h [operoverride is already taken care of 3 blocks above] */
+			if ((who_flags & CHFL_HALFOP) && (client_flags & CHFL_HALFOP)
+			    && !(client_flags & CHFL_ISOP) && MyUser(client))
+			{
+				char errbuf[NICKLEN+15];
+				ircsnprintf(errbuf, sizeof(errbuf), "%s is a halfop", who->name);
+				sendnumeric(client, ERR_CANNOTDOCOMMAND, "KICK",
+					   errbuf);
+				goto deny;
+			}	/* halfop */
+
+			/* allowed (either coz access granted or a remote kick), so attack! */
+			goto attack;
+
+		      deny:
+			continue;
+
+		      attack:
+			if (MyConnect(client)) {
+				int breakit = 0;
+				Hook *h;
+				for (h = Hooks[HOOKTYPE_PRE_LOCAL_KICK]; h; h = h->next) {
+					if((*(h->func.intfunc))(client,who,channel,comment) > 0) {
+						breakit = 1;
+						break;
+					}
+				}
+				if (breakit)
+					continue;
+			}
+
+			kick_user(recv_mtags, channel, client, who, comment);
+		} /* loop on parv[2] */
+		if (MyUser(client))
+			break;
+	} /* loop on parv[1] */
+}
diff --git a/src/modules/kill.c b/src/modules/kill.c
new file mode 100644
index 0000000..67c53c3
--- /dev/null
+++ b/src/modules/kill.c
@@ -0,0 +1,190 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/kill.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_kill);
+static char buf[BUFSIZE], buf2[BUFSIZE];
+
+ModuleHeader MOD_HEADER
+  = {
+	"kill",
+	"5.0",
+	"command /kill",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, "KILL", cmd_kill, 2, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/** The KILL command - this forcefully terminates a users' connection.
+ * parv[1] = kill victim(s) - comma separated list
+ * parv[2] = reason
+ */
+CMD_FUNC(cmd_kill)
+{
+	char *targetlist, *reason;
+	char *nick, *save = NULL;
+	Client *target;
+	Hook *h;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("KILL");
+
+	if ((parc < 3) || BadPtr(parv[2]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "KILL");
+		return;
+	}
+
+	targetlist = parv[1];
+	reason = parv[2];
+
+	if (!IsServer(client->direction) && !ValidatePermissionsForPath("kill:global",client,NULL,NULL,NULL) && !ValidatePermissionsForPath("kill:local",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (strlen(reason) > iConf.quit_length)
+		reason[iConf.quit_length] = '\0';
+
+	if (MyUser(client))
+		targetlist = canonize(targetlist);
+
+	for (nick = strtoken(&save, targetlist, ","); nick; nick = strtoken(&save, NULL, ","))
+	{
+		MessageTag *mtags = NULL;
+
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, nick, maxtargets, "KILL");
+			break;
+		}
+
+		target = find_person(nick, NULL);
+
+		/* If a local user issued the /KILL then we will "chase" the user.
+		 * In other words: we'll check the history for recently changed nicks.
+		 * We don't do this for remote KILL requests as we have UID for that.
+		 */
+		if (!target && MyUser(client))
+		{
+			target = get_history(nick, KILLCHASETIMELIMIT);
+			if (target)
+				sendnotice(client, "*** KILL changed from %s to %s", nick, target->name);
+		}
+
+		if (!target)
+		{
+			sendnumeric(client, ERR_NOSUCHNICK, nick);
+			continue;
+		}
+
+		if ((!MyConnect(target) && MyUser(client) && !ValidatePermissionsForPath("kill:global",client,target,NULL,NULL))
+		    || (MyConnect(target) && MyUser(client)
+		    && !ValidatePermissionsForPath("kill:local",client,target,NULL,NULL)))
+		{
+			sendnumeric(client, ERR_NOPRIVILEGES);
+			continue;
+		}
+
+		/* Hooks can plug-in here to reject a kill */
+		if (MyUser(client))
+		{
+			int ret = EX_ALLOW;
+			for (h = Hooks[HOOKTYPE_PRE_KILL]; h; h = h->next)
+			{
+				/* note: parameters are: client, victim, reason. reason can be NULL !! */
+				ret = (*(h->func.intfunc))(client, target, reason);
+				if (ret != EX_ALLOW)
+					break;
+			}
+			if ((ret == EX_DENY) || (ret == EX_ALWAYS_DENY))
+				continue; /* reject kill for this particular user */
+		}
+
+		/* From here on, the kill is probably going to be successful. */
+
+		sendto_snomask(SNO_KILLS,
+			"*** Received KILL message for %s (%s@%s) from %s: %s",
+			target->name, target->user->username, GetHost(target),
+			client->name,
+			reason);
+
+		ircd_log(LOG_KILL, "KILL (%s) by %s (%s)",
+			make_nick_user_host(target->name, target->user->username, GetHost(target)),
+			client->name,
+			reason);
+
+		new_message(client, recv_mtags, &mtags);
+
+		/* Victim gets a little notification (s)he is about to die */
+		if (MyConnect(target))
+		{
+			sendto_prefix_one(target, client, NULL, ":%s KILL %s :%s",
+			    client->name, target->name, reason);
+		}
+
+		if (MyConnect(target) && MyConnect(client))
+		{
+			/* Local kill. This is handled as if it were a QUIT */
+		}
+		else
+		{
+			/* Kill from one server to another (we may be src, victim or something in-between) */
+
+			/* Broadcast it to other servers */
+			sendto_server(client, 0, 0, mtags, ":%s KILL %s :%s",
+			              client->id, target->id, reason);
+
+			/* Don't send a QUIT for this */
+			SetKilled(target);
+
+			ircsnprintf(buf2, sizeof(buf2), "Killed by %s (%s)", client->name, reason);
+		}
+
+		if (MyUser(client))
+			RunHook3(HOOKTYPE_LOCAL_KILL, client, target, reason);
+
+		ircsnprintf(buf2, sizeof(buf2), "Killed by %s (%s)", client->name, reason);
+		exit_client(target, mtags, buf2);
+
+		free_message_tags(mtags);
+
+		if (IsDead(client))
+			return; /* stop processing if we killed ourselves */
+	}
+}
diff --git a/src/modules/knock.c b/src/modules/knock.c
new file mode 100644
index 0000000..3cdb485
--- /dev/null
+++ b/src/modules/knock.c
@@ -0,0 +1,169 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/knock.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_knock);
+
+#define MSG_KNOCK 	"KNOCK"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"knock",
+	"5.0",
+	"command /knock", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_KNOCK, cmd_knock, 2, CMD_USER);
+	ISupportAdd(modinfo->handle, "KNOCK", NULL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_knock
+**	parv[1] - channel
+**	parv[2] - reason
+**
+** Coded by Stskeeps
+** Additional bugfixes/ideas by codemastr
+** (C) codemastr & Stskeeps
+** 
+** 2019-11-27: Behavior change. We now send the KNOCK
+** across servers and only deliver the channel notice
+** to local channel members. The reason for this is that
+** otherwise we cannot count KNOCKs network-wide which
+** caused knock-floods per-channel to be per-server
+** rather than global, which undesirable.
+** Unfortunately, this means that if you have a mixed
+** U4 and U5 network you will see KNOCK notices twice
+** for every attempt.
+*/
+CMD_FUNC(cmd_knock)
+{
+	Channel *channel;
+	Hook *h;
+	int i = 0;
+	MessageTag *mtags = NULL;
+	char *reason;
+
+	if (IsServer(client))
+		return;
+
+	if (parc < 2 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "KNOCK");
+		return;
+	}
+
+	reason = parv[2] ? parv[2] : "no reason specified";
+
+	if (MyConnect(client) && !valid_channelname(parv[1]))
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, parv[1]);
+		return;
+	}
+
+	if (!(channel = find_channel(parv[1], NULL)))
+	{
+		sendnumeric(client, ERR_CANNOTKNOCK, parv[1], "Channel does not exist!");
+		return;
+	}
+
+	/* IsMember bugfix by codemastr */
+	if (IsMember(client, channel) == 1)
+	{
+		sendnumeric(client, ERR_CANNOTKNOCK, channel->chname, "You're already there!");
+		return;
+	}
+
+	if (!(channel->mode.mode & MODE_INVITEONLY))
+	{
+		sendnumeric(client, ERR_CANNOTKNOCK, channel->chname, "Channel is not invite only!");
+		return;
+	}
+
+	if (is_banned(client, channel, BANCHK_JOIN, NULL, NULL))
+	{
+		sendnumeric(client, ERR_CANNOTKNOCK, channel->chname, "You're banned!");
+		return;
+	}
+
+	for (h = Hooks[HOOKTYPE_PRE_KNOCK]; h; h = h->next)
+	{
+		i = (*(h->func.intfunc))(client,channel);
+		if (i == HOOK_DENY || i == HOOK_ALLOW)
+			break;
+	}
+
+	if (i == HOOK_DENY)
+		return;
+
+	if (MyUser(client) && !ValidatePermissionsForPath("immune:knock-flood",client,NULL,NULL,NULL))
+	{
+		if ((client->user->flood.knock_t + KNOCK_PERIOD) <= timeofday)
+		{
+			client->user->flood.knock_c = 0;
+			client->user->flood.knock_t = timeofday;
+		}
+		if (client->user->flood.knock_c <= KNOCK_COUNT)
+			client->user->flood.knock_c++;
+		if (client->user->flood.knock_c > KNOCK_COUNT)
+		{
+			sendnumeric(client, ERR_CANNOTKNOCK, parv[1],
+			    "You are KNOCK flooding");
+			return;
+		}
+	}
+
+	new_message(&me, NULL, &mtags);
+
+	sendto_channel(channel, &me, NULL, PREFIX_OP|PREFIX_ADMIN|PREFIX_OWNER,
+	               0, SEND_LOCAL, mtags,
+	               ":%s NOTICE @%s :[Knock] by %s!%s@%s (%s)",
+	               me.name, channel->chname,
+	               client->name, client->user->username, GetHost(client),
+	               reason);
+
+	sendto_server(client, 0, 0, mtags, ":%s KNOCK %s :%s", client->id, channel->chname, reason);
+
+	if (MyUser(client))
+		sendnotice(client, "Knocked on %s", channel->chname);
+
+        RunHook4(HOOKTYPE_KNOCK, client, channel, mtags, parv[2]);
+
+	free_message_tags(mtags);
+}
diff --git a/src/modules/labeled-response.c b/src/modules/labeled-response.c
new file mode 100644
index 0000000..a32441f
--- /dev/null
+++ b/src/modules/labeled-response.c
@@ -0,0 +1,368 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/labeled-response.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"labeled-response",
+	"5.0",
+	"Labeled response CAP",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Data structures */
+typedef struct LabeledResponseContext LabeledResponseContext;
+struct LabeledResponseContext {
+	Client *client; /**< The client who issued the original command with a label */
+	char label[256]; /**< The label attached to this command */
+	char batch[BATCHLEN+1]; /**< The generated batch id */
+	int responses; /**< Number of lines sent back to client */
+	int sent_remote; /**< Command has been sent to remote server */
+	char firstbuf[4096]; /**< First buffered response */
+};
+
+/* Forward declarations */
+int lr_pre_command(Client *from, MessageTag *mtags, char *buf);
+int lr_post_command(Client *from, MessageTag *mtags, char *buf);
+int lr_packet(Client *from, Client *to, Client *intended_to, char **msg, int *len);
+void *_labeled_response_save_context(void);
+void _labeled_response_set_context(void *ctx);
+void _labeled_response_force_end(void);
+
+/* Our special version of SupportBatch() assumes that remote servers always handle it */
+#define SupportBatch(x)		(MyConnect(x) ? HasCapability((x), "batch") : 1)
+#define SupportLabel(x)		(HasCapabilityFast((x), CAP_LABELED_RESPONSE))
+
+/* Variables */
+static LabeledResponseContext currentcmd;
+static long CAP_LABELED_RESPONSE = 0L;
+
+static char packet[8192];
+
+int labeled_response_mtag_is_ok(Client *client, char *name, char *value);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddPVoid(modinfo->handle, EFUNC_LABELED_RESPONSE_SAVE_CONTEXT, _labeled_response_save_context);
+	EfunctionAddVoid(modinfo->handle, EFUNC_LABELED_RESPONSE_SET_CONTEXT, _labeled_response_set_context);
+	EfunctionAddVoid(modinfo->handle, EFUNC_LABELED_RESPONSE_FORCE_END, _labeled_response_force_end);
+
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+	ClientCapability *c;
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&currentcmd, 0, sizeof(currentcmd));
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "labeled-response";
+	c = ClientCapabilityAdd(modinfo->handle, &cap, &CAP_LABELED_RESPONSE);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "label";
+	mtag.is_ok = labeled_response_mtag_is_ok;
+	mtag.clicap_handler = c;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_COMMAND, 2000000000, lr_pre_command);
+	HookAdd(modinfo->handle, HOOKTYPE_POST_COMMAND, -2000000000, lr_post_command);
+	HookAdd(modinfo->handle, HOOKTYPE_PACKET, 0, lr_packet);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int lr_pre_command(Client *from, MessageTag *mtags, char *buf)
+{
+	memset(&currentcmd, 0, sizeof(currentcmd));
+	labeled_response_inhibit = labeled_response_inhibit_end = labeled_response_force = 0;
+
+	if (IsServer(from))
+		return 0;
+
+	for (; mtags; mtags = mtags->next)
+	{
+		if (!strcmp(mtags->name, "label") && mtags->value)
+		{
+			strlcpy(currentcmd.label, mtags->value, sizeof(currentcmd.label));
+			currentcmd.client = from;
+			break;
+		}
+	}
+
+	return 0;
+}
+
+char *gen_start_batch(void)
+{
+	static char buf[512];
+
+	generate_batch_id(currentcmd.batch);
+
+	if (MyConnect(currentcmd.client))
+	{
+		/* Local connection */
+		snprintf(buf, sizeof(buf), "@label=%s :%s BATCH +%s labeled-response",
+			currentcmd.label,
+			me.name,
+			currentcmd.batch);
+	} else {
+		/* Remote connection: requires intra-server BATCH syntax */
+		snprintf(buf, sizeof(buf), "@label=%s :%s BATCH %s +%s labeled-response",
+			currentcmd.label,
+			me.name,
+			currentcmd.client->name,
+			currentcmd.batch);
+	}
+	return buf;
+}
+
+int lr_post_command(Client *from, MessageTag *mtags, char *buf)
+{
+	/* ** IMPORTANT **
+	 * Take care NOT to return here, use 'goto done' instead
+	 * as some variables need to be cleared.
+	 */
+
+	/* We may have to send a response or end a BATCH here, if all of
+	 * the following is true:
+	 * 1. The client is still online (from is not NULL)
+	 * 2. A "label" was attached
+	 * 3. The client supports BATCH (or is remote)
+	 * 4. The command has not been forwarded to a remote server
+	 *    (in which case they would be handling it, and not us)
+	 * 5. Unless labeled_response_force is set, in which case
+	 *    we are assumed to have handled it anyway (necessary for
+	 *    commands like PRIVMSG, quite rare).
+	 */
+	if (from && currentcmd.client &&
+	    !(currentcmd.sent_remote && !currentcmd.responses && !labeled_response_force))
+	{
+		Client *savedptr;
+
+		if (currentcmd.responses == 0)
+		{
+			/* Note: we blindly send recv_mtags back here,
+			 * which is OK now, but may not be OK later.
+			 */
+			memset(&currentcmd, 0, sizeof(currentcmd));
+			sendto_one(from, mtags, ":%s ACK", me.name);
+			goto done;
+		} else
+		if (currentcmd.responses == 1)
+		{
+			/* We have buffered this response earlier,
+			 * now we will send it
+			 */
+			int more_tags = currentcmd.firstbuf[0] == '@';
+			currentcmd.client = NULL; /* prevent lr_packet from interfering */
+			snprintf(packet, sizeof(packet),
+				 "@label=%s%s%s\r\n",
+				 currentcmd.label,
+				 more_tags ? ";" : " ",
+				 more_tags ? currentcmd.firstbuf+1 : currentcmd.firstbuf);
+			sendbufto_one(from, packet, 0);
+			goto done;
+		}
+
+		/* End the batch */
+		if (!labeled_response_inhibit_end)
+		{
+			savedptr = currentcmd.client;
+			currentcmd.client = NULL;
+			if (MyConnect(savedptr))
+				sendto_one(from, NULL, ":%s BATCH -%s", me.name, currentcmd.batch);
+			else
+				sendto_one(from, NULL, ":%s BATCH %s -%s", me.name, savedptr->name, currentcmd.batch);
+		}
+	}
+done:
+	memset(&currentcmd, 0, sizeof(currentcmd));
+	labeled_response_inhibit = labeled_response_inhibit_end = labeled_response_force = 0;
+	return 0;
+}
+
+/** Helper function for lr_packet() to skip the message tags prefix,
+ * and possibly @batch as well.
+ */
+char *skip_tags(char *msg)
+{
+	if (*msg != '@')
+		return msg;
+	if (!strncmp(msg, "@batch", 6))
+	{
+		char *p;
+		for (p = msg; *p; p++)
+			if ((*p == ';') || (*p == ' '))
+				return p;
+	}
+	return msg+1; /* just skip the '@' */
+}
+
+int lr_packet(Client *from, Client *to, Client *intended_to, char **msg, int *len)
+{
+	if (currentcmd.client && !labeled_response_inhibit)
+	{
+		/* Labeled response is active */
+		if (currentcmd.client == intended_to)
+		{
+			/* Add the label */
+			if (currentcmd.responses == 0)
+			{
+				int n = *len;
+				if (n > sizeof(currentcmd.firstbuf))
+					n = sizeof(currentcmd.firstbuf);
+				strlcpy(currentcmd.firstbuf, *msg, n);
+				/* Don't send anything -- yet */
+				*msg = NULL;
+				*len = 0;
+			} else
+			if (currentcmd.responses == 1)
+			{
+				/* Start the batch now, normally this would be a sendto_one()
+				 * but doing so is not possible since we are in the sending code :(
+				 * The code below is almost unbearable to see, but the alternative
+				 * is to use an intermediate buffer or pointer jugling, of which
+				 * the former is slower than this implementation and with the latter
+				 * it is easy to make a mistake and create an overflow issue.
+				 * So guess I'll stick with this...
+				 */
+				char *batchstr = gen_start_batch();
+				int more_tags_one = currentcmd.firstbuf[0] == '@';
+				int more_tags_two = **msg == '@';
+				snprintf(packet, sizeof(packet),
+				         "%s\r\n"
+				         "@batch=%s%s%s\r\n"
+				         "@batch=%s%s%s",
+				         batchstr,
+				         currentcmd.batch,
+				         more_tags_one ? ";" : " ",
+				         more_tags_one ? currentcmd.firstbuf+1 : currentcmd.firstbuf,
+				         currentcmd.batch,
+				         more_tags_two ? ";" : " ",
+				         more_tags_two ? *msg+1 : *msg);
+				*msg = packet;
+				*len = strlen(*msg);
+			} else {
+				/* >2 responses.... the first 2 have already been sent */
+				if (!strncmp(*msg, "@batch", 6))
+				{
+					/* No buffer change needed, already contains a (now inner) batch */
+				} else {
+					int more_tags = **msg == '@';
+					snprintf(packet, sizeof(packet), "@batch=%s%s%s",
+						currentcmd.batch,
+						more_tags ? ";" : " ",
+						more_tags ? *msg+1 : *msg);
+					*msg = packet;
+					*len = strlen(*msg);
+				}
+			}
+			currentcmd.responses++;
+		}
+		else if (IsServer(to) || !MyUser(to))
+		{
+			currentcmd.sent_remote = 1;
+		}
+	}
+
+	return 0;
+}
+
+/** This function verifies if the client sending the
+ * tag is permitted to do so and uses a permitted syntax.
+ */
+int labeled_response_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (BadPtr(value))
+		return 0;
+
+	if (IsServer(client))
+		return 1;
+
+	/* Ignore the label if the client does not support both
+	 * (draft/)labeled-response and batch. Yeah, batch too,
+	 * it's too much hassle to support labeled-response without
+	 * batch and the end result is quite broken too.
+	 */
+	if (MyUser(client) && (!SupportLabel(client) || !SupportBatch(client)))
+		return 0;
+
+	/* Do some basic sanity checking for non-servers */
+	if (strlen(value) <= 64)
+		return 1;
+
+	return 0;
+}
+
+/** Save current context for later use in labeled-response.
+ * Currently used in /LIST. Is not planned for other places tbh.
+ */
+void *_labeled_response_save_context(void)
+{
+	LabeledResponseContext *ctx = safe_alloc(sizeof(LabeledResponseContext));
+	memcpy(ctx, &currentcmd, sizeof(LabeledResponseContext));
+	return (void *)ctx;
+}
+
+/** Set previously saved context 'ctx', or clear the context.
+ * @param ctx    The context, or NULL to clear the context.
+ * @note The client from the previously saved context should be
+ *       the same. Don't save one context when processing
+ *       client A and then restore it when processing client B (duh).
+ */
+void _labeled_response_set_context(void *ctx)
+{
+	if (ctx == NULL)
+	{
+		/* This means: clear the current context */
+		memset(&currentcmd, 0, sizeof(currentcmd));
+	} else {
+		/* Set the current context to the provided one */
+		memcpy(&currentcmd, ctx, sizeof(LabeledResponseContext));
+	}
+}
+
+/** Force an end of the labeled-response (only used in /LIST atm) */
+void _labeled_response_force_end(void)
+{
+	if (currentcmd.client)
+		lr_post_command(currentcmd.client, NULL, NULL);
+}
diff --git a/src/modules/lag.c b/src/modules/lag.c
new file mode 100644
index 0000000..b2c1b59
--- /dev/null
+++ b/src/modules/lag.c
@@ -0,0 +1,85 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/lag.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_lag);
+
+/* Place includes here */
+#define MSG_LAG         "LAG"   /* Lag detect */
+
+ModuleHeader MOD_HEADER
+  = {
+	"lag",	/* Name of module */
+	"5.0", /* Version */
+	"command /lag", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_LAG, cmd_lag, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_lag (lag measure) - Stskeeps
+ * parv[1] = server to query
+*/
+
+CMD_FUNC(cmd_lag)
+{
+	if (!ValidatePermissionsForPath("server:info:lag",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "LAG");
+		return;
+	}
+
+	if (*parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "LAG");
+		return;
+	}
+
+	if (hunt_server(client, recv_mtags, ":%s LAG :%s", 1, parc, parv) == HUNTED_NOSUCH)
+		return;
+
+	sendnotice(client, "Lag reply -- %s %s %lld", me.name, parv[1], (long long)TStime());
+}
diff --git a/src/modules/link-security.c b/src/modules/link-security.c
new file mode 100644
index 0000000..d4e6341
--- /dev/null
+++ b/src/modules/link-security.c
@@ -0,0 +1,281 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/link-security.c
+ *   (C) 2017 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"link-security",
+	"5.0",
+	"Link Security CAP",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Forward declarations */
+char *link_security_md_serialize(ModData *m);
+void link_security_md_unserialize(char *str, ModData *m);
+EVENT(checklinksec);
+char *link_security_capability_parameter(Client *client);
+CMD_FUNC(cmd_linksecurity);
+
+/* Global variables */
+ModDataInfo *link_security_md;
+int local_link_security = -1;
+int global_link_security = -1;
+int effective_link_security = -1;
+
+/** Module initalization */
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM_RELOADABLE, 1);
+	
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "link-security";
+	mreq.type = MODDATATYPE_CLIENT;
+	mreq.serialize = link_security_md_serialize;
+	mreq.unserialize = link_security_md_unserialize;
+	mreq.sync = 1;
+	link_security_md = ModDataAdd(modinfo->handle, mreq);
+	if (!link_security_md)
+	{
+		config_error("Unable to ModDataAdd() -- too many 3rd party modules loaded perhaps?");
+		abort();
+	}
+	
+	CommandAdd(modinfo->handle, "LINKSECURITY", cmd_linksecurity, MAXPARA, CMD_USER);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	ClientCapabilityInfo cap;
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "unrealircd.org/link-security";
+	cap.flags = CLICAP_FLAGS_ADVERTISE_ONLY;
+	cap.parameter = link_security_capability_parameter;
+	ClientCapabilityAdd(modinfo->handle, &cap, NULL);
+
+	EventAdd(modinfo->handle, "checklinksec", checklinksec, NULL, 2000, 0);
+	checklinksec(NULL);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Magic value to differentiate between "not set" and "zero".
+ * Only used for internal moddata storage, not exposed
+ * outside these two functions.
+ */
+#define LNKSECMAGIC 100
+
+char *link_security_md_serialize(ModData *m)
+{
+	static char buf[32];
+	if (m->i == 0)
+		return NULL; /* not set */
+	snprintf(buf, sizeof(buf), "%d", m->i - LNKSECMAGIC);
+	return buf;
+}
+
+void link_security_md_unserialize(char *str, ModData *m)
+{
+	m->i = atoi(str) + LNKSECMAGIC;
+}
+
+/** Return 1 if the server certificate is verified for
+ * server 'client', return 0 if not.
+ */
+int certificate_verification_active(Client *client)
+{
+	ConfigItem_link *conf;
+	
+	if (!client->serv || !client->serv->conf)
+		return 0; /* wtf? */
+	conf = client->serv->conf;
+	
+	if (conf->verify_certificate)
+		return 1; /* yes, verify-certificate is 'yes' */
+	
+	if ((conf->auth->type == AUTHTYPE_TLS_CLIENTCERT) ||
+	    (conf->auth->type == AUTHTYPE_TLS_CLIENTCERTFP) ||
+	    (conf->auth->type == AUTHTYPE_SPKIFP))
+	{
+		/* yes, verified by link::password being a
+		 * certificate fingerprint or certificate file.
+		 */
+	    return 1;
+	}
+
+	return 0; /* no, certificate is not verified in any way */
+}
+
+/** Calculate our (local) link-security level.
+ * This means stepping through the list of directly linked
+ * servers and determining if they are linked via SSL and
+ * certificate verification is active.
+ * @returns value from 0 to 2.
+ */
+int our_link_security(void)
+{
+	Client *client;
+	int level = 2; /* safest */
+	
+	list_for_each_entry(client, &server_list, special_node)
+	{
+		if (IsLocalhost(client))
+			continue; /* server connected via localhost */
+		if (!IsSecure(client))
+			return 0; /* Any non-SSL server (which is not localhost) results in level 0. */
+		if (!certificate_verification_active(client))
+			level = 1; /* downgrade to level 1 */
+	}
+	
+	return level;
+}
+
+char *valtostr(int i)
+{
+	static char buf[32];
+	snprintf(buf, sizeof(buf), "%d", i);
+	return buf;
+}
+
+/** Check link security. This is called every X seconds to see if there
+ * is a change, either local or network-wide.
+ */
+EVENT(checklinksec)
+{
+	int last_local_link_security = local_link_security;
+	int last_global_link_security = global_link_security;
+	Client *client;
+	char *s;
+	int v;
+	int warning_sent = 0;
+	
+	local_link_security = our_link_security();
+	if (local_link_security != last_local_link_security)
+	{
+		/* Our own link-security changed (for better or worse),
+		 * Set and broadcast it immediately to the other servers.
+		 */
+		moddata_client_set(&me, "link-security", valtostr(local_link_security));
+	}
+
+	global_link_security = 2;
+	list_for_each_entry(client, &global_server_list, client_node)
+	{
+		s = moddata_client_get(client, "link-security");
+		if (s)
+		{
+			v = atoi(s);
+			if (v == 0)
+			{
+				global_link_security = 0;
+				break;
+			}
+			if (v == 1)
+				global_link_security = 1;
+		}
+	}
+	
+	if (local_link_security < last_local_link_security)
+	{
+		sendto_realops("Local link-security downgraded from level %d to %d due to just linked in server(s)",
+			last_local_link_security, local_link_security);
+		warning_sent = 1;
+	}
+	
+	if (global_link_security < last_global_link_security)
+	{
+		sendto_realops("Global link-security downgraded from level %d to %d due to just linked in server(s)",
+			last_global_link_security, global_link_security);
+		warning_sent = 1;
+	}
+	
+	effective_link_security = MIN(local_link_security, global_link_security);
+
+	if (warning_sent)
+	{
+		sendto_realops("Effective (network-wide) link-security is: level %d", effective_link_security);
+		sendto_realops("More information about this can be found at https://www.unrealircd.org/docs/Link_security");
+	}
+}
+
+char *link_security_capability_parameter(Client *client)
+{
+	return valtostr(effective_link_security);
+}
+
+/** /LINKSECURITY command */
+CMD_FUNC(cmd_linksecurity)
+{
+	Client *acptr;
+	char *s;
+	int v;
+	
+	if (!IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	
+	sendtxtnumeric(client, "== Link Security Report ==");
+	
+	sendtxtnumeric(client, "= By server =");
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		v = -1;
+		s = moddata_client_get(acptr, "link-security");
+		if (s)
+		{
+			v = atoi(s);
+			sendtxtnumeric(client, "%s: level %d", acptr->name, v);
+		} else {
+			sendtxtnumeric(client, "%s: level UNKNOWN", acptr->name);
+		}
+	}
+	
+	sendtxtnumeric(client, "-");
+	sendtxtnumeric(client, "= Network =");
+	sendtxtnumeric(client, "This results in an effective (network-wide) link-security of level %d", effective_link_security);
+	sendtxtnumeric(client, "-");
+	sendtxtnumeric(client, "= Legend =");
+	sendtxtnumeric(client, "Higher level means better link security");
+	sendtxtnumeric(client, "Level UNKNOWN: Not an UnrealIRCd server (eg: services) or an old version (<4.0.14)");
+	sendtxtnumeric(client, "Level 0: One or more servers linked insecurely (not using SSL/TLS)");
+	sendtxtnumeric(client, "Level 1: Servers are linked with SSL/TLS but at least one of them is not verifying certificates");
+	sendtxtnumeric(client, "Level 2: Servers linked with SSL/TLS and certificates are properly verified");
+	sendtxtnumeric(client, "-");
+	sendtxtnumeric(client, "= More information =");
+	sendtxtnumeric(client, "To understand more about link security and how to improve your level");
+	sendtxtnumeric(client, "see https://www.unrealircd.org/docs/Link_security");
+}
diff --git a/src/modules/links.c b/src/modules/links.c
new file mode 100644
index 0000000..6036cc7
--- /dev/null
+++ b/src/modules/links.c
@@ -0,0 +1,77 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_links);
+
+#define MSG_LINKS 	"LINKS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"links",
+	"5.0",
+	"command /links", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_LINKS, cmd_links, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+CMD_FUNC(cmd_links)
+{
+	Client *acptr;
+	int flat = (FLAT_MAP && !IsOper(client)) ? 1 : 0;
+
+	if (!MyUser(client))
+		return;
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		/* Some checks */
+		if (HIDE_ULINES && IsULine(acptr) && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL))
+			continue;
+		if (flat)
+			sendnumeric(client, RPL_LINKS, acptr->name, me.name,
+			    1, (acptr->info[0] ? acptr->info : "(Unknown Location)"));
+		else
+			sendnumeric(client, RPL_LINKS, acptr->name, acptr->serv->up,
+			    acptr->hopcount, (acptr->info[0] ? acptr->info : "(Unknown Location)"));
+	}
+
+	sendnumeric(client, RPL_ENDOFLINKS, "*");
+}
diff --git a/src/modules/list.c b/src/modules/list.c
new file mode 100644
index 0000000..ab4bdea
--- /dev/null
+++ b/src/modules/list.c
@@ -0,0 +1,484 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/list.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_list);
+int send_list(Client *client);
+
+#define MSG_LIST 	"LIST"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"list",
+	"5.0",
+	"command /list", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+typedef struct ChannelListOptions ChannelListOptions;
+struct ChannelListOptions {
+	NameList *yeslist;
+	NameList *nolist;
+	unsigned int starthash;
+	short int showall;
+	unsigned short usermin;
+	int  usermax;
+	time_t currenttime;
+	time_t chantimemin;
+	time_t chantimemax;
+	time_t topictimemin;
+	time_t topictimemax;
+	void *lr_context;
+};
+
+/* Global variables */
+ModDataInfo *list_md = NULL;
+
+/* Macros */
+#define CHANNELLISTOPTIONS(x)       ((ChannelListOptions *)moddata_local_client(x, list_md).ptr)
+#define ALLOCATE_CHANNELLISTOPTIONS(client)	do { moddata_local_client(client, list_md).ptr = safe_alloc(sizeof(ChannelListOptions)); } while(0)
+#define free_list_options(client)		list_md_free(&moddata_local_client(client, list_md))
+
+#define DoList(x)               (MyUser((x)) && CHANNELLISTOPTIONS((x)))
+#define IsSendable(x)		(DBufLength(&x->local->sendQ) < 2048)
+
+/* Forward declarations */
+EVENT(send_queued_list_data);
+void list_md_free(ModData *md);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "list";
+	mreq.type = MODDATATYPE_LOCAL_CLIENT;
+	mreq.free = list_md_free;
+	list_md = ModDataAdd(modinfo->handle, mreq);
+	if (!list_md)
+	{
+		config_error("could not register list moddata");
+		return MOD_FAILED;
+	}
+
+	CommandAdd(modinfo->handle, MSG_LIST, cmd_list, MAXPARA, CMD_USER);
+	EventAdd(modinfo->handle, "send_queued_list_data", send_queued_list_data, NULL, 1500, 0);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Originally from bahamut, modified a bit for Unreal by codemastr
+ * also Opers can now see +s channels -- codemastr */
+
+/*
+ * parv[1] = channel
+ */
+CMD_FUNC(cmd_list)
+{
+	Channel *channel;
+	time_t currenttime = TStime();
+	char *name, *p = NULL;
+	ChannelListOptions *lopt = NULL;
+	int usermax, usermin, error = 0, doall = 0;
+	time_t chantimemin, chantimemax;
+	time_t topictimemin, topictimemax;
+	NameList *yeslist = NULL;
+	NameList *nolist = NULL;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("LIST");
+
+	static char *usage[] = {
+		"   Usage: /LIST <options>",
+		"",
+		"If you don't include any options, the default is to send you the",
+		"entire unfiltered list of channels. Below are the options you can",
+		"use, and what channels LIST will return when you use them.",
+		">number  List channels with more than <number> people.",
+		"<number  List channels with less than <number> people.",
+		"C>number List channels created between now and <number> minutes ago.",
+		"C<number List channels created earlier than <number> minutes ago.",
+		"T>number List channels whose topics are older than <number> minutes",
+		"         (Ie, they have not changed in the last <number> minutes.",
+		"T<number List channels whose topics are not older than <number> minutes.",
+		"*mask*   List channels that match *mask*",
+		"!*mask*  List channels that do not match *mask*",
+		NULL
+	};
+
+	/* Remote /LIST is not supported */
+	if (!MyUser(client))
+		return;
+
+	/* If a /LIST is in progress then a new one will cancel it */
+	if (CHANNELLISTOPTIONS(client))
+	{
+		sendnumeric(client, RPL_LISTEND);
+		free_list_options(client);
+		return;
+	}
+
+	if (parc < 2 || BadPtr(parv[1]))
+	{
+		sendnumeric(client, RPL_LISTSTART);
+		ALLOCATE_CHANNELLISTOPTIONS(client);
+		CHANNELLISTOPTIONS(client)->showall = 1;
+
+		if (send_list(client))
+		{
+			/* Save context since there is more to be sent */
+			CHANNELLISTOPTIONS(client)->lr_context = labeled_response_save_context();
+			labeled_response_inhibit_end = 1;
+		}
+
+		return;
+	}
+
+	if ((parc == 2) && (parv[1][0] == '?') && (parv[1][1] == '\0'))
+	{
+		char **ptr = usage;
+		for (; *ptr; ptr++)
+			sendnumeric(client, RPL_LISTSYNTAX, *ptr);
+		return;
+	}
+
+	sendnumeric(client, RPL_LISTSTART);
+
+	chantimemax = topictimemax = currenttime + 86400;
+	chantimemin = topictimemin = 0;
+	usermin = 0;		/* Minimum of 0 */
+	usermax = -1;		/* No maximum */
+
+	for (name = strtoken(&p, parv[1], ","); name && !error;
+	    name = strtoken(&p, NULL, ","))
+	{
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, name, maxtargets, "LIST");
+			break;
+		}
+		switch (*name)
+		{
+		  case '<':
+			  usermax = atoi(name + 1) - 1;
+			  doall = 1;
+			  break;
+		  case '>':
+			  usermin = atoi(name + 1) + 1;
+			  doall = 1;
+			  break;
+		  case 'C':
+		  case 'c':	/* Channel time -- creation time? */
+			  ++name;
+			  switch (*name++)
+			  {
+			    case '<':
+				    chantimemax = currenttime - 60 * atoi(name);
+				    doall = 1;
+				    break;
+			    case '>':
+				    chantimemin = currenttime - 60 * atoi(name);
+				    doall = 1;
+				    break;
+			    default:
+				    sendnumeric(client, ERR_LISTSYNTAX);
+				    error = 1;
+			  }
+			  break;
+#ifdef LIST_USE_T
+		  case 'T':
+		  case 't':
+			  ++name;
+			  switch (*name++)
+			  {
+			    case '<':
+				    topictimemax =
+					currenttime - 60 * atoi(name);
+				    doall = 1;
+				    break;
+			    case '>':
+				    topictimemin =
+					currenttime - 60 * atoi(name);
+				    doall = 1;
+				    break;
+			    default:
+				    sendnumeric(client, ERR_LISTSYNTAX,
+					"Bad list syntax, type /list ?");
+				    error = 1;
+			  }
+			  break;
+#endif
+		  default:	/* A channel, possibly with wildcards.
+				 * Thought for the future: Consider turning wildcard
+				 * processing on the fly.
+				 * new syntax: !channelmask will tell ircd to ignore
+				 * any channels matching that mask, and then
+				 * channelmask will tell ircd to send us a list of
+				 * channels only masking channelmask. Note: Specifying
+				 * a channel without wildcards will return that
+				 * channel even if any of the !channelmask masks
+				 * matches it.
+				 */
+			  if (*name == '!')
+			  {
+				  doall = 1;
+				  add_name_list(nolist, name + 1);
+			  }
+			  else if (strchr(name, '*') || strchr(name, '?'))
+			  {
+				  doall = 1;
+				  add_name_list(yeslist, name);
+			  }
+			  else	/* Just a normal channel */
+			  {
+				  channel = find_channel(name, NULL);
+				  if (channel && (ShowChannel(client, channel) || ValidatePermissionsForPath("channel:see:list:secret",client,NULL,channel,NULL))) {
+#ifdef LIST_SHOW_MODES
+					modebuf[0] = '[';
+					channel_modes(client, modebuf+1, parabuf, sizeof(modebuf)-1, sizeof(parabuf), channel);
+					if (modebuf[2] == '\0')
+						modebuf[0] = '\0';
+					else
+						strlcat(modebuf, "]", sizeof modebuf);
+#endif
+					  sendnumeric(client, RPL_LIST,
+					      name, channel->users,
+#ifdef LIST_SHOW_MODES
+					      modebuf,
+#endif
+					      (channel->topic ? channel->topic :
+					      ""));
+}
+			  }
+		}		/* switch */
+	}			/* while */
+
+	if (doall)
+	{
+		ALLOCATE_CHANNELLISTOPTIONS(client);
+		CHANNELLISTOPTIONS(client)->usermin = usermin;
+		CHANNELLISTOPTIONS(client)->usermax = usermax;
+		CHANNELLISTOPTIONS(client)->topictimemax = topictimemax;
+		CHANNELLISTOPTIONS(client)->topictimemin = topictimemin;
+		CHANNELLISTOPTIONS(client)->chantimemax = chantimemax;
+		CHANNELLISTOPTIONS(client)->chantimemin = chantimemin;
+		CHANNELLISTOPTIONS(client)->nolist = nolist;
+		CHANNELLISTOPTIONS(client)->yeslist = yeslist;
+
+		if (send_list(client))
+		{
+			/* Save context since there is more to be sent */
+			CHANNELLISTOPTIONS(client)->lr_context = labeled_response_save_context();
+			labeled_response_inhibit_end = 1;
+		}
+		return;
+	}
+
+	sendnumeric(client, RPL_LISTEND);
+}
+/*
+ * The function which sends the actual channel list back to the user.
+ * Operates by stepping through the hashtable, sending the entries back if
+ * they match the criteria.
+ * client = Local client to send the output back to.
+ * Taken from bahamut, modified for Unreal by codemastr.
+ */
+int send_list(Client *client)
+{
+	Channel *channel;
+	ChannelListOptions *lopt = CHANNELLISTOPTIONS(client);
+	unsigned int  hashnum;
+	int numsend = (get_sendq(client) / 768) + 1; /* (was previously hard-coded) */
+	/* ^
+	 * numsend = Number (roughly) of lines to send back. Once this number has
+	 * been exceeded, send_list will finish with the current hash bucket,
+	 * and record that number as the number to start next time send_list
+	 * is called for this user. So, this function will almost always send
+	 * back more lines than specified by numsend (though not by much,
+	 * assuming the hashing algorithm works well). Be conservative in your
+	 * choice of numsend. -Rak
+	 */	
+
+	/* Begin of /list? then send official channels. */
+	if ((lopt->starthash == 0) && conf_offchans)
+	{
+		ConfigItem_offchans *x;
+		for (x = conf_offchans; x; x = x->next)
+		{
+			if (find_channel(x->chname, NULL))
+				continue; /* exists, >0 users.. will be sent later */
+			sendnumeric(client, RPL_LIST, x->chname,
+			    0,
+#ifdef LIST_SHOW_MODES
+			    "",
+#endif					    
+			    x->topic ? x->topic : "");
+		}
+	}
+
+	for (hashnum = lopt->starthash; hashnum < CHAN_HASH_TABLE_SIZE; hashnum++)
+	{
+		if (numsend > 0)
+			for (channel = hash_get_chan_bucket(hashnum);
+			    channel; channel = channel->hnextch)
+			{
+				if (SecretChannel(channel)
+				    && !IsMember(client, channel)
+				    && !ValidatePermissionsForPath("channel:see:list:secret",client,NULL,channel,NULL))
+					continue;
+
+				/* set::hide-list { deny-channel } */
+				if (!IsOper(client) && iConf.hide_list && find_channel_allowed(client, channel->chname))
+					continue;
+
+				/* Similarly, hide unjoinable channels for non-ircops since it would be confusing */
+				if (!IsOper(client) && !valid_channelname(channel->chname))
+					continue;
+
+				/* Much more readable like this -- codemastr */
+				if ((!lopt->showall))
+				{
+					/* User count must be in range */
+					if ((channel->users < lopt->usermin) || 
+					    ((lopt->usermax >= 0) && (channel->users > 
+					    lopt->usermax)))
+						continue;
+
+					/* Creation time must be in range */
+					if ((channel->creationtime && (channel->creationtime <
+					    lopt->chantimemin)) || (channel->creationtime >
+					    lopt->chantimemax))
+						continue;
+
+					/* Topic time must be in range */
+					if ((channel->topic_time < lopt->topictimemin) ||
+					    (channel->topic_time > lopt->topictimemax))
+						continue;
+
+					/* Must not be on nolist (if it exists) */
+					if (lopt->nolist && find_name_list_match(lopt->nolist, channel->chname))
+						continue;
+
+					/* Must be on yeslist (if it exists) */
+					if (lopt->yeslist && !find_name_list_match(lopt->yeslist, channel->chname))
+						continue;
+				}
+#ifdef LIST_SHOW_MODES
+				modebuf[0] = '[';
+				channel_modes(client, modebuf+1, parabuf, sizeof(modebuf)-1, sizeof(parabuf), channel);
+				if (modebuf[2] == '\0')
+					modebuf[0] = '\0';
+				else
+					strlcat(modebuf, "]", sizeof modebuf);
+#endif
+				if (!ValidatePermissionsForPath("channel:see:list:secret",client,NULL,channel,NULL))
+					sendnumeric(client, RPL_LIST,
+					    ShowChannel(client,
+					    channel) ? channel->chname :
+					    "*", channel->users,
+#ifdef LIST_SHOW_MODES
+					    ShowChannel(client, channel) ?
+					    modebuf : "",
+#endif
+					    ShowChannel(client,
+					    channel) ? (channel->topic ?
+					    channel->topic : "") : "");
+				else
+					sendnumeric(client, RPL_LIST, channel->chname,
+					    channel->users,
+#ifdef LIST_SHOW_MODES
+					    modebuf,
+#endif					    
+					    (channel->topic ? channel->topic : ""));
+				numsend--;
+			}
+		else
+			break;
+	}
+
+	/* All done */
+	if (hashnum == CHAN_HASH_TABLE_SIZE)
+	{
+		sendnumeric(client, RPL_LISTEND);
+		free_list_options(client);
+		return 0;
+	}
+
+	/* 
+	 * We've exceeded the limit on the number of channels to send back
+	 * at once.
+	 */
+	lopt->starthash = hashnum;
+	return 1;
+}
+
+EVENT(send_queued_list_data)
+{
+	Client *client, *saved;
+	list_for_each_entry_safe(client, saved, &lclient_list, lclient_node)
+	{
+		if (DoList(client) && IsSendable(client))
+		{
+			labeled_response_set_context(CHANNELLISTOPTIONS(client)->lr_context);
+			if (!send_list(client))
+			{
+				/* We are done! */
+				labeled_response_force_end();
+			}
+			labeled_response_set_context(NULL);
+		}
+	}
+}
+
+/** Called on client exit: free the channel list options of this user */
+void list_md_free(ModData *md)
+{
+	ChannelListOptions *lopt = (ChannelListOptions *)md->ptr;
+
+	if (!lopt)
+		return;
+
+	free_entire_name_list(lopt->yeslist);
+	free_entire_name_list(lopt->nolist);
+	safe_free(lopt->lr_context);
+
+	safe_free(md->ptr);
+}
diff --git a/src/modules/locops.c b/src/modules/locops.c
new file mode 100644
index 0000000..5437385
--- /dev/null
+++ b/src/modules/locops.c
@@ -0,0 +1,76 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_locops);
+
+#define MSG_LOCOPS 	"LOCOPS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"locops",
+	"5.0",
+	"command /locops", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_LOCOPS, cmd_locops, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_locops (write to opers who are +g currently online *this* server)
+**      parv[1] = message text
+*/
+CMD_FUNC(cmd_locops)
+{
+	char *message;
+
+	message = parc > 1 ? parv[1] : NULL;
+
+	if (BadPtr(message))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "LOCOPS");
+		return;
+	}
+	if (MyUser(client) && !ValidatePermissionsForPath("chat:locops",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	sendto_umode(UMODE_OPER, "from %s: %s", client->name, message);
+}
diff --git a/src/modules/lusers.c b/src/modules/lusers.c
new file mode 100644
index 0000000..4059eb4
--- /dev/null
+++ b/src/modules/lusers.c
@@ -0,0 +1,94 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/lusers.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_lusers);
+
+#define MSG_LUSERS 	"LUSERS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"lusers",
+	"5.0",
+	"command /lusers", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_LUSERS, cmd_lusers, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * parv[1] = server to query
+ */
+CMD_FUNC(cmd_lusers)
+{
+char flatmap;
+
+	if (hunt_server(client, recv_mtags, ":%s LUSERS :%s", 1, parc, parv) != HUNTED_ISME)
+		return;
+
+	flatmap = (FLAT_MAP && !ValidatePermissionsForPath("server:info:lusers",client,NULL,NULL,NULL)) ? 1 : 0;
+
+	/* Just to correct results ---Stskeeps */
+	if (irccounts.clients > irccounts.global_max)
+		irccounts.global_max = irccounts.clients;
+	if (irccounts.me_clients > irccounts.me_max)
+		irccounts.me_max = irccounts.me_clients;
+
+	sendnumeric(client, RPL_LUSERCLIENT,
+	    irccounts.clients - irccounts.invisible, irccounts.invisible,
+	    irccounts.servers);
+
+	if (irccounts.operators)
+		sendnumeric(client, RPL_LUSEROP, irccounts.operators);
+	if (irccounts.unknown)
+		sendnumeric(client, RPL_LUSERUNKNOWN, irccounts.unknown);
+	if (irccounts.channels)
+		sendnumeric(client, RPL_LUSERCHANNELS, irccounts.channels);
+	sendnumeric(client, RPL_LUSERME, irccounts.me_clients, flatmap ? 0 : irccounts.me_servers);
+	sendnumeric(client, RPL_LOCALUSERS, irccounts.me_clients, irccounts.me_max, irccounts.me_clients, irccounts.me_max);
+	sendnumeric(client, RPL_GLOBALUSERS, irccounts.clients, irccounts.global_max, irccounts.clients, irccounts.global_max);
+	if ((irccounts.me_clients + irccounts.me_servers) > max_connection_count)
+	{
+		max_connection_count =
+		    irccounts.me_clients + irccounts.me_servers;
+		if (max_connection_count % 10 == 0)	/* only send on even tens */
+			sendto_ops("New record on this server: %d connections (%d clients)",
+			    max_connection_count, irccounts.me_clients);
+	}
+}
diff --git a/src/modules/map.c b/src/modules/map.c
new file mode 100644
index 0000000..a0c8aa4
--- /dev/null
+++ b/src/modules/map.c
@@ -0,0 +1,173 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_map);
+
+#define MSG_MAP 	"MAP"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"map",
+	"5.0",
+	"command /map", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_MAP, cmd_map, MAXPARA, CMD_USER);
+	ISupportAdd(modinfo->handle, "MAP", NULL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * New /MAP format -Potvin
+ * dump_map function.
+ */
+static void dump_map(Client *client, Client *server, char *mask, int prompt_length, int length)
+{
+	static char prompt[64];
+	char *p = &prompt[prompt_length];
+	int  cnt = 0;
+	Client *acptr;
+
+	*p = '\0';
+
+	if (prompt_length > 60)
+		sendnumeric(client, RPL_MAPMORE, prompt, length, server->name);
+	else
+	{
+		sendnumeric(client, RPL_MAP, prompt,
+		            length, server->name, server->serv->users, IsOper(client) ? server->id : "");
+		cnt = 0;
+	}
+
+	if (prompt_length > 0)
+	{
+		p[-1] = ' ';
+		if (p[-2] == '`')
+			p[-2] = ' ';
+	}
+	if (prompt_length > 60)
+		return;
+
+	strcpy(p, "|-");
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if (acptr->srvptr != server ||
+ 		    (IsULine(acptr) && HIDE_ULINES && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL)))
+			continue;
+		SetMap(acptr);
+		cnt++;
+	}
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if (IsULine(acptr) && HIDE_ULINES && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL))
+			continue;
+		if (acptr->srvptr != server)
+			continue;
+		if (!IsMap(acptr))
+			continue;
+		if (--cnt == 0)
+			*p = '`';
+		dump_map(client, acptr, mask, prompt_length + 2, length - 2);
+	}
+
+	if (prompt_length > 0)
+		p[-1] = '-';
+}
+
+void dump_flat_map(Client *client, Client *server, int length)
+{
+	char buf[4];
+	Client *acptr;
+	int cnt = 0, hide_ulines;
+
+	hide_ulines = (HIDE_ULINES && !ValidatePermissionsForPath("server:info:map:ulines",client,NULL,NULL,NULL)) ? 1 : 0;
+
+	sendnumeric(client, RPL_MAP, "", length, server->name, server->serv->users, "");
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if ((IsULine(acptr) && hide_ulines) || (acptr == server))
+			continue;
+		cnt++;
+	}
+
+	strcpy(buf, "|-");
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if ((IsULine(acptr) && hide_ulines) || (acptr == server))
+			continue;
+		if (--cnt == 0)
+			*buf = '`';
+		sendnumeric(client, RPL_MAP, buf, length-2, acptr->name, acptr->serv->users, "");
+	}
+}
+
+/*
+** New /MAP format. -Potvin
+** cmd_map (NEW)
+**
+**      parv[1] = server mask
+**/
+CMD_FUNC(cmd_map)
+{
+	Client *acptr;
+	int  longest = strlen(me.name);
+
+	if (parc < 2)
+		parv[1] = "*";
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		if ((strlen(acptr->name) + acptr->hopcount * 2) > longest)
+			longest = strlen(acptr->name) + acptr->hopcount * 2;
+	}
+
+	if (longest > 60)
+		longest = 60;
+	longest += 2;
+
+	if (FLAT_MAP && !ValidatePermissionsForPath("server:info:map:real-map",client,NULL,NULL,NULL))
+		dump_flat_map(client, &me, longest);
+	else
+		dump_map(client, &me, "*", 0, longest);
+
+	sendnumeric(client, RPL_MAPEND);
+}
diff --git a/src/modules/md.c b/src/modules/md.c
new file mode 100644
index 0000000..485e8a4
--- /dev/null
+++ b/src/modules/md.c
@@ -0,0 +1,438 @@
+/*
+ * Module Data module (command MD)
+ * (C) Copyright 2014-.. Bram Matthys and The UnrealIRCd Team
+ *
+ * This file contains all commands that deal with sending and
+ * receiving module data over the network.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"md",
+	"5.0",
+	"command /MD (S2S only)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+CMD_FUNC(cmd_md);
+void _broadcast_md_client(ModDataInfo *mdi, Client *client, ModData *md);
+void _broadcast_md_channel(ModDataInfo *mdi, Channel *channel, ModData *md);
+void _broadcast_md_member(ModDataInfo *mdi, Channel *channel, Member *m, ModData *md);
+void _broadcast_md_membership(ModDataInfo *mdi, Client *client, Membership *m, ModData *md);
+void _broadcast_md_globalvar(ModDataInfo *mdi, ModData *md);
+void _broadcast_md_client_cmd(Client *except, Client *sender, Client *client, char *varname, char *value);
+void _broadcast_md_channel_cmd(Client *except, Client *sender, Channel *channel, char *varname, char *value);
+void _broadcast_md_member_cmd(Client *except, Client *sender, Channel *channel, Client *client, char *varname, char *value);
+void _broadcast_md_membership_cmd(Client *except, Client *sender, Client *client, Channel *channel, char *varname, char *value);
+void _broadcast_md_globalvar_cmd(Client *except, Client *sender, char *varname, char *value);
+void _send_moddata_client(Client *srv, Client *client);
+void _send_moddata_channel(Client *srv, Channel *channel);
+void _send_moddata_members(Client *srv);
+void _broadcast_moddata_client(Client *client);
+
+extern MODVAR ModDataInfo *MDInfo;
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_CLIENT, _broadcast_md_client);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_CHANNEL, _broadcast_md_channel);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_MEMBER, _broadcast_md_member);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_MEMBERSHIP, _broadcast_md_membership);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_GLOBALVAR, _broadcast_md_globalvar);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_CLIENT_CMD, _broadcast_md_client_cmd);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_CHANNEL_CMD, _broadcast_md_channel_cmd);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_MEMBER_CMD, _broadcast_md_member_cmd);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_MEMBERSHIP_CMD, _broadcast_md_membership_cmd);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MD_GLOBALVAR_CMD, _broadcast_md_globalvar_cmd);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_MODDATA_CLIENT, _send_moddata_client);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_MODDATA_CHANNEL, _send_moddata_channel);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_MODDATA_MEMBERS, _send_moddata_members);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_MODDATA_CLIENT, _broadcast_moddata_client);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, "MD", cmd_md, MAXPARA, CMD_SERVER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Set ModData command.
+ *  Syntax: MD <type> <object name> <variable name> <value>
+ * Example: MD client Syzop sslfp 123456789
+ *
+ * If <value> is ommitted, the variable is unset & freed.
+ *
+ * The appropriate module is called to set the data (unserialize) and
+ * then the command is broadcasted to all other servers.
+ *
+ * Technical documentation (if writing services) is available at:
+ * https://www.unrealircd.org/docs/Server_protocol:MD_command
+ * Module API documentation (if writing an UnrealIRCd module):
+ * https://www.unrealircd.org/docs/Dev:Module_Storage
+ */
+CMD_FUNC(cmd_md)
+{
+	char *type, *objname, *varname, *value;
+	ModDataInfo *md;
+
+	if (!IsServer(client) || (parc < 4) || BadPtr(parv[3]))
+		return;
+
+	type = parv[1];
+	objname = parv[2];
+	varname = parv[3];
+	value = parv[4]; /* may be NULL */
+
+	if (!strcmp(type, "client"))
+	{
+		Client *target = find_client(objname, NULL);
+		md = findmoddata_byname(varname, MODDATATYPE_CLIENT);
+		if (!md || !md->unserialize || !target)
+			return;
+		if (value)
+			md->unserialize(value, &moddata_client(target, md));
+		else
+		{
+			if (md->free)
+				md->free(&moddata_client(target, md));
+			memset(&moddata_client(target, md), 0, sizeof(ModData));
+		}
+		/* Pass on to other servers */
+		broadcast_md_client_cmd(client->direction, client, target, varname, value);
+	} else
+	if (!strcmp(type, "channel"))
+	{
+		Channel *channel = find_channel(objname, NULL);
+		md = findmoddata_byname(varname, MODDATATYPE_CHANNEL);
+		if (!md || !md->unserialize || !channel)
+			return;
+		if (value)
+			md->unserialize(value, &moddata_channel(channel, md));
+		else
+		{
+			if (md->free)
+				md->free(&moddata_channel(channel, md));
+			memset(&moddata_channel(channel, md), 0, sizeof(ModData));
+		}
+		/* Pass on to other servers */
+		broadcast_md_channel_cmd(client->direction, client, channel, varname, value);
+	} else
+	if (!strcmp(type, "member"))
+	{
+		Client *target;
+		Channel *channel;
+		Member *m;
+		char *p;
+
+		/* for member the object name is like '#channel/Syzop' */
+		p = strchr(objname, ':');
+		if (!p)
+			return;
+		*p++ = '\0';
+
+		channel = find_channel(objname, NULL);
+		if (!channel)
+			return;
+
+		target = find_person(p, NULL);
+		if (!target)
+			return;
+
+		m = find_member_link(channel->members, target);
+		if (!m)
+			return;
+
+		md = findmoddata_byname(varname, MODDATATYPE_MEMBER);
+		if (!md || !md->unserialize)
+			return;
+
+		if (value)
+			md->unserialize(value, &moddata_member(m, md));
+		else
+		{
+			if (md->free)
+				md->free(&moddata_member(m, md));
+			memset(&moddata_member(m, md), 0, sizeof(ModData));
+		}
+		/* Pass on to other servers */
+		broadcast_md_member_cmd(client->direction, client, channel, target, varname, value);
+	} else
+	if (!strcmp(type, "membership"))
+	{
+		Client *target;
+		Channel *channel;
+		Membership *m;
+		char *p;
+
+		/* for membership the object name is like 'Syzop/#channel' */
+		p = strchr(objname, ':');
+		if (!p)
+			return;
+		*p++ = '\0';
+
+		target = find_person(objname, NULL);
+		if (!target)
+			return;
+
+		channel = find_channel(p, NULL);
+		if (!channel)
+			return;
+
+		m = find_membership_link(target->user->channel, channel);
+		if (!m)
+			return;
+
+		md = findmoddata_byname(varname, MODDATATYPE_MEMBERSHIP);
+		if (!md || !md->unserialize)
+			return;
+
+		if (value)
+			md->unserialize(value, &moddata_membership(m, md));
+		else
+		{
+			if (md->free)
+				md->free(&moddata_membership(m, md));
+			memset(&moddata_membership(m, md), 0, sizeof(ModData));
+		}
+		/* Pass on to other servers */
+		broadcast_md_membership_cmd(client->direction, client, target, channel, varname, value);
+	} else
+	if (!strcmp(type, "globalvar"))
+	{
+		/* objname is ignored */
+		md = findmoddata_byname(varname, MODDATATYPE_GLOBAL_VARIABLE);
+		if (!md || !md->unserialize)
+			return;
+		if (value)
+			md->unserialize(value, &moddata_global_variable(md));
+		else
+		{
+			if (md->free)
+				md->free(&moddata_global_variable(md));
+			memset(&moddata_global_variable(md), 0, sizeof(ModData));
+		}
+		/* Pass on to other servers */
+		broadcast_md_globalvar_cmd(client->direction, client, varname, value);
+	}
+}
+
+void _broadcast_md_client_cmd(Client *except, Client *sender, Client *client, char *varname, char *value)
+{
+	if (value)
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s %s :%s",
+			sender->id, "client", client->id, varname, value);
+	}
+	else
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s %s",
+			sender->id, "client", client->id, varname);
+	}
+}
+
+void _broadcast_md_channel_cmd(Client *except, Client *sender, Channel *channel, char *varname, char *value)
+{
+	if (value)
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s %s :%s",
+			sender->id, "channel", channel->chname, varname, value);
+	else
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s %s",
+			sender->id, "channel", channel->chname, varname);
+}
+
+void _broadcast_md_member_cmd(Client *except, Client *sender, Channel *channel, Client *client, char *varname, char *value)
+{
+	if (value)
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s:%s %s :%s",
+			sender->id, "member", channel->chname, client->id, varname, value);
+	}
+	else
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s:%s %s",
+			sender->id, "member", channel->chname, client->id, varname);
+	}
+}
+
+void _broadcast_md_membership_cmd(Client *except, Client *sender, Client *client, Channel *channel, char *varname, char *value)
+{
+	if (value)
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s:%s %s :%s",
+			sender->id, "membership", client->id, channel->chname, varname, value);
+	}
+	else
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s:%s %s",
+			sender->id, "membership", client->id, channel->chname, varname);
+	}
+}
+
+void _broadcast_md_globalvar_cmd(Client *except, Client *sender, char *varname, char *value)
+{
+	if (value)
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s :%s",
+			sender->id, "globalvar", varname, value);
+	}
+	else
+	{
+		sendto_server(except, 0, 0, NULL, ":%s MD %s %s",
+			sender->id, "globalvar", varname);
+	}
+}
+
+/** Send module data update to all servers.
+ * @param mdi    Module Data Info structure (which you received from ModDataAdd)
+ * @param client The affected client
+ * @param md     The ModData. May be NULL for unset.
+ */
+ 
+void _broadcast_md_client(ModDataInfo *mdi, Client *client, ModData *md)
+{
+	char *value = md ? mdi->serialize(md) : NULL;
+
+	broadcast_md_client_cmd(NULL, &me, client, mdi->name, value);
+}
+
+void _broadcast_md_channel(ModDataInfo *mdi, Channel *channel, ModData *md)
+{
+	char *value = md ? mdi->serialize(md) : NULL;
+
+	broadcast_md_channel_cmd(NULL, &me, channel, mdi->name, value);
+}
+
+void _broadcast_md_member(ModDataInfo *mdi, Channel *channel, Member *m, ModData *md)
+{
+	char *value = md ? mdi->serialize(md) : NULL;
+
+	broadcast_md_member_cmd(NULL, &me, channel, m->client, mdi->name, value);
+}
+
+void _broadcast_md_membership(ModDataInfo *mdi, Client *client, Membership *m, ModData *md)
+{
+	char *value = md ? mdi->serialize(md) : NULL;
+
+	broadcast_md_membership_cmd(NULL, &me, client, m->channel, mdi->name, value);
+}
+
+void _broadcast_md_globalvar(ModDataInfo *mdi, ModData *md)
+{
+	char *value = md ? mdi->serialize(md) : NULL;
+
+	broadcast_md_globalvar_cmd(NULL, &me, mdi->name, value);
+}
+
+/** Send all moddata attached to client 'client' to remote server 'srv' (if the module wants this), called by .. */
+void _send_moddata_client(Client *srv, Client *client)
+{
+	ModDataInfo *mdi;
+
+	for (mdi = MDInfo; mdi; mdi = mdi->next)
+	{
+		if ((mdi->type == MODDATATYPE_CLIENT) && mdi->sync && mdi->serialize)
+		{
+			char *value = mdi->serialize(&moddata_client(client, mdi));
+			if (value)
+				sendto_one(srv, NULL, ":%s MD %s %s %s :%s",
+					me.id, "client", client->id, mdi->name, value);
+		}
+	}
+}
+
+/** Send all moddata attached to channel 'channel' to remote server 'srv' (if the module wants this), called by SJOIN */
+void _send_moddata_channel(Client *srv, Channel *channel)
+{
+	ModDataInfo *mdi;
+
+	for (mdi = MDInfo; mdi; mdi = mdi->next)
+	{
+		if ((mdi->type == MODDATATYPE_CHANNEL) && mdi->sync && mdi->serialize)
+		{
+			char *value = mdi->serialize(&moddata_channel(channel, mdi));
+			if (value)
+				sendto_one(srv, NULL, ":%s MD %s %s %s :%s",
+					me.id, "channel", channel->chname, mdi->name, value);
+		}
+	}
+}
+
+/** Send all moddata attached to member & memberships for 'channel' to remote server 'srv' (if the module wants this), called by SJOIN */
+void _send_moddata_members(Client *srv)
+{
+	ModDataInfo *mdi;
+	Channel *channel;
+	Client *client;
+
+	for (channel = channels; channel; channel = channel->nextch)
+	{
+		Member *m;
+		for (m = channel->members; m; m = m->next)
+		{
+			client = m->client;
+			if (client->direction == srv)
+				continue; /* from srv's direction */
+			for (mdi = MDInfo; mdi; mdi = mdi->next)
+			{
+				if ((mdi->type == MODDATATYPE_MEMBER) && mdi->sync && mdi->serialize)
+				{
+					char *value = mdi->serialize(&moddata_member(m, mdi));
+					if (value)
+						sendto_one(srv, NULL, ":%s MD %s %s:%s %s :%s",
+							me.id, "member", channel->chname, client->id, mdi->name, value);
+				}
+			}
+		}
+	}
+
+	list_for_each_entry(client, &client_list, client_node)
+	{
+		Membership *m;
+		if (!IsUser(client) || !client->user)
+			continue;
+
+		if (client->direction == srv)
+			continue; /* from srv's direction */
+
+		for (m = client->user->channel; m; m = m->next)
+		{
+			for (mdi = MDInfo; mdi; mdi = mdi->next)
+			{
+				if ((mdi->type == MODDATATYPE_MEMBERSHIP) && mdi->sync && mdi->serialize)
+				{
+					char *value = mdi->serialize(&moddata_membership(m, mdi));
+					if (value)
+						sendto_one(srv, NULL, ":%s MD %s %s:%s %s :%s",
+							me.id, "membership", client->id, m->channel->chname, mdi->name, value);
+				}
+			}
+		}
+	}
+}
+
+/** Broadcast moddata attached to client 'client' to all servers. */
+void _broadcast_moddata_client(Client *client)
+{
+	Client *acptr;
+
+	list_for_each_entry(acptr, &server_list, special_node)
+	{
+		send_moddata_client(acptr, client);
+	}
+}
diff --git a/src/modules/mdex.c b/src/modules/mdex.c
new file mode 100644
index 0000000..26388fb
--- /dev/null
+++ b/src/modules/mdex.c
@@ -0,0 +1,317 @@
+/*
+ * Example module for ModData usage
+ * NEVER LOAD THIS ON A LIVE SERVER!!
+ *
+ * (C) Copyright 2014 Bram Matthys and the UnrealIRCd team
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_mdex);
+
+ModuleHeader MOD_HEADER
+  = {
+	"mdex",
+	"5.0",
+	"Command /MDEX",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+ModDataInfo *mdex_cli = NULL, *mdex_chan = NULL, *mdex_member = NULL, *mdex_membership = NULL;
+void mdex_free(ModData *m);
+char *mdex_serialize(ModData *m);
+void mdex_unserialize(char *str, ModData *m);
+
+MOD_INIT()
+{
+ModDataInfo mreq;
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "mdex";
+	mreq.free = mdex_free;
+	mreq.serialize = mdex_serialize;
+	mreq.unserialize = mdex_unserialize;
+	mreq.sync = 1;
+	mreq.type = MODDATATYPE_CLIENT;
+	mdex_cli = ModDataAdd(modinfo->handle, mreq);
+	if (!mdex_cli)
+	        abort();
+	mreq.type = MODDATATYPE_CHANNEL;
+	mdex_chan = ModDataAdd(modinfo->handle, mreq);
+	if (!mdex_cli)
+	        abort();
+	mreq.type = MODDATATYPE_MEMBER;
+	mdex_member = ModDataAdd(modinfo->handle, mreq);
+	if (!mdex_cli)
+	        abort();
+	mreq.type = MODDATATYPE_MEMBERSHIP;
+	mdex_membership = ModDataAdd(modinfo->handle, mreq);
+	if (!mdex_cli)
+	        abort();
+
+	CommandAdd(modinfo->handle, "MDEX", cmd_mdex, MAXPARA, CMD_USER);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+CMD_FUNC(cmd_mdex)
+{
+	char *action, *type, *objname, *varname, *value;
+	ModDataInfo *md;
+
+	if (!IsOper(client) || (parc < 5) || BadPtr(parv[4]))
+		return 0;
+
+	action = parv[1]; /* get / set */
+	type = parv[2];
+	objname = parv[3];
+#ifdef DEBUGMODE
+	varname = parv[4];
+#else
+	varname = "mdex";
+#endif
+	value = parv[5]; /* may be NULL */
+
+	if (!strcmp(action, "set"))
+	{
+		if (!strcmp(type, "client"))
+		{
+			Client *target = find_client(objname, NULL);
+			md = findmoddata_byname(varname, MODDATATYPE_CLIENT);
+			if (!md || !md->unserialize || !md->free || !target)
+				return 0;
+			if (value)
+				md->unserialize(value, &moddata_client(target, md));
+			else
+			{
+				md->free(&moddata_client(target, md));
+				memset(&moddata_client(target, md), 0, sizeof(ModData));
+			}
+			broadcast_md_client(md, target, &moddata_client(target, md));
+		} else
+		if (!strcmp(type, "channel"))
+		{
+			Channel *channel = find_channel(objname, NULL);
+			md = findmoddata_byname(varname, MODDATATYPE_CHANNEL);
+			if (!md || !md->unserialize || !md->free || !channel)
+				return 0;
+			if (value)
+				md->unserialize(value, &moddata_channel(channel, md));
+			else
+			{
+				md->free(&moddata_channel(channel, md));
+				memset(&moddata_channel(channel, md), 0, sizeof(ModData));
+			}
+			broadcast_md_channel(md, channel, &moddata_channel(channel, md));
+		} else
+		if (!strcmp(type, "member"))
+		{
+			Client *target;
+			Channel *channel;
+			Member *m;
+			char *p;
+			
+			/* for member the object name is like '#channel/Syzop' */
+			p = strchr(objname, ':');
+			if (!p)
+				return 0;
+			*p++ = '\0';
+
+			channel = find_channel(objname, NULL);
+			if (!channel)
+				return 0;
+			
+			target = find_person(p, NULL);
+			if (!target)
+				return 0;
+
+			m = find_member_link(channel->members, target);
+			if (!m)
+				return 0;
+			
+			md = findmoddata_byname(varname, MODDATATYPE_MEMBER);
+			if (!md || !md->unserialize || !md->free)
+				return 0;
+
+			if (value)
+				md->unserialize(value, &moddata_member(m, md));
+			else
+			{
+				md->free(&moddata_member(m, md));
+				memset(&moddata_member(m, md), 0, sizeof(ModData));
+			}
+			broadcast_md_member(md, channel, m, &moddata_member(m, md));
+		} else
+		if (!strcmp(type, "membership"))
+		{
+			Client *target;
+			Channel *channel;
+			Membership *m;
+			char *p;
+			
+			/* for membership the object name is like 'Syzop/#channel' */
+			p = strchr(objname, ':');
+			if (!p)
+				return 0;
+			*p++ = '\0';
+
+			target = find_person(objname, NULL);
+			if (!target)
+				return 0;
+			
+			channel = find_channel(p, NULL);
+			if (!channel)
+				return 0;
+
+			m = find_membership_link(target->user->channel, channel);
+			if (!m)
+				return 0;
+			
+			md = findmoddata_byname(varname, MODDATATYPE_MEMBERSHIP);
+			if (!md || !md->unserialize || !md->free)
+				return 0;
+
+			if (value)
+				md->unserialize(value, &moddata_membership(m, md));
+			else
+			{
+				md->free(&moddata_membership(m, md));
+				memset(&moddata_membership(m, md), 0, sizeof(ModData));
+			}
+			broadcast_md_membership(md, target, m, &moddata_membership(m, md));
+		}
+	} else
+	if (!strcmp(action, "get"))
+	{
+		if (!strcmp(type, "client"))
+		{
+			Client *target = find_client(objname, NULL);
+			char *str;
+			
+			md = findmoddata_byname(varname, MODDATATYPE_CLIENT);
+			if (!md || !md->serialize || !target)
+				return 0;
+			str = md->serialize(&moddata_client(target, md));
+			if (str)
+				sendnotice(client, "Value: %s", str ? str : "<null>");
+			else
+				sendnotice(client, "No value set");
+		} else
+		if (!strcmp(type, "channel"))
+		{
+			Channel *channel = find_channel(objname, NULL);
+			char *str;
+			
+			md = findmoddata_byname(varname, MODDATATYPE_CHANNEL);
+			if (!md || !md->serialize || !channel)
+				return 0;
+			str = md->serialize(&moddata_channel(channel, md));
+			if (str)
+				sendnotice(client, "Value: %s", str ? str : "<null>");
+			else
+				sendnotice(client, "No value set");
+		} else
+		if (!strcmp(type, "member"))
+		{
+			Client *target;
+			Channel *channel;
+			Member *m;
+			char *p, *str;
+			
+			/* for member the object name is like '#channel/Syzop' */
+			p = strchr(objname, ':');
+			if (!p)
+				return 0;
+			*p++ = '\0';
+
+			channel = find_channel(objname, NULL);
+			if (!channel)
+				return 0;
+			
+			target = find_person(p, NULL);
+			if (!target)
+				return 0;
+
+			m = find_member_link(channel->members, target);
+			if (!m)
+				return 0;
+			
+			md = findmoddata_byname(varname, MODDATATYPE_MEMBER);
+			if (!md || !md->serialize)
+				return 0;
+
+			str = md->serialize(&moddata_member(m, md));
+			if (str)
+				sendnotice(client, "Value: %s", str ? str : "<null>");
+			else
+				sendnotice(client, "No value set");
+		} else
+		if (!strcmp(type, "membership"))
+		{
+			Client *target;
+			Channel *channel;
+			Membership *m;
+			char *p, *str;
+			
+			/* for membership the object name is like 'Syzop/#channel' */
+			p = strchr(objname, ':');
+			if (!p)
+				return 0;
+			*p++ = '\0';
+
+			target = find_person(objname, NULL);
+			if (!target)
+				return 0;
+			
+			channel = find_channel(p, NULL);
+			if (!channel)
+				return 0;
+
+			m = find_membership_link(target->user->channel, channel);
+			if (!m)
+				return 0;
+			
+			md = findmoddata_byname(varname, MODDATATYPE_MEMBERSHIP);
+			if (!md || !md->serialize)
+				return 0;
+
+			str = md->serialize(&moddata_membership(m, md));
+			if (str)
+				sendnotice(client, "Value: %s", str ? str : "<null>");
+			else
+				sendnotice(client, "No value set");
+		}
+	}
+	
+	return 0;
+}
+
+void mdex_free(ModData *m)
+{
+	safe_free(m->str);
+}
+
+char *mdex_serialize(ModData *m)
+{
+	if (!m->str)
+		return NULL;
+	return m->str;
+}
+
+void mdex_unserialize(char *str, ModData *m)
+{
+	safe_strdup(m->str, str);
+}
diff --git a/src/modules/message-ids.c b/src/modules/message-ids.c
new file mode 100644
index 0000000..4b29f1f
--- /dev/null
+++ b/src/modules/message-ids.c
@@ -0,0 +1,166 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/message-ids.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"message-ids",
+	"5.0",
+	"msgid CAP",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/** The length of a standard 'msgid' tag (note that special
+ * msgid tags will be longer).
+ * The 22 alphanumeric characters provide slightly more
+ * than 128 bits of randomness (62^22 > 2^128).
+ * See mtag_add_or_inherit_msgid() for more information.
+ */
+#define MSGIDLEN	22
+
+/* Variables */
+long CAP_ACCOUNT_TAG = 0L;
+
+int msgid_mtag_is_ok(Client *client, char *name, char *value);
+void mtag_add_or_inherit_msgid(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature);
+
+MOD_INIT()
+{
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "msgid";
+	mtag.is_ok = msgid_mtag_is_ok;
+	mtag.flags = MTAG_HANDLER_FLAGS_NO_CAP_NEEDED;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	HookAddVoid(modinfo->handle, HOOKTYPE_NEW_MESSAGE, 0, mtag_add_or_inherit_msgid);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This function verifies if the client sending
+ * 'msgid' is permitted to do so and uses a permitted
+ * syntax.
+ * We simply allow msgid ONLY from servers and with any syntax.
+ */
+int msgid_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (IsServer(client) && !BadPtr(value))
+		return 1;
+
+	return 0;
+}
+
+/** Generate a msgid.
+ * @returns a MessageTag struct that you can use directly.
+ * @note
+ * Apparently there has been some discussion on what method to use to
+ * generate msgid's. I am not going to list them here. Just saying that
+ * they have been considered and we chose to go for a string that contains
+ * 128+ bits of randomness, which has an extremely low chance of colissions.
+ * Or, to quote wikipedia on the birthday attack problem:
+ * "For comparison, 10^-18 to 10^-15 is the uncorrectable bit error rate
+ *  of a typical hard disk. In theory, hashes or UUIDs being 128 bits,
+ *  should stay within that range until about 820 billion outputs"
+ * For reference, 10^-15 is 0.000000000000001%
+ * The main reasons for this choice are: that it is extremely simple,
+ * the chance of making a mistake in an otherwise complex implementation
+ * is nullified and we don't risk "leaking" any details.
+ */
+MessageTag *mtag_generate_msgid(void)
+{
+	MessageTag *m = safe_alloc(sizeof(MessageTag));
+	safe_strdup(m->name, "msgid");
+	m->value = safe_alloc(MSGIDLEN+1);
+	gen_random_alnum(m->value, MSGIDLEN);
+	return m;
+}
+
+
+void mtag_add_or_inherit_msgid(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature)
+{
+	MessageTag *m = find_mtag(recv_mtags, "msgid");
+	if (m)
+		m = duplicate_mtag(m);
+	else
+		m = mtag_generate_msgid();
+
+	if (signature)
+	{
+		/* Special case:
+		 * Some commands will receive a single msgid from
+		 * a remote server for multiple events.
+		 * Take for example SJOIN which may contain 5 joins,
+		 * 3 bans setting, 2 invites, and setting a few modes.
+		 * This way we can still generate unique msgid's
+		 * for such sub-events. It is a hash of the subevent
+		 * concatenated to the existing msgid.
+		 * The hash is the first half of a SHA256 hash, then
+		 * base64'd, and with the == suffix removed.
+		 */
+		char prefix[MSGIDLEN+1], *p;
+		strlcpy(prefix, m->value, sizeof(prefix));
+		p = strchr(prefix, '-');
+		if (p)
+		{
+			/* It is possible that we have more stacking.
+			 * IOTW: we are already stacked like xxx-yyy
+			 * and it would have become an xxx-yyy-zzz
+			 * sequence. Instead, we strip the yyy-
+			 * so the end result will be xxx-zzz.
+			 *
+			 * One example code path would be when someone joins
+			 * and the issecure module sets -Z.
+			 */
+			*p = '\0';
+		}
+		SHA256_CTX hash;
+		char binaryhash[SHA256_DIGEST_LENGTH];
+		char b64hash[SHA256_DIGEST_LENGTH*2+1];
+		char newbuf[256];
+		memset(&binaryhash, 0, sizeof(binaryhash));
+		memset(&b64hash, 0, sizeof(b64hash));
+		SHA256_Init(&hash);
+		SHA256_Update(&hash, signature, strlen(signature));
+		SHA256_Final(binaryhash, &hash);
+		b64_encode(binaryhash, sizeof(binaryhash)/2, b64hash, sizeof(b64hash));
+		b64hash[22] = '\0'; /* cut off at '=' */
+		snprintf(newbuf, sizeof(newbuf), "%s-%s", prefix, b64hash);
+		safe_strdup(m->value, newbuf);
+	}
+	AddListItem(m, *mtag_list);
+}
diff --git a/src/modules/message-tags.c b/src/modules/message-tags.c
new file mode 100644
index 0000000..138959b
--- /dev/null
+++ b/src/modules/message-tags.c
@@ -0,0 +1,306 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/message-tags.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"message-tags",
+	"5.0",
+	"Message tags CAP", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+long CAP_MESSAGE_TAGS = 0L;
+char *_mtags_to_string(MessageTag *m, Client *client);
+void _parse_message_tags(Client *client, char **str, MessageTag **mtag_list);
+CMD_FUNC(cmd_tagmsg);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	EfunctionAddPChar(modinfo->handle, EFUNC_MTAGS_TO_STRING, _mtags_to_string);
+	EfunctionAddVoid(modinfo->handle, EFUNC_PARSE_MESSAGE_TAGS, _parse_message_tags);
+
+	return 0;
+}
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "message-tags";
+	ClientCapabilityAdd(modinfo->handle, &cap, &CAP_MESSAGE_TAGS);
+	CommandAdd(modinfo->handle, "TAGMSG", cmd_tagmsg, 1, CMD_USER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Unescape a message tag (name or value).
+ * @param in  The input string
+ * @param out The output string for writing
+ * @note  No size checking, so ensure that the output buffer
+ *        is at least as long as the input buffer.
+ */
+void message_tag_unescape(char *in, char *out)
+{
+	for (; *in; in++)
+	{
+		if (*in == '\\')
+		{
+			in++;
+			if (*in == ':')
+				*out++ = ';';  /* \: to ; */
+			else if (*in == 's')
+				*out++ = ' ';  /* \s to SPACE */
+			else if (*in == 'r')
+				*out++ = '\r'; /* \r to CR */
+			else if (*in == 'n')
+				*out++ = '\n'; /* \n to LF */
+			else if (*in == '\0')
+				break; /* unfinished escaping (\) */
+			else
+				*out++ = *in; /* all rest is as-is */
+			continue;
+		}
+		*out++ = *in;
+	}
+	*out = '\0';
+}
+
+/** Escape a message tag (name or value).
+ * @param in  The input string
+ * @param out The output string for writing
+ * @note  No size checking, so ensure that the output buffer
+ *        is at least twice as long as the input buffer + 1.
+ */
+void message_tag_escape(char *in, char *out)
+{
+	for (; *in; in++)
+	{
+		if (*in == ';')
+		{
+			*out++ = '\\';
+			*out++ = ':';
+		} else
+		if (*in == ' ')
+		{
+			*out++ = '\\';
+			*out++ = 's';
+		} else
+		if (*in == '\\')
+		{
+			*out++ = '\\';
+			*out++ = '\\';
+		} else
+		if (*in == '\r')
+		{
+			*out++ = '\\';
+			*out++ = 'r';
+		} else
+		if (*in == '\n')
+		{
+			*out++ = '\\';
+			*out++ = 'n';
+		} else
+		{
+			*out++ = *in;
+		}
+	}
+	*out = '\0';
+}
+
+/** Incoming filter for message tags */
+int message_tag_ok(Client *client, char *name, char *value)
+{
+	MessageTagHandler *m;
+
+	m = MessageTagHandlerFind(name);
+	if (!m)
+		return 0;
+
+	if (m->is_ok(client, name, value))
+		return 1;
+
+	return 0;
+}
+
+void _parse_message_tags(Client *client, char **str, MessageTag **mtag_list)
+{
+	char *remainder;
+	char *element, *p, *x;
+	static char name[8192], value[8192];
+	MessageTag *m;
+
+	remainder = strchr(*str, ' ');
+	if (!remainder)
+	{
+		/* A message with only message tags (or starting with @ anyway).
+		 * This is useless. So we make it point to the NUL byte,
+		 * aka: empty message.
+		 */
+		for (; **str; *str += 1);
+		return;
+	}
+
+	*remainder = '\0';
+
+	/* Now actually parse the tags: */
+	for (element = strtoken(&p, *str+1, ";"); element; element = strtoken(&p, NULL, ";"))
+	{
+		*name = *value = '\0';
+
+		/* Element has style: 'name=value', or it could be just 'name' */
+		x = strchr(element, '=');
+		if (x)
+		{
+			*x++ = '\0';
+			message_tag_unescape(x, value);
+		}
+		message_tag_unescape(element, name);
+
+		/* Let the message tag handler check if this mtag is
+		 * acceptable. If so, we add it to the list.
+		 */
+		if (message_tag_ok(client, name, value))
+		{
+			m = safe_alloc(sizeof(MessageTag));
+			safe_strdup(m->name, name);
+			/* Both NULL and empty become NULL: */
+			if (BadPtr(value))
+				m->value = NULL;
+			else /* a real value... */
+				safe_strdup(m->value, value);
+			AddListItem(m, *mtag_list);
+		}
+	}
+
+	*str = remainder + 1;
+}
+
+/** Outgoing filter for tags */
+int client_accepts_tag(const char *token, Client *client)
+{
+	MessageTagHandler *m;
+
+	/* Send all tags to remote links, without checking here.
+	 * Note that mtags_to_string() already prevents sending messages
+	 * with message tags to links without PROTOCTL MTAGS, so we can
+	 * simply always return 1 here, regardless of checking (again).
+	 */
+	if (IsServer(client) || !MyConnect(client))
+		return 1;
+
+	m = MessageTagHandlerFind(token);
+	if (!m)
+		return 0;
+
+	/* Maybe there is an outgoing filter in effect (usually not) */
+	if (m->can_send && !m->can_send(client))
+		return 0;
+
+	/* If the client has indicated 'message-tags' support then we can
+	 * send any message tag, regardless of other CAP's.
+	 */
+	if (HasCapability(client, "message-tags"))
+		return 1;
+
+	/* We continue here if the client did not indicate 'message-tags' support... */
+
+	/* If 'message-tags' is not indicated, then these cannot be sent as they don't
+	 * have a CAP to enable anyway (eg: msgid):
+	 */
+	if (m->flags & MTAG_HANDLER_FLAGS_NO_CAP_NEEDED)
+		return 0;
+
+	/* Otherwise, check if the capability is set:
+	 * eg 'account-tag' for 'account', 'time' for 'server-time' and so on..
+	 */
+	if (m->clicap_handler && (client->local->caps & m->clicap_handler->cap))
+		return 1;
+
+	return 0;
+}
+
+/** Return the message tag string (without @) of the message tag linked list.
+ * Taking into account the restrictions that 'client' may have.
+ * @returns A string (static buffer) or NULL if no tags at all (!)
+ */
+char *_mtags_to_string(MessageTag *m, Client *client)
+{
+	static char buf[4096], name[8192], value[8192];
+	char tbuf[512];
+
+	if (!m)
+		return NULL;
+
+	/* Remote servers need to indicate support via PROTOCTL MTAGS */
+	if (client->direction && IsServer(client->direction) && !SupportMTAGS(client->direction))
+		return NULL;
+
+	*buf = '\0';
+	for (; m; m = m->next)
+	{
+		if (!client_accepts_tag(m->name, client))
+			continue;
+		if (m->value)
+		{
+			message_tag_escape(m->name, name);
+			message_tag_escape(m->value, value);
+			snprintf(tbuf, sizeof(tbuf), "%s=%s;", name, value);
+		} else {
+			message_tag_escape(m->name, name);
+			snprintf(tbuf, sizeof(tbuf), "%s;", name);
+		}
+		strlcat(buf, tbuf, sizeof(buf));
+	}
+
+	if (!*buf)
+		return NULL;
+
+	/* Strip off the final semicolon */
+	buf[strlen(buf)-1] = '\0';
+
+	return buf;
+}
+
+/* Dummy handler for TAGMSG.
+ * We do not permit user tags, so implementing a real TAGMSG makes no sense.
+ * By having a dummy command we avoid clients from getting "Unknown command".
+ */
+CMD_FUNC(cmd_tagmsg)
+{
+}
diff --git a/src/modules/message.c b/src/modules/message.c
new file mode 100644
index 0000000..e97635f
--- /dev/null
+++ b/src/modules/message.c
@@ -0,0 +1,819 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/message.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+char *_StripColors(unsigned char *text);
+char *_StripControlCodes(unsigned char *text);
+
+int ban_version(Client *client, char *text);
+
+CMD_FUNC(cmd_private);
+CMD_FUNC(cmd_notice);
+void cmd_message(Client *client, MessageTag *recv_mtags, int parc, char *parv[], int notice);
+int _can_send_to_channel(Client *client, Channel *channel, char **msgtext, char **errmsg, int notice);
+int can_send_to_user(Client *client, Client *target, char **msgtext, char **errmsg, int notice);
+
+/* Place includes here */
+#define MSG_PRIVATE     "PRIVMSG"       /* PRIV */
+#define MSG_NOTICE      "NOTICE"        /* NOTI */
+
+ModuleHeader MOD_HEADER
+  = {
+	"message",	/* Name of module */
+	"5.0", /* Version */
+	"private message and notice", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddPChar(modinfo->handle, EFUNC_STRIPCOLORS, _StripColors);
+	EfunctionAddPChar(modinfo->handle, EFUNC_STRIPCONTROLCODES, _StripControlCodes);
+	EfunctionAdd(modinfo->handle, EFUNC_CAN_SEND_TO_CHANNEL, _can_send_to_channel);
+	return MOD_SUCCESS;
+}
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_PRIVATE, cmd_private, 2, CMD_USER|CMD_SERVER|CMD_RESETIDLE|CMD_VIRUS);
+	CommandAdd(modinfo->handle, MSG_NOTICE, cmd_notice, 2, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+#define CANPRIVMSG_CONTINUE		100
+#define CANPRIVMSG_SEND			101
+/** Check if PRIVMSG's are permitted from a person to another person.
+ * client:	source client
+ * target:	target client
+ * notice:	1 if notice, 0 if privmsg
+ * text:	Pointer to a pointer to a text [in, out]
+ * cmd:		Pointer to a pointer which contains the command to use [in, out]
+ */
+int can_send_to_user(Client *client, Client *target, char **msgtext, char **errmsg, int notice)
+{
+	int ret;
+	Hook *h;
+	int n;
+	static char errbuf[256];
+
+	*errmsg = NULL;
+
+	if (IsVirus(client))
+	{
+		ircsnprintf(errbuf, sizeof(errbuf), "You are only allowed to talk in '%s'", SPAMFILTER_VIRUSCHAN);
+		*errmsg = errbuf;
+		return 0;
+	}
+
+	if (MyUser(client) && target_limit_exceeded(client, target, target->name))
+	{
+		/* target_limit_exceeded() is an exception, in the sense that
+		 * it will send a different numeric. So we don't set errmsg.
+		 */
+		return 0;
+	}
+
+	if (is_silenced(client, target))
+	{
+		RunHook3(HOOKTYPE_SILENCED, client, target, notice);
+		/* Silently discarded, no error message */
+		return 0;
+	}
+
+	// Possible FIXME: make match_spamfilter also use errmsg, or via a wrapper? or use same numeric?
+	if (MyUser(client) && match_spamfilter(client, *msgtext, (notice ? SPAMF_USERNOTICE : SPAMF_USERMSG), target->name, 0, NULL))
+		return 0;
+
+	n = HOOK_CONTINUE;
+	for (h = Hooks[HOOKTYPE_CAN_SEND_TO_USER]; h; h = h->next)
+	{
+		n = (*(h->func.intfunc))(client, target, msgtext, errmsg, notice);
+		if (n == HOOK_DENY)
+		{
+			if (!*errmsg)
+			{
+				ircd_log(LOG_ERROR, "Module %s did not set errmsg!!!", h->owner->header->name);
+				abort();
+			}
+			return 0;
+		}
+		if (!*msgtext || !**msgtext)
+			return 0;
+	}
+
+	/* This may happen, if nothing is left to send anymore (don't send empty messages) */
+	if (!*msgtext || !**msgtext)
+		return 0;
+
+	return 1;
+}
+
+#ifdef PREFIX_AQ
+ #define PREFIX_REST (PREFIX_ADMIN|PREFIX_OWNER)
+#else
+ #define PREFIX_REST (0)
+#endif
+
+/** Convert a string of prefixes (like "+%@") to values (like PREFIX_VOICE|PREFIX_HALFOP|PREFIX_OP).
+ * @param str	The string containing the prefixes and the channel name.
+ * @param end	The position of the hashmark (#)
+ * @returns A value of PREFIX_*, potentially OR'ed if there are multiple values.
+ */
+int prefix_string_to_values(char *str, char *end)
+{
+	char *p;
+	int prefix = 0;
+
+	for (p = str; p != end; p++)
+	{
+		switch (*p)
+		{
+			case '+':
+				prefix |= PREFIX_VOICE | PREFIX_HALFOP | PREFIX_OP | PREFIX_REST;
+				break;
+			case '%':
+				prefix |= PREFIX_HALFOP | PREFIX_OP | PREFIX_REST;
+				break;
+			case '@':
+				prefix |= PREFIX_OP | PREFIX_REST;
+				break;
+#ifdef PREFIX_AQ
+			case '&':
+				prefix |= PREFIX_ADMIN | PREFIX_OWNER;
+				break;
+			case '~':
+				prefix |= PREFIX_OWNER;
+				break;
+#else
+			case '&':
+				prefix |= PREFIX_OP | PREFIX_REST;
+				break;
+			case '~':
+				prefix |= PREFIX_OP | PREFIX_REST;
+				break;
+#endif
+			default:
+				break;	/* ignore it :P */
+		}
+	}
+	return prefix;
+}
+
+/** Find out the lowest prefix to use, so @&~#chan becomes @#chan.
+ * @param prefix	One or more of PREFIX_* values (OR'ed)
+ * @returns A single character
+ * @note prefix must be >0, so must contain at least one PREFIX_xx value!
+ */
+char prefix_values_to_char(int prefix)
+{
+	if (prefix & PREFIX_VOICE)
+		return '+';
+	if (prefix & PREFIX_HALFOP)
+		return '%';
+	if (prefix & PREFIX_OP)
+		return '@';
+#ifdef PREFIX_AQ
+	if (prefix & PREFIX_ADMIN)
+		return '&';
+	if (prefix & PREFIX_OWNER)
+		return '~';
+#endif
+	abort();
+}
+
+/** Check if user is allowed to send to a prefix (eg: @#channel).
+ * @param client	The client (sender)
+ * @param channel	The target channel
+ * @param prefix	The prefix mask (eg: PREFIX_CHANOP)
+ */
+int can_send_to_prefix(Client *client, Channel *channel, int prefix)
+{
+	Membership *lp;
+
+	if (op_can_override("channel:override:message:prefix",client,channel,NULL))
+		return 1;
+
+	lp = find_membership_link(client->user->channel, channel);
+
+	/* Check if user is allowed to send. RULES:
+	 * Need at least voice (+) in order to send to +,% or @
+	 * Need at least ops (@) in order to send to & or ~
+	 */
+	if (!lp || !(lp->flags & (CHFL_VOICE|CHFL_HALFOP|CHFL_CHANOP|CHFL_CHANOWNER|CHFL_CHANADMIN)))
+	{
+		sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+		return 0;
+	}
+
+	if (!(prefix & PREFIX_OP) && ((prefix & PREFIX_OWNER) || (prefix & PREFIX_ADMIN)) &&
+	    !(lp->flags & (CHFL_CHANOP|CHFL_CHANOWNER|CHFL_CHANADMIN)))
+	{
+		sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+		return 0;
+	}
+
+	return 1;
+}
+
+/*
+** cmd_message (used in cmd_private() and cmd_notice())
+** the general function to deliver MSG's between users/channels
+**
+**	parv[1] = receiver list
+**	parv[2] = message text
+**
+** massive cleanup
+** rev argv 6/91
+**
+*/
+void cmd_message(Client *client, MessageTag *recv_mtags, int parc, char *parv[], int notice)
+{
+	Client *target;
+	Channel *channel;
+	char *targetstr, *p, *p2, *pc, *text, *errmsg;
+	int  prefix = 0;
+	char pfixchan[CHANNELLEN + 4];
+	int ret;
+	int ntargets = 0;
+	char *cmd = notice ? "NOTICE" : "PRIVMSG";
+	int maxtargets = max_targets_for_command(cmd);
+	Hook *h;
+	MessageTag *mtags;
+	int sendflags;
+
+	/* Force a labeled-response, even if we don't send anything
+	 * and the request was sent to other servers (which won't
+	 * reply either :D).
+	 */
+	labeled_response_force = 1;
+
+	if (parc < 2 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NORECIPIENT, cmd);
+		return;
+	}
+
+	if (parc < 3 || *parv[2] == '\0')
+	{
+		sendnumeric(client, ERR_NOTEXTTOSEND);
+		return;
+	}
+
+	if (MyConnect(client))
+		parv[1] = (char *)canonize(parv[1]);
+
+	for (p = NULL, targetstr = strtoken(&p, parv[1], ","); targetstr; targetstr = strtoken(&p, NULL, ","))
+	{
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, targetstr, maxtargets, cmd);
+			break;
+		}
+		/* The nicks "ircd" and "irc" are special (and reserved) */
+		if (!strcasecmp(targetstr, "ircd") && MyUser(client))
+			return;
+
+		if (!strcasecmp(targetstr, "irc") && MyUser(client))
+		{
+			/* When ban version { } is enabled the IRCd sends a CTCP VERSION request
+			 * from the "IRC" nick. So we need to handle CTCP VERSION replies to "IRC".
+			 */
+			if (!strncmp(parv[2], "\1VERSION ", 9))
+				ban_version(client, parv[2] + 9);
+			else if (!strncmp(parv[2], "\1SCRIPT ", 8))
+				ban_version(client, parv[2] + 8);
+			return;
+		}
+
+		p2 = strchr(targetstr, '#');
+		prefix = 0;
+
+		/* Message to channel */
+		if (p2 && (channel = find_channel(p2, NULL)))
+		{
+			prefix = prefix_string_to_values(targetstr, p2);
+			if (prefix)
+			{
+				if (MyUser(client) && !can_send_to_prefix(client, channel, prefix))
+					continue;
+				/* Now find out the lowest prefix and rewrite the target.
+				 * Eg: @&~#chan becomes @#chan
+				 */
+				pfixchan[0] = prefix_values_to_char(prefix);
+				strlcpy(pfixchan+1, channel->chname, sizeof(pfixchan)-1);
+				targetstr = pfixchan;
+			} else {
+				/* Replace target so the privmsg always goes to the "official" channel name */
+				strlcpy(pfixchan, channel->chname, sizeof(pfixchan));
+				targetstr = pfixchan;
+			}
+
+			if (IsVirus(client) && strcasecmp(channel->chname, SPAMFILTER_VIRUSCHAN))
+			{
+				sendnotice(client, "You are only allowed to talk in '%s'", SPAMFILTER_VIRUSCHAN);
+				continue;
+			}
+
+			text = parv[2];
+			errmsg = NULL;
+			if (MyUser(client) && !IsULine(client))
+			{
+				if (!can_send_to_channel(client, channel, &text, &errmsg, notice))
+				{
+					/* Send the error message, but only if:
+					 * 1) The user has not been killed
+					 * 2) It is not a NOTICE
+					 */
+					if (IsDead(client))
+						return;
+					if (!IsDead(client) && !notice && errmsg)
+						sendnumeric(client, ERR_CANNOTSENDTOCHAN, channel->chname, errmsg, p2);
+					continue; /* skip delivery to this target */
+				}
+			}
+			mtags = NULL;
+			sendflags = SEND_ALL;
+
+			if (!strchr(CHANCMDPFX,parv[2][0]))
+				sendflags |= SKIP_DEAF;
+
+			if ((*parv[2] == '\001') && strncmp(&parv[2][1], "ACTION ", 7))
+				sendflags |= SKIP_CTCP;
+
+			if (MyUser(client) && match_spamfilter(client, text, notice ? SPAMF_CHANNOTICE : SPAMF_CHANMSG, channel->chname, 0, NULL))
+				return;
+
+			new_message(client, recv_mtags, &mtags);
+
+			RunHook5(HOOKTYPE_PRE_CHANMSG, client, channel, mtags, text, notice);
+
+			if (!text)
+			{
+				free_message_tags(mtags);
+				continue;
+			}
+
+			sendto_channel(channel, client, client->direction,
+				       prefix, 0, sendflags, mtags,
+				       notice ? ":%s NOTICE %s :%s" : ":%s PRIVMSG %s :%s",
+				       client->name, targetstr, text);
+
+			RunHook8(HOOKTYPE_CHANMSG, client, channel, sendflags, prefix, targetstr, mtags, text, notice);
+
+			free_message_tags(mtags);
+
+			continue;
+		}
+		else if (p2)
+		{
+			sendnumeric(client, ERR_NOSUCHNICK, p2);
+			continue;
+		}
+
+
+		/* Message to $servermask */
+		if (*targetstr == '$')
+		{
+			MessageTag *mtags = NULL;
+
+			if (!ValidatePermissionsForPath("chat:notice:global", client, NULL, NULL, NULL))
+			{
+				/* Apparently no other IRCd does this, but I think it's confusing not to
+				 * send an error message, especially with our new privilege system.
+				 * Error message could be more descriptive perhaps.
+				 */
+				sendnumeric(client, ERR_NOPRIVILEGES);
+				continue;
+			}
+			new_message(client, recv_mtags, &mtags);
+			sendto_match_butone(IsServer(client->direction) ? client->direction : NULL,
+			    client, targetstr + 1,
+			    (*targetstr == '#') ? MATCH_HOST :
+			    MATCH_SERVER,
+			    mtags,
+			    ":%s %s %s :%s", client->name, cmd, targetstr, parv[2]);
+			free_message_tags(mtags);
+			continue;
+		}
+
+		/* nickname addressed? */
+		target = hash_find_nickatserver(targetstr, NULL);
+		if (target)
+		{
+			char *errmsg = NULL;
+			text = parv[2];
+			if (!can_send_to_user(client, target, &text, &errmsg, notice))
+			{
+				/* Message is discarded */
+				if (IsDead(client))
+					return;
+				if (!notice && errmsg)
+					sendnumeric(client, ERR_CANTSENDTOUSER, target->name, errmsg);
+			} else
+			{
+				/* We may send the message */
+				MessageTag *mtags = NULL;
+
+				/* Inform sender that recipient is away, if this is so */
+				if (!notice && MyConnect(client) && target->user && target->user->away)
+					sendnumeric(client, RPL_AWAY, target->name, target->user->away);
+
+				new_message(client, recv_mtags, &mtags);
+				labeled_response_inhibit = 1;
+				if (MyUser(target))
+				{
+					/* Deliver to end-user */
+					sendto_prefix_one(target, client, mtags, ":%s %s %s :%s",
+							  client->name, cmd, target->name, text);
+				} else {
+					/* Send to another server */
+					sendto_prefix_one(target, client, mtags, ":%s %s %s :%s",
+							  client->id, cmd, target->id, text);
+				}
+				labeled_response_inhibit = 0;
+				RunHook5(HOOKTYPE_USERMSG, client, target, mtags, text, notice);
+				free_message_tags(mtags);
+				continue;
+			}
+			continue; /* Message has been delivered or rejected, continue with next target */
+		}
+
+		/* If nick@server -and- the @server portion was set::services-server then send a special message */
+		if (!target && SERVICES_NAME)
+		{
+			char *server = strchr(targetstr, '@');
+			if (server && strncasecmp(server + 1, SERVICES_NAME, strlen(SERVICES_NAME)) == 0)
+			{
+				sendnumeric(client, ERR_SERVICESDOWN, targetstr);
+				continue;
+			}
+		}
+
+		/* nothing, nada, not anything found */
+		sendnumeric(client, ERR_NOSUCHNICK, targetstr);
+		continue;
+	}
+}
+
+/*
+** cmd_private
+**	parv[1] = receiver list
+**	parv[2] = message text
+*/
+CMD_FUNC(cmd_private)
+{
+	cmd_message(client, recv_mtags, parc, parv, 0);
+}
+
+/*
+** cmd_notice
+**	parv[1] = receiver list
+**	parv[2] = notice text
+*/
+CMD_FUNC(cmd_notice)
+{
+	cmd_message(client, recv_mtags, parc, parv, 1);
+}
+
+/* Taken from xchat by Peter Zelezny
+ * changed very slightly by codemastr
+ * RGB color stripping support added -- codemastr
+ */
+
+char *_StripColors(unsigned char *text)
+{
+	int i = 0, len = strlen(text), save_len=0;
+	char nc = 0, col = 0, rgb = 0, *save_text=NULL;
+	static unsigned char new_str[4096];
+
+	while (len > 0) 
+	{
+		if ((col && isdigit(*text) && nc < 2) || (col && *text == ',' && nc < 3)) 
+		{
+			nc++;
+			if (*text == ',')
+				nc = 0;
+		}
+		/* Syntax for RGB is ^DHHHHHH where H is a hex digit.
+		 * If < 6 hex digits are specified, the code is displayed
+		 * as text
+		 */
+		else if ((rgb && isxdigit(*text) && nc < 6) || (rgb && *text == ',' && nc < 7))
+		{
+			nc++;
+			if (*text == ',')
+				nc = 0;
+		}
+		else 
+		{
+			if (col)
+				col = 0;
+			if (rgb)
+			{
+				if (nc != 6)
+				{
+					text = save_text+1;
+					len = save_len-1;
+					rgb = 0;
+					continue;
+				}
+				rgb = 0;
+			}
+			if (*text == '\003') 
+			{
+				col = 1;
+				nc = 0;
+			}
+			else if (*text == '\004')
+			{
+				save_text = text;
+				save_len = len;
+				rgb = 1;
+				nc = 0;
+			}
+			else if (*text != '\026') /* (strip reverse too) */
+			{
+				new_str[i] = *text;
+				i++;
+			}
+		}
+		text++;
+		len--;
+	}
+	new_str[i] = 0;
+	if (new_str[0] == '\0')
+		return NULL;
+	return new_str;
+}
+
+/* strip color, bold, underline, and reverse codes from a string */
+char *_StripControlCodes(unsigned char *text) 
+{
+	int i = 0, len = strlen(text), save_len=0;
+	char nc = 0, col = 0, rgb = 0, *save_text=NULL;
+	static unsigned char new_str[4096];
+	while (len > 0) 
+	{
+		if ( col && ((isdigit(*text) && nc < 2) || (*text == ',' && nc < 3)))
+		{
+			nc++;
+			if (*text == ',')
+				nc = 0;
+		}
+		/* Syntax for RGB is ^DHHHHHH where H is a hex digit.
+		 * If < 6 hex digits are specified, the code is displayed
+		 * as text
+		 */
+		else if ((rgb && isxdigit(*text) && nc < 6) || (rgb && *text == ',' && nc < 7))
+		{
+			nc++;
+			if (*text == ',')
+				nc = 0;
+		}
+		else 
+		{
+			if (col)
+				col = 0;
+			if (rgb)
+			{
+				if (nc != 6)
+				{
+					text = save_text+1;
+					len = save_len-1;
+					rgb = 0;
+					continue;
+				}
+				rgb = 0;
+			}
+			switch (*text)
+			{
+			case 3:
+				/* color */
+				col = 1;
+				nc = 0;
+				break;
+			case 4:
+				/* RGB */
+				save_text = text;
+				save_len = len;
+				rgb = 1;
+				nc = 0;
+				break;
+			case 2:
+				/* bold */
+				break;
+			case 31:
+				/* underline */
+				break;
+			case 22:
+				/* reverse */
+				break;
+			case 15:
+				/* plain */
+				break;
+			case 29:
+				/* italic */
+				break;
+			case 30:
+				/* strikethrough */
+				break;
+			case 17:
+				/* monospace */
+				break;
+			case 0xe2:
+				if (!strncmp(text+1, "\x80\x8b", 2))
+				{
+					/* +2 means we skip 3 */
+					text += 2;
+					len  -= 2;
+					break;
+				}
+				/*fallthrough*/
+			default:
+				new_str[i] = *text;
+				i++;
+				break;
+			}
+		}
+		text++;
+		len--;
+	}
+	new_str[i] = 0;
+	return new_str;
+}
+
+/** Check ban version { } blocks, returns 1  if banned and  0 if not. */
+int ban_version(Client *client, char *text)
+{
+	int len;
+	ConfigItem_ban *ban;
+
+	len = strlen(text);
+	if (!len)
+		return 0;
+
+	if (text[len-1] == '\1')
+		text[len-1] = '\0'; /* remove CTCP REPLY terminator (ASCII 1) */
+
+	if ((ban = find_ban(NULL, text, CONF_BAN_VERSION)))
+	{
+		if (IsSoftBanAction(ban->action) && IsLoggedIn(client))
+			return 0; /* soft ban does not apply to us, we are logged in */
+
+		if (find_tkl_exception(TKL_BAN_VERSION, client))
+			return 0; /* we are exempt */
+
+		place_host_ban(client, ban->action, ban->reason, BAN_VERSION_TKL_TIME);
+		return 1;
+	}
+
+	return 0;
+}
+
+/** Can user send a message to this channel?
+ * @param client    The client
+ * @param channel   The channel
+ * @param msgtext The message to send (MAY be changed, even if user is allowed to send)
+ * @param errmsg  The error message (will be filled in)
+ * @param notice  If it's a NOTICE then this is set to 1. Set to 0 for PRIVMSG.
+ * @returns Returns 1 if the user is allowed to send, otherwise 0.
+ * (note that this behavior was reversed in UnrealIRCd versions <5.x.
+ */
+int _can_send_to_channel(Client *client, Channel *channel, char **msgtext, char **errmsg, int notice)
+{
+	Membership *lp;
+	int  member, i = 0;
+	Hook *h;
+
+	if (!MyUser(client))
+		return 1;
+
+	*errmsg = NULL;
+
+	member = IsMember(client, channel);
+
+	if (channel->mode.mode & MODE_NOPRIVMSGS && !member)
+	{
+		/* Channel does not accept external messages (+n).
+		 * Reject, unless HOOKTYPE_CAN_BYPASS_NO_EXTERNAL_MSGS tells otherwise.
+		 */
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_EXTERNAL);
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+		if (i != HOOK_ALLOW)
+		{
+			*errmsg = "No external channel messages";
+			return 0;
+		}
+	}
+
+	lp = find_membership_link(client->user->channel, channel);
+	if (channel->mode.mode & MODE_MODERATED &&
+	    !op_can_override("channel:override:message:moderated",client,channel,NULL) &&
+	    (!lp /* FIXME: UGLY */
+	    || !(lp->flags & (CHFL_CHANOP | CHFL_VOICE | CHFL_CHANOWNER | CHFL_HALFOP | CHFL_CHANADMIN))))
+	{
+		/* Channel is moderated (+m).
+		 * Reject, unless HOOKTYPE_CAN_BYPASS_MODERATED tells otherwise.
+		 */
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_MODERATED);
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+		if (i != HOOK_ALLOW)
+		{
+			*errmsg = "You need voice (+v)";
+			return 0;
+		}
+	}
+
+	/* Modules can plug in as well */
+	for (h = Hooks[HOOKTYPE_CAN_SEND_TO_CHANNEL]; h; h = h->next)
+	{
+		i = (*(h->func.intfunc))(client, channel, lp, msgtext, errmsg, notice);
+		if (i != HOOK_CONTINUE)
+		{
+			if (!*errmsg)
+			{
+				ircd_log(LOG_ERROR, "Module %s did not set errmsg!!!", h->owner->header->name);
+				abort();
+			}
+			break;
+		}
+		if (!*msgtext || !**msgtext)
+			return 0;
+	}
+
+	if (i != HOOK_CONTINUE)
+	{
+		if (!*errmsg)
+			*errmsg = "You are banned";
+		/* Don't send message if the user was previously a member
+		 * and isn't anymore, so if the user is KICK'ed, eg by floodprot.
+		 */
+		if (member && !IsDead(client) && !find_membership_link(client->user->channel, channel))
+			*errmsg = NULL;
+		return 0;
+	}
+	if (!*msgtext || !**msgtext)
+		return 0;
+
+
+	/* Now we are going to check bans */
+
+	/* ..but first: exempt ircops */
+	if (op_can_override("channel:override:message:ban",client,channel,NULL))
+		return 1;
+
+	if ((!lp
+	    || !(lp->flags & (CHFL_CHANOP | CHFL_VOICE | CHFL_CHANOWNER |
+	    CHFL_HALFOP | CHFL_CHANADMIN))) && MyUser(client)
+	    && is_banned(client, channel, BANCHK_MSG, msgtext, errmsg))
+	{
+		/* Modules can set 'errmsg', otherwise we default to this: */
+		if (!*errmsg)
+			*errmsg = "You are banned";
+		return 0;
+	}
+
+	return 1;
+}
diff --git a/src/modules/mkpasswd.c b/src/modules/mkpasswd.c
new file mode 100644
index 0000000..bde0127
--- /dev/null
+++ b/src/modules/mkpasswd.c
@@ -0,0 +1,106 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/mkpasswd.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   mkpasswd command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_mkpasswd);
+
+#define MSG_MKPASSWD 	"MKPASSWD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"mkpasswd",
+	"5.0",
+	"command /mkpasswd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_MKPASSWD, cmd_mkpasswd, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_mkpasswd
+**      parv[1] = password to encrypt
+*/
+CMD_FUNC(cmd_mkpasswd)
+{
+	short	type;
+	char	*result = NULL;
+
+	if (!MKPASSWD_FOR_EVERYONE && !IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	if (!IsOper(client))
+	{
+		/* Non-opers /mkpasswd usage: lag them up, and send a notice to eyes snomask.
+		 * This notice is always sent, even in case of bad usage/bad auth methods/etc.
+		 */
+		client->local->since += 7;
+		sendto_snomask(SNO_EYES, "*** /mkpasswd used by %s (%s@%s)",
+			client->name, client->user->username, GetHost(client));
+	}
+
+	if ((parc < 3) || BadPtr(parv[2]))
+	{
+		sendnotice(client, "*** Syntax: /mkpasswd <authmethod> :parameter");
+		return;
+	}
+	/* Don't want to take any risk ;p. -- Syzop */
+	if (strlen(parv[2]) > 64)
+	{
+		sendnotice(client, "*** Your parameter (text-to-hash) is too long.");
+		return;
+	}
+	if ((type = Auth_FindType(NULL, parv[1])) == -1)
+	{
+		sendnotice(client, "*** %s is not an enabled authentication method", parv[1]);
+		return;
+	}
+
+	if (!(result = Auth_Hash(type, parv[2])))
+	{
+		sendnotice(client, "*** Authentication method %s failed", parv[1]);
+		return;
+	}
+
+	sendnotice(client, "*** Authentication phrase (method=%s, para=%s) is: %s",
+		parv[1], parv[2], result);
+}
diff --git a/src/modules/mode.c b/src/modules/mode.c
new file mode 100644
index 0000000..2635d46
--- /dev/null
+++ b/src/modules/mode.c
@@ -0,0 +1,1937 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/mode.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Forward declarations */
+CMD_FUNC(cmd_mode);
+CMD_FUNC(cmd_mlock);
+void _do_mode(Channel *channel, Client *client, MessageTag *recv_mtags, int parc, char *parv[], time_t sendts, int samode);
+void _set_mode(Channel *channel, Client *client, int parc, char *parv[], u_int *pcount,
+                       char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], int bounce);
+CMD_FUNC(_cmd_umode);
+
+/* local: */
+static void bounce_mode(Channel *, Client *, int, char **);
+int do_mode_char(Channel *channel, long modetype, char modechar, char *param,
+                 u_int what, Client *client,
+                 u_int *pcount, char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], char bounce, long my_access);
+int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
+                    Client *client, u_int *pcount, char pvar[MAXMODEPARAMS][MODEBUFLEN + 3],
+                    char bounce);
+void make_mode_str(Channel *channel, long oldm, Cmode_t oldem, long oldl, int pcount,
+                   char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], char *mode_buf, char *para_buf,
+                   size_t mode_buf_size, size_t para_buf_size, char bounce);
+
+static void mode_cutoff(char *s);
+static void mode_cutoff2(Client *client, Channel *channel, int *parc_out, char *parv[]);
+
+static int samode_in_progress = 0;
+
+#define MSG_MODE 	"MODE"
+
+ModuleHeader MOD_HEADER
+  = {
+	"mode",
+	"5.0",
+	"command /mode",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddVoid(modinfo->handle, EFUNC_DO_MODE, _do_mode);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SET_MODE, _set_mode);
+	EfunctionAddVoid(modinfo->handle, EFUNC_CMD_UMODE, _cmd_umode);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_MODE, cmd_mode, MAXPARA, CMD_USER|CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_MLOCK, cmd_mlock, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * cmd_mode -- written by binary (garryb@binary.islesfan.net)
+ * Completely rewrote it.  The old mode command was 820 lines of ICKY
+ * coding, which is a complete waste, because I wrote it in 570 lines of
+ * *decent* coding.  This is also easier to read, change, and fine-tune.  Plus,
+ * everything isn't scattered; everything's grouped where it should be.
+ *
+ * parv[1] - channel
+ */
+CMD_FUNC(cmd_mode)
+{
+	long unsigned sendts = 0;
+	Ban *ban;
+	Channel *channel;
+
+	/* Now, try to find the channel in question */
+	if (parc > 1)
+	{
+		if (*parv[1] == '#')
+		{
+			channel = find_channel(parv[1], NULL);
+			if (!channel)
+			{
+				cmd_umode(client, recv_mtags, parc, parv);
+				return;
+			}
+		} else
+		{
+			cmd_umode(client, recv_mtags, parc, parv);
+			return;
+		}
+	} else
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "MODE");
+		return;
+	}
+
+	if (MyConnect(client) && !valid_channelname(parv[1]))
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, parv[1]);
+		return;
+	}
+
+	if (parc < 3)
+	{
+		*modebuf = *parabuf = '\0';
+
+		modebuf[1] = '\0';
+		channel_modes(client, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), channel);
+		sendnumeric(client, RPL_CHANNELMODEIS, channel->chname, modebuf, parabuf);
+		sendnumeric(client, RPL_CREATIONTIME, channel->chname, channel->creationtime);
+		return;
+	}
+
+	if (MyUser(client))
+	{
+		/* Deal with information requests from local users, such as:
+		 * MODE #chan b    Show the ban list
+		 * MODE #chan e    Show the ban exemption list
+		 * MODE #chan I    Show the invite exception list
+		 * MODE #chan q    Show list of channel owners
+		 * MODE #chan a    Show list of channel admins
+		 */
+		if (strstr(parv[2], "b") && BadPtr(parv[3]))
+		{
+			if (!IsMember(client, channel) && !ValidatePermissionsForPath("channel:see:mode:remotebanlist",client,NULL,channel,NULL))
+				return;
+			/* send ban list */
+			for (ban = channel->banlist; ban; ban = ban->next)
+				sendnumeric(client, RPL_BANLIST, channel->chname, ban->banstr, ban->who, ban->when);
+			sendnumeric(client, RPL_ENDOFBANLIST, channel->chname);
+			return;
+		}
+
+		if (strstr(parv[2], "e") && BadPtr(parv[3]))
+		{
+			if (!IsMember(client, channel) && !ValidatePermissionsForPath("channel:see:mode:remotebanlist",client,NULL,channel,NULL))
+				return;
+			/* send exban list */
+			for (ban = channel->exlist; ban; ban = ban->next)
+				sendnumeric(client, RPL_EXLIST, channel->chname, ban->banstr, ban->who, ban->when);
+			sendnumeric(client, RPL_ENDOFEXLIST, channel->chname);
+			return;
+		}
+
+		if (strstr(parv[2], "I") && BadPtr(parv[3]))
+		{
+			if (!IsMember(client, channel) && !ValidatePermissionsForPath("channel:see:mode:remoteinvexlist",client,NULL,channel,NULL))
+				return;
+			for (ban = channel->invexlist; ban; ban = ban->next)
+				sendnumeric(client, RPL_INVEXLIST, channel->chname, ban->banstr, ban->who, ban->when);
+			sendnumeric(client, RPL_ENDOFINVEXLIST, channel->chname);
+			return;
+		}
+
+		if (strstr(parv[2], "q") && BadPtr(parv[3]))
+		{
+			Member *member;
+
+			if (!IsMember(client, channel) && !ValidatePermissionsForPath("channel:see:mode:remoteownerlist",client,NULL,channel,NULL))
+				return;
+
+			for (member = channel->members; member; member = member->next)
+			{
+				if (is_chanowner(member->client, channel))
+					sendnumeric(client, RPL_QLIST, channel->chname, member->client->name);
+			}
+			sendnumeric(client, RPL_ENDOFQLIST, channel->chname);
+			return;
+		}
+
+		if (strstr(parv[2], "a") && BadPtr(parv[3]))
+		{
+			Member *member;
+
+			if (!IsMember(client, channel) && !ValidatePermissionsForPath("channel:see:mode:remoteownerlist",client,NULL,channel,NULL))
+				return;
+
+			for (member = channel->members; member; member = member->next)
+			{
+				if (is_chanadmin(member->client, channel))
+					sendnumeric(client, RPL_ALIST, channel->chname, member->client->name);
+			}
+			sendnumeric(client, RPL_ENDOFALIST, channel->chname);
+			return;
+		}
+	}
+
+	opermode = 0;
+
+#ifndef NO_OPEROVERRIDE
+	if (IsUser(client) && !IsULine(client) && !is_chan_op(client, channel) &&
+	    !is_half_op(client, channel) && ValidatePermissionsForPath("channel:override:mode",client,NULL,channel,NULL))
+	{
+		sendts = 0;
+		opermode = 1;
+		goto aftercheck;
+	}
+
+	if (IsUser(client) && !IsULine(client) && !is_chan_op(client, channel) &&
+	    is_half_op(client, channel) && ValidatePermissionsForPath("channel:override:mode",client,NULL,channel,NULL))
+	{
+		opermode = 2;
+		goto aftercheck;
+	}
+#endif
+
+	/* User does not have permission to use the MODE command */
+	if (IsUser(client) && !IsULine(client) && !is_chan_op(client, channel) &&
+	    !is_half_op(client, channel) &&
+	    !ValidatePermissionsForPath("channel:override:mode",client,NULL,channel,NULL))
+	{
+		if (MyUser(client))
+		{
+			sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+			return;
+		}
+		sendto_one(client, NULL, ":%s MODE %s -oh %s %s 0",
+		    me.name, channel->chname, client->name, client->name);
+		/* Tell the other server that the user is
+		 * de-opped.  Fix op desyncs. */
+		bounce_mode(channel, client, parc - 2, parv + 2);
+		return;
+	}
+
+	if (IsServer(client) && (sendts = atol(parv[parc - 1])) &&
+	    !IsULine(client) && channel->creationtime &&
+	    sendts > channel->creationtime)
+	{
+		if (!(*parv[2] == '&'))	/* & denotes a bounce */
+		{
+			/* !!! */
+			sendto_snomask(SNO_EYES,
+			    "*** TS bounce for %s - %lld(ours) %lld(theirs)",
+			    channel->chname, (long long)channel->creationtime,
+			    (long long)sendts);
+			bounce_mode(channel, client, parc - 2, parv + 2);
+		}
+		return;
+	}
+	if (IsServer(client) && !sendts && *parv[parc - 1] != '0')
+		sendts = -1;
+	if (IsServer(client) && sendts != -1)
+		parc--;		/* server supplied a time stamp, remove it now */
+
+aftercheck:
+
+	/* This is to prevent excess +<whatever> modes. -- Syzop */
+	if (MyUser(client) && parv[2])
+	{
+		mode_cutoff(parv[2]);
+		mode_cutoff2(client, channel, &parc, parv);
+	}
+
+	/* Filter out the unprivileged FIRST. *
+	 * Now, we can actually do the mode.  */
+
+	(void)do_mode(channel, client, recv_mtags, parc - 2, parv + 2, sendts, 0);
+	/* After this don't touch 'channel' anymore, as permanent module may have destroyed the channel */
+	opermode = 0; /* Important since sometimes forgotten. -- Syzop */
+}
+
+/** Cut off mode string (eg: +abcdfjkdsgfgs) at MAXMODEPARAMS modes.
+ * @param s The mode string (modes only, no parameters)
+ * @note Should only used on local clients
+ * @author Syzop
+ */
+static void mode_cutoff(char *s)
+{
+unsigned short modesleft = MAXMODEPARAMS * 2; /* be generous... */
+
+	for (; *s && modesleft; s++)
+		if ((*s != '-') && (*s != '+'))
+			modesleft--;
+	*s = '\0';
+}
+
+/** Another mode cutoff routine - this one for the server-side
+ * amplification/enlargement problem that happens with bans/exempts/invex
+ * as explained in #2837. -- Syzop
+ */
+static void mode_cutoff2(Client *client, Channel *channel, int *parc_out, char *parv[])
+{
+	int len, i;
+	int parc = *parc_out;
+
+	if (parc-2 <= 3)
+		return; /* Less than 3 mode parameters? Then we don't even have to check */
+
+	/* Calculate length of MODE if it would go through fully as-is */
+	/* :nick!user@host MODE #channel +something param1 param2 etc... */
+	len = strlen(client->name) + strlen(client->user->username) + strlen(GetHost(client)) +
+	      strlen(channel->chname) + 11;
+
+	len += strlen(parv[2]);
+
+	if (*parv[2] != '+' && *parv[2] != '-')
+		len++;
+
+	for (i = 3; parv[i]; i++)
+	{
+		len += strlen(parv[i]) + 1; /* (+1 for the space character) */
+		/* +4 is another potential amplification (per-param).
+		 * If we were smart we would only check this for b/e/I and only for
+		 * relevant cases (not for all extended), but this routine is dumb,
+		 * so we just +4 for any case where the full mask is missing.
+		 * It's better than assuming +4 for all cases, though...
+		 */
+		if (!match_simple("*!*@*", parv[i]))
+			len += 4;
+	}
+
+	/* Now check if the result is acceptable... */
+	if (len < 510)
+		return; /* Ok, no problem there... */
+
+	/* Ok, we have a potential problem...
+	 * we just dump the last parameter... check how much space we saved...
+	 * and try again if that did not help
+	 */
+	for (i = parc-1; parv[i] && (i > 3); i--)
+	{
+		len -= strlen(parv[i]);
+		if (!match_simple("*!*@*", parv[i]))
+			len -= 4; /* must adjust accordingly.. */
+		parv[i] = NULL;
+		(*parc_out)--;
+		if (len < 510)
+			break;
+	}
+	/* This may be reached if like the first parameter is really insane long..
+	 * which is no problem, as other layers (eg: ban) takes care of that.
+	 * We're done...
+	 */
+}
+
+/* bounce_mode -- written by binary
+ *	User or server is NOT authorized to change the mode.  This takes care
+ * of making the bounce string and bounce it.  Because of the 1 for the bounce
+ * param (last param) of the calls to set_mode and make_mode_str, it will not
+ * set the mode, but create the bounce string.
+ */
+static void bounce_mode(Channel *channel, Client *client, int parc, char *parv[])
+{
+	char pvar[MAXMODEPARAMS][MODEBUFLEN + 3];
+	int  pcount;
+
+	set_mode(channel, client, parc, parv, &pcount, pvar, 1);
+
+	if (channel->creationtime)
+		sendto_one(client, NULL, ":%s MODE %s &%s %s %lld", me.id,
+		    channel->chname, modebuf, parabuf, (long long)channel->creationtime);
+	else
+		sendto_one(client, NULL, ":%s MODE %s &%s %s", me.id, channel->chname,
+		    modebuf, parabuf);
+
+	/* the '&' denotes a bounce so servers won't bounce a bounce */
+}
+
+/* do_mode -- written by binary
+ *	User or server is authorized to do the mode.  This takes care of
+ * setting the mode and relaying it to other users and servers.
+ */
+void _do_mode(Channel *channel, Client *client, MessageTag *recv_mtags, int parc, char *parv[], time_t sendts, int samode)
+{
+	char pvar[MAXMODEPARAMS][MODEBUFLEN + 3];
+	int  pcount;
+	char tschange = 0, isbounce = 0;	/* fwd'ing bounce */
+	MessageTag *mtags = NULL;
+
+	new_message(client, recv_mtags, &mtags);
+
+	/* IMPORTANT: if you return, don't forget to free mtags!! */
+
+	if (**parv == '&')
+		isbounce = 1;
+
+	/* Please keep the next 3 lines next to each other */
+	samode_in_progress = samode;
+	set_mode(channel, client, parc, parv, &pcount, pvar, 0);
+	samode_in_progress = 0;
+
+	if (MyConnect(client))
+		RunHook7(HOOKTYPE_PRE_LOCAL_CHANMODE, client, channel, mtags, modebuf, parabuf, sendts, samode);
+	else
+		RunHook7(HOOKTYPE_PRE_REMOTE_CHANMODE, client, channel, mtags, modebuf, parabuf, sendts, samode);
+
+	if (IsServer(client))
+	{
+		if (sendts > 0)
+		{
+			if (!channel->creationtime || sendts < channel->creationtime)
+			{
+				tschange = 1;
+				channel->creationtime = sendts;
+				if (sendts < 750000)
+				{
+					sendto_realops(
+						"Warning! Possible desync: MODE for channel %s ('%s %s') has fishy timestamp (%lld) (from %s/%s)",
+						channel->chname, modebuf, parabuf, (long long)sendts, client->direction->name, client->name);
+					ircd_log(LOG_ERROR, "Possible desync: MODE for channel %s ('%s %s') has fishy timestamp (%lld) (from %s/%s)",
+						channel->chname, modebuf, parabuf, (long long)sendts, client->direction->name, client->name);
+				}
+				/* new chan or our timestamp is wrong */
+				/* now works for double-bounce prevention */
+
+			}
+			if (sendts > channel->creationtime && channel->creationtime)
+			{
+				/* theirs is wrong but we let it pass anyway */
+				sendts = channel->creationtime;
+				sendto_one(client, NULL, ":%s MODE %s + %lld", me.name,
+				    channel->chname, (long long)channel->creationtime);
+			}
+		}
+		if (sendts == -1 && channel->creationtime)
+			sendts = channel->creationtime;
+	}
+
+	if (*modebuf == '\0' || (*(modebuf + 1) == '\0' && (*modebuf == '+' || *modebuf == '-')))
+	{
+		if (tschange || isbounce)
+		{
+			/* relay bounce time changes */
+			if (channel->creationtime)
+			{
+				sendto_server(client, 0, 0, NULL, ":%s MODE %s %s+ %lld",
+				    me.id, channel->chname, isbounce ? "&" : "",
+				    (long long)channel->creationtime);
+			} else {
+				sendto_server(client, 0, 0, NULL, ":%s MODE %s %s+",
+				    me.id, channel->chname, isbounce ? "&" : "");
+			}
+			free_message_tags(mtags);
+			return; /* nothing to send */
+		}
+	}
+
+	/* opermode for twimodesystem --sts */
+#ifndef NO_OPEROVERRIDE
+	if ((opermode == 1) && IsUser(client))
+	{
+		if (modebuf[1])
+		{
+			sendto_snomask(SNO_EYES,
+			    "*** OperOverride -- %s (%s@%s) MODE %s %s %s",
+			    client->name, client->user->username, client->user->realhost,
+			    channel->chname, modebuf, parabuf);
+
+			/* Logging Implementation added by XeRXeS */
+			ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) MODE %s %s %s",
+				client->name, client->user->username, client->user->realhost,
+				channel->chname, modebuf, parabuf);
+		}
+
+		sendts = 0;
+	}
+#endif
+
+	/* Should stop null modes */
+	if (*(modebuf + 1) == '\0')
+	{
+		free_message_tags(mtags);
+		return;
+	}
+
+	if (IsUser(client) && samode && MyUser(client))
+	{
+		if (!sajoinmode)
+			sendto_umode_global(UMODE_OPER, "%s used SAMODE %s (%s%s%s)",
+				client->name, channel->chname, modebuf, *parabuf ? " " : "", parabuf);
+
+		client = &me;
+		sendts = 0;
+	}
+
+	sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+	               ":%s MODE %s %s %s",
+	               client->name, channel->chname, modebuf, parabuf);
+
+	if (IsServer(client) && sendts != -1)
+	{
+		sendto_server(client, 0, 0, mtags,
+		              ":%s MODE %s %s%s %s %lld",
+		              client->id, channel->chname,
+		              isbounce ? "&" : "", modebuf, parabuf,
+		              (long long)sendts);
+	} else
+	if (samode && IsMe(client))
+	{
+		/* SAMODE is a special case: always send a TS of 0 (omitting TS==desync) */
+		sendto_server(client, 0, 0, mtags,
+		              ":%s MODE %s %s %s 0",
+		              client->id, channel->chname, modebuf, parabuf);
+	} else
+	{
+		sendto_server(client, 0, 0, mtags,
+		              ":%s MODE %s %s%s %s",
+		              client->id, channel->chname, isbounce ? "&" : "", modebuf, parabuf);
+		/* tell them it's not a timestamp, in case the last param
+		   ** is a number. */
+	}
+
+	if (MyConnect(client))
+		RunHook7(HOOKTYPE_LOCAL_CHANMODE, client, channel, mtags, modebuf, parabuf, sendts, samode);
+	else
+		RunHook7(HOOKTYPE_REMOTE_CHANMODE, client, channel, mtags, modebuf, parabuf, sendts, samode);
+
+	/* After this, don't touch 'channel' anymore! As permanent module may have destroyed the channel. */
+
+	free_message_tags(mtags);
+
+}
+/* make_mode_str -- written by binary
+ *	Reconstructs the mode string, to make it look clean.  mode_buf will
+ *  contain the +x-y stuff, and the parabuf will contain the parameters.
+ *  If bounce is set to 1, it will make the string it needs for a bounce.
+ */
+void make_mode_str(Channel *channel, long oldm, Cmode_t oldem, long oldl, int pcount,
+    char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], char *mode_buf, char *para_buf,
+    size_t mode_buf_size, size_t para_buf_size, char bounce)
+{
+	char tmpbuf[MODEBUFLEN+3], *tmpstr;
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+	char *x = mode_buf;
+	int  what, cnt, z;
+	int i;
+	char *m;
+	what = 0;
+
+	*tmpbuf = '\0';
+	*mode_buf = '\0';
+	*para_buf = '\0';
+	what = 0;
+	/* + param-less modes */
+	tab = &corechannelmodetable[0];
+	while (tab->mode != 0x0)
+	{
+		if (channel->mode.mode & tab->mode)
+		{
+			if (!(oldm & tab->mode))
+			{
+				if (what != MODE_ADD)
+				{
+					*x++ = bounce ? '-' : '+';
+					what = MODE_ADD;
+				}
+				*x++ = tab->flag;
+			}
+		}
+		tab++;
+	}
+
+	/* + paramless extmodes... */
+	for (i=0; i <= Channelmode_highest; i++)
+	{
+		if (!Channelmode_Table[i].flag || Channelmode_Table[i].paracount)
+			continue;
+		/* have it now and didn't have it before? */
+		if ((channel->mode.extmode & Channelmode_Table[i].mode) &&
+		    !(oldem & Channelmode_Table[i].mode))
+		{
+			if (what != MODE_ADD)
+			{
+				*x++ = bounce ? '-' : '+';
+				what = MODE_ADD;
+			}
+			*x++ = Channelmode_Table[i].flag;
+		}
+	}
+
+	*x = '\0';
+	/* - param-less modes */
+	tab = &corechannelmodetable[0];
+	while (tab->mode != 0x0)
+	{
+		if (!(channel->mode.mode & tab->mode))
+		{
+			if (oldm & tab->mode)
+			{
+				if (what != MODE_DEL)
+				{
+					*x++ = bounce ? '+' : '-';
+					what = MODE_DEL;
+				}
+				*x++ = tab->flag;
+			}
+		}
+		tab++;
+	}
+
+	/* - extmodes (both "param modes" and paramless don't have
+	 * any params when unsetting... well, except one special type, that is (we skip those here)
+	 */
+	for (i=0; i <= Channelmode_highest; i++)
+	{
+		if (!Channelmode_Table[i].flag || Channelmode_Table[i].unset_with_param)
+			continue;
+		/* don't have it now and did have it before */
+		if (!(channel->mode.extmode & Channelmode_Table[i].mode) &&
+		    (oldem & Channelmode_Table[i].mode))
+		{
+			if (what != MODE_DEL)
+			{
+				*x++ = bounce ? '+' : '-';
+				what = MODE_DEL;
+			}
+			*x++ = Channelmode_Table[i].flag;
+		}
+	}
+
+	*x = '\0';
+	/* user limit */
+	if (channel->mode.limit != oldl)
+	{
+		if ((!bounce && channel->mode.limit == 0) ||
+		    (bounce && channel->mode.limit != 0))
+		{
+			if (what != MODE_DEL)
+			{
+				*x++ = '-';
+				what = MODE_DEL;
+			}
+			if (bounce)
+				channel->mode.limit = 0;	/* set it back */
+			*x++ = 'l';
+		}
+		else
+		{
+			if (what != MODE_ADD)
+			{
+				*x++ = '+';
+				what = MODE_ADD;
+			}
+			*x++ = 'l';
+			if (bounce)
+				channel->mode.limit = oldl;	/* set it back */
+			ircsnprintf(para_buf, para_buf_size, "%s%d ", para_buf, channel->mode.limit);
+		}
+	}
+	/* reconstruct bkov chain */
+	for (cnt = 0; cnt < pcount; cnt++)
+	{
+		if ((*(pvar[cnt]) == '+') && what != MODE_ADD)
+		{
+			*x++ = bounce ? '-' : '+';
+			what = MODE_ADD;
+		}
+		if ((*(pvar[cnt]) == '-') && what != MODE_DEL)
+		{
+			*x++ = bounce ? '+' : '-';
+			what = MODE_DEL;
+		}
+		*x++ = *(pvar[cnt] + 1);
+		tmpstr = &pvar[cnt][2];
+		z = (MODEBUFLEN * MAXMODEPARAMS);
+		m = para_buf;
+		while ((*m)) { m++; }
+		while ((*tmpstr) && ((m-para_buf) < z))
+		{
+			*m = *tmpstr;
+			m++;
+			tmpstr++;
+		}
+		*m++ = ' ';
+		*m = '\0';
+	}
+	if (bounce)
+	{
+		channel->mode.mode = oldm;
+		channel->mode.extmode = oldem;
+	}
+	z = strlen(para_buf);
+	if ((z > 0) && (para_buf[z - 1] == ' '))
+		para_buf[z - 1] = '\0';
+	*x = '\0';
+	if (*mode_buf == '\0')
+	{
+		*mode_buf = '+';
+		mode_buf++;
+		*mode_buf = '\0';
+		/* Don't send empty lines. */
+	}
+	return;
+}
+
+
+/* do_mode_char
+ *  processes one mode character
+ *  returns 1 if it ate up a param, otherwise 0
+ *	written by binary
+ *  modified for Unreal by stskeeps..
+ */
+
+#define REQUIRE_PARAMETER() { if (!param || *pcount >= MAXMODEPARAMS) { retval = 0; break; } retval = 1; }
+
+#ifdef PREFIX_AQ
+#define is_xchanop(x) ((x & (CHFL_CHANOP|CHFL_CHANADMIN|CHFL_CHANOWNER)))
+#else
+#define is_xchanop(x) ((x & CHFL_CHANOP))
+#endif
+
+int  do_mode_char(Channel *channel, long modetype, char modechar, char *param,
+                  u_int what, Client *client,
+                  u_int *pcount, char pvar[MAXMODEPARAMS][MODEBUFLEN + 3],
+                  char bounce, long my_access)
+{
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+	int  retval = 0;
+	Member *member = NULL;
+	Membership *membership = NULL;
+	Client *target;
+	unsigned int tmp = 0;
+	char tmpbuf[512], *tmpstr;
+	char tc = ' ';		/* */
+	int  chasing = 0, x;
+	Hook *h;
+
+	if ((my_access & CHFL_HALFOP) && !is_xchanop(my_access) && !IsULine(client) &&
+	    !op_can_override("channel:override:mode",client,channel,&modetype) && !samode_in_progress)
+	{
+		if (MyUser(client) && (modetype == MODE_HALFOP) && (what == MODE_DEL) &&
+		    param && (find_client(param, NULL) == client))
+		{
+			/* halfop -h'ing him/herself */
+			/* ALLOW */
+		} else
+		{
+			/* Ugly halfop hack --sts
+			   - this allows halfops to do +b +e +v and so on */
+			/* (Syzop/20040413: Allow remote halfop modes */
+			if ((Halfop_mode(modetype) == FALSE) && MyUser(client))
+			{
+				int eaten = 0;
+				while (tab->mode != 0x0)
+				{
+					if (tab->mode == modetype)
+					{
+						sendnumeric(client, ERR_NOTFORHALFOPS, tab->flag);
+						eaten = tab->parameters;
+						break;
+					}
+					tab++;
+				}
+				return eaten;
+			}
+		} /* not -h self */
+	}
+	switch (modetype)
+	{
+		case MODE_RGSTR:
+			if (!IsServer(client) && !IsULine(client))
+			{
+				sendnumeric(client, ERR_ONLYSERVERSCANCHANGE, channel->chname);
+				break;
+			}
+			goto setmode;
+		case MODE_SECRET:
+		case MODE_PRIVATE:
+		case MODE_MODERATED:
+		case MODE_TOPICLIMIT:
+		case MODE_NOPRIVMSGS:
+		case MODE_INVITEONLY:
+			goto setmode;
+		setmode:
+			retval = 0;
+			if (what == MODE_ADD) {
+				/* +sp bugfix.. (by JK/Luke)*/
+		 	 if ((modetype == MODE_SECRET) && (channel->mode.mode & MODE_PRIVATE))
+					channel->mode.mode &= ~MODE_PRIVATE;
+				if ((modetype == MODE_PRIVATE) && (channel->mode.mode & MODE_SECRET))
+					channel->mode.mode &= ~MODE_SECRET;
+				channel->mode.mode |= modetype;
+			}
+			else
+			{
+				channel->mode.mode &= ~modetype;
+				RunHook2(HOOKTYPE_MODECHAR_DEL, channel, (int)modechar);
+			}
+			break;
+
+/* do pro-opping here (popping) */
+		case MODE_CHANOWNER:
+			REQUIRE_PARAMETER()
+			if (!IsULine(client) && !IsServer(client) && !is_chanowner(client, channel) && !samode_in_progress)
+			{
+					if (MyUser(client) && !op_can_override("channel:override:mode",client,channel,&modetype))
+					{
+						sendnumeric(client, ERR_CHANOWNPRIVNEEDED, channel->chname);
+						break;
+					}
+					if (!is_half_op(client, channel)) /* htrig will take care of halfop override notices */
+						opermode = 1;
+			}
+			goto process_listmode;
+		case MODE_CHANADMIN:
+			REQUIRE_PARAMETER()
+			/* not uline, not server, not chanowner, not an samode, not -a'ing yourself... */
+			if (!IsULine(client) && !IsServer(client) && !is_chanowner(client, channel) && !samode_in_progress &&
+			    !(param && (what == MODE_DEL) && (find_client(param, NULL) == client)))
+			{
+					if (MyUser(client) && !op_can_override("channel:override:mode",client,channel,&modetype))
+					{
+						sendnumeric(client, ERR_CHANOWNPRIVNEEDED, channel->chname);
+						break;
+					}
+					if (!is_half_op(client, channel)) /* htrig will take care of halfop override notices */
+						opermode = 1;
+			}
+			goto process_listmode;
+
+		case MODE_HALFOP:
+		case MODE_CHANOP:
+		case MODE_VOICE:
+			REQUIRE_PARAMETER()
+process_listmode:
+			if (!(target = find_chasing(client, param, &chasing)))
+				break;
+			if (!target->user)
+				break;
+			if (!(membership = find_membership_link(target->user->channel, channel)))
+			{
+				sendnumeric(client, ERR_USERNOTINCHANNEL, target->name, channel->chname);
+				break;
+			}
+			member = find_member_link(channel->members, target);
+			if (!member)
+			{
+				/* should never happen */
+				sendto_realops("crap! find_membership_link && !find_member_link !!. Report to unreal team");
+				break;
+			}
+			/* we make the rules, we bend the rules */
+			if (IsServer(client) || IsULine(client))
+				goto breaktherules;
+
+			if (what == MODE_DEL)
+			{
+				int ret = EX_ALLOW;
+				char *badmode = NULL;
+
+				for (h = Hooks[HOOKTYPE_MODE_DEOP]; h; h = h->next)
+				{
+					int n = (*(h->func.intfunc))(client, member->client, channel, what, modechar, my_access, &badmode);
+					if (n == EX_DENY)
+						ret = n;
+				else if (n == EX_ALWAYS_DENY)
+				{
+					ret = n;
+					break;
+				}
+				}
+
+				if (ret == EX_ALWAYS_DENY)
+				{
+					if (MyUser(client) && badmode)
+						sendto_one(client, NULL, "%s", badmode); /* send error message, if any */
+
+				if (MyUser(client))
+					break; /* stop processing this mode */
+				}
+
+				/* This probably should work but is completely untested (the operoverride stuff, I mean): */
+				if (ret == EX_DENY)
+				{
+					if (!op_can_override("channel:override:mode:del",client,channel,&modetype))
+					{
+						if (badmode)
+							sendto_one(client, NULL, "%s", badmode); /* send error message, if any */
+						break; /* stop processing this mode */
+					} else {
+						opermode = 1;
+					}
+				}
+			}
+
+			/* This check not only prevents unprivileged users from doing a -q on chanowners,
+			 * it also protects against -o/-h/-v on them.
+			 */
+			if (is_chanowner(member->client, channel)
+			    && member->client != client
+			    && !is_chanowner(client, channel) && !IsServer(client)
+			    && !IsULine(client) && !opermode && !samode_in_progress && (what == MODE_DEL))
+			{
+				if (MyUser(client))
+				{
+					/* Need this !op_can_override() here again, even with the !opermode
+					 * check a few lines up, all due to halfops. -- Syzop
+					 */
+					if (!op_can_override("channel:override:mode:del",client,channel,&modetype))
+					{
+						char errbuf[NICKLEN+30];
+						ircsnprintf(errbuf, sizeof(errbuf), "%s is a channel owner", member->client->name);
+						sendnumeric(client, ERR_CANNOTCHANGECHANMODE, modechar, errbuf);
+						break;
+					}
+				} else {
+					if (IsOper(client))
+						opermode = 1;
+				}
+			}
+
+			/* This check not only prevents unprivileged users from doing a -a on chanadmins,
+			 * it also protects against -o/-h/-v on them.
+			 */
+			if (is_chanadmin(member->client, channel)
+			    && member->client != client
+			    && !is_chanowner(client, channel) && !IsServer(client) && !opermode && !samode_in_progress
+			    && modetype != MODE_CHANOWNER && (what == MODE_DEL))
+			{
+				if (MyUser(client))
+				{
+					/* Need this !op_can_override() here again, even with the !opermode
+					 * check a few lines up, all due to halfops. -- Syzop
+					 */
+					if (!op_can_override("channel:override:mode:del",client,channel,&modetype))
+					{
+						char errbuf[NICKLEN+30];
+						ircsnprintf(errbuf, sizeof(errbuf), "%s is a channel admin", member->client->name);
+						sendnumeric(client, ERR_CANNOTCHANGECHANMODE, modechar, errbuf);
+						break;
+					}
+				} else {
+					if (IsOper(client))
+						opermode = 1;
+				}
+			}
+		breaktherules:
+			tmp = member->flags;
+			if (what == MODE_ADD)
+				member->flags |= modetype;
+			else
+				member->flags &= ~modetype;
+			if ((tmp == member->flags) && (bounce || !IsULine(client)))
+				break;
+			/* It's easier to undo the mode here instead of later
+			 * when you call make_mode_str for a bounce string.
+			 * Why set it if it will be instantly removed?
+			 * Besides, pvar keeps a log of it. */
+			if (bounce)
+				member->flags = tmp;
+			if (modetype == MODE_CHANOWNER)
+				tc = 'q';
+			if (modetype == MODE_CHANADMIN)
+				tc = 'a';
+			if (modetype == MODE_CHANOP)
+				tc = 'o';
+			if (modetype == MODE_HALFOP)
+				tc = 'h';
+			if (modetype == MODE_VOICE)
+				tc = 'v';
+			/* Make sure membership->flags and member->flags is the same */
+			membership->flags = member->flags;
+			ircsnprintf(pvar[*pcount], MODEBUFLEN + 3,
+			            "%c%c%s",
+			            (what == MODE_ADD) ? '+' : '-', tc, target->name);
+			(*pcount)++;
+			break;
+		case MODE_LIMIT:
+			if (what == MODE_ADD)
+			{
+				REQUIRE_PARAMETER()
+				tmp = atoi(param);
+				if (channel->mode.limit == tmp)
+					break;
+				channel->mode.limit = tmp;
+			}
+			else
+			{
+				retval = 0;
+				if (!channel->mode.limit)
+					break;
+				channel->mode.limit = 0;
+				RunHook2(HOOKTYPE_MODECHAR_DEL, channel, (int)modechar);
+			}
+			break;
+		case MODE_KEY:
+			REQUIRE_PARAMETER()
+			for (x = 0; x < *pcount; x++)
+			{
+				if (pvar[x][1] == 'k')
+				{	/* don't allow user to change key
+				 * more than once per command. */
+					retval = 0;
+					break;
+				}
+			}
+			if (retval == 0)	/* you can't break a case from loop */
+				break;
+			if (what == MODE_ADD)
+			{
+				if (!bounce) {	/* don't do the mode at all. */
+					char *tmp;
+					if ((tmp = strchr(param, ' ')))
+					*tmp = '\0';
+					if ((tmp = strchr(param, ':')))
+					*tmp = '\0';
+					if ((tmp = strchr(param, ',')))
+					*tmp = '\0';
+					if (*param == '\0')
+					break;
+					if (strlen(param) > KEYLEN)
+						param[KEYLEN] = '\0';
+					if (!strcmp(channel->mode.key, param))
+					break;
+					strlcpy(channel->mode.key, param, sizeof(channel->mode.key));
+				}
+				tmpstr = param;
+			}
+			else
+			{
+				if (!*channel->mode.key)
+					break;	/* no change */
+				strlcpy(tmpbuf, channel->mode.key, sizeof(tmpbuf));
+				tmpstr = tmpbuf;
+				if (!bounce)
+					strcpy(channel->mode.key, "");
+				RunHook2(HOOKTYPE_MODECHAR_DEL, channel, (int)modechar);
+			}
+			retval = 1;
+
+			ircsnprintf(pvar[*pcount], MODEBUFLEN + 3,
+			            "%ck%s",
+			            (what == MODE_ADD) ? '+' : '-', tmpstr);
+			(*pcount)++;
+			break;
+
+		case MODE_BAN:
+			REQUIRE_PARAMETER()
+			retval = 1;
+			tmpstr = clean_ban_mask(param, what, client);
+			if (BadPtr(tmpstr))
+			{
+				/* Invalid ban. See if we can send an error about that (only for extbans) */
+				if (MyUser(client) && !bounce && is_extended_ban(param))
+				{
+					Extban *p = findmod_by_bantype(param[1]);
+					if (p && p->is_ok)
+						p->is_ok(client, channel, param, EXBCHK_PARAM, what, EXBTYPE_BAN);
+				}
+
+				break; /* ignore ban, but eat param */
+			}
+			if (MyUser(client) && !bounce && is_extended_ban(param))
+			{
+				/* extban: check access if needed */
+				Extban *p = findmod_by_bantype(tmpstr[1]);
+				if (p && p->is_ok)
+				{
+					if (!p->is_ok(client, channel, tmpstr, EXBCHK_ACCESS, what, EXBTYPE_BAN))
+					{
+						if (ValidatePermissionsForPath("channel:override:mode:extban",client,NULL,channel,NULL))
+						{
+							/* TODO: send operoverride notice */
+						} else {
+							p->is_ok(client, channel, tmpstr, EXBCHK_ACCESS_ERR, what, EXBTYPE_BAN);
+							break;
+						}
+					}
+					if (!p->is_ok(client, channel, tmpstr, EXBCHK_PARAM, what, EXBTYPE_BAN))
+						break;
+				}
+			}
+			/* For bounce, we don't really need to worry whether
+			 * or not it exists on our server.  We'll just always
+			 * bounce it. */
+			if (!bounce &&
+			    ((what == MODE_ADD && add_listmode(&channel->banlist, client, channel, tmpstr))
+			    || (what == MODE_DEL && del_listmode(&channel->banlist, channel, tmpstr))))
+			{
+				break;	/* already exists */
+			}
+			ircsnprintf(pvar[*pcount], MODEBUFLEN + 3,
+			            "%cb%s",
+			            (what == MODE_ADD) ? '+' : '-', tmpstr);
+			(*pcount)++;
+			break;
+		case MODE_EXCEPT:
+			REQUIRE_PARAMETER()
+			tmpstr = clean_ban_mask(param, what, client);
+			if (BadPtr(tmpstr))
+			{
+				/* Invalid except. See if we can send an error about that (only for extbans) */
+				if (MyUser(client) && !bounce && is_extended_ban(param))
+				{
+					Extban *p = findmod_by_bantype(param[1]);
+					if (p && p->is_ok)
+						p->is_ok(client, channel, param, EXBCHK_PARAM, what, EXBTYPE_EXCEPT);
+				}
+
+				break; /* ignore except, but eat param */
+			}
+			if (MyUser(client) && !bounce && is_extended_ban(param))
+			{
+				/* extban: check access if needed */
+				Extban *p = findmod_by_bantype(tmpstr[1]);
+				if (p && p->is_ok)
+				{
+					if (!p->is_ok(client, channel, tmpstr, EXBCHK_ACCESS, what, EXBTYPE_EXCEPT))
+					{
+						if (ValidatePermissionsForPath("channel:override:mode:extban",client,NULL,channel,NULL))
+						{
+							/* TODO: send operoverride notice */
+						} else {
+							p->is_ok(client, channel, tmpstr, EXBCHK_ACCESS_ERR, what, EXBTYPE_EXCEPT);
+							break;
+						}
+					}
+					if (!p->is_ok(client, channel, tmpstr, EXBCHK_PARAM, what, EXBTYPE_EXCEPT))
+						break;
+				}
+			}
+			/* For bounce, we don't really need to worry whether
+			 * or not it exists on our server.  We'll just always
+			 * bounce it. */
+			if (!bounce &&
+			    ((what == MODE_ADD && add_listmode(&channel->exlist, client, channel, tmpstr))
+			    || (what == MODE_DEL && del_listmode(&channel->exlist, channel, tmpstr))))
+			{
+				break;	/* already exists */
+			}
+			ircsnprintf(pvar[*pcount], MODEBUFLEN + 3,
+			            "%ce%s",
+			            (what == MODE_ADD) ? '+' : '-', tmpstr);
+			(*pcount)++;
+			break;
+		case MODE_INVEX:
+			REQUIRE_PARAMETER()
+			tmpstr = clean_ban_mask(param, what, client);
+			if (BadPtr(tmpstr))
+			{
+				/* Invalid invex. See if we can send an error about that (only for extbans) */
+				if (MyUser(client) && !bounce && is_extended_ban(param))
+				{
+					Extban *p = findmod_by_bantype(param[1]);
+					if (p && p->is_ok)
+						p->is_ok(client, channel, param, EXBCHK_PARAM, what, EXBTYPE_INVEX);
+				}
+
+				break; /* ignore invex, but eat param */
+			}
+			if (MyUser(client) && !bounce && is_extended_ban(param))
+			{
+				/* extban: check access if needed */
+				Extban *p = findmod_by_bantype(tmpstr[1]);
+				if (p)
+				{
+					if (!(p->options & EXTBOPT_INVEX))
+						break; /* this extended ban type does not support INVEX */
+					if (p->is_ok && !p->is_ok(client, channel, tmpstr, EXBCHK_ACCESS, what, EXBTYPE_INVEX))
+					{
+						if (ValidatePermissionsForPath("channel:override:mode:extban",client,NULL,channel,NULL))
+						{
+							/* TODO: send operoverride notice */
+						} else {
+							p->is_ok(client, channel, tmpstr, EXBCHK_ACCESS_ERR, what, EXBTYPE_INVEX);
+							break;
+						}
+					}
+					if (p->is_ok && !p->is_ok(client, channel, tmpstr, EXBCHK_PARAM, what, EXBTYPE_INVEX))
+						break;
+				}
+			}
+			/* For bounce, we don't really need to worry whether
+			 * or not it exists on our server.  We'll just always
+			 * bounce it. */
+			if (!bounce &&
+			    ((what == MODE_ADD && add_listmode(&channel->invexlist, client, channel, tmpstr))
+			    || (what == MODE_DEL && del_listmode(&channel->invexlist, channel, tmpstr))))
+			{
+				break;	/* already exists */
+			}
+			ircsnprintf(pvar[*pcount], MODEBUFLEN + 3,
+			            "%cI%s",
+			            (what == MODE_ADD) ? '+' : '-', tmpstr);
+			(*pcount)++;
+			break;
+	}
+	return retval;
+}
+
+/** Check access and if granted, set the extended chanmode to the requested value in memory.
+  * note: if bounce is requested then the mode will not be set.
+  * @returns amount of params eaten (0 or 1)
+  */
+int do_extmode_char(Channel *channel, Cmode *handler, char *param, u_int what,
+                    Client *client, u_int *pcount, char pvar[MAXMODEPARAMS][MODEBUFLEN + 3],
+                    char bounce)
+{
+	int paracnt = (what == MODE_ADD) ? handler->paracount : 0;
+	char mode = handler->flag;
+	int x;
+	char *morphed;
+
+	if ((what == MODE_DEL) && handler->unset_with_param)
+		paracnt = 1; /* there's always an exception! */
+
+	/* Expected a param and it isn't there? */
+	if (paracnt && (!param || (*pcount >= MAXMODEPARAMS)))
+		return 0;
+
+	/* Prevent remote users from setting local channel modes */
+	if (handler->local && !MyUser(client))
+		return paracnt;
+
+	if (MyUser(client))
+	{
+		x = handler->is_ok(client, channel, mode, param, EXCHK_ACCESS, what);
+		if ((x == EX_ALWAYS_DENY) ||
+		    ((x == EX_DENY) && !op_can_override("channel:override:mode:del",client,channel,handler) && !samode_in_progress))
+		{
+			handler->is_ok(client, channel, mode, param, EXCHK_ACCESS_ERR, what);
+			return paracnt; /* Denied & error msg sent */
+		}
+		if (x == EX_DENY)
+			opermode = 1; /* override in progress... */
+	} else {
+		/* remote user: we only need to check if we need to generate an operoverride msg */
+		if (!IsULine(client) && IsUser(client) && op_can_override("channel:override:mode:del",client,channel,handler) &&
+		    (handler->is_ok(client, channel, mode, param, EXCHK_ACCESS, what) != EX_ALLOW))
+		{
+			opermode = 1; /* override in progress... */
+		}
+	}
+
+	/* Check for multiple changes in 1 command (like +y-y+y 1 2, or +yy 1 2). */
+	for (x = 0; x < *pcount; x++)
+	{
+		if (pvar[x][1] == handler->flag)
+		{
+			/* this is different than the old chanmode system, coz:
+			 * "mode #chan +kkL #a #b #c" will get "+kL #a #b" which is wrong :p.
+			 * we do eat the parameter. -- Syzop
+			 */
+			return paracnt;
+		}
+	}
+
+	/* w00t... a parameter mode */
+	if (handler->paracount)
+	{
+		if (what == MODE_DEL)
+		{
+			if (!(channel->mode.extmode & handler->mode))
+				return paracnt; /* There's nothing to remove! */
+			if (handler->unset_with_param)
+			{
+				/* Special extended channel mode requiring a parameter on unset.
+				 * Any provided parameter is ok, the current one (that is set) will be used.
+				 */
+				ircsnprintf(pvar[*pcount], MODEBUFLEN + 3, "-%c%s",
+					handler->flag, cm_getparameter(channel, handler->flag));
+				(*pcount)++;
+			} else {
+				/* Normal extended channel mode: deleting is just -X, no parameter.
+				 * Nothing needs to be done here.
+				 */
+			}
+		} else {
+			/* add: is the parameter ok? */
+			if (handler->is_ok(client, channel, mode, param, EXCHK_PARAM, what) == FALSE)
+				return paracnt; /* rejected by is_ok */
+
+			morphed = handler->conv_param(param, client);
+			if (!morphed)
+				return paracnt; /* rejected by conv_param */
+
+			/* is it already set at the same value? if so, ignore it. */
+			if (channel->mode.extmode & handler->mode)
+			{
+				char *now, *requested;
+				char flag = handler->flag;
+				now = cm_getparameter(channel, flag);
+				requested = handler->conv_param(param, client);
+				if (now && requested && !strcmp(now, requested))
+					return paracnt; /* ignore... */
+			}
+			ircsnprintf(pvar[*pcount], MODEBUFLEN + 3, "+%c%s",
+				handler->flag, handler->conv_param(param, client));
+			(*pcount)++;
+			param = morphed; /* set param to converted parameter. */
+		}
+	}
+
+	if (bounce) /* bounce here means: only check access and return return value */
+		return paracnt;
+
+	if (what == MODE_ADD)
+	{	/* + */
+		channel->mode.extmode |= handler->mode;
+		if (handler->paracount)
+			cm_putparameter(channel, handler->flag, param);
+	} else
+	{	/* - */
+		channel->mode.extmode &= ~(handler->mode);
+		RunHook2(HOOKTYPE_MODECHAR_DEL, channel, (int)mode);
+		if (handler->paracount)
+			cm_freeparameter(channel, handler->flag);
+	}
+	return paracnt;
+}
+
+/** In 2003 I introduced PROTOCTL CHANMODES= so remote servers (and services)
+ * could deal with unknown "parameter eating" channel modes, minimizing desyncs.
+ * Now, in 2015, I finally added the code to deal with this. -- Syzop
+ */
+int paracount_for_chanmode_from_server(Client *client, u_int what, char mode)
+{
+	if (MyUser(client))
+		return 0; /* no server, we have no idea, assume 0 paracount */
+
+	if (!client->serv)
+	{
+		/* If it's from a remote client then figure out from which "uplink" we
+		 * received this MODE. The uplink is the directly-connected-server to us
+		 * and may differ from the server the user is actually on. This is correct.
+		 */
+		if (!client->direction || !client->direction->serv)
+			return 0;
+		client = client->direction;
+	}
+
+	if (client->serv->features.chanmodes[0] && strchr(client->serv->features.chanmodes[0], mode))
+		return 1; /* 1 parameter for set, 1 parameter for unset */
+
+	if (client->serv->features.chanmodes[1] && strchr(client->serv->features.chanmodes[1], mode))
+		return 1; /* 1 parameter for set, 1 parameter for unset */
+
+	if (client->serv->features.chanmodes[2] && strchr(client->serv->features.chanmodes[2], mode))
+		return (what == MODE_ADD) ? 1 : 0; /* 1 parameter for set, no parameter for unset */
+
+	if (client->serv->features.chanmodes[3] && strchr(client->serv->features.chanmodes[3], mode))
+		return 0; /* no parameter for set, no parameter for unset */
+
+	if (mode == '&')
+		return 0; /* & indicates bounce, it is not an actual mode character */
+
+	/* If we end up here it means we have no idea if it is a parameter-eating or paramless
+	 * channel mode. That's actually pretty bad. This shouldn't happen since CHANMODES=
+	 * is sent since 2003 and the (often also required) EAUTH PROTOCTL is in there since 2010.
+	 */
+	sendto_realops("Unknown channel mode %c%c from server %s!",
+		(what == MODE_ADD) ? '+' : '-',
+		mode,
+		client->name);
+
+	return 0;
+}
+
+/** Quick way to find out parameter count for a channel mode.
+ * Only for LOCAL mode requests. For remote modes use
+ * paracount_for_chanmode_from_server() instead.
+ */
+int paracount_for_chanmode(u_int what, char mode)
+{
+	if (me.serv->features.chanmodes[0] && strchr(me.serv->features.chanmodes[0], mode))
+		return 1; /* 1 parameter for set, 1 parameter for unset */
+
+	if (me.serv->features.chanmodes[1] && strchr(me.serv->features.chanmodes[1], mode))
+		return 1; /* 1 parameter for set, 1 parameter for unset */
+
+	if (me.serv->features.chanmodes[2] && strchr(me.serv->features.chanmodes[2], mode))
+		return (what == MODE_ADD) ? 1 : 0; /* 1 parameter for set, no parameter for unset */
+
+	if (me.serv->features.chanmodes[3] && strchr(me.serv->features.chanmodes[3], mode))
+		return 0; /* no parameter for set, no parameter for unset */
+
+	/* Not found: */
+	return 0;
+}
+
+/* set_mode
+ *	written by binary
+ */
+void _set_mode(Channel *channel, Client *client, int parc, char *parv[], u_int *pcount,
+               char pvar[MAXMODEPARAMS][MODEBUFLEN + 3], int bounce)
+{
+	char *curchr;
+	char *argument;
+	u_int what = MODE_ADD;
+	long modetype = 0;
+	int paracount = 1;
+#ifdef DEVELOP
+	char *tmpo = NULL;
+#endif
+	CoreChannelModeTable *tab = &corechannelmodetable[0];
+	CoreChannelModeTable foundat;
+	int found = 0;
+	int sent_mlock_warning = 0;
+	unsigned int htrig = 0;
+	long oldm, oldl;
+	int checkrestr = 0, warnrestr = 1;
+	int extm = 1000000; /* (default value not used but stops gcc from complaining) */
+	Cmode_t oldem;
+	long my_access;
+	paracount = 1;
+	*pcount = 0;
+
+	oldm = channel->mode.mode;
+	oldl = channel->mode.limit;
+	oldem = channel->mode.extmode;
+	if (RESTRICT_CHANNELMODES && !ValidatePermissionsForPath("immune:restrict-channelmodes",client,NULL,channel,NULL)) /* "cache" this */
+		checkrestr = 1;
+
+	/* Set access to the status we have */
+	my_access = IsUser(client) ? get_access(client, channel) : 0;
+
+	for (curchr = parv[0]; *curchr; curchr++)
+	{
+		switch (*curchr)
+		{
+			case '+':
+				what = MODE_ADD;
+				break;
+			case '-':
+				what = MODE_DEL;
+				break;
+			default:
+				if (MyUser(client) && channel->mode_lock && strchr(channel->mode_lock, *curchr) != NULL)
+				{
+					if (!IsOper(client) || find_server(SERVICES_NAME, NULL) ||
+					    !ValidatePermissionsForPath("channel:override:mlock",client,NULL,channel,NULL))
+					{
+						if (!sent_mlock_warning)
+						{
+							sendnumeric(client, ERR_MLOCKRESTRICTED, channel->chname, *curchr, channel->mode_lock);
+							sent_mlock_warning++;
+						}
+						continue;
+					}
+				}
+				found = 0;
+				tab = &corechannelmodetable[0];
+				while ((tab->mode != 0x0) && found == 0)
+				{
+					if (tab->flag == *curchr)
+					{
+						found = 1;
+						foundat = *tab;
+					}
+					tab++;
+				}
+				if (found == 1)
+				{
+					modetype = foundat.mode;
+				} else {
+					/* Maybe in extmodes */
+					for (extm=0; extm <= Channelmode_highest; extm++)
+					{
+						if (Channelmode_Table[extm].flag == *curchr)
+						{
+							found = 2;
+							break;
+						}
+					}
+				}
+				if (found == 0) /* Mode char unknown */
+				{
+					if (!MyUser(client))
+						paracount += paracount_for_chanmode_from_server(client, what, *curchr);
+					else
+						sendnumeric(client, ERR_UNKNOWNMODE, *curchr);
+					break;
+				}
+
+				if (checkrestr && strchr(RESTRICT_CHANNELMODES, *curchr))
+				{
+					if (warnrestr)
+					{
+						sendnotice(client, "Setting/removing of channelmode(s) '%s' has been disabled.",
+							RESTRICT_CHANNELMODES);
+						warnrestr = 0;
+					}
+					paracount += paracount_for_chanmode(what, *curchr);
+					break;
+				}
+
+				if (paracount < parc)
+					argument = parv[paracount]; /* can still be NULL */
+				else
+					argument = NULL;
+
+#ifndef NO_OPEROVERRIDE
+				if (found == 1)
+				{
+					if ((Halfop_mode(modetype) == FALSE) && opermode == 2 && htrig != 1)
+					{
+						/* YUCK! */
+						if ((foundat.flag == 'h') && argument && (find_person(argument, NULL) == client))
+						{
+							/* ircop with halfop doing a -h on himself. no warning. */
+						} else {
+							opermode = 0;
+							htrig = 1;
+						}
+					}
+				}
+				else if (found == 2) {
+					/* Extended mode: all override stuff is in do_extmode_char which will set
+					 * opermode if appropriate. -- Syzop
+					 */
+				}
+#endif /* !NO_OPEROVERRIDE */
+
+				/* Not sure how useful this is, but I'll let it stay... */
+				if (argument && strlen(argument) >= MODEBUFLEN)
+					argument[MODEBUFLEN-1] = '\0';
+
+				if (found == 1)
+				{
+					paracount += do_mode_char(channel, modetype, *curchr,
+								  argument, what, client, pcount,
+								  pvar, bounce, my_access);
+				}
+				else if (found == 2)
+				{
+					paracount += do_extmode_char(channel, &Channelmode_Table[extm], argument,
+								     what, client, pcount, pvar, bounce);
+				}
+				break;
+		} /* switch(*curchr) */
+	} /* for loop through mode letters */
+
+	make_mode_str(channel, oldm, oldem, oldl, *pcount, pvar, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), bounce);
+
+#ifndef NO_OPEROVERRIDE
+	if ((htrig == 1) && IsUser(client))
+	{
+		/* This is horrible. Just horrible. */
+		if (!((modebuf[0] == '+' || modebuf[0] == '-') && modebuf[1] == '\0'))
+		{
+			sendto_snomask(SNO_EYES, "*** OperOverride -- %s (%s@%s) MODE %s %s %s",
+			               client->name, client->user->username, client->user->realhost,
+			               channel->chname, modebuf, parabuf);
+		}
+
+		/* Logging Implementation added by XeRXeS */
+		ircd_log(LOG_OVERRIDE,"OVERRIDE: %s (%s@%s) MODE %s %s %s",
+		         client->name, client->user->username, client->user->realhost,
+		         channel->chname, modebuf, parabuf);
+
+		htrig = 0;
+		opermode = 0; /* stop double override notices... but is this ok??? -- Syzop */
+	}
+#endif
+}
+
+/*
+ * cmd_umode() added 15/10/91 By Darren Reed.
+ * parv[1] - username to change mode for
+ * parv[2] - modes to change
+ */
+CMD_FUNC(_cmd_umode)
+{
+	int i;
+	char **p, *m;
+	Client *acptr;
+	int what, setsnomask = 0;
+	long oldumodes = 0;
+	int oldsnomasks = 0;
+	/* (small note: keep 'what' as an int. -- Syzop). */
+	short rpterror = 0, umode_restrict_err = 0, chk_restrict = 0, modex_err = 0;
+
+	what = MODE_ADD;
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "MODE");
+		return;
+	}
+
+	if (!(acptr = find_person(parv[1], NULL)))
+	{
+		if (MyConnect(client))
+		{
+			sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+		}
+		return;
+	}
+	if (acptr != client)
+	{
+		sendnumeric(client, ERR_USERSDONTMATCH);
+		return;
+	}
+
+	if (parc < 3)
+	{
+		sendnumeric(client, RPL_UMODEIS, get_usermode_string(client));
+		if (client->user->snomask)
+			sendnumeric(client, RPL_SNOMASK, get_snomask_string(client));
+		return;
+	}
+
+	userhost_save_current(client); /* save host, in case we do any +x/-x or similar */
+
+	/* find flags already set for user */
+	for (i = 0; i <= Usermode_highest; i++)
+		if ((client->umodes & Usermode_Table[i].mode))
+			oldumodes |= Usermode_Table[i].mode;
+
+	for (i = 0; i <= Snomask_highest; i++)
+		if ((client->user->snomask & Snomask_Table[i].mode))
+			oldsnomasks |= Snomask_Table[i].mode;
+
+	if (RESTRICT_USERMODES && MyUser(client) && !ValidatePermissionsForPath("immune:restrict-usermodes",client,NULL,NULL,NULL))
+		chk_restrict = 1;
+
+	if (MyConnect(client))
+		setsnomask = client->user->snomask;
+	/*
+	 * parse mode change string(s)
+	 */
+	p = &parv[2];
+	for (m = *p; *m; m++)
+	{
+		if (chk_restrict && strchr(RESTRICT_USERMODES, *m))
+		{
+			if (!umode_restrict_err)
+			{
+				sendnotice(client, "Setting/removing of usermode(s) '%s' has been disabled.",
+					RESTRICT_USERMODES);
+				umode_restrict_err = 1;
+			}
+			continue;
+		}
+		switch (*m)
+		{
+			case '+':
+				what = MODE_ADD;
+				break;
+			case '-':
+				what = MODE_DEL;
+				break;
+				/* we may not get these,
+				 * but they shouldnt be in default
+				 */
+			case ' ':
+			case '\t':
+				break;
+			case 's':
+				if (what == MODE_DEL)
+				{
+					if (parc >= 4 && client->user->snomask)
+					{
+						set_snomask(client, parv[3]);
+						if (client->user->snomask == 0)
+							goto def;
+						break;
+					} else {
+						set_snomask(client, NULL);
+						goto def;
+					}
+				}
+				if (what == MODE_ADD)
+				{
+					if (parc < 4)
+						set_snomask(client, IsOper(client) ? SNO_DEFOPER : SNO_DEFUSER);
+					else
+						set_snomask(client, parv[3]);
+					goto def;
+				}
+				break;
+			case 'o':
+			case 'O':
+				if (IsQuarantined(client->direction))
+				{
+					sendto_realops("QUARANTINE: Oper %s on server %s killed, due to quarantine", client->name, client->srvptr->name);
+					sendto_server(NULL, 0, 0, NULL, ":%s KILL %s :Quarantined: no oper privileges allowed", me.id, client->name);
+					exit_client(client, NULL, "Quarantined: no oper privileges allowed");
+					return;
+				}
+				/* A local user trying to set himself +o/+O is denied here.
+				 * A while later (outside this loop) it is handled as well (and +C, +N, etc too)
+				 * but we need to take care here too because it might cause problems
+				 * that's just asking for bugs! -- Syzop.
+				 */
+				if (MyUser(client) && (what == MODE_ADD)) /* Someone setting himself +o? Deny it. */
+					break;
+				goto def;
+			case 't':
+			case 'x':
+				switch (UHOST_ALLOWED)
+				{
+				case UHALLOW_ALWAYS:
+					goto def;
+				case UHALLOW_NEVER:
+					if (MyUser(client))
+					{
+						if (!modex_err)
+						{
+							sendnotice(client, "*** Setting %c%c is disabled",
+								what == MODE_ADD ? '+' : '-', *m);
+							modex_err = 1;
+						}
+						break;
+					}
+					goto def;
+				case UHALLOW_NOCHANS:
+					if (MyUser(client) && client->user->joined)
+					{
+						if (!modex_err)
+						{
+							sendnotice(client, "*** Setting %c%c can not be done while you are on channels",
+								what == MODE_ADD ? '+' : '-', *m);
+							modex_err = 1;
+						}
+						break;
+					}
+					goto def;
+				case UHALLOW_REJOIN:
+					/* Handled later */
+					goto def;
+				}
+				break;
+			default:
+			def:
+				for (i = 0; i <= Usermode_highest; i++)
+				{
+					if (*m == Usermode_Table[i].flag)
+					{
+						if (Usermode_Table[i].allowed)
+						if (!Usermode_Table[i].allowed(client,what))
+							break;
+						if (what == MODE_ADD)
+							client->umodes |= Usermode_Table[i].mode;
+						else
+							client->umodes &= ~Usermode_Table[i].mode;
+						break;
+					}
+					else if (i == Usermode_highest && MyConnect(client) && !rpterror)
+					{
+						sendnumeric(client, ERR_UMODEUNKNOWNFLAG);
+						rpterror = 1;
+					}
+				}
+				break;
+		} /* switch */
+	} /* for */
+
+	/* Don't let non-ircops set ircop-only modes or snomasks */
+	if (!ValidatePermissionsForPath("self:opermodes",client,NULL,NULL,NULL))
+	{
+		if ((oldumodes & UMODE_OPER) && IsOper(client))
+		{
+			/* User is an oper but does not have the self:opermodes capability.
+			 * This only happens for heavily restricted IRCOps.
+			 * Fixes bug https://bugs.unrealircd.org/view.php?id=5130
+			 */
+			int i;
+
+			/* MODES */
+			for (i = 0; i <= Usermode_highest; i++)
+			{
+				if (!Usermode_Table[i].flag)
+					continue;
+				if (Usermode_Table[i].unset_on_deoper)
+				{
+					/* This is an oper mode. Is it set now and wasn't earlier?
+					 * then it needs to be stripped, as setting it is not
+					 * permitted.
+					 */
+					long m = Usermode_Table[i].mode;
+					if ((client->umodes & m) && !(oldumodes & m))
+						client->umodes &= ~Usermode_Table[i].mode; /* remove */
+				}
+			}
+
+			/* SNOMASKS: user can delete existing but not add new ones */
+			for (i = 0; i <= Snomask_highest; i++)
+			{
+				int sno = Snomask_Table[i].mode;
+
+				if (!Snomask_Table[i].flag)
+					continue;
+				/* Is it set now and wasn't earlier? Then it
+				 * needs to be stripped, as setting it is not
+				 * permitted.
+				 */
+				if ((client->user->snomask & sno) && !(oldsnomasks & sno))
+					client->user->snomask &= ~Snomask_Table[i].mode; /* remove */
+			}
+		} else {
+			/* User isn't an ircop at all. The solution is simple: */
+			remove_oper_privileges(client, 0);
+		}
+	}
+
+	if (MyUser(client) && (client->umodes & UMODE_SECURE) && !IsSecure(client))
+		client->umodes &= ~UMODE_SECURE;
+
+	/* -x translates to -xt (if applicable) */
+	if ((oldumodes & UMODE_HIDE) && !IsHidden(client))
+		client->umodes &= ~UMODE_SETHOST;
+
+	/* Vhost unset = unset some other data as well */
+	if ((oldumodes & UMODE_SETHOST) && !IsSetHost(client))
+	{
+		swhois_delete(client, "vhost", "*", &me, NULL);
+	}
+
+	/* +x or -t+x */
+	if ((IsHidden(client) && !(oldumodes & UMODE_HIDE)) ||
+	    ((oldumodes & UMODE_SETHOST) && !IsSetHost(client) && IsHidden(client)))
+	{
+		if (!dontspread)
+			sendto_server(client, PROTO_VHP, 0, NULL, ":%s SETHOST :%s",
+				client->name, client->user->virthost);
+
+		/* Set the vhost */
+		safe_strdup(client->user->virthost, client->user->cloakedhost);
+
+		/* Notify */
+		userhost_changed(client);
+		if (MyUser(client))
+			sendnumeric(client, RPL_HOSTHIDDEN, client->user->virthost);
+	}
+
+	/* -x */
+	if (!IsHidden(client) && (oldumodes & UMODE_HIDE))
+	{
+		/* (Re)create the cloaked virthost, because it will be used
+		 * for ban-checking... free+recreate here because it could have
+		 * been a vhost for example. -- Syzop
+		 */
+		safe_strdup(client->user->virthost, client->user->cloakedhost);
+
+		/* Notify */
+		userhost_changed(client);
+		if (MyUser(client))
+			sendnumeric(client, RPL_HOSTHIDDEN, client->user->realhost);
+	}
+	/*
+	 * If I understand what this code is doing correctly...
+	 * If the user WAS an operator and has now set themselves -o/-O
+	 * then remove their access, d'oh!
+	 * In order to allow opers to do stuff like go +o, +h, -o and
+	 * remain +h, I moved this code below those checks. It should be
+	 * O.K. The above code just does normal access flag checks. This
+	 * only changes the operflag access level.  -Cabal95
+	 */
+	if ((oldumodes & UMODE_OPER) && !IsOper(client) && MyConnect(client))
+	{
+		list_del(&client->special_node);
+		remove_oper_privileges(client, 0);
+		RunHook2(HOOKTYPE_LOCAL_OPER, client, 0);
+	}
+
+	if (!(oldumodes & UMODE_OPER) && IsOper(client))
+		irccounts.operators++;
+
+	/* deal with opercounts and stuff */
+	if ((oldumodes & UMODE_OPER) && !IsOper(client))
+	{
+		irccounts.operators--;
+		VERIFY_OPERCOUNT(client, "umode1");
+	} else /* YES this 'else' must be here, otherwise we can decrease twice. fixes opercount bug. */
+	if (!(oldumodes & UMODE_HIDEOPER) && IsHideOper(client))
+	{
+		irccounts.operators--;
+		VERIFY_OPERCOUNT(client, "umode2");
+	}
+	/* end of dealing with opercounts */
+
+	if ((oldumodes & UMODE_HIDEOPER) && !IsHideOper(client))
+	{
+		irccounts.operators++;
+	}
+	if (!(oldumodes & UMODE_INVISIBLE) && IsInvisible(client))
+		irccounts.invisible++;
+	if ((oldumodes & UMODE_INVISIBLE) && !IsInvisible(client))
+		irccounts.invisible--;
+
+	if (MyConnect(client) && !IsOper(client))
+		remove_oper_privileges(client, 0);
+
+	/*
+	 * compare new flags with old flags and send string which
+	 * will cause servers to update correctly.
+	 */
+	if (oldumodes != client->umodes)
+		RunHook3(HOOKTYPE_UMODE_CHANGE, client, oldumodes, client->umodes);
+	if (dontspread == 0)
+		send_umode_out(client, 1, oldumodes);
+
+	if (MyConnect(client) && setsnomask != client->user->snomask)
+		sendnumeric(client, RPL_SNOMASK, get_snomask_string(client));
+}
+
+CMD_FUNC(cmd_mlock)
+{
+	Channel *channel = NULL;
+	time_t t;
+
+	if ((parc < 3) || BadPtr(parv[2]))
+		return;
+
+	t = (time_t) atol(parv[1]);
+
+	/* Now, try to find the channel in question */
+	channel = find_channel(parv[2], NULL);
+	if (!channel)
+		return;
+
+	/* Senders' Channel t is higher, drop it. */
+	if (t > channel->creationtime)
+		return;
+
+	if (IsServer(client))
+		set_channel_mlock(client, channel, parv[3], TRUE);
+}
diff --git a/src/modules/module.def b/src/modules/module.def
new file mode 100644
index 0000000..35b9505
--- /dev/null
+++ b/src/modules/module.def
@@ -0,0 +1,5 @@
+EXPORTS
+	Mod_Header
+	Mod_Init
+	Mod_Load
+	Mod_Unload
diff --git a/src/modules/motd.c b/src/modules/motd.c
new file mode 100644
index 0000000..0397604
--- /dev/null
+++ b/src/modules/motd.c
@@ -0,0 +1,123 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/motd.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_motd);
+
+#define MSG_MOTD 	"MOTD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"motd",
+	"5.0",
+	"command /motd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_MOTD, cmd_motd, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * Heavily modified from the ircu cmd_motd by codemastr
+ * Also svsmotd support added
+ */
+CMD_FUNC(cmd_motd)
+{
+	ConfigItem_tld *ptr;
+	MOTDFile *themotd;
+	MOTDLine *motdline;
+	int  svsnofile = 0;
+
+	if (IsServer(client))
+		return;
+
+	if (hunt_server(client, recv_mtags, ":%s MOTD :%s", 1, parc, parv) != HUNTED_ISME)
+	{
+		if (MyUser(client))
+			client->local->since += 15;
+		return;
+	}
+
+	ptr = find_tld(client);
+
+	if (ptr)
+		themotd = &ptr->motd;
+	else
+		themotd = &motd;
+
+	if (themotd == NULL || themotd->lines == NULL)
+	{
+		sendnumeric(client, ERR_NOMOTD);
+		svsnofile = 1;
+		goto svsmotd;
+	}
+
+	sendnumeric(client, RPL_MOTDSTART, me.name);
+
+	/* tm_year should be zero only if the struct is zero-ed */
+	if (themotd && themotd->lines && themotd->last_modified.tm_year)
+	{
+		sendnumericfmt(client, RPL_MOTD, ":- %.04d-%.02d-%.02d %.02d:%02d",
+			themotd->last_modified.tm_year + 1900,
+			themotd->last_modified.tm_mon + 1,
+			themotd->last_modified.tm_mday,
+			themotd->last_modified.tm_hour,
+			themotd->last_modified.tm_min);
+	}
+
+	motdline = NULL;
+	if(themotd)
+		motdline = themotd->lines;
+	while (motdline)
+	{
+		sendnumeric(client, RPL_MOTD,
+			motdline->line);
+		motdline = motdline->next;
+	}
+	svsmotd:
+
+	motdline = svsmotd.lines;
+	while (motdline)
+	{
+		sendnumeric(client, RPL_MOTD,
+			motdline->line);
+		motdline = motdline->next;
+	}
+	if (svsnofile == 0)
+		sendnumeric(client, RPL_ENDOFMOTD);
+}
diff --git a/src/modules/names.c b/src/modules/names.c
new file mode 100644
index 0000000..81e596e
--- /dev/null
+++ b/src/modules/names.c
@@ -0,0 +1,201 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/names.c
+ *   (C) 2006 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_names);
+
+#define MSG_NAMES 	"NAMES"
+
+ModuleHeader MOD_HEADER
+  = {
+	"names",
+	"5.0",
+	"command /names", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_NAMES, cmd_names, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/************************************************************************
+ * cmd_names() - Added by Jto 27 Apr 1989
+ * 12 Feb 2000 - geesh, time for a rewrite -lucas
+ ************************************************************************/
+
+static char buf[BUFSIZE];
+
+/*
+** cmd_names
+**	parv[1] = channel
+*/
+#define TRUNCATED_NAMES 64
+CMD_FUNC(cmd_names)
+{
+	int multiprefix = (MyConnect(client) && HasCapability(client, "multi-prefix"));
+	int uhnames = (MyConnect(client) && HasCapability(client, "userhost-in-names")); // cache UHNAMES support
+	int bufLen = NICKLEN + (!uhnames ? 0 : (1 + USERLEN + 1 + HOSTLEN));
+	int mlen = strlen(me.name) + bufLen + 7;
+	Channel *channel;
+	Client *acptr;
+	int member;
+	Member *cm;
+	int idx, flag = 1, spos;
+	char *s, *para = parv[1];
+	char nuhBuffer[NICKLEN+USERLEN+HOSTLEN+3];
+
+	if (parc < 2 || !MyConnect(client))
+	{
+		sendnumeric(client, RPL_ENDOFNAMES, "*");
+		return;
+	}
+
+	for (s = para; *s; s++)
+	{
+		if (*s == ',')
+		{
+			if (strlen(para) > TRUNCATED_NAMES)
+				para[TRUNCATED_NAMES] = '\0';
+			sendto_realops("names abuser %s %s",
+			    get_client_name(client, FALSE), para);
+			sendnumeric(client, ERR_TOOMANYTARGETS, s+1, 1, "NAMES");
+			return;
+		}
+	}
+
+	channel = find_channel(para, NULL);
+
+	if (!channel || (!ShowChannel(client, channel) && !ValidatePermissionsForPath("channel:see:names:secret",client,NULL,channel,NULL)))
+	{
+		sendnumeric(client, RPL_ENDOFNAMES, para);
+		return;
+	}
+
+	/* cache whether this user is a member of this channel or not */
+	member = IsMember(client, channel);
+
+	if (PubChannel(channel))
+		buf[0] = '=';
+	else if (SecretChannel(channel))
+		buf[0] = '@';
+	else
+		buf[0] = '*';
+
+	idx = 1;
+	buf[idx++] = ' ';
+	for (s = channel->chname; *s; s++)
+		buf[idx++] = *s;
+	buf[idx++] = ' ';
+	buf[idx++] = ':';
+
+	/* If we go through the following loop and never add anything,
+	   we need this to be empty, otherwise spurious things from the
+	   LAST /names call get stuck in there.. - lucas */
+	buf[idx] = '\0';
+
+	spos = idx;		/* starting point in buffer for names! */
+
+	for (cm = channel->members; cm; cm = cm->next)
+	{
+		acptr = cm->client;
+		if (IsInvisible(acptr) && !member && !ValidatePermissionsForPath("channel:see:names:invisible",client,acptr,channel,NULL))
+			continue;
+
+		if (!user_can_see_member(client, acptr, channel))
+			continue; /* invisible (eg: due to delayjoin) */
+
+		if (!multiprefix)
+		{
+			/* Standard NAMES reply */
+#ifdef PREFIX_AQ
+			if (cm->flags & CHFL_CHANOWNER)
+				buf[idx++] = '~';
+			else if (cm->flags & CHFL_CHANADMIN)
+				buf[idx++] = '&';
+			else
+#endif
+			if (cm->flags & CHFL_CHANOP)
+				buf[idx++] = '@';
+			else if (cm->flags & CHFL_HALFOP)
+				buf[idx++] = '%';
+			else if (cm->flags & CHFL_VOICE)
+				buf[idx++] = '+';
+		} else {
+			/* NAMES reply with all rights included (multi-prefix / NAMESX) */
+#ifdef PREFIX_AQ
+			if (cm->flags & CHFL_CHANOWNER)
+				buf[idx++] = '~';
+			if (cm->flags & CHFL_CHANADMIN)
+				buf[idx++] = '&';
+#endif
+			if (cm->flags & CHFL_CHANOP)
+				buf[idx++] = '@';
+			if (cm->flags & CHFL_HALFOP)
+				buf[idx++] = '%';
+			if (cm->flags & CHFL_VOICE)
+				buf[idx++] = '+';
+		}
+
+		if (!uhnames) {
+			s = acptr->name;
+		} else {
+			strlcpy(nuhBuffer,
+			        make_nick_user_host(acptr->name, acptr->user->username, GetHost(acptr)),
+				bufLen + 1);
+			s = nuhBuffer;
+		}
+		/* 's' is intialized above to point to either acptr->name (normal),
+		 * or to nuhBuffer (for UHNAMES).
+		 */
+		for (; *s; s++)
+			buf[idx++] = *s;
+		buf[idx++] = ' ';
+		buf[idx] = '\0';
+		flag = 1;
+		if (mlen + idx + bufLen > BUFSIZE - 7)
+		{
+			sendnumeric(client, RPL_NAMREPLY, buf);
+			idx = spos;
+			flag = 0;
+		}
+	}
+
+	if (flag)
+		sendnumeric(client, RPL_NAMREPLY, buf);
+
+	sendnumeric(client, RPL_ENDOFNAMES, para);
+}
diff --git a/src/modules/netinfo.c b/src/modules/netinfo.c
new file mode 100644
index 0000000..a1fac6b
--- /dev/null
+++ b/src/modules/netinfo.c
@@ -0,0 +1,141 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_netinfo);
+
+#define MSG_NETINFO 	"NETINFO"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"netinfo",
+	"5.0",
+	"command /netinfo", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_NETINFO, cmd_netinfo, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** NETINFO: Share configuration settings with directly linked server.
+ * Originally written by Stskeeps
+ *
+ * Technical documentation:
+ * https://www.unrealircd.org/docs/Server_protocol:NETINFO_command
+ *
+ * parv[1] = max global count
+ * parv[2] = time of end sync
+ * parv[3] = unreal protocol using (numeric)
+ * parv[4] = cloak-crc (> u2302)
+ * parv[5] = free(**)
+ * parv[6] = free(**)
+ * parv[7] = free(**)
+ * parv[8] = network name
+ */
+CMD_FUNC(cmd_netinfo)
+{
+	long 		lmax;
+	time_t	 	xx;
+	long 		endsync, protocol;
+	char		buf[512];
+
+	if (parc < 9)
+		return;
+
+	/* Only allow from directly connected servers */
+	if (!MyConnect(client))
+		return;
+
+	if (IsNetInfo(client))
+	{
+		sendto_realops("Already got NETINFO from Link %s", client->name);
+		return;
+	}
+
+	/* is a long therefore not ATOI */
+	lmax = atol(parv[1]);
+	endsync = atol(parv[2]);
+	protocol = atol(parv[3]);
+
+	/* max global count != max_global_count --sts */
+	if (lmax > irccounts.global_max)
+	{
+		irccounts.global_max = lmax;
+		sendto_realops("Max Global Count is now %li (set by link %s)",
+		    lmax, client->name);
+	}
+
+	xx = TStime();
+	if ((xx - endsync) < -2)
+	{
+		char *emsg = "";
+		if (xx - endsync < -10)
+		{
+			emsg = " [\002PLEASE SYNC YOUR CLOCKS!\002]";
+		}
+		sendto_umode_global(UMODE_OPER,
+			"Possible negative TS split at link %s (%lld - %lld = %lld)%s",
+			client->name, (long long)(xx), (long long)(endsync), (long long)(xx - endsync), emsg);
+	}
+	sendto_umode_global(UMODE_OPER,
+	    "Link %s -> %s is now synced [secs: %lld recv: %ld.%hu sent: %ld.%hu]",
+	    client->name, me.name, (long long)(TStime() - endsync), client->local->receiveK,
+	    client->local->receiveB, client->local->sendK, client->local->sendB);
+
+	if (!(strcmp(ircnetwork, parv[8]) == 0))
+	{
+		sendto_umode_global(UMODE_OPER,
+			"Network name mismatch from link %s (%s != %s)",
+			client->name, parv[8], ircnetwork);
+	}
+
+	if ((protocol != UnrealProtocol) && (protocol != 0))
+	{
+		sendto_umode_global(UMODE_OPER,
+			"Link %s is running Protocol %li while %s is running %d",
+			client->name, protocol, me.name, UnrealProtocol);
+	}
+	strlcpy(buf, CLOAK_KEYCRC, sizeof(buf));
+	if (*parv[4] != '*' && strcmp(buf, parv[4]))
+	{
+		sendto_realops
+			("Link %s has a DIFFERENT CLOAK KEY - %s != %s. \002YOU SHOULD CORRECT THIS ASAP\002.",
+				client->name, parv[4], buf);
+	}
+	SetNetInfo(client);
+}
diff --git a/src/modules/nick.c b/src/modules/nick.c
new file mode 100644
index 0000000..daf1e9d
--- /dev/null
+++ b/src/modules/nick.c
@@ -0,0 +1,1416 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/nick.c
+ *   (C) 1999-2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"nick",
+	"5.0",
+	"command /nick",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+CMD_FUNC(cmd_nick);
+CMD_FUNC(cmd_nick_local);
+CMD_FUNC(cmd_nick_remote);
+CMD_FUNC(cmd_uid);
+int _register_user(Client *client, char *nick, char *username, char *umode, char *virthost, char *ip);
+void nick_collision(Client *cptr, char *newnick, char *newid, Client *new, Client *existing, int type);
+int AllowClient(Client *client, char *username);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAdd(modinfo->handle, EFUNC_REGISTER_USER, _register_user);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, "NICK", cmd_nick, MAXPARA, CMD_USER|CMD_SERVER|CMD_UNREGISTERED);
+	CommandAdd(modinfo->handle, "UID", cmd_uid, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static char buf[BUFSIZE];
+static char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64];
+
+#define NICKCOL_EQUAL         0
+#define NICKCOL_NEW_WON       1
+#define NICKCOL_EXISTING_WON  2
+
+/* Assume that on collision a NICK is in flight and the other server will take
+ * the exact same decision we would do, and thus we don't send a KILL to cptr?
+ * This works great with this code, seems to kill the correct person and not
+ * cause desyncs even without UID/SID. HOWEVER.. who knows what code the other servers run?
+ * Should use UID/SID anyway, then this whole problem doesn't exist.
+ */
+#define ASSUME_NICK_IN_FLIGHT
+
+/** The NICK command.
+ * In UnrealIRCd 4/5 this is only used in 2 cases:
+ * 1) A local user setting or changing the nick name ("NICK xyz")
+ * 2) A remote user changing their nick name (":<uid> NICK <newnick>")
+ */
+CMD_FUNC(cmd_nick_remote)
+{
+	TKL *tklban;
+	int ishold;
+	Client *acptr;
+	char nick[NICKLEN + 2];
+	time_t lastnick = 0;
+	int differ = 1;
+	unsigned char removemoder = (client->umodes & UMODE_REGNICK) ? 1 : 0;
+	char *nickid = (IsUser(client) && *client->id) ? client->id : NULL;
+	Client *cptr = client->direction; /* Pending a complete overhaul... (TODO) */
+	MessageTag *mtags = NULL;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NONICKNAMEGIVEN);
+		return;
+	}
+
+	if (!IsUser(client))
+	{
+		/* Old NICK protocol for introducing users, not supported as you should use UID */
+		sendto_umode_global(UMODE_OPER, "Old NICK protocol detected from server %s, should use UID instead -- delinking",
+		                                client->name);
+		exit_client(cptr->direction, NULL, "Old NICK protocol detected, bad, use UID!");
+		return;
+	}
+
+	strlcpy(nick, parv[1], NICKLEN + 1);
+
+	if (parc > 2)
+		lastnick = atol(parv[2]);
+
+	if (!do_remote_nick_name(nick))
+	{
+		ircstats.is_kill++;
+		sendto_umode(UMODE_OPER, "Bad Nick: %s From: %s %s",
+		    parv[1], client->name, get_client_name(cptr, FALSE));
+		mtags = NULL;
+		new_message(client, NULL, &mtags);
+		sendto_one(cptr, mtags, ":%s KILL %s :Illegal nick name", me.id, client->id);
+		SetKilled(client);
+		exit_client(client, mtags, "Illegal nick name");
+		free_message_tags(mtags);
+		mtags = NULL;
+		return;
+	}
+
+	if (!strcasecmp("ircd", nick) || !strcasecmp("irc", nick))
+	{
+		sendto_umode(UMODE_OPER, "Bad Reserved Nick: %s From: %s %s",
+		    parv[1], client->name, get_client_name(cptr, FALSE));
+		mtags = NULL;
+		new_message(client, NULL, &mtags);
+		sendto_one(cptr, mtags, ":%s KILL %s :Reserved nick name", me.id, client->id);
+		SetKilled(client);
+		exit_client(client, mtags, "Reserved nick name");
+		free_message_tags(mtags);
+		mtags = NULL;
+		return;
+	}
+
+	/* Check Q-lines / ban nick */
+	if (!IsULine(client) && (tklban = find_qline(client, nick, &ishold)) && !ishold)
+	{
+		/* Remote user changing nick - warning only */
+		sendto_snomask(SNO_QLINE, "Q-Lined nick %s from %s on %s", nick,
+			client->name, client->srvptr ? client->srvptr->name : "<unknown>");
+	}
+
+	if ((acptr = find_client(nick, NULL)))
+	{
+		/* If existing nick is still in handshake, kill it */
+		if (IsUnknown(acptr) && MyConnect(acptr))
+		{
+			SetKilled(acptr);
+			exit_client(acptr, NULL, "Overridden");
+		} else
+		if (acptr == client)
+		{
+			/* 100% identical? Must be a bug, but ok */
+			if (!strcmp(acptr->name, nick))
+				return;
+			/* Allows change of case in their nick */
+			removemoder = 0; /* don't set the user -r */
+		} else
+		{
+			/*
+			   ** A NICK change has collided (e.g. message type ":old NICK new").
+			 */
+			differ = (mycmp(acptr->user->username, client->user->username) ||
+			          mycmp(acptr->user->realhost, client->user->realhost));
+
+			sendto_umode(UMODE_OPER, "Nick change collision from %s to %s (%s %lld <- %s %lld)",
+			    client->name, acptr->name, acptr->direction->name,
+			    (long long)acptr->lastnick,
+			    client->direction->name, (long long)lastnick);
+
+			if (!(parc > 2) || lastnick == acptr->lastnick)
+			{
+				nick_collision(client, parv[1], nickid, client, acptr, NICKCOL_EQUAL);
+				return; /* Now that I killed them both, ignore the NICK */
+			} else
+			if ((differ && (acptr->lastnick > lastnick)) ||
+			    (!differ && (acptr->lastnick < lastnick)))
+			{
+				nick_collision(client, parv[1], nickid, client, acptr, NICKCOL_NEW_WON);
+				/* fallthrough: their user won, continue and proceed with the nick change */
+			} else
+			if ((differ && (acptr->lastnick < lastnick)) ||
+			    (!differ && (acptr->lastnick > lastnick)))
+			{
+				nick_collision(client, parv[1], nickid, client, acptr, NICKCOL_EXISTING_WON);
+				return; /* their user lost, ignore the NICK */
+			} else
+			{
+				return;		/* just in case */
+			}
+		}
+	}
+
+	mtags = NULL;
+
+	/* Existing client nick-changing */
+
+	if (!IsULine(client))
+		sendto_snomask(SNO_FNICKCHANGE, "*** %s (%s@%s) has changed their nickname to %s",
+			client->name, client->user->username, client->user->realhost, nick);
+
+	RunHook2(HOOKTYPE_REMOTE_NICKCHANGE, client, nick);
+
+	client->lastnick = lastnick ? lastnick : TStime();
+	add_history(client, 1);
+	new_message(client, recv_mtags, &mtags);
+	sendto_server(client, 0, 0, mtags, ":%s NICK %s %lld",
+	    client->id, nick, (long long)client->lastnick);
+	sendto_local_common_channels(client, client, 0, mtags, ":%s NICK :%s", client->name, nick);
+	free_message_tags(mtags);
+	if (removemoder)
+		client->umodes &= ~UMODE_REGNICK;
+
+	/* Finally set new nick name. */
+	del_from_client_hash_table(client->name, client);
+	hash_check_watch(client, RPL_LOGOFF);
+
+	strcpy(client->name, nick);
+	add_to_client_hash_table(nick, client);
+
+	hash_check_watch(client, RPL_LOGON);
+}
+
+CMD_FUNC(cmd_nick_local)
+{
+	TKL *tklban;
+	int ishold;
+	Client *acptr;
+	char nick[NICKLEN + 2], descbuf[BUFSIZE];
+	Membership *mp;
+	long lastnick = 0l;
+	int  differ = 1, update_watch = 1;
+	unsigned char removemoder = (client->umodes & UMODE_REGNICK) ? 1 : 0;
+	Hook *h;
+	int i = 0;
+	char *nickid = (IsUser(client) && *client->id) ? client->id : NULL;
+	Client *cptr = client->direction; /* Pending a complete overhaul... (TODO) */
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NONICKNAMEGIVEN);
+		return;
+	}
+
+	/* Enforce minimum nick length */
+	if (iConf.min_nick_length && !IsOper(client) && !IsULine(client) && strlen(parv[1]) < iConf.min_nick_length)
+	{
+		snprintf(descbuf, sizeof descbuf, "A minimum length of %d chars is required", iConf.min_nick_length);
+		sendnumeric(client, ERR_ERRONEUSNICKNAME, parv[1], descbuf);
+		return;
+	}
+
+	/* Enforce maximum nick length */
+	strlcpy(nick, parv[1], iConf.nick_length + 1);
+
+	/* Check if this is a valid nick name */
+	if (!do_nick_name(nick))
+	{
+		sendnumeric(client, ERR_ERRONEUSNICKNAME, parv[1], "Illegal characters");
+		return;
+	}
+
+	/* set::anti-flood::nick-flood */
+	if (client->user && !ValidatePermissionsForPath("immune:nick-flood",client,NULL,NULL,NULL))
+	{
+		if ((client->user->flood.nick_c >= NICK_COUNT) &&
+		    (TStime() - client->user->flood.nick_t < NICK_PERIOD))
+		{
+			/* Throttle... */
+			sendnumeric(client, ERR_NCHANGETOOFAST, nick,
+				(int)(NICK_PERIOD - (TStime() - client->user->flood.nick_t)));
+			return;
+		}
+	}
+
+	/* Check for collisions / in use */
+	if (!strcasecmp("ircd", nick) || !strcasecmp("irc", nick))
+	{
+		sendnumeric(client, ERR_ERRONEUSNICKNAME, nick, "Reserved for internal IRCd purposes");
+		return;
+	}
+
+	if (MyUser(client))
+	{
+		/* Local client changing nick: check spamfilter */
+		spamfilter_build_user_string(spamfilter_user, nick, client);
+		if (match_spamfilter(client, spamfilter_user, SPAMF_USER, NULL, 0, NULL))
+			return;
+	}
+
+	/* Check Q-lines / ban nick */
+	if (!IsULine(client) && (tklban = find_qline(client, nick, &ishold)))
+	{
+		if (ishold)
+		{
+			sendnumeric(client, ERR_ERRONEUSNICKNAME, nick, tklban->ptr.nameban->reason);
+			return;
+		}
+		if (!ValidatePermissionsForPath("immune:server-ban:ban-nick",client,NULL,NULL,nick))
+		{
+			client->local->since += 4; /* lag them up */
+			sendnumeric(client, ERR_ERRONEUSNICKNAME, nick, tklban->ptr.nameban->reason);
+			sendto_snomask(SNO_QLINE, "Forbidding Q-lined nick %s from %s.",
+			    nick, get_client_name(cptr, FALSE));
+			return;	/* NICK message ignored */
+		}
+		/* fallthrough for ircops that have sufficient privileges */
+	}
+
+	if (!ValidatePermissionsForPath("immune:nick-flood",client,NULL,NULL,NULL))
+		cptr->local->since += 3;	/* Nick-flood prot. -Donwulff */
+
+	if ((acptr = find_client(nick, NULL)))
+	{
+		/* Shouldn't be possible since dot is disallowed: */
+		if (IsServer(acptr))
+		{
+			sendnumeric(client, ERR_NICKNAMEINUSE, nick);
+			return;
+		}
+		if (acptr == client)
+		{
+			/* New nick is exactly the same as the old nick? */
+			if (!strcmp(acptr->name, nick))
+				return;
+			/* Changing cAsE */
+			removemoder = 0;
+		} else
+		/* Collision with a nick of a session that is still in handshake */
+		if (IsUnknown(acptr) && MyConnect(acptr))
+		{
+			/* Kill the other connection that is still in progress */
+			SetKilled(acptr);
+			exit_client(acptr, NULL, "Overridden");
+		} else
+		{
+			sendnumeric(client, ERR_NICKNAMEINUSE, nick);
+			return;	/* NICK message ignored */
+		}
+	}
+
+	/* New local client? */
+	if (!client->name[0])
+	{
+		if (iConf.ping_cookie)
+		{
+			/*
+			 * Client setting NICK the first time.
+			 *
+			 * Generate a random string for them to pong with.
+			 */
+			client->local->nospoof = getrandom32();
+
+			sendto_one(client, NULL, "PING :%X", client->local->nospoof);
+		}
+
+		/* Copy password to the passwd field if it's given after NICK */
+		if ((parc > 2) && (strlen(parv[2]) <= PASSWDLEN))
+			safe_strdup(client->local->passwd, parv[2]);
+
+		/* This had to be copied here to avoid problems.. */
+		strlcpy(client->name, nick, sizeof(client->name));
+
+		/* Let's see if we can get online now... */
+		if (is_handshake_finished(client))
+		{
+			/* Send a CTCP VERSION */
+			if (!iConf.ping_cookie && USE_BAN_VERSION && MyConnect(client))
+				sendto_one(client, NULL, ":IRC!IRC@%s PRIVMSG %s :\1VERSION\1", me.name, nick);
+
+			client->lastnick = TStime();
+			if (!register_user(client, nick, client->user->username, NULL, NULL, NULL))
+			{
+				if (IsDead(client))
+					return;
+				/* ..otherwise.. fallthrough so we run the same code
+				 * as in case of !is_handshake_finished()
+				 */
+			} else {
+				/* New user! */
+				update_watch = 0; /* already done in register_user() */
+				strlcpy(nick, client->name, sizeof(nick)); /* don't ask, but I need this. do not remove! -- Syzop */
+			}
+		}
+	} else
+	if (MyUser(client))
+	{
+		MessageTag *mtags = NULL;
+
+		/* Existing client nick-changing */
+
+		/*
+		   ** If the client belongs to me, then check to see
+		   ** if client is currently on any channels where it
+		   ** is currently banned.  If so, do not allow the nick
+		   ** change to occur.
+		   ** Also set 'lastnick' to current time, if changed.
+		 */
+		for (mp = client->user->channel; mp; mp = mp->next)
+		{
+			if (!is_skochanop(client, mp->channel) && is_banned(client, mp->channel, BANCHK_NICK, NULL, NULL))
+			{
+				sendnumeric(client, ERR_BANNICKCHANGE,
+				    mp->channel->chname);
+				return;
+			}
+			if (CHECK_TARGET_NICK_BANS && !is_skochanop(client, mp->channel) && is_banned_with_nick(client, mp->channel, BANCHK_NICK, nick, NULL, NULL))
+			{
+				sendnumeric(client, ERR_BANNICKCHANGE, mp->channel->chname);
+				return;
+			}
+
+			for (h = Hooks[HOOKTYPE_CHAN_PERMIT_NICK_CHANGE]; h; h = h->next)
+			{
+				i = (*(h->func.intfunc))(client,mp->channel);
+				if (i != HOOK_CONTINUE)
+					break;
+			}
+
+			if (i == HOOK_DENY)
+			{
+				sendnumeric(client, ERR_NONICKCHANGE,
+				    mp->channel->chname);
+				return;
+			}
+		}
+
+		if (TStime() - client->user->flood.nick_t >= NICK_PERIOD)
+		{
+			client->user->flood.nick_t = TStime();
+			client->user->flood.nick_c = 1;
+		} else
+			client->user->flood.nick_c++;
+
+		sendto_snomask(SNO_NICKCHANGE, "*** %s (%s@%s) has changed their nickname to %s",
+			client->name, client->user->username, client->user->realhost, nick);
+
+		RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, client, nick);
+		client->lastnick = TStime();
+		add_history(client, 1);
+		new_message(client, recv_mtags, &mtags);
+		sendto_server(client, 0, 0, mtags, ":%s NICK %s %lld",
+		    client->id, nick, (long long)client->lastnick);
+		sendto_local_common_channels(client, client, 0, mtags, ":%s NICK :%s", client->name, nick);
+		sendto_one(client, mtags, ":%s NICK :%s", client->name, nick);
+		free_message_tags(mtags);
+		if (removemoder)
+			client->umodes &= ~UMODE_REGNICK;
+	} else
+	{
+		/* Someone changing nicks in the pre-registered phase */
+	}
+
+	del_from_client_hash_table(client->name, client);
+	if (update_watch && IsUser(client))
+		hash_check_watch(client, RPL_LOGOFF);
+
+	strlcpy(client->name, nick, sizeof(client->name));
+	add_to_client_hash_table(nick, client);
+
+	/* update fdlist --nenolod */
+	snprintf(descbuf, sizeof(descbuf), "Client: %s", nick);
+	fd_desc(client->local->fd, descbuf);
+
+	if (update_watch && IsUser(client))
+		hash_check_watch(client, RPL_LOGON);
+
+	if (removemoder && MyUser(client))
+		sendto_one(client, NULL, ":%s MODE %s :-r", me.name, client->name);
+}
+
+/*
+** cmd_uid
+**	parv[1] = nickname
+**      parv[2] = hopcount
+**      parv[3] = timestamp
+**      parv[4] = username
+**      parv[5] = hostname
+**      parv[6] = UID
+**	parv[7] = servicestamp
+**      parv[8] = umodes
+**	parv[9] = virthost, * if none
+**	parv[10] = cloaked host, * if none
+**	parv[11] = ip
+**	parv[12] = info
+**
+** Technical documentation is available at:
+** https://www.unrealircd.org/docs/Server_protocol:UID_command
+*/
+CMD_FUNC(cmd_uid)
+{
+	TKL *tklban;
+	int ishold;
+	Client *acptr, *serv = NULL;
+	Client *acptrs;
+	char nick[NICKLEN + 1];
+	long lastnick = 0l;
+	int differ = 1;
+	char *hostname, *username, *sstamp, *umodes, *virthost, *ip, *realname;
+
+	if (parc < 13)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "UID");
+		return;
+	}
+
+	/* It's not just the directly attached client which must be a
+	 * server. The source itself needs to be a server.
+	 */
+	if (!IsServer(client))
+	{
+		sendnumeric(client, ERR_NOTFORUSERS, "UID");
+		return;
+	}
+
+	strlcpy(nick, parv[1], sizeof(nick));
+
+	/* Do some *MINIMAL* nick name checking for remote nicknames.
+	 * This will only catch things that severely break things. -- Syzop
+	 */
+	if (!do_remote_nick_name(nick))
+	{
+		sendnumeric(client, ERR_ERRONEUSNICKNAME, parv[1], "Illegal characters");
+
+		ircstats.is_kill++;
+		sendto_umode(UMODE_OPER, "Bad Nick: %s From: %s %s",
+		    parv[1], client->name, get_client_name(client, FALSE));
+		/* Send kill to uplink only, hasn't been broadcasted to the rest, anyway */
+		sendto_one(client, NULL, ":%s KILL %s :Bad nick", me.id, parv[1]);
+		return;
+	}
+
+	/* Kill quarantined opers early... */
+	if (IsQuarantined(client->direction) && strchr(parv[8], 'o'))
+	{
+		ircstats.is_kill++;
+		/* Send kill to uplink only, hasn't been broadcasted to the rest, anyway */
+		sendto_one(client, NULL, ":%s KILL %s :Quarantined: no oper privileges allowed",
+			me.id, parv[1]);
+		sendto_umode_global(UMODE_OPER, "QUARANTINE: Oper %s on server %s killed, due to quarantine",
+			parv[1], client->name);
+		return;
+	}
+
+	/* This one is never allowed, even from remotes */
+	if (!strcasecmp("ircd", nick) || !strcasecmp("irc", nick))
+	{
+		sendnumeric(client, ERR_ERRONEUSNICKNAME, nick, "Reserved for internal IRCd purposes");
+		sendto_one(client, NULL, ":%s KILL %s :Bad reserved nick", me.id, parv[1]);
+		return;
+	}
+
+	if (!IsULine(client) && (tklban = find_qline(client, nick, &ishold)))
+	{
+		if (IsServer(client) && !ishold) /* server introducing new client */
+		{
+			acptrs = find_server(client->user == NULL ? parv[6] : client->user->server, NULL);
+			/* (NEW: no unregistered Q-Line msgs anymore during linking) */
+			if (!acptrs || (acptrs->serv && acptrs->serv->flags.synced))
+				sendto_snomask(SNO_QLINE, "Q-Lined nick %s from %s on %s", nick,
+				    (*client->name != 0
+				    && !IsServer(client) ? client->name : "<unregistered>"),
+				    acptrs ? acptrs->name : "unknown server");
+		}
+	}
+
+	/* Now check if 'nick' already exists - first, collisions with server names/ids (extremely rare) */
+	if ((acptr = find_server(nick, NULL)) != NULL)
+	{
+		sendto_umode(UMODE_OPER, "Nick collision on %s(%s <- %s)",
+		    client->name, acptr->direction->name,
+		    get_client_name(client, FALSE));
+		ircstats.is_kill++;
+		sendto_one(client, NULL, ":%s KILL %s :Nick-server-collision", me.id, parv[1]);
+		return;
+	}
+
+	/* Now check if 'nick' already exists - collision with a user (or still in handshake, unknown) */
+	if ((acptr = find_client(nick, NULL)) != NULL)
+	{
+		/* If there's a collision with a user that is still in handshake, on our side,
+		 * then we can just kill our client and continue.
+		 */
+		if (MyConnect(acptr) && IsUnknown(acptr))
+		{
+			SetKilled(acptr);
+			exit_client(acptr, NULL, "Overridden");
+			goto nickkill2done;
+		}
+
+		lastnick = atol(parv[3]);
+		differ = (mycmp(acptr->user->username, parv[4]) || mycmp(acptr->user->realhost, parv[5]));
+		sendto_umode(UMODE_OPER, "Nick collision on %s (%s %lld <- %s %lld)",
+		    acptr->name, acptr->direction->name, (long long)acptr->lastnick,
+		    client->direction->name, (long long)lastnick);
+		/*
+		   **    I'm putting the KILL handling here just to make it easier
+		   ** to read, it's hard to follow it the way it used to be.
+		   ** Basically, this is what it will do.  It will kill both
+		   ** users if no timestamp is given, or they are equal.  It will
+		   ** kill the user on our side if the other server is "correct"
+		   ** (user@host differ and their user is older, or user@host are
+		   ** the same and their user is younger), otherwise just kill the
+		   ** user an reintroduce our correct user.
+		   **    The old code just sat there and "hoped" the other server
+		   ** would kill their user.  Not anymore.
+		   **                                               -- binary
+		 */
+		if (acptr->lastnick == lastnick)
+		{
+			nick_collision(client, parv[1], parv[6], NULL, acptr, NICKCOL_EQUAL);
+			return;	/* We killed both users, now stop the process. */
+		}
+
+		if ((differ && (acptr->lastnick > lastnick)) ||
+		    (!differ && (acptr->lastnick < lastnick)) || acptr->direction == client->direction)	/* we missed a QUIT somewhere ? */
+		{
+			nick_collision(client, parv[1], parv[6], NULL, acptr, NICKCOL_NEW_WON);
+			/* We got rid of the "wrong" user. Introduce the correct one. */
+			/* ^^ hmm.. why was this absent in nenolod's code, resulting in a 'return 0'? seems wrong. */
+			goto nickkill2done;
+		}
+
+		if ((differ && (acptr->lastnick < lastnick)) || (!differ && (acptr->lastnick > lastnick)))
+		{
+			nick_collision(client, parv[1], parv[6], NULL, acptr, NICKCOL_EXISTING_WON);
+			return;	/* Ignore the NICK */
+		}
+		return; /* just in case */
+	}
+
+nickkill2done:
+	/* Proceed with introducing the new client, change source (replace client) */
+
+	serv = client;
+	client = make_client(serv->direction, serv);
+	strlcpy(client->id, parv[6], IDLEN);
+	add_client_to_list(client);
+	add_to_id_hash_table(client->id, client);
+	client->lastnick = atol(parv[3]);
+	strlcpy(client->name, nick, NICKLEN+1);
+	add_to_client_hash_table(nick, client);
+
+	make_user(client);
+
+	hostname = parv[5];
+	sstamp = parv[7];
+	username = parv[4];
+	umodes = parv[8];
+	virthost = parv[9];
+	ip = parv[11];
+	realname = parv[12];
+	/* Note that cloaked host aka parv[10] is unused */
+
+	client->user->server = find_or_add(client->srvptr->name);
+	strlcpy(client->user->realhost, hostname, sizeof(client->user->realhost));
+	// FIXME: some validation would be nice ^
+
+	if (*sstamp != '*')
+		strlcpy(client->user->svid, sstamp, sizeof(client->user->svid));
+
+	strlcpy(client->info, realname, sizeof(client->info));
+	strlcpy(client->user->username, username, USERLEN + 1);
+	register_user(client, client->name, username, umodes, virthost, ip);
+	if (IsDead(client))
+		return;
+	if (!IsULine(serv) && IsSynched(serv))
+		sendto_fconnectnotice(client, 0, NULL);
+
+	RunHook(HOOKTYPE_REMOTE_CONNECT, client);
+}
+
+/** The NICK command.
+ * In UnrealIRCd 4/5 this is only used in 2 cases:
+ * 1) A local user setting or changing the nick name ("NICK xyz")
+ * 2) A remote user changing their nick name (":<uid> NICK <newnick>")
+ */
+CMD_FUNC(cmd_nick)
+{
+	if (MyConnect(client) && !IsServer(client))
+		cmd_nick_local(client, recv_mtags, parc, parv);
+	else
+		cmd_nick_remote(client, recv_mtags, parc, parv);
+}
+
+/** Register the connection as a User.
+ * This is called after NICK + USER (in no particular order)
+ * and possibly other protocol messages as well (eg CAP).
+ * @param client		Client to be made a user.
+ * @param nick		Nick name
+ * @param username	Username
+ * @param umode		User modes
+ * @param virthost	Virtual host (can be NULL)
+ * @param ip		IP address string (can be NULL)
+ * @returns 1 if successfully registered, 0 if not (client might be killed).
+ */
+int _register_user(Client *client, char *nick, char *username, char *umode, char *virthost, char *ip)
+{
+	ConfigItem_ban *bconf;
+	char *tmpstr;
+	char stripuser[USERLEN + 1], *u1 = stripuser, *u2, olduser[USERLEN + 1],
+	    userbad[USERLEN * 2 + 1], *ubad = userbad, noident = 0;
+	int i, xx;
+	Hook *h;
+	ClientUser *user = client->user;
+	char *tkllayer[9] = {
+		me.name,	/*0  server.name */
+		"+",		/*1  +|- */
+		"z",		/*2  G   */
+		"*",		/*3  user */
+		NULL,		/*4  host */
+		NULL,
+		NULL,		/*6  expire_at */
+		NULL,		/*7  set_at */
+		NULL		/*8  reason */
+	};
+	TKL *savetkl = NULL;
+	ConfigItem_tld *tlds;
+
+	nick = client->name; /* <- The data is always the same, but the pointer is sometimes not,
+	                    *    I need this for one of my modules, so do not remove! ;) -- Syzop */
+
+	if (MyConnect(client))
+	{
+	        char temp[USERLEN + 1];
+
+		if (!AllowClient(client, username))
+		{
+			ircstats.is_ref++;
+			/* For safety, we have an extra kill here */
+			if (!IsDead(client))
+				exit_client(client, NULL, "Rejected");
+			return 0;
+		}
+
+		if (client->local->hostp)
+		{
+			/* reject ASCII < 32 and ASCII >= 127 (note: upper resolver might be even more strict). */
+			for (tmpstr = client->local->sockhost; *tmpstr > ' ' && *tmpstr < 127; tmpstr++);
+
+			/* if host contained invalid ASCII _OR_ the DNS reply is an IP-like reply
+			 * (like: 1.2.3.4 or ::ffff:1.2.3.4), then reject it and use IP instead.
+			 */
+			if (*tmpstr || !*user->realhost || (isdigit(*client->local->sockhost) && (client->local->sockhost > tmpstr && isdigit(*(tmpstr - 1))) )
+			    || (client->local->sockhost[0] == ':'))
+				strlcpy(client->local->sockhost, client->ip, sizeof(client->local->sockhost));
+		}
+		if (client->local->sockhost[0])
+		{
+			strlcpy(user->realhost, client->local->sockhost, sizeof(client->local->sockhost)); /* SET HOSTNAME */
+		} else {
+			sendto_realops("[HOSTNAME BUG] client->local->sockhost is empty for user %s (%s, %s)",
+				client->name, client->ip ? client->ip : "<null>", user->realhost);
+			ircd_log(LOG_ERROR, "[HOSTNAME BUG] client->local->sockhost is empty for user %s (%s, %s)",
+				client->name, client->ip ? client->ip : "<null>", user->realhost);
+		}
+
+		/*
+		 * I do not consider *, ~ or ! 'hostile' in usernames,
+		 * as it is easy to differentiate them (Use \*, \? and \\)
+		 * with the possible?
+		 * exception of !. With mIRC etc. ident is easy to fake
+		 * to contain @ though, so if that is found use non-ident
+		 * username. -Donwulff
+		 *
+		 * I do, We only allow a-z A-Z 0-9 _ - and . now so the
+		 * !strchr(client->ident, '@') check is out of date. -Cabal95
+		 *
+		 * Moved the noident stuff here. -OnyxDragon
+		 */
+
+		/* because username may point to user->username */
+		strlcpy(temp, username, USERLEN + 1);
+
+		if (!IsUseIdent(client))
+			strlcpy(user->username, temp, USERLEN + 1);
+		else if (IsIdentSuccess(client))
+			strlcpy(user->username, client->ident, USERLEN+1);
+		else
+		{
+			if (IDENT_CHECK == 0) {
+				strlcpy(user->username, temp, USERLEN+1);
+			}
+			else {
+				*user->username = '~';
+				strlcpy((user->username + 1), temp, sizeof(user->username)-1);
+				noident = 1;
+			}
+
+		}
+		/*
+		 * Limit usernames to just 0-9 a-z A-Z _ - and .
+		 * It strips the "bad" chars out, and if nothing is left
+		 * changes the username to the first 8 characters of their
+		 * nickname. After the MOTD is displayed it sends numeric
+		 * 455 to the user telling them what(if anything) happened.
+		 * -Cabal95
+		 *
+		 * Moved the noident thing to the right place - see above
+		 * -OnyxDragon
+		 *
+		 * No longer use nickname if the entire ident is invalid,
+                 * if thats the case, it is likely the user is trying to cause
+		 * problems so just ban them. (Using the nick could introduce
+		 * hostile chars) -- codemastr
+		 */
+		for (u2 = user->username + noident; *u2; u2++)
+		{
+			if (isallowed(*u2))
+				*u1++ = *u2;
+			else if (*u2 < 32)
+			{
+				/*
+				 * Make sure they can read what control
+				 * characters were in their username.
+				 */
+				*ubad++ = '^';
+				*ubad++ = *u2 + '@';
+			}
+			else
+				*ubad++ = *u2;
+		}
+		*u1 = '\0';
+		*ubad = '\0';
+		if (strlen(stripuser) != strlen(user->username + noident))
+		{
+			if (stripuser[0] == '\0')
+			{
+				exit_client(client, NULL, "Hostile username. Please use only 0-9 a-z A-Z _ - and . in your username.");
+				return 0;
+			}
+
+			strlcpy(olduser, user->username + noident, USERLEN+1);
+			strlcpy(user->username + 1, stripuser, sizeof(user->username)-1);
+			user->username[0] = '~';
+			user->username[USERLEN] = '\0';
+		}
+		else
+			u1 = NULL;
+
+		/* Check ban realname { } blocks */
+		if ((bconf = find_ban(NULL, client->info, CONF_BAN_REALNAME)))
+		{
+			ircstats.is_ref++;
+			banned_client(client, "realname", bconf->reason?bconf->reason:"", 0, 0);
+			return 0;
+		}
+		/* Check G/Z lines before shuns -- kill before quite -- codemastr */
+		if (find_tkline_match(client, 0))
+		{
+			ircstats.is_ref++;
+			return 0;
+		}
+		find_shun(client);
+
+		spamfilter_build_user_string(spamfilter_user, client->name, client);
+		if (match_spamfilter(client, spamfilter_user, SPAMF_USER, NULL, 0, &savetkl))
+		{
+			if (savetkl && ((savetkl->ptr.spamfilter->action == BAN_ACT_VIRUSCHAN) ||
+			                (savetkl->ptr.spamfilter->action == BAN_ACT_SOFT_VIRUSCHAN)))
+			{
+				/* 'viruschan' action:
+				 * Continue with registering the client, and at the end
+				 * of this function we will do the actual joining to the
+				 * virus channel.
+				 */
+			} else {
+				/* Client is either dead or blocked (will hang, on purpose, and timeout) */
+				return 0;
+			}
+		}
+
+		for (h = Hooks[HOOKTYPE_PRE_LOCAL_CONNECT]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client);
+			if (i == HOOK_DENY)
+				return 0;
+			if (i == HOOK_ALLOW)
+				break;
+		}
+	}
+	else
+	{
+		strlcpy(user->username, username, USERLEN+1);
+	}
+	SetUser(client);
+	irccounts.clients++;
+	if (client->srvptr && client->srvptr->serv)
+		client->srvptr->serv->users++;
+
+	make_cloakedhost(client, user->realhost, user->cloakedhost, sizeof(user->cloakedhost));
+	safe_strdup(user->virthost, user->cloakedhost);
+
+	if (MyConnect(client))
+	{
+		char descbuf[BUFSIZE];
+		int i;
+
+		snprintf(descbuf, sizeof descbuf, "Client: %s", nick);
+		fd_desc(client->local->fd, descbuf);
+
+		list_move(&client->lclient_node, &lclient_list);
+
+		irccounts.unknown--;
+		irccounts.me_clients++;
+
+		if (IsSecure(client))
+		{
+			client->umodes |= UMODE_SECURE;
+			RunHook(HOOKTYPE_SECURE_CONNECT, client);
+		}
+
+		if (IsHidden(client))
+			ircd_log(LOG_CLIENT, "Connect - %s!%s@%s [VHOST %s]", nick,
+				user->username, user->realhost, user->virthost);
+		else
+			ircd_log(LOG_CLIENT, "Connect - %s!%s@%s", nick, user->username,
+				user->realhost);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 0);
+		sendnumeric(client, RPL_WELCOME, ircnetwork, nick, user->username, user->realhost);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 1);
+		sendnumeric(client, RPL_YOURHOST, me.name, version);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 2);
+		sendnumeric(client, RPL_CREATED, creation);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 3);
+		sendnumeric(client, RPL_MYINFO, me.name, version, umodestring, cmodestring);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 4);
+		for (i = 0; ISupportStrings[i]; i++)
+			sendnumeric(client, RPL_ISUPPORT, ISupportStrings[i]);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 5);
+
+		if (IsHidden(client))
+		{
+			sendnumeric(client, RPL_HOSTHIDDEN, user->virthost);
+			RunHook2(HOOKTYPE_WELCOME, client, 396);
+		}
+
+		if (IsSecureConnect(client))
+		{
+			if (client->local->ssl && !iConf.no_connect_tls_info)
+			{
+				sendnotice(client, "*** You are connected to %s with %s",
+					me.name, tls_get_cipher(client->local->ssl));
+			}
+		}
+
+		{
+			char *parv[2];
+			parv[0] = client->name;
+			parv[1] = NULL;
+			do_cmd(client, NULL, "LUSERS", 1, parv);
+			if (IsDead(client))
+				return 0;
+		}
+
+		RunHook2(HOOKTYPE_WELCOME, client, 266);
+
+		short_motd(client);
+
+		RunHook2(HOOKTYPE_WELCOME, client, 376);
+
+#ifdef EXPERIMENTAL
+		sendnotice(client,
+			"*** \2NOTE:\2 This server is running experimental IRC server software (UnrealIRCd %s). "
+			"If you find any bugs or problems, please report them at https://bugs.unrealircd.org/",
+			VERSIONONLY);
+#endif
+		/*
+		 * Now send a numeric to the user telling them what, if
+		 * anything, happened.
+		 */
+		if (u1)
+			sendnumeric(client, ERR_HOSTILENAME, olduser, userbad, stripuser);
+	}
+	else
+	{
+		Client *acptr;
+
+		/* Remote client */
+		/* The following two cases probably cannot happen anymore? at all? */
+		if (!(acptr = find_server_quick(user->server)))
+		{
+			sendto_ops("Bad USER [%s] :%s USER %s %s : No such server",
+			           client->name, nick, user->username, user->server);
+			sendto_one(client, NULL, ":%s KILL %s :No such server: %s",
+			    me.id, client->id, user->server);
+			SetKilled(client);
+			exit_client(client, NULL, "USER without prefix(2.8) or wrong prefix");
+			return 0;
+		}
+		else if (acptr->direction != client->direction)
+		{
+			sendto_ops("Bad User [%s] :%s USER %s %s, != %s[%s]",
+			    client->name, nick, user->username, user->server,
+			    acptr->name, acptr->direction->name);
+			sendto_one(client, NULL, ":%s KILL %s :Wrong user-server-direction",
+			    me.id, client->id);
+			SetKilled(client);
+			exit_client(client, NULL, "USER server wrong direction");
+			return 0;
+		} else
+		{
+			client->flags |= acptr->flags;
+		}
+
+		if (IsULine(client->srvptr))
+			SetULine(client);
+	}
+	if (client->umodes & UMODE_INVISIBLE)
+	{
+		irccounts.invisible++;
+	}
+
+	if (virthost && umode)
+	{
+		/* Set the IP address first */
+		if (ip && (*ip != '*'))
+		{
+			char *ipstring = decode_ip(ip);
+			if (!ipstring)
+			{
+				sendto_ops("USER with invalid IP (%s) (%s) -- "
+				           "IP must be base64 encoded binary representation of either IPv4 or IPv6",
+				           client->name, ip);
+				exit_client(client, NULL, "USER with invalid IP");
+				return 0;
+			}
+			safe_strdup(client->ip, ipstring);
+		}
+
+		/* For remote clients we recalculate the cloakedhost here because
+		 * it may depend on the IP address (bug #5064).
+		 */
+		make_cloakedhost(client, user->realhost, user->cloakedhost, sizeof(user->cloakedhost));
+		safe_strdup(user->virthost, user->cloakedhost);
+
+		/* Set the umodes */
+		tkllayer[0] = nick;
+		tkllayer[1] = nick;
+		tkllayer[2] = umode;
+		tkllayer[3] = NULL;
+		dontspread = 1;
+		do_cmd(client, NULL, "MODE", 3, tkllayer);
+		dontspread = 0;
+
+		/* Set the vhost */
+		if (virthost && *virthost != '*')
+			safe_strdup(client->user->virthost, virthost);
+	}
+
+	hash_check_watch(client, RPL_LOGON);	/* Uglier hack */
+	build_umode_string(client, 0, SEND_UMODES|UMODE_SERVNOTICE, buf);
+
+	sendto_serv_butone_nickcmd(client->direction, client, (*buf == '\0' ? "+" : buf));
+
+	if (MyConnect(client))
+	{
+		broadcast_moddata_client(client);
+		sendto_connectnotice(client, 0, NULL); /* moved down, for modules. */
+		if (buf[0] != '\0' && buf[1] != '\0')
+			sendto_one(client, NULL, ":%s MODE %s :%s", client->name,
+			    client->name, buf);
+		if (user->snomask)
+			sendnumeric(client, RPL_SNOMASK, get_snomask_string_raw(user->snomask));
+
+		if (!IsSecure(client) && !IsLocalhost(client) && (iConf.plaintext_policy_user == POLICY_WARN))
+			sendnotice(client, "%s", iConf.plaintext_policy_user_message);
+
+		if (IsSecure(client) && (iConf.outdated_tls_policy_user == POLICY_WARN) && outdated_tls_client(client))
+			sendnotice(client, "%s", outdated_tls_client_build_string(iConf.outdated_tls_policy_user_message, client));
+
+		/* Make creation time the real 'online since' time, excluding registration time.
+		 * Otherwise things like set::anti-spam-quit-messagetime 10s could mean
+		 * 1 second in practice (#2174).
+		 */
+		client->local->firsttime = TStime();
+		client->local->last = TStime();
+
+		/* Give the user a fresh start as far as fake-lag is concerned.
+		 * Otherwise the user could be lagged up already due to all the CAP stuff.
+		 */
+		client->local->since = TStime();
+
+		RunHook2(HOOKTYPE_WELCOME, client, 999);
+
+		/* NOTE: Code after this 'if (savetkl)' will not be executed for quarantined-
+		 *       virus-users. So be carefull with the order. -- Syzop
+		 */
+		// FIXME: verify if this works, trace code path upstream!!!!
+		if (savetkl)
+			return join_viruschan(client, savetkl, SPAMF_USER); /* [RETURN!] */
+
+		/* Force the user to join the given chans -- codemastr */
+		tlds = find_tld(client);
+
+		if (tlds && !BadPtr(tlds->channel))
+		{
+			char *chans = strdup(tlds->channel);
+			char *args[3] = {
+				client->name,
+				chans,
+				NULL
+			};
+			do_cmd(client, NULL, "JOIN", 3, args);
+			safe_free(chans);
+			if (IsDead(client))
+				return 0;
+		}
+		else if (!BadPtr(AUTO_JOIN_CHANS) && strcmp(AUTO_JOIN_CHANS, "0"))
+		{
+			char *chans = strdup(AUTO_JOIN_CHANS);
+			char *args[3] = {
+				client->name,
+				chans,
+				NULL
+			};
+			do_cmd(client, NULL, "JOIN", 3, args);
+			safe_free(chans);
+			if (IsDead(client))
+				return 0;
+		}
+		/* NOTE: If you add something here.. be sure to check the 'if (savetkl)' note above */
+	}
+
+	if (MyConnect(client) && !BadPtr(client->local->passwd))
+	{
+		safe_free(client->local->passwd);
+		client->local->passwd = NULL;
+	}
+
+	/* User successfully registered */
+	return 1;
+}
+
+/** Nick collission detected. A winner has been decided upstream. Deal with killing.
+ * I moved this all to a single routine here rather than having all code duplicated
+ * due to SID vs NICK and some code quadruplicated.
+ */
+void nick_collision(Client *cptr, char *newnick, char *newid, Client *new, Client *existing, int type)
+{
+	char comment[512];
+	char *new_server, *existing_server;
+
+	ircd_log(LOG_ERROR, "Nick collision: %s[%s]@%s (new) vs %s[%s]@%s (existing). Winner: %s. Type: %s",
+		newnick, newid, cptr->name,
+		existing->name, existing->id, existing->srvptr->name,
+		(type == NICKCOL_EQUAL) ? "None (equal)" : ((type == NICKCOL_NEW_WON) ? "New won" : "Existing won"),
+		new ? "nick-change" : "new user connecting");
+
+	new_server = cptr->name;
+	existing_server = (existing == existing->direction) ? me.name : existing->direction->name;
+	if (type == NICKCOL_EXISTING_WON)
+		snprintf(comment, sizeof(comment), "Nick collision: %s <- %s", new_server, existing_server);
+	else if (type == NICKCOL_NEW_WON)
+		snprintf(comment, sizeof(comment), "Nick collision: %s <- %s", existing_server, new_server);
+	else
+		snprintf(comment, sizeof(comment), "Nick collision: %s <-> %s", existing_server, new_server);
+
+	/* We only care about the direction from this point, not about the originally sending server */
+	cptr = cptr->direction;
+
+	if ((type == NICKCOL_EQUAL) || (type == NICKCOL_EXISTING_WON))
+	{
+		/* Kill 'new':
+		 * - 'new' is known by the cptr-side as 'newnick' already
+		 * - if not nick-changing then the other servers don't know this user
+		 * - if nick-changing, then the the other servers know the user as new->name
+		 */
+
+		/* cptr case first... this side knows the user by newnick/newid */
+		/* SID server can kill 'new' by ID */
+		sendto_one(cptr, NULL, ":%s KILL %s :%s", me.id, newid, comment);
+
+		/* non-cptr case... only necessary if nick-changing. */
+		if (new)
+		{
+			MessageTag *mtags = NULL;
+
+			new_message(new, NULL, &mtags);
+
+			/* non-cptr side knows this user by their old nick name */
+			sendto_server(cptr, 0, 0, mtags, ":%s KILL %s :%s", me.id, new->id, comment);
+
+			/* Exit the client */
+			ircstats.is_kill++;
+			SetKilled(new);
+			exit_client(new, mtags, comment);
+
+			free_message_tags(mtags);
+		}
+	}
+
+	if ((type == NICKCOL_EQUAL) || (type == NICKCOL_NEW_WON))
+	{
+		MessageTag *mtags = NULL;
+
+		new_message(existing, NULL, &mtags);
+
+		/* Now let's kill 'existing' */
+		sendto_server(NULL, 0, 0, mtags, ":%s KILL %s :%s", me.id, existing->id, comment);
+
+		/* Exit the client */
+		ircstats.is_kill++;
+		SetKilled(existing);
+		exit_client(existing, mtags, comment);
+
+		free_message_tags(mtags);
+	}
+}
+
+/* This used to initialize the various name strings used to store hostnames.
+ * But nowadays this takes place much earlier (in add_connection?).
+ * It's mainly used for "localhost" and WEBIRC magic only now...
+ */
+int check_init(Client *client, char *sockn, size_t size)
+{
+	strlcpy(sockn, client->local->sockhost, HOSTLEN);
+
+	RunHookReturnInt3(HOOKTYPE_CHECK_INIT, client, sockn, size, !=0);
+
+	/* Some silly hack to convert 127.0.0.1 and such into 'localhost' */
+	if (!strcmp(GetIP(client), "127.0.0.1") ||
+	    !strcmp(GetIP(client), "0:0:0:0:0:0:0:1") ||
+	    !strcmp(GetIP(client), "0:0:0:0:0:ffff:127.0.0.1"))
+	{
+		if (client->local->hostp)
+		{
+			unreal_free_hostent(client->local->hostp);
+			client->local->hostp = NULL;
+		}
+		strlcpy(sockn, "localhost", HOSTLEN);
+	}
+
+	return 1;
+}
+
+/** Returns 1 if allow::maxperip is exceeded by 'client' */
+int exceeds_maxperip(Client *client, ConfigItem_allow *aconf)
+{
+	Client *acptr;
+	int cnt = 1;
+
+	if (find_tkl_exception(TKL_MAXPERIP, client))
+		return 0; /* exempt */
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		if (IsUser(acptr) && !strcmp(GetIP(acptr), GetIP(client)))
+		{
+			cnt++;
+			if (cnt > aconf->maxperip)
+				return 1;
+		}
+	}
+	return 0;
+}
+
+/** Allow or reject the client based on allow { } blocks and all other restrictions.
+ * @param client     Client to check (local)
+ * @param username   Username, for some reason...
+ * @returns 1 if OK, 0 if client is rejected (likely killed too)
+ */
+int AllowClient(Client *client, char *username)
+{
+	static char sockhost[HOSTLEN + 1];
+	struct hostent *hp = NULL;
+	int i;
+	ConfigItem_allow *aconf;
+	char *hname;
+	static char uhost[HOSTLEN + USERLEN + 3];
+	static char fullname[HOSTLEN + 1];
+
+	Debug((DEBUG_DNS, "ch_cl: check access for %s[%s]", client->name, client->local->sockhost));
+
+	if (!check_init(client, sockhost, sizeof(sockhost)))
+		return 0;
+
+	hp = client->local->hostp;
+
+	if (!IsSecure(client) && !IsLocalhost(client) && (iConf.plaintext_policy_user == POLICY_DENY))
+	{
+		exit_client(client, NULL, iConf.plaintext_policy_user_message);
+		return 0;
+	}
+
+	if (IsSecure(client) && (iConf.outdated_tls_policy_user == POLICY_DENY) && outdated_tls_client(client))
+	{
+		char *msg = outdated_tls_client_build_string(iConf.outdated_tls_policy_user_message, client);
+		exit_client(client, NULL, msg);
+		return 0;
+	}
+
+	for (aconf = conf_allow; aconf; aconf = aconf->next)
+	{
+		if (!aconf->hostname || !aconf->ip)
+			goto attach;
+		if (aconf->auth && !client->local->passwd && !moddata_client_get(client, "certfp"))
+			continue;
+		if (aconf->flags.tls && !IsSecure(client))
+			continue;
+		if (hp && hp->h_name)
+		{
+			hname = hp->h_name;
+			strlcpy(fullname, hname, sizeof(fullname));
+			Debug((DEBUG_DNS, "a_il: %s->%s", sockhost, fullname));
+			if (strchr(aconf->hostname, '@'))
+			{
+				if (aconf->flags.noident)
+					strlcpy(uhost, username, sizeof(uhost));
+				else
+					strlcpy(uhost, client->ident, sizeof(uhost));
+				strlcat(uhost, "@", sizeof(uhost));
+			}
+			else
+				*uhost = '\0';
+			strlcat(uhost, fullname, sizeof(uhost));
+			if (match_simple(aconf->hostname, uhost))
+				goto attach;
+		}
+
+		if (strchr(aconf->ip, '@'))
+		{
+			if (aconf->flags.noident)
+				strlcpy(uhost, username, sizeof(uhost));
+			else
+				strlcpy(uhost, client->ident, sizeof(uhost));
+			strlcat(uhost, "@", sizeof(uhost));
+		}
+		else
+			*uhost = '\0';
+		strlcat(uhost, sockhost, sizeof(uhost));
+		/* Check the IP */
+		if (match_user(aconf->ip, client, MATCH_CHECK_IP))
+			goto attach;
+
+		/* Hmm, localhost is a special case, hp == NULL and sockhost contains
+		 * 'localhost' instead of an ip... -- Syzop. */
+		if (!strcmp(sockhost, "localhost"))
+		{
+			if (strchr(aconf->hostname, '@'))
+			{
+				if (aconf->flags.noident)
+					strlcpy(uhost, username, sizeof(uhost));
+				else
+					strlcpy(uhost, client->ident, sizeof(uhost));
+				strlcat(uhost, "@localhost", sizeof(uhost));
+			}
+			else
+				strcpy(uhost, "localhost");
+
+			if (match_simple(aconf->hostname, uhost))
+				goto attach;
+		}
+
+		continue;
+	attach:
+		if (!aconf->flags.noident)
+			SetUseIdent(client);
+		if (!aconf->flags.useip && hp)
+			strlcpy(uhost, fullname, sizeof(uhost));
+		else
+			strlcpy(uhost, sockhost, sizeof(uhost));
+		set_sockhost(client, uhost);
+
+		if (aconf->maxperip && exceeds_maxperip(client, aconf))
+		{
+			/* Already got too many with that ip# */
+			exit_client(client, NULL, iConf.reject_message_too_many_connections);
+			return 0;
+		}
+
+		if (aconf->auth && !Auth_Check(client, aconf->auth, client->local->passwd))
+		{
+			/* Always continue if password was wrong. */
+			continue;
+		}
+
+		if (!((aconf->class->clients + 1) > aconf->class->maxclients))
+		{
+			client->local->class = aconf->class;
+			client->local->class->clients++;
+		}
+		else
+		{
+			/* Class is full */
+			sendnumeric(client, RPL_REDIR, aconf->server ? aconf->server : defserv, aconf->port ? aconf->port : 6667);
+			exit_client(client, NULL, iConf.reject_message_server_full);
+			return 0;
+		}
+		return 1;
+	}
+	/* User did not match any allow { } blocks: */
+	exit_client(client, NULL, iConf.reject_message_unauthorized);
+	return 0;
+}
diff --git a/src/modules/nocodes.c b/src/modules/nocodes.c
new file mode 100644
index 0000000..a8f14fd
--- /dev/null
+++ b/src/modules/nocodes.c
@@ -0,0 +1,102 @@
+/*
+ * "No Codes", a very simple (but often requested) module written by Syzop.
+ * This module will strip messages with bold/underline/reverse if chanmode
+ * +S is set, and block them if +c is set.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"nocodes",	/* Name of module */
+	"1.2", /* Version */
+	"Strip/block bold/underline/reverse - by Syzop", /* Short description of module */
+	"UnrealIRCd Team", /* Author */
+	"unrealircd-5",
+};
+
+int nocodes_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, 0, nocodes_can_send_to_channel);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static int has_controlcodes(char *p)
+{
+	for (; *p; p++)
+		if ((*p == '\002') || (*p == '\037') || (*p == '\026') || (*p == '\035')) /* bold, underline, reverse, italic */
+			return 1;
+	return 0;
+}
+
+int nocodes_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	static char retbuf[4096];
+	Hook *h;
+	int i;
+
+	if (has_channel_mode(channel, 'S'))
+	{
+		if (!has_controlcodes(*msg))
+			return HOOK_CONTINUE;
+
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_COLOR);
+			if (i == HOOK_ALLOW)
+				return HOOK_CONTINUE; /* bypass +S restriction */
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+
+		strlcpy(retbuf, StripControlCodes(*msg), sizeof(retbuf));
+		*msg = retbuf;
+		return HOOK_CONTINUE;
+	} else
+	if (has_channel_mode(channel, 'c'))
+	{
+		if (!has_controlcodes(*msg))
+			return HOOK_CONTINUE;
+
+		for (h = Hooks[HOOKTYPE_CAN_BYPASS_CHANNEL_MESSAGE_RESTRICTION]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client, channel, BYPASS_CHANMSG_COLOR);
+			if (i == HOOK_ALLOW)
+				return HOOK_CONTINUE; /* bypass +c restriction */
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+
+		*errmsg = "Control codes (bold/underline/reverse) are not permitted in this channel";
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/oper.c b/src/modules/oper.c
new file mode 100644
index 0000000..f9776cf
--- /dev/null
+++ b/src/modules/oper.c
@@ -0,0 +1,332 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/oper.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_oper);
+
+
+/* Place includes here */
+#define MSG_OPER        "OPER"  /* OPER */
+
+ModuleHeader MOD_HEADER
+  = {
+	"oper",	/* Name of module */
+	"5.0", /* Version */
+	"command /oper", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_OPER, cmd_oper, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void set_oper_host(Client *client, char *host)
+{
+        char uhost[HOSTLEN + USERLEN + 1];
+        char *p;
+        
+        strlcpy(uhost, host, sizeof(uhost));
+        
+	if ((p = strchr(uhost, '@')))
+	{
+	        *p++ = '\0';
+		strlcpy(client->user->username, uhost, sizeof(client->user->username));
+		sendto_server(NULL, 0, 0, NULL, ":%s SETIDENT %s",
+		    client->id, client->user->username);
+	        host = p;
+	}
+	iNAH_host(client, host);
+	SetHidden(client);
+}
+
+/*
+** cmd_oper
+**	parv[1] = oper name
+**	parv[2] = oper password
+*/
+CMD_FUNC(cmd_oper)
+{
+	ConfigItem_oper *operblock;
+	char *name, *password;
+	long old_umodes = client->umodes & ALL_UMODES;
+
+	if (!MyUser(client))
+		return;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "OPER");
+		return;
+	}
+
+	if (SVSNOOP)
+	{
+		sendnotice(client,
+		    "*** This server is in NOOP mode, you cannot /oper");
+		return;
+	}
+
+	if (IsOper(client))
+	{
+		sendnumeric(client, RPL_YOUREOPER);
+		// TODO: de-confuse this ? ;)
+		return;
+	}
+
+	name = parv[1];
+	password = (parc > 2) ? parv[2] : "";
+
+	/* set::plaintext-policy::oper 'deny' */
+	if (!IsSecure(client) && !IsLocalhost(client) && (iConf.plaintext_policy_oper == POLICY_DENY))
+	{
+		sendnotice(client, "%s", iConf.plaintext_policy_oper_message);
+		sendto_snomask_global
+		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) [not using SSL/TLS]",
+		    client->name, client->user->username, client->local->sockhost);
+		ircd_log(LOG_OPER, "OPER NO-SSL/TLS (%s) by (%s!%s@%s)", name, client->name,
+			client->user->username, client->local->sockhost);
+		client->local->since += 7;
+		return;
+	}
+
+	/* set::outdated-tls-policy::oper 'deny' */
+	if (IsSecure(client) && (iConf.outdated_tls_policy_oper == POLICY_DENY) && outdated_tls_client(client))
+	{
+		sendnotice(client, "%s", outdated_tls_client_build_string(iConf.outdated_tls_policy_oper_message, client));
+		sendto_snomask_global
+		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) [outdated SSL/TLS protocol or cipher]",
+		    client->name, client->user->username, client->local->sockhost);
+		ircd_log(LOG_OPER, "OPER OUTDATED-SSL/TLS (%s) by (%s!%s@%s)", name, client->name,
+			client->user->username, client->local->sockhost);
+		client->local->since += 7;
+		return;
+	}
+
+	if (!(operblock = find_oper(name)))
+	{
+		sendnumeric(client, ERR_NOOPERHOST);
+		sendto_snomask_global
+		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) [unknown oper]",
+		    client->name, client->user->username, client->local->sockhost);
+		ircd_log(LOG_OPER, "OPER UNKNOWNOPER (%s) by (%s!%s@%s)", name, client->name,
+			client->user->username, client->local->sockhost);
+		client->local->since += 7;
+		return;
+	}
+
+	if (!unreal_mask_match(client, operblock->mask))
+	{
+		sendnumeric(client, ERR_NOOPERHOST);
+		sendto_snomask_global
+		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) using UID %s [host doesnt match]",
+		    client->name, client->user->username, client->local->sockhost, name);
+		ircd_log(LOG_OPER, "OPER NOHOSTMATCH (%s) by (%s!%s@%s)", name, client->name,
+			client->user->username, client->local->sockhost);
+		client->local->since += 7;
+		return;
+	}
+
+	if (!Auth_Check(client, operblock->auth, password))
+	{
+		sendnumeric(client, ERR_PASSWDMISMATCH);
+		if (FAILOPER_WARN)
+			sendnotice(client,
+			    "*** Your attempt has been logged.");
+		ircd_log(LOG_OPER, "OPER FAILEDAUTH (%s) by (%s!%s@%s)", name, client->name,
+			client->user->username, client->local->sockhost);
+		sendto_snomask_global
+		    (SNO_OPER, "Failed OPER attempt by %s (%s@%s) using UID %s [FAILEDAUTH]",
+		    client->name, client->user->username, client->local->sockhost, name);
+		client->local->since += 7;
+		return;
+	}
+
+	/* Authentication of the oper succeeded (like, password, ssl cert),
+	 * but we still have some other restrictions to check below as well,
+	 * like 'require-modes' and 'maxlogins'...
+	 */
+
+	/* Check oper::require_modes */
+	if (operblock->require_modes & ~client->umodes)
+	{
+		sendnumericfmt(client, ERR_NOOPERHOST, ":You are missing user modes required to OPER");
+		sendto_snomask_global
+			(SNO_OPER, "Failed OPER attempt by %s (%s@%s) [lacking modes '%s' in oper::require-modes]",
+			 client->name, client->user->username, client->local->sockhost, get_usermode_string_raw(operblock->require_modes & ~client->umodes));
+		ircd_log(LOG_OPER, "OPER MISSINGMODES (%s) by (%s!%s@%s), needs modes=%s",
+			 name, client->name, client->user->username, client->local->sockhost,
+			 get_usermode_string_raw(operblock->require_modes & ~client->umodes));
+		client->local->since += 7;
+		return;
+	}
+
+	if (!find_operclass(operblock->operclass))
+	{
+		sendnotice(client, "ERROR: There is a non-existant oper::operclass specified for your oper block");
+		ircd_log(LOG_ERROR, "OPER MISSINGOPERCLASS (%s) by (%s!%s@%s), oper::operclass does not exist: %s",
+			name, client->name, client->user->username, client->local->sockhost,
+			operblock->operclass);
+		sendto_snomask_global
+			(SNO_OPER, "Failed OPER attempt by %s (%s@%s) [oper::operclass does not exist: '%s']",
+			client->name, client->user->username, client->local->sockhost, operblock->operclass);
+		return;
+	}
+
+	if (operblock->maxlogins && (count_oper_sessions(operblock->name) >= operblock->maxlogins))
+	{
+		sendnumeric(client, ERR_NOOPERHOST);
+		sendnotice(client, "Your maximum number of concurrent oper logins has been reached (%d)",
+			operblock->maxlogins);
+		sendto_snomask_global
+			(SNO_OPER, "Failed OPER attempt by %s (%s@%s) using UID %s [maxlogins reached]",
+			client->name, client->user->username, client->local->sockhost, name);
+		ircd_log(LOG_OPER, "OPER TOOMANYLOGINS (%s) by (%s!%s@%s)", name, client->name,
+			client->user->username, client->local->sockhost);
+		client->local->since += 4;
+		return;
+	}
+
+	/* /OPER really succeeded now. Start processing it. */
+
+	/* Store which oper block was used to become IRCOp (for maxlogins and whois) */
+	safe_strdup(client->user->operlogin, operblock->name);
+
+	/* Put in the right class */
+	if (client->local->class)
+		client->local->class->clients--;
+	client->local->class = operblock->class;
+	client->local->class->clients++;
+
+	/* oper::swhois */
+	if (operblock->swhois)
+	{
+		SWhois *s;
+		for (s = operblock->swhois; s; s = s->next)
+			swhois_add(client, "oper", -100, s->line, &me, NULL);
+	}
+
+	/* set oper user modes */
+	client->umodes |= UMODE_OPER;
+	if (operblock->modes)
+		client->umodes |= operblock->modes; /* oper::modes */
+	else
+		client->umodes |= OPER_MODES; /* set::modes-on-oper */
+
+	/* oper::vhost */
+	if (operblock->vhost)
+	{
+		set_oper_host(client, operblock->vhost);
+	} else
+	if (IsHidden(client) && !client->user->virthost)
+	{
+		/* +x has just been set by modes-on-oper and no vhost. cloak the oper! */
+		safe_strdup(client->user->virthost, client->user->cloakedhost);
+	}
+
+	sendto_snomask_global(SNO_OPER,
+		"%s (%s@%s) [%s] is now an operator",
+		client->name, client->user->username, client->local->sockhost,
+		parv[1]);
+
+	ircd_log(LOG_OPER, "OPER (%s) by (%s!%s@%s)", name, client->name, client->user->username,
+		client->local->sockhost);
+
+	/* set oper snomasks */
+	if (operblock->snomask)
+		set_snomask(client, operblock->snomask); /* oper::snomask */
+	else
+		set_snomask(client, OPER_SNOMASK); /* set::snomask-on-oper */
+
+	/* some magic to set user mode +s (and snomask +s) if you have any snomasks set */
+	if (client->user->snomask)
+	{
+		client->user->snomask |= SNO_SNOTICE;
+		client->umodes |= UMODE_SERVNOTICE;
+	}
+	
+	send_umode_out(client, 1, old_umodes);
+	sendnumeric(client, RPL_SNOMASK, get_snomask_string(client));
+
+	list_add(&client->special_node, &oper_list);
+
+	RunHook2(HOOKTYPE_LOCAL_OPER, client, 1);
+
+	sendnumeric(client, RPL_YOUREOPER);
+
+	/* Update statistics */
+	if (IsInvisible(client) && !(old_umodes & UMODE_INVISIBLE))
+		irccounts.invisible++;
+	if (IsOper(client) && !IsHideOper(client))
+		irccounts.operators++;
+
+	if (SHOWOPERMOTD == 1)
+		do_cmd(client, NULL, "OPERMOTD", parc, parv);
+
+	if (!BadPtr(OPER_AUTO_JOIN_CHANS) && strcmp(OPER_AUTO_JOIN_CHANS, "0"))
+	{
+		char *chans = strdup(OPER_AUTO_JOIN_CHANS);
+		char *args[3] = {
+			client->name,
+			chans,
+			NULL
+		};
+		do_cmd(client, NULL, "JOIN", 3, args);
+		safe_free(chans);
+		/* Theoretically the oper may be killed on join. Would be fun, though */
+		if (IsDead(client))
+			return;
+	}
+
+	/* set::plaintext-policy::oper 'warn' */
+	if (!IsSecure(client) && !IsLocalhost(client) && (iConf.plaintext_policy_oper == POLICY_WARN))
+	{
+		sendnotice(client, "%s", iConf.plaintext_policy_oper_message);
+		sendto_snomask_global
+		    (SNO_OPER, "OPER %s [%s] used an insecure (non-SSL/TLS) connection to /OPER.",
+		    client->name, name);
+	}
+
+	/* set::outdated-tls-policy::oper 'warn' */
+	if (IsSecure(client) && (iConf.outdated_tls_policy_oper == POLICY_WARN) && outdated_tls_client(client))
+	{
+		sendnotice(client, "%s", outdated_tls_client_build_string(iConf.outdated_tls_policy_oper_message, client));
+		sendto_snomask_global
+		    (SNO_OPER, "OPER %s [%s] used a connection with an outdated SSL/TLS protocol or cipher to /OPER.",
+		    client->name, name);
+	}
+}
diff --git a/src/modules/opermotd.c b/src/modules/opermotd.c
new file mode 100644
index 0000000..72901e9
--- /dev/null
+++ b/src/modules/opermotd.c
@@ -0,0 +1,92 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/opermotd.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_opermotd);
+
+#define MSG_OPERMOTD 	"OPERMOTD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"opermotd",
+	"5.0",
+	"command /opermotd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_OPERMOTD, cmd_opermotd, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * Modified from comstud by codemastr
+ */
+CMD_FUNC(cmd_opermotd)
+{
+	MOTDLine *motdline;
+	ConfigItem_tld *tld;
+
+	if (!ValidatePermissionsForPath("server:opermotd",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	tld = find_tld(client);
+
+	motdline = NULL;
+	if (tld)
+		motdline = tld->opermotd.lines;
+	if (!motdline)
+		motdline = opermotd.lines;
+
+	if (!motdline)
+	{
+		sendnumeric(client, ERR_NOOPERMOTD);
+		return;
+	}
+	sendnumeric(client, RPL_MOTDSTART, me.name);
+	sendnumeric(client, RPL_MOTD, "IRC Operator Message of the Day");
+
+	while (motdline)
+	{
+		sendnumeric(client, RPL_MOTD,
+			   motdline->line);
+		motdline = motdline->next;
+	}
+	sendnumeric(client, RPL_ENDOFMOTD);
+}
diff --git a/src/modules/part.c b/src/modules/part.c
new file mode 100644
index 0000000..efc8659
--- /dev/null
+++ b/src/modules/part.c
@@ -0,0 +1,220 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/part.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_part);
+
+#define MSG_PART 	"PART"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"part",
+	"5.0",
+	"command /part", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_PART, cmd_part, 2, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_part
+**	parv[1] = channel
+**	parv[2] = comment (added by Lefler)
+*/
+CMD_FUNC(cmd_part)
+{
+	Channel *channel;
+	Membership *lp;
+	char *p = NULL, *name;
+	char *commentx = (parc > 2 && parv[2]) ? parv[2] : NULL;
+	char *comment;
+	int n;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("PART");
+	
+	if (parc < 2 || parv[1][0] == '\0')
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "PART");
+		return;
+	}
+
+	if (MyUser(client))
+	{
+		if (IsShunned(client))
+			commentx = NULL;
+		if (STATIC_PART)
+		{
+			if (!strcasecmp(STATIC_PART, "yes") || !strcmp(STATIC_PART, "1"))
+				commentx = NULL;
+			else if (!strcasecmp(STATIC_PART, "no") || !strcmp(STATIC_PART, "0"))
+				; /* keep original reason */
+			else
+				commentx = STATIC_PART;
+		}
+		if (commentx)
+		{
+			if (match_spamfilter(client, commentx, SPAMF_PART, parv[1], 0, NULL))
+				commentx = NULL;
+			if (IsDead(client))
+				return;
+		}
+	}
+
+	for (; (name = strtoken(&p, parv[1], ",")); parv[1] = NULL)
+	{
+		MessageTag *mtags = NULL;
+
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, name, maxtargets, "PART");
+			break;
+		}
+
+		channel = get_channel(client, name, 0);
+		if (!channel)
+		{
+			sendnumeric(client, ERR_NOSUCHCHANNEL, name);
+			continue;
+		}
+
+		/* 'commentx' is the general part msg, but it can be changed
+		 * per-channel (eg some chans block badwords, strip colors, etc)
+		 * so we copy it to 'comment' and use that in this for loop :)
+		 */
+		comment = commentx;
+
+		if (!(lp = find_membership_link(client->user->channel, channel)))
+		{
+			/* Normal to get get when our client did a kick
+			   ** for a remote client (who sends back a PART),
+			   ** so check for remote client or not --Run
+			 */
+			if (MyUser(client))
+				sendnumeric(client, ERR_NOTONCHANNEL, name);
+			continue;
+		}
+
+		if (!ValidatePermissionsForPath("channel:override:banpartmsg",client,NULL,channel,NULL) && !is_chan_op(client, channel)) {
+			/* Banned? No comment allowed ;) */
+			if (comment && is_banned(client, channel, BANCHK_MSG, &comment, NULL))
+				comment = NULL;
+			if (comment && is_banned(client, channel, BANCHK_LEAVE_MSG, &comment, NULL))
+				comment = NULL;
+			/* Same for +m */
+			if ((channel->mode.mode & MODE_MODERATED) && comment &&
+				 !has_voice(client, channel) && !is_half_op(client, channel))
+			{
+				comment = NULL;
+			}
+		}
+
+		if (MyConnect(client))
+		{
+			Hook *tmphook;
+			for (tmphook = Hooks[HOOKTYPE_PRE_LOCAL_PART]; tmphook; tmphook = tmphook->next) {
+				comment = (*(tmphook->func.pcharfunc))(client, channel, comment);
+				if (!comment)
+					break;
+			}
+		}
+
+		/* Create a new message, this one is actually used by 8 calls (though at most 4 max) */
+		new_message_special(client, recv_mtags, &mtags, ":%s PART %s", client->name, channel->chname);
+
+		/* Send to other servers... */
+		sendto_server(client, 0, 0, mtags, ":%s PART %s :%s",
+			client->id, channel->chname, comment ? comment : "");
+
+		if (invisible_user_in_channel(client, channel))
+		{
+			/* Show PART only to chanops and self */
+			if (!comment)
+			{
+				sendto_channel(channel, client, client,
+					       PREFIX_HALFOP|PREFIX_OP|PREFIX_OWNER|PREFIX_ADMIN, 0,
+					       SEND_LOCAL, mtags,
+					       ":%s PART %s",
+					       client->name, channel->chname);
+				if (MyUser(client))
+				{
+					sendto_one(client, mtags, ":%s!%s@%s PART %s",
+						client->name, client->user->username, GetHost(client), channel->chname);
+				}
+			}
+			else
+			{
+				sendto_channel(channel, client, client,
+					       PREFIX_HALFOP|PREFIX_OP|PREFIX_OWNER|PREFIX_ADMIN, 0,
+					       SEND_LOCAL, mtags,
+					       ":%s PART %s %s",
+					       client->name, channel->chname, comment);
+				if (MyUser(client))
+				{
+					sendto_one(client, mtags,
+						":%s!%s@%s PART %s %s",
+						client->name, client->user->username, GetHost(client),
+						channel->chname, comment);
+				}
+			}
+		}
+		else
+		{
+			/* Show PART to all users in channel */
+			if (!comment)
+			{
+				sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+				               ":%s PART %s",
+				               client->name, channel->chname);
+			} else {
+				sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+				               ":%s PART %s :%s",
+				               client->name, channel->chname, comment);
+			}
+		}
+
+		if (MyUser(client))
+			RunHook4(HOOKTYPE_LOCAL_PART, client, channel, mtags, comment);
+		else
+			RunHook4(HOOKTYPE_REMOTE_PART, client, channel, mtags, comment);
+
+		free_message_tags(mtags);
+
+		remove_user_from_channel(client, channel);
+	}
+}
diff --git a/src/modules/pass.c b/src/modules/pass.c
new file mode 100644
index 0000000..b67fb6c
--- /dev/null
+++ b/src/modules/pass.c
@@ -0,0 +1,141 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/pass.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_pass);
+
+#define MSG_PASS 	"PASS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"pass",
+	"5.0",
+	"command /pass", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+int _check_banned(Client *client, int exitflags);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	EfunctionAdd(modinfo->handle, EFUNC_CHECK_BANNED, _check_banned);
+	
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_PASS, cmd_pass, 1, CMD_UNREGISTERED|CMD_USER|CMD_SERVER);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Handles zlines/gzlines/throttling/unknown connections
+ * @param client     Client to be checked
+ * @param exitflags  Special flag (NO_EXIT_CLIENT) -- only used in very early stages of the connection
+ * @returns 1 if user is banned and is or should be killed, 0 if not.
+ */
+int _check_banned(Client *client, int exitflags)
+{
+	TKL *tk;
+
+	if ((tk = find_tkline_match_zap(client)))
+	{
+		banned_client(client, "Z-Lined", tk->ptr.serverban->reason, (tk->type & TKL_GLOBAL)?1:0, exitflags);
+		return 1;
+	}
+	else
+	{
+		int val;
+		char zlinebuf[512];
+
+		if (!(val = throttle_can_connect(client)))
+		{
+			if (exitflags & NO_EXIT_CLIENT)
+			{
+				ircsnprintf(zlinebuf, sizeof(zlinebuf),
+					"ERROR :Closing Link: [%s] (Throttled: Reconnecting too fast) - "
+					"Email %s for more information.\r\n",
+					client->ip, KLINE_ADDRESS);
+				(void)send(client->local->fd, zlinebuf, strlen(zlinebuf), 0);
+				return 1;
+			} else {
+				ircsnprintf(zlinebuf, sizeof(zlinebuf),
+				            "Throttled: Reconnecting too fast - "
+				            "Email %s for more information.",
+				            KLINE_ADDRESS);
+				exit_client(client, NULL, zlinebuf);
+				return 1;
+			}
+		}
+		else if (val == 1)
+			add_throttling_bucket(client);
+	}
+
+	return 0;
+}
+
+/***************************************************************************
+ * cmd_pass() - Added Sat, 4 March 1989
+ ***************************************************************************/
+/*
+** cmd_pass
+**	parv[1] = password
+*/
+CMD_FUNC(cmd_pass)
+{
+	char *password = parc > 1 ? parv[1] : NULL;
+
+	if (!MyConnect(client) || (!IsUnknown(client) && !IsHandshake(client)))
+	{
+		sendnumeric(client, ERR_ALREADYREGISTRED);
+		return;
+	}
+
+	if (BadPtr(password))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "PASS");
+		return;
+	}
+
+	/* Store the password */
+	safe_strldup(client->local->passwd, password, PASSWDLEN+1);
+
+	/* note: the original non-truncated password is supplied as 2nd parameter. */
+	RunHookReturn2(HOOKTYPE_LOCAL_PASS, client, password, !=0);
+}
diff --git a/src/modules/pingpong.c b/src/modules/pingpong.c
new file mode 100644
index 0000000..1e5a02b
--- /dev/null
+++ b/src/modules/pingpong.c
@@ -0,0 +1,200 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/pingpong.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_ping);
+CMD_FUNC(cmd_pong);
+CMD_FUNC(cmd_nospoof);
+
+/* Place includes here */
+#define MSG_PING        "PING"  /* PING */
+#define MSG_PONG        "PONG"  /* PONG */
+
+ModuleHeader MOD_HEADER
+  = {
+	"pingpong",	/* Name of module */
+	"5.0", /* Version */
+	"ping, pong and nospoof", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_PING, cmd_ping, MAXPARA, CMD_USER|CMD_SERVER|CMD_SHUN);
+	CommandAdd(modinfo->handle, MSG_PONG, cmd_pong, MAXPARA, CMD_UNREGISTERED|CMD_USER|CMD_SERVER|CMD_SHUN|CMD_VIRUS);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_ping
+**	parv[1] = origin
+**	parv[2] = destination
+*/
+CMD_FUNC(cmd_ping)
+{
+	Client *target;
+	char *origin, *destination;
+
+	if (parc < 2 || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NOORIGIN);
+		return;
+	}
+
+	origin = parv[1];
+	destination = parv[2];	/* Will get NULL or pointer (parc >= 2!!) */
+
+	if (!MyUser(client))
+		origin = client->name;
+
+	if (!BadPtr(destination) && mycmp(destination, me.name) != 0 && mycmp(destination, me.id) != 0)
+	{
+		if (MyUser(client))
+			origin = client->name; /* Make sure origin is not spoofed */
+		if ((target = find_server_quick(destination)) && (target != &me))
+			sendto_one(target, NULL, ":%s PING %s :%s", client->name, origin, destination);
+		else
+		{
+			sendnumeric(client, ERR_NOSUCHSERVER, destination);
+			return;
+		}
+	}
+	else
+		sendto_one(client, NULL, ":%s PONG %s :%s", me.name,
+		    (destination) ? destination : me.name, origin);
+}
+
+/*
+** cmd_nospoof - allows clients to respond to no spoofing patch
+**	parv[1] = code
+*/
+CMD_FUNC(cmd_nospoof)
+{
+	unsigned long result;
+
+	if (IsNotSpoof(client))
+		return;
+	if (IsRegistered(client))
+		return;
+	if (!*client->name)
+		return;
+	if (BadPtr(parv[1]))
+	{
+		sendnotice(client, "ERROR: Invalid PING response. Your client must respond back with PONG :<cookie>");
+		return;
+	}
+
+	result = strtoul(parv[1], NULL, 16);
+
+	if (result != client->local->nospoof)
+	{
+		/* Apparently we also accept PONG <irrelevant> <cookie>... */
+		if (BadPtr(parv[2]))
+		{
+			sendnotice(client, "ERROR: Invalid PING response. Your client must respond back with PONG :<cookie>");
+			return;
+		}
+		result = strtoul(parv[2], NULL, 16);
+		if (result != client->local->nospoof)
+		{
+			sendnotice(client, "ERROR: Invalid PING response. Your client must respond back with PONG :<cookie>");
+			return;
+		}
+	}
+
+	client->local->nospoof = 0;
+
+	if (USE_BAN_VERSION && MyConnect(client))
+		sendto_one(client, NULL, ":IRC!IRC@%s PRIVMSG %s :\1VERSION\1",
+			   me.name, client->name);
+
+	if (is_handshake_finished(client))
+		register_user(client, client->name, client->user->username, NULL, NULL, NULL);
+}
+
+/*
+** cmd_pong
+**	parv[1] = origin
+**	parv[2] = destination
+*/
+CMD_FUNC(cmd_pong)
+{
+	Client *target;
+	char *origin, *destination;
+
+	if (!IsRegistered(client))
+	{
+		cmd_nospoof(client, recv_mtags, parc, parv);
+		return;
+	}
+
+	if (parc < 2 || *parv[1] == '\0')
+	{
+		sendnumeric(client, ERR_NOORIGIN);
+		return;
+	}
+
+	origin = parv[1];
+	destination = parv[2];
+	ClearPingSent(client);
+	ClearPingWarning(client);
+
+	/* Remote pongs for clients? uhh... */
+	if (MyUser(client) || !IsRegistered(client))
+		return;
+
+	/* PONG from a server - either for us, or needs relaying.. */
+	if (!BadPtr(destination) && mycmp(destination, me.name) != 0)
+	{
+		if ((target = find_client(destination, NULL)) ||
+		    (target = find_server_quick(destination)))
+		{
+			if (IsUser(client) && !IsServer(target))
+			{
+				sendnumeric(client, ERR_NOSUCHSERVER, destination);
+				return;
+			} else
+			{
+				sendto_one(target, NULL, ":%s PONG %s %s", client->name, origin, destination);
+			}
+		}
+		else
+		{
+			sendnumeric(client, ERR_NOSUCHSERVER, destination);
+			return;
+		}
+	}
+}
diff --git a/src/modules/plaintext-policy.c b/src/modules/plaintext-policy.c
new file mode 100644
index 0000000..6df0cbe
--- /dev/null
+++ b/src/modules/plaintext-policy.c
@@ -0,0 +1,75 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/plaintext-policy.c
+ *   (C) 2017 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"plaintext-policy",
+	"5.0",
+	"Plaintext Policy CAP",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	return MOD_SUCCESS;
+}
+
+void init_plaintext_policy(ModuleInfo *modinfo);
+
+MOD_LOAD()
+{
+	/* init_plaintext_policy is delayed to MOD_LOAD due to configuration dependency */
+	init_plaintext_policy(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+char *plaintext_policy_capability_parameter(Client *client)
+{
+	static char buf[128];
+	
+	snprintf(buf, sizeof(buf), "user=%s,oper=%s,server=%s",
+             policy_valtostr(iConf.plaintext_policy_user),
+             policy_valtostr(iConf.plaintext_policy_oper),
+             policy_valtostr(iConf.plaintext_policy_server));
+	return buf;
+}
+
+void init_plaintext_policy(ModuleInfo *modinfo)
+{
+	ClientCapabilityInfo cap;
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "unrealircd.org/plaintext-policy";
+	cap.flags = CLICAP_FLAGS_ADVERTISE_ONLY;
+	cap.parameter = plaintext_policy_capability_parameter;
+	ClientCapabilityAdd(modinfo->handle, &cap, NULL);
+}
diff --git a/src/modules/protoctl.c b/src/modules/protoctl.c
new file mode 100644
index 0000000..0b765b5
--- /dev/null
+++ b/src/modules/protoctl.c
@@ -0,0 +1,420 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/protoctl.c
+ *   (C) 2004- The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_protoctl);
+
+#define MSG_PROTOCTL 	"PROTOCTL"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"protoctl",
+	"5.0",
+	"command /protoctl", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_PROTOCTL, cmd_protoctl, MAXPARA, CMD_UNREGISTERED|CMD_SERVER|CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+#define MAX_SERVER_TIME_OFFSET 60
+
+/* The PROTOCTL command is used for negotiating capabilities with
+ * directly connected servers.
+ * See https://www.unrealircd.org/docs/Server_protocol:PROTOCTL_command
+ * for all technical documentation, especially if you are a server
+ * or services coder.
+ */
+CMD_FUNC(cmd_protoctl)
+{
+	int  i;
+	int first_protoctl = IsProtoctlReceived(client) ? 0 : 1; /**< First PROTOCTL we receive? Special ;) */
+	char proto[512];
+	char *name, *value, *p;
+
+	if (!MyConnect(client))
+		return; /* Remote PROTOCTL's are not supported */
+
+	SetProtoctlReceived(client);
+
+	for (i = 1; i < parc; i++)
+	{
+		strlcpy(proto, parv[i], sizeof proto);
+		p = strchr(proto, '=');
+		if (p)
+		{
+			name = proto;
+			*p++ = '\0';
+			value = p;
+		} else {
+			name = proto;
+			value = NULL;
+		}
+
+		if (!strcmp(name, "NAMESX"))
+		{
+			SetCapability(client, "multi-prefix");
+		}
+		else if (!strcmp(name, "UHNAMES") && UHNAMES_ENABLED)
+		{
+			SetCapability(client, "userhost-in-names");
+		}
+		else if (!strcmp(name, "VL"))
+		{
+			SetVL(client);
+		}
+		else if (!strcmp(name, "VHP"))
+		{
+			SetVHP(client);
+		}
+		else if (!strcmp(name, "CLK"))
+		{
+			SetCLK(client);
+		}
+		else if (!strcmp(name, "SJSBY") && iConf.ban_setter_sync)
+		{
+			SetSJSBY(client);
+		}
+		else if (!strcmp(name, "MTAGS"))
+		{
+			SetMTAGS(client);
+		}
+		else if (!strcmp(name, "NICKCHARS") && value)
+		{
+			if (!IsServer(client) && !IsEAuth(client) && !IsHandshake(client))
+				continue;
+			/* Ok, server is either authenticated, or is an outgoing connect... */
+			/* Some combinations are fatal because they would lead to mass-kills:
+			 * - use of 'utf8' on our server but not on theirs
+			 */
+			if (strstr(charsys_get_current_languages(), "utf8") && !strstr(value, "utf8"))
+			{
+				char buf[512];
+				snprintf(buf, sizeof(buf), "Server %s has utf8 in set::allowed-nickchars but %s does not. Link rejected.",
+					me.name, *client->name ? client->name : "other side");
+				sendto_realops("\002ERROR\001 %s", buf);
+				exit_client(client, NULL, buf);
+				return;
+			}
+			/* We compare the character sets to see if we should warn opers about any mismatch... */
+			if (strcmp(value, charsys_get_current_languages()))
+			{
+				sendto_realops("\002WARNING!!!!\002 Link %s does not have the same set::allowed-nickchars settings (or is "
+							"a different UnrealIRCd version), this MAY cause display issues. Our charset: '%s', theirs: '%s'",
+					get_client_name(client, FALSE), charsys_get_current_languages(), value);
+			}
+			if (client->serv)
+				safe_strdup(client->serv->features.nickchars, value);
+
+			/* If this is a runtime change (so post-handshake): */
+			if (IsServer(client))
+				broadcast_sinfo(client, NULL, client);
+		}
+		else if (!strcmp(name, "CHANNELCHARS") && value)
+		{
+			int their_value;
+
+			if (!IsServer(client) && !IsEAuth(client) && !IsHandshake(client))
+				continue;
+
+			their_value = allowed_channelchars_strtoval(value);
+			if (their_value != iConf.allowed_channelchars)
+			{
+				char linkerr[256];
+				ircsnprintf(linkerr, sizeof(linkerr),
+					"Link rejected. Server %s has set::allowed-channelchars '%s' "
+					"while %s has a value of '%s'. "
+					"Please choose the same value on all servers.",
+					client->name, value,
+					me.name, allowed_channelchars_valtostr(iConf.allowed_channelchars));
+				sendto_realops("ERROR: %s", linkerr);
+				exit_client(client, NULL, linkerr);
+				return;
+			}
+		}
+		else if (!strcmp(name, "SID") && value)
+		{
+			Client *aclient;
+			char *sid = value;
+
+			if (!IsServer(client) && !IsEAuth(client) && !IsHandshake(client))
+			{
+				exit_client(client, NULL, "Got PROTOCTL SID before EAUTH, that's the wrong order!");
+				return;
+			}
+
+			if (*client->id && (strlen(client->id)==3))
+			{
+				exit_client(client, NULL, "Got PROTOCTL SID twice");
+				return;
+			}
+
+			if (!valid_sid(value))
+			{
+				exit_client(client, NULL, "Invalid SID. The first character must be a digit and the other two characters must be A-Z0-9. Eg: 0AA.");
+				return;
+			}
+
+			if (IsServer(client))
+			{
+				exit_client(client, NULL, "Got PROTOCTL SID after SERVER, that's the wrong order!");
+				return;
+			}
+
+			if ((aclient = hash_find_id(sid, NULL)) != NULL)
+			{
+				sendto_one(client, NULL, "ERROR :SID %s already exists from %s", aclient->id, aclient->name);
+				sendto_snomask(SNO_SNOTICE, "Link %s rejected - SID %s already exists from %s",
+						get_client_name(client, FALSE), aclient->id, aclient->name);
+				exit_client(client, NULL, "SID collision");
+				return;
+			}
+
+			if (*client->id)
+				del_from_id_hash_table(client->id, client); /* delete old UID entry (created on connect) */
+			strlcpy(client->id, sid, IDLEN);
+			add_to_id_hash_table(client->id, client); /* add SID */
+		}
+		else if (!strcmp(name, "EAUTH") && value)
+		{
+			/* Early authorization: EAUTH=servername,protocol,flags,software
+			 * (Only servername is mandatory, rest is optional)
+			 */
+			int ret;
+			char *p;
+			char *servername = NULL, *protocol = NULL, *flags = NULL, *software = NULL;
+			char buf[512];
+			ConfigItem_link *aconf = NULL;
+
+			if (IsEAuth(client))
+			{
+				exit_client(client, NULL, "PROTOCTL EAUTH received twice");
+				return;
+			}
+
+			strlcpy(buf, value, sizeof(buf));
+			p = strchr(buf, ' ');
+			if (p)
+			{
+				*p = '\0';
+				p = NULL;
+			}
+			
+			servername = strtoken(&p, buf, ",");
+			if (!servername || (strlen(servername) > HOSTLEN) || !strchr(servername, '.'))
+			{
+				sendto_one(client, NULL, "ERROR :Bogus server name in EAUTH (%s)", servername ? servername : "");
+				sendto_snomask
+				    (SNO_JUNK,
+				    "WARNING: Bogus server name (%s) from %s in EAUTH (maybe just a fishy client)",
+				    servername ? servername : "", get_client_name(client, TRUE));
+				exit_client(client, NULL, "Bogus server name");
+				return;
+			}
+			
+			
+			protocol = strtoken(&p, NULL, ",");
+			if (protocol)
+			{
+				flags = strtoken(&p, NULL, ",");
+				if (flags)
+				{
+					software = strtoken(&p, NULL, ",");
+				}
+			}
+			
+			if (!verify_link(client, servername, &aconf))
+				return;
+
+			/* note: software, protocol and flags may be NULL */
+			if (!check_deny_version(client, software, protocol ? atoi(protocol) : 0, flags))
+				return;
+
+			SetEAuth(client);
+			make_server(client); /* allocate and set client->serv */
+			/* Set client->name but don't add to hash list. The real work on
+			 * that is done in cmd_server. We just set it here for display
+			 * purposes of error messages (such as reject due to clock).
+			 */
+			strlcpy(client->name, servername, sizeof(client->name));
+			if (protocol)
+				client->serv->features.protocol = atoi(protocol);
+			if (software)
+				safe_strdup(client->serv->features.software, software);
+			if (!IsHandshake(client) && aconf) /* Send PASS early... */
+				sendto_one(client, NULL, "PASS :%s", (aconf->auth->type == AUTHTYPE_PLAINTEXT) ? aconf->auth->data : "*");
+		}
+		else if (!strcmp(name, "SERVERS") && value)
+		{
+			Client *aclient, *srv;
+			char *sid = NULL;
+			
+			if (!IsEAuth(client))
+				continue;
+				
+			if (client->serv->features.protocol < 2351)
+				continue; /* old SERVERS= version */
+			
+			/* Other side lets us know which servers are behind it.
+			 * SERVERS=<sid-of-server-1>[,<sid-of-server-2[,..etc..]]
+			 * Eg: SERVER=001,002,0AB,004,005
+			 */
+
+			add_pending_net(client, value);
+
+			aclient = find_non_pending_net_duplicates(client);
+			if (aclient)
+			{
+				sendto_one(client, NULL, "ERROR :Server with SID %s (%s) already exists",
+					aclient->id, aclient->name);
+				sendto_realops("Link %s cancelled, server with SID %s (%s) already exists",
+					get_client_name(aclient, TRUE), aclient->id, aclient->name);
+				exit_client(client, NULL, "Server Exists (or non-unique me::sid)");
+				return;
+			}
+			
+			aclient = find_pending_net_duplicates(client, &srv, &sid);
+			if (aclient)
+			{
+				sendto_one(client, NULL, "ERROR :Server with SID %s is being introduced by another server as well. "
+				                 "Just wait a moment for it to synchronize...", sid);
+				sendto_realops("Link %s cancelled, server would introduce server with SID %s, which "
+				               "server %s is also about to introduce. Just wait a moment for it to synchronize...",
+				               get_client_name(aclient, TRUE), sid, get_client_name(srv, TRUE));
+				exit_client(client, NULL, "Server Exists (just wait a moment)");
+				return;
+			}
+
+			/* Send our PROTOCTL SERVERS= back if this was NOT a response */
+			if (*value != '*')
+				send_protoctl_servers(client, 1);
+		}
+		else if (!strcmp(name, "TS") && value && (IsServer(client) || IsEAuth(client)))
+		{
+			long t = atol(value);
+			char msg[512], linkerr[512];
+			
+			if (t < 10000)
+				continue; /* ignore */
+			
+			*msg = *linkerr = '\0';
+			
+			if ((TStime() - t) > MAX_SERVER_TIME_OFFSET)
+			{
+				snprintf(linkerr, sizeof(linkerr),
+				         "Your clock is %lld seconds behind my clock. "
+				         "Please verify both your clock and mine, "
+				         "fix it and try linking again.",
+				         (long long)(TStime() - t));
+				snprintf(msg, sizeof(msg),
+				         "Rejecting link %s: our clock is %lld seconds ahead. "
+				         "Correct time is very important in IRC. Please "
+				         "verify the clock on both %s (them) and %s (us), "
+				         "fix it and then try linking again",
+				         get_client_name(client, TRUE),
+				         (long long)(TStime() - t),
+				         client->name, me.name);
+			} else
+			if ((t - TStime()) > MAX_SERVER_TIME_OFFSET)
+			{
+				snprintf(linkerr, sizeof(linkerr),
+				         "Your clock is %lld seconds ahead of my clock. "
+				         "Please verify both your clock and mine, fix it, "
+				         "and try linking again.",
+				         (long long)(t - TStime()));
+				snprintf(msg, sizeof(msg),
+				         "Rejecting link %s: our clock is %lld seconds behind. "
+				         "Correct time is very important in IRC. Please "
+				         "verify the clock on both %s (them) and %s (us), "
+				         "fix it and then try linking again",
+					get_client_name(client, TRUE),
+					(long long)(t - TStime()),
+					client->name, me.name);
+			}
+			
+			if (*msg)
+			{
+				sendto_realops("%s", msg);
+				ircd_log(LOG_ERROR, "%s", msg);
+				exit_client(client, NULL, linkerr);
+				return;
+			}
+		}
+		else if (!strcmp(name, "MLOCK"))
+		{
+			client->local->proto |= PROTO_MLOCK;
+		}
+		else if (!strcmp(name, "CHANMODES") && value && client->serv)
+		{
+			parse_chanmodes_protoctl(client, value);
+			/* If this is a runtime change (so post-handshake): */
+			if (IsServer(client))
+				broadcast_sinfo(client, NULL, client);
+		}
+		else if (!strcmp(name, "USERMODES") && value && client->serv)
+		{
+			safe_strdup(client->serv->features.usermodes, value);
+			/* If this is a runtime change (so post-handshake): */
+			if (IsServer(client))
+				broadcast_sinfo(client, NULL, client);
+		}
+		else if (!strcmp(name, "BOOTED") && value && client->serv)
+		{
+			client->serv->boottime = atol(value);
+		}
+		else if (!strcmp(name, "EXTSWHOIS"))
+		{
+			client->local->proto |= PROTO_EXTSWHOIS;
+		}
+		/* You can add protocol extensions here.
+		 * Use 'name' and 'value' (the latter may be NULL).
+		 *
+		 * DO NOT error or warn on unknown proto; we just don't
+		 * support it.
+		 */
+	}
+
+	if (first_protoctl && IsHandshake(client) && client->serv && !IsServerSent(client)) /* first & outgoing connection to server */
+	{
+		/* SERVER message moved from completed_connection() to here due to EAUTH/SERVERS PROTOCTL stuff,
+		 * which needed to be delayed until after both sides have received SERVERS=xx (..or not.. in case
+		 * of older servers).
+		 */
+		send_server_message(client);
+	}
+}
diff --git a/src/modules/quit.c b/src/modules/quit.c
new file mode 100644
index 0000000..7af7a52
--- /dev/null
+++ b/src/modules/quit.c
@@ -0,0 +1,163 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/quit.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_quit);
+
+#define MSG_QUIT        "QUIT"  /* QUIT */
+
+ModuleHeader MOD_HEADER
+  = {
+	"quit",	/* Name of module */
+	"5.0", /* Version */
+	"command /quit", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_QUIT, cmd_quit, 1, CMD_UNREGISTERED|CMD_USER|CMD_VIRUS);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_quit
+**	parv[1] = comment
+*/
+CMD_FUNC(cmd_quit)
+{
+	char *comment = (parc > 1 && parv[1]) ? parv[1] : client->name;
+	static char commentbuf[MAXQUITLEN + 1];
+
+	if (parv[1] && (strlen(comment) > iConf.quit_length))
+		comment[iConf.quit_length] = '\0';
+
+	if (MyUser(client))
+	{
+		int n;
+		Hook *tmphook;
+
+		if (STATIC_QUIT)
+		{
+			exit_client(client, recv_mtags, STATIC_QUIT);
+			return;
+		}
+
+		if (IsVirus(client))
+		{
+			exit_client(client, recv_mtags, "Client exited");
+			return;
+		}
+
+		if (match_spamfilter(client, comment, SPAMF_QUIT, NULL, 0, NULL))
+		{
+			comment = client->name;
+			if (IsDead(client))
+				return;
+		}
+		
+		if (!ValidatePermissionsForPath("immune:anti-spam-quit-message-time",client,NULL,NULL,NULL) && ANTI_SPAM_QUIT_MSG_TIME)
+		{
+			if (client->local->firsttime+ANTI_SPAM_QUIT_MSG_TIME > TStime())
+				comment = client->name;
+		}
+
+		if (iConf.part_instead_of_quit_on_comment_change && MyUser(client))
+		{
+			Membership *lp, *lp_next;
+			char *newcomment;
+			Channel *channel;
+
+			for (lp = client->user->channel; lp; lp = lp_next)
+			{
+				channel = lp->channel;
+				newcomment = comment;
+				lp_next = lp->next;
+
+				for (tmphook = Hooks[HOOKTYPE_PRE_LOCAL_QUIT_CHAN]; tmphook; tmphook = tmphook->next)
+				{
+					newcomment = (*(tmphook->func.pcharfunc))(client, channel, comment);
+					if (!newcomment)
+						break;
+				}
+
+				if (newcomment && is_banned(client, channel, BANCHK_LEAVE_MSG, &newcomment, NULL))
+					newcomment = NULL;
+
+				/* Comment changed? Then PART the user before we do the QUIT. */
+				if (comment != newcomment)
+				{
+					char *parx[4];
+					int ret;
+
+					parx[0] = NULL;
+					parx[1] = channel->chname;
+					parx[2] = newcomment;
+					parx[3] = NULL;
+
+					do_cmd(client, recv_mtags, "PART", newcomment ? 3 : 2, parx);
+					/* This would be unusual, but possible (somewhere in the future perhaps): */
+					if (IsDead(client))
+						return;
+				}
+			}
+		}
+
+		for (tmphook = Hooks[HOOKTYPE_PRE_LOCAL_QUIT]; tmphook; tmphook = tmphook->next)
+		{
+			comment = (*(tmphook->func.pcharfunc))(client, comment);
+			if (!comment)
+			{			
+				comment = client->name;
+				break;
+			}
+		}
+
+		if (PREFIX_QUIT)
+			snprintf(commentbuf, sizeof(commentbuf), "%s: %s", PREFIX_QUIT, comment);
+		else
+			strlcpy(commentbuf, comment, sizeof(commentbuf));
+
+		exit_client(client, recv_mtags, commentbuf);
+	}
+	else
+	{
+		/* Remote quits and non-person quits always use their original comment.
+		 * Also pass recv_mtags so to keep the msgid and such.
+		 */
+		exit_client(client, recv_mtags, comment);
+	}
+}
diff --git a/src/modules/reputation.c b/src/modules/reputation.c
new file mode 100644
index 0000000..27bbda8
--- /dev/null
+++ b/src/modules/reputation.c
@@ -0,0 +1,885 @@
+/*
+ * reputation - Provides a scoring system for "known users".
+ * (C) Copyright 2015-2019 Bram Matthys (Syzop) and the UnrealIRCd team.
+ * License: GPLv2
+ *
+ * How this works is simple:
+ * Every 5 minutes the IP address of all the connected users receive
+ * a point. Registered users receive 2 points every 5 minutes.
+ * The total reputation score is then later used, by other modules, for
+ * example to make decisions such as to reject or allow a user if the
+ * server is under attack.
+ * The reputation scores are saved in a database. By default this file
+ * is data/reputation.db (often ~/unrealircd/data/reputation.db).
+ *
+ * See also https://www.unrealircd.org/docs/Connthrottle
+ */
+
+#include "unrealircd.h"
+
+#define REPUTATION_VERSION "1.2"
+
+#undef TEST
+
+#undef BENCHMARK
+/* Benchmark results (2GHz Xeon Skylake, compiled with -O2, Linux):
+ * 10k random IP's with various expire times:
+ * - load db:  23 ms
+ * - expiry:    1 ms
+ * - save db:   7 ms
+ * 100k random IP's with various expire times:
+ * - load db: 103 ms
+ * - expiry:   10 ms
+ * - save db:  32 ms
+ * So, even for 100,000 unique IP's, the initial load of the database
+ * would delay the UnrealIRCd boot process only for 0.1 second.
+ * The writing of the db, which happens every 5 minutes, for such
+ * amount of IP's takes 32ms (0.03 second).
+ * Of course, exact figures will depend on the storage and cache.
+ * That being said, the file for 100k random IP's is slightly under
+ * 3MB, so not big, which likely means the timing will be similar
+ * for a broad number of (storage) systems.
+ */
+ 
+#ifndef TEST
+ #define BUMP_SCORE_EVERY	300
+ #define DELETE_OLD_EVERY	605
+ #define SAVE_DB_EVERY		902
+#else
+ #define BUMP_SCORE_EVERY 	3
+ #define DELETE_OLD_EVERY	3
+ #define SAVE_DB_EVERY		3
+#endif
+
+#ifndef CALLBACKTYPE_REPUTATION_STARTTIME
+ #define CALLBACKTYPE_REPUTATION_STARTTIME 5
+#endif
+
+ModuleHeader MOD_HEADER
+  = {
+	"reputation",
+	REPUTATION_VERSION,
+	"Known IP's scoring system",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Defines */
+
+#define MAXEXPIRES 10
+
+#define REPUTATION_SCORE_CAP 10000
+
+#define UPDATE_SCORE_MARGIN 1
+
+#define REPUTATION_HASH_TABLE_SIZE 2048
+
+#define Reputation(client)	moddata_client(client, reputation_md).l
+
+/* Definitions (structs, etc.) */
+
+struct cfgstruct {
+	int expire_score[MAXEXPIRES];
+	long expire_time[MAXEXPIRES];
+	char *database;
+};
+
+typedef struct ReputationEntry ReputationEntry;
+
+struct ReputationEntry {
+	ReputationEntry *prev, *next;
+	unsigned short score; /**< score for the user */
+	long last_seen; /**< user last seen (unix timestamp) */
+	int marker; /**< internal marker, not written to db */
+	char ip[1]; /*< ip address */
+};
+
+/* Global variables */
+
+static struct cfgstruct cfg; /**< Current configuration */
+long reputation_starttime = 0;
+long reputation_writtentime = 0;
+
+static ReputationEntry *ReputationHashTable[REPUTATION_HASH_TABLE_SIZE];
+static char siphashkey_reputation[SIPHASH_KEY_LENGTH];
+
+static ModuleInfo ModInf;
+
+ModDataInfo *reputation_md; /* Module Data structure which we acquire */
+
+/* Forward declarations */
+void reputation_md_free(ModData *m);
+char *reputation_md_serialize(ModData *m);
+void reputation_md_unserialize(char *str, ModData *m);
+void config_setdefaults(void);
+CMD_FUNC(reputation_cmd);
+CMD_FUNC(reputationunperm);
+int reputation_whois(Client *client, Client *target);
+int reputation_set_on_connect(Client *client);
+int reputation_pre_lconnect(Client *client);
+int reputation_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int reputation_config_run(ConfigFile *cf, ConfigEntry *ce, int type);
+int reputation_config_posttest(int *errs);
+static uint64_t hash_reputation_entry(char *ip);
+void add_reputation_entry(ReputationEntry *e);
+EVENT(delete_old_records);
+EVENT(add_scores);
+EVENT(save_db_evt);
+void load_db(void);
+void save_db(void);
+int reputation_starttime_callback(void);
+
+MOD_TEST()
+{
+	memcpy(&ModInf, modinfo, modinfo->size);
+	memset(&cfg, 0, sizeof(cfg));
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, reputation_config_test);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, reputation_config_posttest);
+	CallbackAddEx(modinfo->handle, CALLBACKTYPE_REPUTATION_STARTTIME, reputation_starttime_callback);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1);
+	memset(&ReputationHashTable, 0, sizeof(ReputationHashTable));
+	siphash_generate_key(siphashkey_reputation);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "reputation";
+	mreq.free = reputation_md_free;
+	mreq.serialize = reputation_md_serialize;
+	mreq.unserialize = reputation_md_unserialize;
+	mreq.sync = 0; /* local! */
+	mreq.type = MODDATATYPE_CLIENT;
+	reputation_md = ModDataAdd(modinfo->handle, mreq);
+	if (!reputation_md)
+		abort();
+
+	config_setdefaults();
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, reputation_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_WHOIS, 0, reputation_whois);
+	HookAdd(modinfo->handle, HOOKTYPE_HANDSHAKE, 0, reputation_set_on_connect);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_LOCAL_CONNECT, 2000000000, reputation_pre_lconnect); /* (prio: last) */
+	HookAdd(modinfo->handle, HOOKTYPE_REMOTE_CONNECT, -1000000000, reputation_set_on_connect); /* (prio: near-first) */
+	CommandAdd(ModInf.handle, "REPUTATION", reputation_cmd, MAXPARA, CMD_USER|CMD_SERVER);
+	CommandAdd(ModInf.handle, "REPUTATIONUNPERM", reputationunperm, MAXPARA, CMD_USER|CMD_SERVER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	load_db();
+	if (reputation_starttime == 0)
+		reputation_starttime = TStime();
+	EventAdd(ModInf.handle, "delete_old_records", delete_old_records, NULL, DELETE_OLD_EVERY*1000, 0);
+	EventAdd(ModInf.handle, "add_scores", add_scores, NULL, BUMP_SCORE_EVERY*1000, 0);
+	EventAdd(ModInf.handle, "save_db", save_db_evt, NULL, SAVE_DB_EVERY*1000, 0);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	save_db();
+	return MOD_SUCCESS;
+}
+
+void config_setdefaults(void)
+{
+	/* data/reputation.db */
+	safe_strdup(cfg.database, "reputation.db");
+	convert_to_absolute_path(&cfg.database, PERMDATADIR);
+
+	/* EXPIRES the following entries if the IP does appear for some time: */
+	/* <=2 points after 1 hour */
+	cfg.expire_score[0] = 2;
+#ifndef TEST
+	cfg.expire_time[0]   = 3600;
+#else
+	cfg.expire_time[0]   = 36;
+#endif
+	/* <=6 points after 7 days */
+	cfg.expire_score[1] = 6;
+	cfg.expire_time[1]   = 86400*7;
+	/* ANY result that has not been seen for 30 days */
+	cfg.expire_score[2] = -1;
+	cfg.expire_time[2]   = 86400*30;
+}
+
+int reputation_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::reputation.. */
+	if (!ce || strcmp(ce->ce_varname, "reputation"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+		{
+			config_error("%s:%i: blank set::reputation::%s without value",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		} else
+		if (!strcmp(cep->ce_varname, "database"))
+		{
+			convert_to_absolute_path(&cep->ce_vardata, PERMDATADIR);
+		} else
+		{
+			config_error("%s:%i: unknown directive set::reputation::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+	
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int reputation_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::reputation.. */
+	if (!ce || strcmp(ce->ce_varname, "reputation"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "database"))
+		{
+			safe_strdup(cfg.database, cep->ce_vardata);
+		}
+	}
+	return 1;
+}
+
+int reputation_config_posttest(int *errs)
+{
+	int errors = 0;
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+/** Parse database header and set variables appropriately */
+int parse_db_header(char *buf)
+{
+	char *header=NULL, *version=NULL, *starttime=NULL, *writtentime=NULL;
+	char *p=NULL;
+
+	if (strncmp(buf, "REPDB", 5))
+		return 0;
+
+	header = strtoken(&p, buf, " ");
+	if (!header)
+		return 0;
+
+	version = strtoken(&p, NULL, " ");
+	if (!version || (atoi(version) != 1))
+		return 0;
+
+	starttime = strtoken(&p, NULL, " ");
+	if (!starttime)
+		return 0;
+
+	writtentime = strtoken(&p, NULL, " ");
+	if (!writtentime)
+		return 0;
+
+	reputation_starttime = atol(starttime);
+	reputation_writtentime = atol(writtentime);
+
+	return 1;
+}
+
+void load_db(void)
+{
+	FILE *fd;
+	char buf[512], *p;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	fd = fopen(cfg.database, "r");
+	if (!fd)
+	{
+		config_warn("WARNING: Could not open/read database '%s': %s", cfg.database, strerror(ERRNO));
+		return;
+	}
+	
+	memset(buf, 0, sizeof(buf));
+	if (fgets(buf, 512, fd) == NULL)
+	{
+		config_error("WARNING: Database file corrupt ('%s')", cfg.database);
+		fclose(fd);
+		return;
+	}
+	
+	/* Header contains: REPDB <version> <starttime> <writtentime>
+	 * Where:
+	 * REPDB:        Literally the string "REPDB".
+	 * <version>     This is version 1 at the time of this writing.
+	 * <starttime>   The time that recording of reputation started,
+	 *               in other words: when this module was first loaded, ever.
+	 * <writtentime> Time that the database was last written.
+	 */
+	if (!parse_db_header(buf))
+	{
+		config_error("WARNING: Cannot load database %s. Error reading header. "
+		             "Database corrupt? Or are you downgrading from a newer "
+		             "UnrealIRCd version perhaps? This is not supported.",
+		             cfg.database);
+		fclose(fd);
+		return;
+	}
+
+	while(fgets(buf, 512, fd) != NULL)
+	{
+		char *ip = NULL, *score = NULL, *last_seen = NULL;
+		ReputationEntry *e;
+		
+		stripcrlf(buf);
+		/* Format: <ip> <score> <last seen> */
+		ip = strtoken(&p, buf, " ");
+		if (!ip)
+			continue;
+		score = strtoken(&p, NULL, " ");
+		if (!score)
+			continue;
+		last_seen = strtoken(&p, NULL, " ");
+		if (!last_seen)
+			continue;
+		
+		e = safe_alloc(sizeof(ReputationEntry)+strlen(ip));
+		strcpy(e->ip, ip); /* safe, see alloc above */
+		e->score = atoi(score);
+		e->last_seen = atol(last_seen);
+		
+		add_reputation_entry(e);
+	}
+	fclose(fd);
+
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "Reputation benchmark: LOAD DB: %lld microseconds",
+		(long long)(((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec)));
+#endif
+}
+
+void save_db(void)
+{
+	FILE *fd;
+	char tmpfname[512];
+	int i;
+	ReputationEntry *e;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+	
+#ifdef TEST
+	sendto_realops("REPUTATION IS RUNNING IN TEST MODE. SAVING DB'S...");
+#endif
+
+	/* We write to a temporary file. Only to rename it later if everything was ok */
+	snprintf(tmpfname, sizeof(tmpfname), "%s.tmp", cfg.database);
+	
+	fd = fopen(tmpfname, "w");
+	if (!fd)
+	{
+		config_error("ERROR: Could not open/write database '%s': %s -- DATABASE *NOT* SAVED!!!", tmpfname, strerror(ERRNO));
+		return;
+	}
+
+	if (fprintf(fd, "REPDB 1 %lld %lld\n", (long long)reputation_starttime, (long long)TStime()) < 0)
+		goto write_fail;
+
+	for (i = 0; i < REPUTATION_HASH_TABLE_SIZE; i++)
+	{
+		for (e = ReputationHashTable[i]; e; e = e->next)
+		{
+			if (fprintf(fd, "%s %d %lld\n", e->ip, (int)e->score, (long long)e->last_seen) < 0)
+			{
+write_fail:
+				config_error("ERROR writing to '%s': %s -- DATABASE *NOT* SAVED!!!", tmpfname, strerror(ERRNO));
+				fclose(fd);
+				return;
+			}
+		}
+	}
+
+	if (fclose(fd) < 0)
+	{
+		config_error("ERROR writing to '%s': %s -- DATABASE *NOT* SAVED!!!", tmpfname, strerror(ERRNO));
+		return;
+	}
+	
+	/* Everything went fine. We rename our temporary file to the existing
+	 * DB file (will overwrite), which is more or less an atomic operation.
+	 */
+#ifdef _WIN32
+	/* The rename operation cannot be atomic on Windows as it will cause a "file exists" error */
+	unlink(cfg.database);
+#endif
+	if (rename(tmpfname, cfg.database) < 0)
+	{
+		config_error("ERROR renaming '%s' to '%s': %s -- DATABASE *NOT* SAVED!!!",
+			tmpfname, cfg.database, strerror(ERRNO));
+		return;
+	}
+
+	reputation_writtentime = TStime();
+
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "Reputation benchmark: SAVE DB: %lld microseconds",
+		(long long)(((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec)));
+#endif
+
+	return;
+}
+
+static uint64_t hash_reputation_entry(char *ip)
+{
+	return siphash(ip, siphashkey_reputation) % REPUTATION_HASH_TABLE_SIZE;
+}
+
+void add_reputation_entry(ReputationEntry *e)
+{
+	int hashv = hash_reputation_entry(e->ip);
+
+	AddListItem(e, ReputationHashTable[hashv]);
+}
+
+ReputationEntry *find_reputation_entry(char *ip)
+{
+	ReputationEntry *e;
+	int hashv = hash_reputation_entry(ip);
+
+	for (e = ReputationHashTable[hashv]; e; e = e->next)
+		if (!strcmp(e->ip, ip))
+			return e;
+
+	return NULL;
+}
+
+/** Called when the user connects.
+ * Locally: very early, just after the TCP/IP connection has
+ * been established, before any data.
+ * Remote user: early in the HOOKTYPE_REMOTE_CONNECT hook.
+ */
+int reputation_set_on_connect(Client *client)
+{
+	char *ip = client->ip;
+	ReputationEntry *e;
+
+	if (ip)
+	{
+		e = find_reputation_entry(ip);
+		if (e)
+		{
+			Reputation(client) = e->score; /* SET MODDATA */
+		}
+	}
+
+	return 0;
+}
+
+int reputation_pre_lconnect(Client *client)
+{
+	/* User will likely be accepted. Inform other servers about the score
+	 * we have for this user. For more information about this type of
+	 * server to server traffic, see the reputation_server_cmd function.
+	 */
+	ReputationEntry *e = find_reputation_entry(GetIP(client));
+	sendto_server(NULL, 0, 0, NULL, ":%s REPUTATION %s %d", me.id, GetIP(client), e ? (int)e->score : 0);
+
+	return 0;
+}
+
+EVENT(add_scores)
+{
+	static int marker = 0;
+	char *ip;
+	Client *client;
+	ReputationEntry *e;
+
+	/* This marker is used so we only bump score for an IP entry
+	 * once and not twice (or more) if there are multiple users
+	 * with the same IP address.
+	 */
+	marker += 2;
+
+	/* These macros make the code below easier to read. Also,
+	 * this explains why we just did marker+=2 and not marker++.
+	 */
+	#define MARKER_UNREGISTERED_USER (marker)
+	#define MARKER_REGISTERED_USER (marker+1)
+	
+	list_for_each_entry(client, &client_list, client_node)
+	{
+		if (!IsUser(client))
+			continue; /* skip servers, unknowns, etc.. */
+
+		ip = client->ip;
+		if (!ip)
+			continue;
+
+		e = find_reputation_entry(ip);
+		if (!e)
+		{
+			/* Create */
+			e = safe_alloc(sizeof(ReputationEntry)+strlen(ip));
+			strcpy(e->ip, ip); /* safe, allocated above */
+			add_reputation_entry(e);
+		}
+
+		/* If this is not a duplicate entry, then bump the score.. */
+		if ((e->marker != MARKER_UNREGISTERED_USER) && (e->marker != MARKER_REGISTERED_USER))
+		{
+			e->marker = MARKER_UNREGISTERED_USER;
+			if (e->score < REPUTATION_SCORE_CAP)
+			{
+				/* Regular users receive a point. */
+				e->score++;
+				/* Registered users receive an additional point */
+				if (IsLoggedIn(client) && (e->score < REPUTATION_SCORE_CAP))
+				{
+					e->score++;
+					e->marker = MARKER_REGISTERED_USER;
+				}
+			}
+		} else
+		if ((e->marker == MARKER_UNREGISTERED_USER) && IsLoggedIn(client) && (e->score < REPUTATION_SCORE_CAP))
+		{
+			/* This is to catch a special case:
+			 * If there are 2 or more users with the same IP
+			 * address and the first user was not registered
+			 * then the IP entry only received a score bump of +1.
+			 * If the 2nd user (with same IP) is a registered
+			 * user then the IP should actually receive a
+			 * score bump of +2 (in total).
+			 */
+			e->score++;
+			e->marker = MARKER_REGISTERED_USER;
+		}
+
+		e->last_seen = TStime();
+		Reputation(client) = e->score; /* update moddata */
+	}
+}
+
+/** Is this entry expired? */
+static inline int is_reputation_expired(ReputationEntry *e)
+{
+	int i;
+	for (i = 0; i < MAXEXPIRES; i++)
+	{
+		if (cfg.expire_time[i] == 0)
+			break; /* end of all entries */
+		if ((e->score <= cfg.expire_score[i]) && (TStime() - e->last_seen > cfg.expire_time[i]))
+			return 1;
+	}
+	return 0;
+}
+
+EVENT(delete_old_records)
+{
+	int i;
+	ReputationEntry *e, *e_next;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+	
+	for (i = 0; i < REPUTATION_HASH_TABLE_SIZE; i++)
+	{
+		for (e = ReputationHashTable[i]; e; e = e_next)
+		{
+			e_next = e->next;
+			
+			if (is_reputation_expired(e))
+			{
+#ifdef DEBUGMODE
+				ircd_log(LOG_ERROR, "Deleting expired entry for '%s' (score %hd, last seen %lld seconds ago)",
+				         e->ip, e->score, (long long)(TStime() - e->last_seen));
+#endif
+				DelListItem(e, ReputationHashTable[i]);
+				safe_free(e);
+			}
+		}
+	}
+
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "Reputation benchmark: EXPIRY IN MEM: %lld microseconds",
+		(long long)(((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec)));
+#endif
+}
+
+EVENT(save_db_evt)
+{
+	save_db();
+}
+
+CMD_FUNC(reputationunperm)
+{
+	if (!IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	ModuleSetOptions(ModInf.handle, MOD_OPT_PERM, 0);
+
+	sendto_realops("%s used /REPUTATIONUNPERM. On next REHASH the module can be RELOADED or UNLOADED. "
+	               "Note however that for a few minutes the scoring may be skipped, so don't do this too often.",
+	               client->name);
+}
+
+int count_reputation_records(void)
+{
+	int i;
+	ReputationEntry *e;
+	int total = 0;
+
+	for (i = 0; i < REPUTATION_HASH_TABLE_SIZE; i++)
+		for (e = ReputationHashTable[i]; e; e = e->next)
+			total++;
+
+	return total;
+}
+
+CMD_FUNC(reputation_user_cmd)
+{
+	ReputationEntry *e;
+	char *ip;
+
+	if (!IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnotice(client, "Reputation module statistics:");
+		sendnotice(client, "Recording for: %lld seconds (since unixtime %lld)",
+			(long long)(TStime() - reputation_starttime),
+			(long long)reputation_starttime);
+		if (reputation_writtentime)
+		{
+			sendnotice(client, "Last successful db write: %lld seconds ago (unixtime %lld)",
+				(long long)(TStime() - reputation_writtentime),
+				(long long)reputation_writtentime);
+		} else {
+			sendnotice(client, "Last successful db write: never");
+		}
+		sendnotice(client, "Current number of records (IP's): %d", count_reputation_records());
+		sendnotice(client, "-");
+		sendnotice(client, "For more specific information, use: /REPUTATION [nick|IP-address]");
+		return;
+	}
+	
+	if (strchr(parv[1], '.') || strchr(parv[1], ':'))
+	{
+		ip = parv[1];
+	} else {
+		Client *target = find_person(parv[1], NULL);
+		if (!target)
+		{
+			sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+			return;
+		}
+		ip = target->ip;
+		if (!ip)
+		{
+			sendnotice(client, "No IP address information available for user '%s'.", parv[1]); /* e.g. services */
+			return;
+		}
+	}
+	
+	e = find_reputation_entry(ip);
+	if (!e)
+	{
+		sendnotice(client, "No reputation record found for IP %s", ip);
+		return;
+	}
+
+	sendnotice(client, "****************************************************");
+	sendnotice(client, "Reputation record for IP %s:", ip);
+	sendnotice(client, "    Score: %hd", e->score);
+	sendnotice(client, "Last seen: %lld seconds ago (unixtime: %lld)",
+		(long long)(TStime() - e->last_seen),
+		(long long)e->last_seen);
+	sendnotice(client, "****************************************************");
+}
+
+/** The REPUTATION server command handler.
+ * Syntax: :server REPUTATION <ip> <score>
+ * Where the <score> may be prefixed by an asterisk (*).
+ *
+ * The best way to explain this command is to illustrate by example:
+ * :servera REPUTATION 1.2.3.4 0
+ * Then serverb, which might have a score of 2 for this IP, will:
+ * - Send back to the servera direction:  :serverb REPUTATION 1.2.3.4 *2
+ *   So the original server (and direction) receive a score update.
+ * - Propagate to non-servera direction: :servera REPUTATION 1.2.3.4 2
+ *   So use the new higher score (2 rather than 0).
+ * Then the next server may do the same. It MUST propagate to non-serverb
+ * direction and MAY (again) update the score even higher.
+ *
+ * If the score is not prefixed by * then the server may do as above and
+ * send back to the uplink an "update" of the score. If, however, the
+ * score is prefixed by * then the server will NEVER send back to the
+ * uplink, it may only propagate. This is to prevent loops.
+ *
+ * Note that some margin is used when deciding if the server should send
+ * back score updates. This is defined by UPDATE_SCORE_MARGIN.
+ * If this is for example set to 1 then a point difference of 1 will not
+ * yield a score update since such a minor score update is not worth the
+ * server to server traffic. Also, due to timing differences a score
+ * difference of 1 is quite likely to hapen in normal circumstances.
+ */
+CMD_FUNC(reputation_server_cmd)
+{
+	ReputationEntry *e;
+	char *ip;
+	int score;
+	int allow_reply;
+
+	/* :server REPUTATION <ip> <score> */
+	if ((parc < 3) || BadPtr(parv[2]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "REPUTATION");
+		return;
+	}
+	
+	ip = parv[1];
+
+	if (parv[2][0] == '*')
+	{
+		allow_reply = 0;
+		score = atoi(parv[2]+1);
+	} else {
+		allow_reply = 1;
+		score = atoi(parv[2]);
+	}
+
+	if (score > REPUTATION_SCORE_CAP)
+		score = REPUTATION_SCORE_CAP;
+
+	e = find_reputation_entry(ip);
+	if (allow_reply && e && (e->score > score) && (e->score - score > UPDATE_SCORE_MARGIN))
+	{
+		/* We have a higher score, inform the client direction about it.
+		 * This will prefix the score with a * so servers will never reply to it.
+		 */
+		sendto_one(client, NULL, ":%s REPUTATION %s *%d", me.id, parv[1], e->score);
+#ifdef DEBUGMODE
+		ircd_log(LOG_ERROR, "[reputation] Score for '%s' from %s is %d, but we have %d, sending back %d",
+			ip, client->name, score, e->score, e->score);
+#endif
+		score = e->score; /* Update for propagation in the non-client direction */
+	}
+
+	/* Update our score if sender has a higher score */
+	if (e && (score > e->score))
+	{
+#ifdef DEBUGMODE
+		ircd_log(LOG_ERROR, "[reputation] Score for '%s' from %s is %d, but we have %d, updating our score to %d",
+			ip, client->name, score, e->score, score);
+#endif
+		e->score = score;
+	}
+
+	/* If we don't have any entry for this IP, add it now. */
+	if (!e && (score > 0))
+	{
+#ifdef DEBUGMODE
+		ircd_log(LOG_ERROR, "[reputation] Score for '%s' from %s is %d, we had no entry, adding it",
+			ip, client->name, score);
+#endif
+		e = safe_alloc(sizeof(ReputationEntry)+strlen(ip));
+		strcpy(e->ip, ip); /* safe, see alloc above */
+		e->score = score;
+		e->last_seen = TStime();
+		add_reputation_entry(e);
+	}
+
+	/* Propagate to the non-client direction (score may be updated) */
+	sendto_server(client, 0, 0, NULL,
+	              ":%s REPUTATION %s %s%d",
+	              client->id,
+	              parv[1],
+	              allow_reply ? "" : "*",
+	              score);
+}
+
+CMD_FUNC(reputation_cmd)
+{
+	if (MyUser(client))
+		reputation_user_cmd(client, recv_mtags, parc, parv);
+	else if (IsServer(client))
+		reputation_server_cmd(client, recv_mtags, parc, parv);
+}
+
+int reputation_whois(Client *client, Client *target)
+{
+	int reputation = Reputation(target);
+
+	if (!IsOper(client))
+		return 0; /* only opers can see this.. */
+	
+	if (reputation > 0)
+	{
+		sendto_one(client, NULL, ":%s %d %s %s :is using an IP with a reputation score of %d",
+			me.name, RPL_WHOISSPECIAL, client->name,
+			target->name, reputation);
+	}
+	return 0;
+}
+
+void reputation_md_free(ModData *m)
+{
+	/* we have nothing to free actually, but we must set to zero */
+	m->l = 0;
+}
+
+char *reputation_md_serialize(ModData *m)
+{
+	static char buf[32];
+	if (m->i == 0)
+		return NULL; /* not set (reputation always starts at 1) */
+	snprintf(buf, sizeof(buf), "%d", m->i);
+	return buf;
+}
+
+void reputation_md_unserialize(char *str, ModData *m)
+{
+	m->i = atoi(str);
+}
+
+int reputation_starttime_callback(void)
+{
+	/* NB: fix this by 2038 */
+	return (int)reputation_starttime;
+}
diff --git a/src/modules/require-module.c b/src/modules/require-module.c
new file mode 100644
index 0000000..8b74b10
--- /dev/null
+++ b/src/modules/require-module.c
@@ -0,0 +1,558 @@
+/*
+ * Check for modules that are required across the network, as well as modules
+ * that *aren't* even allowed (deny/require module { } blocks)
+ * (C) Copyright 2019 Gottem and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MSG_SMOD "SMOD"
+#define SMOD_FLAG_REQUIRED 'R'
+#define SMOD_FLAG_GLOBAL 'G'
+#define SMOD_FLAG_LOCAL 'L'
+
+ModuleHeader MOD_HEADER = {
+	"require-module",
+	"5.0.1",
+	"Require/deny modules across the network",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+typedef struct _denymod DenyMod;
+struct _denymod {
+	DenyMod *prev, *next;
+	char *name;
+	char *reason;
+};
+
+typedef struct _requiremod ReqMod;
+struct _requiremod {
+	ReqMod *prev, *next;
+	char *name;
+	char *minversion;
+};
+
+// Forward declarations
+Module *find_modptr_byname(char *name, unsigned strict);
+DenyMod *find_denymod_byname(char *name);
+ReqMod *find_reqmod_byname(char *name);
+
+int reqmods_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int reqmods_configrun(ConfigFile *cf, ConfigEntry *ce, int type);
+
+int reqmods_configtest_deny(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int reqmods_configrun_deny(ConfigFile *cf, ConfigEntry *ce, int type);
+
+int reqmods_configtest_require(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int reqmods_configrun_require(ConfigFile *cf, ConfigEntry *ce, int type);
+
+CMD_FUNC(cmd_smod);
+int reqmods_hook_serverconnect(Client *client);
+
+// Globals
+extern MODVAR Module *Modules;
+DenyMod *DenyModList = NULL;
+ReqMod *ReqModList = NULL;
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, reqmods_configtest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	MARK_AS_GLOBAL_MODULE(modinfo);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, reqmods_configrun);
+	HookAdd(modinfo->handle, HOOKTYPE_SERVER_CONNECT, 0, reqmods_hook_serverconnect);
+	CommandAdd(modinfo->handle, MSG_SMOD, cmd_smod, MAXPARA, CMD_SERVER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	if (ModuleGetError(modinfo->handle) != MODERR_NOERROR)
+	{
+		config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	DenyMod *dmod, *dnext;
+	ReqMod *rmod, *rnext;
+	for (dmod = DenyModList; dmod; dmod = dnext)
+	{
+		dnext = dmod->next;
+		safe_free(dmod->name);
+		safe_free(dmod->reason);
+		DelListItem(dmod, DenyModList);
+		safe_free(dmod);
+	}
+	for (rmod = ReqModList; rmod; rmod = rnext)
+	{
+		rnext = rmod->next;
+		safe_free(rmod->name);
+		safe_free(rmod->minversion);
+		DelListItem(rmod, ReqModList);
+		safe_free(rmod);
+	}
+	DenyModList = NULL;
+	ReqModList = NULL;
+	return MOD_SUCCESS;
+}
+
+Module *find_modptr_byname(char *name, unsigned strict)
+{
+	Module *mod;
+	for (mod = Modules; mod; mod = mod->next)
+	{
+		// Let's not be too strict with the name
+		if (!strcasecmp(mod->header->name, name))
+		{
+			if (strict && !(mod->flags & MODFLAG_LOADED))
+				mod = NULL;
+			return mod;
+		}
+	}
+	return NULL;
+}
+
+DenyMod *find_denymod_byname(char *name)
+{
+	DenyMod *dmod;
+	for (dmod = DenyModList; dmod; dmod = dmod->next)
+	{
+		if (!strcasecmp(dmod->name, name))
+			return dmod;
+	}
+	return NULL;
+}
+
+ReqMod *find_reqmod_byname(char *name)
+{
+	ReqMod *rmod;
+	for (rmod = ReqModList; rmod; rmod = rmod->next)
+	{
+		if (!strcasecmp(rmod->name, name))
+			return rmod;
+	}
+	return NULL;
+}
+
+int reqmods_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	if (type == CONFIG_DENY)
+		return reqmods_configtest_deny(cf, ce, type, errs);
+
+	if (type == CONFIG_REQUIRE)
+		return reqmods_configtest_require(cf, ce, type, errs);
+
+	return 0;
+}
+
+int reqmods_configrun(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	if (type == CONFIG_DENY)
+		return reqmods_configrun_deny(cf, ce, type);
+
+	if (type == CONFIG_REQUIRE)
+		return reqmods_configrun_require(cf, ce, type);
+
+	return 0;
+}
+
+int reqmods_configtest_deny(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+	int has_name, has_reason;
+
+	// We are only interested in deny module { }
+	if (strcmp(ce->ce_vardata, "module"))
+		return 0;
+
+	has_name = has_reason = 0;
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strlen(cep->ce_varname))
+		{
+			config_error("%s:%i: blank directive for deny module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+			continue;
+		}
+
+		if (!cep->ce_vardata || !strlen(cep->ce_vardata))
+		{
+			config_error("%s:%i: blank %s without value for deny module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "name"))
+		{
+			if (has_name)
+			{
+				config_error("%s:%i: duplicate %s for deny module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+				continue;
+			}
+
+			// We do a loose check here because a module might not be fully loaded yet
+			if (find_modptr_byname(cep->ce_vardata, 0))
+			{
+				config_error("[require-module] Module '%s' was specified as denied but we've actually loaded it ourselves", cep->ce_vardata);
+				errors++;
+			}
+			has_name = 1;
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "reason")) // Optional
+		{
+			// Still check for duplicate directives though
+			if (has_reason)
+			{
+				config_error("%s:%i: duplicate %s for deny module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+				errors++;
+				continue;
+			}
+			has_reason = 1;
+			continue;
+		}
+
+		config_error("%s:%i: unknown directive %s for deny module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+		errors++;
+	}
+
+	if (!has_name)
+	{
+		config_error("%s:%i: missing required 'name' directive for deny module { } block", ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int reqmods_configrun_deny(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+	DenyMod *dmod;
+
+	if (strcmp(ce->ce_vardata, "module"))
+		return 0;
+
+	dmod = safe_alloc(sizeof(DenyMod));
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "name"))
+		{
+			safe_strdup(dmod->name, cep->ce_vardata);
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "reason"))
+		{
+			safe_strdup(dmod->reason, cep->ce_vardata);
+			continue;
+		}
+	}
+
+	// Just use a default reason if none was specified (since it's optional)
+	if (!dmod->reason || !strlen(dmod->reason))
+		 safe_strdup(dmod->reason, "no reason");
+	AddListItem(dmod, DenyModList);
+	return 1;
+}
+
+int reqmods_configtest_require(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+	int has_name, has_minversion;
+
+	// We are only interested in require module { }
+	if (strcmp(ce->ce_vardata, "module"))
+		return 0;
+
+	has_name = has_minversion = 0;
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strlen(cep->ce_varname))
+		{
+			config_error("%s:%i: blank directive for require module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+			errors++;
+			continue;
+		}
+
+		if (!cep->ce_vardata || !strlen(cep->ce_vardata))
+		{
+			config_error("%s:%i: blank %s without value for require module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "name"))
+		{
+			if (has_name)
+			{
+				config_error("%s:%i: duplicate %s for require module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+				continue;
+			}
+
+			if (!find_modptr_byname(cep->ce_vardata, 0))
+			{
+				config_error("[require-module] Module '%s' was specified as required but we didn't even load it ourselves (maybe double check the name?)", cep->ce_vardata);
+				errors++;
+			}
+
+			// Let's be nice and let configrun handle adding this module to the list
+			has_name = 1;
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "min-version")) // Optional
+		{
+			// Still check for duplicate directives though
+			if (has_minversion)
+			{
+				config_error("%s:%i: duplicate %s for require module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+				errors++;
+				continue;
+			}
+			has_minversion = 1;
+			continue;
+		}
+
+		// Reason directive is not used for require module { }, so error on that too
+		config_error("%s:%i: unknown directive %s for require module { } block", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+		errors++;
+	}
+
+	if (!has_name)
+	{
+		config_error("%s:%i: missing required 'name' directive for require module { } block", ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int reqmods_configrun_require(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+	Module *mod;
+	ReqMod *rmod;
+	char *name, *minversion;
+
+	if (strcmp(ce->ce_vardata, "module"))
+		return 0;
+
+	name = minversion = NULL;
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "name"))
+		{
+			if (!(mod = find_modptr_byname(cep->ce_vardata, 0)))
+			{
+				// Something went very wrong :D
+				config_warn("[require-module] [BUG?] Passed configtest_require() but not configrun_require() for module '%s' (seems to not be loaded after all)", cep->ce_vardata);
+				continue;
+			}
+
+			name = cep->ce_vardata;
+			continue;
+		}
+
+		if (!strcmp(cep->ce_varname, "min-version"))
+		{
+			minversion = cep->ce_vardata;
+			continue;
+		}
+	}
+
+	// While technically an error, let's not kill the entire server over it
+	if (!name)
+		return 1;
+
+	rmod = safe_alloc(sizeof(ReqMod));
+	safe_strdup(rmod->name, name);
+	if (minversion)
+		safe_strdup(rmod->minversion, minversion);
+	AddListItem(rmod, ReqModList);
+	return 1;
+}
+
+CMD_FUNC(cmd_smod)
+{
+	char modflag, name[64], *version;
+	char buf[BUFSIZE];
+	char *tmp, *p, *modbuf;
+	Module *mod;
+	DenyMod *dmod;
+	int i;
+	int abort;
+
+	// A non-server client shouldn't really be possible here, but still :D
+	if (!MyConnect(client) || !IsServer(client) || BadPtr(parv[1]))
+		return;
+
+	// Module strings are passed as 1 space-delimited parameter
+	strlcpy(buf, parv[1], sizeof(buf));
+	abort = 0;
+	for (modbuf = strtoken(&tmp, buf, " "); modbuf; modbuf = strtoken(&tmp, NULL, " "))
+	{
+		/* The order of checks is:
+		 * 1: deny module { } -- SQUIT always
+		 * 2 (if module not loaded): require module { } -- SQUIT always
+		 * 3 (if module not loaded): warn, but only if MOD_OPT_GLOBAL
+		 * 4 (optional, if module loaded only): require module::min-version
+		 */
+		p = strchr(modbuf, ':');
+		if (!p)
+			continue; /* malformed request */
+		modflag = *modbuf; // Get the module flag (FIXME: parses only first letter atm)
+		modbuf = p+1;
+		strlcpy(name, modbuf, sizeof(name)); // Let's work on a copy of the param
+
+		version = strchr(name, ':');
+		if (!version)
+			continue; /* malformed request */
+		*version++ = '\0';
+
+		// Even if a denied module is only required locally, let's still prevent a server that uses it from linking in
+		if ((dmod = find_denymod_byname(name)))
+		{
+			// Send this particular notice to local opers only
+			sendto_umode_global(UMODE_OPER, "Server %s is using module '%s', which is specified in a deny module { } config block (reason: %s)", client->name, name, dmod->reason);
+			abort = 1; // Always SQUIT because it was explicitly denied by admins
+			continue;
+		}
+
+		// Doing a strict check for the module being fully loaded so we can emit an alert in that case too :>
+		mod = find_modptr_byname(name, 1);
+		if (!mod)
+		{
+			/* Since only the server missing the module will report it, we need to broadcast the warning network-wide ;]
+			 * Obviously we won't take any real action if the module seems to be locally required only, except if it's marked as required
+			 */
+			if (modflag == 'R')
+			{
+				// We don't need to check the version yet because there's nothing to compare it to, so we'll treat it as if no require module::min-version was specified
+				sendto_umode_global(UMODE_OPER, "Required module wasn't (fully) loaded or is missing entirely: %s", name);
+				abort = 1; // Always SQUIT here too (explicitly required by admins)
+			}
+
+			else if (modflag == 'G')
+				sendto_umode_global(UMODE_OPER, "[WARN] Module marked as global wasn't (fully) loaded or is missing entirely: %s", name);
+
+			continue;
+		}
+
+		// Further checks are only necessary for explicitly required mods
+		if (modflag != 'R')
+			continue;
+
+		// Module is loaded on both servers and the other end is require { }'ing a specific module version
+		// An explicit version was specified in require module { } but our module version is less than that
+		if (*version != '*' && strnatcasecmp(mod->header->version, version) < 0)
+		{
+			sendto_umode_global(UMODE_OPER, "Module version mismatch for required module '%s' (should be equal to or greater than %s but we're running %s)", name, version, mod->header->version);
+			abort = 1;
+		}
+	}
+
+	if (abort)
+	{
+		sendto_umode_global(UMODE_OPER, "ABORTING LINK: %s <=> %s", me.name, client->name);
+		exit_client(client, NULL, "ABORTING LINK");
+		return;
+	}
+}
+
+int reqmods_hook_serverconnect(Client *client)
+{
+	/* This function simply dumps a list of modules and their version to the other server,
+	 * which will then run through the received list and check the names/versions
+	 */
+	char modflag;
+	char modbuf[64];
+	char *modversion;
+	/* Try to use a large buffer, but take into account the hostname, command, spaces, etc */
+	char sendbuf[BUFSIZE - HOSTLEN - 16];
+	Module *mod;
+	ReqMod *rmod;
+	size_t len, modlen;
+
+	/* Let's not have leaves directly connected to the hub send their module list to other *leaves* as well =]
+	 * Since the hub will introduce all servers currently linked to it, this hook is actually called for every separate node
+	 */
+	if (!MyConnect(client))
+		return HOOK_CONTINUE;
+
+	sendbuf[0] = '\0';
+	len = 0;
+
+	/* At this stage we don't care if a module isn't global (or not fully loaded), we'll dump all modules so we can properly deny
+	 * certain ones across the network
+	 * Also, the G flag is only used for modules that tag themselves as global, since we're keeping separate lists for require (R flag) and deny
+	 */
+	for (mod = Modules; mod; mod = mod->next)
+	{
+		modflag = SMOD_FLAG_LOCAL;
+		modversion = mod->header->version;
+
+		// require { }'d modules should be loaded on this server anyways, meaning we don't have to use a separate loop for those =]
+		if ((rmod = find_reqmod_byname(mod->header->name)))
+		{
+			// require module::min-version overrides the version found in the module's header
+			modflag = SMOD_FLAG_REQUIRED;
+			modversion = (rmod->minversion ? rmod->minversion : "*");
+		}
+
+		else if ((mod->options & MOD_OPT_GLOBAL))
+			modflag = SMOD_FLAG_GLOBAL;
+
+		ircsnprintf(modbuf, sizeof(modbuf), "%c:%s:%s", modflag, mod->header->name, modversion);
+		modlen = strlen(modbuf);
+		if (len + modlen + 2 > sizeof(sendbuf)) // Account for space and nullbyte, otherwise the last module entry might be cut off
+		{
+			// "Flush" current list =]
+			sendto_one(client, NULL, ":%s %s :%s", me.id, MSG_SMOD, sendbuf);
+			sendbuf[0] = '\0';
+			len = 0;
+		}
+
+		/* Maybe account for the space between modules, can't do this earlier because otherwise the ircsnprintf() would skip past the nullbyte
+		 * of the previous module (which in turn terminates the string prematurely)
+		 */
+		ircsnprintf(sendbuf + len, sizeof(sendbuf) - len, "%s%s", (len > 0 ? " " : ""), modbuf);
+		if (len)
+			len++;
+		len += modlen;
+	}
+
+	// May have something left
+	if (sendbuf[0])
+		sendto_one(client, NULL, ":%s %s :%s", me.id, MSG_SMOD, sendbuf);
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/restrict-commands.c b/src/modules/restrict-commands.c
new file mode 100644
index 0000000..781c88d
--- /dev/null
+++ b/src/modules/restrict-commands.c
@@ -0,0 +1,408 @@
+/*
+ * Restrict specific commands unless certain conditions have been met
+ * (C) Copyright 2019 Gottem and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER = {
+	"restrict-commands",
+	"1.0.2",
+	"Restrict specific commands unless certain conditions have been met",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+#define GetReputation(client) (moddata_client_get(client, "reputation") ? atoi(moddata_client_get(client, "reputation")) : 0)
+
+typedef struct RestrictedCommand RestrictedCommand;
+struct RestrictedCommand {
+	RestrictedCommand *prev, *next;
+	char *cmd;
+	char *conftag;
+	long connect_delay;
+	int exempt_identified;
+	int exempt_reputation_score;
+	int exempt_webirc;
+	int disable;
+};
+
+typedef struct {
+	char *conftag;
+	char *cmd;
+} CmdMap;
+
+// Forward declarations
+char *find_cmd_byconftag(char *conftag);
+RestrictedCommand *find_restrictions_bycmd(char *cmd);
+RestrictedCommand *find_restrictions_byconftag(char *conftag);
+int rcmd_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int rcmd_configrun(ConfigFile *cf, ConfigEntry *ce, int type);
+int rcmd_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice);
+int rcmd_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+int rcmd_block_message(Client *client, char *text, int notice, char **errmsg, char *display, char *conftag);
+CMD_OVERRIDE_FUNC(rcmd_override);
+
+// Globals
+static ModuleInfo ModInf;
+RestrictedCommand *RestrictedCommandList = NULL;
+CmdMap conf_cmdmaps[] = {
+	// These are special cases in which we can't override the command, so they are handled through hooks instead
+	{ "channel-message", "PRIVMSG" },
+	{ "channel-notice", "NOTICE" },
+	{ "private-message", "PRIVMSG" },
+	{ "private-notice", "NOTICE" },
+	{ NULL, NULL, }, // REQUIRED for the loop to properly work
+};
+
+MOD_TEST()
+{
+	memcpy(&ModInf, modinfo, modinfo->size);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, rcmd_configtest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, rcmd_configrun);
+
+	// Due to the nature of PRIVMSG/NOTICE we're gonna need to hook into PRE_* stuff instead of using command overrides
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_CHANNEL, -1000000, rcmd_can_send_to_channel);
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, -1000000, rcmd_can_send_to_user);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	if (ModuleGetError(modinfo->handle) != MODERR_NOERROR)
+	{
+		config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	RestrictedCommand *rcmd, *next;
+	for (rcmd = RestrictedCommandList; rcmd; rcmd = next)
+	{
+		next = rcmd->next;
+		safe_free(rcmd->conftag);
+		safe_free(rcmd->cmd);
+		DelListItem(rcmd, RestrictedCommandList);
+		safe_free(rcmd);
+	}
+	RestrictedCommandList = NULL;
+	return MOD_SUCCESS;
+}
+
+char *find_cmd_byconftag(char *conftag) {
+	CmdMap *cmap;
+	for (cmap = conf_cmdmaps; cmap->conftag; cmap++)
+	{
+		if (!strcmp(cmap->conftag, conftag))
+			return cmap->cmd;
+	}
+	return NULL;
+}
+
+RestrictedCommand *find_restrictions_bycmd(char *cmd) {
+	RestrictedCommand *rcmd;
+	for (rcmd = RestrictedCommandList; rcmd; rcmd = rcmd->next)
+	{
+		if (!strcasecmp(rcmd->cmd, cmd))
+			return rcmd;
+	}
+	return NULL;
+}
+
+RestrictedCommand *find_restrictions_byconftag(char *conftag) {
+	RestrictedCommand *rcmd;
+	for (rcmd = RestrictedCommandList; rcmd; rcmd = rcmd->next)
+	{
+		if (rcmd->conftag && !strcmp(rcmd->conftag, conftag))
+			return rcmd;
+	}
+	return NULL;
+}
+
+int rcmd_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep, *cep2;
+	RestrictedCommand *rcmd;
+	long connect_delay;
+	int exempt_reputation_score;
+	int exempt_webirc;
+	int has_restriction;
+
+	// We are only interested in set::restrict-commands
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!ce || strcmp(ce->ce_varname, "restrict-commands"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		has_restriction = 0;
+		for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+		{
+			if (!strcmp(cep2->ce_varname, "disable"))
+			{
+				has_restriction = 1;
+				continue;
+			}
+
+			if (!cep2->ce_vardata)
+			{
+				config_error("%s:%i: blank set::restrict-commands::%s:%s without value", cep2->ce_fileptr->cf_filename, cep2->ce_varlinenum, cep->ce_varname, cep2->ce_varname);
+				errors++;
+				continue;
+			}
+
+			if (!strcmp(cep2->ce_varname, "connect-delay"))
+			{
+				has_restriction = 1;
+				connect_delay = config_checkval(cep2->ce_vardata, CFG_TIME);
+				if (connect_delay < 10 || connect_delay > 3600)
+				{
+					config_error("%s:%i: set::restrict-commands::%s::connect-delay should be in range 10-3600", cep2->ce_fileptr->cf_filename, cep2->ce_varlinenum, cep->ce_varname);
+					errors++;
+				}
+				continue;
+			}
+
+			if (!strcmp(cep2->ce_varname, "exempt-identified"))
+				continue;
+			
+			if (!strcmp(cep2->ce_varname, "exempt-webirc"))
+				continue;
+			
+			if (!strcmp(cep2->ce_varname, "exempt-reputation-score"))
+			{
+				exempt_reputation_score = atoi(cep2->ce_vardata);
+				if (exempt_reputation_score <= 0)
+				{
+					config_error("%s:%i: set::restrict-commands::%s::exempt-reputation-score must be greater than 0", cep2->ce_fileptr->cf_filename, cep2->ce_varlinenum, cep->ce_varname);
+					errors++;
+				}
+				continue;
+			}
+
+			config_error("%s:%i: unknown directive set::restrict-commands::%s::%s", cep2->ce_fileptr->cf_filename, cep2->ce_varlinenum, cep->ce_varname, cep2->ce_varname);
+			errors++;
+		}
+
+		if (!has_restriction)
+		{
+			config_error("%s:%i: no restrictions were set for set::restrict-commands::%s (either 'connect-delay' or 'disable' is required)", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int rcmd_configrun(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *cep2;
+	char *cmd, *conftag;
+	RestrictedCommand *rcmd;
+
+	// We are only interested in set::restrict-commands
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!ce || strcmp(ce->ce_varname, "restrict-commands"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		// May need to switch some stuff around for special cases where the config directive doesn't match the actual command
+		conftag = NULL;
+		if ((cmd = find_cmd_byconftag(cep->ce_varname)))
+			conftag = cep->ce_varname;
+		else
+			cmd = cep->ce_varname;
+
+		// Try to add override before even allocating the struct so we can bail early
+		// Also don't override anything from the conf_cmdmaps[] list because those are handled through hooks instead
+		if (!conftag)
+		{
+			// Let's hope nobody tries to unload the module for PRIVMSG/NOTICE :^)
+			if (!CommandExists(cmd))
+			{
+				config_warn("[restrict-commands] Command '%s' does not exist. Did you mistype? Or is the module providing it not loaded?", cmd);
+				continue;
+			}
+
+			if (!CommandOverrideAdd(ModInf.handle, cmd, rcmd_override))
+			{
+				config_warn("[restrict-commands] Failed to add override for '%s' (NO RESTRICTIONS APPLY)", cmd);
+				continue;
+			}
+		}
+
+		rcmd = safe_alloc(sizeof(RestrictedCommand));
+		safe_strdup(rcmd->cmd, cmd);
+		safe_strdup(rcmd->conftag, conftag);
+		for (cep2 = cep->ce_entries; cep2; cep2 = cep2->ce_next)
+		{
+			if (!cep2->ce_vardata)
+				continue;
+
+			if (!strcmp(cep2->ce_varname, "connect-delay"))
+			{
+				rcmd->connect_delay = config_checkval(cep2->ce_vardata, CFG_TIME);
+				continue;
+			}
+
+			if (!strcmp(cep2->ce_varname, "exempt-identified"))
+			{
+				rcmd->exempt_identified = config_checkval(cep2->ce_vardata, CFG_YESNO);
+				continue;
+			}
+			
+			if (!strcmp(cep2->ce_varname, "exempt-webirc"))
+			{
+				rcmd->exempt_webirc = config_checkval(cep2->ce_vardata, CFG_YESNO);
+				continue;
+			}
+
+			if (!strcmp(cep2->ce_varname, "exempt-reputation-score"))
+			{
+				rcmd->exempt_reputation_score = atoi(cep2->ce_vardata);
+				continue;
+			}
+
+			if (!strcmp(cep2->ce_varname, "disable"))
+			{
+				rcmd->disable = cep2->ce_vardata ? config_checkval(cep2->ce_vardata, CFG_YESNO) : 1;
+				break; // Using break instead of continue since 'disable' takes precedence anyways
+			}
+		}
+		AddListItem(rcmd, RestrictedCommandList);
+	}
+
+	return 1;
+}
+
+int rcmd_canbypass(Client *client, RestrictedCommand *rcmd)
+{
+	if (!client || !rcmd)
+		return 1;
+	if (rcmd->exempt_identified && IsLoggedIn(client))
+		return 1;
+	if (rcmd->exempt_webirc && moddata_client_get(client, "webirc"))
+		return 1;
+	if (rcmd->exempt_reputation_score > 0 && (GetReputation(client) >= rcmd->exempt_reputation_score))
+		return 1;
+	if (client->local && (TStime() - client->local->firsttime < rcmd->connect_delay))
+		return 0;
+	return 1; // Default to yes so we don't drop too many commands
+}
+
+int rcmd_can_send_to_channel(Client *client, Channel *channel, Membership *lp, char **msg, char **errmsg, int notice)
+{
+	if (rcmd_block_message(client, *msg, notice, errmsg, "channel", (notice ? "channel-notice" : "channel-message")))
+		return HOOK_DENY;
+
+	return HOOK_CONTINUE;
+}
+
+int rcmd_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	// Need a few extra exceptions for user messages only =]
+	if ((client == target) || IsULine(target))
+		return HOOK_CONTINUE; /* bypass/exempt */
+
+	if (rcmd_block_message(client, *text, notice, errmsg, "user", (notice ? "private-notice" : "private-message")))
+		return HOOK_DENY;
+
+	return HOOK_CONTINUE;
+}
+
+int rcmd_block_message(Client *client, char *text, int notice, char **errmsg, char *display, char *conftag)
+{
+	RestrictedCommand *rcmd;
+	static char errbuf[256];
+
+	// Let's allow non-local users, opers and U:Lines early =]
+	if (!MyUser(client) || !client->local || IsOper(client) || IsULine(client))
+		return 0;
+
+	rcmd = find_restrictions_byconftag(conftag);
+	if (rcmd)
+	{
+		if (rcmd->disable)
+		{
+			ircsnprintf(errbuf, sizeof(errbuf),
+			            "Sending of %ss to %ss been disabled by the network administrators",
+			            (notice ? "notice" : "message"), display);
+			*errmsg = errbuf;
+			return 1;
+		}
+		if (!rcmd_canbypass(client, rcmd))
+		{
+			ircsnprintf(errbuf, sizeof(errbuf),
+			            "You cannot send %ss to %ss until you've been connected for %ld seconds or more",
+			            (notice ? "notice" : "message"), display, rcmd->connect_delay);
+			*errmsg = errbuf;
+			return 1;
+		}
+	}
+
+	// No restrictions apply, process command as normal =]
+	return 0;
+}
+
+CMD_OVERRIDE_FUNC(rcmd_override)
+{
+	RestrictedCommand *rcmd;
+
+	if (!MyUser(client) || !client->local || IsOper(client) || IsULine(client))
+	{
+		CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+		return;
+	}
+
+	rcmd = find_restrictions_bycmd(ovr->command->cmd);
+	if (rcmd)
+	{
+		if (rcmd->disable)
+		{
+			sendnumericfmt(client, ERR_UNKNOWNCOMMAND,
+			               "%s :This command is disabled by the network administrator",
+			               ovr->command->cmd);
+			return;
+		}
+		if (!rcmd_canbypass(client, rcmd))
+		{
+			sendnumericfmt(client, ERR_UNKNOWNCOMMAND,
+			               "%s :You must be connected for at least %ld seconds before you can use this command",
+			               ovr->command->cmd, rcmd->connect_delay);
+			return;
+		}
+	}
+
+	// No restrictions apply, process command as normal =]
+	CallCommandOverride(ovr, client, recv_mtags, parc, parv);
+}
diff --git a/src/modules/rmtkl.c b/src/modules/rmtkl.c
new file mode 100644
index 0000000..8ba0f64
--- /dev/null
+++ b/src/modules/rmtkl.c
@@ -0,0 +1,293 @@
+/*
+ * Easily remove *-Lines in bulk
+ * (C) Copyright 2019 Gottem and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER = {
+	"rmtkl",
+	"1.4",
+	"Adds /rmtkl command to easily remove *-Lines in bulk",
+	"Gottem and the UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+#define IsParam(x) (parc > (x) && !BadPtr(parv[(x)]))
+#define IsNotParam(x) (parc <= (x) || BadPtr(parv[(x)]))
+
+typedef struct {
+	int type;
+	char flag;
+	char *txt;
+	char *operpriv;
+} TKLType;
+
+static void dump_str(Client *client, char **buf);
+static TKLType *find_TKLType_by_flag(char flag);
+void rmtkl_check_options(char *param, int *skipperm, int *silent);
+int rmtkl_tryremove(Client *client, TKLType *tkltype, TKL *tkl, char *uhmask, char *commentmask, int skipperm, int silent);
+CMD_FUNC(rmtkl);
+
+TKLType tkl_types[] = {
+	{ TKL_KILL, 'k', "K-Line", "server-ban:kline:remove" },
+	{ TKL_ZAP, 'z',	"Z-Line", "server-ban:zline:local:remove" },
+	{ TKL_KILL | TKL_GLOBAL, 'G', "G-Line", "server-ban:gline:remove" },
+	{ TKL_ZAP | TKL_GLOBAL, 'Z', "Global Z-Line", "server-ban:zline:global:remove" },
+	{ TKL_SHUN | TKL_GLOBAL, 's', "Shun", "server-ban:shun:remove" },
+//	{ TKL_SPAMF | TKL_GLOBAL, 'F', "Global Spamfilter", "server-ban:spamfilter:remove" }, TODO: re-add spamfilter support
+	{ 0, 0, "Unknown *-Line", 0 },
+};
+
+static char *rmtkl_help[] = {
+	"*** \002Help on /rmtkl\002 *** ",
+	"Removes all TKLs matching the given conditions from the local server, or the entire",
+	"network if it's a global-type ban.",
+	"Syntax:",
+	"    \002/rmtkl\002 \037user@host\037 \037type\037 [\037comment\037] [\037-skipperm\037] [\037-silent\037]",
+	"The \037user@host\037 field is a wildcard mask to match the target of a ban.",
+	"The \037type\037 field may contain any number of the following characters:",
+	"    k, z, G, Z, s, F and *",
+	"    These correspond to (local) K-Line, (local) Z-Line, G-Line, Global Z-Line, (global) Shun and (global) Spamfilter",
+	"    (asterisk includes every type besides F)",
+	"The \037comment\037 field is also a wildcard mask to match the reason text of a ban. If specified, it must always",
+	"come \037before\037 the options starting with \002-\002.",
+	"Examples:",
+	"    - \002/rmtkl * *\002",
+	"        [remove \037all\037 supported TKLs except spamfilters]",
+	"    - \002/rmtkl *@*.mx GZ\002 * -skipperm",
+	"        [remove all Mexican G/Z-Lines while skipping over permanent ones]",
+/*	"    - \002/rmtkl * * *Zombie*\002",
+	"        [remove all non-spamfilter bans having \037Zombie\037 in the reason field]", TODO: re-add spamfilter support  */
+	"*** \002End of help\002 ***",
+	NULL
+};
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	if (CommandExists("RMTKL"))
+	{
+		config_error("Command RMTKL already exists");
+		return MOD_FAILED;
+	}
+	CommandAdd(modinfo->handle, "RMTKL", rmtkl, 5, CMD_USER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	if (ModuleGetError(modinfo->handle) != MODERR_NOERROR)
+	{
+		config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static void dump_str(Client *client, char **buf)
+{
+	if (!MyUser(client))
+		return;
+
+	// Using sendto_one() instead of sendnumericfmt() because the latter strips indentation and stuff ;]
+	for (; *buf != NULL; buf++)
+		sendto_one(client, NULL, ":%s %03d %s :%s", me.name, RPL_TEXT, client->name, *buf);
+
+	// Let user take 8 seconds to read it
+	client->local->since += 8;
+}
+
+static TKLType *find_TKLType_by_flag(char flag)
+{
+	TKLType *t;
+	for (t = tkl_types; t->type; t++)
+		if (t->flag == flag)
+			break;
+	return t;
+}
+
+void rmtkl_check_options(char *param, int *skipperm, int *silent) {
+	if (!strcasecmp("-skipperm", param))
+		*skipperm = 1;
+	if (!strcasecmp("-silent", param))
+		*silent = 1;
+}
+
+int rmtkl_tryremove(Client *client, TKLType *tkltype, TKL *tkl, char *uhmask, char *commentmask, int skipperm, int silent)
+{
+	if (tkl->type != tkltype->type)
+		return 0;
+
+	// Let's not touch Q-Lines
+	if (tkl->type & TKL_NAME)
+		return 0;
+
+	/* Don't touch TKL's that were added through config */
+	if (tkl->flags & TKL_FLAG_CONFIG)
+		return 0;
+
+	if (TKLIsSpamfilter(tkl))
+	{
+#if 0
+//FIXME: re-add spamfilter support
+		// Is a spamfilter added through IRC, we can remove this if the "user" mask matches the reason
+		if (!match_simple(uhmask, tkl->reason))
+			return 0;
+#endif
+	} else
+	if (TKLIsServerBan(tkl))
+	{
+		if (!match_simple(uhmask, make_user_host(tkl->ptr.serverban->usermask, tkl->ptr.serverban->hostmask)))
+			return 0;
+
+		if (commentmask && !match_simple(commentmask, tkl->ptr.serverban->reason))
+			return 0;
+	} else
+		return 0;
+
+	if (skipperm && tkl->expire_at == 0)
+		return 0;
+
+	if (!silent)
+		sendnotice_tkl_del(client->name, tkl);
+
+	RunHook2(HOOKTYPE_TKL_DEL, client, tkl);
+
+	if (tkl->type & TKL_SHUN)
+		tkl_check_local_remove_shun(tkl);
+	tkl_del_line(tkl);
+	return 1;
+}
+
+CMD_FUNC(rmtkl)
+{
+	TKL *tkl, *next;
+	TKLType *tkltype;
+	char *types, *uhmask, *commentmask, *p;
+	char tklchar;
+	int tklindex, tklindex2, skipperm, silent;
+	unsigned int count;
+	char broadcast[BUFSIZE];
+
+	if (!IsULine(client) && !IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (IsNotParam(1))
+	{
+		dump_str(client, rmtkl_help);
+		return;
+	}
+
+	if (IsNotParam(2))
+	{
+		sendnotice(client, "Not enough parameters. Type /RMTKL for help.");
+		return;
+	}
+
+	uhmask = parv[1];
+	types = parv[2];
+	commentmask = NULL;
+	skipperm = 0;
+	silent = 0;
+	count = 0;
+	snprintf(broadcast, sizeof(broadcast), ":%s RMTKL %s %s", client->name, types, uhmask);
+
+	// Check for optionals
+	if (IsParam(3))
+	{
+		// Comment mask, if specified, always goes third
+		if (*parv[3] != '-')
+			commentmask = parv[3];
+		else
+			rmtkl_check_options(parv[3], &skipperm, &silent);
+		ircsnprintf(broadcast, sizeof(broadcast), "%s %s", broadcast, parv[3]);
+	}
+	if (IsParam(4))
+	{
+		rmtkl_check_options(parv[4], &skipperm, &silent);
+		ircsnprintf(broadcast, sizeof(broadcast), "%s %s", broadcast, parv[4]);
+	}
+	if (IsParam(5))
+	{
+		rmtkl_check_options(parv[5], &skipperm, &silent);
+		ircsnprintf(broadcast, sizeof(broadcast), "%s %s", broadcast, parv[5]);
+	}
+
+	// Wildcard resolves to everything but 'F', since spamfilters are a bit special
+	if (strchr(types, '*'))
+		types = "kzGZs";
+
+	// Make sure the oper actually has the privileges to remove the *-Lines he wants
+	if (!IsULine(client))
+	{
+		for (p = types; *p; p++)
+		{
+			tkltype = find_TKLType_by_flag(*p);
+			if (!tkltype->type)
+				continue;
+
+			if (!ValidatePermissionsForPath(tkltype->operpriv, client, NULL, NULL, NULL))
+			{
+				sendnumeric(client, ERR_NOPRIVILEGES);
+				return;
+			}
+		}
+	}
+
+	// Broadcast the command to other servers *before* we proceed with removal
+	sendto_server(NULL, 0, 0, NULL, "%s", broadcast);
+
+	// Loop over all supported types
+	for (tkltype = tkl_types; tkltype->type; tkltype++) {
+		if (!strchr(types, tkltype->flag))
+			continue;
+
+		// Loop over all TKL entries, first try the ones in the hash table
+		tklchar = tkl_typetochar(tkltype->type);
+		tklindex = tkl_ip_hash_type(tklchar);
+		if (tklindex >= 0)
+		{
+			for (tklindex2 = 0; tklindex2 < TKLIPHASHLEN2; tklindex2++)
+			{
+				for (tkl = tklines_ip_hash[tklindex][tklindex2]; tkl; tkl = next)
+				{
+					next = tkl->next;
+					count += rmtkl_tryremove(client, tkltype, tkl, uhmask, commentmask, skipperm, silent);
+				}
+			}
+		}
+
+		// Then the regular *-Lines (not an else because certain TKLs might have a hash as well as a plain linked list)
+		tklindex = tkl_hash(tklchar);
+		for (tkl = tklines[tklindex]; tkl; tkl = next)
+		{
+			next = tkl->next;
+			count += rmtkl_tryremove(client, tkltype, tkl, uhmask, commentmask, skipperm, silent);
+		}
+	}
+
+	sendto_snomask(SNO_TKL, "*** %s removed %d TKLine(s) using /rmtkl", client->name, count);
+}
diff --git a/src/modules/rules.c b/src/modules/rules.c
new file mode 100644
index 0000000..8c09287
--- /dev/null
+++ b/src/modules/rules.c
@@ -0,0 +1,92 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_rules);
+
+#define MSG_RULES 	"RULES"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"rules",
+	"5.0",
+	"command /rules", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_RULES, cmd_rules, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * Heavily modified from the ircu cmd_motd by codemastr
+ * Also svsmotd support added
+ */
+CMD_FUNC(cmd_rules)
+{
+	ConfigItem_tld *ptr;
+	MOTDLine *temp;
+
+	temp = NULL;
+
+	if (hunt_server(client, recv_mtags, ":%s RULES :%s", 1, parc, parv) != HUNTED_ISME)
+		return;
+
+	ptr = find_tld(client);
+
+	if (ptr)
+		temp = ptr->rules.lines;
+	if(!temp)
+		temp = rules.lines;
+
+	if (temp == NULL)
+	{
+		sendnumeric(client, ERR_NORULES);
+		return;
+
+	}
+
+	sendnumeric(client, RPL_RULESSTART, me.name);
+
+	while (temp)
+	{
+		sendnumeric(client, RPL_RULES,
+		    temp->line);
+		temp = temp->next;
+	}
+	sendnumeric(client, RPL_ENDOFRULES);
+}
diff --git a/src/modules/sajoin.c b/src/modules/sajoin.c
new file mode 100644
index 0000000..ea3496a
--- /dev/null
+++ b/src/modules/sajoin.c
@@ -0,0 +1,279 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sajoin.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sajoin);
+
+#define MSG_SAJOIN 	"SAJOIN"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"sajoin",
+	"5.0",
+	"command /sajoin", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SAJOIN, cmd_sajoin, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_sajoin() - Lamego - Wed Jul 21 20:04:48 1999
+   Copied off PTlink IRCd (C) PTlink coders team.
+   Coded for Sadmin by Stskeeps
+   also Modified by NiQuiL (niquil@programmer.net)
+	parv[1] - nick to make join
+	parv[2] - channel(s) to join
+*/
+CMD_FUNC(cmd_sajoin)
+{
+	Client *target;
+	char jbuf[BUFSIZE];
+	char mode = '\0';
+	char sjmode = '\0';
+	char *mode_args[3];
+	int did_anything = 0;
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("SAJOIN");
+
+	if (parc < 3)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SAJOIN");
+		return;
+	}
+
+	if (!(target = find_person(parv[1], NULL)))
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+		return;
+	}
+
+	/* Is this user disallowed from operating on this victim at all? */
+	if (!IsULine(client) && !ValidatePermissionsForPath("sacmd:sajoin",client,target,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	/* If it's not for our client, then simply pass on the message... */
+	if (!MyUser(target))
+	{
+		sendto_one(target, NULL, ":%s SAJOIN %s %s", client->id, target->id, parv[2]);
+
+		/* Logging function added by XeRXeS */
+		ircd_log(LOG_SACMDS,"SAJOIN: %s used SAJOIN to make %s join %s",
+			client->name, target->name, parv[2]);
+
+		return;
+	}
+
+	/* Can't this just use do_join() or something with a parameter to bypass some checks?
+	 * This duplicate code is damn ugly. Ah well..
+	 */
+	{
+		char *name, *p = NULL;
+		int i, parted = 0;
+	
+		*jbuf = 0;
+
+		/* Now works like cmd_join */
+		for (i = 0, name = strtoken(&p, parv[2], ","); name; name = strtoken(&p, NULL, ","))
+		{
+			Channel *channel;
+			Membership *lp;
+
+			if (++ntargets > maxtargets)
+			{
+				sendnumeric(client, ERR_TOOMANYTARGETS, name, maxtargets, "SAJOIN");
+				break;
+			}
+
+			switch (name[0])
+			{
+#ifdef PREFIX_AQ
+				case '~':
+					mode = 'q';
+					sjmode = '~';
+					++name;
+					break;
+				case '&':
+					mode = 'a';
+					sjmode = '&';
+					++name;
+					break;
+#endif
+				case '@':
+					mode = 'o';
+					sjmode = '@';
+					++name;
+					break;
+				case '%':
+					mode = 'h';
+					sjmode = '%';
+					++name;
+					break;
+				case '+':
+					mode = 'v';
+					sjmode = '+';
+					++name;
+					break;
+				default:
+					mode = sjmode = '\0'; /* make sure sjmode is 0. */
+					break;
+			}
+
+			if (strlen(name) > CHANNELLEN)
+			{
+				sendnotice(client, "Channel name too long: %s", name);
+				continue;
+			}
+
+			if (*name == '0' && !atoi(name) && !sjmode)
+			{
+				strcpy(jbuf, "0");
+				i = 1;
+				parted = 1;
+				continue;
+			}
+
+			if (!valid_channelname(name))
+			{
+				send_invalid_channelname(client, name);
+				continue;
+			}
+
+			channel = get_channel(target, name, 0);
+
+			/* If this _specific_ channel is not permitted, skip it */
+			if (!IsULine(client) && !ValidatePermissionsForPath("sacmd:sajoin",client,target,channel,NULL))
+			{
+				sendnumeric(client, ERR_NOPRIVILEGES);
+				continue;
+			}
+
+			if (!parted && channel && (lp = find_membership_link(target->user->channel, channel)))
+			{
+				sendnumeric(client, ERR_USERONCHANNEL, target->name, name);
+				continue;
+			}
+			if (*jbuf)
+				strlcat(jbuf, ",", sizeof jbuf);
+			strlncat(jbuf, name, sizeof jbuf, sizeof(jbuf) - i - 1);
+			i += strlen(name) + 1;
+		}
+		if (!*jbuf)
+			return;
+		i = 0;
+		strcpy(parv[2], jbuf);
+		*jbuf = 0;
+		for (name = strtoken(&p, parv[2], ","); name; name = strtoken(&p, NULL, ","))
+		{
+			MessageTag *mtags = NULL;
+			int flags;
+			Channel *channel;
+			Membership *lp;
+			Hook *h;
+			int i = 0;
+
+			if (*name == '0' && !atoi(name) && !sjmode)
+			{
+				/* Rewritten so to generate a PART for each channel to servers,
+				 * so the same msgid is used for each part on all servers. -- Syzop
+				 */
+				did_anything = 1;
+				while ((lp = target->user->channel))
+				{
+					MessageTag *mtags = NULL;
+					channel = lp->channel;
+
+					new_message(target, NULL, &mtags);
+					sendto_channel(channel, target, NULL, 0, 0, SEND_LOCAL, NULL,
+					               ":%s PART %s :%s",
+					               target->name, channel->chname, "Left all channels");
+					sendto_server(client, 0, 0, mtags, ":%s PART %s :Left all channels", target->name, channel->chname);
+					if (MyConnect(target))
+						RunHook4(HOOKTYPE_LOCAL_PART, target, channel, mtags, "Left all channels");
+					free_message_tags(mtags);
+					remove_user_from_channel(target, channel);
+				}
+				strcpy(jbuf, "0");
+				continue;
+			}
+			flags = (ChannelExists(name)) ? CHFL_DEOPPED : LEVEL_ON_JOIN;
+			channel = get_channel(target, name, CREATE);
+			if (channel && (lp = find_membership_link(target->user->channel, channel)))
+				continue;
+
+			i = HOOK_CONTINUE;
+			for (h = Hooks[HOOKTYPE_CAN_SAJOIN]; h; h = h->next)
+			{
+				i = (*(h->func.intfunc))(target,channel,client);
+				if (i != HOOK_CONTINUE)
+					break;
+			}
+
+			if (i == HOOK_DENY)
+				continue; /* process next channel */
+
+			/* Generate a new message without inheritance.
+			 * We can do this because we are the server that
+			 * will send a JOIN for each channel due to this loop.
+			 * Each with their own unique msgid.
+			 */
+			new_message(target, NULL, &mtags);
+			join_channel(channel, target, mtags, flags);
+			if (sjmode)
+			{
+				opermode = 0;
+				sajoinmode = 1;
+				mode_args[0] = safe_alloc(2);
+				mode_args[0][0] = mode;
+				mode_args[0][1] = '\0';
+				mode_args[1] = target->name;
+				mode_args[2] = 0;
+				do_mode(channel, target, NULL, 3, mode_args, 0, 1);
+				sajoinmode = 0;
+				safe_free(mode_args[0]);
+			}
+			free_message_tags(mtags);
+			did_anything = 1;
+			if (*jbuf)
+				strlcat(jbuf, ",", sizeof jbuf);
+			strlcat(jbuf, name, sizeof jbuf);
+		}
+	}
+}
diff --git a/src/modules/samode.c b/src/modules/samode.c
new file mode 100644
index 0000000..7dc48b8
--- /dev/null
+++ b/src/modules/samode.c
@@ -0,0 +1,86 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/samode.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_samode);
+
+#define MSG_SAMODE 	"SAMODE"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"samode",
+	"5.0",
+	"command /samode", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SAMODE, cmd_samode, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * cmd_samode
+ * parv[1] = channel
+ * parv[2] = modes
+ * -t
+ */
+CMD_FUNC(cmd_samode)
+{
+	Channel *channel;
+
+	if (parc <= 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SAMODE");
+		return;
+	}
+
+	channel = find_channel(parv[1], NULL);
+	if (!channel)
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, parv[1]);
+		return;
+	}
+
+	if (!ValidatePermissionsForPath("sacmd:samode", client, NULL, channel, NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	opermode = 0;
+	do_mode(channel, client, NULL, parc - 2, parv + 2, 0, 1);
+}
diff --git a/src/modules/sapart.c b/src/modules/sapart.c
new file mode 100644
index 0000000..d783fdd
--- /dev/null
+++ b/src/modules/sapart.c
@@ -0,0 +1,164 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sapart.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sapart);
+
+#define MSG_SAPART 	"SAPART"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"sapart",
+	"5.0",
+	"command /sapart", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SAPART, cmd_sapart, 3, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_sapart() - Lamego - Wed Jul 21 20:04:48 1999
+   Copied off PTlink IRCd (C) PTlink coders team.
+   Coded for Sadmin by Stskeeps
+   also Modified by NiQuiL (niquil@programmer.net)
+	parv[1] - nick to make part
+	parv[2] - channel(s) to part
+	parv[3] - comment
+*/
+
+CMD_FUNC(cmd_sapart)
+{
+	Client *target;
+	Channel *channel;
+	Membership *lp;
+	char *name, *p = NULL;
+	int i;
+	char *comment = (parc > 3 && parv[3] ? parv[3] : NULL);
+	char commentx[512];
+	char jbuf[BUFSIZE];
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("SAPART");
+
+	if ((parc < 3) || BadPtr(parv[2]))
+        {
+                sendnumeric(client, ERR_NEEDMOREPARAMS, "SAPART");
+                return;
+        }
+
+        if (!(target = find_person(parv[1], NULL)))
+        {
+                sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+                return;
+        }
+
+	/* See if we can operate on this vicim/this command */
+	if (!ValidatePermissionsForPath("sacmd:sapart",client,target,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	/* Relay it on, if it's not my target */
+	if (!MyUser(target))
+	{
+		if (comment)
+		{
+			sendto_one(target, NULL, ":%s SAPART %s %s :%s", client->id, target->id, parv[2], comment);
+			ircd_log(LOG_SACMDS,"SAPART: %s used SAPART to make %s part %s (%s)",
+			         client->name, target->name, parv[2], comment);
+		}
+		else
+		{
+			sendto_one(target, NULL, ":%s SAPART %s %s", client->id, target->id, parv[2]);
+			ircd_log(LOG_SACMDS,"SAPART: %s used SAPART to make %s part %s",
+			         client->name, target->name, parv[2]);
+		}
+		return;
+	}
+
+	/* Now works like cmd_join */
+	*jbuf = 0;
+	for (i = 0, name = strtoken(&p, parv[2], ","); name; name = strtoken(&p, NULL, ","))
+	{
+		if (++ntargets > maxtargets)
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, name, maxtargets, "SAPART");
+			break;
+		}
+		if (!(channel = get_channel(target, name, 0)))
+		{
+			sendnumeric(client, ERR_NOSUCHCHANNEL,
+				name);
+			continue;
+		}
+
+		/* Validate oper can do this on chan/victim */
+		if (!IsULine(client) && !ValidatePermissionsForPath("sacmd:sapart",client,target,channel,NULL))
+		{
+			sendnumeric(client, ERR_NOPRIVILEGES);
+			continue;
+		}
+
+		if (!(lp = find_membership_link(target->user->channel, channel)))
+		{
+			sendnumeric(client, ERR_USERNOTINCHANNEL, target->name, name);
+			continue;
+		}
+		if (*jbuf)
+			strlcat(jbuf, ",", sizeof jbuf);
+		strlncat(jbuf, name, sizeof jbuf, sizeof(jbuf) - i - 1);
+		i += strlen(name) + 1;
+	}
+
+	if (!*jbuf)
+		return;
+
+	strcpy(parv[2], jbuf);
+
+	if (comment)
+	{
+		strcpy(commentx, "SAPart: ");
+		strlcat(commentx, comment, 512);
+	}
+
+	parv[0] = target->name; // nick
+	parv[1] = parv[2]; // chan
+	parv[2] = comment ? commentx : NULL; // comment
+	do_cmd(target, NULL, "PART", comment ? 3 : 2, parv);
+	/* target may be killed now due to the part reason @ spamfilter */
+}
diff --git a/src/modules/sasl.c b/src/modules/sasl.c
new file mode 100644
index 0000000..2cf51fe
--- /dev/null
+++ b/src/modules/sasl.c
@@ -0,0 +1,445 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sasl.c
+ *   (C) 2012 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"sasl",
+	"5.0",
+	"SASL", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+void saslmechlist_free(ModData *m);
+char *saslmechlist_serialize(ModData *m);
+void saslmechlist_unserialize(char *str, ModData *m);
+char *sasl_capability_parameter(Client *client);
+int sasl_server_synced(Client *client);
+EVENT(sasl_timeout);
+
+/* Macros */
+#define MSG_AUTHENTICATE "AUTHENTICATE"
+#define MSG_SASL "SASL"
+#define MSG_SVSLOGIN "SVSLOGIN"
+#define AGENT_SID(agent_p)	(agent_p->user != NULL ? agent_p->user->server : agent_p->name)
+
+/* Variables */
+long CAP_SASL = 0L;
+
+/*
+ * The following people were involved in making the previous iteration of SASL over
+ * IRC which allowed psuedo-identifiers:
+ *
+ * danieldg, Daniel de Graff <danieldg@inspircd.org>
+ * jilles, Jilles Tjoelker <jilles@stack.nl>
+ * Jobe, Matthew Beeching <jobe@mdbnet.co.uk>
+ * gxti, Michael Tharp <gxti@partiallystapled.com>
+ * nenolod, William Pitcock <nenolod@dereferenced.org>
+ *
+ * Thanks also to all of the client authors which have implemented SASL in their
+ * clients.  With the backwards-compatibility layer allowing "lightweight" SASL
+ * implementations, we now truly have a universal authentication mechanism for
+ * IRC.
+ */
+
+/*
+ * SVSLOGIN message
+ *
+ * parv[1]: propagation mask
+ * parv[2]: target
+ * parv[3]: ESVID
+ */
+CMD_FUNC(cmd_svslogin)
+{
+	Client *target;
+
+	if (!SASL_SERVER || MyUser(client) || (parc < 3) || !parv[3])
+		return;
+
+	/* We actually ignore parv[1] since this is a broadcast message.
+	 * It is a broadcast message because we want ALL servers to know
+	 * that the user is now logged in under account xyz.
+	 */
+
+	target = find_client(parv[2], NULL);
+	if (target)
+	{
+		if (IsServer(target))
+			return;
+
+		if (target->user == NULL)
+			make_user(target);
+
+		strlcpy(target->user->svid, parv[3], sizeof(target->user->svid));
+
+		if (MyConnect(target))
+		{
+			/* Notify user */
+			sendnumeric(target, RPL_LOGGEDIN,
+				   BadPtr(target->name) ? "*" : target->name,
+				   BadPtr(target->user->username) ? "*" : target->user->username,
+				   BadPtr(target->user->realhost) ? "*" : target->user->realhost,
+				   target->user->svid, target->user->svid);
+		}
+
+		user_account_login(recv_mtags, target);
+	} else {
+		/* It is perfectly normal for target to be NULL as this
+		 * happens during registration phase (pre-connect).
+		 * It just means we cannot set any properties for this user,
+		 * which is fine in that case, since it will be synced via
+		 * the UID message instead.
+		 * We still have to broadcast the message, which is why
+		 * we do not return here.
+		 */
+	}
+
+	/* Propagate to the rest of the network */
+	sendto_server(client, 0, 0, NULL, ":%s SVSLOGIN %s %s %s",
+	              client->name, parv[1], parv[2], parv[3]);
+}
+
+/*
+ * SASL message
+ *
+ * parv[1]: distribution mask
+ * parv[2]: target
+ * parv[3]: mode/state
+ * parv[4]: data
+ * parv[5]: out-of-bound data
+ */
+CMD_FUNC(cmd_sasl)
+{
+	if (!SASL_SERVER || MyUser(client) || (parc < 4) || !parv[4])
+		return;
+
+	if (!strcasecmp(parv[1], me.name) || !strncmp(parv[1], me.id, 3))
+	{
+		Client *target;
+
+		target = find_client(parv[2], NULL);
+		if (!target || !MyConnect(target))
+			return;
+
+		if (target->user == NULL)
+			make_user(target);
+
+		/* reject if another SASL agent is answering */
+		if (*target->local->sasl_agent && strcasecmp(client->name, target->local->sasl_agent))
+			return;
+		else
+			strlcpy(target->local->sasl_agent, client->name, sizeof(target->local->sasl_agent));
+
+		if (*parv[3] == 'C')
+		{
+			RunHookReturn2(HOOKTYPE_SASL_CONTINUATION, target, parv[4], !=0);
+			sendto_one(target, NULL, "AUTHENTICATE %s", parv[4]);
+		}
+		else if (*parv[3] == 'D')
+		{
+			*target->local->sasl_agent = '\0';
+			if (*parv[4] == 'F')
+			{
+				target->local->sasl_sent_time = 0;
+				target->local->since += 7; /* bump fakelag due to failed authentication attempt */
+				RunHookReturn2(HOOKTYPE_SASL_RESULT, target, 0, !=0);
+				sendnumeric(target, ERR_SASLFAIL);
+			}
+			else if (*parv[4] == 'S')
+			{
+				target->local->sasl_sent_time = 0;
+				target->local->sasl_complete++;
+				RunHookReturn2(HOOKTYPE_SASL_RESULT, target, 1, !=0);
+				sendnumeric(target, RPL_SASLSUCCESS);
+			}
+		}
+		else if (*parv[3] == 'M')
+			sendnumeric(target, RPL_SASLMECHS, parv[4]);
+
+		return;
+	}
+
+	/* not for us; propagate. */
+	sendto_server(client, 0, 0, NULL, ":%s SASL %s %s %c %s %s",
+	    client->name, parv[1], parv[2], *parv[3], parv[4], parc > 5 ? parv[5] : "");
+}
+
+/*
+ * AUTHENTICATE message
+ *
+ * parv[1]: data
+ */
+CMD_FUNC(cmd_authenticate)
+{
+	Client *agent_p = NULL;
+
+	/* Failing to use CAP REQ for sasl is a protocol violation. */
+	if (!SASL_SERVER || !MyConnect(client) || BadPtr(parv[1]) || !HasCapability(client, "sasl"))
+		return;
+
+	if ((parv[1][0] == ':') || strchr(parv[1], ' '))
+	{
+		sendnumeric(client, ERR_CANNOTDOCOMMAND, "AUTHENTICATE", "Invalid parameter");
+		return;
+	}
+
+	if (strlen(parv[1]) > 400)
+	{
+		sendnumeric(client, ERR_SASLTOOLONG);
+		return;
+	}
+
+	if (*client->local->sasl_agent)
+		agent_p = find_client(client->local->sasl_agent, NULL);
+
+	if (agent_p == NULL)
+	{
+		char *addr = BadPtr(client->ip) ? "0" : client->ip;
+		char *certfp = moddata_client_get(client, "certfp");
+
+		sendto_server(NULL, 0, 0, NULL, ":%s SASL %s %s H %s %s",
+		    me.name, SASL_SERVER, client->id, addr, addr);
+
+		if (certfp)
+			sendto_server(NULL, 0, 0, NULL, ":%s SASL %s %s S %s %s",
+			    me.name, SASL_SERVER, client->id, parv[1], certfp);
+		else
+			sendto_server(NULL, 0, 0, NULL, ":%s SASL %s %s S %s",
+			    me.name, SASL_SERVER, client->id, parv[1]);
+	}
+	else
+		sendto_server(NULL, 0, 0, NULL, ":%s SASL %s %s C %s",
+		    me.name, AGENT_SID(agent_p), client->id, parv[1]);
+
+	client->local->sasl_out++;
+	client->local->sasl_sent_time = TStime();
+}
+
+static int abort_sasl(Client *client)
+{
+	client->local->sasl_sent_time = 0;
+
+	if (client->local->sasl_out == 0 || client->local->sasl_complete)
+		return 0;
+
+	client->local->sasl_out = client->local->sasl_complete = 0;
+	sendnumeric(client, ERR_SASLABORTED);
+
+	if (*client->local->sasl_agent)
+	{
+		Client *agent_p = find_client(client->local->sasl_agent, NULL);
+
+		if (agent_p != NULL)
+		{
+			sendto_server(NULL, 0, 0, NULL, ":%s SASL %s %s D A",
+			    me.name, AGENT_SID(agent_p), client->id);
+			return 0;
+		}
+	}
+
+	sendto_server(NULL, 0, 0, NULL, ":%s SASL * %s D A", me.name, client->id);
+	return 0;
+}
+
+/** Is this capability visible?
+ * Note that 'client' may be NULL when queried from CAP DEL / CAP NEW
+ */
+int sasl_capability_visible(Client *client)
+{
+	if (!SASL_SERVER || !find_server(SASL_SERVER, NULL))
+		return 0;
+
+	/* Don't advertise 'sasl' capability if we are going to reject the
+	 * user anyway due to set::plaintext-policy. This way the client
+	 * won't attempt SASL authentication and thus it prevents the client
+	 * from sending the password unencrypted (in case of method PLAIN).
+	 */
+	if (client && !IsSecure(client) && !IsLocalhost(client) && (iConf.plaintext_policy_user == POLICY_DENY))
+		return 0;
+
+	/* Similarly, don't advertise when we are going to reject the user
+	 * due to set::outdated-tls-policy.
+	 */
+	if (IsSecure(client) && (iConf.outdated_tls_policy_user == POLICY_DENY) && outdated_tls_client(client))
+		return 0;
+
+	return 1;
+}
+
+int sasl_connect(Client *client)
+{
+	return abort_sasl(client);
+}
+
+int sasl_quit(Client *client, MessageTag *mtags, char *comment)
+{
+	return abort_sasl(client);
+}
+
+int sasl_server_quit(Client *client, MessageTag *mtags)
+{
+	if (!SASL_SERVER)
+		return 0;
+
+	/* If the set::sasl-server is gone, let everyone know 'sasl' is no longer available */
+	if (!strcasecmp(client->name, SASL_SERVER))
+		send_cap_notify(0, "sasl");
+
+	return 0;
+}
+
+void auto_discover_sasl_server(int justlinked)
+{
+	if (!SASL_SERVER && SERVICES_NAME)
+	{
+		Client *client = find_server(SERVICES_NAME, NULL);
+		if (client && moddata_client_get(client, "saslmechlist"))
+		{
+			/* SASL server found */
+			if (justlinked)
+			{
+				/* Let's send this message only on link and not also on /rehash */
+				sendto_realops("Services server '%s' provides SASL authentication, good! "
+				               "I'm setting set::sasl-server to '%s' internally.",
+				               SERVICES_NAME, SERVICES_NAME);
+				/* We should really get some LOG_INFO or something... I keep abusing LOG_ERROR :) */
+				ircd_log(LOG_ERROR, "Services server '%s' provides SASL authentication, good! "
+				                    "I'm setting set::sasl-server to '%s' internally.",
+				                    SERVICES_NAME, SERVICES_NAME);
+			}
+			safe_strdup(SASL_SERVER, SERVICES_NAME);
+			if (justlinked)
+				sasl_server_synced(client);
+		}
+	}
+}
+
+int sasl_server_synced(Client *client)
+{
+	if (!SASL_SERVER)
+	{
+		auto_discover_sasl_server(1);
+		return 0;
+	}
+
+	/* If the set::sasl-server is gone, let everyone know 'sasl' is no longer available */
+	if (!strcasecmp(client->name, SASL_SERVER))
+		send_cap_notify(1, "sasl");
+
+	return 0;
+}
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	CommandAdd(modinfo->handle, MSG_SASL, cmd_sasl, MAXPARA, CMD_USER|CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVSLOGIN, cmd_svslogin, MAXPARA, CMD_USER|CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_AUTHENTICATE, cmd_authenticate, MAXPARA, CMD_UNREGISTERED|CMD_USER);
+
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_CONNECT, 0, sasl_connect);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_QUIT, 0, sasl_quit);
+	HookAdd(modinfo->handle, HOOKTYPE_SERVER_QUIT, 0, sasl_server_quit);
+	HookAdd(modinfo->handle, HOOKTYPE_SERVER_SYNCED, 0, sasl_server_synced);
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "sasl";
+	cap.visible = sasl_capability_visible;
+	cap.parameter = sasl_capability_parameter;
+	ClientCapabilityAdd(modinfo->handle, &cap, &CAP_SASL);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "saslmechlist";
+	mreq.free = saslmechlist_free;
+	mreq.serialize = saslmechlist_serialize;
+	mreq.unserialize = saslmechlist_unserialize;
+	mreq.sync = 1;
+	mreq.type = MODDATATYPE_CLIENT;
+	ModDataAdd(modinfo->handle, mreq);
+
+	EventAdd(modinfo->handle, "sasl_timeout", sasl_timeout, NULL, 2000, 0);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	auto_discover_sasl_server(0);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void saslmechlist_free(ModData *m)
+{
+	safe_free(m->str);
+}
+
+char *saslmechlist_serialize(ModData *m)
+{
+	if (!m->str)
+		return NULL;
+	return m->str;
+}
+
+void saslmechlist_unserialize(char *str, ModData *m)
+{
+	safe_strdup(m->str, str);
+}
+
+char *sasl_capability_parameter(Client *client)
+{
+	Client *server;
+
+	if (SASL_SERVER)
+	{
+		server = find_server(SASL_SERVER, NULL);
+		if (server)
+			return moddata_client_get(server, "saslmechlist"); /* NOTE: could still return NULL */
+	}
+
+	return NULL;
+}
+
+EVENT(sasl_timeout)
+{
+	Client *client;
+
+	list_for_each_entry(client, &unknown_list, lclient_node)
+	{
+		if (client->local->sasl_sent_time &&
+		    (TStime() - client->local->sasl_sent_time > iConf.sasl_timeout))
+		{
+			sendnotice(client, "SASL request timed out (server or client misbehaving) -- aborting SASL and continuing connection...");
+			abort_sasl(client);
+		}
+	}
+}
diff --git a/src/modules/sdesc.c b/src/modules/sdesc.c
new file mode 100644
index 0000000..6c1f730
--- /dev/null
+++ b/src/modules/sdesc.c
@@ -0,0 +1,92 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sdesc.c
+ *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sdesc);
+
+#define MSG_SDESC 	"SDESC"	/* sdesc */
+
+ModuleHeader MOD_HEADER
+  = {
+	"sdesc",	/* Name of module */
+	"5.0", /* Version */
+	"command /sdesc", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SDESC, cmd_sdesc, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_sdesc - 15/05/1999 - Stskeeps
+ *  :prefix SDESC
+ *  parv[1] - description
+ *  D: Sets server info if you are Server Admin (ONLINE)
+*/
+
+CMD_FUNC(cmd_sdesc)
+{
+	if (!ValidatePermissionsForPath("server:description",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SDESC");
+		return;
+	}
+
+	if (strlen(parv[1]) > REALLEN)
+	{
+		if (MyConnect(client))
+		{
+			sendnotice(client, "*** /SDESC Error: \"Server info\" may maximum be %i characters of length",
+				REALLEN);
+			return;
+		}
+		parv[1][REALLEN] = '\0';
+	}
+
+	ircsnprintf(client->srvptr->info, sizeof(client->srvptr->info), "%s", parv[1]);
+
+	sendto_server(client, 0, 0, NULL, ":%s SDESC :%s", client->name, parv[1]);
+
+	sendto_ops("Server description for %s is now '%s' (changed by %s)",
+		client->srvptr->name, client->srvptr->info, client->name);
+}
diff --git a/src/modules/sendsno.c b/src/modules/sendsno.c
new file mode 100644
index 0000000..cabea21
--- /dev/null
+++ b/src/modules/sendsno.c
@@ -0,0 +1,103 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/sendsno.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sendsno);
+
+#define MSG_SENDSNO   "SENDSNO"
+
+ModuleHeader MOD_HEADER
+  = {
+	"sendsno",	/* Name of module */
+	"5.0", /* Version */
+	"command /sendsno", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SENDSNO, cmd_sendsno, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_sendsno - Written by Syzop, bit based on SENDUMODE from Stskeeps
+**      parv[1] = target snomask
+**      parv[2] = message text
+** Servers can use this to:
+**   :server.unreal.net SENDSNO e :Hiiiii
+*/
+CMD_FUNC(cmd_sendsno)
+{
+	MessageTag *mtags = NULL;
+	char *sno, *msg, *p;
+	long snomask = 0;
+	int i;
+	Client *acptr;
+
+	if ((parc < 3) || BadPtr(parv[2]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SENDSNO");
+		return;
+	}
+	sno = parv[1];
+	msg = parv[2];
+
+	new_message(client, recv_mtags, &mtags);
+
+	/* Forward to others... */
+	sendto_server(client, 0, 0, mtags, ":%s SENDSNO %s :%s", client->id, parv[1], parv[2]);
+
+	for (p = sno; *p; p++)
+	{
+		for(i = 0; i <= Snomask_highest; i++)
+		{
+			if (Snomask_Table[i].flag == *p)
+			{
+				snomask |= Snomask_Table[i].mode;
+				break;
+			}
+		}
+	}
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		if (acptr->user->snomask & snomask)
+			sendto_one(acptr, mtags, ":%s NOTICE %s :%s", client->name, acptr->name, msg);
+	}
+
+	free_message_tags(mtags);
+}
diff --git a/src/modules/sendumode.c b/src/modules/sendumode.c
new file mode 100644
index 0000000..a8504d7
--- /dev/null
+++ b/src/modules/sendumode.c
@@ -0,0 +1,107 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/sendumode.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sendumode);
+
+/* Place includes here */
+#define MSG_SENDUMODE   "SENDUMODE"
+#define MSG_SMO         "SMO"
+
+ModuleHeader MOD_HEADER
+  = {
+	"sendumode",	/* Name of module */
+	"5.0", /* Version */
+	"command /sendumode", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SENDUMODE, cmd_sendumode, MAXPARA, CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_SMO, cmd_sendumode, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** SENDUMODE - Send to usermode command (S2S traffic only).
+ * parv[1] = target user modes
+ * parv[2] = message text
+ * For example:
+ * :server SENDUMODE o :Serious problem: blablabla
+ */
+CMD_FUNC(cmd_sendumode)
+{
+	MessageTag *mtags = NULL;
+	Client *acptr;
+	char *message;
+	char *p;
+	int i;
+	long umode_s = 0;
+
+	message = (parc > 3) ? parv[3] : parv[2];
+
+	if (parc < 3)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SENDUMODE");
+		return;
+	}
+
+	new_message(client, recv_mtags, &mtags);
+
+	sendto_server(client, 0, 0, mtags, ":%s SENDUMODE %s :%s", client->id, parv[1], message);
+
+	for (p = parv[1]; *p; p++)
+	{
+		for(i = 0; i <= Usermode_highest; i++)
+		{
+			if (!Usermode_Table[i].flag)
+				continue;
+			if (Usermode_Table[i].flag == *p)
+			{
+				umode_s |= Usermode_Table[i].mode;
+				break;
+			}
+		}
+	}
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		if (acptr->umodes & umode_s)
+			sendto_one(acptr, mtags, ":%s NOTICE %s :%s", client->name, acptr->name, message);
+	}
+
+	free_message_tags(mtags);
+}
diff --git a/src/modules/server-time.c b/src/modules/server-time.c
new file mode 100644
index 0000000..f204e2a
--- /dev/null
+++ b/src/modules/server-time.c
@@ -0,0 +1,116 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/server-time.c
+ *   (C) 2019 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"server-time",
+	"5.0",
+	"server-time CAP",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Variables */
+long CAP_SERVER_TIME = 0L;
+
+int server_time_mtag_is_ok(Client *client, char *name, char *value);
+void mtag_add_or_inherit_time(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature);
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+	ClientCapability *c;
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "server-time";
+	c = ClientCapabilityAdd(modinfo->handle, &cap, &CAP_SERVER_TIME);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "time";
+	mtag.is_ok = server_time_mtag_is_ok;
+	mtag.clicap_handler = c;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	HookAddVoid(modinfo->handle, HOOKTYPE_NEW_MESSAGE, 0, mtag_add_or_inherit_time);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This function verifies if the client sending
+ * 'server-time' is permitted to do so and uses a permitted
+ * syntax.
+ * We simply allow server-time ONLY from servers.
+ */
+int server_time_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (IsServer(client) && !BadPtr(value))
+		return 1;
+
+	return 0;
+}
+
+void mtag_add_or_inherit_time(Client *sender, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature)
+{
+	MessageTag *m = find_mtag(recv_mtags, "time");
+	if (m)
+	{
+		m = duplicate_mtag(m);
+	} else
+	{
+		struct timeval t;
+		struct tm *tm;
+		time_t sec;
+		char buf[64];
+
+		gettimeofday(&t, NULL);
+		sec = t.tv_sec;
+		tm = gmtime(&sec);
+		snprintf(buf, sizeof(buf), "%04d-%02d-%02dT%02d:%02d:%02d.%03dZ",
+			tm->tm_year + 1900,
+			tm->tm_mon + 1,
+			tm->tm_mday,
+			tm->tm_hour,
+			tm->tm_min,
+			tm->tm_sec,
+			(int)(t.tv_usec / 1000));
+
+		m = safe_alloc(sizeof(MessageTag));
+		safe_strdup(m->name, "time");
+		safe_strdup(m->value, buf);
+	}
+	AddListItem(m, *mtag_list);
+}
diff --git a/src/modules/server.c b/src/modules/server.c
new file mode 100644
index 0000000..9722a3e
--- /dev/null
+++ b/src/modules/server.c
@@ -0,0 +1,1284 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/server.c
+ *   (C) 2004-present The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Forward declarations */
+void send_channel_modes_sjoin3(Client *to, Channel *channel);
+CMD_FUNC(cmd_server);
+CMD_FUNC(cmd_sid);
+int _verify_link(Client *client, char *servername, ConfigItem_link **link_out);
+void _send_protoctl_servers(Client *client, int response);
+void _send_server_message(Client *client);
+void _introduce_user(Client *to, Client *acptr);
+int _check_deny_version(Client *cptr, char *software, int protocol, char *flags);
+void _broadcast_sinfo(Client *acptr, Client *to, Client *except);
+
+/* Global variables */
+static char buf[BUFSIZE];
+
+#define MSG_SERVER 	"SERVER"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"server",
+	"5.0",
+	"command /server", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_PROTOCTL_SERVERS, _send_protoctl_servers);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SEND_SERVER_MESSAGE, _send_server_message);
+	EfunctionAdd(modinfo->handle, EFUNC_VERIFY_LINK, _verify_link);
+	EfunctionAddVoid(modinfo->handle, EFUNC_INTRODUCE_USER, _introduce_user);
+	EfunctionAdd(modinfo->handle, EFUNC_CHECK_DENY_VERSION, _check_deny_version);
+	EfunctionAddVoid(modinfo->handle, EFUNC_BROADCAST_SINFO, _broadcast_sinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SERVER, cmd_server, MAXPARA, CMD_UNREGISTERED|CMD_SERVER);
+	CommandAdd(modinfo->handle, "SID", cmd_sid, MAXPARA, CMD_SERVER);
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int server_sync(Client *cptr, ConfigItem_link *conf);
+
+/** Check deny version { } blocks.
+ * @param cptr		Client (a server)
+ * @param software	Software version in use (can be NULL)
+ * @param protoctol	UnrealIRCd protocol version in use (can be 0)
+ * @param flags		Server flags (hardly ever used, can be NULL)
+ * @returns 1 if link is denied (client is already killed), 0 if not.
+ */
+int _check_deny_version(Client *cptr, char *software, int protocol, char *flags)
+{
+	ConfigItem_deny_version *vlines;
+	
+	for (vlines = conf_deny_version; vlines; vlines = vlines->next)
+	{
+		if (match_simple(vlines->mask, cptr->name))
+			break;
+	}
+	
+	if (vlines)
+	{
+		char *proto = vlines->version;
+		char *vflags = vlines->flags;
+		int result = 0, i;
+		switch (*proto)
+		{
+			case '<':
+				proto++;
+				if (protocol < atoi(proto))
+					result = 1;
+				break;
+			case '>':
+				proto++;
+				if (protocol > atoi(proto))
+					result = 1;
+				break;
+			case '=':
+				proto++;
+				if (protocol == atoi(proto))
+					result = 1;
+				break;
+			case '!':
+				proto++;
+				if (protocol != atoi(proto))
+					result = 1;
+				break;
+			default:
+				if (protocol == atoi(proto))
+					result = 1;
+				break;
+		}
+		if (protocol == 0 || *proto == '*')
+			result = 0;
+
+		if (result)
+		{
+			exit_client(cptr, NULL, "Denied by deny version { } block");
+			return 0;
+		}
+
+		if (flags)
+		{
+			for (i = 0; vflags[i]; i++)
+			{
+				if (vflags[i] == '!')
+				{
+					i++;
+					if (strchr(flags, vflags[i])) {
+						result = 1;
+						break;
+					}
+				}
+				else if (!strchr(flags, vflags[i]))
+				{
+						result = 1;
+						break;
+				}
+			}
+
+			if (*vflags == '*' || !strcmp(flags, "0"))
+				result = 0;
+		}
+
+		if (result)
+		{
+			exit_client(cptr, NULL, "Denied by deny version { } block");
+			return 0;
+		}
+	}
+	
+	return 1;
+}
+
+/** Send our PROTOCTL SERVERS=x,x,x,x stuff.
+ * When response is set, it will be PROTOCTL SERVERS=*x,x,x (mind the asterisk).
+ */
+void _send_protoctl_servers(Client *client, int response)
+{
+	char buf[512];
+	Client *acptr;
+
+	sendto_one(client, NULL, "PROTOCTL EAUTH=%s,%d,%s%s,%s",
+		me.name, UnrealProtocol, serveropts, extraflags ? extraflags : "", version);
+		
+	ircsnprintf(buf, sizeof(buf), "PROTOCTL SERVERS=%s", response ? "*" : "");
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "%s,", acptr->id);
+		if (strlen(buf) > sizeof(buf)-12)
+			break; /* prevent overflow/cutoff if you have a network with more than 90 servers or something. */
+	}
+	
+	/* Remove final comma (if any) */
+	if (buf[strlen(buf)-1] == ',')
+		buf[strlen(buf)-1] = '\0';
+
+	sendto_one(client, NULL, "%s", buf);
+}
+
+void _send_server_message(Client *client)
+{
+	if (client->serv && client->serv->flags.server_sent)
+	{
+#ifdef DEBUGMODE
+		abort();
+#endif
+		return;
+	}
+
+	sendto_one(client, NULL, "SERVER %s 1 :U%d-%s%s-%s %s",
+		me.name, UnrealProtocol, serveropts, extraflags ? extraflags : "", me.id, me.info);
+
+	if (client->serv)
+		client->serv->flags.server_sent = 1;
+}
+
+
+/** Verify server link.
+ * This does authentication and authorization checks.
+ * @param cptr The client directly connected to us (cptr).
+ * @param client The client which (originally) issued the server command (client).
+ * @param servername The server name provided by the client.
+ * @param link_out Pointer-to-pointer-to-link block. Will be set when auth OK. Caller may pass NULL if he doesn't care.
+ * @returns This function returns 1 on successful authentication, 0 otherwise - in which case the client has been killed.
+ */
+int _verify_link(Client *client, char *servername, ConfigItem_link **link_out)
+{
+	char xerrmsg[256];
+	ConfigItem_link *link;
+	char *inpath = get_client_name(client, TRUE);
+	Client *acptr = NULL, *ocptr = NULL;
+	ConfigItem_ban *bconf;
+
+	/* We set the sockhost here so you can have incoming masks based on hostnames.
+	 * Perhaps a bit late to do it here, but does anyone care?
+	 */
+	if (client->local->hostp && client->local->hostp->h_name)
+		set_sockhost(client, client->local->hostp->h_name);
+
+	if (link_out)
+		*link_out = NULL;
+	
+	strcpy(xerrmsg, "No matching link configuration");
+
+	if (!client->local->passwd)
+	{
+		sendto_one(client, NULL, "ERROR :Missing password");
+		exit_client(client, NULL, "Missing password");
+		return 0;
+	}
+
+	/* First check if the server is in the list */
+	if (!servername) {
+		strcpy(xerrmsg, "Null servername");
+		goto errlink;
+	}
+	
+	if (client->serv && client->serv->conf)
+	{
+		/* This is an outgoing connect so we already know what link block we are
+		 * dealing with. It's the one in: client->serv->conf
+		 */
+
+		/* Actually we still need to double check the servername to avoid confusion. */
+		if (strcasecmp(servername, client->serv->conf->servername))
+		{
+			ircsnprintf(xerrmsg, sizeof(xerrmsg), "Outgoing connect from link block '%s' but server "
+				"introduced himself as '%s'. Server name mismatch.",
+				client->serv->conf->servername,
+				servername);
+
+			sendto_one(client, NULL, "ERROR :%s", xerrmsg);
+			sendto_ops_and_log("Outgoing link aborted to %s(%s@%s) (%s) %s",
+				client->serv->conf->servername, client->ident, client->local->sockhost, xerrmsg, inpath);
+			exit_client(client, NULL, xerrmsg);
+			return 0;
+		}
+		link = client->serv->conf;
+		goto skip_host_check;
+	} else {
+		/* Hunt the linkblock down ;) */
+		for(link = conf_link; link; link = link->next)
+			if (match_simple(link->servername, servername))
+				break;
+	}
+	
+	if (!link)
+	{
+		ircsnprintf(xerrmsg, sizeof(xerrmsg), "No link block named '%s'", servername);
+		goto errlink;
+	}
+	
+	if (!link->incoming.mask)
+	{
+		ircsnprintf(xerrmsg, sizeof(xerrmsg), "Link block '%s' exists but has no link::incoming::mask", servername);
+		goto errlink;
+	}
+
+	link = find_link(servername, client);
+
+	if (!link)
+	{
+		ircsnprintf(xerrmsg, sizeof(xerrmsg), "Server is in link block but link::incoming::mask didn't match");
+errlink:
+		/* Send the "simple" error msg to the server */
+		sendto_one(client, NULL,
+		    "ERROR :Link denied (No link block found named '%s' or link::incoming::mask did not match your IP %s) %s",
+		    servername, GetIP(client), inpath);
+		/* And send the "verbose" error msg only to locally connected ircops */
+		sendto_ops_and_log("Link denied for %s(%s@%s) (%s) %s",
+		    servername, client->ident, client->local->sockhost, xerrmsg, inpath);
+		exit_client(client, NULL, "Link denied (No link block found with your server name or link::incoming::mask did not match)");
+		return 0;
+	}
+
+skip_host_check:
+	/* Now for checking passwords */
+	if (!Auth_Check(client, link->auth, client->local->passwd))
+	{
+		/* Let's help admins a bit with a good error message in case
+		 * they mix different authentication systems (plaintext password
+		 * vs an "TLS Auth type" like spkifp/tlsclientcert/tlsclientcertfp).
+		 * The 'if' statement below is a bit complex but it consists of 2 things:
+		 * 1. Check if our side expects a plaintext password but we did not receive one
+		 * 2. Check if our side expects a non-plaintext password but we did receive one
+		 */
+		if (((link->auth->type == AUTHTYPE_PLAINTEXT) && client->local->passwd && !strcmp(client->local->passwd, "*")) ||
+		    ((link->auth->type != AUTHTYPE_PLAINTEXT) && client->local->passwd && strcmp(client->local->passwd, "*")))
+		{
+			sendto_ops_and_log("Link denied for '%s' (Authentication failed due to different password types on both sides of the link) %s",
+				servername, inpath);
+			sendto_ops_and_log("Read https://www.unrealircd.org/docs/FAQ#auth-fail-mixed for more information");
+		} else
+		if (link->auth->type == AUTHTYPE_SPKIFP)
+		{
+			sendto_ops_and_log("Link denied for '%s' (Authentication failed [spkifp mismatch]) %s",
+				servername, inpath);
+		} else
+		if (link->auth->type == AUTHTYPE_TLS_CLIENTCERT)
+		{
+			sendto_ops_and_log("Link denied for '%s' (Authentication failed [tlsclientcert mismatch]) %s",
+				servername, inpath);
+		} else
+		if (link->auth->type == AUTHTYPE_TLS_CLIENTCERTFP)
+		{
+			sendto_ops_and_log("Link denied for '%s' (Authentication failed [tlsclientcertfp mismatch]) %s",
+				servername, inpath);
+		} else
+		{
+			sendto_ops_and_log("Link denied for '%s' (Authentication failed [Bad password?]) %s",
+				servername, inpath);
+		}
+		sendto_one(client, NULL,
+		    "ERROR :Link '%s' denied (Authentication failed) %s",
+		    servername, inpath);
+		exit_client(client, NULL, "Link denied (Authentication failed)");
+		return 0;
+	}
+
+	/* Verify the TLS certificate (if requested) */
+	if (link->verify_certificate)
+	{
+		char *errstr = NULL;
+
+		if (!IsTLS(client))
+		{
+			sendto_one(client, NULL,
+				"ERROR :Link '%s' denied (Not using SSL/TLS) %s",
+				servername, inpath);
+			sendto_ops_and_log("Link denied for '%s' (Not using SSL/TLS and verify-certificate is on) %s",
+				servername, inpath);
+			exit_client(client, NULL, "Link denied (Not using SSL/TLS)");
+			return 0;
+		}
+		if (!verify_certificate(client->local->ssl, link->servername, &errstr))
+		{
+			sendto_one(client, NULL,
+				"ERROR :Link '%s' denied (Certificate verification failed) %s",
+				servername, inpath);
+			sendto_ops_and_log("Link denied for '%s' (Certificate verification failed) %s",
+				servername, inpath);
+			sendto_ops_and_log("Reason for certificate verification failure: %s", errstr);
+			exit_client(client, NULL, "Link denied (Certificate verification failed)");
+			return 0;
+		}
+	}
+
+	/*
+	 * Third phase, we check that the server does not exist
+	 * already
+	 */
+	if ((acptr = find_server(servername, NULL)))
+	{
+		/* Found. Bad. Quit. */
+
+		if (IsMe(acptr))
+		{
+			sendto_ops_and_log("Link %s rejected, server trying to link with my name (%s)",
+				get_client_name(client, TRUE), me.name);
+			sendto_one(client, NULL, "ERROR: Server %s exists (it's me!)", me.name);
+			exit_client(client, NULL, "Server Exists");
+			return 0;
+		}
+
+		acptr = acptr->direction;
+		ocptr = (client->local->firsttime > acptr->local->firsttime) ? acptr : client;
+		acptr = (client->local->firsttime > acptr->local->firsttime) ? client : acptr;
+		sendto_one(acptr, NULL,
+		    "ERROR :Server %s already exists from %s",
+		    servername,
+		    (ocptr->direction ? ocptr->direction->name : "<nobody>"));
+		sendto_ops_and_log
+		    ("Link %s cancelled, server %s already exists from %s",
+		    get_client_name(acptr, TRUE), servername,
+		    (ocptr->direction ? ocptr->direction->name : "<nobody>"));
+		exit_client(acptr, NULL, "Server Exists");
+		return 0;
+	}
+	if ((bconf = find_ban(NULL, servername, CONF_BAN_SERVER)))
+	{
+		sendto_ops_and_log
+			("Cancelling link %s, banned server",
+			get_client_name(client, TRUE));
+		sendto_one(client, NULL, "ERROR :Banned server (%s)", bconf->reason ? bconf->reason : "no reason");
+		exit_client(client, NULL, "Banned server");
+		return 0;
+	}
+	if (link->class->clients + 1 > link->class->maxclients)
+	{
+		sendto_ops_and_log("Cancelling link %s, full class",
+				get_client_name(client, TRUE));
+		exit_client(client, NULL, "Full class");
+		return 0;
+	}
+	if (!IsLocalhost(client) && (iConf.plaintext_policy_server == POLICY_DENY) && !IsSecure(client))
+	{
+		sendto_one(client, NULL, "ERROR :Servers need to use SSL/TLS (set::plaintext-policy::server is 'deny')");
+		sendto_ops_and_log("Rejected insecure server %s. See https://www.unrealircd.org/docs/FAQ#ERROR:_Servers_need_to_use_SSL.2FTLS", client->name);
+		exit_client(client, NULL, "Servers need to use SSL/TLS (set::plaintext-policy::server is 'deny')");
+		return 0;
+	}
+	if (IsSecure(client) && (iConf.outdated_tls_policy_server == POLICY_DENY) && outdated_tls_client(client))
+	{
+		sendto_one(client, NULL, "ERROR :Server is using an outdated SSL/TLS protocol or cipher (set::outdated-tls-policy::server is 'deny')");
+		sendto_ops_and_log("Rejected server %s using outdated %s. See https://www.unrealircd.org/docs/FAQ#server-outdated-tls", tls_get_cipher(client->local->ssl), client->name);
+		exit_client(client, NULL, "Server using outdates SSL/TLS protocol or cipher (set::outdated-tls-policy::server is 'deny')");
+		return 0;
+	}
+	if (link_out)
+		*link_out = link;
+	return 1;
+}
+
+/** Server command. Only for locally connected servers!!.
+ * parv[1] = server name
+ * parv[2] = hop count
+ * parv[3] = server description, may include protocol version and other stuff too (VL)
+ */
+CMD_FUNC(cmd_server)
+{
+	char *servername = NULL;	/* Pointer for servername */
+	char *ch = NULL;	/* */
+	char descbuf[BUFSIZE];
+	int  hop = 0;
+	char info[REALLEN + 61];
+	ConfigItem_link *aconf = NULL;
+	ConfigItem_deny_link *deny;
+	char *flags = NULL, *protocol = NULL, *inf = NULL, *num = NULL;
+
+	if (IsUser(client))
+	{
+		sendnumeric(client, ERR_ALREADYREGISTRED);
+		sendnotice(client, "*** Sorry, but your IRC program doesn't appear to support changing servers.");
+		return;
+	}
+
+	if (parc < 4 || (!*parv[3]))
+	{
+		sendto_one(client, NULL, "ERROR :Not enough SERVER parameters");
+		exit_client(client, NULL,  "Not enough parameters");
+		return;
+	}
+
+	servername = parv[1];
+
+	/* Remote 'SERVER' command is not possible on a 100% SID network */
+	if (!MyConnect(client))
+	{
+		char buf[256];
+		sendto_umode_global(UMODE_OPER, "Server %s introduced %s which is using old unsupported protocol from UnrealIRCd 3.2.x or earlier. " 
+		                                "See https://www.unrealircd.org/docs/FAQ#old-server-protocol",
+		                                client->direction->name, servername);
+		exit_client(client->direction, NULL, "Introduced another server with unsupported protocol");
+		return;
+	}
+
+	if (client->local->listener && (client->local->listener->options & LISTENER_CLIENTSONLY))
+	{
+		exit_client(client, NULL, "This port is for clients only");
+		return;
+	}
+
+	if (!valid_server_name(servername))
+	{
+		sendto_one(client, NULL, "ERROR :Bogus server name (%s)", servername);
+		sendto_snomask
+		    (SNO_JUNK,
+		    "WARNING: Bogus server name (%s) from %s (maybe just a fishy client)",
+		    servername, get_client_name(client, TRUE));
+		exit_client(client, NULL, "Bogus server name");
+		return;
+	}
+
+	if (!client->local->passwd)
+	{
+		sendto_one(client, NULL, "ERROR :Missing password");
+		exit_client(client, NULL, "Missing password");
+		return;
+	}
+
+	if (!verify_link(client, servername, &aconf))
+		return; /* Rejected */
+
+	/* From this point the server is authenticated, so we can be more verbose
+	 * with notices to ircops and in exit_client() and such.
+	 */
+
+	strlcpy(client->name, servername, sizeof(client->name));
+
+	if (strlen(client->id) != 3)
+	{
+		sendto_umode_global(UMODE_OPER, "Server %s is using old unsupported protocol from UnrealIRCd 3.2.x or earlier. " 
+		                                "See https://www.unrealircd.org/docs/FAQ#old-server-protocol",
+		                                servername);
+		ircd_log(LOG_ERROR, "Server using old unsupported protocol from UnrealIRCd 3.2.x or earlier. "
+		                    "See https://www.unrealircd.org/docs/FAQ#old-server-protocol");
+		exit_client(client, NULL, "Server using old unsupported protocol from UnrealIRCd 3.2.x or earlier. "
+		                          "See https://www.unrealircd.org/docs/FAQ#old-server-protocol");
+		return;
+	}
+
+	hop = atol(parv[2]);
+	if (hop != 1)
+	{
+		sendto_umode_global(UMODE_OPER, "Directly linked server %s provided a hopcount of %d, while 1 was expected",
+		                                servername, hop);
+		exit_client(client, NULL, "Invalid SERVER message, hop count must be 1");
+	}
+	client->hopcount = hop;
+
+	strlcpy(info, parv[parc - 1], sizeof(info));
+
+	/* Parse "VL" data in description */
+	if (SupportVL(client))
+	{
+		char tmp[REALLEN + 61];
+		inf = protocol = flags = num = NULL;
+		strlcpy(tmp, info, sizeof(tmp)); /* work on a copy */
+
+		/* We are careful here to allow invalid syntax or missing
+		 * stuff, which mean that particular variable will stay NULL.
+		 */
+
+		protocol = strtok(tmp, "-");
+		if (protocol)
+			flags = strtok(NULL, "-");
+		if (flags)
+			num = strtok(NULL, " ");
+		if (num)
+			inf = strtok(NULL, "");
+		if (inf)
+		{
+			strlcpy(client->info, inf[0] ? inf : "server", sizeof(client->info)); /* set real description */
+
+			if (!_check_deny_version(client, NULL, atoi(protocol), flags))
+				return; /* Rejected */
+		} else {
+			strlcpy(client->info, info[0] ? info : "server", sizeof(client->info));
+		}
+	} else {
+		strlcpy(client->info, info[0] ? info : "server", sizeof(client->info));
+	}
+
+	/* Process deny server { } restrictions */
+	for (deny = conf_deny_link; deny; deny = deny->next)
+	{
+		if (deny->flag.type == CRULE_ALL && match_simple(deny->mask, servername)
+			&& crule_eval(deny->rule))
+		{
+			sendto_ops_and_log("Refused connection from %s. Rejected by deny link { } block.",
+				get_client_host(client));
+			exit_client(client, NULL, "Disallowed by connection rule");
+			return;
+		}
+	}
+
+	if (aconf->options & CONNECT_QUARANTINE)
+		SetQuarantined(client);
+
+	ircsnprintf(descbuf, sizeof descbuf, "Server: %s", servername);
+	fd_desc(client->local->fd, descbuf);
+
+	server_sync(client, aconf);
+}
+
+/** Remote server command (SID).
+ * parv[1] = server name
+ * parv[2] = hop count (always >1)
+ * parv[3] = SID
+ * parv[4] = server description
+ */
+CMD_FUNC(cmd_sid)
+{
+	Client *acptr, *ocptr;
+	ConfigItem_link	*aconf;
+	ConfigItem_ban *bconf;
+	int 	hop;
+	char	*servername = parv[1];
+	Client *cptr = client->direction; /* lazy, since this function may be removed soon */
+
+	/* Only allow this command from server sockets */
+	if (!IsServer(client->direction))
+	{
+		sendnumeric(client, ERR_NOTFORUSERS, "SID");
+		return;
+	}
+
+	if (parc < 4 || BadPtr(parv[3]))
+	{
+		sendto_one(client, NULL, "ERROR :Not enough SID parameters");
+		return;
+	}
+
+	/* Check if server already exists... */
+	if ((acptr = find_server(servername, NULL)))
+	{
+		/* Found. Bad. Quit. */
+
+		if (IsMe(acptr))
+		{
+			sendto_ops_and_log("Link %s rejected, server trying to link with my name (%s)",
+				get_client_name(client, TRUE), me.name);
+			sendto_one(client, NULL, "ERROR: Server %s exists (it's me!)", me.name);
+			exit_client(client, NULL, "Server Exists");
+			return;
+		}
+
+		// FIXME: verify this code:
+		acptr = acptr->direction;
+		ocptr = (cptr->local->firsttime > acptr->local->firsttime) ? acptr : cptr;
+		acptr = (cptr->local->firsttime > acptr->local->firsttime) ? cptr : acptr;
+		sendto_one(acptr, NULL,
+		    "ERROR :Server %s already exists from %s",
+		    servername,
+		    (ocptr->direction ? ocptr->direction->name : "<nobody>"));
+		sendto_ops_and_log
+		    ("Link %s cancelled, server %s already exists from %s",
+		    get_client_name(acptr, TRUE), servername,
+		    (ocptr->direction ? ocptr->direction->name : "<nobody>"));
+		exit_client(acptr, NULL, "Server Exists");
+		return;
+	}
+
+	/* Check deny server { } */
+	if ((bconf = find_ban(NULL, servername, CONF_BAN_SERVER)))
+	{
+		sendto_ops_and_log("Cancelling link %s, banned server %s",
+			get_client_name(cptr, TRUE), servername);
+		sendto_one(cptr, NULL, "ERROR :Banned server (%s)", bconf->reason ? bconf->reason : "no reason");
+		exit_client(cptr, NULL, "Brought in banned server");
+		return;
+	}
+
+	/* OK, let us check the data now */
+	if (!valid_server_name(servername))
+	{
+		sendto_ops_and_log("Link %s introduced server with bad server name '%s' -- disconnecting",
+		                   client->name, servername);
+		exit_client(cptr, NULL, "Introduced server with bad server name");
+		return;
+	}
+
+	hop = atol(parv[2]);
+	if (hop < 2)
+	{
+		sendto_ops_and_log("Server %s introduced server %s with hop count of %d, while >1 was expected",
+		                   client->name, servername, hop);
+		exit_client(cptr, NULL, "ERROR :Invalid hop count");
+		return;
+	}
+
+	if (!valid_sid(parv[3]))
+	{
+		sendto_ops_and_log("Server %s introduced server %s with invalid SID '%s' -- disconnecting",
+		                   client->name, servername, parv[3]);
+		exit_client(cptr, NULL, "ERROR :Invalid SID");
+		return;
+	}
+
+	if (!cptr->serv->conf)
+	{
+		sendto_ops_and_log("Internal error: lost conf for %s!!, dropping link", cptr->name);
+		exit_client(cptr, NULL, "Internal error: lost configuration");
+		return;
+	}
+
+	aconf = cptr->serv->conf;
+
+	if (!aconf->hub)
+	{
+		sendto_ops_and_log("Link %s cancelled, is Non-Hub but introduced Leaf %s",
+			cptr->name, servername);
+		exit_client(cptr, NULL, "Non-Hub Link");
+		return;
+	}
+
+	if (!match_simple(aconf->hub, servername))
+	{
+		sendto_ops_and_log("Link %s cancelled, linked in %s, which hub config disallows",
+			cptr->name, servername);
+		exit_client(cptr, NULL, "Not matching hub configuration");
+		return;
+	}
+
+	if (aconf->leaf)
+	{
+		if (!match_simple(aconf->leaf, servername))
+		{
+			sendto_ops_and_log("Link %s(%s) cancelled, disallowed by leaf configuration",
+				cptr->name, servername);
+			exit_client(cptr, NULL, "Disallowed by leaf configuration");
+			return;
+		}
+	}
+
+	if (aconf->leaf_depth && (hop > aconf->leaf_depth))
+	{
+		sendto_ops_and_log("Link %s(%s) cancelled, too deep depth",
+			cptr->name, servername);
+		exit_client(cptr, NULL, "Too deep link depth (leaf)");
+		return;
+	}
+
+	/* All approved, add the server */
+	acptr = make_client(cptr, find_server(client->name, cptr));
+	strlcpy(acptr->name, servername, sizeof(acptr->name));
+	acptr->hopcount = hop;
+	strlcpy(acptr->id, parv[3], sizeof(acptr->id));
+	strlcpy(acptr->info, parv[parc - 1], sizeof(acptr->info));
+	make_server(acptr);
+	acptr->serv->up = find_or_add(acptr->srvptr->name);
+	SetServer(acptr);
+	ircd_log(LOG_SERVER, "SERVER %s (from %s)", acptr->name, acptr->srvptr->name);
+	/* If this server is U-lined, or the parent is, then mark it as U-lined */
+	if (IsULine(client) || find_uline(acptr->name))
+		SetULine(acptr);
+	irccounts.servers++;
+	find_or_add(acptr->name);
+	add_client_to_list(acptr);
+	add_to_client_hash_table(acptr->name, acptr);
+	add_to_id_hash_table(acptr->id, acptr);
+	list_move(&acptr->client_node, &global_server_list);
+
+	RunHook(HOOKTYPE_SERVER_CONNECT, acptr);
+
+	sendto_server(client, 0, 0, NULL, ":%s SID %s %d %s :%s",
+		    acptr->srvptr->id, acptr->name, hop + 1, acptr->id, acptr->info);
+
+	RunHook(HOOKTYPE_POST_SERVER_CONNECT, acptr);
+}
+
+void _introduce_user(Client *to, Client *acptr)
+{
+	build_umode_string(acptr, 0, SEND_UMODES, buf);
+
+	sendto_one_nickcmd(to, acptr, buf);
+	
+	send_moddata_client(to, acptr);
+
+	if (acptr->user->away)
+		sendto_one(to, NULL, ":%s AWAY :%s", acptr->id, acptr->user->away);
+
+	if (acptr->user->swhois)
+	{
+		SWhois *s;
+		for (s = acptr->user->swhois; s; s = s->next)
+		{
+			if (CHECKSERVERPROTO(to, PROTO_EXTSWHOIS))
+			{
+				sendto_one(to, NULL, ":%s SWHOIS %s + %s %d :%s",
+					me.id, acptr->name, s->setby, s->priority, s->line);
+			} else
+			{
+				sendto_one(to, NULL, ":%s SWHOIS %s :%s",
+					me.id, acptr->name, s->line);
+			}
+		}
+	}
+}
+
+void tls_link_notification_verify(Client *acptr, ConfigItem_link *aconf)
+{
+	char *spki_fp;
+	char *tls_fp;
+	char *errstr = NULL;
+	int verify_ok;
+
+	if (!MyConnect(acptr) || !acptr->local->ssl || !aconf)
+		return;
+
+	if ((aconf->auth->type == AUTHTYPE_TLS_CLIENTCERT) ||
+	    (aconf->auth->type == AUTHTYPE_TLS_CLIENTCERTFP) ||
+	    (aconf->auth->type == AUTHTYPE_SPKIFP))
+	{
+		/* Link verified by certificate or SPKI */
+		return;
+	}
+
+	if (aconf->verify_certificate)
+	{
+		/* Link verified by trust chain */
+		return;
+	}
+
+	tls_fp = moddata_client_get(acptr, "certfp");
+	spki_fp = spki_fingerprint(acptr);
+	if (!tls_fp || !spki_fp)
+		return; /* wtf ? */
+
+	/* Only bother the user if we are linking to UnrealIRCd 4.0.16+,
+	 * since only for these versions we can give precise instructions.
+	 */
+	if (!acptr->serv || acptr->serv->features.protocol < 4016)
+		return;
+
+	sendto_realops("You may want to consider verifying this server link.");
+	sendto_realops("More information about this can be found on https://www.unrealircd.org/Link_verification");
+
+	verify_ok = verify_certificate(acptr->local->ssl, aconf->servername, &errstr);
+	if (errstr && strstr(errstr, "not valid for hostname"))
+	{
+		sendto_realops("Unfortunately the certificate of server '%s' has a name mismatch:", acptr->name);
+		sendto_realops("%s", errstr);
+		sendto_realops("This isn't a fatal error but it will prevent you from using verify-certificate yes;");
+	} else
+	if (!verify_ok)
+	{
+		sendto_realops("In short: in the configuration file, change the 'link %s {' block to use this as a password:", acptr->name);
+		sendto_realops("password \"%s\" { spkifp; };", spki_fp);
+		sendto_realops("And follow the instructions on the other side of the link as well (which will be similar, but will use a different hash)");
+	} else
+	{
+		sendto_realops("In short: in the configuration file, add the following to your 'link %s {' block:", acptr->name);
+		sendto_realops("verify-certificate yes;");
+		sendto_realops("Alternatively, you could use SPKI fingerprint verification. Then change the password in the link block to be:");
+		sendto_realops("password \"%s\" { spkifp; };", spki_fp);
+	}
+}
+
+#define SafeStr(x)    ((x && *(x)) ? (x) : "*")
+
+/** Broadcast SINFO.
+ * @param cptr   The server to send the information about.
+ * @param to     The server to send the information TO (NULL for broadcast).
+ * @param except The direction NOT to send to.
+ * This function takes into account that the server may not
+ * provide all of the detailed info. If any information is
+ * absent we will send 0 for numbers and * for NULL strings.
+ */
+void _broadcast_sinfo(Client *acptr, Client *to, Client *except)
+{
+	char chanmodes[128], buf[512];
+
+	if (acptr->serv->features.chanmodes[0])
+	{
+		snprintf(chanmodes, sizeof(chanmodes), "%s,%s,%s,%s",
+			 acptr->serv->features.chanmodes[0],
+			 acptr->serv->features.chanmodes[1],
+			 acptr->serv->features.chanmodes[2],
+			 acptr->serv->features.chanmodes[3]);
+	} else {
+		strlcpy(chanmodes, "*", sizeof(chanmodes));
+	}
+
+	snprintf(buf, sizeof(buf), "%lld %d %s %s %s :%s",
+		      (long long)acptr->serv->boottime,
+		      acptr->serv->features.protocol,
+		      SafeStr(acptr->serv->features.usermodes),
+		      chanmodes,
+		      SafeStr(acptr->serv->features.nickchars),
+		      SafeStr(acptr->serv->features.software));
+
+	if (to)
+	{
+		/* Targetted to one server */
+		sendto_one(to, NULL, ":%s SINFO %s", acptr->id, buf);
+	} else {
+		/* Broadcast (except one side...) */
+		sendto_server(except, 0, 0, NULL, ":%s SINFO %s", acptr->id, buf);
+	}
+}
+
+int	server_sync(Client *cptr, ConfigItem_link *aconf)
+{
+	char		*inpath = get_client_name(cptr, TRUE);
+	Client		*acptr;
+	int incoming = IsUnknown(cptr) ? 1 : 0;
+
+	ircd_log(LOG_SERVER, "SERVER %s", cptr->name);
+
+	if (cptr->local->passwd)
+	{
+		safe_free(cptr->local->passwd);
+		cptr->local->passwd = NULL;
+	}
+	if (incoming)
+	{
+		/* If this is an incomming connection, then we have just received
+		 * their stuff and now send our stuff back.
+		 */
+		if (!IsEAuth(cptr)) /* if eauth'd then we already sent the passwd */
+			sendto_one(cptr, NULL, "PASS :%s", (aconf->auth->type == AUTHTYPE_PLAINTEXT) ? aconf->auth->data : "*");
+
+		send_proto(cptr, aconf);
+		send_server_message(cptr);
+	}
+
+	/* Set up server structure */
+	free_pending_net(cptr);
+	SetServer(cptr);
+	irccounts.me_servers++;
+	irccounts.servers++;
+	irccounts.unknown--;
+	list_move(&cptr->client_node, &global_server_list);
+	list_move(&cptr->lclient_node, &lclient_list);
+	list_add(&cptr->special_node, &server_list);
+	if (find_uline(cptr->name))
+	{
+		if (cptr->serv && cptr->serv->features.software && !strncmp(cptr->serv->features.software, "UnrealIRCd-", 11))
+		{
+			sendto_realops("\002WARNING:\002 Bad ulines! It seems your server is misconfigured: "
+			               "your ulines { } block is matching an UnrealIRCd server (%s). "
+			               "This is not correct and will cause security issues. "
+			               "ULines should only be added for services! "
+			               "See https://www.unrealircd.org/docs/FAQ#bad-ulines",
+			               cptr->name);
+		}
+		SetULine(cptr);
+	}
+	find_or_add(cptr->name);
+	if (IsSecure(cptr))
+	{
+		sendto_umode_global(UMODE_OPER,
+			"(\2link\2) Secure link %s -> %s established (%s)",
+			me.name, inpath, tls_get_cipher(cptr->local->ssl));
+		tls_link_notification_verify(cptr, aconf);
+	}
+	else
+	{
+		sendto_umode_global(UMODE_OPER,
+			"(\2link\2) Link %s -> %s established",
+			me.name, inpath);
+		/* Print out a warning if linking to a non-TLS server unless it's localhost.
+		 * Yeah.. there are still other cases when non-TLS links are fine (eg: local IP
+		 * of the same machine), we won't bother with detecting that. -- Syzop
+		 */
+		if (!IsLocalhost(cptr) && (iConf.plaintext_policy_server == POLICY_WARN))
+		{
+			sendto_realops("\002WARNING:\002 This link is unencrypted (not SSL/TLS). We highly recommend to use "
+			               "SSL/TLS for server linking. See https://www.unrealircd.org/docs/Linking_servers");
+		}
+		if (IsSecure(cptr) && (iConf.outdated_tls_policy_server == POLICY_WARN) && outdated_tls_client(cptr))
+		{
+			sendto_realops("\002WARNING:\002 This link is using an outdated SSL/TLS protocol or cipher (%s).",
+			               tls_get_cipher(cptr->local->ssl));
+		}
+	}
+	add_to_client_hash_table(cptr->name, cptr);
+	/* doesnt duplicate cptr->serv if allocted this struct already */
+	make_server(cptr);
+	cptr->serv->up = me.name;
+	cptr->srvptr = &me;
+	if (!cptr->serv->conf)
+		cptr->serv->conf = aconf; /* Only set serv->conf to aconf if not set already! Bug #0003913 */
+	if (incoming)
+	{
+		cptr->serv->conf->refcount++;
+		Debug((DEBUG_ERROR, "reference count for %s (%s) is now %d",
+			cptr->name, cptr->serv->conf->servername, cptr->serv->conf->refcount));
+	}
+	cptr->serv->conf->class->clients++;
+	cptr->local->class = cptr->serv->conf->class;
+	RunHook(HOOKTYPE_SERVER_CONNECT, cptr);
+
+	/* Broadcast new server to the rest of the network */
+	sendto_server(cptr, 0, 0, NULL, ":%s SID %s 2 %s :%s",
+		    cptr->srvptr->id, cptr->name, cptr->id, cptr->info);
+
+	/* Broadcast the just-linked-in featureset to other servers on our side */
+	broadcast_sinfo(cptr, NULL, cptr);
+
+	/* Send moddata of &me (if any, likely minimal) */
+	send_moddata_client(cptr, &me);
+
+	list_for_each_entry_reverse(acptr, &global_server_list, client_node)
+	{
+		/* acptr->direction == acptr for acptr == cptr */
+		if (acptr->direction == cptr)
+			continue;
+
+		if (IsServer(acptr))
+		{
+			sendto_one(cptr, NULL, ":%s SID %s %d %s :%s",
+			    acptr->srvptr->id,
+			    acptr->name, acptr->hopcount + 1,
+			    acptr->id, acptr->info);
+
+			/* Also signal to the just-linked server which
+			 * servers are fully linked.
+			 * Now you might ask yourself "Why don't we just
+			 * assume every server you get during link phase
+			 * is fully linked?", well.. there's a race condition
+			 * if 2 servers link (almost) at the same time,
+			 * then you would think the other one is fully linked
+			 * while in fact he was not.. -- Syzop.
+			 */
+			if (acptr->serv->flags.synced)
+			{
+				sendto_one(cptr, NULL, ":%s EOS", acptr->id);
+#ifdef DEBUGMODE
+				ircd_log(LOG_ERROR, "[EOSDBG] server_sync: sending to uplink '%s' with src %s...",
+					cptr->name, acptr->name);
+#endif
+			}
+			/* Send SINFO of our servers to their side */
+			broadcast_sinfo(acptr, cptr, NULL);
+			send_moddata_client(cptr, acptr); /* send moddata of server 'acptr' (if any, likely minimal) */
+		}
+	}
+
+	/* Synching nick information */
+	list_for_each_entry_reverse(acptr, &client_list, client_node)
+	{
+		/* acptr->direction == acptr for acptr == cptr */
+		if (acptr->direction == cptr)
+			continue;
+		if (IsUser(acptr))
+			introduce_user(cptr, acptr);
+	}
+	/*
+	   ** Last, pass all channels plus statuses
+	 */
+	{
+		Channel *channel;
+		for (channel = channels; channel; channel = channel->nextch)
+		{
+			send_channel_modes_sjoin3(cptr, channel);
+			if (channel->topic_time)
+				sendto_one(cptr, NULL, "TOPIC %s %s %lld :%s",
+				    channel->chname, channel->topic_nick,
+				    (long long)channel->topic_time, channel->topic);
+			send_moddata_channel(cptr, channel);
+		}
+	}
+	
+	/* Send ModData for all member(ship) structs */
+	send_moddata_members(cptr);
+	
+	/* pass on TKLs */
+	tkl_sync(cptr);
+
+	RunHook(HOOKTYPE_SERVER_SYNC, cptr);
+
+	sendto_one(cptr, NULL, "NETINFO %i %lld %i %s 0 0 0 :%s",
+	    irccounts.global_max, (long long)TStime(), UnrealProtocol,
+	    CLOAK_KEYCRC,
+	    ircnetwork);
+
+	/* Send EOS (End Of Sync) to the just linked server... */
+	sendto_one(cptr, NULL, ":%s EOS", me.id);
+#ifdef DEBUGMODE
+	ircd_log(LOG_ERROR, "[EOSDBG] server_sync: sending to justlinked '%s' with src ME...",
+			cptr->name);
+#endif
+	RunHook(HOOKTYPE_POST_SERVER_CONNECT, cptr);
+	return 0;
+}
+
+/** This will send "to" a full list of the modes for channel channel,
+ *
+ * Half of it recoded by Syzop: the whole buffering and size checking stuff
+ * looked weird and just plain inefficient. We now fill up our send-buffer
+ * really as much as we can, without causing any overflows of course.
+ */
+void send_channel_modes_sjoin3(Client *to, Channel *channel)
+{
+	MessageTag *mtags = NULL;
+	Member *members;
+	Member *lp;
+	Ban *ban;
+	short nomode, nopara;
+	char tbuf[512]; /* work buffer, for temporary data */
+	char buf[1024]; /* send buffer */
+	char *bufptr; /* points somewhere in 'buf' */
+	char *p; /* points to somewhere in 'tbuf' */
+	int prebuflen = 0; /* points to after the <sjointoken> <TS> <chan> <fixmodes> <fixparas <..>> : part */
+	int sent = 0; /* we need this so we send at least 1 message about the channel (eg if +P and no members, no bans, #4459) */
+
+	if (*channel->chname != '#')
+		return;
+
+	nomode = 0;
+	nopara = 0;
+	members = channel->members;
+
+	/* First we'll send channel, channel modes and members and status */
+
+	*modebuf = *parabuf = '\0';
+	channel_modes(to, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), channel);
+
+	if (!modebuf[1])
+		nomode = 1;
+	if (!(*parabuf))
+		nopara = 1;
+
+	/* Generate a new message (including msgid).
+	 * Due to the way SJOIN works, we will use the same msgid for
+	 * multiple SJOIN messages to servers. Rest assured that clients
+	 * will never see these duplicate msgid's though. They
+	 * will see a 'special' version instead with a suffix.
+	 */
+	new_message(&me, NULL, &mtags);
+
+	if (nomode && nopara)
+	{
+		ircsnprintf(buf, sizeof(buf),
+		    ":%s SJOIN %lld %s :", me.id,
+		    (long long)channel->creationtime, channel->chname);
+	}
+	if (nopara && !nomode)
+	{
+		ircsnprintf(buf, sizeof(buf),
+		    ":%s SJOIN %lld %s %s :", me.id,
+		    (long long)channel->creationtime, channel->chname, modebuf);
+	}
+	if (!nopara && !nomode)
+	{
+		ircsnprintf(buf, sizeof(buf),
+		    ":%s SJOIN %lld %s %s %s :", me.id,
+		    (long long)channel->creationtime, channel->chname, modebuf, parabuf);
+	}
+
+	prebuflen = strlen(buf);
+	bufptr = buf + prebuflen;
+
+	/* RULES:
+	 * - Use 'tbuf' as a working buffer, use 'p' to advance in 'tbuf'.
+	 *   Thus, be sure to do a 'p = tbuf' at the top of the loop.
+	 * - When one entry has been build, check if strlen(buf) + strlen(tbuf) > BUFSIZE - 8,
+	 *   if so, do not concat but send the current result (buf) first to the server
+	 *   and reset 'buf' to only the prebuf part (all until the ':').
+	 *   Then, in both cases, concat 'tbuf' to 'buf' and continue
+	 * - Be sure to ALWAYS zero terminate (*p = '\0') when the entry has been build.
+	 * - Be sure to add a space after each entry ;)
+	 *
+	 * For a more illustrated view, take a look at the first for loop, the others
+	 * are pretty much the same.
+	 *
+	 * Follow these rules, and things would be smooth and efficient (network-wise),
+	 * if you ignore them, expect crashes and/or heap corruption, aka: HELL.
+	 * You have been warned.
+	 *
+	 * Side note: of course things would be more efficient if the prebuf thing would
+	 * not be sent every time, but that's another story
+	 *      -- Syzop
+	 */
+
+	for (lp = members; lp; lp = lp->next)
+	{
+		p = tbuf;
+		if (lp->flags & MODE_CHANOP)
+			*p++ = '@';
+		if (lp->flags & MODE_VOICE)
+			*p++ = '+';
+		if (lp->flags & MODE_HALFOP)
+			*p++ = '%';
+		if (lp->flags & MODE_CHANOWNER)
+			*p++ = '*';
+		if (lp->flags & MODE_CHANADMIN)
+			*p++ = '~';
+
+		p = mystpcpy(p, lp->client->id);
+		*p++ = ' ';
+		*p = '\0';
+
+		/* this is: if (strlen(tbuf) + strlen(buf) > BUFSIZE - 8) */
+		if ((p - tbuf) + (bufptr - buf) > BUFSIZE - 8)
+		{
+			/* Would overflow, so send our current stuff right now (except new stuff) */
+			sendto_one(to, mtags, "%s", buf);
+			sent++;
+			bufptr = buf + prebuflen;
+			*bufptr = '\0';
+		}
+		/* concat our stuff.. */
+		bufptr = mystpcpy(bufptr, tbuf);
+	}
+
+	for (ban = channel->banlist; ban; ban = ban->next)
+	{
+		p = tbuf;
+		if (SupportSJSBY(to))
+			p += add_sjsby(p, ban->who, ban->when);
+		*p++ = '&';
+		p = mystpcpy(p, ban->banstr);
+		*p++ = ' ';
+		*p = '\0';
+		
+		/* this is: if (strlen(tbuf) + strlen(buf) > BUFSIZE - 8) */
+		if ((p - tbuf) + (bufptr - buf) > BUFSIZE - 8)
+		{
+			/* Would overflow, so send our current stuff right now (except new stuff) */
+			sendto_one(to, mtags, "%s", buf);
+			sent++;
+			bufptr = buf + prebuflen;
+			*bufptr = '\0';
+		}
+		/* concat our stuff.. */
+		bufptr = mystpcpy(bufptr, tbuf);
+	}
+
+	for (ban = channel->exlist; ban; ban = ban->next)
+	{
+		p = tbuf;
+		if (SupportSJSBY(to))
+			p += add_sjsby(p, ban->who, ban->when);
+		*p++ = '"';
+		p = mystpcpy(p, ban->banstr);
+		*p++ = ' ';
+		*p = '\0';
+		
+		/* this is: if (strlen(tbuf) + strlen(buf) > BUFSIZE - 8) */
+		if ((p - tbuf) + (bufptr - buf) > BUFSIZE - 8)
+		{
+			/* Would overflow, so send our current stuff right now (except new stuff) */
+			sendto_one(to, mtags, "%s", buf);
+			sent++;
+			bufptr = buf + prebuflen;
+			*bufptr = '\0';
+		}
+		/* concat our stuff.. */
+		bufptr = mystpcpy(bufptr, tbuf);
+	}
+
+	for (ban = channel->invexlist; ban; ban = ban->next)
+	{
+		p = tbuf;
+		if (SupportSJSBY(to))
+			p += add_sjsby(p, ban->who, ban->when);
+		*p++ = '\'';
+		p = mystpcpy(p, ban->banstr);
+		*p++ = ' ';
+		*p = '\0';
+		
+		/* this is: if (strlen(tbuf) + strlen(buf) > BUFSIZE - 8) */
+		if ((p - tbuf) + (bufptr - buf) > BUFSIZE - 8)
+		{
+			/* Would overflow, so send our current stuff right now (except new stuff) */
+			sendto_one(to, mtags, "%s", buf);
+			sent++;
+			bufptr = buf + prebuflen;
+			*bufptr = '\0';
+		}
+		/* concat our stuff.. */
+		bufptr = mystpcpy(bufptr, tbuf);
+	}
+
+	if (buf[prebuflen] || !sent)
+		sendto_one(to, mtags, "%s", buf);
+
+	free_message_tags(mtags);
+}
diff --git a/src/modules/sethost.c b/src/modules/sethost.c
new file mode 100644
index 0000000..01be159
--- /dev/null
+++ b/src/modules/sethost.c
@@ -0,0 +1,152 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sethost.c
+ *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sethost);
+
+/* Place includes here */
+#define MSG_SETHOST 	"SETHOST"	/* sethost */
+
+ModuleHeader MOD_HEADER
+  = {
+	"sethost",	/* Name of module */
+	"5.0", /* Version */
+	"command /sethost", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SETHOST, cmd_sethost, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+   cmd_sethost() added by Stskeeps (30/04/1999)
+               (modified at 15/05/1999) by Stskeeps | Potvin
+   :prefix SETHOST newhost
+   parv[1] - newhost
+*/
+CMD_FUNC(cmd_sethost)
+{
+	char *vhost;
+
+	if (MyUser(client) && !ValidatePermissionsForPath("self:set:host",client,NULL,NULL,NULL))
+	{
+  		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc < 2)
+		vhost = NULL;
+	else
+		vhost = parv[1];
+
+	if (BadPtr(vhost))
+	{	
+		if (MyConnect(client))
+			sendnotice(client, "*** Syntax: /SetHost <new host>");
+		return;
+	}
+
+	if (strlen(parv[1]) > (HOSTLEN))
+	{
+		if (MyConnect(client))
+			sendnotice(client, "*** /SetHost Error: Hostnames are limited to %i characters.", HOSTLEN);
+		return;
+	}
+
+	if (!valid_host(vhost))
+	{
+		sendnotice(client, "*** /SetHost Error: A hostname may only contain a-z, A-Z, 0-9, '-' & '.'.");
+		return;
+	}
+	if (vhost[0] == ':')
+	{
+		sendnotice(client, "*** A hostname cannot start with ':'");
+		return;
+	}
+
+	if (MyUser(client) && !strcmp(GetHost(client), vhost))
+	{
+		sendnotice(client, "/SetHost Error: requested host is same as current host.");
+		return;
+	}
+
+	userhost_save_current(client);
+
+	switch (UHOST_ALLOWED)
+	{
+		case UHALLOW_NEVER:
+			if (MyUser(client))
+			{
+				sendnotice(client, "*** /SetHost is disabled");
+				return;
+			}
+			break;
+		case UHALLOW_ALWAYS:
+			break;
+		case UHALLOW_NOCHANS:
+			if (MyUser(client) && client->user->joined)
+			{
+				sendnotice(client, "*** /SetHost can not be used while you are on a channel");
+				return;
+			}
+			break;
+		case UHALLOW_REJOIN:
+			/* join sent later when the host has been changed */
+			break;
+	}
+
+	/* hide it */
+	client->umodes |= UMODE_HIDE;
+	client->umodes |= UMODE_SETHOST;
+	/* get it in */
+	safe_strdup(client->user->virthost, vhost);
+	/* spread it out */
+	sendto_server(client, 0, 0, NULL, ":%s SETHOST %s", client->id, parv[1]);
+
+	userhost_changed(client);
+
+	if (MyConnect(client))
+	{
+		sendto_one(client, NULL, ":%s MODE %s :+xt", client->name, client->name);
+		sendnumeric(client, RPL_HOSTHIDDEN, vhost);
+		sendnotice(client, 
+		    "Your nick!user@host-mask is now (%s!%s@%s) - To disable it type /mode %s -x",
+		     client->name, client->user->username, vhost,
+		    client->name);
+	}
+}
diff --git a/src/modules/setident.c b/src/modules/setident.c
new file mode 100644
index 0000000..05179e3
--- /dev/null
+++ b/src/modules/setident.c
@@ -0,0 +1,131 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/setident.c
+ *   (C) 1999-2001 Carsten Munk (Techie/Stskeeps) <stskeeps@tspre.org>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define MSG_SETIDENT 	"SETIDENT"	/* set ident */
+
+CMD_FUNC(cmd_setident);
+
+ModuleHeader MOD_HEADER
+  = {
+	"setident",	/* Name of module */
+	"5.0", /* Version */
+	"/setident", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SETIDENT, cmd_setident, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_setident - 12/05/1999 - Stskeeps
+ * :prefix SETIDENT newident
+ * parv[1] - newident
+ * D: This will set your username to be <x> (like (/setident Root))
+ * (if you are IRCop) **efg*
+ * Cloning of cmd_sethost at some points - so same authors ;P
+*/
+CMD_FUNC(cmd_setident)
+{
+
+	char *vident, *s;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		if (MyConnect(client))
+			sendnotice(client, "*** Syntax: /SETIDENT <new ident>");
+		return;
+	}
+
+	vident = parv[1];
+
+	switch (UHOST_ALLOWED)
+	{
+		case UHALLOW_ALWAYS:
+			break;
+		case UHALLOW_NEVER:
+			if (MyUser(client))
+			{
+				sendnotice(client, "*** /SETIDENT is disabled");
+				return;
+			}
+			break;
+		case UHALLOW_NOCHANS:
+			if (MyUser(client) && client->user->joined)
+			{
+				sendnotice(client, "*** /SETIDENT cannot be used while you are on a channel");
+				return;
+			}
+			break;
+		case UHALLOW_REJOIN:
+			/* dealt with later */
+			break;
+	}
+
+	if (strlen(vident) > USERLEN)
+	{
+		if (MyConnect(client))
+			sendnotice(client, "*** /SETIDENT Error: Usernames are limited to %i characters.", USERLEN);
+		return;
+	}
+
+	/* Check if the new ident contains illegal characters */
+	for (s = vident; *s; s++)
+	{
+		if ((*s == '~') && (s == vident))
+			continue;
+		if (!isallowed(*s))
+		{
+			sendnotice(client, "*** /SETIDENT Error: A username may contain a-z, A-Z, 0-9, '-', '~' & '.'.");
+			return;
+		}
+	}
+
+	userhost_save_current(client);
+
+	strlcpy(client->user->username, vident, sizeof(client->user->username));
+
+	sendto_server(client, 0, 0, NULL, ":%s SETIDENT %s", client->id, parv[1]);
+
+	userhost_changed(client);
+
+	if (MyConnect(client))
+	{
+		sendnotice(client, "Your nick!user@host-mask is now (%s!%s@%s)",
+		                 client->name, client->user->username, GetHost(client));
+	}
+}
diff --git a/src/modules/setname.c b/src/modules/setname.c
new file mode 100644
index 0000000..eb75a6b
--- /dev/null
+++ b/src/modules/setname.c
@@ -0,0 +1,118 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/setname.c
+ *   (c) 1999-2001 Dominick Meglio (codemastr) <codemastr@unrealircd.com>
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_setname);
+
+#define MSG_SETNAME 	"SETNAME"	/* setname */
+
+ModuleHeader MOD_HEADER
+  = {
+	"setname",	/* Name of module */
+	"5.0", /* Version */
+	"command /setname", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SETNAME, cmd_setname, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_setname - 12/05/1999 - Stskeeps
+ * :prefix SETNAME :gecos
+ * parv[1] - gecos
+ * D: This will set your gecos to be <x> (like (/setname :The lonely wanderer))
+   yes it is experimental but anyways ;P
+    FREEDOM TO THE USERS! ;) 
+*/ 
+CMD_FUNC(cmd_setname)
+{
+	int xx;
+	char tmpinfo[REALLEN + 1];
+	char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64];
+	ConfigItem_ban *bconf;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SETNAME");
+		return;
+	}
+
+	if (strlen(parv[1]) > REALLEN)
+	{
+		if (MyConnect(client))
+		{
+			sendnotice(client, "*** /SetName Error: \"Real names\" may maximum be %i characters of length",
+				REALLEN);
+		}
+		return;
+	}
+
+	if (MyUser(client))
+	{
+		/* set temp info for spamfilter check*/
+		strcpy(tmpinfo, client->info);
+		/* set the new name before we check, but don't send to servers unless it is ok */
+		strcpy(client->info, parv[1]);
+		spamfilter_build_user_string(spamfilter_user, client->name, client);
+		if (match_spamfilter(client, spamfilter_user, SPAMF_USER, NULL, 0, NULL))
+		{
+			/* Was rejected by spamfilter, restore the realname */
+			strcpy(client->info, tmpinfo);
+			return;
+		}
+
+		/* Check for realname bans here too */
+		if (!ValidatePermissionsForPath("immune:server-ban:ban-realname",client,NULL,NULL,NULL) &&
+		    ((bconf = find_ban(NULL, client->info, CONF_BAN_REALNAME))))
+		{
+			banned_client(client, "realname", bconf->reason?bconf->reason:"", 0, 0);
+			return;
+		}
+	} else {
+		/* remote user */
+		strcpy(client->info, parv[1]);
+	}
+
+	sendto_server(client, 0, 0, NULL, ":%s SETNAME :%s", client->id, parv[1]);
+
+	if (MyConnect(client))
+	{
+		sendnotice(client, "Your \"real name\" is now set to be %s - you have to set it manually to undo it",
+		           parv[1]);
+	}
+}
diff --git a/src/modules/silence.c b/src/modules/silence.c
new file mode 100644
index 0000000..6fd6bb3
--- /dev/null
+++ b/src/modules/silence.c
@@ -0,0 +1,240 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/silence.c
+ *   (C) 2004- The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_silence);
+
+ModuleHeader MOD_HEADER
+  = {
+	"silence",
+	"5.0",
+	"command /silence", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Structs */
+typedef struct Silence Silence;
+/** A /SILENCE entry */
+struct Silence
+{
+	Silence *prev, *next;
+	char mask[1]; /**< user!nick@host mask of silence entry */
+};
+
+/* Global variables */
+ModDataInfo *silence_md = NULL;
+
+/* Macros */
+#define SILENCELIST(x)       ((Silence *)moddata_local_client(x, silence_md).ptr)
+
+/* Forward declarations */
+int _is_silenced(Client *, Client *);
+int _del_silence(Client *client, const char *mask);
+int _add_silence(Client *client, const char *mask, int senderr);
+void silence_md_free(ModData *md);
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	EfunctionAdd(modinfo->handle, EFUNC_ADD_SILENCE, _add_silence);
+	EfunctionAdd(modinfo->handle, EFUNC_DEL_SILENCE, _del_silence);
+	EfunctionAdd(modinfo->handle, EFUNC_IS_SILENCED, _is_silenced);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "silence";
+	mreq.type = MODDATATYPE_LOCAL_CLIENT;
+	mreq.free = silence_md_free;
+	silence_md = ModDataAdd(modinfo->handle, mreq);
+	if (!silence_md)
+	{
+		config_error("could not register silence moddata");
+		return MOD_FAILED;
+	}
+	CommandAdd(modinfo->handle, "SILENCE", cmd_silence, MAXPARA, CMD_USER);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** The /SILENCE command - server-side ignore list.
+ * Syntax:
+ * SILENCE +user  To add a user from the silence list
+ * SILENCE -user  To remove a user from the silence list
+ * SILENCE        To send the current silence list
+ *
+ */
+
+CMD_FUNC(cmd_silence)
+{
+	Silence *s;
+	char action, *p;
+
+	if (MyUser(client))
+	{
+		if (parc < 2 || BadPtr(parv[1]))
+		{
+			for (s = SILENCELIST(client); s; s = s->next)
+				sendnumeric(client, RPL_SILELIST, s->mask);
+			sendnumeric(client, RPL_ENDOFSILELIST);
+			return;
+		}
+		p = parv[1];
+		action = *p;
+		if (action == '-' || action == '+')
+		{
+			p++;
+		} else
+		if (!strchr(p, '@') && !strchr(p, '.') && !strchr(p, '!') && !strchr(p, '*') && !find_person(p, NULL))
+		{
+			sendnumeric(client, ERR_NOSUCHNICK, parv[1]);
+			return;
+		} else
+		{
+			action = '+';
+		}
+		p = pretty_mask(p);
+		if ((action == '-' && del_silence(client, p)) ||
+		    (action != '-' && add_silence(client, p, 1)))
+		{
+			sendto_prefix_one(client, client, NULL, ":%s SILENCE %c%s",
+			    client->name, action, p);
+		}
+		return;
+	}
+
+	/* Probably server to server traffic.
+	 * We don't care about this anymore on UnrealIRCd 5 and later.
+	 */
+}
+
+/** Delete item from the silence list.
+ * @param client The client.
+ * @param mask The mask to delete from the list.
+ * @returns 1 if entry was found and deleted, 0 if not found.
+ */
+int _del_silence(Client *client, const char *mask)
+{
+	Silence *s;
+
+	for (s = SILENCELIST(client); s; s = s->next)
+	{
+		if (mycmp(mask, s->mask) == 0)
+		{
+			DelListItemUnchecked(s, moddata_local_client(client, silence_md).ptr);
+			safe_free(s);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+/** Add item to the silence list.
+ * @param client The client.
+ * @param mask The mask to add to the list.
+ * @returns 1 if silence entry added,
+ *          0 if not added, eg: full or already covered by an existing silence entry.
+ */
+int _add_silence(Client *client, const char *mask, int senderr)
+{
+	Silence *s;
+	int cnt = 0;
+
+	if (!MyUser(client))
+		return 0;
+
+	for (s = SILENCELIST(client); s; s = s->next)
+	{
+		if ((strlen(s->mask) > MAXSILELENGTH) || (++cnt >= SILENCE_LIMIT))
+		{
+			if (senderr)
+				sendnumeric(client, ERR_SILELISTFULL, mask);
+			return 0;
+		}
+		else
+		{
+			if (match_simple(s->mask, mask))
+				return 0;
+		}
+	}
+
+	/* Add the new entry */
+	s = safe_alloc(sizeof(Silence)+strlen(mask));
+	strcpy(s->mask, mask); /* safe, allocated above */
+	AddListItemUnchecked(s, moddata_local_client(client, silence_md).ptr);
+	return 1;
+}
+
+/** Check whether sender is silenced by receiver.
+ * @param sender    The client that intends to send a message.
+ * @param receiver  The client that would receive the message.
+ * @returns 1 if sender is silenced by receiver (do NOT send the message),
+ *          0 if not silenced (go ahead and send).
+ */
+int _is_silenced(Client *sender, Client *receiver)
+{
+	Silence *s;
+	char mask[HOSTLEN + NICKLEN + USERLEN + 5];
+
+	if (!MyUser(receiver) || !receiver->user || !sender->user || !SILENCELIST(receiver))
+		return 0;
+
+	ircsnprintf(mask, sizeof(mask), "%s!%s@%s", sender->name, sender->user->username, GetHost(sender));
+
+	for (s = SILENCELIST(receiver); s; s = s->next)
+	{
+		if (match_simple(s->mask, mask))
+			return 1;
+	}
+
+	return 0;
+}
+
+/** Called on client exit: free the silence list of this user */
+void silence_md_free(ModData *md)
+{
+	Silence *b, *b_next;
+
+	for (b = md->ptr; b; b = b_next)
+	{
+		b_next = b->next;
+		safe_free(b);
+	}
+	md->ptr = NULL;
+}
diff --git a/src/modules/sinfo.c b/src/modules/sinfo.c
new file mode 100644
index 0000000..d41eedf
--- /dev/null
+++ b/src/modules/sinfo.c
@@ -0,0 +1,163 @@
+/*
+ * cmd_sinfo - Server information
+ * (C) Copyright 2019 Bram Matthys (Syzop) and the UnrealIRCd team.
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"sinfo",
+	"5.0",
+	"Server information",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Forward declarations */
+CMD_FUNC(cmd_sinfo);
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	CommandAdd(modinfo->handle, "SINFO", cmd_sinfo, MAXPARA, CMD_USER|CMD_SERVER);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** SINFO server-to-server command.
+ * Technical documentation is available at:
+ * https://www.unrealircd.org/docs/Server_protocol:SINFO_command
+ * ^ contains important remarks regarding when to send it and when not.
+ */
+CMD_FUNC(sinfo_server)
+{
+	char buf[512];
+
+	if (MyConnect(client))
+	{
+		/* It is a protocol violation to send an SINFO for yourself,
+		 * eg if you are server 001, then you cannot send :001 SINFO ....
+		 * Exiting the client may seem harsh, but this way we force users
+		 * to use the correct protocol. If we would not do this then some
+		 * services coders may think they should use only SINFO while in
+		 * fact for directly connected servers they should use things like
+		 * PROTOCTL CHANMODES=... USERMODES=... NICKCHARS=.... etc, and
+		 * failure to do so will lead to potential desyncs or other major
+		 * issues.
+		 */
+		exit_client(client, NULL, "Protocol error: you cannot send SINFO about yourself");
+		return;
+	}
+
+	/* :SID SINFO up_since protocol umodes chanmodes nickchars :software name
+	 *               1        2        3      4        5        6 (last one)
+	 * If we extend it then 'software name' will still be the last one, so
+	 * it may become 7, 8 or 9. New elements are inserted right before it.
+	 */
+
+	if ((parc < 6) || BadPtr(parv[6]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SINFO");
+		return;
+	}
+
+	client->serv->boottime = atol(parv[1]);
+	client->serv->features.protocol = atoi(parv[2]);
+
+	if (!strcmp(parv[3], "*"))
+		safe_free(client->serv->features.usermodes);
+	else
+		safe_strdup(client->serv->features.usermodes, parv[3]);
+
+	if (!strcmp(parv[4], "*"))
+	{
+		safe_free(client->serv->features.chanmodes[0]);
+		safe_free(client->serv->features.chanmodes[1]);
+		safe_free(client->serv->features.chanmodes[2]);
+		safe_free(client->serv->features.chanmodes[3]);
+	} else {
+		parse_chanmodes_protoctl(client, parv[4]);
+	}
+
+	if (!strcmp(parv[5], "*"))
+		safe_free(client->serv->features.nickchars);
+	else
+		safe_strdup(client->serv->features.nickchars, parv[5]);
+
+	/* Software is always the last parameter. It is currently parv[6]
+	 * but may change later. So always use parv[parc-1].
+	 */
+	if (!strcmp(parv[parc-1], "*"))
+		safe_free(client->serv->features.software);
+	else
+		safe_strdup(client->serv->features.software, parv[parc-1]);
+
+	/* Broadcast to 'the other side' of the net */
+	concat_params(buf, sizeof(buf), parc, parv);
+	sendto_server(client, 0, 0, NULL, ":%s SINFO %s", client->id, buf);
+}
+
+#define SafeDisplayStr(x)  ((x && *(x)) ? (x) : "-")
+CMD_FUNC(sinfo_user)
+{
+	Client *acptr;
+
+	if (!IsOper(client))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	list_for_each_entry(acptr, &global_server_list, client_node)
+	{
+		sendtxtnumeric(client, "*** Server %s:", acptr->name);
+		sendtxtnumeric(client, "Protocol: %d",
+		               acptr->serv->features.protocol);
+		sendtxtnumeric(client, "Software: %s",
+		               SafeDisplayStr(acptr->serv->features.software));
+		if (!acptr->serv->boottime)
+		{
+			sendtxtnumeric(client, "Up since: -");
+			sendtxtnumeric(client, "Uptime: -");
+		} else {
+			sendtxtnumeric(client, "Up since: %s",
+			               pretty_date(acptr->serv->boottime));
+			sendtxtnumeric(client, "Uptime: %s",
+			               pretty_time_val(TStime() - acptr->serv->boottime));
+		}
+		sendtxtnumeric(client, "User modes: %s",
+		               SafeDisplayStr(acptr->serv->features.usermodes));
+		if (!acptr->serv->features.chanmodes[0])
+		{
+			sendtxtnumeric(client, "Channel modes: -");
+		} else {
+			sendtxtnumeric(client, "Channel modes: %s,%s,%s,%s",
+			               SafeDisplayStr(acptr->serv->features.chanmodes[0]),
+			               SafeDisplayStr(acptr->serv->features.chanmodes[1]),
+			               SafeDisplayStr(acptr->serv->features.chanmodes[2]),
+			               SafeDisplayStr(acptr->serv->features.chanmodes[3]));
+		}
+		sendtxtnumeric(client, "Allowed nick characters: %s",
+		               SafeDisplayStr(acptr->serv->features.nickchars));
+	}
+}
+
+CMD_FUNC(cmd_sinfo)
+{
+	if (IsServer(client))
+		sinfo_server(client, recv_mtags, parc, parv);
+	else if (MyUser(client))
+		sinfo_user(client, recv_mtags, parc, parv);
+}
diff --git a/src/modules/sjoin.c b/src/modules/sjoin.c
new file mode 100644
index 0000000..3a8048c
--- /dev/null
+++ b/src/modules/sjoin.c
@@ -0,0 +1,906 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sjoin.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sjoin);
+
+#define MSG_SJOIN 	"SJOIN"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"sjoin",
+	"5.0",
+	"command /sjoin", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SJOIN, cmd_sjoin, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+typedef struct xParv aParv;
+struct xParv {
+	int  parc;
+	char *parv[256];
+};
+
+aParv pparv;
+
+aParv *mp2parv(char *xmbuf, char *parmbuf)
+{
+	int  c;
+	char *p, *s;
+
+	pparv.parv[0] = xmbuf;
+	c = 1;
+	
+	for (s = strtoken(&p, parmbuf, " "); s; s = strtoken(&p, NULL, " "))
+	{
+		pparv.parv[c] = s;
+		c++; /* in my dreams */
+	}
+	pparv.parv[c] = NULL;
+	pparv.parc = c;
+	return (&pparv);
+}
+
+void send_local_chan_mode(MessageTag *recv_mtags, Client *client, Channel *channel, char *modebuf, char *parabuf)
+{
+	MessageTag *mtags = NULL;
+
+	new_message_special(client, recv_mtags, &mtags, ":%s MODE %s %s %s", client->name, channel->chname, modebuf, parabuf);
+	sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+	               ":%s MODE %s %s %s", client->name, channel->chname, modebuf, parabuf);
+	if (MyConnect(client))
+		RunHook7(HOOKTYPE_LOCAL_CHANMODE, client, channel, mtags, modebuf, parabuf, 0, -1);
+	else
+		RunHook7(HOOKTYPE_REMOTE_CHANMODE, client, channel, mtags, modebuf, parabuf, 0, -1);
+	free_message_tags(mtags);
+}
+
+/** SJOIN: Synchronize channel modes, +beI lists and users (server-to-server command)
+ * Extensive technical documentation is available at:
+ * https://www.unrealircd.org/docs/Server_protocol:SJOIN_command
+ *
+ *  parv[1] = channel timestamp
+ *  parv[2] = channel name
+ *
+ *  if parc == 3:
+ *  parv[3] = nick names + modes - all in one parameter
+ *
+ *  if parc == 4:
+ *  parv[3] = channel modes
+ *  parv[4] = nick names + modes - all in one parameter
+ *
+ *  if parc > 4:
+ *  parv[3] = channel modes
+ *  parv[4 to parc - 2] = mode parameters
+ *  parv[parc - 1] = nick names + modes
+ */
+
+/* Note: with regards to message tags we use new_message_special()
+ *       here extensively. This because one SJOIN command can (often)
+ *       generate multiple events that are sent to clients,
+ *       for example 1 SJOIN can cause multiple joins, +beI, etc.
+ *       -- Syzop
+ */
+
+/* Some ugly macros, but useful */
+#define Addit(mode,param) if ((strlen(parabuf) + strlen(param) + 11 < MODEBUFLEN) && (b <= MAXMODEPARAMS)) { \
+	if (*parabuf) \
+		strcat(parabuf, " ");\
+	strcat(parabuf, param);\
+	modebuf[b++] = mode;\
+	modebuf[b] = 0;\
+}\
+else {\
+	send_local_chan_mode(recv_mtags, client, channel, modebuf, parabuf); \
+	strcpy(parabuf,param);\
+	/* modebuf[0] should stay what it was ('+' or '-') */ \
+	modebuf[1] = mode;\
+	modebuf[2] = '\0';\
+	b = 2;\
+}
+#define Addsingle(x) do { modebuf[b] = x; b++; modebuf[b] = '\0'; } while(0)
+#define CheckStatus(x,y) do { if (modeflags & (y)) { Addit((x), acptr->name); } } while(0)
+
+CMD_FUNC(cmd_sjoin)
+{
+	unsigned short nopara;
+	unsigned short nomode; /**< An SJOIN without MODE? */
+	unsigned short removeours; /**< Remove our modes */
+	unsigned short removetheirs; /**< Remove their modes (or actually: do not ADD their modes, the MODE -... line will be sent later by the other side) */
+	unsigned short merge;	/**< same timestamp: merge their & our modes */
+	char pvar[MAXMODEPARAMS][MODEBUFLEN + 3];
+	char cbuf[1024];
+	char nick[1024]; /**< nick or ban/invex/exempt being processed */
+	char scratch_buf[1024]; /**< scratch buffer */
+	char prefix[16]; /**< prefix of nick for server to server traffic (eg: @) */
+	char uid_buf[BUFSIZE];  /**< Buffer for server-to-server traffic which will be broadcasted to others (servers supporting SID/UID) */
+	char uid_sjsby_buf[BUFSIZE];  /**< Buffer for server-to-server traffic which will be broadcasted to others (servers supporting SID/UID and SJSBY) */
+	char sj3_parabuf[BUFSIZE]; /**< Prefix for the above SJOIN buffers (":xxx SJOIN #channel +mode :") */
+	char *s = NULL;
+	Channel *channel; /**< Channel */
+	aParv *ap;
+	int pcount, i;
+	Hook *h;
+	time_t ts, oldts;
+	unsigned short b=0;
+	char *tp, *p, *saved = NULL;
+	long modeflags;
+	char queue_s=0, queue_c=0; /* oh this is soooooo ugly :p */
+	
+	if (!IsServer(client) || parc < 4)
+		return;
+
+	if (!IsChannelName(parv[2]))
+		return;
+
+	merge = nopara = nomode = removeours = removetheirs = 0;
+
+	if (parc < 6)
+		nopara = 1;
+
+	if (parc < 5)
+		nomode = 1;
+
+	channel = get_channel(client, parv[2], CREATE);
+
+	ts = (time_t)atol(parv[1]);
+
+	if (channel->creationtime > ts)
+	{
+		removeours = 1;
+		oldts = channel->creationtime;
+		channel->creationtime = ts;
+	}
+	else if ((channel->creationtime < ts) && (channel->creationtime != 0))
+	{
+		removetheirs = 1;
+	}
+	else if (channel->creationtime == ts)
+	{
+		merge = 1;
+	}
+
+	if (channel->creationtime == 0)
+	{
+		oldts = -1;
+		channel->creationtime = ts;
+	}
+	else
+	{
+		oldts = channel->creationtime;
+	}
+
+	// FIXME: make it so services cannot screw this up so easily --- if possible...
+	if (ts < 750000)
+	{
+		if (ts != 0)
+			sendto_ops
+			    ("Warning! Possible desync: SJOIN for channel %s has a fishy timestamp (%lld) [%s/%s]",
+			    channel->chname, (long long)ts, client->name, client->direction->name);
+	}
+
+	parabuf[0] = '\0';
+	modebuf[0] = '+';
+	modebuf[1] = '\0';
+
+	/* Grab current modes -> modebuf & parabuf */
+	channel_modes(client, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf), channel);
+
+	/* Do we need to remove all our modes, bans/exempt/inves lists and -vhoaq our users? */
+	if (removeours)
+	{
+		Member *lp;
+		Membership *lp2;
+
+		modebuf[0] = '-';
+
+		/* remove our modes if any */
+		if (modebuf[1] != '\0')
+		{
+			MessageTag *mtags = NULL;
+			ap = mp2parv(modebuf, parabuf);
+			set_mode(channel, client, ap->parc, ap->parv, &pcount, pvar, 0);
+			send_local_chan_mode(recv_mtags, client, channel, modebuf, parabuf);
+		}
+		/* remove bans */
+		/* reset the buffers */
+		modebuf[0] = '-';
+		modebuf[1] = '\0';
+		parabuf[0] = '\0';
+		b = 1;
+		while(channel->banlist)
+		{
+			Ban *ban = channel->banlist;
+			Addit('b', ban->banstr);
+			channel->banlist = ban->next;
+			safe_free(ban->banstr);
+			safe_free(ban->who);
+			free_ban(ban);
+		}
+		while(channel->exlist)
+		{
+			Ban *ban = channel->exlist;
+			Addit('e', ban->banstr);
+			channel->exlist = ban->next;
+			safe_free(ban->banstr);
+			safe_free(ban->who);
+			free_ban(ban);
+		}
+		while(channel->invexlist)
+		{
+			Ban *ban = channel->invexlist;
+			Addit('I', ban->banstr);
+			channel->invexlist = ban->next;
+			safe_free(ban->banstr);
+			safe_free(ban->who);
+			free_ban(ban);
+		}
+		for (lp = channel->members; lp; lp = lp->next)
+		{
+			lp2 = find_membership_link(lp->client->user->channel, channel);
+			if (!lp2)
+			{
+				sendto_realops("Oops! channel->members && !find_membership_link");
+				continue;
+			}
+			if (lp->flags & MODE_CHANOWNER)
+			{
+				lp->flags &= ~MODE_CHANOWNER;
+				Addit('q', lp->client->name);
+			}
+			if (lp->flags & MODE_CHANADMIN)
+			{
+				lp->flags &= ~MODE_CHANADMIN;
+				Addit('a', lp->client->name);
+			}
+			if (lp->flags & MODE_CHANOP)
+			{
+				lp->flags &= ~MODE_CHANOP;
+				Addit('o', lp->client->name);
+			}
+			if (lp->flags & MODE_HALFOP)
+			{
+				lp->flags &= ~MODE_HALFOP;
+				Addit('h', lp->client->name);
+			}
+			if (lp->flags & MODE_VOICE)
+			{
+				lp->flags &= ~MODE_VOICE;
+				Addit('v', lp->client->name);
+			}
+			/* Those should always match anyways  */
+			lp2->flags = lp->flags;
+		}
+		if (b > 1)
+		{
+			modebuf[b] = '\0';
+			send_local_chan_mode(recv_mtags, client, channel, modebuf, parabuf);
+		}
+
+		/* since we're dropping our modes, we want to clear the mlock as well. --nenolod */
+		set_channel_mlock(client, channel, NULL, FALSE);
+	}
+	/* Mode setting done :), now for our beloved clients */
+	parabuf[0] = 0;
+	modebuf[0] = '+';
+	modebuf[1] = '\0';
+	b = 1;
+	strlcpy(cbuf, parv[parc-1], sizeof cbuf);
+
+	sj3_parabuf[0] = '\0';
+	for (i = 2; i <= (parc - 2); i++)
+	{
+		if (!parv[i])
+		{
+			sendto_ops("Got null parv in SJ3 code");
+			continue;
+		}
+		strlcat(sj3_parabuf, parv[i], sizeof sj3_parabuf);
+		if (((i + 1) <= (parc - 2)))
+			strlcat(sj3_parabuf, " ", sizeof sj3_parabuf);
+	}
+
+	/* Now process adding of users & adding of list modes (bans/exempt/invex) */
+
+	snprintf(uid_buf, sizeof uid_buf, ":%s SJOIN %lld %s :", client->id, (long long)ts, sj3_parabuf);
+	snprintf(uid_sjsby_buf, sizeof uid_sjsby_buf, ":%s SJOIN %lld %s :", client->id, (long long)ts, sj3_parabuf);
+
+	for (s = strtoken(&saved, cbuf, " "); s; s = strtoken(&saved, NULL, " "))
+	{
+		char *setby = client->name; /**< Set by (nick, nick!user@host, or server name) */
+		time_t setat = TStime(); /**< Set at timestamp */
+		int sjsby_info = 0; /**< Set to 1 if we receive SJSBY info to alter the above 2 vars */
+
+		modeflags = 0;
+		i = 0;
+		tp = s;
+
+		/* UnrealIRCd 4.2.2 and later support "SJSBY" which allows communicating
+		 * setat/setby information for bans, ban exempts and invite exceptions.
+		 */
+		if (SupportSJSBY(client->direction) && (*tp == '<'))
+		{
+			/* Special prefix to communicate timestamp and setter:
+			 * "<" + timestamp + "," + nick[!user@host] + ">" + normal SJOIN stuff
+			 * For example: "<12345,nick>&some!nice@ban"
+			 */
+			char *end = strchr(tp, '>'), *p;
+			if (!end)
+			{
+				/* this obviously should never happen */
+				sendto_ops("Malformed SJOIN piece from %s for channel %s: %s",
+					client->name, channel->chname, tp);
+				continue;
+			}
+			*end++ = '\0';
+
+			p = strchr(tp, ',');
+			if (!p)
+			{
+				/* missing setby parameter */
+				sendto_ops("Malformed SJOIN piece from %s for channel %s: %s",
+					client->name, channel->chname, tp);
+				continue;
+			}
+			*p++ = '\0';
+
+			setat = atol(tp+1);
+			setby = p;
+			sjsby_info = 1;
+
+			tp = end; /* the remainder is used for the actual ban/exempt/invex */
+		}
+
+		while (
+		    (*tp == '@') || (*tp == '+') || (*tp == '%')
+		    || (*tp == '*') || (*tp == '~') || (*tp == '&')
+		    || (*tp == '"') || (*tp == '\''))
+		{
+			switch (*(tp++))
+			{
+			  case '@':
+				  modeflags |= CHFL_CHANOP;
+				  break;
+			  case '%':
+				  modeflags |= CHFL_HALFOP;
+				  break;
+			  case '+':
+				  modeflags |= CHFL_VOICE;
+				  break;
+			  case '*':
+				  modeflags |= CHFL_CHANOWNER;
+				  break;
+			  case '~':
+				  modeflags |= CHFL_CHANADMIN;
+				  break;
+			  case '&':
+				  modeflags = CHFL_BAN;
+				  goto getnick;
+			  case '"':
+				  modeflags = CHFL_EXCEPT;
+				  goto getnick;
+			  case '\'':
+				  modeflags = CHFL_INVEX;
+				  goto getnick;
+			}
+		}
+getnick:
+
+		/* First, set the appropriate prefix for server to server traffic.
+		 * Note that 'prefix' is a 16 byte buffer but it's safe due to the limited
+		 * number of choices as can be seen below:
+		 */
+		*prefix = '\0';
+		p = prefix;
+		if (modeflags == CHFL_INVEX)
+			*p++ = '\'';
+		else if (modeflags == CHFL_EXCEPT)
+			*p++ = '\"';
+		else if (modeflags == CHFL_BAN)
+			*p++ = '&';
+		else
+		{
+			/* multiple options possible at the same time */
+			if (modeflags & CHFL_CHANOWNER)
+				*p++ = '*';
+			if (modeflags & CHFL_CHANADMIN)
+				*p++ = '~';
+			if (modeflags & CHFL_CHANOP)
+				*p++ = '@';
+			if (modeflags & CHFL_HALFOP)
+				*p++ = '%';
+			if (modeflags & CHFL_VOICE)
+				*p++ = '+';
+		}
+		*p = '\0';
+
+		/* Now copy the "nick" (which can actually be a ban/invex/exempt).
+		 * There's no size checking here but nick is 1024 bytes and we
+		 * have 512 bytes input max.
+		 */
+		i = 0;
+		while ((*tp != ' ') && (*tp != '\0'))
+			nick[i++] = *(tp++);	/* get nick */
+		nick[i] = '\0';
+		if (nick[0] == ' ')
+			continue;
+		if (nick[0] == '\0')
+			continue;
+		Debug((DEBUG_DEBUG, "Got nick: %s", nick));
+		if (!(modeflags & CHFL_BAN) && !(modeflags & CHFL_EXCEPT) && !(modeflags & CHFL_INVEX))
+		{
+			Client *acptr;
+
+			/* A person joining */
+
+			/* The user may no longer exist. This can happen in case of a
+			 * SVSKILL traveling in the other direction. Nothing to worry about.
+			 */
+			if (!(acptr = find_person(nick, NULL)))
+				continue;
+
+			if (acptr->direction != client->direction)
+			{
+				if (IsMember(acptr, channel))
+				{
+					/* Nick collision, don't kick or it desyncs -Griever*/
+					continue;
+				}
+			
+				sendto_one(client, NULL,
+				    ":%s KICK %s %s :Fake direction",
+				    me.id, channel->chname, acptr->name);
+				sendto_realops
+				    ("Fake direction from user %s in SJOIN from %s(%s) at %s",
+				    nick, client->srvptr->name,
+				    client->name, channel->chname);
+				continue;
+			}
+
+			if (removetheirs)
+			{
+				modeflags = 0;
+			}
+
+			if (!IsMember(acptr, channel))
+			{
+				/* User joining the channel, send JOIN to local users.
+				 */
+				MessageTag *mtags = NULL;
+
+				add_user_to_channel(channel, acptr, modeflags);
+				RunHook4(HOOKTYPE_REMOTE_JOIN, acptr, channel, recv_mtags, NULL);
+				new_message_special(acptr, recv_mtags, &mtags, ":%s JOIN %s", acptr->name, channel->chname);
+				send_join_to_local_users(acptr, channel, mtags);
+				free_message_tags(mtags);
+			}
+
+			CheckStatus('q', CHFL_CHANOWNER);
+			CheckStatus('a', CHFL_CHANADMIN);
+			CheckStatus('o', CHFL_CHANOP);
+			CheckStatus('h', CHFL_HALFOP);
+			CheckStatus('v', CHFL_VOICE);
+
+			if (strlen(uid_buf) + strlen(prefix) + IDLEN > BUFSIZE - 10)
+			{
+				/* Send what we have and start a new buffer */
+				sendto_server(client, 0, PROTO_SJSBY, recv_mtags, "%s", uid_buf);
+				snprintf(uid_buf, sizeof(uid_buf), ":%s SJOIN %lld %s :", client->id, (long long)ts, sj3_parabuf);
+				/* Double-check the new buffer is sufficient to concat the data */
+				if (strlen(uid_buf) + strlen(prefix) + strlen(acptr->id) > BUFSIZE - 5)
+				{
+					ircd_log(LOG_ERROR, "Oversized SJOIN: '%s' + '%s%s'",
+						uid_buf, prefix, acptr->id);
+					sendto_realops("Oversized SJOIN for %s -- see ircd log", channel->chname);
+					continue;
+				}
+			}
+			sprintf(uid_buf+strlen(uid_buf), "%s%s ", prefix, acptr->id);
+
+			if (strlen(uid_sjsby_buf) + strlen(prefix) + IDLEN > BUFSIZE - 10)
+			{
+				/* Send what we have and start a new buffer */
+				sendto_server(client, 0, PROTO_SJSBY, recv_mtags, "%s", uid_sjsby_buf);
+				snprintf(uid_sjsby_buf, sizeof(uid_sjsby_buf), ":%s SJOIN %lld %s :", client->id, (long long)ts, sj3_parabuf);
+				/* Double-check the new buffer is sufficient to concat the data */
+				if (strlen(uid_sjsby_buf) + strlen(prefix) + strlen(acptr->id) > BUFSIZE - 5)
+				{
+					ircd_log(LOG_ERROR, "Oversized SJOIN: '%s' + '%s%s'",
+						uid_sjsby_buf, prefix, acptr->id);
+					sendto_realops("Oversized SJOIN for %s -- see ircd log", channel->chname);
+					continue;
+				}
+			}
+			sprintf(uid_sjsby_buf+strlen(uid_sjsby_buf), "%s%s ", prefix, acptr->id);
+		}
+		else
+		{
+			if (removetheirs)
+				continue;
+
+			/* For list modes (beI): validate the syntax */
+			if (modeflags & (CHFL_BAN|CHFL_EXCEPT|CHFL_INVEX))
+			{
+				char *str;
+				
+				/* non-extbans: prevent bans without ! or @. a good case of "should never happen". */
+				if ((nick[0] != '~') && (!strchr(nick, '!') || !strchr(nick, '@') || (nick[0] == '!')))
+					continue;
+				
+				str = clean_ban_mask(nick, MODE_ADD, client);
+				if (!str)
+					continue; /* invalid ban syntax */
+				strlcpy(nick, str, sizeof(nick));
+			}
+			
+			/* Adding of list modes */
+			if (modeflags & CHFL_BAN)
+			{
+				if (add_listmode_ex(&channel->banlist, client, channel, nick, setby, setat) != -1)
+				{
+					Addit('b', nick);
+				}
+			}
+			if (modeflags & CHFL_EXCEPT)
+			{
+				if (add_listmode_ex(&channel->exlist, client, channel, nick, setby, setat) != -1)
+				{
+					Addit('e', nick);
+				}
+			}
+			if (modeflags & CHFL_INVEX)
+			{
+				if (add_listmode_ex(&channel->invexlist, client, channel, nick, setby, setat) != -1)
+				{
+					Addit('I', nick);
+				}
+			}
+
+			if (strlen(uid_buf) + strlen(prefix) + strlen(nick) > BUFSIZE - 10)
+			{
+				/* Send what we have and start a new buffer */
+				sendto_server(client, 0, PROTO_SJSBY, recv_mtags, "%s", uid_buf);
+				snprintf(uid_buf, sizeof(uid_buf), ":%s SJOIN %lld %s :", client->id, (long long)ts, sj3_parabuf);
+				/* Double-check the new buffer is sufficient to concat the data */
+				if (strlen(uid_buf) + strlen(prefix) + strlen(nick) > BUFSIZE - 5)
+				{
+					ircd_log(LOG_ERROR, "Oversized SJOIN: '%s' + '%s%s'",
+						uid_buf, prefix, nick);
+					sendto_realops("Oversized SJOIN for %s -- see ircd log", channel->chname);
+					continue;
+				}
+			}
+			sprintf(uid_buf+strlen(uid_buf), "%s%s ", prefix, nick);
+
+			*scratch_buf = '\0';
+			if (sjsby_info)
+				add_sjsby(scratch_buf, setby, setat);
+			strcat(scratch_buf, prefix);
+			strcat(scratch_buf, nick);
+			strcat(scratch_buf, " ");
+			if (strlen(uid_sjsby_buf) + strlen(scratch_buf) > BUFSIZE - 10)
+			{
+				/* Send what we have and start a new buffer */
+				sendto_server(client, PROTO_SJSBY, 0, recv_mtags, "%s", uid_sjsby_buf);
+				snprintf(uid_sjsby_buf, sizeof(uid_sjsby_buf), ":%s SJOIN %lld %s :", client->id, (long long)ts, sj3_parabuf);
+				/* Double-check the new buffer is sufficient to concat the data */
+				if (strlen(uid_sjsby_buf) + strlen(scratch_buf) > BUFSIZE - 5)
+				{
+					ircd_log(LOG_ERROR, "Oversized SJOIN: '%s' + '%s'", uid_sjsby_buf, scratch_buf);
+					sendto_realops("Oversized SJOIN for %s -- see ircd log", channel->chname);
+					continue;
+				}
+			}
+			strcpy(uid_sjsby_buf+strlen(uid_sjsby_buf), scratch_buf); /* size already checked above */
+		}
+		continue;
+	}
+
+	/* Send out any possible remainder.. */
+	Debug((DEBUG_DEBUG, "Sending '%li %s :%s' to ", ts, parabuf, parv[parc - 1]));
+	sendto_server(client, 0, PROTO_SJSBY, recv_mtags, "%s", uid_buf);
+	sendto_server(client, PROTO_SJSBY, 0, recv_mtags, "%s", uid_sjsby_buf);
+
+	if (modebuf[1])
+	{
+		modebuf[b] = '\0';
+		send_local_chan_mode(recv_mtags, client, channel, modebuf, parabuf);
+	}
+	
+	if (!merge && !removetheirs && !nomode)
+	{
+		char paraback[1024];
+		MessageTag *mtags = NULL;
+
+		strlcpy(modebuf, parv[3], sizeof modebuf);
+		parabuf[0] = '\0';
+		if (!nopara)
+		{
+			for (b = 4; b <= (parc - 2); b++)
+			{
+				strlcat(parabuf, parv[b], sizeof parabuf);
+				strlcat(parabuf, " ", sizeof parabuf);
+			}
+		}
+		strlcpy(paraback, parabuf, sizeof paraback);
+		ap = mp2parv(modebuf, parabuf);
+
+		set_mode(channel, client, ap->parc, ap->parv, &pcount, pvar, 0);
+		send_local_chan_mode(recv_mtags, client, channel, modebuf, parabuf);
+	}
+
+	if (merge && !nomode)
+	{
+		CoreChannelModeTable *acp;
+		Mode oldmode; /**< The old mode (OUR mode) */
+
+		/* Copy current mode to oldmode (need to duplicate all extended mode params too..) */
+		memcpy(&oldmode, &channel->mode, sizeof(oldmode));
+		memset(&oldmode.extmodeparams, 0, sizeof(oldmode.extmodeparams));
+		extcmode_duplicate_paramlist(channel->mode.extmodeparams, oldmode.extmodeparams);
+
+		/* Now merge the modes */
+		strlcpy(modebuf, parv[3], sizeof modebuf);
+		parabuf[0] = '\0';
+		if (!nopara)
+		{
+			for (b = 4; b <= (parc - 2); b++)
+			{
+				strlcat(parabuf, parv[b], sizeof parabuf);
+				strlcat(parabuf, " ", sizeof parabuf);
+			}
+		}
+		ap = mp2parv(modebuf, parabuf);
+		set_mode(channel, client, ap->parc, ap->parv, &pcount, pvar, 0);
+
+		/* Good, now we got modes, now for the differencing and outputting of modes
+		 * We first see if any para modes are set.
+		 */
+		strlcpy(modebuf, "-", sizeof modebuf);
+		parabuf[0] = '\0';
+		b = 1;
+		/* however, is this really going to happen at all? may be unneeded */
+		if (oldmode.limit && !channel->mode.limit)
+		{
+			Addsingle('l');
+		}
+		if (oldmode.key[0] && !channel->mode.key[0])
+		{
+			Addit('k', oldmode.key);
+		}
+
+		/* First, check if we have something they don't have..
+		 * note that: oldmode.* = us, channel->mode.* = them.
+		 */
+		for (i=0; i <= Channelmode_highest; i++)
+		{
+			if ((Channelmode_Table[i].flag) &&
+			    (oldmode.extmode & Channelmode_Table[i].mode) &&
+			    !(channel->mode.extmode & Channelmode_Table[i].mode))
+			{
+				if (Channelmode_Table[i].paracount)
+				{
+					char *parax = cm_getparameter_ex(oldmode.extmodeparams, Channelmode_Table[i].flag);
+					//char *parax = Channelmode_Table[i].get_param(extcmode_get_struct(oldmode.extmodeparam, Channelmode_Table[i].flag));
+					Addit(Channelmode_Table[i].flag, parax);
+				} else {
+					Addsingle(Channelmode_Table[i].flag);
+				}
+			}
+		}
+
+		/* Check if we had +s and it became +p, then revert it... */
+		if ((oldmode.mode & MODE_SECRET) && (channel->mode.mode & MODE_PRIVATE))
+		{
+			/* stay +s ! */
+			channel->mode.mode &= ~MODE_PRIVATE;
+			channel->mode.mode |= MODE_SECRET;
+			Addsingle('p'); /* - */
+			queue_s = 1;
+		}
+		/* Add single char modes... */
+		for (acp = corechannelmodetable; acp->mode; acp++)
+		{
+			if ((oldmode.mode & acp->mode) && !(channel->mode.mode & acp->mode) && !acp->parameters)
+			{
+				Addsingle(acp->flag);
+			}
+		}
+		if (b > 1)
+		{
+			Addsingle('+');
+		}
+		else
+		{
+			strlcpy(modebuf, "+", sizeof modebuf);
+			b = 1;
+		}
+
+		if (queue_s)
+			Addsingle('s');
+
+		if (queue_c)
+			Addsingle('c');
+
+		for (acp = corechannelmodetable; acp->mode; acp++)
+		{
+			if (!(oldmode.mode & acp->mode) && (channel->mode.mode & acp->mode) && !acp->parameters)
+			{
+				Addsingle(acp->flag);
+			}
+		}
+
+		/* Now, check if they have something we don't have..
+		 * note that: oldmode.* = us, channel->mode.* = them.
+		 */
+		for (i=0; i <= Channelmode_highest; i++)
+		{
+			if ((Channelmode_Table[i].flag) &&
+			    !(oldmode.extmode & Channelmode_Table[i].mode) &&
+			    (channel->mode.extmode & Channelmode_Table[i].mode))
+			{
+				if (Channelmode_Table[i].paracount)
+				{
+					char *parax = cm_getparameter(channel, Channelmode_Table[i].flag);
+					if (parax)
+					{
+						Addit(Channelmode_Table[i].flag, parax);
+					}
+				} else {
+					Addsingle(Channelmode_Table[i].flag);
+				}
+			}
+		}
+
+		/* now, if we had diffent para modes - this loop really could be done better, but */
+
+		/* +l (limit) difference? */
+		if (oldmode.limit && channel->mode.limit && (oldmode.limit != channel->mode.limit))
+		{
+			channel->mode.limit = MAX(oldmode.limit, channel->mode.limit);
+			if (oldmode.limit != channel->mode.limit)
+			{
+				Addit('l', my_itoa(channel->mode.limit));
+			}
+		}
+
+		/* +k (key) difference? */
+		if (oldmode.key[0] && channel->mode.key[0] && strcmp(oldmode.key, channel->mode.key))
+		{
+			if (strcmp(oldmode.key, channel->mode.key) > 0)			
+			{
+				strlcpy(channel->mode.key, oldmode.key, sizeof channel->mode.key);
+			}
+			else
+			{
+				Addit('k', channel->mode.key);
+			}
+		}
+
+		/* Now, check for any param differences in extended channel modes..
+		 * note that: oldmode.* = us, channel->mode.* = them.
+		 * if we win: copy oldmode to channel mode, if they win: send the mode
+		 */
+		for (i=0; i <= Channelmode_highest; i++)
+		{
+			if (Channelmode_Table[i].flag && Channelmode_Table[i].paracount &&
+			    (oldmode.extmode & Channelmode_Table[i].mode) &&
+			    (channel->mode.extmode & Channelmode_Table[i].mode))
+			{
+				int r;
+				char *parax;
+				char flag = Channelmode_Table[i].flag;
+				void *ourm = GETPARASTRUCTEX(oldmode.extmodeparams, flag);
+				void *theirm = GETPARASTRUCT(channel, flag);
+				//CmodeParam *ourm = extcmode_get_struct(oldmode.extmodeparam,Channelmode_Table[i].flag);
+				//CmodeParam *theirm = extcmode_get_struct(channel->mode.extmodeparam, Channelmode_Table[i].flag);
+				
+				r = Channelmode_Table[i].sjoin_check(channel, ourm, theirm);
+				switch (r)
+				{
+					case EXSJ_WEWON:
+						parax = cm_getparameter_ex(oldmode.extmodeparams, flag); /* grab from old */
+						cm_putparameter(channel, flag, parax); /* put in new (won) */
+						break;
+
+					case EXSJ_THEYWON:
+						parax = cm_getparameter(channel, flag);
+						Debug((DEBUG_DEBUG, "sjoin: they won: '%s'", parax));
+						Addit(Channelmode_Table[i].flag, parax);
+						break;
+
+					case EXSJ_SAME:
+						Debug((DEBUG_DEBUG, "sjoin: equal"));
+						break;
+
+					case EXSJ_MERGE:
+						parax = cm_getparameter_ex(oldmode.extmodeparams, flag); /* grab from old */
+						cm_putparameter(channel, flag, parax); /* put in new (won) */
+						Addit(flag, parax);
+						break;
+
+					default:
+						ircd_log(LOG_ERROR, "channel.c:m_sjoin:param diff checker: got unk. retval 0x%x??", r);
+						break;
+				}
+			}
+		}
+
+		Addsingle('\0');
+
+		if (modebuf[1])
+		{
+			send_local_chan_mode(recv_mtags, client, channel, modebuf, parabuf);
+		}
+
+		/* free the oldmode.* crap :( */
+		extcmode_free_paramlist(oldmode.extmodeparams);
+		/* memset(&oldmode.extmodeparams, 0, sizeof(oldmode.extmodeparams)); -- redundant? */
+	}
+
+	for (h = Hooks[HOOKTYPE_CHANNEL_SYNCED]; h; h = h->next)
+	{
+		int i = (*(h->func.intfunc))(channel,merge,removetheirs,nomode);
+		if (i == 1)
+			return; /* channel no longer exists */
+	}
+
+	/* we should be synced by now, */
+	if ((oldts != -1) && (oldts != channel->creationtime))
+	{
+		MessageTag *mtags = NULL;
+		new_message(client, NULL, &mtags);
+		sendto_channel(channel, &me, NULL, 0, 0, SEND_LOCAL, NULL,
+			":%s NOTICE %s :*** TS for %s changed from %lld to %lld",
+			me.name, channel->chname, channel->chname,
+			(long long)oldts, (long long)channel->creationtime);
+		free_message_tags(mtags);
+	}
+
+	/* If something went wrong with processing of the SJOIN above and
+	 * the channel actually has no users in it at this point,
+	 * then destroy the channel.
+	 */
+	if (!channel->users)
+	{
+		sub1_from_channel(channel);
+		return;
+	}
+}
diff --git a/src/modules/snomasks/Makefile.in b/src/modules/snomasks/Makefile.in
new file mode 100644
index 0000000..d5bb70f
--- /dev/null
+++ b/src/modules/snomasks/Makefile.in
@@ -0,0 +1,55 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/modules/snomasks/Makefile
+#*   Copyright (C) The UnrealIRCd team
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*/
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+INCLUDES = ../../include/channel.h \
+	../../include/common.h ../../include/config.h ../../include/dbuf.h \
+	../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \
+	../../include/ircsprintf.h \
+	../../include/license.h \
+	../../include/modules.h ../../include/modversion.h ../../include/msg.h \
+	../../include/numeric.h ../../include/proto.h ../../include/dns.h \
+	../../include/resource.h ../../include/setup.h \
+	../../include/struct.h ../../include/sys.h \
+	../../include/types.h ../../include/url.h \
+	../../include/version.h ../../include/whowas.h
+
+R_MODULES=\
+	dccreject.so
+
+MODULES=$(R_MODULES)
+MODULEFLAGS=@MODULEFLAGS@
+RM=@RM@
+
+all: build
+
+build: $(MODULES)
+
+clean:
+	$(RM) -f *.o *.so *~ core
+
+#############################################################################
+#             .so's section
+#############################################################################
+
+dccreject.so: dccreject.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o dccreject.so dccreject.c
+
diff --git a/src/modules/snomasks/dccreject.c b/src/modules/snomasks/dccreject.c
new file mode 100644
index 0000000..50bccdd
--- /dev/null
+++ b/src/modules/snomasks/dccreject.c
@@ -0,0 +1,70 @@
+/*
+ * Show DCC SEND rejection notices (Snomask +D)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"snomasks/dccreject",
+	"4.2",
+	"Snomask +D",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long SNO_DCCREJECT = 0L;
+
+/* Forward declarations */
+int dccreject_dcc_denied(Client *client, char *target, char *realfile, char *displayfile, ConfigItem_deny_dcc *dccdeny);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	SnomaskAdd(modinfo->handle, 'D', umode_allow_opers, &SNO_DCCREJECT);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_DCC_DENIED, 0, dccreject_dcc_denied);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int dccreject_dcc_denied(Client *client, char *target, char *realfile, char *displayfile, ConfigItem_deny_dcc *dccdeny)
+{
+	sendto_snomask_global(SNO_DCCREJECT, 
+		"%s tried to send forbidden file %s (%s) to %s (is blocked now)",
+		client->name, displayfile, dccdeny->reason, target);
+
+	return 0;
+}
diff --git a/src/modules/sqline.c b/src/modules/sqline.c
new file mode 100644
index 0000000..6955c2d
--- /dev/null
+++ b/src/modules/sqline.c
@@ -0,0 +1,87 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/sqline.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_sqline);
+
+/* Place includes here */
+#define MSG_SQLINE      "SQLINE"        /* SQLINE */
+
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"sqline",	/* Name of module */
+	"5.0", /* Version */
+	"command /sqline", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SQLINE, cmd_sqline, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_sqline
+ *	parv[1] = nickmask
+ *	parv[2] = reason
+ */
+CMD_FUNC(cmd_sqline)
+{
+	char mo[32];
+	char *comment = (parc == 3) ? parv[2] : NULL;
+	char *tkllayer[9] = {
+		me.name,        /*0  server.name */
+		"+",            /*1  +|- */
+		"Q",            /*2  G   */
+		"*" ,           /*3  user */
+		parv[1],        /*4  host */
+		client->name,     /*5  setby */
+		"0",            /*6  expire_at */
+		NULL,           /*7  set_at */
+		"no reason"     /*8  reason */
+	};
+
+	if (parc < 2)
+		return;
+
+	ircsnprintf(mo, sizeof(mo), "%lld", (long long)TStime());
+	tkllayer[7] = mo;
+	tkllayer[8] = comment ? comment : "no reason";
+	cmd_tkl(&me, NULL, 9, tkllayer);
+}
diff --git a/src/modules/squit.c b/src/modules/squit.c
new file mode 100644
index 0000000..7ea2782
--- /dev/null
+++ b/src/modules/squit.c
@@ -0,0 +1,158 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/squit.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_squit);
+
+#define MSG_SQUIT 	"SQUIT"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"squit",
+	"5.0",
+	"command /squit", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SQUIT, cmd_squit, 2, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_squit
+**	parv[1] = server name
+**	parv[parc-1] = comment
+*/
+CMD_FUNC(cmd_squit)
+{
+	char *server;
+	Client *target;
+	char *comment = (parc > 2 && parv[parc - 1]) ? parv[parc - 1] : client->name;
+
+	// FIXME: this function is way too confusing, and full of old shit?
+
+	if (!ValidatePermissionsForPath("route:local",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "SQUIT");
+		return;
+	}
+
+	server = parv[1];
+
+	target = find_server_quick(server);
+	if (target && IsMe(target))
+	{
+		target = client->direction;
+		server = client->direction->local->sockhost;
+	}
+
+	/*
+	   ** SQUIT semantics is tricky, be careful...
+	   **
+	   ** The old (irc2.2PL1 and earlier) code just cleans away the
+	   ** server client from the links (because it is never true
+	   ** "client->direction == target".
+	   **
+	   ** This logic here works the same way until "SQUIT host" hits
+	   ** the server having the target "host" as local link. Then it
+	   ** will do a real cleanup spewing SQUIT's and QUIT's to all
+	   ** directions, also to the link from which the orinal SQUIT
+	   ** came, generating one unnecessary "SQUIT host" back to that
+	   ** link.
+	   **
+	   ** One may think that this could be implemented like
+	   ** "hunt_server" (e.g. just pass on "SQUIT" without doing
+	   ** nothing until the server having the link as local is
+	   ** reached). Unfortunately this wouldn't work in the real life,
+	   ** because either target may be unreachable or may not comply
+	   ** with the request. In either case it would leave target in
+	   ** links--no command to clear it away. So, it's better just
+	   ** clean out while going forward, just to be sure.
+	   **
+	   ** ...of course, even better cleanout would be to QUIT/SQUIT
+	   ** dependant users/servers already on the way out, but
+	   ** currently there is not enough information about remote
+	   ** clients to do this...   --msa
+	 */
+	if (!target)
+	{
+		sendnumeric(client, ERR_NOSUCHSERVER, server);
+		return;
+	}
+	if (MyUser(client) && ((!ValidatePermissionsForPath("route:global",client,NULL,NULL,NULL) && !MyConnect(target)) ||
+	    (!ValidatePermissionsForPath("route:local",client,NULL,NULL,NULL) && MyConnect(target))))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	/*
+	   **  Notify all opers, if my local link is remotely squitted
+	 */
+	if (MyConnect(target) && !MyUser(client))
+	{
+		sendto_umode_global(UMODE_OPER, "Received SQUIT %s from %s (%s)",
+		    target->name, get_client_name(client, FALSE), comment);
+	}
+	else if (MyConnect(target))
+	{
+		if (target->user)
+		{
+			sendnotice(client, "ERROR: You're connected to %s, we cannot SQUIT ourselves",
+			           me.name);
+			return;
+		}
+		sendto_umode_global(UMODE_OPER, "Received SQUIT %s from %s (%s)",
+		    target->name, get_client_name(client, FALSE), comment);
+	}
+	if (IsOper(client))
+	{
+		/*
+		 * It was manually /squit'ed by a human being(we hope),
+		 * there is a very good chance they don't want us to
+		 * reconnect right away.  -Cabal95
+		 */
+		SetSQuit(target);
+	}
+
+	exit_client(target, recv_mtags, comment);
+}
diff --git a/src/modules/staff.c b/src/modules/staff.c
new file mode 100644
index 0000000..e9462be
--- /dev/null
+++ b/src/modules/staff.c
@@ -0,0 +1,389 @@
+/*
+ *   cmd_staff: Displays a file(/URL) when the /STAFF command is used.
+ *   (C) Copyright 2004-2016 Syzop <syzop@vulnscan.org>
+ *   (C) Copyright 2003-2004 AngryWolf <angrywolf@flashmail.com>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"staff",
+	"3.8",
+	"/STAFF command",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+#define MSG_STAFF	"STAFF"
+
+#define DEF_STAFF_FILE   CONFDIR "/network.staff"
+#define CONF_STAFF_FILE  (staff_file ? staff_file : DEF_STAFF_FILE)
+#ifdef USE_LIBCURL
+#define STAFF_FILE       (Download.path ? Download.path : CONF_STAFF_FILE)
+#else
+#define STAFF_FILE       CONF_STAFF_FILE
+#endif
+
+#define RPL_STAFF        ":%s 700 %s :- %s"
+#define RPL_STAFFSTART   ":%s 701 %s :- %s IRC Network Staff Information -"
+#define RPL_ENDOFSTAFF   ":%s 702 %s :End of /STAFF command."
+#define RPL_NOSTAFF      ":%s 703 %s :Network Staff File is missing"
+
+/* Forward declarations */
+static void unload_motd_file(MOTDFile *list);
+CMD_FUNC(cmd_staff);
+static int cb_rehashflag(Client *client, char *flag);
+static int cb_test(ConfigFile *, ConfigEntry *, int, int *);
+static int cb_conf(ConfigFile *, ConfigEntry *, int);
+static int cb_rehash();
+static int cb_stats(Client *client, char *flag);
+#ifdef USE_LIBCURL
+static int download_staff_file(ConfigEntry *ce);
+static void download_staff_file_complete(char *url, char *file, char *errorbuf, int cached, void *dummy);
+#endif
+static void InitConf();
+static void FreeConf();
+
+static MOTDFile staff;
+static char *staff_file;
+
+#ifdef USE_LIBCURL
+struct {
+	unsigned	is_url : 1;
+	unsigned	once_completed : 1;
+	unsigned	in_progress : 1;
+	char		*file;			// File name
+	char		*path;			// File path
+	char		*url;			// Full URL address
+} Download;
+#endif
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, cb_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+#ifdef USE_LIBCURL
+	memset(&Download, 0, sizeof(Download));
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1);
+#endif
+	memset(&staff, 0, sizeof(staff));
+	InitConf();
+
+	CommandAdd(modinfo->handle, MSG_STAFF, cmd_staff, MAXPARA, CMD_USER);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, cb_conf);
+	HookAdd(modinfo->handle, HOOKTYPE_REHASH, 0, cb_rehash);
+	HookAdd(modinfo->handle, HOOKTYPE_REHASHFLAG, 0, cb_rehashflag);
+	HookAdd(modinfo->handle, HOOKTYPE_STATS, 0, cb_stats);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	FreeConf();
+	unload_motd_file(&staff);
+
+#ifdef USE_LIBCURL
+	safe_free(Download.path);
+   	safe_free(Download.file);
+	safe_free(Download.url);
+#endif
+
+	return MOD_SUCCESS;
+}
+
+static int cb_rehash()
+{
+	FreeConf();
+	InitConf();
+	return 1;
+}
+
+static void InitConf()
+{
+	staff_file = NULL;
+}
+
+static void FreeConf()
+{
+	safe_free(staff_file);
+}
+
+/*** web routines */
+#ifdef USE_LIBCURL
+static void remove_staff_file()
+{
+	if (Download.path)
+	{
+		if (remove(Download.path) == -1)
+		{
+			if (config_verbose > 0)
+				config_status("Cannot remove file %s: %s",
+					Download.path, strerror(errno));
+		}
+	        safe_free(Download.path);
+	        Download.path = NULL;
+	}
+}
+
+static int download_staff_file(ConfigEntry *ce)
+{
+	int ret = 0;
+	struct stat sb;
+	char *file, *filename;
+
+	if (Download.in_progress)
+		return 0;
+
+	Download.is_url = 1;
+	safe_strdup(Download.url, ce->ce_vardata);
+
+	file = url_getfilename(ce->ce_vardata);
+	filename = unreal_getfilename(file);
+	/* TODO: handle NULL returns */
+	safe_strdup(Download.file, filename);
+	safe_free(file);
+
+	if (!loop.ircd_rehashing && !Download.once_completed)
+	{
+		char *error;
+
+		if (config_verbose > 0)
+			config_status("Downloading %s", displayurl(Download.url));
+
+		if (!(file = download_file(ce->ce_vardata, &error)))
+		{
+			config_error("%s:%i: test: error downloading '%s': %s",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+				displayurl(ce->ce_vardata), error);
+			return -1;
+		}
+
+		Download.once_completed = 1;
+		safe_strdup(Download.path, file);
+		read_motd(Download.path, &staff);
+
+		safe_free(file);
+		return 0;
+	}
+
+	file = Download.path ? Download.path : Download.file;
+
+	if ((ret = stat(file, &sb)) && errno != ENOENT)
+	{
+		/* I know, stat shouldn't fail... */
+		config_error("%s:%i: could not get the creation time of %s: stat() returned %d: %s",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			Download.file, ret, strerror(errno));
+		return -1;
+	}
+
+	if (config_verbose > 0)
+		config_status("Downloading %s", displayurl(Download.url));
+
+	Download.in_progress = 1;
+	download_file_async(Download.url, sb.st_ctime, download_staff_file_complete, NULL);
+	return 0;
+}
+
+static void download_staff_file_complete(char *url, char *file, char *errorbuf, int cached, void *dummy)
+{
+	Download.in_progress = 0;
+	Download.once_completed = 1;
+
+	if (!cached)
+	{
+		if (!file)
+		{
+			config_error("Error downloading %s: %s",
+				displayurl(url), errorbuf);
+			return;
+		}
+
+		remove_staff_file();
+		safe_strdup(Download.path, file);
+		read_motd(Download.path, &staff);
+	} else
+	{
+		char *urlfile = url_getfilename(url);
+		char *file = unreal_getfilename(urlfile);
+		char *tmp = unreal_mktemp("tmp", file);
+		/* TODO: handle null returns ? */
+		unreal_copyfile(Download.path, tmp);
+		remove_staff_file();
+		safe_strdup(Download.path, tmp);
+		safe_free(urlfile);
+	}
+}
+#endif
+
+static void unload_motd_file(MOTDFile *list)
+{
+	MOTDLine *old, *new;
+
+	if (!list)
+		return;
+
+	new = list->lines;
+
+	if (!new)
+		return;
+
+	while (new)
+	{
+		old = new->next;
+		safe_free(new->line);
+		safe_free(new);
+		new = old;
+	}
+}
+
+static int cb_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+#ifdef USE_LIBCURL
+	char *file = NULL, *filename = NULL;
+#endif
+
+	if (type == CONFIG_SET)
+	{
+		if (!strcmp(ce->ce_varname, "staff-file"))
+		{
+#ifdef USE_LIBCURL
+			if (url_is_valid(ce->ce_vardata))
+			{
+				/* TODO: hm, relax this one? */
+				if (!(file = url_getfilename(ce->ce_vardata)) || !(filename = unreal_getfilename(file)))
+				{
+					config_error("%s:%i: invalid filename in URL",
+						ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+					errors++;
+				}
+				safe_free(file);
+			}
+#endif
+
+			*errs = errors;
+			return errors ? -1 : 1;
+		}
+	}
+
+	return 0;
+}
+
+static int cb_conf(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	if (type == CONFIG_SET)
+	{
+		if (!strcmp(ce->ce_varname, "staff-file"))
+		{
+#ifdef USE_LIBCURL
+			if (!Download.in_progress)
+			{
+				safe_strdup(staff_file, ce->ce_vardata);
+				if (url_is_valid(ce->ce_vardata))
+				{
+					download_staff_file(ce);
+				}
+				else
+#endif
+				{
+					convert_to_absolute_path(&ce->ce_vardata, CONFDIR);
+					read_motd(ce->ce_vardata, &staff);
+				}
+#ifdef USE_LIBCURL
+			}
+
+#endif
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+static int cb_stats(Client *client, char *flag)
+{
+	if (*flag == 'S')
+	{
+		sendtxtnumeric(client, "staff-file: %s", STAFF_FILE);
+		return 1;
+	}
+
+	return 0;
+}
+
+static int cb_rehashflag(Client *client, char *flag)
+{
+	int myflag = 0;
+
+	/* "-all" only keeps compatibility with beta19 */
+	if (match_simple("-all", flag) || (myflag = match_simple("-staff", flag)))
+	{
+		if (myflag)
+			sendto_ops("%sRehashing network staff file on the request of %s",
+                                MyUser(client) ? "Remotely " : "", client->name);
+
+#ifdef USE_LIBCURL
+		if (Download.is_url)
+			read_motd(Download.path, &staff);
+		else
+#endif
+			read_motd(CONF_STAFF_FILE, &staff);
+	}
+
+	return 0;
+}
+
+/** The routine that actual does the /STAFF command */
+CMD_FUNC(cmd_staff)
+{
+	MOTDFile *temp;
+	MOTDLine *aLine;
+
+	if (!IsUser(client))
+		return;
+
+	if (hunt_server(client, recv_mtags, ":%s STAFF", 1, parc, parv) != HUNTED_ISME)
+		return;
+
+	if (!staff.lines)
+	{
+		sendto_one(client, NULL, RPL_NOSTAFF, me.name, client->name);
+		return;
+	}
+
+	sendto_one(client, NULL, RPL_STAFFSTART, me.name, client->name, ircnetwork);
+
+	temp = &staff;
+
+	for (aLine = temp->lines; aLine; aLine = aLine->next)
+		sendto_one(client, NULL, RPL_STAFF, me.name, client->name, aLine->line);
+
+	sendto_one(client, NULL, RPL_ENDOFSTAFF, me.name, client->name);
+}
diff --git a/src/modules/starttls.c b/src/modules/starttls.c
new file mode 100644
index 0000000..03dc883
--- /dev/null
+++ b/src/modules/starttls.c
@@ -0,0 +1,122 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/starttls.c
+ *   (C) 2009 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_starttls);
+
+#define MSG_STARTTLS 	"STARTTLS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"starttls",
+	"5.0",
+	"command /starttls", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+long CLICAP_STARTTLS;
+
+MOD_INIT()
+{
+	ClientCapabilityInfo cap;
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	CommandAdd(modinfo->handle, MSG_STARTTLS, cmd_starttls, MAXPARA, CMD_UNREGISTERED);
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "tls";
+	ClientCapabilityAdd(modinfo->handle, &cap, &CLICAP_STARTTLS);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+CMD_FUNC(cmd_starttls)
+{
+	SSL_CTX *ctx;
+	int tls_options;
+
+	if (!MyConnect(client) || !IsUnknown(client))
+		return;
+
+	ctx = client->local->listener->ssl_ctx ? client->local->listener->ssl_ctx : ctx_server;
+	tls_options = client->local->listener->tls_options ? client->local->listener->tls_options->options : iConf.tls_options->options;
+
+	/* Is SSL support enabled? (may not, if failed to load cert/keys/..) */
+	if (!ctx)
+	{
+		/* Pretend STARTTLS is an unknown command, this is the safest approach */
+		sendnumeric(client, ERR_NOTREGISTERED);
+		return;
+	}
+
+	/* Is STARTTLS disabled? (same response as above) */
+	if (tls_options & TLSFLAG_NOSTARTTLS)
+	{
+		sendnumeric(client, ERR_NOTREGISTERED);
+		return;
+	}
+
+	if (IsSecure(client))
+	{
+		sendnumeric(client, ERR_STARTTLS, "STARTTLS failed. Already using TLS.");
+		return;
+	}
+
+	dbuf_delete(&client->local->recvQ, DBufLength(&client->local->recvQ)); /* Clear up any remaining plaintext commands */
+	sendnumeric(client, RPL_STARTTLS);
+	send_queued(client);
+
+	SetStartTLSHandshake(client);
+	Debug((DEBUG_DEBUG, "Starting SSL handshake (due to STARTTLS) for %s", client->local->sockhost));
+	if ((client->local->ssl = SSL_new(ctx)) == NULL)
+		goto fail;
+	SetTLS(client);
+	SSL_set_fd(client->local->ssl, client->local->fd);
+	SSL_set_nonblocking(client->local->ssl);
+	if (!ircd_SSL_accept(client, client->local->fd)) {
+		Debug((DEBUG_DEBUG, "Failed SSL accept handshake in instance 1: %s", client->local->sockhost));
+		SSL_set_shutdown(client->local->ssl, SSL_RECEIVED_SHUTDOWN);
+		SSL_smart_shutdown(client->local->ssl);
+		SSL_free(client->local->ssl);
+		goto fail;
+	}
+
+	/* HANDSHAKE IN PROGRESS */
+	return;
+fail:
+	/* Failure */
+	sendnumeric(client, ERR_STARTTLS, "STARTTLS failed");
+	client->local->ssl = NULL;
+	ClearTLS(client);
+	SetUnknown(client);
+}
diff --git a/src/modules/stats.c b/src/modules/stats.c
new file mode 100644
index 0000000..9985a59
--- /dev/null
+++ b/src/modules/stats.c
@@ -0,0 +1,1076 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/stats.c
+ *   (C) 2004-present The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_stats);
+
+#define MSG_STATS 	"STATS"
+
+ModuleHeader MOD_HEADER
+  = {
+	"stats",
+	"5.0",
+	"command /stats",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_STATS, cmd_stats, 3, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+extern MODVAR int  max_connection_count;
+extern char *get_client_name2(Client *, int);
+
+int stats_banversion(Client *, char *);
+int stats_links(Client *, char *);
+int stats_denylinkall(Client *, char *);
+int stats_gline(Client *, char *);
+int stats_except(Client *, char *);
+int stats_allow(Client *, char *);
+int stats_command(Client *, char *);
+int stats_oper(Client *, char *);
+int stats_port(Client *, char *);
+int stats_bannick(Client *, char *);
+int stats_traffic(Client *, char *);
+int stats_uline(Client *, char *);
+int stats_vhost(Client *, char *);
+int stats_denylinkauto(Client *, char *);
+int stats_kline(Client *, char *);
+int stats_banrealname(Client *, char *);
+int stats_sqline(Client *, char *);
+int stats_linkinfoint(Client *, char *, int);
+int stats_linkinfo(Client *, char *);
+int stats_linkinfoall(Client *, char *);
+int stats_chanrestrict(Client *, char *);
+int stats_shun(Client *, char *);
+int stats_set(Client *, char *);
+int stats_tld(Client *, char *);
+int stats_uptime(Client *, char *);
+int stats_denyver(Client *, char *);
+int stats_notlink(Client *, char *);
+int stats_class(Client *, char *);
+int stats_officialchannels(Client *, char *);
+int stats_spamfilter(Client *, char *);
+int stats_fdtable(Client *, char *);
+
+#define SERVER_AS_PARA 0x1
+#define FLAGS_AS_PARA 0x2
+
+struct statstab {
+	char flag;
+	char *longflag;
+	int (*func)(Client *client, char *para);
+	int options;
+};
+
+/* Must be listed lexicographically */
+/* Long flags must be lowercase */
+struct statstab StatsTable[] = {
+	{ 'B', "banversion",	stats_banversion,	0		},
+	{ 'C', "link", 		stats_links,		0 		},
+	{ 'D', "denylinkall",	stats_denylinkall,	0		},
+	{ 'G', "gline",		stats_gline,		FLAGS_AS_PARA	},
+	{ 'H', "link",	 	stats_links,		0 		},
+	{ 'I', "allow",		stats_allow,		0 		},
+	{ 'K', "kline",		stats_kline,		0 		},
+	{ 'L', "linkinfoall",	stats_linkinfoall,	SERVER_AS_PARA	},
+	{ 'M', "command",	stats_command,		0 		},
+	{ 'O', "oper",		stats_oper,		0 		},
+	{ 'P', "port",		stats_port,		0 		},
+	{ 'Q', "sqline",	stats_sqline,		FLAGS_AS_PARA 	},
+	{ 'S', "set",		stats_set,		0		},
+	{ 'T', "traffic",	stats_traffic,		0 		},
+	{ 'U', "uline",		stats_uline,		0 		},
+	{ 'V', "vhost", 	stats_vhost,		0 		},
+	{ 'W', "fdtable",       stats_fdtable,          0               },
+	{ 'X', "notlink",	stats_notlink,		0 		},
+	{ 'Y', "class",		stats_class,		0 		},
+	{ 'c', "link", 		stats_links,		0 		},
+	{ 'd', "denylinkauto",	stats_denylinkauto,	0 		},
+	{ 'e', "except",	stats_except,		0 		},
+	{ 'f', "spamfilter",	stats_spamfilter,	FLAGS_AS_PARA	},
+	{ 'g', "gline",		stats_gline,		FLAGS_AS_PARA	},
+	{ 'h', "link", 		stats_links,		0 		},
+	{ 'j', "officialchans", stats_officialchannels, 0 		},
+	{ 'k', "kline",		stats_kline,		0 		},
+	{ 'l', "linkinfo",	stats_linkinfo,		SERVER_AS_PARA 	},
+	{ 'm', "command",	stats_command,		0 		},
+	{ 'n', "banrealname",	stats_banrealname,	0 		},
+	{ 'o', "oper",		stats_oper,		0 		},
+	{ 'q', "bannick",	stats_bannick,		FLAGS_AS_PARA	},
+	{ 'r', "chanrestrict",	stats_chanrestrict,	0 		},
+	{ 's', "shun",		stats_shun,		FLAGS_AS_PARA	},
+	{ 't', "tld",		stats_tld,		0 		},
+	{ 'u', "uptime",	stats_uptime,		0 		},
+	{ 'v', "denyver",	stats_denyver,		0 		},
+	{ 'x', "notlink",	stats_notlink,		0 		},
+	{ 'y', "class",		stats_class,		0 		},
+	{ 0, 	NULL, 		NULL, 			0		}
+};
+
+int stats_compare(char *s1, char *s2)
+{
+	/* The long stats flags are always lowercase */
+	while (*s1 == tolower(*s2))
+	{
+		if (*s1 == 0)
+			return 0;
+		s1++;
+		s2++;
+	}
+	return 1;
+}
+
+static inline struct statstab *stats_binary_search(char c) {
+	int start = 0;
+	int stop = sizeof(StatsTable)/sizeof(StatsTable[0])-1;
+	int mid;
+	while (start <= stop) {
+		mid = (start+stop)/2;
+		if (c < StatsTable[mid].flag)
+			stop = mid-1;
+		else if (StatsTable[mid].flag == c)
+			return &StatsTable[mid];
+		else
+			start = mid+1;
+	}
+	return NULL;
+}
+
+static inline struct statstab *stats_search(char *s) {
+	int i;
+	for (i = 0; StatsTable[i].flag; i++)
+		if (!stats_compare(StatsTable[i].longflag,s))
+			return &StatsTable[i];
+	return NULL;
+}
+
+static inline char *stats_combine_parv(char *p1, char *p2)
+{
+	static char buf[BUFSIZE+1];
+        ircsnprintf(buf, sizeof(buf), "%s %s", p1, p2);
+	return buf;
+}
+
+static inline void stats_help(Client *client)
+{
+	sendnumeric(client, RPL_STATSHELP, "/Stats flags:");
+	sendnumeric(client, RPL_STATSHELP, "B - banversion - Send the ban version list");
+	sendnumeric(client, RPL_STATSHELP, "b - badword - Send the badwords list");
+	sendnumeric(client, RPL_STATSHELP, "C - link - Send the link block list");
+	sendnumeric(client, RPL_STATSHELP, "d - denylinkauto - Send the deny link (auto) block list");
+	sendnumeric(client, RPL_STATSHELP, "D - denylinkall - Send the deny link (all) block list");
+	sendnumeric(client, RPL_STATSHELP, "e - except - Send the ban exception list (ELINEs and in config))");
+	sendnumeric(client, RPL_STATSHELP, "f - spamfilter - Send the spamfilter list");
+	sendnumeric(client, RPL_STATSHELP, "F - denydcc - Send the deny dcc and allow dcc block lists");
+	sendnumeric(client, RPL_STATSHELP, "G - gline - Send the gline and gzline list");
+	sendnumeric(client, RPL_STATSHELP, "  Extended flags: [+/-mrs] [mask] [reason] [setby]");
+	sendnumeric(client, RPL_STATSHELP, "   m Return glines matching/not matching the specified mask");
+	sendnumeric(client, RPL_STATSHELP, "   r Return glines with a reason matching/not matching the specified reason");
+	sendnumeric(client, RPL_STATSHELP, "   s Return glines set by/not set by clients matching the specified name");
+	sendnumeric(client, RPL_STATSHELP, "I - allow - Send the allow block list");
+	sendnumeric(client, RPL_STATSHELP, "j - officialchans - Send the offical channels list");
+	sendnumeric(client, RPL_STATSHELP, "K - kline - Send the ban user/ban ip/except ban block list");
+	sendnumeric(client, RPL_STATSHELP, "l - linkinfo - Send link information");
+	sendnumeric(client, RPL_STATSHELP, "L - linkinfoall - Send all link information");
+	sendnumeric(client, RPL_STATSHELP, "M - command - Send list of how many times each command was used");
+	sendnumeric(client, RPL_STATSHELP, "n - banrealname - Send the ban realname block list");
+	sendnumeric(client, RPL_STATSHELP, "O - oper - Send the oper block list");
+	sendnumeric(client, RPL_STATSHELP, "P - port - Send information about ports");
+	sendnumeric(client, RPL_STATSHELP, "q - bannick - Send the ban nick block list");
+	sendnumeric(client, RPL_STATSHELP, "Q - sqline - Send the global qline list");
+	sendnumeric(client, RPL_STATSHELP, "r - chanrestrict - Send the channel deny/allow block list");
+	sendnumeric(client, RPL_STATSHELP, "S - set - Send the set block list");
+	sendnumeric(client, RPL_STATSHELP, "s - shun - Send the shun list");
+	sendnumeric(client, RPL_STATSHELP, "  Extended flags: [+/-mrs] [mask] [reason] [setby]");
+	sendnumeric(client, RPL_STATSHELP, "   m Return shuns matching/not matching the specified mask");
+	sendnumeric(client, RPL_STATSHELP, "   r Return shuns with a reason matching/not matching the specified reason");
+	sendnumeric(client, RPL_STATSHELP, "   s Return shuns set by/not set by clients matching the specified name");
+	sendnumeric(client, RPL_STATSHELP, "t - tld - Send the tld block list");
+	sendnumeric(client, RPL_STATSHELP, "T - traffic - Send traffic information");
+	sendnumeric(client, RPL_STATSHELP, "u - uptime - Send the server uptime and connection count");
+	sendnumeric(client, RPL_STATSHELP, "U - uline - Send the ulines block list");
+	sendnumeric(client, RPL_STATSHELP, "v - denyver - Send the deny version block list");
+	sendnumeric(client, RPL_STATSHELP, "V - vhost - Send the vhost block list");
+	sendnumeric(client, RPL_STATSHELP, "W - fdtable - Send the FD table listing");
+	sendnumeric(client, RPL_STATSHELP, "X - notlink - Send the list of servers that are not current linked");
+	sendnumeric(client, RPL_STATSHELP, "Y - class - Send the class block list");
+}
+
+static inline int allow_user_stats_short(char c)
+{
+	char l;
+	if (!ALLOW_USER_STATS)
+		return 0;
+	if (strchr(ALLOW_USER_STATS, c))
+		return 1;
+	l = tolower(c);
+	/* Hack for the flags that are case insensitive */
+	if (l == 'o' || l == 'y' || l == 'k' || l == 'g' || l == 'x' || l == 'c' ||
+		l =='f' || l == 'i' || l == 'h' || l == 'm')
+	{
+		if (islower(c) && strchr(ALLOW_USER_STATS, toupper(c)))
+			return 1;
+		else if (isupper(c) && strchr(ALLOW_USER_STATS, tolower(c)))
+			return 1;
+	}
+	/* Hack for c/C/H/h */
+	if (l == 'c')
+	{
+		if (strpbrk(ALLOW_USER_STATS, "hH"))
+			return 1;
+	} else if (l == 'h')
+		if (strpbrk(ALLOW_USER_STATS, "cC"))
+			return 1;
+	return 0;
+}
+
+static inline int allow_user_stats_long(char *s)
+{
+	OperStat *os;
+	for (os = iConf.allow_user_stats_ext; os; os = os->next)
+	{
+		if (!strcasecmp(os->flag, s))
+			return 1;
+	}
+	return 0;
+}
+
+/* This is pretty slow, but it isn't used often so it isn't a big deal */
+static inline char *allow_user_stats_long_to_short()
+{
+	static char buffer[BUFSIZE+1];
+	int i = 0;
+	OperStat *os;
+	for (os = iConf.allow_user_stats_ext; os; os = os->next)
+	{
+		struct statstab *stat = stats_search(os->flag);
+		if (!stat)
+			continue;
+		if (!strchr(ALLOW_USER_STATS, stat->flag))
+			buffer[i++] = stat->flag;
+	}
+	buffer[i] = 0;
+	return buffer;
+}
+
+CMD_FUNC(cmd_stats)
+{
+	struct statstab *stat;
+	char flags[2];
+
+	if (parc == 3 && parv[2][0] != '+' && parv[2][0] != '-')
+	{
+		if (hunt_server(client, recv_mtags, ":%s STATS %s :%s", 2, parc, parv) != HUNTED_ISME)
+			return;
+	}
+	else if (parc == 4 && parv[2][0] != '+' && parv[2][0] != '-')
+	{
+		if (hunt_server(client, recv_mtags, ":%s STATS %s %s %s", 2, parc, parv) != HUNTED_ISME)
+			return;
+	}
+	if (parc < 2 || !*parv[1])
+	{
+		stats_help(client);
+		sendnumeric(client, RPL_ENDOFSTATS, '*');
+		return;
+	}
+
+	/* Decide if we are looking for 1 char or a string */
+	if (parv[1][0] && !parv[1][1])
+	{
+		if (!ValidatePermissionsForPath("server:info:stats",client,NULL,NULL,NULL) && !allow_user_stats_short(parv[1][0]))
+		{
+			sendnumeric(client, ERR_NOPRIVILEGES);
+			return;
+		}
+		/* Old style, we can use a binary search here */
+		stat = stats_binary_search(parv[1][0]);
+	}
+	else
+	{
+		if (!ValidatePermissionsForPath("server:info:stats",client,NULL,NULL,NULL) && !allow_user_stats_long(parv[1]))
+		{
+			sendnumeric(client, ERR_NOPRIVILEGES);
+			return;
+		}
+		/* New style, search the hard way */
+		stat = stats_search(parv[1]);
+	}
+
+	if (!stat)
+	{
+		/* Not found. Perhaps a module provides it? */
+		Hook *h;
+		int found = 0, n;
+		for (h = Hooks[HOOKTYPE_STATS]; h; h = h->next)
+		{
+			n = (*(h->func.intfunc))(client, parv[1]);
+			if (n == 1)
+				found = 1;
+		}
+		if (!found)
+			stats_help(client);
+		sendnumeric(client, RPL_ENDOFSTATS, '*');
+		return;
+	}
+
+	flags[0] = stat->flag;
+	flags[1] = '\0';
+
+	if (stat->options & FLAGS_AS_PARA)
+	{
+		if (parc > 2 && (parv[2][0] == '+' || parv[2][0] == '-'))
+		{
+			if (parc > 3)
+				stat->func(client, stats_combine_parv(parv[2],parv[3]));
+			else
+				stat->func(client, parv[2]);
+		}
+		else if (parc > 3)
+			stat->func(client, parv[3]);
+		else
+			stat->func(client, NULL);
+	}
+	else if (stat->options & SERVER_AS_PARA)
+	{
+		if (parc > 2)
+			stat->func(client, parv[2]);
+		else
+			stat->func(client, NULL);
+	}
+	else
+		stat->func(client, NULL);
+
+	/* Modules can append data: */
+	RunHook2(HOOKTYPE_STATS, client, flags);
+
+	sendnumeric(client, RPL_ENDOFSTATS, stat->flag);
+
+	if (!IsULine(client))
+		sendto_snomask(SNO_EYES, "Stats \'%c\' requested by %s (%s@%s)",
+			stat->flag, client->name, client->user->username, GetHost(client));
+	else
+		sendto_snomask(SNO_JUNK, "Stats \'%c\' requested by %s (%s@%s) [ulined]",
+			stat->flag, client->name, client->user->username, GetHost(client));
+}
+
+int stats_banversion(Client *client, char *para)
+{
+	ConfigItem_ban *bans;
+	for (bans = conf_ban; bans; bans = bans->next)
+	{
+		if (bans->flag.type != CONF_BAN_VERSION)
+			continue;
+		sendnumeric(client, RPL_STATSBANVER,
+			bans->mask, bans->reason ? bans->reason : "No Reason");
+	}
+	return 0;
+}
+
+int stats_links(Client *client, char *para)
+{
+	ConfigItem_link *link_p;
+#ifdef DEBUGMODE
+	Client *acptr;
+#endif
+	for (link_p = conf_link; link_p; link_p = link_p->next)
+	{
+		sendnumericfmt(client, RPL_STATSCLINE, "C - * %s %i %s %s%s%s",
+			link_p->servername,
+			link_p->outgoing.port,
+			link_p->class->name,
+			(link_p->outgoing.options & CONNECT_AUTO) ? "a" : "",
+			(link_p->outgoing.options & CONNECT_TLS) ? "S" : "",
+			(link_p->flag.temporary == 1) ? "T" : "");
+#ifdef DEBUGMODE
+		sendnotice(client, "%s (%p) has refcount %d",
+			link_p->servername, link_p, link_p->refcount);
+#endif
+		if (link_p->hub)
+			sendnumericfmt(client, RPL_STATSHLINE, "H %s * %s",
+				link_p->hub, link_p->servername);
+		else if (link_p->leaf)
+			sendnumericfmt(client, RPL_STATSLLINE, "L %s * %s %d",
+				link_p->leaf, link_p->servername, link_p->leaf_depth);
+		// TODO: send incoming allow list? (for opers only)
+	}
+#ifdef DEBUGMODE
+	list_for_each_entry(acptr, &client_list, client_node)
+		if (MyConnect(acptr) && acptr->serv && !IsMe(acptr))
+		{
+			if (!acptr->serv->conf)
+				sendnotice(client, "client '%s' (%p) has NO CONF attached (? :P)",
+					acptr->name, acptr);
+			else
+				sendnotice(client, "client '%s' (%p) has conf %p attached, refcount: %d, temporary: %s",
+					acptr->name, acptr,
+					acptr->serv->conf,
+					acptr->serv->conf->refcount,
+					acptr->serv->conf->flag.temporary ? "YES" : "NO");
+		}
+#endif
+	return 0;
+}
+
+int stats_denylinkall(Client *client, char *para)
+{
+	ConfigItem_deny_link *links;
+
+	for (links = conf_deny_link; links; links = links->next)
+	{
+		if (links->flag.type == CRULE_ALL)
+			sendnumeric(client, RPL_STATSDLINE,
+			'D', links->mask, links->prettyrule);
+	}
+	return 0;
+}
+
+int stats_gline(Client *client, char *para)
+{
+	tkl_stats(client, TKL_GLOBAL|TKL_KILL, para);
+	tkl_stats(client, TKL_GLOBAL|TKL_ZAP, para);
+	return 0;
+}
+
+int stats_spamfilter(Client *client, char *para)
+{
+	tkl_stats(client, TKL_SPAMF, para);
+	tkl_stats(client, TKL_GLOBAL|TKL_SPAMF, para);
+	return 0;
+}
+
+int stats_except(Client *client, char *para)
+{
+	tkl_stats(client, TKL_EXCEPTION, para);
+	tkl_stats(client, TKL_EXCEPTION|TKL_GLOBAL, para);
+	return 0;
+}
+
+int stats_allow(Client *client, char *para)
+{
+	ConfigItem_allow *allows;
+	for (allows = conf_allow; allows; allows = allows->next)
+		sendnumeric(client, RPL_STATSILINE, allows->ip, allows->hostname, allows->maxperip,
+			allows->class->name, allows->server ? allows->server
+			: defserv, allows->port ? allows->port : 6667);
+	return 0;
+}
+
+int stats_command(Client *client, char *para)
+{
+	int i;
+	RealCommand *mptr;
+	for (i = 0; i < 256; i++)
+		for (mptr = CommandHash[i]; mptr; mptr = mptr->next)
+			if (mptr->count)
+#ifndef DEBUGMODE
+			sendnumeric(client, RPL_STATSCOMMANDS, mptr->cmd,
+				mptr->count, mptr->bytes);
+#else
+			sendnumeric(client, RPL_STATSCOMMANDS, mptr->cmd,
+				mptr->count, mptr->bytes,
+				mptr->lticks, mptr->lticks / CLOCKS_PER_SEC,
+				mptr->rticks, mptr->rticks / CLOCKS_PER_SEC);
+#endif
+
+	return 0;
+}
+
+int stats_oper(Client *client, char *para)
+{
+	ConfigItem_oper *oper_p;
+	ConfigItem_mask *m;
+
+	for (oper_p = conf_oper; oper_p; oper_p = oper_p->next)
+	{
+		for (m = oper_p->mask; m; m = m->next)
+		{
+	  		sendnumeric(client, RPL_STATSOLINE,
+	  			'O', m->mask, oper_p->name,
+	  			"-",
+	  			oper_p->class->name? oper_p->class->name : "");
+		}
+	}
+	return 0;
+}
+
+static char *stats_port_helper(ConfigItem_listen *listener)
+{
+	static char buf[256];
+
+	ircsnprintf(buf, sizeof(buf), "%s%s%s%s",
+	    (listener->options & LISTENER_CLIENTSONLY)? "clientsonly ": "",
+	    (listener->options & LISTENER_SERVERSONLY)? "serversonly ": "",
+	    (listener->options & LISTENER_TLS)?         "tls ": "",
+	    !(listener->options & LISTENER_TLS)?        "plaintext ": "");
+	return buf;
+}
+
+int stats_port(Client *client, char *para)
+{
+	ConfigItem_listen *listener;
+
+	for (listener = conf_listen; listener != NULL; listener = listener->next)
+	{
+		if (!(listener->options & LISTENER_BOUND))
+			continue;
+		if ((listener->options & LISTENER_SERVERSONLY) && !ValidatePermissionsForPath("server:info:stats",client,NULL,NULL,NULL))
+			continue;
+		sendnotice(client, "*** Listener on %s:%i (%s): has %i client(s), options: %s %s",
+		           listener->ip,
+		           listener->port,
+		           listener->ipv6 ? "IPv6" : "IPv4",
+		           listener->clients,
+		           stats_port_helper(listener),
+		           listener->flag.temporary ? "[TEMPORARY]" : "");
+	}
+	return 0;
+}
+
+int stats_bannick(Client *client, char *para)
+{
+	tkl_stats(client, TKL_NAME, para);
+	tkl_stats(client, TKL_GLOBAL|TKL_NAME, para);
+	return 0;
+}
+
+int stats_traffic(Client *client, char *para)
+{
+	Client *acptr;
+	IRCStatistics *sp;
+	IRCStatistics tmp;
+	time_t now = TStime();
+
+	sp = &tmp;
+	memcpy(sp, &ircstats, sizeof(IRCStatistics));
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		if (IsServer(acptr))
+		{
+			sp->is_sbs += acptr->local->sendB;
+			sp->is_sbr += acptr->local->receiveB;
+			sp->is_sks += acptr->local->sendK;
+			sp->is_skr += acptr->local->receiveK;
+			sp->is_sti += now - acptr->local->firsttime;
+			sp->is_sv++;
+			if (sp->is_sbs > 1023)
+			{
+				sp->is_sks += (sp->is_sbs >> 10);
+				sp->is_sbs &= 0x3ff;
+			}
+			if (sp->is_sbr > 1023)
+			{
+				sp->is_skr += (sp->is_sbr >> 10);
+				sp->is_sbr &= 0x3ff;
+			}
+		}
+		else if (IsUser(acptr))
+		{
+			sp->is_cbs += acptr->local->sendB;
+			sp->is_cbr += acptr->local->receiveB;
+			sp->is_cks += acptr->local->sendK;
+			sp->is_ckr += acptr->local->receiveK;
+			sp->is_cti += now - acptr->local->firsttime;
+			sp->is_cl++;
+			if (sp->is_cbs > 1023)
+			{
+				sp->is_cks += (sp->is_cbs >> 10);
+				sp->is_cbs &= 0x3ff;
+			}
+			if (sp->is_cbr > 1023)
+			{
+				sp->is_ckr += (sp->is_cbr >> 10);
+				sp->is_cbr &= 0x3ff;
+			}
+		}
+		else if (IsUnknown(acptr))
+			sp->is_ni++;
+	}
+
+	sendnumericfmt(client, RPL_STATSDEBUG, "accepts %u refused %u", sp->is_ac, sp->is_ref);
+	sendnumericfmt(client, RPL_STATSDEBUG, "unknown commands %u prefixes %u", sp->is_unco, sp->is_unpf);
+	sendnumericfmt(client, RPL_STATSDEBUG, "nick collisions %u unknown closes %u", sp->is_kill, sp->is_ni);
+	sendnumericfmt(client, RPL_STATSDEBUG, "wrong direction %u empty %u", sp->is_wrdi, sp->is_empt);
+	sendnumericfmt(client, RPL_STATSDEBUG, "numerics seen %u mode fakes %u", sp->is_num, sp->is_fake);
+	sendnumericfmt(client, RPL_STATSDEBUG, "auth successes %u fails %u", sp->is_asuc, sp->is_abad);
+	sendnumericfmt(client, RPL_STATSDEBUG, "local connections %u udp packets %u", sp->is_loc, sp->is_udp);
+	sendnumericfmt(client, RPL_STATSDEBUG, "Client Server");
+	sendnumericfmt(client, RPL_STATSDEBUG, "connected %u %u", sp->is_cl, sp->is_sv);
+	sendnumericfmt(client, RPL_STATSDEBUG, "bytes sent %ld.%huK %ld.%huK",
+		sp->is_cks, sp->is_cbs, sp->is_sks, sp->is_sbs);
+	sendnumericfmt(client, RPL_STATSDEBUG, "bytes recv %ld.%huK %ld.%huK",
+	    sp->is_ckr, sp->is_cbr, sp->is_skr, sp->is_sbr);
+	sendnumericfmt(client, RPL_STATSDEBUG, "time connected %lld %lld",
+	    (long long)sp->is_cti, (long long)sp->is_sti);
+
+	return 0;
+}
+
+int stats_fdtable(Client *client, char *para)
+{
+	int i;
+
+	for (i = 0; i < MAXCONNECTIONS; i++)
+	{
+		FDEntry *fde = &fd_table[i];
+
+		if (!fde->is_open)
+			continue;
+
+		sendnumericfmt(client, RPL_STATSDEBUG,
+			"fd %3d, desc '%s', read-hdl %p, write-hdl %p, cbdata %p",
+			fde->fd, fde->desc, fde->read_callback, fde->write_callback, fde->data);
+	}
+
+	return 0;
+}
+
+int stats_uline(Client *client, char *para)
+{
+	ConfigItem_ulines *ulines;
+	for (ulines = conf_ulines; ulines; ulines = ulines->next)
+		sendnumeric(client, RPL_STATSULINE, ulines->servername);
+	return 0;
+}
+int stats_vhost(Client *client, char *para)
+{
+	ConfigItem_mask *m;
+	ConfigItem_vhost *vhosts;
+
+	for (vhosts = conf_vhost; vhosts; vhosts = vhosts->next)
+	{
+		for (m = vhosts->mask; m; m = m->next)
+		{
+			sendtxtnumeric(client, "vhost %s%s%s %s %s", vhosts->virtuser ? vhosts->virtuser : "", vhosts->virtuser ? "@" : "",
+			     vhosts->virthost, vhosts->login, m->mask);
+		}
+	}
+	return 0;
+}
+
+int stats_denylinkauto(Client *client, char *para)
+{
+	ConfigItem_deny_link *links;
+
+	for (links = conf_deny_link; links; links = links->next)
+	{
+		if (links->flag.type == CRULE_AUTO)
+			sendnumeric(client, RPL_STATSDLINE,
+			'd', links->mask, links->prettyrule);
+	}
+	return 0;
+}
+
+int stats_kline(Client *client, char *para)
+{
+	tkl_stats(client, TKL_KILL, NULL);
+	tkl_stats(client, TKL_ZAP, NULL);
+	return 0;
+}
+
+int stats_banrealname(Client *client, char *para)
+{
+	ConfigItem_ban *bans;
+	for (bans = conf_ban; bans; bans = bans->next)
+	{
+		if (bans->flag.type == CONF_BAN_REALNAME)
+		{
+			sendnumeric(client, RPL_STATSNLINE, bans->mask, bans->reason
+				? bans->reason : "<no reason>");
+		}
+	}
+	return 0;
+}
+
+int stats_sqline(Client *client, char *para)
+{
+	tkl_stats(client, TKL_NAME|TKL_GLOBAL, para);
+	return 0;
+}
+
+int stats_chanrestrict(Client *client, char *para)
+{
+	ConfigItem_deny_channel *dchans;
+	ConfigItem_allow_channel *achans;
+	for (dchans = conf_deny_channel; dchans; dchans = dchans->next)
+	{
+		sendtxtnumeric(client, "deny %s %c %s", dchans->channel, dchans->warn ? 'w' : '-', dchans->reason);
+	}
+  	for (achans = conf_allow_channel; achans; achans = achans->next)
+  	{
+		sendtxtnumeric(client, "allow %s", achans->channel);
+	}
+	return 0;
+}
+
+int stats_shun(Client *client, char *para)
+{
+	tkl_stats(client, TKL_GLOBAL|TKL_SHUN, para);
+	return 0;
+}
+
+/* should this be moved to a seperate stats flag? */
+int stats_officialchannels(Client *client, char *para)
+{
+	ConfigItem_offchans *x;
+
+	for (x = conf_offchans; x; x = x->next)
+	{
+		sendtxtnumeric(client, "%s %s", x->chname, x->topic ? x->topic : "");
+	}
+	return 0;
+}
+
+#define SafePrint(x)   ((x) ? (x) : "")
+
+int stats_set(Client *client, char *para)
+{
+	char *uhallow;
+
+	if (!ValidatePermissionsForPath("server:info:stats",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return 0;
+	}
+
+	sendtxtnumeric(client, "*** Configuration Report ***");
+	sendtxtnumeric(client, "network-name: %s", ircnetwork);
+	sendtxtnumeric(client, "default-server: %s", defserv);
+	if (SERVICES_NAME)
+	{
+		sendtxtnumeric(client, "services-server: %s", SERVICES_NAME);
+	}
+	if (STATS_SERVER)
+	{
+		sendtxtnumeric(client, "stats-server: %s", STATS_SERVER);
+	}
+	if (SASL_SERVER)
+	{
+		sendtxtnumeric(client, "sasl-server: %s", SASL_SERVER);
+	}
+	sendtxtnumeric(client, "hiddenhost-prefix: %s", hidden_host);
+	sendtxtnumeric(client, "help-channel: %s", helpchan);
+	sendtxtnumeric(client, "cloak-keys: %s", CLOAK_KEYCRC);
+	sendtxtnumeric(client, "kline-address: %s", KLINE_ADDRESS);
+	if (GLINE_ADDRESS)
+		sendtxtnumeric(client, "gline-address: %s", GLINE_ADDRESS);
+	sendtxtnumeric(client, "modes-on-connect: %s", get_usermode_string_raw(CONN_MODES));
+	sendtxtnumeric(client, "modes-on-oper: %s", get_usermode_string_raw(OPER_MODES));
+	*modebuf = *parabuf = 0;
+	chmode_str(&iConf.modes_on_join, modebuf, parabuf, sizeof(modebuf), sizeof(parabuf));
+	sendtxtnumeric(client, "modes-on-join: %s %s", modebuf, parabuf);
+	if (iConf.min_nick_length)
+		sendtxtnumeric(client, "min-nick-length: %i", iConf.min_nick_length);
+	sendtxtnumeric(client, "nick-length: %i", iConf.nick_length);
+	sendtxtnumeric(client, "snomask-on-oper: %s", OPER_SNOMASK);
+	if (ALLOW_USER_STATS)
+	{
+		char *longflags = allow_user_stats_long_to_short();
+		sendtxtnumeric(client, "allow-user-stats: %s%s", ALLOW_USER_STATS, longflags ? longflags : "");
+	}
+	if (RESTRICT_USERMODES)
+		sendtxtnumeric(client, "restrict-usermodes: %s", RESTRICT_USERMODES);
+	if (RESTRICT_CHANNELMODES)
+		sendtxtnumeric(client, "restrict-channelmodes: %s", RESTRICT_CHANNELMODES);
+	if (RESTRICT_EXTENDEDBANS)
+		sendtxtnumeric(client, "restrict-extendedbans: %s", RESTRICT_EXTENDEDBANS);
+	switch (UHOST_ALLOWED)
+	{
+		case UHALLOW_NEVER:
+			uhallow = "never";
+			break;
+		case UHALLOW_NOCHANS:
+			uhallow = "not-on-channels";
+			break;
+		case UHALLOW_REJOIN:
+			uhallow = "force-rejoin";
+			break;
+		case UHALLOW_ALWAYS:
+		default:
+			uhallow = "always";
+			break;
+	}
+	if (uhallow)
+		sendtxtnumeric(client, "allow-userhost-change: %s", uhallow);
+	sendtxtnumeric(client, "hide-ban-reason: %d", HIDE_BAN_REASON);
+	sendtxtnumeric(client, "anti-spam-quit-message-time: %s", pretty_time_val(ANTI_SPAM_QUIT_MSG_TIME));
+	sendtxtnumeric(client, "channel-command-prefix: %s", CHANCMDPFX ? CHANCMDPFX : "`");
+	sendtxtnumeric(client, "tls::certificate: %s", SafePrint(iConf.tls_options->certificate_file));
+	sendtxtnumeric(client, "tls::key: %s", SafePrint(iConf.tls_options->key_file));
+	sendtxtnumeric(client, "tls::trusted-ca-file: %s", SafePrint(iConf.tls_options->trusted_ca_file));
+	sendtxtnumeric(client, "tls::options: %s", iConf.tls_options->options & TLSFLAG_FAILIFNOCERT ? "FAILIFNOCERT" : "");
+	sendtxtnumeric(client, "options::show-opermotd: %d", SHOWOPERMOTD);
+	sendtxtnumeric(client, "options::hide-ulines: %d", HIDE_ULINES);
+	sendtxtnumeric(client, "options::identd-check: %d", IDENT_CHECK);
+	sendtxtnumeric(client, "options::fail-oper-warn: %d", FAILOPER_WARN);
+	sendtxtnumeric(client, "options::show-connect-info: %d", SHOWCONNECTINFO);
+	sendtxtnumeric(client, "options::no-connect-tls-info: %d", NOCONNECTTLSLINFO);
+	sendtxtnumeric(client, "options::dont-resolve: %d", DONT_RESOLVE);
+	sendtxtnumeric(client, "options::mkpasswd-for-everyone: %d", MKPASSWD_FOR_EVERYONE);
+	sendtxtnumeric(client, "options::allow-insane-bans: %d", ALLOW_INSANE_BANS);
+	sendtxtnumeric(client, "options::allow-part-if-shunned: %d", ALLOW_PART_IF_SHUNNED);
+	sendtxtnumeric(client, "maxchannelsperuser: %i", MAXCHANNELSPERUSER);
+	sendtxtnumeric(client, "ping-warning: %i seconds", PINGWARNING);
+	sendtxtnumeric(client, "auto-join: %s", AUTO_JOIN_CHANS ? AUTO_JOIN_CHANS : "0");
+	sendtxtnumeric(client, "oper-auto-join: %s", OPER_AUTO_JOIN_CHANS ? OPER_AUTO_JOIN_CHANS : "0");
+	sendtxtnumeric(client, "static-quit: %s", STATIC_QUIT ? STATIC_QUIT : "<none>");
+	sendtxtnumeric(client, "static-part: %s", STATIC_PART ? STATIC_PART : "<none>");
+	sendtxtnumeric(client, "who-limit: %d", WHOLIMIT);
+	sendtxtnumeric(client, "silence-limit: %d", SILENCE_LIMIT);
+	if (DNS_BINDIP)
+		sendtxtnumeric(client, "dns::bind-ip: %s", DNS_BINDIP);
+	sendtxtnumeric(client, "ban-version-tkl-time: %s", pretty_time_val(BAN_VERSION_TKL_TIME));
+	if (LINK_BINDIP)
+		sendtxtnumeric(client, "link::bind-ip: %s", LINK_BINDIP);
+	sendtxtnumeric(client, "anti-flood::connect-flood: %d per %s", THROTTLING_COUNT, pretty_time_val(THROTTLING_PERIOD));
+	sendtxtnumeric(client, "anti-flood::unknown-flood-bantime: %s", pretty_time_val(UNKNOWN_FLOOD_BANTIME));
+	sendtxtnumeric(client, "anti-flood::unknown-flood-amount: %ldKB", UNKNOWN_FLOOD_AMOUNT);
+	if (AWAY_PERIOD)
+	{
+		sendtxtnumeric(client, "anti-flood::away-flood: %d per %s", AWAY_COUNT, pretty_time_val(AWAY_PERIOD));
+	}
+	sendtxtnumeric(client, "anti-flood::nick-flood: %d per %s", NICK_COUNT, pretty_time_val(NICK_PERIOD));
+	sendtxtnumeric(client, "handshake-timeout: %s", pretty_time_val(iConf.handshake_timeout));
+	sendtxtnumeric(client, "sasl-timeout: %s", pretty_time_val(iConf.sasl_timeout));
+	sendtxtnumeric(client, "ident::connect-timeout: %s", pretty_time_val(IDENT_CONNECT_TIMEOUT));
+	sendtxtnumeric(client, "ident::read-timeout: %s", pretty_time_val(IDENT_READ_TIMEOUT));
+	sendtxtnumeric(client, "spamfilter::ban-time: %s", pretty_time_val(SPAMFILTER_BAN_TIME));
+	sendtxtnumeric(client, "spamfilter::ban-reason: %s", SPAMFILTER_BAN_REASON);
+	sendtxtnumeric(client, "spamfilter::virus-help-channel: %s", SPAMFILTER_VIRUSCHAN);
+	if (SPAMFILTER_EXCEPT)
+		sendtxtnumeric(client, "spamfilter::except: %s", SPAMFILTER_EXCEPT);
+	sendtxtnumeric(client, "check-target-nick-bans: %s", CHECK_TARGET_NICK_BANS ? "yes" : "no");
+	sendtxtnumeric(client, "plaintext-policy::user: %s", policy_valtostr(iConf.plaintext_policy_user));
+	sendtxtnumeric(client, "plaintext-policy::oper: %s", policy_valtostr(iConf.plaintext_policy_oper));
+	sendtxtnumeric(client, "plaintext-policy::server: %s", policy_valtostr(iConf.plaintext_policy_server));
+	sendtxtnumeric(client, "outdated-tls-policy::user: %s", policy_valtostr(iConf.outdated_tls_policy_user));
+	sendtxtnumeric(client, "outdated-tls-policy::oper: %s", policy_valtostr(iConf.outdated_tls_policy_oper));
+	sendtxtnumeric(client, "outdated-tls-policy::server: %s", policy_valtostr(iConf.outdated_tls_policy_server));
+	RunHook2(HOOKTYPE_STATS, client, "S");
+	return 1;
+}
+
+int stats_tld(Client *client, char *para)
+{
+	ConfigItem_tld *tld;
+
+	for (tld = conf_tld; tld; tld = tld->next)
+	{
+		sendnumeric(client, RPL_STATSTLINE,
+			tld->mask, tld->motd_file, tld->rules_file ?
+			tld->rules_file : "none");
+	}
+
+	return 0;
+}
+
+int stats_uptime(Client *client, char *para)
+{
+	time_t tmpnow;
+
+	tmpnow = TStime() - me.local->since;
+	sendnumeric(client, RPL_STATSUPTIME,
+	    tmpnow / 86400, (tmpnow / 3600) % 24, (tmpnow / 60) % 60,
+	    tmpnow % 60);
+	sendnumeric(client, RPL_STATSCONN,
+	    max_connection_count, irccounts.me_max);
+	return 0;
+}
+
+int stats_denyver(Client *client, char *para)
+{
+	ConfigItem_deny_version *versions;
+	for (versions = conf_deny_version; versions; versions = versions->next)
+	{
+		sendnumeric(client, RPL_STATSVLINE,
+			versions->version, versions->flags, versions->mask);
+	}
+	return 0;
+}
+
+int stats_notlink(Client *client, char *para)
+{
+	ConfigItem_link *link_p;
+
+	for (link_p = conf_link; link_p; link_p = link_p->next)
+	{
+		if (!find_server_quick(link_p->servername))
+		{
+			sendnumeric(client, RPL_STATSXLINE, link_p->servername,
+				link_p->outgoing.port);
+		}
+	}
+	return 0;
+}
+
+int stats_class(Client *client, char *para)
+{
+	ConfigItem_class *classes;
+
+	for (classes = conf_class; classes; classes = classes->next)
+	{
+		sendnumeric(client, RPL_STATSYLINE, classes->name, classes->pingfreq, classes->connfreq,
+			classes->maxclients, classes->sendq, classes->recvq ? classes->recvq : DEFAULT_RECVQ);
+#ifdef DEBUGMODE
+		sendnotice(client, "class '%s' has clients=%d, xrefcount=%d",
+			classes->name, classes->clients, classes->xrefcount);
+#endif
+	}
+	return 0;
+}
+
+int stats_linkinfo(Client *client, char *para)
+{
+	return stats_linkinfoint(client, para, 0);
+}
+
+int stats_linkinfoall(Client *client, char *para)
+{
+	return stats_linkinfoint(client, para, 1);
+}
+
+int stats_linkinfoint(Client *client, char *para, int all)
+{
+#ifndef DEBUGMODE
+	static char Sformat[] = "SendQ SendM SendBytes RcveM RcveBytes Open_since :Idle";
+	static char Lformat[] = "%s%s %u %u %u %u %u %u :%u";
+#else
+	static char Sformat[] = "SendQ SendM SendBytes RcveM RcveBytes Open_since CPU :Idle";
+	static char Lformat[] = "%s%s %u %u %u %u %u %u %s";
+	char pbuf[96];		/* Should be enough for to ints */
+#endif
+	int remote = 0;
+	int wilds = 0;
+	int doall = 0;
+	int showports = ValidatePermissionsForPath("server:info:stats",client,NULL,NULL,NULL);
+	Client *acptr;
+	/*
+	 * send info about connections which match, or all if the
+	 * mask matches me.name.  Only restrictions are on those who
+	 * are invisible not being visible to 'foreigners' who use
+	 * a wild card based search to list it.
+	 */
+	if (para)
+	{
+		if (!mycmp(para, me.name))
+			doall = 2;
+		else if (match_simple(para, me.name))
+			doall = 1;
+		if (strchr(para, '*') || strchr(para, '?'))
+			wilds = 1;
+	}
+	else
+		para = me.name;
+	sendnumericfmt(client, RPL_STATSLINKINFO, "%s", Sformat);
+	if (!MyUser(client))
+	{
+		remote = 1;
+		wilds = 0;
+	}
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		if (IsInvisible(acptr) && (doall || wilds) &&
+			!IsOper(acptr) && (acptr != client))
+			continue;
+		if (remote && doall && !IsServer(acptr) && !IsMe(acptr))
+			continue;
+		if (remote && !doall && IsServer(acptr))
+			continue;
+		if (!doall && wilds && !match_simple(para, acptr->name))
+			continue;
+		if (!(para && (IsServer(acptr) || IsListening(acptr))) &&
+		    !(doall || wilds) &&
+		    mycmp(para, acptr->name))
+		{
+			continue;
+		}
+
+#ifdef DEBUGMODE
+		ircsnprintf(pbuf, sizeof(pbuf), "%ld :%ld", (long)acptr->local->cputime,
+		      (long)(acptr->user && MyConnect(acptr)) ? TStime() - acptr->local->last : 0);
+#endif
+		if (ValidatePermissionsForPath("server:info:stats",client,NULL,NULL,NULL))
+		{
+			sendnumericfmt(client, RPL_STATSLINKINFO, Lformat,
+				all ?
+				(get_client_name2(acptr, showports)) :
+				(get_client_name(acptr, FALSE)),
+				get_client_status(acptr),
+				(int)DBufLength(&acptr->local->sendQ),
+				(int)acptr->local->sendM, (int)acptr->local->sendK,
+				(int)acptr->local->receiveM,
+				(int)acptr->local->receiveK,
+			 	TStime() - acptr->local->firsttime,
+#ifndef DEBUGMODE
+				(acptr->user && MyConnect(acptr)) ?
+				TStime() - acptr->local->last : 0);
+#else
+				pbuf);
+#endif
+		}
+		else if (!strchr(acptr->name, '.'))
+			sendnumericfmt(client, RPL_STATSLINKINFO, Lformat,
+				IsHidden(acptr) ? acptr->name :
+				all ?	/* Potvin - PreZ */
+				get_client_name2(acptr, showports) :
+				get_client_name(acptr, FALSE),
+				get_client_status(acptr),
+				(int)DBufLength(&acptr->local->sendQ),
+				(int)acptr->local->sendM, (int)acptr->local->sendK,
+				(int)acptr->local->receiveM,
+				(int)acptr->local->receiveK,
+				TStime() - acptr->local->firsttime,
+#ifndef DEBUGMODE
+				(acptr->user && MyConnect(acptr)) ?
+				TStime() - acptr->local->last : 0);
+#else
+				pbuf);
+#endif
+	}
+#ifdef DEBUGMODE
+	list_for_each_entry(acptr, &client_list, client_node)
+	{
+		if (IsServer(acptr))
+			sendnotice(client, "Server %s is %s",
+				acptr->name, acptr->serv->flags.synced ? "SYNCED" : "NOT SYNCED!!");
+	}
+#endif
+	return 0;
+}
diff --git a/src/modules/sts.c b/src/modules/sts.c
new file mode 100644
index 0000000..4d78d01
--- /dev/null
+++ b/src/modules/sts.c
@@ -0,0 +1,111 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/sts.c
+ *   (C) 2017 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"sts",
+	"5.0",
+	"Strict Transport Security CAP", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	return MOD_SUCCESS;
+}
+
+void init_sts(ModuleInfo *modinfo);
+
+MOD_LOAD()
+{
+	/* init_sts is delayed to MOD_LOAD due to configuration dependency */
+	init_sts(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Check if this capability should be visible.
+ * Note that 'client' may be NULL.
+ */
+int sts_capability_visible(Client *client)
+{
+	TLSOptions *ssl;
+
+	/* This is possible if queried from the CAP NEW/DEL code */
+	if (client == NULL)
+		return (iConf.tls_options && iConf.tls_options->sts_port) ? 1 : 0;
+
+	if (!IsSecure(client))
+	{
+		if (iConf.tls_options && iConf.tls_options->sts_port)
+			return 1; /* YES, non-SSL user and set::tls::sts-policy configured */
+		return 0; /* NO, there is no sts-policy */
+	}
+
+	ssl = FindTLSOptionsForUser(client);
+
+	if (ssl && ssl->sts_port)
+		return 1;
+
+	return 0;
+}
+
+char *sts_capability_parameter(Client *client)
+{
+	TLSOptions *ssl;
+	static char buf[256];
+
+	if (IsSecure(client))
+		ssl = FindTLSOptionsForUser(client);
+	else
+		ssl = iConf.tls_options;
+
+	if (!ssl)
+		return ""; /* This would be odd. */
+
+	snprintf(buf, sizeof(buf), "port=%d,duration=%ld", ssl->sts_port, ssl->sts_duration);
+	if (ssl->sts_preload)
+		strlcat(buf, ",preload", sizeof(buf));
+
+	return buf;
+}
+
+void init_sts(ModuleInfo *modinfo)
+{
+	ClientCapabilityInfo cap;
+
+	memset(&cap, 0, sizeof(cap));
+	cap.name = "sts";
+	cap.flags = CLICAP_FLAGS_ADVERTISE_ONLY;
+	cap.visible = sts_capability_visible;
+	cap.parameter = sts_capability_parameter;
+	ClientCapabilityAdd(modinfo->handle, &cap, NULL);
+}
diff --git a/src/modules/svsjoin.c b/src/modules/svsjoin.c
new file mode 100644
index 0000000..f0175ae
--- /dev/null
+++ b/src/modules/svsjoin.c
@@ -0,0 +1,97 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/svsjoin.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svsjoin);
+
+/* Place includes here */
+#define MSG_SVSJOIN       "SVSJOIN"
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsjoin",	/* Name of module */
+	"5.0", /* Version */
+	"command /svsjoin", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSJOIN, cmd_svsjoin, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+/* cmd_svsjoin() - Lamego - Wed Jul 21 20:04:48 1999
+   Copied off PTlink IRCd (C) PTlink coders team.
+	parv[1] - nick to make join
+	parv[2] - channel(s) to join
+	parv[3] - (optional) channel key(s)
+*/
+CMD_FUNC(cmd_svsjoin)
+{
+	Client *target;
+
+	if (!IsULine(client))
+		return;
+
+	if ((parc < 3) || !(target = find_person(parv[1], NULL)))
+		return;
+
+	if (MyUser(target))
+	{
+		parv[0] = target->name;
+		parv[1] = parv[2];
+		if (parc == 3)
+		{
+			parv[2] = NULL;
+			do_cmd(target, NULL, "JOIN", 2, parv);
+			/* NOTE: 'target' may be killed if we ever implement spamfilter join channel target */
+		} else {
+			parv[2] = parv[3];
+			parv[3] = NULL;
+			do_cmd(target, NULL, "JOIN", 3, parv);
+			/* NOTE: 'target' may be killed if we ever implement spamfilter join channel target */
+		}
+	}
+	else
+	{
+		if (parc == 3)
+			sendto_one(target, NULL, ":%s SVSJOIN %s %s", client->name,
+			    parv[1], parv[2]);
+		else
+			sendto_one(target, NULL, ":%s SVSJOIN %s %s %s", client->name,
+				parv[1], parv[2], parv[3]);
+	}
+}
diff --git a/src/modules/svskill.c b/src/modules/svskill.c
new file mode 100644
index 0000000..a1121d4
--- /dev/null
+++ b/src/modules/svskill.c
@@ -0,0 +1,88 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/svskill.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svskill);
+
+#define MSG_SVSKILL	"SVSKILL"
+
+ModuleHeader MOD_HEADER
+  = {
+	"svskill",	/* Name of module */
+	"5.0", /* Version */
+	"command /svskill", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSKILL, cmd_svskill, MAXPARA, CMD_SERVER|CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_svskill
+**	parv[1] = client
+**	parv[2] = kill message
+*/
+CMD_FUNC(cmd_svskill)
+{
+	MessageTag *mtags = NULL;
+	Client *target;
+	char *comment = "SVS Killed";
+	int n;
+
+	if (parc < 2)
+		return;
+	if (parc > 3)
+		return;
+	if (parc == 3)
+		comment = parv[2];
+
+	if (!IsULine(client))
+		return;
+
+	if (!(target = find_person(parv[1], NULL)))
+		return;
+
+	/* for new_message() we use target here, makes sense for the exit_client, right? */
+	new_message(target, recv_mtags, &mtags);
+	sendto_server(client, 0, 0, mtags, ":%s SVSKILL %s :%s", client->id, target->id, comment);
+	SetKilled(target);
+	exit_client(target, mtags, comment);
+	free_message_tags(mtags);
+}
diff --git a/src/modules/svslusers.c b/src/modules/svslusers.c
new file mode 100644
index 0000000..a231929
--- /dev/null
+++ b/src/modules/svslusers.c
@@ -0,0 +1,79 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svslusers.c
+ *   (C) 2002 codemastr [Dominick Meglio] (codemastr@unrealircd.com)
+ *
+ *   SVSLUSERS command, allows remote setting of local and global max user count
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svslusers);
+
+#define MSG_SVSLUSERS 	"SVSLUSERS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"svslusers",
+	"5.0",
+	"command /svslusers", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSLUSERS, cmd_svslusers, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_svslusers
+**      parv[1] = server to update
+**      parv[2] = max global users
+**      parv[3] = max local users
+**      If -1 is specified for either number, it is ignored and the current count
+**      is kept.
+*/
+CMD_FUNC(cmd_svslusers)
+{
+        if (!IsULine(client) || parc < 4)
+		return;  
+        if (hunt_server(client, NULL, ":%s SVSLUSERS %s %s :%s", 1, parc, parv) == HUNTED_ISME)
+        {
+		int temp;
+		temp = atoi(parv[2]);
+		if (temp >= 0)
+			irccounts.global_max = temp;
+		temp = atoi(parv[3]);
+		if (temp >= 0) 
+			irccounts.me_max = temp;
+        }
+}
diff --git a/src/modules/svsmode.c b/src/modules/svsmode.c
new file mode 100644
index 0000000..4772abc
--- /dev/null
+++ b/src/modules/svsmode.c
@@ -0,0 +1,607 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svsmode.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   SVSMODE and SVS2MODE commands
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* FIXME: this one needs a lot more mtag work !! with _special... */
+
+#include "unrealircd.h"
+
+void add_send_mode_param(Channel *channel, Client *from, char what, char mode, char *param);
+CMD_FUNC(cmd_svsmode);
+CMD_FUNC(cmd_svs2mode);
+
+#define MSG_SVSMODE 	"SVSMODE"	
+#define MSG_SVS2MODE    "SVS2MODE"
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsmode",
+	"5.0",
+	"command /svsmode and svs2mode", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSMODE, cmd_svsmode, MAXPARA, CMD_SERVER|CMD_USER);
+	CommandAdd(modinfo->handle, MSG_SVS2MODE, cmd_svs2mode, MAXPARA, CMD_SERVER|CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void unban_user(Client *client, Channel *channel, Client *acptr, char chmode)
+{
+	Extban *extban;
+	Ban *ban, *bnext;
+	Ban **banlist;
+	char uhost[NICKLEN+USERLEN+HOSTLEN+6], vhost[NICKLEN+USERLEN+HOSTLEN+6];
+	char ihost[NICKLEN+USERLEN+HOSTLEN+6], chost[NICKLEN+USERLEN+HOSTLEN+6];
+
+	/* BUILD HOSTS */
+
+	*uhost = *vhost = *ihost = *chost = '\0';
+
+	strlcpy(uhost, make_nick_user_host(acptr->name, 
+		acptr->user->username, acptr->user->realhost),
+		sizeof uhost);
+
+	if (GetIP(acptr)) /* only if we actually have an IP */
+		strlcpy(ihost, make_nick_user_host(acptr->name,
+			acptr->user->username, GetIP(acptr)),
+			sizeof ihost);
+
+	/* The next could have been an IsSetHost(), but I'm playing it safe with regards to backward compat. */
+	if (IsHidden(acptr) &&
+	    !(*acptr->user->cloakedhost && !strcasecmp(acptr->user->virthost, acptr->user->cloakedhost))) 
+	{
+		strlcpy(vhost, make_nick_user_host(acptr->name,
+			acptr->user->username, acptr->user->virthost),
+			sizeof vhost);
+	}
+
+	if (*acptr->user->cloakedhost) /* only if we know the cloaked host */
+		strlcpy(chost, make_nick_user_host(acptr->name, 
+			acptr->user->username, acptr->user->cloakedhost),
+			sizeof chost);
+
+	/* SELECT BANLIST */
+
+	switch (chmode)
+	{
+		case 'b':
+			banlist = &channel->banlist;
+			break;
+		case 'e':
+			banlist = &channel->exlist;
+			break;
+		case 'I':
+			banlist = &channel->invexlist;
+			break;
+		default:
+			abort();
+	}
+
+	/* DO THE ACTUAL WORK */
+
+	for (ban = *banlist; ban; ban = bnext)
+	{
+		bnext = ban->next;
+		if (match_simple(ban->banstr, uhost) ||
+		    (*vhost && match_simple(ban->banstr, vhost)) ||
+		    (*ihost && match_simple(ban->banstr, ihost)) ||
+		    (*chost && match_simple(ban->banstr, chost)))
+		{
+			add_send_mode_param(channel, client, '-',  chmode, 
+				ban->banstr);
+			del_listmode(banlist, channel, ban->banstr);
+		}
+		else if (chmode != 'I' && *ban->banstr == '~' && (extban = findmod_by_bantype(ban->banstr[1])))
+		{
+			if (extban->options & EXTBOPT_CHSVSMODE) 
+			{
+				if (extban->is_banned(acptr, channel, ban->banstr, BANCHK_JOIN, NULL, NULL))
+				{
+					add_send_mode_param(channel, acptr, '-', chmode, ban->banstr);
+					del_listmode(banlist, channel, ban->banstr);
+				}
+			}
+		}
+	}
+}
+
+void clear_bans(Client *client, Channel *channel, char chmode)
+{
+	Extban *extban;
+	Ban *ban, *bnext;
+	Ban **banlist;
+
+	switch (chmode)
+	{
+		case 'b':
+			banlist = &channel->banlist;
+			break;
+		case 'e':
+			banlist = &channel->exlist;
+			break;
+		case 'I':
+			banlist = &channel->invexlist;
+			break;
+		default:
+			abort();
+	}
+	
+	for (ban = *banlist; ban; ban = bnext)
+	{
+		bnext = ban->next;
+		if (chmode != 'I' && (*ban->banstr == '~') && (extban = findmod_by_bantype(ban->banstr[1])))
+		{
+			if (!(extban->options & EXTBOPT_CHSVSMODE))							
+				continue;
+		}
+		add_send_mode_param(channel, client, '-',  chmode, ban->banstr);
+		del_listmode(banlist, channel, ban->banstr);
+	}
+}
+
+/** Special Channel MODE command for services, used by SVSMODE and SVS2MODE.
+ * @note
+ * This SVSMODE/SVS2MODE for channels is not simply the regular MODE "but for
+ * services". No, it does different things.
+ *
+ *  Syntax: SVSMODE <channel> <mode and params>
+ *
+ * There are three variants (do NOT mix them!):
+ * 1) SVSMODE #chan -[b|e|I]
+ *    This will remove all bans/exempts/invex in the channel.
+ * 2) SVSMODE #chan -[b|e|I] nickname
+ *    This will remove all bans/exempts/invex that affect nickname.
+ *    Eg: -b nick may remove bans places on IP, host, cloaked host, vhost,
+ *    basically anything that matches this nickname. Note that the
+ *    user with the specified nickname needs to be online for this to work.
+ * 3) SVSMODE #chan -[v|h|o|a|q]
+ *    This will remove the specified mode(s) from all users in the channel.
+ *    Eg: -o will result in a MODE -o for every channel operator.
+ *
+ * OLD syntax had a 'ts' parameter. No services are known to use this.
+ */
+void channel_svsmode(Client *client, int parc, char *parv[]) 
+{
+	Channel *channel;
+	Client *target;
+	char *m;
+	int what = MODE_ADD;
+	int i = 4; // wtf is this
+	Member *cm;
+	int channel_flags;
+
+	*parabuf = *modebuf = '\0';
+
+	if ((parc < 3) || BadPtr(parv[2]))
+		return;
+
+	if (!(channel = find_channel(parv[1], NULL)))
+		return;
+
+	for(m = parv[2]; *m; m++)
+	{
+		switch (*m)
+		{
+			case '+':
+				what = MODE_ADD;
+				break;
+			case '-':
+				what = MODE_DEL;
+				break;
+			case 'v':
+			case 'h':
+			case 'o':
+			case 'a':
+			case 'q':
+				if (what != MODE_DEL)
+				{
+					sendto_realops("Warning! Received SVS(2)MODE with +%c for %s from %s, which is invalid!!",
+						*m, channel->chname, client->name);
+					continue;
+				}
+				channel_flags = char_to_channelflag(*m);
+				for (cm = channel->members; cm; cm = cm->next)
+				{
+					if (cm->flags & channel_flags)
+					{
+						Membership *mb;
+						mb = find_membership_link(cm->client->user->channel, channel);
+						add_send_mode_param(channel, client, '-', *m, cm->client->name);
+						cm->flags &= ~channel_flags;
+						if (mb)
+							mb->flags = cm->flags;
+					}
+				}
+				break;
+			case 'b':
+			case 'e':
+			case 'I':
+				if (parc >= i)
+				{
+					if (!(target = find_person(parv[i-1], NULL)))
+					{
+						i++;
+						break;
+					}
+					i++;
+
+					unban_user(client, channel, target, *m);
+				}
+				else {
+					clear_bans(client, channel, *m);
+				}
+				break;
+			default:
+				sendto_realops("Warning! Invalid mode `%c' used with 'SVSMODE %s %s %s' (from %s %s)",
+					       *m, channel->chname, parv[2], parv[3] ? parv[3] : "",
+					       client->direction->name, client->name);
+				break;
+		}
+	}
+
+	/* only send message if modes have changed */
+	if (*parabuf)
+	{
+		MessageTag *mtags = NULL;
+		/* NOTE: cannot use 'recv_mtag' here because MODE could be rewrapped. Not ideal :( */
+		new_message(client, NULL, &mtags);
+
+		sendto_channel(channel, client, client, 0, 0, SEND_LOCAL, mtags,
+		               ":%s MODE %s %s %s",
+		               client->name, channel->chname,  modebuf, parabuf);
+		sendto_server(NULL, 0, 0, mtags, ":%s MODE %s %s %s", client->id, channel->chname, modebuf, parabuf);
+
+		/* Activate this hook just like cmd_mode.c */
+		RunHook7(HOOKTYPE_REMOTE_CHANMODE, client, channel, mtags, modebuf, parabuf, 0, 0);
+
+		free_message_tags(mtags);
+
+		*parabuf = 0;
+	}
+}
+
+/** Special User MODE command for Services.
+ * @note
+ * This is used by both SVSMODE and SVS2MODE, when dealing with users (not channels).
+ * parv[1] - nick to change mode for
+ * parv[2] - modes to change
+ * parv[3] - Service Stamp (if mode == d)
+ *
+ * show_change can be 0 (for svsmode) or 1 (for svs2mode).
+ */
+void do_svsmode(Client *client, MessageTag *recv_mtags, int parc, char *parv[], int show_change)
+{
+	int i;
+	char *m;
+	Client *target;
+	int  what;
+	long setflags = 0;
+
+	if (!IsULine(client))
+		return;
+
+	what = MODE_ADD;
+
+	if (parc < 3)
+		return;
+
+	if (parv[1][0] == '#') 
+	{
+		channel_svsmode(client, parc, parv);
+		return;
+	}
+
+	if (!(target = find_person(parv[1], NULL)))
+		return;
+
+	userhost_save_current(target);
+
+	/* initialize setflag to be the user's pre-SVSMODE flags */
+	for (i = 0; i <= Usermode_highest; i++)
+		if (Usermode_Table[i].flag && (target->umodes & Usermode_Table[i].mode))
+			setflags |= Usermode_Table[i].mode;
+
+	/* parse mode change string(s) */
+	for (m = parv[2]; *m; m++)
+		switch (*m)
+		{
+			case '+':
+				what = MODE_ADD;
+				break;
+			case '-':
+				what = MODE_DEL;
+				break;
+
+			/* we may not get these, but they shouldnt be in default */
+			case ' ':
+			case '\n':
+			case '\r':
+			case '\t':
+				break;
+			case 'i':
+				if ((what == MODE_ADD) && !(target->umodes & UMODE_INVISIBLE))
+					irccounts.invisible++;
+				if ((what == MODE_DEL) && (target->umodes & UMODE_INVISIBLE))
+					irccounts.invisible--;
+				goto setmodex;
+			case 'o':
+				if ((what == MODE_ADD) && !(target->umodes & UMODE_OPER))
+				{
+					if (!IsOper(target) && MyUser(target))
+						list_add(&target->special_node, &oper_list);
+
+					irccounts.operators++;
+				}
+				if ((what == MODE_DEL) && (target->umodes & UMODE_OPER))
+				{
+					if (target->umodes & UMODE_HIDEOPER)
+					{
+						/* clear 'H' too, and opercount stays the same.. */
+						target->umodes &= ~UMODE_HIDEOPER;
+					} else {
+						irccounts.operators--;
+					}
+
+					if (MyUser(target) && !list_empty(&target->special_node))
+						list_del(&target->special_node);
+					
+					/* User is no longer oper (after the goto below, anyway)...
+					 * so remove all oper-only modes and snomasks.
+					 */
+					remove_oper_privileges(target, 0);
+				}
+				goto setmodex;
+			case 'H':
+				if (what == MODE_ADD && !(target->umodes & UMODE_HIDEOPER))
+				{
+					if (!IsOper(target) && !strchr(parv[2], 'o')) /* (ofcoz this strchr() is flawed) */
+					{
+						/* isn't an oper, and would not become one either.. abort! */
+						sendto_realops(
+							"[BUG] server %s tried to set +H while user not an oper, para=%s/%s, "
+							"umodes=%ld, please fix your services or if you think it's our fault, "
+							"report at https://bugs.unrealircd.org/", client->name, parv[1], parv[2], target->umodes);
+						break; /* abort! */
+					}
+					irccounts.operators--;
+				}
+				if (what == MODE_DEL && (target->umodes & UMODE_HIDEOPER))
+					irccounts.operators++;
+				goto setmodex;
+			case 'd':
+				if (parv[3])
+				{
+					strlcpy(target->user->svid, parv[3], sizeof(target->user->svid));
+					user_account_login(recv_mtags, target);
+				}
+				else
+				{
+					/* setting deaf */
+					goto setmodex;
+				}
+				break;
+			case 'x':
+				if (what == MODE_DEL)
+				{
+					/* -x */
+					if (target->user->virthost)
+					{
+						/* Removing mode +x and virthost set... recalculate host then (but don't activate it!) */
+						safe_strdup(target->user->virthost, target->user->cloakedhost);
+					}
+				} else
+				{
+					/* +x */
+					if (!target->user->virthost)
+					{
+						/* Hmm... +x but no virthost set, that's bad... use cloakedhost.
+						 * Not sure if this could ever happen, but just in case... -- Syzop
+						 */
+						safe_strdup(target->user->virthost, target->user->cloakedhost);
+					}
+					/* Announce the new host to VHP servers if we're setting the virthost to the cloakedhost.
+					 * In other cases, we can assume that the host has been broadcasted already (after all,
+					 * how else could it have been changed...?).
+					 * NOTES: we're doing a strcasecmp here instead of simply checking if it's a "+x but
+					 * not -t"-case. The reason for this is that the 't' might follow ("+xt" instead of "+tx"),
+					 * in which case we would have needlessly announced it. Ok I didn't test it but that's
+					 * the idea behind it :P. -- Syzop
+					 */
+					if (MyUser(target) && !strcasecmp(target->user->virthost, target->user->cloakedhost))
+						sendto_server(NULL, PROTO_VHP, 0, NULL, ":%s SETHOST :%s", target->id,
+							target->user->virthost);
+				}
+				goto setmodex;
+			case 't':
+				/* We support -t nowadays, which means we remove the vhost and set the cloaked host
+				 * (note that +t is a NOOP, that code is in +x)
+				 */
+				if (what == MODE_DEL)
+				{
+					/* First, check if there's a change at all. Perhaps it's a -t on someone
+					 * with no virthost or virthost being cloakedhost?
+					 * Also, check to make sure user->cloakedhost exists at all.
+					 * This so we won't crash in weird cases like non-conformant servers.
+					 */
+					if (target->user->virthost && *target->user->cloakedhost && strcasecmp(target->user->cloakedhost, GetHost(target)))
+					{
+						/* Make the change effective: */
+						safe_strdup(target->user->virthost, target->user->cloakedhost);
+						/* And broadcast the change to VHP servers */
+						if (MyUser(target))
+							sendto_server(NULL, PROTO_VHP, 0, NULL, ":%s SETHOST :%s", target->id,
+								target->user->virthost);
+					}
+					goto setmodex;
+				}
+				break;
+			case 'z':
+				/* Setting and unsetting user mode 'z' remotely is not supported */
+				break;
+			default:
+				setmodex:
+				for (i = 0; i <= Usermode_highest; i++)
+				{
+					if (!Usermode_Table[i].flag)
+						continue;
+					if (*m == Usermode_Table[i].flag)
+					{
+						if (what == MODE_ADD)
+							target->umodes |= Usermode_Table[i].mode;
+						else
+							target->umodes &= ~Usermode_Table[i].mode;
+						break;
+					}
+				}
+				break;
+		} /*switch*/
+
+	if (parc > 3)
+		sendto_server(client, 0, 0, NULL, ":%s %s %s %s %s",
+		    client->id, show_change ? "SVS2MODE" : "SVSMODE",
+		    parv[1], parv[2], parv[3]);
+	else
+		sendto_server(client, 0, 0, NULL, ":%s %s %s %s",
+		    client->id, show_change ? "SVS2MODE" : "SVSMODE",
+		    parv[1], parv[2]);
+
+	/* Here we trigger the same hooks that cmd_mode does and, likewise,
+	   only if the old flags (setflags) are different than the newly-
+	   set ones */
+	if (setflags != target->umodes)
+		RunHook3(HOOKTYPE_UMODE_CHANGE, client, setflags, target->umodes);
+
+	if (show_change)
+	{
+		char buf[BUFSIZE];
+		build_umode_string(target, setflags, ALL_UMODES, buf);
+		if (MyUser(target) && *buf)
+			sendto_one(target, NULL, ":%s MODE %s :%s", client->name, target->name, buf);
+	}
+
+	userhost_changed(target); /* we can safely call this, even if nothing changed */
+
+	VERIFY_OPERCOUNT(target, "svsmodeX");
+}
+
+/*
+ * cmd_svsmode() added by taz
+ * parv[1] - username to change mode for
+ * parv[2] - modes to change
+ * parv[3] - Service Stamp (if mode == d)
+ */
+CMD_FUNC(cmd_svsmode)
+{
+	do_svsmode(client, recv_mtags, parc, parv, 0);
+}
+
+/*
+ * cmd_svs2mode() added by Potvin
+ * parv[1] - username to change mode for
+ * parv[2] - modes to change
+ * parv[3] - Service Stamp (if mode == d)
+ */
+CMD_FUNC(cmd_svs2mode)
+{
+	do_svsmode(client, recv_mtags, parc, parv, 1);
+}
+
+void add_send_mode_param(Channel *channel, Client *from, char what, char mode, char *param)
+{
+	static char *modes = NULL, lastwhat;
+	static short count = 0;
+	short send = 0;
+	
+	if (!modes) modes = modebuf;
+	
+	if (!modebuf[0])
+	{
+		modes = modebuf;
+		*modes++ = what;
+		*modes = 0;
+		lastwhat = what;
+		*parabuf = 0;
+		count = 0;
+	}
+	if (lastwhat != what)
+	{
+		*modes++ = what;
+		*modes = 0;
+		lastwhat = what;
+	}
+	if (strlen(parabuf) + strlen(param) + 11 < MODEBUFLEN)
+	{
+		if (*parabuf) 
+			strcat(parabuf, " ");
+		strcat(parabuf, param);
+		*modes++ = mode;
+		*modes = 0;
+		count++;
+	}
+	else if (*parabuf) 
+		send = 1;
+
+	if (count == MAXMODEPARAMS)
+		send = 1;
+
+	if (send)
+	{
+		MessageTag *mtags = NULL;
+		/* NOTE: cannot use 'recv_mtag' here because MODE could be rewrapped. Not ideal :( */
+		new_message(from, NULL, &mtags);
+		sendto_channel(channel, from, from, 0, 0, SEND_LOCAL, mtags,
+		               ":%s MODE %s %s %s",
+		               from->name, channel->chname, modebuf, parabuf);
+		sendto_server(NULL, 0, 0, mtags, ":%s MODE %s %s %s", from->id, channel->chname, modebuf, parabuf);
+		free_message_tags(mtags);
+		send = 0;
+		*parabuf = 0;
+		modes = modebuf;
+		*modes++ = what;
+		lastwhat = what;
+		if (count != MAXMODEPARAMS)
+		{
+			strcpy(parabuf, param);
+			*modes++ = mode;
+			count = 1;
+		}
+		else 
+			count = 0;
+		*modes = 0;
+	}
+}
diff --git a/src/modules/svsmotd.c b/src/modules/svsmotd.c
new file mode 100644
index 0000000..2f70740
--- /dev/null
+++ b/src/modules/svsmotd.c
@@ -0,0 +1,118 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svsmotd.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   SVSMOTD command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svsmotd);
+
+#define MSG_SVSMOTD 	"SVSMOTD"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsmotd",
+	"5.0",
+	"command /svsmotd", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSMOTD, cmd_svsmotd, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_svsmotd
+**
+*/
+CMD_FUNC(cmd_svsmotd)
+{
+        FILE *conf = NULL;
+
+        if (!IsULine(client))
+        {
+                sendnumeric(client, ERR_NOPRIVILEGES);
+                return;
+        }
+        if (parc < 2)
+        {
+                sendnumeric(client, ERR_NEEDMOREPARAMS, "SVSMOTD");
+                return;
+        }
+
+        if ((*parv[1] != '!') && parc < 3)
+        {
+                sendnumeric(client, ERR_NEEDMOREPARAMS, "SVSMOTD");
+                return;
+        }
+
+        switch (*parv[1])
+        {
+          case '#':
+                  conf = fopen(conf_files->svsmotd_file, "a");
+                  sendto_ops("Added '%s' to services motd", parv[2]);
+                  break;
+          case '!':
+          {
+                  remove(conf_files->svsmotd_file);
+                  free_motd(&svsmotd);
+                  sendto_ops("Wiped out services motd data");
+                  break;
+          }
+          default:
+                  return;
+        }
+        if (parv[2])
+                sendto_server(client, 0, 0, NULL, ":%s SVSMOTD %s :%s", client->id, parv[1], parv[2]);
+        else
+                sendto_server(client, 0, 0, NULL, ":%s SVSMOTD %s", client->id, parv[1]);
+
+        if (conf == NULL)
+                return;
+
+        if (parc < 3 && (*parv[1] == '!'))
+        {
+                fclose(conf);
+                return;
+        }
+        fprintf(conf, "%s\n", parv[2]);
+        if (*parv[1] == '!')
+                sendto_ops("Added '%s' to services motd", parv[2]);
+
+        fclose(conf);
+        /* We editted it, so rehash it -- codemastr */
+        read_motd(conf_files->svsmotd_file, &svsmotd);
+}
diff --git a/src/modules/svsnick.c b/src/modules/svsnick.c
new file mode 100644
index 0000000..92618fb
--- /dev/null
+++ b/src/modules/svsnick.c
@@ -0,0 +1,115 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svsnick.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   svsnick command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svsnick);
+
+#define MSG_SVSNICK 	"SVSNICK"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsnick",
+	"5.0",
+	"command /svsnick", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSNICK, cmd_svsnick, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+/*
+** cmd_svsnick
+**      parv[1] = old nickname
+**      parv[2] = new nickname
+**      parv[3] = timestamp
+*/
+CMD_FUNC(cmd_svsnick)
+{
+	Client *acptr;
+	Client *ocptr; /* Other client */
+	MessageTag *mtags = NULL;
+
+	if (!IsULine(client) || parc < 4 || (strlen(parv[2]) > NICKLEN))
+		return; /* This looks like an error anyway -Studded */
+
+	if (hunt_server(client, NULL, ":%s SVSNICK %s %s :%s", 1, parc, parv) != HUNTED_ISME)
+		return; /* Forwarded, done */
+
+	if (do_nick_name(parv[2]) == 0)
+		return;
+
+	if (!(acptr = find_person(parv[1], NULL)))
+		return; /* User not found, bail out */
+
+	if ((ocptr = find_client(parv[2], NULL)) && ocptr != acptr) /* Collision */
+	{
+		exit_client(acptr, NULL,
+		                   "Nickname collision due to Services enforced "
+		                   "nickname change, your nick was overruled");
+		return;
+	}
+
+	/* if the new nickname is identical to the old one, ignore it */
+	if (!strcmp(acptr->name, parv[2]))
+		return;
+
+	if (acptr != ocptr)
+		acptr->umodes &= ~UMODE_REGNICK;
+	acptr->lastnick = atol(parv[3]);
+
+	/* no 'recv_mtags' here, we do not inherit from SVSNICK but generate a new NICK event */
+	new_message(acptr, NULL, &mtags);
+	sendto_local_common_channels(acptr, NULL, 0, mtags, ":%s NICK :%s", acptr->name, parv[2]);
+	sendto_one(acptr, mtags, ":%s NICK :%s", acptr->name, parv[2]);
+	sendto_server(NULL, 0, 0, mtags, ":%s NICK %s :%ld", acptr->id, parv[2], atol(parv[3]));
+	free_message_tags(mtags);
+
+	add_history(acptr, 1);
+	del_from_client_hash_table(acptr->name, acptr);
+	hash_check_watch(acptr, RPL_LOGOFF);
+
+	sendto_snomask(SNO_NICKCHANGE,
+		"*** %s (%s@%s) has been forced to change their nickname to %s", 
+		acptr->name, acptr->user->username, acptr->user->realhost, parv[2]);
+	RunHook2(HOOKTYPE_LOCAL_NICKCHANGE, acptr, parv[2]);
+
+	strlcpy(acptr->name, parv[2], sizeof acptr->name);
+	add_to_client_hash_table(parv[2], acptr);
+	hash_check_watch(acptr, RPL_LOGON);
+}
diff --git a/src/modules/svsnline.c b/src/modules/svsnline.c
new file mode 100644
index 0000000..2f8e945
--- /dev/null
+++ b/src/modules/svsnline.c
@@ -0,0 +1,157 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svsnline.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   SVSNLINE Command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svsnline);
+
+#define MSG_SVSNLINE 	"SVSNLINE"	/* svsnline */
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsnline",	/* Name of module */
+	"5.0", /* Version */
+	"command /svsnline", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSNLINE, cmd_svsnline, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void wipe_svsnlines(void)
+{
+	ConfigItem_ban *bconf, *next;
+	
+	for (bconf = conf_ban; bconf; bconf = next)
+	{
+		next = bconf->next;
+		if ((bconf->flag.type == CONF_BAN_REALNAME) &&
+			(bconf->flag.type2 == CONF_BAN_TYPE_AKILL))
+		{
+			DelListItem(bconf, conf_ban);
+			safe_free(bconf->mask);
+			safe_free(bconf->reason);
+			safe_free(bconf);
+		}
+	}
+}
+
+/*
+ * cmd_svsnline
+ * SVSNLINE + reason_where_is_space :realname mask with spaces
+ * SVSNLINE - :realname mask
+ * SVSNLINE *     Wipes
+ * -Stskeeps
+*/
+CMD_FUNC(cmd_svsnline)
+{
+	ConfigItem_ban *bconf;
+	char		*s;
+
+	if (parc < 2)
+		return;
+
+	switch (*parv[1])
+	{
+		  /* Allow non-U-Lines to send ONLY SVSNLINE +, but don't send it out
+		   * unless it is from a U-Line -- codemastr */
+	  case '+':
+	  {
+		  if (parc < 4)
+			  return;
+		 
+		  if (!find_banEx(NULL, parv[3], CONF_BAN_REALNAME, CONF_BAN_TYPE_AKILL))
+		  {
+			bconf = safe_alloc(sizeof(ConfigItem_ban));
+			bconf->flag.type = CONF_BAN_REALNAME;
+			safe_strdup(bconf->mask, parv[3]);
+			safe_strdup(bconf->reason, parv[2]);
+			for (s = bconf->reason; *s; s++)
+				if (*s == '_')
+					*s = ' ';
+			bconf->flag.type2 = CONF_BAN_TYPE_AKILL;
+			AddListItem(bconf, conf_ban);
+		  } 
+		 
+		  if (IsULine(client))
+			sendto_server(client, 0, 0, NULL, ":%s SVSNLINE + %s :%s",
+			    client->id, parv[2], parv[3]);
+		  break;
+	  }
+	  case '-':
+	  {
+		  if (!IsULine(client))
+			  return;
+		  if (parc < 3)
+			  return;
+		  
+		  for (bconf = conf_ban; bconf; bconf = bconf->next)
+		  {
+			if (bconf->flag.type != CONF_BAN_REALNAME)
+				continue;
+			if (bconf->flag.type2 != CONF_BAN_TYPE_AKILL)
+				continue;
+			if (!strcasecmp(bconf->mask, parv[2]))
+				break;
+		  }
+		  if (bconf)
+		  {
+		  	DelListItem(bconf, conf_ban);
+	  		safe_free(bconf->mask);
+	  		safe_free(bconf->reason);
+		  	safe_free(bconf);
+		  	
+		  }
+		  sendto_server(client, 0, 0, NULL, ":%s SVSNLINE - %s", client->id, parv[2]);
+		  break;
+	  }
+	  case '*':
+	  {
+		  if (!IsULine(client))
+			  return;
+	          wipe_svsnlines();
+		  sendto_server(client, 0, 0, NULL, ":%s SVSNLINE *", client->id);
+		  break;
+	  }
+
+	}
+}
diff --git a/src/modules/svsnolag.c b/src/modules/svsnolag.c
new file mode 100644
index 0000000..cc71f85
--- /dev/null
+++ b/src/modules/svsnolag.c
@@ -0,0 +1,105 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svsnolag.c
+ *   (C) 2006 Alex Berezhnyak and djGrrr
+ *
+ *   Fake lag exception - SVSNOLAG and SVS2NOLAG commands
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svsnolag);
+CMD_FUNC(cmd_svs2nolag);
+
+#define MSG_SVSNOLAG 	"SVSNOLAG"	
+#define MSG_SVS2NOLAG 	"SVS2NOLAG"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsnolag",
+	"5.0",
+	"commands /svsnolag and /svs2nolag", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSNOLAG, cmd_svsnolag, MAXPARA, CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVS2NOLAG, cmd_svs2nolag, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void do_svsnolag(Client *client, int parc, char *parv[], int show_change)
+{
+	Client *target;
+	char *cmd = show_change ? MSG_SVS2NOLAG : MSG_SVSNOLAG;
+
+	if (!IsULine(client))
+		return;
+
+	if (parc < 3)
+		return;
+
+	if (!(target = find_person(parv[2], NULL)))
+		return;
+
+	if (!MyUser(target))
+	{
+		sendto_one(target, NULL, ":%s %s %s %s", client->name, cmd, parv[1], parv[2]);
+		return;
+	}
+
+	if (*parv[1] == '+')
+	{
+		if (!IsNoFakeLag(target))
+		{
+			SetNoFakeLag(target);
+			if (show_change)
+				sendnotice(target, "You are now exempted from fake lag");
+		}
+	}
+	if (*parv[1] == '-')
+	{
+		if (IsNoFakeLag(target))
+		{
+			ClearNoFakeLag(target);
+			if (show_change)
+				sendnotice(target, "You are no longer exempted from fake lag");
+		}
+	}
+}
+
+CMD_FUNC(cmd_svsnolag)
+{
+	do_svsnolag(client, parc, parv, 0);
+}
+
+CMD_FUNC(cmd_svs2nolag)
+{
+	do_svsnolag(client, parc, parv, 1);
+}
diff --git a/src/modules/svsnoop.c b/src/modules/svsnoop.c
new file mode 100644
index 0000000..28e802e
--- /dev/null
+++ b/src/modules/svsnoop.c
@@ -0,0 +1,95 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svsnoop.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   svsnoop command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svsnoop);
+
+#define MSG_SVSNOOP 	"SVSNOOP"	
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"svsnoop",
+	"5.0",
+	"command /svsnoop", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSNOOP, cmd_svsnoop, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+CMD_FUNC(cmd_svsnoop)
+{
+	Client *acptr;
+
+	if (!(IsULine(client) && parc > 2))
+		return;
+
+	if (hunt_server(client, NULL, ":%s SVSNOOP %s :%s", 1, parc, parv) == HUNTED_ISME)
+	{
+		if (parv[2][0] == '+')
+		{
+			SVSNOOP = 1;
+			sendto_ops("This server has been placed in NOOP mode");
+			list_for_each_entry(acptr, &client_list, client_node)
+			{
+				if (MyUser(acptr) && IsOper(acptr))
+				{
+					if (IsOper(acptr))
+					{
+						irccounts.operators--;
+						VERIFY_OPERCOUNT(acptr, "svsnoop");
+					}
+
+					if (!list_empty(&acptr->special_node))
+						list_del(&acptr->special_node);
+
+					remove_oper_privileges(acptr, 1);
+					RunHook2(HOOKTYPE_LOCAL_OPER, acptr, 0);
+				}
+			}
+		}
+		else
+		{
+			SVSNOOP = 0;
+			sendto_ops("This server is no longer in NOOP mode");
+		}
+	}
+}
diff --git a/src/modules/svspart.c b/src/modules/svspart.c
new file mode 100644
index 0000000..dd9007c
--- /dev/null
+++ b/src/modules/svspart.c
@@ -0,0 +1,90 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/svspart.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svspart);
+
+#define MSG_SVSPART       "SVSPART"
+
+ModuleHeader MOD_HEADER
+  = {
+	"svspart",	/* Name of module */
+	"5.0", /* Version */
+	"command /svspart", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSPART, cmd_svspart, 3, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+/* cmd_svspart() - Lamego - Wed Jul 21 20:04:48 1999
+   Copied off PTlink IRCd (C) PTlink coders team.
+  Modified for PART by Stskeeps
+	parv[1] - nick to make part
+	parv[2] - channel(s) to part
+	parv[3] - comment
+*/
+CMD_FUNC(cmd_svspart)
+{
+	Client *target;
+	char *comment = (parc > 3 && parv[3] ? parv[3] : NULL);
+	if (!IsULine(client))
+		return;
+
+	if (parc < 3 || !(target = find_person(parv[1], NULL))) 
+		return;
+
+	if (MyUser(target))
+	{
+		parv[0] = target->name;
+		parv[1] = parv[2];
+		parv[2] = comment;
+		parv[3] = NULL;
+		do_cmd(target, NULL, "PART", comment ? 3 : 2, parv);
+		/* NOTE: target may be killed now by spamfilter due to the part reason */
+	}
+	else
+	{
+		if (comment)
+			sendto_one(target, NULL, ":%s SVSPART %s %s :%s", client->name,
+			    parv[1], parv[2], parv[3]);
+		else
+			sendto_one(target, NULL, ":%s SVSPART %s %s", client->name,
+			    parv[1], parv[2]);
+	}
+}
diff --git a/src/modules/svssilence.c b/src/modules/svssilence.c
new file mode 100644
index 0000000..5d64f54
--- /dev/null
+++ b/src/modules/svssilence.c
@@ -0,0 +1,96 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/svssilence.c
+ *   (C) 2003 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svssilence);
+
+ModuleHeader MOD_HEADER
+  = {
+	"svssilence",	/* Name of module */
+	"5.0", /* Version */
+	"command /svssilence", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, "SVSSILENCE", cmd_svssilence, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+/* cmd_svssilence()
+ * written by Syzop (copied a lot from cmd_silence),
+ * suggested by <??>.
+ * parv[1] - target nick
+ * parv[2] - space delimited silence list (+Blah +Blih -Bluh etc)
+ * SERVER DISTRIBUTION:
+ * Since UnrealIRCd 5 it is directed to the target client (previously: broadcasted).
+ */
+CMD_FUNC(cmd_svssilence)
+{
+	Client *target;
+	int mine;
+	char *p, *cp, c;
+	
+	if (!IsULine(client))
+		return;
+
+	if (parc < 3 || BadPtr(parv[2]) || !(target = find_person(parv[1], NULL)))
+		return;
+	
+	if (!MyUser(target))
+	{
+		sendto_one(target, NULL, ":%s SVSSILENCE %s :%s", client->name, parv[1], parv[2]);
+		return;
+	}
+
+	/* It's for our client */
+	for (p = strtok(parv[2], " "); p; p = strtok(NULL, " "))
+	{
+		c = *p;
+		if ((c == '-') || (c == '+'))
+			p++;
+		else if (!(strchr(p, '@') || strchr(p, '.') || strchr(p, '!') || strchr(p, '*')))
+		{
+			/* "no such nick" */
+			continue;
+		}
+		else
+			c = '+';
+		cp = pretty_mask(p);
+		if ((c == '-' && !del_silence(target, cp)) ||
+		    (c != '-' && !add_silence(target, cp, 0)))
+		{
+			sendto_prefix_one(target, target, NULL, ":%s SILENCE %c%s", client->name, c, cp);
+		}
+	}
+}
diff --git a/src/modules/svssno.c b/src/modules/svssno.c
new file mode 100644
index 0000000..ced2ea4
--- /dev/null
+++ b/src/modules/svssno.c
@@ -0,0 +1,133 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/svssno.c
+ *   (C) 2004 Dominick Meglio (codemastr) and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svssno);
+CMD_FUNC(cmd_svs2sno);
+
+#define MSG_SVSSNO 	"SVSSNO"	
+#define MSG_SVS2SNO 	"SVS2SNO"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"svssno",
+	"5.0",
+	"command /svssno", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSSNO, cmd_svssno, MAXPARA, CMD_USER|CMD_SERVER);
+	CommandAdd(modinfo->handle, MSG_SVS2SNO, cmd_svs2sno, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * do_svssno() 
+ * parv[1] - username to change snomask for
+ * parv[2] - snomasks to change
+ * show_change determines whether to show the change to the user
+ */
+void do_svssno(Client *client, int parc, char *parv[], int show_change)
+{
+	char *p;
+	Client *target;
+	int what = MODE_ADD, i;
+
+	if (!IsULine(client))
+		return;
+
+	if (parc < 2)
+		return;
+
+	if (parv[1][0] == '#') 
+		return;
+
+	if (!(target = find_person(parv[1], NULL)))
+		return;
+
+	if (hunt_server(client, NULL,
+	                      show_change ? ":%s SVS2SNO %s %s" : ":%s SVSSNO %s %s",
+	                      1, parc, parv) != HUNTED_ISME)
+	{
+		return;
+	}
+
+	if (MyUser(target))
+	{
+		if (parc == 2)
+			target->user->snomask = 0;
+		else
+		{
+			for (p = parv[2]; p && *p; p++) {
+				switch (*p) {
+					case '+':
+						what = MODE_ADD;
+						break;
+					case '-':
+						what = MODE_DEL;
+						break;
+					default:
+				 	 for (i = 0; i <= Snomask_highest; i++)
+				 	 {
+				 	 	if (!Snomask_Table[i].flag)
+				 	 		continue;
+		 	 			if (*p == Snomask_Table[i].flag)
+				 	 	{
+				 	 		if (what == MODE_ADD)
+					 	 		target->user->snomask |= Snomask_Table[i].mode;
+			 			 	else
+			 	 				target->user->snomask &= ~Snomask_Table[i].mode;
+				 	 	}
+				 	 }				
+				}
+			}
+		}
+	}
+
+	if (show_change)
+		sendnumeric(target, RPL_SNOMASK, get_snomask_string(target));
+}
+
+CMD_FUNC(cmd_svssno)
+{
+	do_svssno(client, parc, parv, 0);
+}
+
+CMD_FUNC(cmd_svs2sno)
+{
+	do_svssno(client, parc, parv, 1);
+}
diff --git a/src/modules/svswatch.c b/src/modules/svswatch.c
new file mode 100644
index 0000000..040ab0d
--- /dev/null
+++ b/src/modules/svswatch.c
@@ -0,0 +1,80 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/svswatch.c
+ *   (C) 2003 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_svswatch);
+
+/* Place includes here */
+#define MSG_SVSWATCH       "SVSWATCH"
+
+ModuleHeader MOD_HEADER
+  = {
+	"svswatch",	/* Name of module */
+	"5.0", /* Version */
+	"command /svswatch", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SVSWATCH, cmd_svswatch, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+	
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+/* cmd_svswatch() - written by Syzop, suggested by Griever.
+ * parv[1] - target nick
+ * parv[2] - parameters
+ */
+CMD_FUNC(cmd_svswatch)
+{
+	Client *target;
+
+	if (!IsULine(client))
+		return;
+
+	if (parc < 3 || BadPtr(parv[2]) || !(target = find_person(parv[1], NULL)))
+		return;
+
+	if (MyUser(target))
+	{
+		parv[0] = target->name;
+		parv[1] = parv[2];
+		parv[2] = NULL;
+		do_cmd(target, NULL, "WATCH", 2, parv);
+	}
+	else
+		sendto_one(target, NULL, ":%s SVSWATCH %s :%s", client->name, parv[1], parv[2]);
+}
diff --git a/src/modules/swhois.c b/src/modules/swhois.c
new file mode 100644
index 0000000..78d72b1
--- /dev/null
+++ b/src/modules/swhois.c
@@ -0,0 +1,110 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/swhois.c
+ *   (C) 2001 The UnrealIRCd Team
+ *
+ *   SWHOIS command
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_swhois);
+
+#define MSG_SWHOIS 	"SWHOIS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"swhois",
+	"5.0",
+	"command /swhois", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_SWHOIS, cmd_swhois, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+/** SWHOIS: add or delete additional whois titles to user.
+ * Old syntax:
+ * parv[1] = nickname
+ * parv[2] = new swhois
+ * New syntax (since July 2015, by Syzop):
+ * parv[1] = nickname
+ * parv[2] = + or -
+ * parv[3] = added-by tag
+ * parv[4] = priority
+ * parv[5] = swhois
+ */
+CMD_FUNC(cmd_swhois)
+{
+	Client *target;
+	char tag[HOSTLEN+1];
+	char swhois[SWHOISLEN+1];
+	int add;
+	int priority = 0;
+
+	*tag = *swhois = '\0';
+
+	if (parc < 3)
+		return;
+
+	target = find_person(parv[1], NULL);
+	if (!target)
+		return;
+
+	if ((parc > 5) && !BadPtr(parv[5]))
+	{
+		/* New syntax */
+		add = (*parv[2] == '+') ? 1 : 0;
+		strlcpy(tag, parv[3], sizeof(tag));
+		priority = atoi(parv[4]);
+		strlcpy(swhois, parv[5], sizeof(swhois));
+	} else {
+		/* Old syntax */
+		strlcpy(tag, client->name, sizeof(tag));
+		if (BadPtr(parv[2]))
+		{
+			/* Delete. Hmmmm. Let's just delete anything with that tag. */
+			strcpy(swhois, "*");
+			add = 0;
+		} else {
+			/* Add */
+			add = 1;
+			strlcpy(swhois, parv[2], sizeof(swhois));
+		}
+	}
+
+	if (add)
+		swhois_add(target, tag, priority, swhois, client, client);
+	else
+		swhois_delete(target, tag, swhois, client, client);
+}
diff --git a/src/modules/third/Makefile.in b/src/modules/third/Makefile.in
new file mode 100644
index 0000000..5fd8f47
--- /dev/null
+++ b/src/modules/third/Makefile.in
@@ -0,0 +1,47 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/modules/chanmodes/Makefile
+#*   Copyright (C) The UnrealIRCd Team
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*/
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+INCLUDES = ../../include/channel.h \
+	../../include/common.h ../../include/config.h ../../include/dbuf.h \
+	../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \
+	../../include/ircsprintf.h \
+	../../include/license.h \
+	../../include/modules.h ../../include/modversion.h ../../include/msg.h \
+	../../include/numeric.h ../../include/proto.h ../../include/dns.h \
+	../../include/resource.h ../../include/setup.h \
+	../../include/struct.h ../../include/sys.h \
+	../../include/types.h ../../include/url.h \
+	../../include/version.h ../../include/whowas.h
+
+MODULEFLAGS=@MODULEFLAGS@
+RM=@RM@
+
+all: build
+
+build:
+	../../buildmod
+
+custommodule: $(MODULEFILE).c
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o $(MODULEFILE).so $(MODULEFILE).c $(EXLIBS)
+
+clean:
+	$(RM) -f *.o *.so *~ core
diff --git a/src/modules/time.c b/src/modules/time.c
new file mode 100644
index 0000000..3b882fe
--- /dev/null
+++ b/src/modules/time.c
@@ -0,0 +1,66 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/time.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_time);
+
+/* Place includes here */
+#define MSG_TIME	"TIME"
+
+ModuleHeader MOD_HEADER
+  = {
+	"time",	/* Name of module */
+	"5.0", /* Version */
+	"command /time", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_TIME, cmd_time, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_time
+**	parv[1] = servername
+*/
+CMD_FUNC(cmd_time)
+{
+	if (hunt_server(client, recv_mtags, ":%s TIME :%s", 1, parc, parv) == HUNTED_ISME)
+		sendnumeric(client, RPL_TIME, me.name, long_date(0));
+}
diff --git a/src/modules/tkl.c b/src/modules/tkl.c
new file mode 100644
index 0000000..30a4ffe
--- /dev/null
+++ b/src/modules/tkl.c
@@ -0,0 +1,4955 @@
+/*
+ * Unreal Internet Relay Chat Daemon, src/modules/tkl.c
+ * TKL Commands: server bans, spamfilters, etc.
+ * (C) 1999-2019 Bram Matthys and The UnrealIRCd Team
+ *
+ * See file AUTHORS in IRC package for additional names of
+ * the programmers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"tkl",
+	"5.0",
+	"Server ban commands such as /GLINE, /SPAMFILTER, etc.",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Forward declarations */
+int tkl_config_test_spamfilter(ConfigFile *, ConfigEntry *, int, int *);
+int tkl_config_match_spamfilter(ConfigFile *, ConfigEntry *, int);
+int tkl_config_test_ban(ConfigFile *, ConfigEntry *, int, int *);
+int tkl_config_run_ban(ConfigFile *, ConfigEntry *, int);
+int tkl_config_test_except(ConfigFile *, ConfigEntry *, int, int *);
+int tkl_config_run_except(ConfigFile *, ConfigEntry *, int);
+CMD_FUNC(cmd_gline);
+CMD_FUNC(cmd_shun);
+CMD_FUNC(cmd_tempshun);
+CMD_FUNC(cmd_gzline);
+CMD_FUNC(cmd_kline);
+CMD_FUNC(cmd_zline);
+CMD_FUNC(cmd_spamfilter);
+CMD_FUNC(cmd_eline);
+void cmd_tkl_line(Client *client, int parc, char *parv[], char *type);
+int _tkl_hash(unsigned int c);
+char _tkl_typetochar(int type);
+int _tkl_chartotype(char c);
+int tkl_banexception_chartotype(char c);
+char *_tkl_type_string(TKL *tk);
+char *tkl_banexception_configname_to_chars(char *name);
+TKL *_tkl_add_serverban(int type, char *usermask, char *hostmask, char *reason, char *set_by,
+                            time_t expire_at, time_t set_at, int soft, int flags);
+TKL *_tkl_add_banexception(int type, char *usermask, char *hostmask, char *reason, char *set_by,
+                               time_t expire_at, time_t set_at, int soft, char *bantypes, int flags);
+TKL *_tkl_add_nameban(int type, char *name, int hold, char *reason, char *set_by,
+                          time_t expire_at, time_t set_at, int flags);
+TKL *_tkl_add_spamfilter(int type, unsigned short target, BanAction action, Match *match, char *set_by,
+                             time_t expire_at, time_t set_at,
+                             time_t spamf_tkl_duration, char *spamf_tkl_reason,
+                             int flags);
+void _sendnotice_tkl_del(char *removed_by, TKL *tkl);
+void _sendnotice_tkl_add(TKL *tkl);
+void _free_tkl(TKL *tkl);
+void _tkl_del_line(TKL *tkl);
+static void _tkl_check_local_remove_shun(TKL *tmp);
+void tkl_expire_entry(TKL * tmp);
+EVENT(tkl_check_expire);
+int _find_tkline_match(Client *client, int skip_soft);
+int _find_shun(Client *client);
+int _find_spamfilter_user(Client *client, int flags);
+TKL *_find_qline(Client *client, char *nick, int *ishold);
+TKL *_find_tkline_match_zap(Client *client);
+void _tkl_stats(Client *client, int type, char *para);
+void _tkl_sync(Client *client);
+CMD_FUNC(_cmd_tkl);
+int _place_host_ban(Client *client, BanAction action, char *reason, long duration);
+int _match_spamfilter(Client *client, char *str_in, int type, char *target, int flags, TKL **rettk);
+int _join_viruschan(Client *client, TKL *tk, int type);
+void _spamfilter_build_user_string(char *buf, char *nick, Client *client);
+int _match_user(char *rmask, Client *client, int options);
+int _match_user_extended_server_ban(char *banstr, Client *client);
+void ban_target_to_tkl_layer(BanTarget ban_target, BanAction action, Client *client, char **tkl_username, char **tkl_hostname);
+int _tkl_ip_hash(char *ip);
+int _tkl_ip_hash_type(int type);
+TKL *_find_tkl_serverban(int type, char *usermask, char *hostmask, int softban);
+TKL *_find_tkl_banexception(int type, char *usermask, char *hostmask, int softban);
+TKL *_find_tkl_nameban(int type, char *name, int hold);
+TKL *_find_tkl_spamfilter(int type, char *match_string, BanAction action, unsigned short target);
+int _find_tkl_exception(int ban_type, Client *client);
+
+/* Externals (only for us :D) */
+extern int MODVAR spamf_ugly_vchanoverride;
+
+typedef struct TKLTypeTable TKLTypeTable;
+struct TKLTypeTable
+{
+	char *config_name;        /**< The name as used in the configuration file */
+	char letter;              /**< The letter ised in the TKL S2S command */
+	int type;                 /**< TKL_xxx, optionally OR'ed with TKL_GLOBAL */
+	char *log_name;           /**< Used for logging and server notices */
+	unsigned tkltype:1;       /**< Is a type available in cmd_tkl() and friends */
+	unsigned exceptiontype:1; /**< Is a type available for exceptions */
+};
+
+/** This table which defines all TKL types and TKL exception types.
+ * If you wonder about the messy order: gline/kline/gzline/zline
+ * are at the top for performance reasons. They make up 99% of the TKLs.
+ *
+ * IMPORTANT IF YOU ARE ADDING A NEW TYPE TO THIS TABLE:
+ * - also update eline_syntax()
+ * - also check if eline_type_requires_ip() needs to be updated
+ * - more?
+ */
+TKLTypeTable tkl_types[] = {
+	/* <config name> <letter> <TKL_xxx type>               <logging name> <tkl option?> <exempt option?> */
+	{ "gline",              'G', TKL_KILL       | TKL_GLOBAL, "G-Line",             1, 1 },
+	{ "kline",              'k', TKL_KILL,                    "K-Line",             1, 1 },
+	{ "gzline",             'Z', TKL_ZAP        | TKL_GLOBAL, "Global Z-Line",      1, 1 },
+	{ "zline",              'z', TKL_ZAP,                     "Z-Line",             1, 1 },
+	{ "spamfilter",         'F', TKL_SPAMF      | TKL_GLOBAL, "Spamfilter",         1, 1 },
+	{ "qline",              'Q', TKL_NAME       | TKL_GLOBAL, "Q-Line",             1, 1 },
+	{ "except",             'E', TKL_EXCEPTION  | TKL_GLOBAL, "Exception",          1, 0 },
+	{ "shun",               's', TKL_SHUN       | TKL_GLOBAL, "Shun",               1, 1 },
+	{ "local-qline",        'q', TKL_NAME,                    "Local Q-Line",       1, 0 },
+	{ "local-spamfilter",   'e', TKL_EXCEPTION,               "Local Exception",    1, 0 },
+	{ "local-exception",    'f', TKL_SPAMF,                   "Local Spamfilter",   1, 0 },
+	{ "blacklist",          'b', TKL_BLACKLIST,               "Blacklist",          0, 1 },
+	{ "connect-flood",      'c', TKL_CONNECT_FLOOD,           "Connect flood",      0, 1 },
+	{ "maxperip",           'm', TKL_MAXPERIP,                "Max-per-IP",         0, 1 },
+	{ "unknown-data-flood", 'd', TKL_UNKNOWN_DATA_FLOOD,      "Unknown data flood", 0, 1 },
+	{ "antirandom",         'r', TKL_ANTIRANDOM,              "Antirandom",         0, 1 },
+	{ "antimixedutf8",      '8', TKL_ANTIMIXEDUTF8,           "Antimixedutf8",      0, 1 },
+	{ "ban-version",        'v', TKL_BAN_VERSION,             "Ban Version",        0, 1 },
+	{ NULL,                 '\0', 0,                          NULL,                 0, 0 },
+};
+#define ALL_VALID_EXCEPTION_TYPES "kline, gline, zline, gzline, spamfilter, shun, qline, blacklist, connect-flood, unknown-data-flood, antirandom, antimixedutf8, ban-version"
+
+MOD_TEST()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, tkl_config_test_spamfilter);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, tkl_config_test_ban);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, tkl_config_test_except);
+	EfunctionAdd(modinfo->handle, EFUNC_TKL_HASH, _tkl_hash);
+	EfunctionAdd(modinfo->handle, EFUNC_TKL_TYPETOCHAR, TO_INTFUNC(_tkl_typetochar));
+	EfunctionAdd(modinfo->handle, EFUNC_TKL_CHARTOTYPE, TO_INTFUNC(_tkl_chartotype));
+	EfunctionAddPChar(modinfo->handle, EFUNC_TKL_TYPE_STRING, _tkl_type_string);
+	EfunctionAddPVoid(modinfo->handle, EFUNC_TKL_ADD_SERVERBAN, TO_PVOIDFUNC(_tkl_add_serverban));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_TKL_ADD_BANEXCEPTION, TO_PVOIDFUNC(_tkl_add_banexception));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_TKL_ADD_NAMEBAN, TO_PVOIDFUNC(_tkl_add_nameban));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_TKL_ADD_SPAMFILTER, TO_PVOIDFUNC(_tkl_add_spamfilter));
+	EfunctionAddVoid(modinfo->handle, EFUNC_TKL_DEL_LINE, _tkl_del_line);
+	EfunctionAddVoid(modinfo->handle, EFUNC_FREE_TKL, _free_tkl);
+	EfunctionAddVoid(modinfo->handle, EFUNC_TKL_CHECK_LOCAL_REMOVE_SHUN, _tkl_check_local_remove_shun);
+	EfunctionAdd(modinfo->handle, EFUNC_FIND_TKLINE_MATCH, _find_tkline_match);
+	EfunctionAdd(modinfo->handle, EFUNC_FIND_SHUN, _find_shun);
+	EfunctionAdd(modinfo->handle, EFUNC_FIND_SPAMFILTER_USER, _find_spamfilter_user);
+	EfunctionAddPVoid(modinfo->handle, EFUNC_FIND_QLINE, TO_PVOIDFUNC(_find_qline));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_FIND_TKLINE_MATCH_ZAP, TO_PVOIDFUNC(_find_tkline_match_zap));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_FIND_TKL_SERVERBAN, TO_PVOIDFUNC(_find_tkl_serverban));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_FIND_TKL_BANEXCEPTION, TO_PVOIDFUNC(_find_tkl_banexception));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_FIND_TKL_NAMEBAN, TO_PVOIDFUNC(_find_tkl_nameban));
+	EfunctionAddPVoid(modinfo->handle, EFUNC_FIND_TKL_SPAMFILTER, TO_PVOIDFUNC(_find_tkl_spamfilter));
+	EfunctionAddVoid(modinfo->handle, EFUNC_TKL_STATS, _tkl_stats);
+	EfunctionAddVoid(modinfo->handle, EFUNC_TKL_SYNCH, _tkl_sync);
+	EfunctionAddVoid(modinfo->handle, EFUNC_CMD_TKL, _cmd_tkl);
+	EfunctionAdd(modinfo->handle, EFUNC_PLACE_HOST_BAN, _place_host_ban);
+	EfunctionAdd(modinfo->handle, EFUNC_DOSPAMFILTER, _match_spamfilter);
+	EfunctionAdd(modinfo->handle, EFUNC_DOSPAMFILTER_VIRUSCHAN, _join_viruschan);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SPAMFILTER_BUILD_USER_STRING, _spamfilter_build_user_string);
+	EfunctionAdd(modinfo->handle, EFUNC_MATCH_USER, _match_user);
+	EfunctionAdd(modinfo->handle, EFUNC_TKL_IP_HASH, _tkl_ip_hash);
+	EfunctionAdd(modinfo->handle, EFUNC_TKL_IP_HASH_TYPE, _tkl_ip_hash_type);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SENDNOTICE_TKL_ADD, _sendnotice_tkl_add);
+	EfunctionAddVoid(modinfo->handle, EFUNC_SENDNOTICE_TKL_DEL, _sendnotice_tkl_del);
+	EfunctionAdd(modinfo->handle, EFUNC_FIND_TKL_EXCEPTION, _find_tkl_exception);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, tkl_config_match_spamfilter);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, tkl_config_run_ban);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, tkl_config_run_except);
+	CommandAdd(modinfo->handle, "GLINE", cmd_gline, 3, CMD_OPER);
+	CommandAdd(modinfo->handle, "SHUN", cmd_shun, 3, CMD_OPER);
+	CommandAdd(modinfo->handle, "TEMPSHUN", cmd_tempshun, 2, CMD_OPER);
+	CommandAdd(modinfo->handle, "ZLINE", cmd_zline, 3, CMD_OPER);
+	CommandAdd(modinfo->handle, "KLINE", cmd_kline, 3, CMD_OPER);
+	CommandAdd(modinfo->handle, "GZLINE", cmd_gzline, 3, CMD_OPER);
+	CommandAdd(modinfo->handle, "SPAMFILTER", cmd_spamfilter, 7, CMD_OPER);
+	CommandAdd(modinfo->handle, "ELINE", cmd_eline, 4, CMD_OPER);
+	CommandAdd(modinfo->handle, "TKL", _cmd_tkl, MAXPARA, CMD_OPER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(modinfo->handle, "tklexpire", tkl_check_expire, NULL, 5000, 0);
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Test a spamfilter { } block in the configuration file */
+int tkl_config_test_spamfilter(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep, *cepp;
+	int errors = 0;
+	char *match = NULL, *reason = NULL;
+	char has_target = 0, has_match = 0, has_action = 0, has_reason = 0, has_bantime = 0, has_match_type = 0;
+	int match_type = 0;
+
+	/* We are only interested in spamfilter { } blocks */
+	if ((type != CONFIG_MAIN) || strcmp(ce->ce_varname, "spamfilter"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "target"))
+		{
+			if (has_target)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter::target");
+				continue;
+			}
+			has_target = 1;
+			if (cep->ce_vardata)
+			{
+				if (!spamfilter_getconftargets(cep->ce_vardata))
+				{
+					config_error("%s:%i: unknown spamfiler target type '%s'",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+					errors++;
+				}
+			}
+			else if (cep->ce_entries)
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (!spamfilter_getconftargets(cepp->ce_varname))
+					{
+						config_error("%s:%i: unknown spamfiler target type '%s'",
+							cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum, cepp->ce_varname);
+						errors++;
+					}
+				}
+			}
+			else
+			{
+				config_error_empty(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter", cep->ce_varname);
+				errors++;
+			}
+			continue;
+		}
+		if (!cep->ce_vardata)
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"spamfilter", cep->ce_varname);
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "reason"))
+		{
+			if (has_reason)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter::reason");
+				continue;
+			}
+			has_reason = 1;
+			reason = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "match"))
+		{
+			if (has_match)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter::match");
+				continue;
+			}
+			has_match = 1;
+			match = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (has_action)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter::action");
+				continue;
+			}
+			has_action = 1;
+			if (!banact_stringtoval(cep->ce_vardata))
+			{
+				config_error("%s:%i: spamfilter::action has unknown action type '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			if (has_bantime)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter::ban-time");
+				continue;
+			}
+			has_bantime = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "match-type"))
+		{
+			if (has_match_type)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "spamfilter::match-type");
+				continue;
+			}
+			if (!strcasecmp(cep->ce_vardata, "posix"))
+			{
+				config_error("%s:%i: this spamfilter uses match-type 'posix' which is no longer supported. "
+				             "You must switch over to match-type 'regex' instead. "
+				             "See https://www.unrealircd.org/docs/FAQ#spamfilter-posix-deprecated",
+				             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+				errors++;
+				*errs = errors;
+				return -1; /* return now, otherwise there will be issues */
+			}
+			match_type = unreal_match_method_strtoval(cep->ce_vardata);
+			if (match_type == 0)
+			{
+				config_error("%s:%i: spamfilter::match-type: unknown match type '%s', "
+				             "should be one of: 'simple', 'regex' or 'posix'",
+				             cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				             cep->ce_vardata);
+				errors++;
+				continue;
+			}
+			has_match_type = 1;
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"spamfilter", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	if (match && match_type)
+	{
+		Match *m;
+		char *err;
+
+		m = unreal_create_match(match_type, match, &err);
+		if (!m)
+		{
+			config_error("%s:%i: spamfilter::match contains an invalid regex: %s",
+				ce->ce_fileptr->cf_filename,
+				ce->ce_varlinenum,
+				err);
+			errors++;
+		} else
+		{
+			unreal_delete_match(m);
+		}
+	}
+
+	if (!has_match)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"spamfilter::match");
+		errors++;
+	}
+	if (!has_target)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"spamfilter::target");
+		errors++;
+	}
+	if (!has_action)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"spamfilter::action");
+		errors++;
+	}
+	if (match && reason && (strlen(match) + strlen(reason) > 505))
+	{
+		config_error("%s:%i: spamfilter block problem: match + reason field are together over 505 bytes, "
+		             "please choose a shorter regex or reason",
+		             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+	if (!has_match_type)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"spamfilter::match-type");
+		errors++;
+	}
+
+	if (!has_match_type && !has_match && has_action && has_target)
+	{
+		need_34_upgrade = 1;
+	}
+
+	if (match && !strcmp(match, "^LOL! //echo -a \\$\\(\\$decode\\(.+,m\\),[0-9]\\)$"))
+	{
+		config_warn("*** IMPORTANT ***");
+		config_warn("You have old examples in your spamfilter.conf. "
+		             "We suggest you to edit this file and replace the examples.");
+		config_warn("Please read https://www.unrealircd.org/docs/FAQ#old-spamfilter-conf !!!");
+		config_warn("*****************");
+	}
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+/** Process a spamfilter { } block in the configuration file */
+int tkl_config_match_spamfilter(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+	ConfigEntry *cepp;
+	char *word = NULL;
+	time_t bantime = (SPAMFILTER_BAN_TIME ? SPAMFILTER_BAN_TIME : 86400);
+	char *banreason = "<internally added by ircd>";
+	int action = 0, target = 0;
+	int match_type = 0;
+	Match *m;
+
+	/* We are only interested in spamfilter { } blocks */
+	if ((type != CONFIG_MAIN) || strcmp(ce->ce_varname, "spamfilter"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "match"))
+		{
+			word = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "target"))
+		{
+			if (cep->ce_vardata)
+				target = spamfilter_getconftargets(cep->ce_vardata);
+			else
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					target |= spamfilter_getconftargets(cepp->ce_varname);
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			action = banact_stringtoval(cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			banreason = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			bantime = config_checkval(cep->ce_vardata, CFG_TIME);
+		}
+		else if (!strcmp(cep->ce_varname, "match-type"))
+		{
+			match_type = unreal_match_method_strtoval(cep->ce_vardata);
+		}
+	}
+
+	m = unreal_create_match(match_type, word, NULL);
+	tkl_add_spamfilter(TKL_SPAMF,
+	                    target,
+	                    action,
+	                    m,
+	                    me.name,
+	                    0,
+	                    TStime(),
+	                    bantime,
+	                    banreason,
+	                    TKL_FLAG_CONFIG);
+	return 1;
+}
+
+/** Test a ban { } block in the configuration file */
+int tkl_config_test_ban(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep;
+	int errors = 0;
+	char has_mask = 0, has_reason = 0;
+
+	/* We are only interested in ban { } blocks */
+	if (type != CONFIG_BAN)
+		return 0;
+
+	if (strcmp(ce->ce_vardata, "nick") && strcmp(ce->ce_vardata, "user") &&
+	    strcmp(ce->ce_vardata, "ip"))
+	{
+		return 0;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "ban"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (has_mask)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "ban::mask");
+				continue;
+			}
+			has_mask = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			if (has_reason)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "ban::reason");
+				continue;
+			}
+			has_reason = 1;
+		}
+		else
+		{
+			config_error("%s:%i: unknown directive ban %s::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				ce->ce_vardata,
+				cep->ce_varname);
+			errors++;
+		}
+	}
+
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"ban::mask");
+		errors++;
+	}
+
+	if (!has_reason)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"ban::reason");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+/** Process a ban { } block in the configuration file */
+int tkl_config_run_ban(ConfigFile *cf, ConfigEntry *ce, int configtype)
+{
+	ConfigEntry *cep;
+	char *usermask = NULL;
+	char *hostmask = NULL;
+	char *reason = NULL;
+	int tkltype;
+
+	/* We are only interested in ban { } blocks */
+	if (configtype != CONFIG_BAN)
+		return 0;
+
+	if (strcmp(ce->ce_vardata, "nick") && strcmp(ce->ce_vardata, "user") &&
+	    strcmp(ce->ce_vardata, "ip"))
+	{
+		return 0;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			char buf[512], *p;
+			strlcpy(buf, cep->ce_vardata, sizeof(buf));
+			if (is_extended_ban(buf))
+			{
+				char *str;
+				Extban *extban;
+				char buf2[BUFSIZE];
+				extban = findmod_by_bantype(buf[1]);
+				if (!extban || !(extban->options & EXTBOPT_TKL))
+				{
+					config_warn("%s:%d: Invalid or unsupported extended server ban requested: %s",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, buf);
+					goto tcrb_end;
+				}
+				/* is_ok() is not called, since there is no client, similar to like remote bans set */
+				str = extban->conv_param(buf);
+				if (!str || (strlen(str) <= 4))
+				{
+					config_warn("%s:%d: Extended server ban has a problem: %s",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, buf);
+					goto tcrb_end;
+				}
+				strlcpy(buf2, str+3, sizeof(buf2));
+				buf[3] = '\0';
+				safe_strdup(usermask, buf); /* eg ~S: */
+				safe_strdup(hostmask, buf2);
+			} else
+			{
+				p = strchr(buf, '@');
+				if (p)
+				{
+					*p++ = '\0';
+					safe_strdup(usermask, buf);
+					safe_strdup(hostmask, p);
+				} else {
+					safe_strdup(hostmask, cep->ce_vardata);
+				}
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "reason"))
+		{
+			safe_strdup(reason, cep->ce_vardata);
+		}
+	}
+
+	if (!usermask)
+		safe_strdup(usermask, "*");
+
+	if (!reason)
+		safe_strdup(reason, "-");
+
+	if (!strcmp(ce->ce_vardata, "nick"))
+		tkltype = TKL_NAME;
+	else if (!strcmp(ce->ce_vardata, "user"))
+		tkltype = TKL_KILL;
+	else if (!strcmp(ce->ce_vardata, "ip"))
+		tkltype = TKL_ZAP;
+	else
+		abort(); /* impossible */
+
+	if (TKLIsNameBanType(tkltype))
+		tkl_add_nameban(tkltype, hostmask, 0, reason, "-config-", 0, TStime(), TKL_FLAG_CONFIG);
+	else if (TKLIsServerBanType(tkltype))
+		tkl_add_serverban(tkltype, usermask, hostmask, reason, "-config-", 0, TStime(), 0, TKL_FLAG_CONFIG);
+
+tcrb_end:
+	safe_free(usermask);
+	safe_free(hostmask);
+	safe_free(reason);
+	return 1;
+}
+
+int tkl_config_test_except(ConfigFile *cf, ConfigEntry *ce, int configtype, int *errs)
+{
+	ConfigEntry *cep, *cepp;
+	int errors = 0;
+	int has_mask = 0;
+
+	/* We are only interested in except { } blocks */
+	if (configtype != CONFIG_EXCEPT)
+		return 0;
+
+	/* These are the types that we handle */
+	if (strcmp(ce->ce_vardata, "ban") && strcmp(ce->ce_vardata, "throttle") &&
+	    strcmp(ce->ce_vardata, "tkl") && strcmp(ce->ce_vardata, "blacklist") &&
+	    strcmp(ce->ce_vardata, "spamfilter"))
+	{
+		return 0;
+	}
+
+	if (!strcmp(ce->ce_vardata, "tkl"))
+	{
+		config_error("%s:%d: except tkl { } has been renamed to except ban { }",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		config_status("Please rename your block in the configuration file.");
+		*errs = 1;
+		return -1;
+	}
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (cep->ce_entries)
+			{
+				/* mask { *@1.1.1.1; *@2.2.2.2; *@3.3.3.3; }; */
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (!cepp->ce_varname)
+					{
+						config_error_empty(cepp->ce_fileptr->cf_filename,
+							cepp->ce_varlinenum, "except ban", "mask");
+						errors++;
+						continue;
+					}
+					has_mask = 1;
+				}
+			} else
+			if (cep->ce_vardata)
+			{
+				/* mask *@1.1.1.1; */
+				if (!cep->ce_vardata)
+				{
+					config_error_empty(cep->ce_fileptr->cf_filename,
+						cep->ce_varlinenum, "except ban", "mask");
+					errors++;
+					continue;
+				}
+				has_mask = 1;
+			}
+		} else
+		if (!strcmp(cep->ce_varname, "type"))
+		{
+			if (cep->ce_entries)
+			{
+				/* type { x; y; z; }; */
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					if (!tkl_banexception_configname_to_chars(cepp->ce_varname))
+					{
+						config_error("%s:%d: except ban::type '%s' unknown. Must be one of: %s",
+							cepp->ce_fileptr->cf_filename, cepp->ce_varlinenum, cepp->ce_varname,
+							ALL_VALID_EXCEPTION_TYPES);
+						errors++;
+					}
+			} else
+			if (cep->ce_vardata)
+			{
+				/* type x; */
+				if (!tkl_banexception_configname_to_chars(cep->ce_vardata))
+				{
+					config_error("%s:%d: except ban::type '%s' unknown. Must be one of: %s",
+						cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata,
+						ALL_VALID_EXCEPTION_TYPES);
+					errors++;
+				}
+			}
+		} else {
+			config_error_unknown(cep->ce_fileptr->cf_filename,
+				cep->ce_varlinenum, "except", cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"except ban::mask");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+void config_create_tkl_except(char *mask, char *bantypes)
+{
+	char *usermask = NULL;
+	char *hostmask = NULL;
+	int soft = 0;
+	char buf[256], buf2[256], *p;
+
+	if (*mask == '%')
+	{
+		soft = 1;
+		mask++;
+	}
+	strlcpy(buf, mask, sizeof(buf));
+	if (is_extended_ban(buf))
+	{
+		char *str;
+		Extban *extban;
+		extban = findmod_by_bantype(buf[1]);
+		if (!extban || !(extban->options & EXTBOPT_TKL))
+		{
+			config_warn("Invalid or unsupported extended server ban exemption requested: %s", buf);
+			return;
+		}
+		/* is_ok() is not called, since there is no client, similar to like remote bans set */
+		str = extban->conv_param(buf);
+		if (!str || (strlen(str) <= 4))
+		{
+			config_warn("Extended server ban exemption has a problem: %s", buf);
+			return;
+		}
+		strlcpy(buf2, str+3, sizeof(buf2));
+		buf[3] = '\0';
+		usermask = buf; /* eg ~S: */
+		hostmask = buf2;
+	} else
+	{
+		p = strchr(buf, '@');
+		if (!p)
+		{
+			usermask = "*";
+			hostmask = buf;
+		} else {
+			*p++ = '\0';
+			usermask = buf;
+			hostmask = p;
+		}
+	}
+
+	if ((*usermask == ':') || (*hostmask == ':'))
+	{
+		config_error("Cannot add illegal ban '%s': for a given user@host neither"
+		             "user nor host may start with a : character (semicolon)", mask);
+		return;
+	}
+
+	tkl_add_banexception(TKL_EXCEPTION, usermask, hostmask, "Added in configuration file",
+	                     "-config-", 0, TStime(), soft, bantypes, TKL_FLAG_CONFIG);
+}
+
+int tkl_config_run_except(ConfigFile *cf, ConfigEntry *ce, int configtype)
+{
+	ConfigEntry *cep, *cepp;
+	char bantypes[64];
+
+	/* We are only interested in except { } blocks */
+	if (configtype != CONFIG_EXCEPT)
+		return 0;
+
+	/* These are the types that we handle */
+	if (strcmp(ce->ce_vardata, "ban") && strcmp(ce->ce_vardata, "throttle") &&
+	    strcmp(ce->ce_vardata, "blacklist") &&
+	    strcmp(ce->ce_vardata, "spamfilter"))
+	{
+		return 0;
+	}
+
+	*bantypes = '\0';
+
+	/* First configure all the types */
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "type"))
+		{
+			if (cep->ce_entries)
+			{
+				/* type { x; y; z; }; */
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					char *str = tkl_banexception_configname_to_chars(cepp->ce_varname);
+					strlcat(bantypes, str, sizeof(bantypes));
+				}
+			} else
+			if (cep->ce_vardata)
+			{
+				/* type x; */
+				char *str = tkl_banexception_configname_to_chars(cep->ce_vardata);
+				strlcat(bantypes, str, sizeof(bantypes));
+			}
+		}
+	}
+
+	if (!*bantypes)
+	{
+		/* Default setting if no 'type' is specified: */
+		if (!strcmp(ce->ce_vardata, "ban"))
+			strlcpy(bantypes, "kgzZs", sizeof(bantypes));
+		else if (!strcmp(ce->ce_vardata, "throttle"))
+			strlcpy(bantypes, "c", sizeof(bantypes));
+		else if (!strcmp(ce->ce_vardata, "blacklist"))
+			strlcpy(bantypes, "b", sizeof(bantypes));
+		else if (!strcmp(ce->ce_vardata, "spamfilter"))
+			strlcpy(bantypes, "f", sizeof(bantypes));
+		else
+			abort(); /* someone can't code */
+	}
+
+	/* Now walk through all mask entries */
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (cep->ce_entries)
+			{
+				/* mask { *@1.1.1.1; *@2.2.2.2; *@3.3.3.3; }; */
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					config_create_tkl_except(cepp->ce_varname, bantypes);
+			} else
+			if (cep->ce_vardata)
+			{
+				/* mask *@1.1.1.1; */
+				config_create_tkl_except(cep->ce_vardata, bantypes);
+			}
+		}
+	}
+
+	return 1;
+}
+
+/** Return unique spamfilter id for TKL */
+char *spamfilter_id(TKL *tk)
+{
+	static char buf[128];
+
+	snprintf(buf, sizeof(buf), "%p", (void *)tk);
+	return buf;
+}
+
+/** GLINE - Global kline.
+** Syntax: /gline [+|-]u@h mask time :reason
+**
+** parv[1] = [+|-]u@h mask
+** parv[2] = for how long
+** parv[3] = reason
+*/
+CMD_FUNC(cmd_gline)
+{
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:gline",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc == 1)
+	{
+		char *parv[3];
+		parv[0] = NULL;
+		parv[1] = "gline";
+		parv[2] = NULL;
+		do_cmd(client, recv_mtags, "STATS", 2, parv);
+	} else
+	{
+		cmd_tkl_line(client, parc, parv, "G");
+	}
+}
+
+/** GZLINE - Global zline.
+ */
+CMD_FUNC(cmd_gzline)
+{
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:zline:global",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc == 1)
+	{
+		char *parv[3];
+		parv[0] = NULL;
+		parv[1] = "gline"; /* (there's no /STATS gzline, it's included in /STATS gline output) */
+		parv[2] = NULL;
+		do_cmd(client, recv_mtags, "STATS", 2, parv);
+	} else {
+		cmd_tkl_line(client, parc, parv, "Z");
+	}
+}
+
+/** SHUN - Shun a user so it can no longer execute any meaningful commands.
+ */
+CMD_FUNC(cmd_shun)
+{
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:shun",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc == 1)
+	{
+		char *parv[3];
+		parv[0] = NULL;
+		parv[1] = "shun";
+		parv[2] = NULL;
+		do_cmd(client, recv_mtags, "STATS", 2, parv);
+	} else {
+		cmd_tkl_line(client, parc, parv, "s");
+	}
+}
+
+/** TEMPSHUN - Temporarily shun a user so it can no longer execute
+ *  any meaningful commands - until the user disconnects (session only).
+ */
+CMD_FUNC(cmd_tempshun)
+{
+	Client *target;
+	char *comment = ((parc > 2) && !BadPtr(parv[2])) ? parv[2] : "no reason";
+	char *name;
+	int remove = 0;
+
+	if (MyUser(client) && (!ValidatePermissionsForPath("server-ban:shun:temporary",client,NULL,NULL,NULL)))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "TEMPSHUN");
+		return;
+	}
+	if (parv[1][0] == '+')
+		name = parv[1]+1;
+	else if (parv[1][0] == '-')
+	{
+		name = parv[1]+1;
+		remove = 1;
+	} else
+		name = parv[1];
+
+	target = find_person(name, NULL);
+	if (!target)
+	{
+		sendnumeric(client, ERR_NOSUCHNICK, name);
+		return;
+	}
+	if (!MyUser(target))
+	{
+		sendto_one(target->direction, NULL, ":%s TEMPSHUN %s :%s",
+			client->id, target->id, comment);
+	} else {
+		char buf[1024];
+		if (!remove)
+		{
+			if (IsShunned(target))
+			{
+				sendnotice(client, "User '%s' already shunned", target->name);
+			} else if (ValidatePermissionsForPath("immune:server-ban:shun",target,NULL,NULL,NULL))
+			{
+				sendnotice(client, "You cannot tempshun '%s' because (s)he is an oper with 'immune:server-ban:shun' privilege", target->name);
+			} else
+			{
+				SetShunned(target);
+				ircsnprintf(buf, sizeof(buf), "Temporary shun added on user %s (%s@%s) by %s [%s]",
+					target->name, target->user->username, target->user->realhost,
+					client->name, comment);
+				sendto_snomask_global(SNO_TKL, "%s", buf);
+			}
+		} else {
+			if (!IsShunned(target))
+			{
+				sendnotice(client, "User '%s' is not shunned", target->name);
+			} else {
+				ClearShunned(target);
+				ircsnprintf(buf, sizeof(buf), "Removed temporary shun on user %s (%s@%s) by %s",
+					target->name, target->user->username, target->user->realhost,
+					client->name);
+				sendto_snomask_global(SNO_TKL, "%s", buf);
+			}
+		}
+	}
+}
+
+/** KLINE - Kill line (ban user from local server)
+ */
+CMD_FUNC(cmd_kline)
+{
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:kline:local:add",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc == 1)
+	{
+		char *parv[3];
+		parv[0] = NULL;
+		parv[1] = "kline";
+		parv[2] = NULL;
+		do_cmd(client, recv_mtags, "STATS", 2, parv);
+		return;
+	}
+
+	if (!ValidatePermissionsForPath("server-ban:kline:remove",client,NULL,NULL,NULL) && *parv[1] == '-')
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	cmd_tkl_line(client, parc, parv, "k");
+}
+
+/** Generate stats for '/GLINE -stats' and such */
+void tkl_general_stats(Client *client)
+{
+	int index, index2;
+	TKL *tkl;
+	int total = 0;
+	int subtotal;
+
+	/* First, hashed entries.. */
+	for (index = 0; index < TKLIPHASHLEN1; index++)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			subtotal = 0;
+			for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+				subtotal++;
+			if (subtotal > 0)
+				sendnotice(client, "Slot %d:%d has %d item(s)", index, index2, subtotal);
+			total += subtotal;
+		}
+	}
+	sendnotice(client, "Hashed TKL items: %d item(s)", total);
+
+	/* Now normal entries.. */
+	subtotal = 0;
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tkl = tklines[index]; tkl; tkl = tkl->next)
+			subtotal++;
+	}
+	sendnotice(client, "Standard TKL items: %d item(s)", subtotal);
+	total += subtotal;
+	sendnotice(client, "Grand total TKL items: %d item(s)", total);
+}
+
+/** ZLINE - Kill a user as soon as it tries to connect to the server.
+ * This happens before any DNS/ident lookups have been done and
+ * before any data has been processed (including no SSL/TLS handshake, etc.)
+ */
+CMD_FUNC(cmd_zline)
+{
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:zline:local:add",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc == 1)
+	{
+		char *parv[3];
+		parv[0] = NULL;
+		parv[1] = "kline"; /* (there's no /STATS zline, it's included in /STATS kline output) */
+		parv[2] = NULL;
+		do_cmd(client, recv_mtags, "STATS", 2, parv);
+		return;
+	}
+
+	if ((parc > 1) && !BadPtr(parv[1]) && !strcasecmp(parv[1], "-stats"))
+	{
+		/* Print some statistics */
+		tkl_general_stats(client);
+		return;
+	}
+
+	cmd_tkl_line(client, parc, parv, "z");
+}
+
+/** Check if a ban is placed with a too broad mask (like '*') */
+int ban_too_broad(char *usermask, char *hostmask)
+{
+	char *p;
+	int cnt = 0;
+
+	/* Scary config setting. Hmmm. */
+	if (ALLOW_INSANE_BANS)
+		return 0;
+
+	/* Allow things like clone@*, dsfsf@*, etc.. */
+	if (!strchr(usermask, '*') && !strchr(usermask, '?'))
+		return 0;
+
+	/* If it's a CIDR, then check /mask first.. */
+	p = strchr(hostmask, '/');
+	if (p)
+	{
+		int cidrlen = atoi(p+1);
+		if (strchr(hostmask, ':'))
+		{
+			if (cidrlen < 48)
+				return 1; /* too broad IPv6 CIDR mask */
+		} else {
+			if (cidrlen < 16)
+				return 1; /* too broad IPv4 CIDR mask */
+		}
+	}
+
+	/* Must at least contain 4 non-wildcard/non-dot characters.
+	 * This will deal with non-CIDR and hosts, but any correct
+	 * CIDR mask will also pass this test (which is fine).
+	 */
+	for (p = hostmask; *p; p++)
+		if (*p != '*' && *p != '.' && *p != '?')
+			cnt++;
+
+	if (cnt >= 4)
+		return 0;
+
+	return 1;
+}
+
+/** Intermediate layer between user functions such as KLINE/GLINE
+ * and the TKL layer (cmd_tkl).
+ * This allows us doing some syntax checking and other helpful
+ * things that are the same for many types of *LINES.
+ */
+void cmd_tkl_line(Client *client, int parc, char *parv[], char *type)
+{
+	time_t secs;
+	int whattodo = 0;	/* 0 = add  1 = del */
+	time_t i;
+	Client *acptr = NULL;
+	char *mask = NULL;
+	char mo[64], mo2[64];
+	char mask2buf[BUFSIZE];
+	char *p, *usermask, *hostmask;
+	char *tkllayer[10] = {
+		me.name,		/*0  server.name */
+		NULL,			/*1  +|- */
+		NULL,			/*2  G   */
+		NULL,			/*3  user */
+		NULL,			/*4  host */
+		NULL,			/*5  set_by */
+		"0",			/*6  expire_at */
+		NULL,			/*7  set_at */
+		"no reason",	/*8  reason */
+		NULL
+	};
+	struct tm *t;
+
+	if ((parc == 1) || BadPtr(parv[1]))
+		return; /* shouldn't happen */
+
+	mask = parv[1];
+	if (*mask == '-')
+	{
+		whattodo = 1;
+		mask++;
+	}
+	else if (*mask == '+')
+	{
+		whattodo = 0;
+		mask++;
+	}
+
+	if (strchr(mask, '!'))
+	{
+		sendnotice(client, "[error] Cannot have '!' in masks.");
+		return;
+	}
+	if (*mask == ':')
+	{
+		sendnotice(client, "[error] Mask cannot start with a ':'.");
+		return;
+	}
+	if (strchr(mask, ' '))
+		return;
+
+	/* Check if it's a softban */
+	if (*mask == '%')
+	{
+		if (!strchr("kGs", *type))
+		{
+			sendnotice(client, "The %% prefix (soft ban) is only available for KLINE, GLINE and SHUN."
+			                 "For technical reasons this will not work for (G)ZLINE.");
+			return;
+		}
+	}
+
+	/* Check if it's an extended server ban */
+	if (is_extended_ban(mask))
+	{
+		if (whattodo == 0)
+		{
+			/* Add */
+			char *str;
+			Extban *extban;
+			extban = findmod_by_bantype(mask[1]);
+			if (!extban || !(extban->options & EXTBOPT_TKL))
+			{
+				sendnotice(client, "Invalid or unsupported extended server ban requested: %s", mask);
+				sendnotice(client, "Valid types are for example ~a, ~r, ~S");
+				return;
+			}
+			if (extban->is_ok && !extban->is_ok(client, NULL, mask, EXBCHK_PARAM, MODE_ADD, EXBTYPE_TKL))
+				return; /* rejected */
+			str = extban->conv_param(mask);
+			if (!str || (strlen(str) <= 4))
+				return; /* rejected */
+			strlcpy(mask2buf, str+3, sizeof(mask2buf));
+			mask[3] = '\0';
+			usermask = mask; /* eg ~S: */
+			hostmask = mask2buf;
+		} else {
+			/* Delete: allow any attempt */
+			strlcpy(mask2buf, mask+3, sizeof(mask2buf));
+			mask[3] = '\0';
+			usermask = mask; /* eg ~S: */
+			hostmask = mask2buf;
+		}
+		/* Make sure we don't screw up S2S traffic ;) */
+		if (*hostmask == ':')
+		{
+			sendnotice(client, "[error] For technical reasons you cannot use double :: at the beginning "
+					   "of an extended server ban (eg ~a::xyz). You probably don't want to do this either.");
+			return;
+		}
+		if (!*hostmask)
+		{
+			sendnotice(client, "[error] Empty hostmask encountered, eg -~S:");
+			return;
+		}
+	} else
+	{
+		/* Check if it's a hostmask and legal .. */
+		p = strchr(mask, '@');
+		if (p) {
+			if ((p == mask) || !p[1])
+			{
+				sendnotice(client, "Error: no user@host specified");
+				return;
+			}
+			usermask = strtok(mask, "@");
+			hostmask = strtok(NULL, "");
+			if (BadPtr(hostmask)) {
+				if (BadPtr(usermask)) {
+					return;
+				}
+				hostmask = usermask;
+				usermask = "*";
+			}
+			if (*hostmask == ':')
+			{
+				sendnotice(client, "[error] For technical reasons you cannot start the host with a ':', sorry");
+				return;
+			}
+			if (((*type == 'z') || (*type == 'Z')) && !whattodo)
+			{
+				/* It's a (G)ZLINE, make sure the user isn't specyfing a HOST.
+				 * Just a warning in 3.2.3, but an error in 3.2.4.
+				 */
+				if (strcmp(usermask, "*"))
+				{
+					sendnotice(client, "ERROR: (g)zlines must be placed at \037*\037@ipmask, not \037user\037@ipmask. This is "
+							 "because (g)zlines are processed BEFORE dns and ident lookups are done. "
+							 "If you want to use usermasks, use a KLINE/GLINE instead.");
+					return;
+				}
+				for (p=hostmask; *p; p++)
+					if (isalpha(*p) && !isxdigit(*p))
+					{
+						sendnotice(client, "ERROR: (g)zlines must be placed at *@\037IPMASK\037, not *@\037HOSTMASK\037 "
+								 "(so for example *@192.168.* is ok, but *@*.aol.com is not). "
+								 "This is because (g)zlines are processed BEFORE dns and ident lookups are done. "
+								 "If you want to use hostmasks instead of ipmasks, use a KLINE/GLINE instead.");
+						return;
+					}
+			}
+		}
+		else
+		{
+			/* It's seemingly a nick .. let's see if we can find the user */
+			if ((acptr = find_person(mask, NULL)))
+			{
+				BanAction action = BAN_ACT_KLINE; // just a dummy default
+				if ((*type == 'z') || (*type == 'Z'))
+					action = BAN_ACT_ZLINE; // to indicate zline (no hostname, no dns, etc)
+				ban_target_to_tkl_layer(iConf.manual_ban_target, action, acptr, &usermask, &hostmask);
+			}
+			else
+			{
+				sendnumeric(client, ERR_NOSUCHNICK, mask);
+				return;
+			}
+		}
+	}
+
+	if (!whattodo && ban_too_broad(usermask, hostmask))
+	{
+		sendnotice(client, "*** [error] Too broad mask");
+		return;
+	}
+
+	secs = 0;
+
+	if (whattodo == 0 && (parc > 3))
+	{
+		secs = config_checkval(parv[2], CFG_TIME);
+		if (secs < 0)
+		{
+			sendnotice(client, "*** [error] The time you specified is out of range!");
+			return;
+		}
+	}
+	tkllayer[1] = whattodo == 0 ? "+" : "-";
+	tkllayer[2] = type;
+	tkllayer[3] = usermask;
+	tkllayer[4] = hostmask;
+	tkllayer[5] = make_nick_user_host(client->name, client->user->username, GetHost(client));
+	if (whattodo == 0)
+	{
+		if (secs == 0)
+		{
+			if (DEFAULT_BANTIME && (parc <= 3))
+				ircsnprintf(mo, sizeof(mo), "%lld", (long long)(DEFAULT_BANTIME + TStime()));
+			else
+				ircsnprintf(mo, sizeof(mo), "%lld", (long long)secs); /* "0" */
+		}
+		else
+			ircsnprintf(mo, sizeof(mo), "%lld", (long long)(secs + TStime()));
+		ircsnprintf(mo2, sizeof(mo2), "%lld", (long long)TStime());
+		tkllayer[6] = mo;
+		tkllayer[7] = mo2;
+		if (parc > 3) {
+			tkllayer[8] = parv[3];
+		} else if (parc > 2) {
+			tkllayer[8] = parv[2];
+		}
+		/* Blerghhh... */
+		i = atol(mo);
+		t = gmtime(&i);
+		if (!t)
+		{
+			sendnotice(client, "*** [error] The time you specified is out of range");
+			return;
+		}
+
+		/* call the tkl layer .. */
+		cmd_tkl(&me, NULL, 9, tkllayer);
+	}
+	else
+	{
+		/* call the tkl layer .. */
+		cmd_tkl(&me, NULL, 6, tkllayer);
+
+	}
+}
+
+void eline_syntax(Client *client)
+{
+	sendnotice(client, " Syntax: /ELINE <user@host> <bantypes> <expiry-time> <reason>");
+	sendnotice(client, "     Or: /ELINE <extserverban> <bantypes> <expiry-time> <reason>");
+	sendnotice(client, "Valid bantypes are:");
+	sendnotice(client, "k: K-Line     G: G-Line");
+	sendnotice(client, "z: Z-Line     Z: Global Z-Line");
+	sendnotice(client, "Q: Q-Line");
+	sendnotice(client, "s: Shun");
+	sendnotice(client, "F: Spamfilter");
+	sendnotice(client, "b: Blacklist checking");
+	sendnotice(client, "c: Connect flood (bypass set::anti-flood::connect-flood))");
+	sendnotice(client, "d: Unknown data flood (no ZLINE on too much data before registration)");
+	sendnotice(client, "m: Bypass allow::maxperip restriction");
+	sendnotice(client, "r: Bypass antirandom module");
+	sendnotice(client, "8: Bypass antimixedutf8 module");
+	sendnotice(client, "v: Bypass ban version { } blocks");
+	sendnotice(client, "Examples:");
+	sendnotice(client, "/ELINE *@unrealircd.org kGf 0 This user is exempt");
+	sendnotice(client, "/ELINE ~S:1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef kGf 0 Trusted user with this certificate fingerprint");
+	sendnotice(client, "-");
+	sendnotice(client, "To get a list of all current ELINEs, type: /STATS except");
+}
+
+/** Check if any of the specified types require the
+ * exception to be placed on *@ip rather than
+ * user@host or *@host. For eg zlines.
+ */
+int eline_type_requires_ip(char *bantypes)
+{
+	if (strchr(bantypes, 'z') || strchr(bantypes, 'Z') ||
+	    strchr(bantypes, 'c') ||
+	    strchr(bantypes, 'b') ||
+	    strchr(bantypes, 'd'))
+		return 1;
+	return 0;
+}
+
+/** Checks a string to see if it contains invalid ban exception types */
+int contains_invalid_server_ban_exception_type(char *str, char *c)
+{
+	char *p;
+	for (p = str; *p; p++)
+	{
+		if (!tkl_banexception_chartotype(*p))
+		{
+			*c = *p;
+			return 1;
+		}
+	}
+	return 0;
+}
+
+CMD_FUNC(cmd_eline)
+{
+	time_t secs = 0;
+	int add = 1;
+	Client *acptr = NULL;
+	char *mask = NULL;
+	char mo[64], mo2[64];
+	char mask2buf[BUFSIZE];
+	char *p, *usermask, *hostmask, *bantypes=NULL, *reason=NULL;
+	char *tkllayer[11] = {
+		me.name,		/*0  server.name */
+		NULL,			/*1  +|- */
+		NULL,			/*2  E   */
+		NULL,			/*3  user */
+		NULL,			/*4  host */
+		NULL,			/*5  set_by */
+		"0",			/*6  expire_at */
+		"-",			/*7  set_at */
+		"-",			/*8  ban types */
+		"-",			/*9  reason */
+		NULL
+	};
+
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:eline",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	/* For del we need at least:
+	 * ELINE -user@host
+	 * The 'add' case is checked later.
+	 */
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		eline_syntax(client);
+		return;
+	}
+
+	mask = parv[1];
+	if (*mask == '-')
+	{
+		add = 0;
+		mask++;
+	}
+	else if (*mask == '+')
+	{
+		add = 1;
+		mask++;
+	}
+
+	/* For add we need more:
+	 * ELINE user@host bantypes expiry :reason
+	 */
+	if (add)
+	{
+		if ((parc < 5) || BadPtr(parv[4]))
+		{
+			eline_syntax(client);
+			return;
+		}
+		bantypes = parv[2];
+		reason = parv[4];
+	}
+
+	if (strchr(mask, '!'))
+	{
+		sendnotice(client, "[error] Cannot have '!' in masks.");
+		return;
+	}
+	if (*mask == ':')
+	{
+		sendnotice(client, "[error] Mask cannot start with a ':'.");
+		return;
+	}
+	if (strchr(mask, ' '))
+		return;
+
+	/* Check if it's an extended server ban */
+	if (is_extended_ban(mask))
+	{
+		if (add)
+		{
+			/* Add */
+			char *str;
+			Extban *extban;
+			extban = findmod_by_bantype(mask[1]);
+			if (!extban || !(extban->options & EXTBOPT_TKL))
+			{
+				sendnotice(client, "Invalid or unsupported extended server ban requested: %s", mask);
+				sendnotice(client, "Valid types are for example ~a, ~r, ~S");
+				return;
+			}
+			if (extban->is_ok && !extban->is_ok(client, NULL, mask, EXBCHK_PARAM, MODE_ADD, EXBTYPE_TKL))
+				return; /* rejected */
+			str = extban->conv_param(mask);
+			if (!str || (strlen(str) <= 4))
+				return; /* rejected */
+			strlcpy(mask2buf, str+3, sizeof(mask2buf));
+			mask[3] = '\0';
+			usermask = mask; /* eg ~S: */
+			hostmask = mask2buf;
+			if (eline_type_requires_ip(bantypes))
+			{
+				sendnotice(client, "ERROR: Ban exceptions with type z/Z/c/b do not work on extended server bans. "
+				                   "This is because checking (g)zlines, connect-flood and blacklists is done BEFORE "
+				                   "extended bans can be checked.");
+				return;
+			}
+		} else {
+			/* Delete: allow any attempt */
+			strlcpy(mask2buf, mask+3, sizeof(mask2buf));
+			mask[3] = '\0';
+			usermask = mask; /* eg ~S: */
+			hostmask = mask2buf;
+		}
+		/* Make sure we don't screw up S2S traffic ;) */
+		if (*hostmask == ':')
+		{
+			sendnotice(client, "[error] For technical reasons you cannot use double :: at the beginning "
+					   "of an extended server ban (eg ~a::xyz). You probably don't want to do this either.");
+			return;
+		}
+		if (!*hostmask)
+		{
+			sendnotice(client, "[error] Empty hostmask encountered, eg -~S:");
+			return;
+		}
+	} else
+	{
+		/* Check if it's a hostmask and legal .. */
+		p = strchr(mask, '@');
+		if (p)
+		{
+			if ((p == mask) || !p[1])
+			{
+				sendnotice(client, "Error: no user@host specified");
+				return;
+			}
+			usermask = strtok(mask, "@");
+			hostmask = strtok(NULL, "");
+			if (BadPtr(hostmask)) {
+				if (BadPtr(usermask)) {
+					return;
+				}
+				hostmask = usermask;
+				usermask = "*";
+			}
+			if (*hostmask == ':')
+			{
+				sendnotice(client, "[error] For technical reasons you cannot start the host with a ':', sorry");
+				return;
+			}
+			if (add && eline_type_requires_ip(bantypes))
+			{
+				/* Trying to exempt a user from a (G)ZLINE,
+				 * make sure the user isn't specifying a host then.
+				 */
+				if (strcmp(usermask, "*"))
+				{
+					sendnotice(client, "ERROR: Ban exceptions with type z/Z/c/b need to be placed at \037*\037@ipmask, not \037user\037@ipmask. "
+							 "This is because checking (g)zlines, connect-flood and blacklists is done BEFORE any dns and ident lookups.");
+					return;
+				}
+				for (p=hostmask; *p; p++)
+					if (isalpha(*p) && !isxdigit(*p))
+					{
+						sendnotice(client, "ERROR: Ban exceptions with type z/Z/c/b need to be placed at *@\037ipmask\037, not *@\037hostmask\037. "
+								 "(so for example *@192.168.* is ok, but *@*.aol.com is not). "
+								 "This is because checking (g)zlines, connect-flood and blacklists is done BEFORE any dns and ident lookups.");
+						return;
+					}
+			}
+		}
+		else
+		{
+			/* It's seemingly a nick .. let's see if we can find the user */
+			if ((acptr = find_person(mask, NULL)))
+			{
+				BanAction action = BAN_ACT_KLINE; // just a dummy default
+				if (add && eline_type_requires_ip(bantypes))
+					action = BAN_ACT_ZLINE; // to indicate zline (no hostname, no dns, etc)
+				ban_target_to_tkl_layer(iConf.manual_ban_target, action, acptr, &usermask, &hostmask);
+			}
+			else
+			{
+				sendnumeric(client, ERR_NOSUCHNICK, mask);
+				return;
+			}
+		}
+	}
+
+	if (add)
+	{
+		secs = config_checkval(parv[3], CFG_TIME);
+		if ((secs <= 0) && (*parv[3] != '0'))
+		{
+			sendnotice(client, "*** [error] The expiry time you specified is out of range!");
+			eline_syntax(client);
+			return;
+		}
+	}
+
+	tkllayer[1] = add ? "+" : "-";
+	tkllayer[2] = "E";
+	tkllayer[3] = usermask;
+	tkllayer[4] = hostmask;
+	tkllayer[5] = make_nick_user_host(client->name, client->user->username, GetHost(client));
+
+	if (add)
+	{
+		char c;
+		/* Add ELINE */
+		if (secs == 0)
+			ircsnprintf(mo, sizeof(mo), "%lld", (long long)secs); /* "0" */
+		else
+			ircsnprintf(mo, sizeof(mo), "%lld", (long long)(secs + TStime()));
+		ircsnprintf(mo2, sizeof(mo2), "%lld", (long long)TStime());
+		tkllayer[6] = mo;
+		tkllayer[7] = mo2;
+		tkllayer[8] = bantypes;
+		if (contains_invalid_server_ban_exception_type(bantypes, &c))
+		{
+			sendnotice(client, "ERROR: bantype '%c' is unrecognized (in '%s'). "
+			                   "Note that the bantypes are case sensitive. "
+			                   "Type /ELINE to see a list of all possible bantypes.",
+			                   c, bantypes);
+			return;
+		}
+		tkllayer[9] = reason;
+		/* call the tkl layer .. */
+		cmd_tkl(&me, NULL, 10, tkllayer);
+	}
+	else
+	{
+		/* Remove ELINE */
+		/* call the tkl layer .. */
+		cmd_tkl(&me, NULL, 10, tkllayer);
+
+	}
+}
+
+
+/** Helper function for cmd_spamfilter, explaining usage. */
+void spamfilter_usage(Client *client)
+{
+	sendnotice(client, "Use: /spamfilter [add|del|remove|+|-] [-simple|-regex|-posix] [type] [action] [tkltime] [tklreason] [regex]");
+	sendnotice(client, "See '/helpop ?spamfilter' for more information.");
+	sendnotice(client, "For an easy way to remove an existing spamfilter, use '/spamfilter del' without additional parameters");
+}
+
+/** Helper function for cmd_spamfilter, explaining usage has changed. */
+void spamfilter_new_usage(Client *client, char *parv[])
+{
+	sendnotice(client, "Unknown match-type '%s'. Must be one of: -regex (new fast PCRE regexes), "
+	                 "-posix (old unreal 3.2.x posix regexes) or "
+	                 "-simple (simple text with ? and * wildcards)",
+	                 parv[2]);
+
+	if (*parv[2] != '-')
+		sendnotice(client, "Using the old 3.2.x /SPAMFILTER syntax? Note the new -regex/-posix/-simple field!!");
+
+	spamfilter_usage(client);
+}
+
+/** Delete a spamfilter by ID (the ID can be obtained via '/SPAMFILTER del' */
+void spamfilter_del_by_id(Client *client, char *id)
+{
+	int index;
+	TKL *tk;
+	int found = 0;
+	char mo[32], mo2[32];
+	char *tkllayer[13] = {
+		me.name,	/*  0 server.name */
+		NULL,		/*  1 +|- */
+		"F",		/*  2 F   */
+		NULL,		/*  3 usermask (targets) */
+		NULL,		/*  4 hostmask (action) */
+		NULL,		/*  5 set_by */
+		"0",		/*  6 expire_at */
+		"0",		/*  7 set_at */
+		"",			/*  8 tkl time */
+		"",			/*  9 tkl reason */
+		"",			/* 10 match method */
+		"",			/* 11 regex */
+		NULL
+	};
+
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tk = tklines[index]; tk; tk = tk->next)
+		{
+			if (((tk->type & (TKL_GLOBAL|TKL_SPAMF)) == (TKL_GLOBAL|TKL_SPAMF)) && !strcmp(spamfilter_id(tk), id))
+			{
+				found = 1;
+				break;
+			}
+		}
+		if (found)
+			break; /* break outer loop */
+	}
+
+	if (!tk)
+	{
+		sendnotice(client, "Sorry, no spamfilter found with that ID. Did you run '/spamfilter del' to get the appropriate id?");
+		return;
+	}
+
+	/* Spamfilter found. Now fill the tkllayer */
+	tkllayer[1] = "-";
+	tkllayer[3] = spamfilter_target_inttostring(tk->ptr.spamfilter->target); /* target(s) */
+	mo[0] = banact_valtochar(tk->ptr.spamfilter->action);
+	mo[1] = '\0';
+	tkllayer[4] = mo; /* action */
+	tkllayer[5] = make_nick_user_host(client->name, client->user->username, GetHost(client));
+	tkllayer[8] = "-";
+	tkllayer[9] = "-";
+	tkllayer[10] = unreal_match_method_valtostr(tk->ptr.spamfilter->match->type); /* matching type */
+	tkllayer[11] = tk->ptr.spamfilter->match->str; /* regex */
+	ircsnprintf(mo2, sizeof(mo2), "%lld", (long long)TStime());
+	tkllayer[7] = mo2; /* deletion time */
+
+	cmd_tkl(&me, NULL, 12, tkllayer);
+}
+
+/** Spamfilter to fight spam, advertising, worms and other bad things on IRC.
+ * See https://www.unrealircd.org/docs/Spamfilter for general documentation.
+ *
+ * /SPAMFILTER [add|del|remove|+|-] [match-type] [type] [action] [tkltime] [reason] [regex]
+ *                   1                    2         3       4        5        6        7
+ */
+CMD_FUNC(cmd_spamfilter)
+{
+	int whattodo = 0;	/* 0 = add  1 = del */
+	char mo[32], mo2[32];
+	char *tkllayer[13] = {
+		me.name,	/*  0 server.name */
+		NULL,		/*  1 +|- */
+		"F",		/*  2 F   */
+		NULL,		/*  3 usermask (targets) */
+		NULL,		/*  4 hostmask (action) */
+		NULL,		/*  5 set_by */
+		"0",		/*  6 expire_at */
+		"0",		/*  7 set_at */
+		"",			/*  8 tkl time */
+		"",			/*  9 tkl reason */
+		"",			/* 10 match method */
+		"",			/* 11 regex */
+		NULL
+	};
+	int targets = 0, action = 0;
+	char targetbuf[64], actionbuf[2];
+	char reason[512];
+	int n;
+	Match *m;
+	int match_type = 0;
+	char *err = NULL;
+
+	if (IsServer(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server-ban:spamfilter",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (parc == 1)
+	{
+		char *parv[3];
+		parv[0] = NULL;
+		parv[1] = "spamfilter";
+		parv[2] = NULL;
+		do_cmd(client, recv_mtags, "STATS", 2, parv);
+		return;
+	}
+
+	if ((parc <= 3) && !strcmp(parv[1], "del"))
+	{
+		if (!parv[2])
+		{
+			/* Show STATS with appropriate SPAMFILTER del command */
+			char *parv[5];
+			parv[0] = NULL;
+			parv[1] = "spamfilter";
+			parv[2] = me.name;
+			parv[3] = "del";
+			parv[4] = NULL;
+			do_cmd(client, recv_mtags, "STATS", 4, parv);
+			return;
+		}
+		spamfilter_del_by_id(client, parv[2]);
+		return;
+	}
+
+	if ((parc == 7) && (*parv[2] != '-'))
+	{
+		spamfilter_new_usage(client,parv);
+		return;
+	}
+
+	if ((parc < 8) || BadPtr(parv[7]))
+	{
+		spamfilter_usage(client);
+		return;
+	}
+
+	/* parv[1]: [add|del|+|-]
+	 * parv[2]: match-type
+	 * parv[3]: type
+	 * parv[4]: action
+	 * parv[5]: tkl time
+	 * parv[6]: tkl reason (or block reason..)
+	 * parv[7]: regex
+	 */
+	if (!strcasecmp(parv[1], "add") || !strcmp(parv[1], "+"))
+		whattodo = 0;
+	else if (!strcasecmp(parv[1], "del") || !strcmp(parv[1], "-") || !strcasecmp(parv[1], "remove"))
+		whattodo = 1;
+	else
+	{
+		sendnotice(client, "1st parameter invalid");
+		spamfilter_usage(client);
+		return;
+	}
+
+	if ((whattodo == 0) && !strcasecmp(parv[2]+1, "posix"))
+	{
+		sendnotice(client, "ERROR: Spamfilter type 'posix' is DEPRECATED. You must use type 'regex' instead.");
+		sendnotice(client, "See https://www.unrealircd.org/docs/FAQ#spamfilter-posix-deprecated");
+		return;
+	}
+
+	match_type = unreal_match_method_strtoval(parv[2]+1);
+	if (!match_type)
+	{
+		spamfilter_new_usage(client, parv);
+		return;
+	}
+
+	targets = spamfilter_gettargets(parv[3], client);
+	if (!targets)
+	{
+		spamfilter_usage(client);
+		return;
+	}
+
+	strlcpy(targetbuf, spamfilter_target_inttostring(targets), sizeof(targetbuf));
+
+	action = banact_stringtoval(parv[4]);
+	if (!action)
+	{
+		sendnotice(client, "Invalid 'action' field (%s)", parv[4]);
+		spamfilter_usage(client);
+		return;
+	}
+	actionbuf[0] = banact_valtochar(action);
+	actionbuf[1] = '\0';
+
+	if (whattodo == 0)
+	{
+		/* now check the regex / match field... */
+		m = unreal_create_match(match_type, parv[7], &err);
+		if (!m)
+		{
+			sendnotice(client, "Error in regex '%s': %s", parv[7], err);
+			return;
+		}
+		unreal_delete_match(m);
+	}
+
+	tkllayer[1] = whattodo ? "-" : "+";
+	tkllayer[3] = targetbuf;
+	tkllayer[4] = actionbuf;
+	tkllayer[5] = make_nick_user_host(client->name, client->user->username, GetHost(client));
+
+	if (parv[5][0] == '-')
+	{
+		ircsnprintf(mo, sizeof(mo), "%lld", (long long)SPAMFILTER_BAN_TIME);
+		tkllayer[8] = mo;
+	}
+	else
+		tkllayer[8] = parv[5];
+
+	if (parv[6][0] == '-')
+		strlcpy(reason, unreal_encodespace(SPAMFILTER_BAN_REASON), sizeof(reason));
+	else
+		strlcpy(reason, parv[6], sizeof(reason));
+
+	tkllayer[9] = reason;
+	tkllayer[10] = parv[2]+1; /* +1 to skip the '-' */
+	tkllayer[11] = parv[7];
+
+	/* SPAMFILTER LENGTH CHECK.
+	 * We try to limit it here so '/stats f' output shows ok, output of that is:
+	 * :servername 229 destname F <target> <action> <num> <num> <num> <reason> <set_by> :<regex>
+	 * : ^NICKLEN       ^ NICKLEN                                       ^check   ^check   ^check
+	 * And for the other fields (and spacing/etc) we count on max 40 characters.
+	 * We also do >500 instead of >510, since that looks cleaner ;).. so actually we count
+	 * on 50 characters for the rest... -- Syzop
+	 */
+	n = strlen(reason) + strlen(parv[7]) + strlen(tkllayer[6]) + (NICKLEN * 2) + 40;
+	if ((n > 500) && (whattodo == 0))
+	{
+		sendnotice(client, "Sorry, spamfilter too long. You'll either have to trim down the "
+		                 "reason or the regex (exceeded by %d bytes)", n - 500);
+		return;
+	}
+
+	if (whattodo == 0)
+	{
+		ircsnprintf(mo2, sizeof(mo2), "%lld", (long long)TStime());
+		tkllayer[7] = mo2;
+	}
+
+	cmd_tkl(&me, NULL, 12, tkllayer);
+}
+
+/** tkl hash method.
+ * @param c   The tkl type character, see tkl_typetochar().
+ * @note      The input value 'c' is assumed to be in range a-z or A-Z!
+ *            Also, don't blindly change the hashmethod here, some things
+ *            depend on 'z' and 'Z' ending up in the same bucket.
+ */
+int _tkl_hash(unsigned int c)
+{
+#ifdef DEBUGMODE
+	if ((c >= 'a') && (c <= 'z'))
+		return c-'a';
+	else if ((c >= 'A') && (c <= 'Z'))
+		return c-'A';
+	else {
+		sendto_realops("[BUG] tkl_hash() called with out of range parameter (c = '%c') !!!", c);
+		ircd_log(LOG_ERROR, "[BUG] tkl_hash() called with out of range parameter (c = '%c') !!!", c);
+		return 0;
+	}
+#else
+	return (isupper(c) ? c-'A' : c-'a');
+#endif
+}
+
+/** tkl type to tkl character.
+ * NOTE: type is assumed to be valid.
+ */
+char _tkl_typetochar(int type)
+{
+	int i;
+	for (i=0; tkl_types[i].config_name; i++)
+		if ((tkl_types[i].type == type) && tkl_types[i].tkltype)
+			return tkl_types[i].letter;
+	sendto_realops("[BUG]: tkl_typetochar(): unknown type 0x%x !!!", type);
+	ircd_log(LOG_ERROR, "[BUG] tkl_typetochar(): unknown type 0x%x !!!", type);
+	return 0;
+}
+
+/** tkl character to tkl type
+ * Returns 0 if invalid type.
+ */
+int _tkl_chartotype(char c)
+{
+	int i;
+	for (i=0; tkl_types[i].config_name; i++)
+		if ((tkl_types[i].letter == c) && tkl_types[i].tkltype)
+			return tkl_types[i].type;
+	return 0;
+}
+
+int tkl_banexception_chartotype(char c)
+{
+	int i;
+	for (i=0; tkl_types[i].config_name; i++)
+		if ((tkl_types[i].letter == c) && tkl_types[i].exceptiontype)
+			return tkl_types[i].type;
+	return 0;
+}
+
+char *tkl_banexception_configname_to_chars(char *name)
+{
+	static char buf[128];
+	int i;
+
+	if (!strcasecmp(name, "all"))
+	{
+		/* 'all' means everything except qline: */
+		char *p = buf;
+		for (i=0; tkl_types[i].config_name; i++)
+		{
+			if (tkl_types[i].exceptiontype && !(tkl_types[i].type & TKL_NAME))
+				*p++ = tkl_types[i].letter;
+		}
+		*p = '\0';
+		return buf;
+	}
+
+	for (i=0; tkl_types[i].config_name; i++)
+	{
+		if (!strcasecmp(name, tkl_types[i].config_name) && tkl_types[i].exceptiontype)
+		{
+			buf[0] = tkl_types[i].letter;
+			buf[1] = '\0';
+			return buf;
+		}
+	}
+	return NULL;
+}
+
+/** Show TKL type as a string (used when adding/removing) */
+char *_tkl_type_string(TKL *tkl)
+{
+	static char txt[256];
+
+	*txt = '\0';
+
+	if (TKLIsServerBan(tkl) && (tkl->ptr.serverban->subtype == TKL_SUBTYPE_SOFT))
+		strlcpy(txt, "Soft ", sizeof(txt));
+
+	int i;
+	for (i=0; tkl_types[i].config_name; i++)
+	{
+		if ((tkl_types[i].type == tkl->type) && tkl_types[i].tkltype)
+		{
+			strlcat(txt, tkl_types[i].log_name, sizeof(txt));
+			return txt;
+		}
+	}
+
+	strlcpy(txt, "Unknown *-Line", sizeof(txt));
+	return txt;
+}
+
+int tkl_banexception_matches_type(TKL *except, int bantype)
+{
+	char *p;
+	int extype;
+
+	if (!TKLIsBanException(except))
+		abort();
+
+	for (p = except->ptr.banexception->bantypes; *p; p++)
+	{
+		extype = tkl_banexception_chartotype(*p);
+		if ((extype & TKL_SPAMF) || (extype & TKL_SHUN) || (extype & TKL_NAME))
+		{
+			/* For spamfilter, shun and qline we don't care
+			 * whether they are global or not. That would only
+			 * be confusing to the admin.
+			 */
+			extype &= ~TKL_GLOBAL;
+			if (bantype & extype)
+				return 1;
+		} else {
+			/* Rest requires an exact match */
+			if (bantype == extype)
+				return 1;
+		}
+	}
+
+	return 0;
+}
+
+/** Used for finding out which element of the tkl_ip hash table is used (primary element) */
+int _tkl_ip_hash(char *ip)
+{
+	char ipbuf[64], *p;
+
+	for (p = ip; *p; p++)
+	{
+		if ((*p == '?') || (*p == '*') || (*p == '/'))
+			return -1; /* not an entry suitable for the ip hash table */
+	}
+	if (inet_pton(AF_INET, ip, &ipbuf) == 1)
+	{
+		/* IPv4 */
+		unsigned int v = (ipbuf[0] << 24) +
+		                 (ipbuf[1] << 16) +
+		                 (ipbuf[2] << 8)  +
+		                 ipbuf[3];
+		return v % TKLIPHASHLEN2;
+	} else
+	if (inet_pton(AF_INET6, ip, &ipbuf) == 1)
+	{
+		/* IPv6 (only upper 64 bits) */
+		unsigned int v1 = (ipbuf[0] << 24) +
+		                 (ipbuf[1] << 16) +
+		                 (ipbuf[2] << 8)  +
+		                 ipbuf[3];
+		unsigned int v2 = (ipbuf[4] << 24) +
+		                 (ipbuf[5] << 16) +
+		                 (ipbuf[6] << 8)  +
+		                 ipbuf[7];
+		return (v1 ^ v2) % TKLIPHASHLEN2;
+	} else
+	{
+		return -1;
+	}
+}
+
+// TODO: consider efunc
+int tkl_ip_hash_tkl(TKL *tkl)
+{
+	if (TKLIsServerBan(tkl))
+		return tkl_ip_hash(tkl->ptr.serverban->hostmask);
+	if (TKLIsBanException(tkl))
+		return tkl_ip_hash(tkl->ptr.banexception->hostmask);
+	return -1;
+}
+
+/** Used for finding out which tkl_ip hash table needs to be used (secondary element).
+ * NOTE: Returns -1 for types that are never on the TKL ip hash table, such as spamfilter.
+ *       This can be used by the caller as a quick way to find out if the type is supported.
+ */
+int _tkl_ip_hash_type(int type)
+{
+	if ((type == 'Z') || (type == 'z'))
+		return 0;
+	else if (type == 'G')
+		return 1;
+	else if (type == 'k')
+		return 2;
+	else if ((type == 'e') || (type == 'E'))
+		return 3;
+	else
+		return -1;
+}
+
+/* Find the appropriate list 'head' that we need to iterate.
+ * This is simply a helper that is used at 3 places and I hate duplicate code.
+ * NOTE: this function may return NULL.
+ */
+TKL *tkl_find_head(char type, char *hostmask, TKL *def)
+{
+	int index, index2;
+
+	/* First, check ip hash table TKL's... */
+	index = tkl_ip_hash_type(type);
+	if (index >= 0)
+	{
+		index2 = tkl_ip_hash(hostmask);
+		if (index2 >= 0)
+		{
+			/* iterate tklines_ip_hash[index][index2] */
+			return tklines_ip_hash[index][index2];
+		}
+	}
+	/* Fallback to the default */
+	return def;
+}
+
+/** Add a spamfilter entry to the list.
+ * @param type                TKL_SPAMF or TKL_SPAMF|TKL_GLOBAL.
+ * @param target              The spamfilter target (SPAMF_*)
+ * @param action              The spamfilter action (BAN_ACT_*)
+ * @param match               The match (this struct may contain a regex for example)
+ * @param set_by              Who (or what) set the ban
+ * @param expire_at           When will the ban expire (0 for permanent)
+ * @param set_at              When was the ban set
+ * @param spamf_tkl_duration  When will the ban placed by spamfilter expire
+ * @param spamf_tkl_reason    What is the reason for bans placed by spamfilter
+ * @param flags               Any TKL_FLAG_* (TKL_FLAG_CONFIG, etc..)
+ * @returns                   The TKL entry, or NULL in case of a problem,
+ *                            such as a regex failing to compile, memory problem, ..
+ */
+TKL *_tkl_add_spamfilter(int type, unsigned short target, BanAction action, Match *match, char *set_by,
+                             time_t expire_at, time_t set_at,
+                             time_t tkl_duration, char *tkl_reason,
+                             int flags)
+{
+	TKL *tkl;
+	int index;
+
+	if (!(type & TKL_SPAMF))
+		abort();
+
+	tkl = safe_alloc(sizeof(TKL));
+	/* First the common fields */
+	tkl->type = type;
+	tkl->flags = flags;
+	tkl->set_at = set_at;
+	safe_strdup(tkl->set_by, set_by);
+	tkl->expire_at = expire_at;
+	/* Then the spamfilter fields */
+	tkl->ptr.spamfilter = safe_alloc(sizeof(Spamfilter));
+	tkl->ptr.spamfilter->target = target;
+	tkl->ptr.spamfilter->action = action;
+	tkl->ptr.spamfilter->match = match;
+	safe_strdup(tkl->ptr.spamfilter->tkl_reason, tkl_reason);
+	tkl->ptr.spamfilter->tkl_duration = tkl_duration;
+
+	if (tkl->ptr.spamfilter->target & SPAMF_USER)
+		loop.do_bancheck_spamf_user = 1;
+	if (tkl->ptr.spamfilter->target & SPAMF_AWAY)
+		loop.do_bancheck_spamf_away = 1;
+
+	/* Spamfilters go via the normal TKL list... */
+	index = tkl_hash(tkl_typetochar(type));
+	AddListItem(tkl, tklines[index]);
+
+	return tkl;
+}
+
+/** Add a server ban TKL entry.
+ * @param type                The TKL type, one of TKL_*,
+ *                            optionally OR'ed with TKL_GLOBAL.
+ * @param usermask            The user mask
+ * @param hostmask            The host mask
+ * @param reason              The reason for the ban
+ * @param set_by              Who (or what) set the ban
+ * @param expire_at           When will the ban expire (0 for permanent)
+ * @param set_at              When was the ban set
+ * @param soft                Whether it's a soft-ban
+ * @param flags               Any TKL_FLAG_* (TKL_FLAG_CONFIG, etc..)
+ * @returns                   The TKL entry, or NULL in case of a problem,
+ *                            such as a regex failing to compile, memory problem, ..
+ * @note
+ * Be sure not to call this function for spamfilters,
+ * qlines or exempts, which have their own function!
+ */
+TKL *_tkl_add_serverban(int type, char *usermask, char *hostmask, char *reason, char *set_by,
+                           time_t expire_at, time_t set_at, int soft, int flags)
+{
+	TKL *tkl;
+	int index, index2;
+
+	if (!TKLIsServerBanType(type))
+		abort();
+
+	tkl = safe_alloc(sizeof(TKL));
+	/* First the common fields */
+	tkl->type = type;
+	tkl->flags = flags;
+	tkl->set_at = set_at;
+	safe_strdup(tkl->set_by, set_by);
+	tkl->expire_at = expire_at;
+	/* Now the server ban fields */
+	tkl->ptr.serverban = safe_alloc(sizeof(ServerBan));
+	safe_strdup(tkl->ptr.serverban->usermask, usermask);
+	safe_strdup(tkl->ptr.serverban->hostmask, hostmask);
+	if (soft)
+		tkl->ptr.serverban->subtype = TKL_SUBTYPE_SOFT;
+	safe_strdup(tkl->ptr.serverban->reason, reason);
+
+	/* For ip hash table TKL's... */
+	index = tkl_ip_hash_type(tkl_typetochar(type));
+	if (index >= 0)
+	{
+		index2 = tkl_ip_hash_tkl(tkl);
+		if (index2 >= 0)
+		{
+			AddListItem(tkl, tklines_ip_hash[index][index2]);
+			return tkl;
+		}
+	}
+
+	/* If we get here it's just for our normal list.. */
+	index = tkl_hash(tkl_typetochar(type));
+	AddListItem(tkl, tklines[index]);
+
+	return tkl;
+}
+
+/** Add a ban exception TKL entry.
+ * @param type                TKL_EXCEPTION or TKLEXCEPT|TKL_GLOBAL.
+ * @param usermask            The user mask
+ * @param hostmask            The host mask
+ * @param reason              The reason for the ban
+ * @param set_by              Who (or what) set the ban
+ * @param expire_at           When will the ban expire (0 for permanent)
+ * @param set_at              When was the ban set
+ * @param soft                Whether it's a soft-ban
+ * @param bantypes            The ban types to exempt from
+ * @param flags               Any TKL_FLAG_* (TKL_FLAG_CONFIG, etc..)
+ * @returns                   The TKL entry, or NULL in case of a problem,
+ *                            such as a regex failing to compile, memory problem, ..
+ * @note
+ * Be sure not to call this function for spamfilters,
+ * qlines or exempts, which have their own function!
+ */
+TKL *_tkl_add_banexception(int type, char *usermask, char *hostmask, char *reason, char *set_by,
+                               time_t expire_at, time_t set_at, int soft, char *bantypes, int flags)
+{
+	TKL *tkl;
+	int index, index2;
+
+	if (!TKLIsBanExceptionType(type))
+		abort();
+
+	tkl = safe_alloc(sizeof(TKL));
+	/* First the common fields */
+	tkl->type = type;
+	tkl->flags = flags;
+	tkl->set_at = set_at;
+	safe_strdup(tkl->set_by, set_by);
+	tkl->expire_at = expire_at;
+	/* Now the ban except fields */
+	tkl->ptr.banexception = safe_alloc(sizeof(BanException));
+	safe_strdup(tkl->ptr.banexception->usermask, usermask);
+	safe_strdup(tkl->ptr.banexception->hostmask, hostmask);
+	if (soft)
+		tkl->ptr.banexception->subtype = TKL_SUBTYPE_SOFT;
+	safe_strdup(tkl->ptr.banexception->bantypes, bantypes);
+	safe_strdup(tkl->ptr.banexception->reason, reason);
+
+	/* For ip hash table TKL's... */
+	index = tkl_ip_hash_type(tkl_typetochar(type));
+	if (index >= 0)
+	{
+		index2 = tkl_ip_hash_tkl(tkl);
+		if (index2 >= 0)
+		{
+			AddListItem(tkl, tklines_ip_hash[index][index2]);
+			return tkl;
+		}
+	}
+
+	/* If we get here it's just for our normal list.. */
+	index = tkl_hash(tkl_typetochar(type));
+	AddListItem(tkl, tklines[index]);
+
+	return tkl;
+}
+
+/** Add a name ban TKL entry (Q-Line), used for banning nicks and channels.
+ * @param type                The TKL type, one of TKL_*,
+ *                            optionally OR'ed with TKL_GLOBAL.
+ * @param name                The nick or channel to be banned (wildcards accepted)
+ * @param hold                Flag to indicate services hold
+ * @param reason              The reason for the ban
+ * @param set_by              Who (or what) set the ban
+ * @param expire_at           When will the ban expire (0 for permanent)
+ * @param set_at              When was the ban set
+ * @param flags               Any TKL_FLAG_* (TKL_FLAG_CONFIG, etc..)
+ * @returns                   The TKL entry, or NULL in case of a problem,
+ *                            such as a regex failing to compile, memory problem, ..
+ * @note
+ * Be sure not to call this function for spamfilters,
+ * qlines or exempts, which have their own function!
+ */
+TKL *_tkl_add_nameban(int type, char *name, int hold, char *reason, char *set_by,
+                          time_t expire_at, time_t set_at, int flags)
+{
+	TKL *tkl;
+	int index;
+
+	if (!TKLIsNameBanType(type))
+		abort();
+
+	tkl = safe_alloc(sizeof(TKL));
+	/* First the common fields */
+	tkl->type = type;
+	tkl->flags = flags;
+	tkl->set_at = set_at;
+	safe_strdup(tkl->set_by, set_by);
+	tkl->expire_at = expire_at;
+	/* Now the name ban fields */
+	tkl->ptr.nameban = safe_alloc(sizeof(ServerBan));
+	safe_strdup(tkl->ptr.nameban->name, name);
+	tkl->ptr.nameban->hold = hold;
+	safe_strdup(tkl->ptr.nameban->reason, reason);
+
+	/* Name bans go via the normal TKL list.. */
+	index = tkl_hash(tkl_typetochar(type));
+	AddListItem(tkl, tklines[index]);
+
+	return tkl;
+}
+
+
+/** Free a TKL entry but do not remove from the list.
+ * (this assumes that it was not added yet or is already removed)
+ * Most people will use tkl_del_line() instead.
+ */
+void _free_tkl(TKL *tkl)
+{
+	/* Free the entry */
+	/* First, the common fields */
+	safe_free(tkl->set_by);
+	/* Now the type specific fields */
+	if (TKLIsServerBan(tkl) && tkl->ptr.serverban)
+	{
+		safe_free(tkl->ptr.serverban->usermask);
+		safe_free(tkl->ptr.serverban->hostmask);
+		safe_free(tkl->ptr.serverban->reason);
+		safe_free(tkl->ptr.serverban);
+	} else
+	if (TKLIsNameBan(tkl) && tkl->ptr.nameban)
+	{
+		safe_free(tkl->ptr.nameban->name);
+		safe_free(tkl->ptr.nameban->reason);
+		safe_free(tkl->ptr.nameban);
+	} else
+	if (TKLIsSpamfilter(tkl) && tkl->ptr.spamfilter)
+	{
+		/* Spamfilter */
+		safe_free(tkl->ptr.spamfilter->tkl_reason);
+		if (tkl->ptr.spamfilter->match)
+			unreal_delete_match(tkl->ptr.spamfilter->match);
+		safe_free(tkl->ptr.spamfilter);
+	} else
+	if (TKLIsBanException(tkl) && tkl->ptr.banexception)
+	{
+		safe_free(tkl->ptr.banexception->usermask);
+		safe_free(tkl->ptr.banexception->hostmask);
+		safe_free(tkl->ptr.banexception->bantypes);
+		safe_free(tkl->ptr.banexception->reason);
+		safe_free(tkl->ptr.banexception);
+	}
+	safe_free(tkl);
+}
+
+/** Delete a TKL entry from the list and free it.
+ * @param tkl The TKL entry.
+ */
+void _tkl_del_line(TKL *tkl)
+{
+	int index, index2;
+	int found = 0;
+
+	/* Try to find it in the ip TKL hash table first
+	 * (this only applies to server bans)
+	 */
+	index = tkl_ip_hash_type(tkl_typetochar(tkl->type));
+	if (index >= 0)
+	{
+		index2 = tkl_ip_hash_tkl(tkl);
+		if (index2 >= 0)
+		{
+#if 1
+			/* Temporary validation until an rmtkl(?) bug is fixed */
+			TKL *d;
+			int really_found = 0;
+			for (d = tklines_ip_hash[index][index2]; d; d = d->next)
+				if (d == tkl)
+				{
+					really_found = 1;
+					break;
+				}
+			if (!really_found)
+			{
+				ircd_log(LOG_ERROR, "[BUG] [Crash] tkl_del_line() for %s (%d): "
+				                    "NOT found in tklines_ip_hash[%d][%d], "
+				                    "this should never happen!",
+				                    tkl_type_string(tkl),
+				                    tkl->type,
+				                    index, index2);
+				if (TKLIsServerBan(tkl))
+				{
+					ircd_log(LOG_ERROR, "Additional information: the ban was on %s@%s",
+						tkl->ptr.serverban->usermask ? tkl->ptr.serverban->usermask : "<null>",
+						tkl->ptr.serverban->hostmask ? tkl->ptr.serverban->hostmask : "<null>");
+				}
+				abort();
+			}
+#endif
+			DelListItem(tkl, tklines_ip_hash[index][index2]);
+			found = 1;
+		}
+	}
+
+	if (!found)
+	{
+		/* If we get here it's just for our normal list.. */
+		index = tkl_hash(tkl_typetochar(tkl->type));
+		DelListItem(tkl, tklines[index]);
+	}
+
+	/* Finally, free the entry */
+	free_tkl(tkl);
+}
+
+/*
+ * tkl_check_local_remove_shun:
+ * removes shun from currently connected users affected by tmp.
+ */
+// TODO / FIXME: audit this function, it looks crazy
+void _tkl_check_local_remove_shun(TKL *tmp)
+{
+	long i;
+	char *chost, *cname, *cip;
+	int is_ip;
+	Client *client;
+
+	TKL *tk;
+	int keep_shun;
+
+	for (i = 0; i <= 5; i++)
+	{
+		list_for_each_entry(client, &lclient_list, lclient_node)
+			if (MyUser(client) && IsShunned(client))
+			{
+				chost = client->local->sockhost;
+				cname = client->user->username;
+
+				cip = GetIP(client);
+
+				if ((*tmp->ptr.serverban->hostmask >= '0') && (*tmp->ptr.serverban->hostmask <= '9'))
+					is_ip = 1;
+				else
+					is_ip = 0;
+
+				if (is_ip == 0 ?
+				    (match_simple(tmp->ptr.serverban->hostmask, chost) && match_simple(tmp->ptr.serverban->usermask, cname)) :
+				    (match_simple(tmp->ptr.serverban->hostmask, chost) || match_simple(tmp->ptr.serverban->hostmask, cip))
+				    && match_simple(tmp->ptr.serverban->usermask, cname))
+				{
+					/*
+					  before blindly marking this user as un-shunned, we need to check
+					  if the user is under any other existing shuns. (#0003906)
+					  Unfortunately, this requires crazy amounts of indentation ;-).
+
+					  This enumeration code is based off of _tkl_stats()
+					 */
+					keep_shun = 0;
+					for(tk = tklines[tkl_hash('s')]; tk && !keep_shun; tk = tk->next)
+						if(tk != tmp && match_simple(tk->ptr.serverban->usermask, cname))
+						{
+							if ((*tk->ptr.serverban->hostmask >= '0') && (*tk->ptr.serverban->hostmask <= '9')
+							    /* the hostmask is an IP */
+							    && (match_simple(tk->ptr.serverban->hostmask, chost) || match_simple(tk->ptr.serverban->hostmask, cip)))
+								keep_shun = 1;
+							else
+								/* the hostmask is not an IP */
+								if (match_simple(tk->ptr.serverban->hostmask, chost) && match_simple(tk->ptr.serverban->usermask, cname))
+									keep_shun = 1;
+						}
+
+					if(!keep_shun)
+					{
+						ClearShunned(client);
+					}
+				}
+			}
+	}
+}
+
+
+/** This returns something like user@host, or %user@host, or ~a:Trusted
+ * that can be used in oper notices like expiring kline, added kline, etc.
+ */
+#define NO_SOFT_PREFIX	1
+char *tkl_uhost(TKL *tkl, char *buf, size_t buflen, int options)
+{
+	if (TKLIsServerBan(tkl))
+	{
+		if (is_extended_ban(tkl->ptr.serverban->usermask))
+		{
+			ircsnprintf(buf, buflen, "%s%s%s",
+				(!(options & NO_SOFT_PREFIX) && (tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT)) ? "%" : "",
+				tkl->ptr.serverban->usermask, tkl->ptr.serverban->hostmask);
+		} else {
+			ircsnprintf(buf, buflen, "%s%s@%s",
+				(!(options & NO_SOFT_PREFIX) && (tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT)) ? "%" : "",
+				tkl->ptr.serverban->usermask, tkl->ptr.serverban->hostmask);
+		}
+	} else
+	if (TKLIsBanException(tkl))
+	{
+		if (is_extended_ban(tkl->ptr.banexception->usermask))
+		{
+			ircsnprintf(buf, buflen, "%s%s%s",
+				(!(options & NO_SOFT_PREFIX) && (tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT)) ? "%" : "",
+				tkl->ptr.banexception->usermask, tkl->ptr.banexception->hostmask);
+		} else {
+			ircsnprintf(buf, buflen, "%s%s@%s",
+				(!(options & NO_SOFT_PREFIX) && (tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT)) ? "%" : "",
+				tkl->ptr.banexception->usermask, tkl->ptr.banexception->hostmask);
+		}
+	} else
+		abort();
+
+	return buf;
+}
+
+/** Deal with expiration of a specific TKL entry.
+ * This is a helper function for tkl_check_expire().
+ */
+void tkl_expire_entry(TKL *tkl)
+{
+	char *whattype = tkl_type_string(tkl);
+
+	if (!tkl)
+		return;
+
+	if (tkl->type & TKL_SPAMF)
+	{
+		/* Impossible */
+	} else
+	if (TKLIsServerBan(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		sendto_snomask(SNO_TKL,
+		    "*** Expiring %s (%s) made by %s (Reason: %s) set %lld seconds ago",
+		    whattype, uhost, tkl->set_by, tkl->ptr.serverban->reason,
+		    (long long)(TStime() - tkl->set_at));
+		ircd_log
+		    (LOG_TKL, "Expiring %s (%s) made by %s (Reason: %s) set %lld seconds ago",
+		    whattype, uhost, tkl->set_by, tkl->ptr.serverban->reason,
+		    (long long)(TStime() - tkl->set_at));
+	}
+	else if (TKLIsNameBan(tkl))
+	{
+		if (!tkl->ptr.nameban->hold)
+		{
+			sendto_snomask(SNO_TKL,
+				"*** Expiring %s (%s) made by %s (Reason: %s) set %lld seconds ago",
+				whattype, tkl->ptr.nameban->name, tkl->set_by, tkl->ptr.nameban->reason,
+				(long long)(TStime() - tkl->set_at));
+			ircd_log
+				(LOG_TKL, "Expiring %s (%s) made by %s (Reason: %s) set %lld seconds ago",
+				whattype, tkl->ptr.nameban->name, tkl->set_by, tkl->ptr.nameban->reason,
+				(long long)(TStime() - tkl->set_at));
+		}
+	}
+	else if (TKLIsBanException(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		sendto_snomask(SNO_TKL,
+		    "*** Expiring %s (%s) for types '%s' made by %s (Reason: %s) set %lld seconds ago",
+		    whattype, uhost, tkl->ptr.banexception->bantypes, tkl->set_by, tkl->ptr.banexception->reason,
+		    (long long)(TStime() - tkl->set_at));
+		ircd_log
+		    (LOG_TKL, "Expiring %s (%s) for types '%s' made by %s (Reason: %s) set %lld seconds ago",
+		    whattype, uhost, tkl->ptr.banexception->bantypes, tkl->set_by, tkl->ptr.banexception->reason,
+		    (long long)(TStime() - tkl->set_at));
+	}
+
+	if (tkl->type & TKL_SHUN)
+		tkl_check_local_remove_shun(tkl);
+
+	RunHook2(HOOKTYPE_TKL_DEL, NULL, tkl);
+	tkl_del_line(tkl);
+}
+
+/** Regularly check TKL entries for expiration */
+EVENT(tkl_check_expire)
+{
+	TKL *tkl, *next;
+	time_t nowtime;
+	int index, index2;
+
+	nowtime = TStime();
+
+	/* First, hashed entries.. */
+	for (index = 0; index < TKLIPHASHLEN1; index++)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = next)
+			{
+				next = tkl->next;
+				if (tkl->expire_at <= nowtime && !(tkl->expire_at == 0))
+				{
+					tkl_expire_entry(tkl);
+				}
+			}
+		}
+	}
+
+	/* Now normal entries.. */
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tkl = tklines[index]; tkl; tkl = next)
+		{
+			next = tkl->next;
+			if (tkl->expire_at <= nowtime && !(tkl->expire_at == 0))
+			{
+				tkl_expire_entry(tkl);
+			}
+		}
+	}
+}
+
+/* This is just a helper function for find_tkl_exception() */
+static int find_tkl_exception_matcher(Client *client, int ban_type, TKL *except_tkl)
+{
+	char uhost[NICKLEN+HOSTLEN+1];
+
+	if (!TKLIsBanException(except_tkl))
+		return 0;
+
+	if (!tkl_banexception_matches_type(except_tkl, ban_type))
+		return 0;
+
+	tkl_uhost(except_tkl, uhost, sizeof(uhost), NO_SOFT_PREFIX);
+
+	if (match_user(uhost, client, MATCH_CHECK_REAL))
+	{
+		if (!(except_tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT))
+			return 1; /* hard ban exempt */
+		if ((except_tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT) && IsLoggedIn(client))
+			return 1; /* soft ban exempt - only matches if user is logged in */
+	}
+
+	return 0; /* not found */
+}
+
+/** Search for TKL Exceptions for this user.
+ * @param ban_type   The ban type to check, normally ban_tkl->type.
+ * @param client     The user
+ * @returns 1 if ban exempt, 0 if not.
+ * @note
+ * If you have a TKL ban that matched, say, 'ban_tkl'.
+ * Then you call this function like this:
+ * if (find_tkl_exception(ban_tkl->type, client))
+ *     return 0; // User is exempt
+ * [.. continue and ban the user..]
+ */
+int _find_tkl_exception(int ban_type, Client *client)
+{
+	TKL *tkl;
+	int index, index2;
+	Hook *hook;
+
+	if (IsServer(client) || IsMe(client))
+		return 1;
+
+	/* First, the TKL ip hash table entries.. */
+	index = tkl_ip_hash_type('e');
+	index2 = tkl_ip_hash(GetIP(client));
+	if (index2 >= 0)
+	{
+		for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+		{
+			if (find_tkl_exception_matcher(client, ban_type, tkl))
+				return 1; /* exempt */
+		}
+	}
+
+	/* If not banned (yet), then check regular entries.. */
+	for (tkl = tklines[tkl_hash('e')]; tkl; tkl = tkl->next)
+	{
+			if (find_tkl_exception_matcher(client, ban_type, tkl))
+				return 1; /* exempt */
+	}
+
+	for (hook = Hooks[HOOKTYPE_TKL_EXCEPT]; hook; hook = hook->next)
+	{
+		if (hook->func.intfunc(client, ban_type) > 0)
+			return 1; /* exempt by hook */
+	}
+	return 0; /* Not exempt */
+}
+
+/** Helper function for find_tkline_match() */
+int find_tkline_match_matcher(Client *client, int skip_soft, TKL *tkl)
+{
+	char uhost[NICKLEN+HOSTLEN+1];
+
+	if (!TKLIsServerBan(tkl) || (tkl->type & TKL_SHUN))
+		return 0;
+
+	if (skip_soft && (tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT))
+		return 0;
+
+	tkl_uhost(tkl, uhost, sizeof(uhost), NO_SOFT_PREFIX);
+
+	if (match_user(uhost, client, MATCH_CHECK_REAL))
+	{
+		/* If hard-ban, or soft-ban&unauthenticated.. */
+		if (!(tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) ||
+		    ((tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) && !IsLoggedIn(client)))
+		{
+			/* Found match. Now check for exception... */
+			if (find_tkl_exception(tkl->type, client))
+				return 0; /* exempted */
+			return 1; /* banned */
+		}
+	}
+
+	return 0; /* no match */
+}
+
+/** Check if user matches a *LINE. If so, kill the user.
+ * @retval 1 if client is banned, 0 if not
+ * @note Do not continue processing if the client is killed (0 return value).
+ * @note Return value changed with regards to UnrealIRCd 4!
+ */
+int _find_tkline_match(Client *client, int skip_soft)
+{
+	TKL *tkl;
+	int banned = 0;
+	int index, index2;
+
+	if (IsServer(client) || IsMe(client))
+		return 0;
+
+	/* First, the TKL ip hash table entries.. */
+	index2 = tkl_ip_hash(GetIP(client));
+	if (index2 >= 0)
+	{
+		for (index = 0; index < TKLIPHASHLEN1; index++)
+		{
+			for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+			{
+				banned = find_tkline_match_matcher(client, skip_soft, tkl);
+				if (banned)
+					break;
+			}
+			if (banned)
+				break;
+		}
+	}
+
+	/* If not banned (yet), then check regular entries.. */
+	if (!banned)
+	{
+		for (index = 0; index < TKLISTLEN; index++)
+		{
+			for (tkl = tklines[index]; tkl; tkl = tkl->next)
+			{
+				banned = find_tkline_match_matcher(client, skip_soft, tkl);
+				if (banned)
+					break;
+			}
+			if (banned)
+				break;
+		}
+	}
+
+	if (!banned)
+		return 0;
+
+	/* User is banned... */
+
+	RunHookReturnInt2(HOOKTYPE_FIND_TKLINE_MATCH, client, tkl, !=99);
+
+	if (tkl->type & TKL_KILL)
+	{
+		ircstats.is_ref++;
+		if (tkl->type & TKL_GLOBAL)
+			banned_client(client, "G-Lined", tkl->ptr.serverban->reason, 1, 0);
+		else
+			banned_client(client, "K-Lined", tkl->ptr.serverban->reason, 0, 0);
+		return 1; /* killed */
+	} else
+	if (tkl->type & TKL_ZAP)
+	{
+		ircstats.is_ref++;
+		banned_client(client, "Z-Lined", tkl->ptr.serverban->reason, (tkl->type & TKL_GLOBAL)?1:0, 0);
+		return 1; /* killed */
+	}
+
+	return 0;
+}
+
+/** Check if user is shunned.
+ * @param client   Client to check.
+ * @returns 1 if shunned, 0 if not.
+ */
+int _find_shun(Client *client)
+{
+	TKL *tkl;
+
+	if (IsServer(client) || IsMe(client))
+		return 0;
+
+	if (IsShunned(client))
+		return 1;
+
+	if (ValidatePermissionsForPath("immune:server-ban:shun",client,NULL,NULL,NULL))
+		return 0;
+
+	for (tkl = tklines[tkl_hash('s')]; tkl; tkl = tkl->next)
+	{
+		char uhost[NICKLEN+HOSTLEN+1];
+
+		if (!(tkl->type & TKL_SHUN))
+			continue;
+
+		snprintf(uhost, sizeof(uhost), "%s@%s", tkl->ptr.serverban->usermask, tkl->ptr.serverban->hostmask);
+
+		if (match_user(uhost, client, MATCH_CHECK_REAL))
+		{
+			/* If hard-ban, or soft-ban&unauthenticated.. */
+			if (!(tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) ||
+			    ((tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) && !IsLoggedIn(client)))
+			{
+				/* Found match. Now check for exception... */
+				if (find_tkl_exception(TKL_SHUN, client))
+					return 0;
+				SetShunned(client);
+				return 1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/** Helper function for spamfilter_build_user_string().
+ * This ensures IPv6 hosts are in brackets.
+ */
+char *SpamfilterMagicHost(char *i)
+{
+	static char buf[256];
+
+	if (!strchr(i, ':'))
+		return i;
+
+	/* otherwise, it's IPv6.. prepend it with [ and append a ] */
+	ircsnprintf(buf, sizeof(buf), "[%s]", i);
+	return buf;
+}
+
+/** Build the nick:user@host:realname string
+ * @param buf     The buffer used for storage, the size of
+ *                which should be at least NICKLEN+USERLEN+HOSTLEN+1.
+ * @param nick    The nickname (because client can be nick-changing).
+ * @param client  The affected client.
+ */
+void _spamfilter_build_user_string(char *buf, char *nick, Client *client)
+{
+	snprintf(buf, NICKLEN+USERLEN+HOSTLEN+1, "%s!%s@%s:%s",
+		nick, client->user->username, SpamfilterMagicHost(client->user->realhost), client->info);
+}
+
+
+/** Checks if the user matches a spamfilter of type 'u' (user,
+ * nick!user@host:realname ban).
+ * Written by: Syzop
+ * Assumes: only call for clients, possible assume on local clients [?]
+ * Return values: see match_spamfilter()
+ */
+int _find_spamfilter_user(Client *client, int flags)
+{
+	char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64]; /* n!u@h:r */
+
+	if (ValidatePermissionsForPath("immune:server-ban:spamfilter",client,NULL,NULL,NULL))
+		return 0;
+
+	spamfilter_build_user_string(spamfilter_user, client->name, client);
+	return match_spamfilter(client, spamfilter_user, SPAMF_USER, NULL, flags, NULL);
+}
+
+/** Check a spamfilter against all local users and print a message.
+ * This is only used for the 'warn' action (BAN_ACT_WARN).
+ */
+int spamfilter_check_users(TKL *tkl)
+{
+	char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64]; /* n!u@h:r */
+	char buf[1024];
+	int matches = 0;
+	Client *client;
+
+	list_for_each_entry_reverse(client, &lclient_list, lclient_node)
+	{
+		if (MyUser(client))
+		{
+			spamfilter_build_user_string(spamfilter_user, client->name, client);
+			if (!unreal_match(tkl->ptr.spamfilter->match, spamfilter_user))
+				continue; /* No match */
+
+			/* matched! */
+			ircsnprintf(buf, sizeof(buf), "[Spamfilter] %s!%s@%s matches filter '%s': [%s: '%s'] [%s]",
+				client->name, client->user->username, client->user->realhost,
+				tkl->ptr.spamfilter->match->str,
+				"user", spamfilter_user,
+				unreal_decodespace(tkl->ptr.spamfilter->tkl_reason));
+
+			sendto_snomask_global(SNO_SPAMF, "%s", buf);
+			ircd_log(LOG_SPAMFILTER, "%s", buf);
+			RunHook6(HOOKTYPE_LOCAL_SPAMFILTER, client, spamfilter_user, spamfilter_user, SPAMF_USER, NULL, tkl);
+			matches++;
+		}
+	}
+
+	return matches;
+}
+
+/** Similarly to previous, but match against all global users.
+ * FUNCTION IS UNUSED !!
+ */
+int spamfilter_check_all_users(Client *from, TKL *tkl)
+{
+	char spamfilter_user[NICKLEN + USERLEN + HOSTLEN + REALLEN + 64]; /* n!u@h:r */
+	int matches = 0;
+	Client *acptr;
+
+	list_for_each_entry(acptr, &client_list, client_node)
+	{
+		if (IsUser(acptr))
+		{
+			spamfilter_build_user_string(spamfilter_user, acptr->name, acptr);
+			if (!unreal_match(tkl->ptr.spamfilter->match, spamfilter_user))
+				continue; /* No match */
+
+			/* matched! */
+			sendnotice(from, "[Spamfilter] %s!%s@%s matches filter '%s': [%s: '%s'] [%s]",
+				acptr->name, acptr->user->username, acptr->user->realhost,
+				tkl->ptr.spamfilter->match->str,
+				"user", spamfilter_user,
+				unreal_decodespace(tkl->ptr.spamfilter->tkl_reason));
+			matches++;
+		}
+	}
+
+	return matches;
+}
+
+/** Check if the nick or channel name is banned (Q-Line).
+ * @param client   The possibly affected user.
+ * @param name     The nick or channel to check.
+ * @param is_hold  This will be SET (so OUT) if it's a services hold.
+ *
+ * @note Special handling:
+ * #*ble* will match with #bbleh
+ * *ble* will NOT match with #bbleh, will with bbleh
+ */
+TKL *_find_qline(Client *client, char *name, int *ishold)
+{
+	TKL *tkl;
+	int	points = 0;
+	*ishold = 0;
+
+	if (IsServer(client) || IsMe(client))
+		return NULL;
+
+	for (tkl = tklines[tkl_hash('q')]; tkl; tkl = tkl->next)
+	{
+		points = 0;
+
+		if (!TKLIsNameBan(tkl))
+			continue;
+
+		if (((*tkl->ptr.nameban->name == '#' && *name == '#') || (*tkl->ptr.nameban->name != '#' && *name != '#'))
+		    && match_simple(tkl->ptr.nameban->name, name))
+		{
+			points = 1;
+			break;
+		}
+	}
+
+	if (points != 1)
+		return NULL;
+
+	/* It's a services hold (except bans don't override this) */
+	if (tkl->ptr.nameban->hold)
+	{
+		*ishold = 1;
+		return tkl;
+	}
+
+	if (find_tkl_exception(TKL_NAME, client))
+		return NULL; /* exempt */
+
+	return tkl;
+}
+
+/** Helper function for find_tkline_match_zap() */
+TKL *find_tkline_match_zap_matcher(Client *client, TKL *tkl)
+{
+	if (!(tkl->type & TKL_ZAP))
+		return NULL;
+
+	if (match_user(tkl->ptr.serverban->hostmask, client, MATCH_CHECK_IP))
+	{
+		if (find_tkl_exception(TKL_ZAP, client))
+			return NULL; /* exempt */
+		return tkl; /* banned */
+	}
+
+	return NULL; /* no match */
+}
+
+/** Find matching (G)ZLINE, if any.
+ * Note: function prototype changed as per UnrealIRCd 4.2.0.
+ * @retval The (G)Z-Line that matched, or NULL if no such ban was found.
+ */
+TKL *_find_tkline_match_zap(Client *client)
+{
+	TKL *tkl, *ret;
+	int index, index2;
+
+	if (IsServer(client) || IsMe(client))
+		return NULL;
+
+	/* First, the TKL ip hash table entries.. */
+	index = tkl_ip_hash_type('z');
+	index2 = tkl_ip_hash(GetIP(client));
+	if (index2 >= 0)
+	{
+		for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+		{
+			ret = find_tkline_match_zap_matcher(client, tkl);
+			if (ret)
+				return ret;
+		}
+	}
+
+	/* If not banned (yet), then check regular entries.. */
+	for (tkl = tklines[tkl_hash('z')]; tkl; tkl = tkl->next)
+	{
+		ret = find_tkline_match_zap_matcher(client, tkl);
+		if (ret)
+			return ret;
+	}
+
+	return NULL;
+}
+
+#define BY_MASK 0x1
+#define BY_REASON 0x2
+#define NOT_BY_MASK 0x4
+#define NOT_BY_REASON 0x8
+#define BY_SETBY 0x10
+#define NOT_BY_SETBY 0x20
+
+typedef struct {
+	int flags;
+	char *mask;
+	char *reason;
+	char *set_by;
+} TKLFlag;
+
+/** Parse STATS tkl parameters.
+ * TODO: I don't think this is documented anywhere? Or underdocumented at least.
+ */
+static void parse_stats_params(char *para, TKLFlag *flag)
+{
+	static char paratmp[512]; /* <- copy of para, because it gets fragged by strtok() */
+	char *flags, *tmp;
+	char what = '+';
+
+	memset(flag, 0, sizeof(TKLFlag));
+	strlcpy(paratmp, para, sizeof(paratmp));
+	flags = strtok(paratmp, " ");
+	if (!flags)
+		return;
+
+	for (; *flags; flags++)
+	{
+		switch (*flags)
+		{
+			case '+':
+				what = '+';
+				break;
+			case '-':
+				what = '-';
+				break;
+			case 'm':
+				if (flag->mask || !(tmp = strtok(NULL, " ")))
+					continue;
+				if (what == '+')
+					flag->flags |= BY_MASK;
+				else
+					flag->flags |= NOT_BY_MASK;
+				flag->mask = tmp;
+				break;
+			case 'r':
+				if (flag->reason || !(tmp = strtok(NULL, " ")))
+					continue;
+				if (what == '+')
+					flag->flags |= BY_REASON;
+				else
+					flag->flags |= NOT_BY_REASON;
+				flag->reason = tmp;
+				break;
+			case 's':
+				if (flag->set_by || !(tmp = strtok(NULL, " ")))
+					continue;
+				if (what == '+')
+					flag->flags |= BY_SETBY;
+				else
+					flag->flags |= NOT_BY_SETBY;
+				flag->set_by = tmp;
+				break;
+		}
+	}
+}
+
+/** Does this TKL entry match the search terms?
+ * This is a helper function for tkl_stats().
+ */
+void tkl_stats_matcher(Client *client, int type, char *para, TKLFlag *tklflags, TKL *tkl)
+{
+	/***** First, handle the selection ******/
+
+	if (!BadPtr(para))
+	{
+		if (tklflags->flags & BY_SETBY)
+			if (!match_simple(tklflags->set_by, tkl->set_by))
+				return;
+		if (tklflags->flags & NOT_BY_SETBY)
+			if (match_simple(tklflags->set_by, tkl->set_by))
+				return;
+		if (TKLIsServerBan(tkl))
+		{
+			if (tklflags->flags & BY_MASK)
+			{
+				if (!match_simple(tklflags->mask, make_user_host(tkl->ptr.serverban->usermask, tkl->ptr.serverban->hostmask)))
+					return;
+			}
+			if (tklflags->flags & NOT_BY_MASK)
+			{
+				if (match_simple(tklflags->mask, make_user_host(tkl->ptr.serverban->usermask, tkl->ptr.serverban->hostmask)))
+					return;
+			}
+			if (tklflags->flags & BY_REASON)
+				if (!match_simple(tklflags->reason, tkl->ptr.serverban->reason))
+					return;
+			if (tklflags->flags & NOT_BY_REASON)
+				if (match_simple(tklflags->reason, tkl->ptr.serverban->reason))
+					return;
+		} else
+		if (TKLIsNameBan(tkl))
+		{
+			if (tklflags->flags & BY_MASK)
+			{
+				if (!match_simple(tklflags->mask, tkl->ptr.nameban->name))
+					return;
+			}
+			if (tklflags->flags & NOT_BY_MASK)
+			{
+				if (match_simple(tklflags->mask, tkl->ptr.nameban->name))
+					return;
+			}
+			if (tklflags->flags & BY_REASON)
+				if (!match_simple(tklflags->reason, tkl->ptr.nameban->reason))
+					return;
+			if (tklflags->flags & NOT_BY_REASON)
+				if (match_simple(tklflags->reason, tkl->ptr.nameban->reason))
+					return;
+		} else
+		if (TKLIsBanException(tkl))
+		{
+			if (tklflags->flags & BY_MASK)
+			{
+				if (!match_simple(tklflags->mask, make_user_host(tkl->ptr.banexception->usermask, tkl->ptr.banexception->hostmask)))
+					return;
+			}
+			if (tklflags->flags & NOT_BY_MASK)
+			{
+				if (match_simple(tklflags->mask, make_user_host(tkl->ptr.banexception->usermask, tkl->ptr.banexception->hostmask)))
+					return;
+			}
+			if (tklflags->flags & BY_REASON)
+				if (!match_simple(tklflags->reason, tkl->ptr.banexception->reason))
+					return;
+			if (tklflags->flags & NOT_BY_REASON)
+				if (match_simple(tklflags->reason, tkl->ptr.banexception->reason))
+					return;
+		}
+	}
+
+	/***** If we are still here then we have a match and will will send the STATS entry */
+	if (TKLIsServerBan(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		if (tkl->type == (TKL_KILL | TKL_GLOBAL))
+		{
+			sendnumeric(client, RPL_STATSGLINE, 'G', uhost,
+				   (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+				   (TStime() - tkl->set_at), tkl->set_by, tkl->ptr.serverban->reason);
+		} else
+		if (tkl->type == (TKL_ZAP | TKL_GLOBAL))
+		{
+			sendnumeric(client, RPL_STATSGLINE, 'Z', uhost,
+				   (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+				   (TStime() - tkl->set_at), tkl->set_by, tkl->ptr.serverban->reason);
+		} else
+		if (tkl->type == (TKL_SHUN | TKL_GLOBAL))
+		{
+			sendnumeric(client, RPL_STATSGLINE, 's', uhost,
+				   (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+				   (TStime() - tkl->set_at), tkl->set_by, tkl->ptr.serverban->reason);
+		} else
+		if (tkl->type == (TKL_KILL))
+		{
+			sendnumeric(client, RPL_STATSGLINE, 'K', uhost,
+				   (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+				   (TStime() - tkl->set_at), tkl->set_by, tkl->ptr.serverban->reason);
+		} else
+		if (tkl->type == (TKL_ZAP))
+		{
+			sendnumeric(client, RPL_STATSGLINE, 'z', uhost,
+				   (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+				   (TStime() - tkl->set_at), tkl->set_by, tkl->ptr.serverban->reason);
+		}
+	} else
+	if (TKLIsSpamfilter(tkl))
+	{
+		sendnumeric(client, RPL_STATSSPAMF,
+			(tkl->type & TKL_GLOBAL) ? 'F' : 'f',
+			unreal_match_method_valtostr(tkl->ptr.spamfilter->match->type),
+			spamfilter_target_inttostring(tkl->ptr.spamfilter->target),
+			banact_valtostring(tkl->ptr.spamfilter->action),
+			(tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+			TStime() - tkl->set_at,
+			tkl->ptr.spamfilter->tkl_duration, tkl->ptr.spamfilter->tkl_reason,
+			tkl->set_by,
+			tkl->ptr.spamfilter->match->str);
+		if (para && !strcasecmp(para, "del"))
+		{
+			char *hash = spamfilter_id(tkl);
+			if (tkl->type & TKL_GLOBAL)
+			{
+				sendtxtnumeric(client, "To delete this spamfilter, use /SPAMFILTER del %s", hash);
+				sendtxtnumeric(client, "-");
+			} else {
+				sendtxtnumeric(client, "This spamfilter is stored in the configuration file and cannot be removed with /SPAMFILTER del");
+				sendtxtnumeric(client, "-");
+			}
+		}
+	} else
+	if (TKLIsNameBan(tkl))
+	{
+		sendnumeric(client, RPL_STATSQLINE, (tkl->type & TKL_GLOBAL) ? 'Q' : 'q',
+			tkl->ptr.nameban->name, (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+			TStime() - tkl->set_at, tkl->set_by, tkl->ptr.nameban->reason);
+	} else
+	if (TKLIsBanException(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		sendnumeric(client, RPL_STATSEXCEPTTKL, uhost,
+			   tkl->ptr.banexception->bantypes,
+			   (tkl->expire_at != 0) ? (tkl->expire_at - TStime()) : 0,
+			   (TStime() - tkl->set_at), tkl->set_by, tkl->ptr.banexception->reason);
+	}
+}
+
+/* TKL Stats. This is used by /STATS gline and all the others */
+void _tkl_stats(Client *client, int type, char *para)
+{
+	TKL *tk;
+	TKLFlag tklflags;
+	int index, index2;
+
+	if (!BadPtr(para))
+		parse_stats_params(para, &tklflags);
+
+	/* First the IP hashed entries (if applicable).. */
+	index = tkl_ip_hash_type(tkl_typetochar(type));
+	if (index >= 0)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			for (tk = tklines_ip_hash[index][index2]; tk; tk = tk->next)
+			{
+				if (type && tk->type != type)
+					continue;
+				tkl_stats_matcher(client, type, para, &tklflags, tk);
+			}
+		}
+	}
+
+	/* Then the normal entries... */
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tk = tklines[index]; tk; tk = tk->next)
+		{
+			if (type && tk->type != type)
+				continue;
+			tkl_stats_matcher(client, type, para, &tklflags, tk);
+		}
+	}
+
+	if ((type == (TKL_SPAMF|TKL_GLOBAL)) && (!para || strcasecmp(para, "del")))
+	{
+		/* If requesting spamfilter stats and not spamfilter del, then suggest it. */
+		sendnotice(client, "Tip: if you are looking for an easy way to remove a spamfilter, run '/SPAMFILTER del'.");
+	}
+}
+
+/** Synchronize a TKL entry with the other server.
+ * @param sender  The sender (eg: &me).
+ * @param to      The remote server.
+ * @param tkl     The TKL entry.
+ */
+void tkl_sync_send_entry(int add, Client *sender, Client *to, TKL *tkl)
+{
+	char typ;
+
+	if (!(tkl->type & TKL_GLOBAL))
+		return; /* nothing to sync */
+
+	typ = tkl_typetochar(tkl->type);
+
+	if (TKLIsServerBan(tkl))
+	{
+		sendto_one(to, NULL, ":%s TKL %c %c %s%s %s %s %lld %lld :%s", sender->name,
+			   add ? '+' : '-',
+			   typ,
+			   (tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) ? "%" : "",
+			   *tkl->ptr.serverban->usermask ? tkl->ptr.serverban->usermask : "*",
+			   tkl->ptr.serverban->hostmask, tkl->set_by,
+			   (long long)tkl->expire_at, (long long)tkl->set_at,
+			   tkl->ptr.serverban->reason);
+	} else
+	if (TKLIsNameBan(tkl))
+	{
+		sendto_one(to, NULL, ":%s TKL %c %c %c %s %s %lld %lld :%s", sender->name,
+			   add ? '+' : '-',
+			   typ,
+			   tkl->ptr.nameban->hold ? 'H' : '*',
+			   tkl->ptr.nameban->name,
+			   tkl->set_by,
+			   (long long)tkl->expire_at, (long long)tkl->set_at,
+			   tkl->ptr.nameban->reason);
+	} else
+	if (TKLIsSpamfilter(tkl))
+	{
+		sendto_one(to, NULL, ":%s TKL %c %c %s %c %s %lld %lld %lld %s %s :%s", sender->name,
+			   add ? '+' : '-',
+			   typ,
+			   spamfilter_target_inttostring(tkl->ptr.spamfilter->target),
+			   banact_valtochar(tkl->ptr.spamfilter->action),
+			   tkl->set_by,
+			   (long long)tkl->expire_at, (long long)tkl->set_at,
+			   (long long)tkl->ptr.spamfilter->tkl_duration, tkl->ptr.spamfilter->tkl_reason,
+			   unreal_match_method_valtostr(tkl->ptr.spamfilter->match->type),
+			   tkl->ptr.spamfilter->match->str);
+	} else
+	if (TKLIsBanException(tkl))
+	{
+		sendto_one(to, NULL, ":%s TKL %c %c %s%s %s %s %lld %lld %s :%s", sender->name,
+			   add ? '+' : '-',
+			   typ,
+			   (tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT) ? "%" : "",
+			   *tkl->ptr.banexception->usermask ? tkl->ptr.banexception->usermask : "*",
+			   tkl->ptr.banexception->hostmask, tkl->set_by,
+			   (long long)tkl->expire_at, (long long)tkl->set_at,
+			   tkl->ptr.banexception->bantypes,
+			   tkl->ptr.banexception->reason);
+	} else
+	{
+		sendto_ops_and_log("[BUG] tkl_sync_send_entry() called, but unknown type %d/'%c'",
+			tkl->type, typ);
+		abort();
+	}
+}
+
+/** Broadcast a TKL entry.
+ * @param sender  The sender, eg &me
+ * @param skip    The client to skip, eg 'client' or NULL.
+ * @param tkl     The TKL entry to synchronize with the other servers.
+ */
+void tkl_broadcast_entry(int add, Client *sender, Client *skip, TKL *tkl)
+{
+	Client *acptr;
+
+	list_for_each_entry(acptr, &server_list, special_node)
+	{
+		if (skip && acptr == skip->direction)
+			continue;
+
+		tkl_sync_send_entry(add, sender, acptr, tkl);
+	}
+}
+
+/** Synchronize all TKL entries with this server.
+ * @param client The server to synchronize with.
+ */
+void _tkl_sync(Client *client)
+{
+	TKL *tkl;
+	int index, index2;
+
+	/* First, hashed entries.. */
+	for (index = 0; index < TKLIPHASHLEN1; index++)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+			{
+				tkl_sync_send_entry(1, &me, client, tkl);
+			}
+		}
+	}
+
+	/* Then, regular entries.. */
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tkl = tklines[index]; tkl; tkl = tkl->next)
+		{
+			tkl_sync_send_entry(1, &me, client, tkl);
+		}
+	}
+}
+
+/** Find a server ban TKL - only used to prevent duplicates and for deletion */
+TKL *_find_tkl_serverban(int type, char *usermask, char *hostmask, int softban)
+{
+	char tpe = tkl_typetochar(type);
+	TKL *head, *tkl;
+
+	if (!TKLIsServerBanType(type))
+		abort();
+
+	head = tkl_find_head(tpe, hostmask, tklines[tkl_hash(tpe)]);
+	for (tkl = head; tkl; tkl = tkl->next)
+	{
+		if (tkl->type == type)
+		{
+			if (!strcasecmp(tkl->ptr.serverban->hostmask, hostmask) &&
+			    !strcasecmp(tkl->ptr.serverban->usermask, usermask))
+			{
+				/* And an extra check for soft/hard ban mismatches.. */
+				if ((tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT) == softban)
+					return tkl;
+			}
+		}
+	}
+	return NULL; /* Not found */
+}
+
+/** Find a ban exception TKL - only used to prevent duplicates and for deletion */
+TKL *_find_tkl_banexception(int type, char *usermask, char *hostmask, int softban)
+{
+	char tpe = tkl_typetochar(type);
+	TKL *head, *tkl;
+
+	if (!TKLIsBanExceptionType(type))
+		abort();
+
+	head = tkl_find_head(tpe, hostmask, tklines[tkl_hash(tpe)]);
+	for (tkl = head; tkl; tkl = tkl->next)
+	{
+		if (tkl->type == type)
+		{
+			if (!strcasecmp(tkl->ptr.banexception->hostmask, hostmask) &&
+			    !strcasecmp(tkl->ptr.banexception->usermask, usermask))
+			{
+				/* And an extra check for soft/hard ban mismatches.. */
+				if ((tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT) == softban)
+					return tkl;
+			}
+		}
+	}
+	return NULL; /* Not found */
+}
+
+/** Find a name ban TKL (qline) - only used to prevent duplicates and for deletion */
+TKL *_find_tkl_nameban(int type, char *name, int hold)
+{
+	char tpe = tkl_typetochar(type);
+	TKL *tkl;
+
+	if (!TKLIsNameBanType(type))
+		abort();
+
+	for (tkl = tklines[tkl_hash(tpe)]; tkl; tkl = tkl->next)
+	{
+		if ((tkl->type == type) && !strcasecmp(tkl->ptr.nameban->name, name))
+			return tkl;
+	}
+	return NULL; /* Not found */
+}
+
+/** Find a spamfilter TKL - only used to prevent duplicates and for deletion */
+TKL *_find_tkl_spamfilter(int type, char *match_string, BanAction action, unsigned short target)
+{
+	char tpe = tkl_typetochar(type);
+	TKL *tkl;
+
+	if (!TKLIsSpamfilterType(type))
+		abort();
+
+	for (tkl = tklines[tkl_hash(tpe)]; tkl; tkl = tkl->next)
+	{
+		if ((type == tkl->type) &&
+		    !strcmp(match_string, tkl->ptr.spamfilter->match->str) &&
+		    (action == tkl->ptr.spamfilter->action) &&
+		    (target == tkl->ptr.spamfilter->target))
+		{
+			return tkl;
+		}
+	}
+	return NULL; /* Not found */
+}
+
+/** Send a notice to opers about the TKL that is being added */
+void _sendnotice_tkl_add(TKL *tkl)
+{
+	char buf[512];
+	char set_at[128];
+	char expire_at[128];
+	char *tkl_type_str; /**< Eg: "K-Line" */
+
+	/* Don't show notices for temporary nick holds (issued by services) */
+	if (TKLIsNameBan(tkl) && tkl->ptr.nameban->hold)
+		return;
+
+	tkl_type_str = tkl_type_string(tkl);
+
+	*buf = *set_at = *expire_at = '\0';
+	short_date(tkl->set_at, set_at);
+	if (tkl->expire_at > 0)
+		short_date(tkl->expire_at, expire_at);
+
+	if (TKLIsServerBan(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		if (tkl->expire_at != 0)
+		{
+			ircsnprintf(buf, sizeof(buf), "%s added for %s on %s GMT (from %s to expire at %s GMT: %s)",
+				tkl_type_str, uhost,
+				set_at, tkl->set_by, expire_at, tkl->ptr.serverban->reason);
+		} else {
+			ircsnprintf(buf, sizeof(buf), "Permanent %s added for %s on %s GMT (from %s: %s)",
+				tkl_type_str, uhost,
+				set_at, tkl->set_by, tkl->ptr.serverban->reason);
+		}
+	} else
+	if (TKLIsNameBan(tkl))
+	{
+		if (tkl->expire_at > 0)
+		{
+			ircsnprintf(buf, sizeof(buf), "%s added for %s on %s GMT (from %s to expire at %s GMT: %s)",
+				tkl_type_str, tkl->ptr.nameban->name, set_at, tkl->set_by, expire_at, tkl->ptr.nameban->reason);
+		} else {
+			ircsnprintf(buf, sizeof(buf), "Permanent %s added for %s on %s GMT (from %s: %s)",
+				tkl_type_str, tkl->ptr.nameban->name, set_at, tkl->set_by, tkl->ptr.nameban->reason);
+		}
+	} else
+	if (TKLIsSpamfilter(tkl))
+	{
+		/* Spamfilter */
+		ircsnprintf(buf, sizeof(buf),
+		            "Spamfilter added: '%s' [type: %s] [target: %s] [action: %s] [reason: %s] on %s GMT (from %s)",
+		            tkl->ptr.spamfilter->match->str,
+			    unreal_match_method_valtostr(tkl->ptr.spamfilter->match->type),
+		            spamfilter_target_inttostring(tkl->ptr.spamfilter->target),
+		            banact_valtostring(tkl->ptr.spamfilter->action),
+		            unreal_decodespace(tkl->ptr.spamfilter->tkl_reason),
+		            set_at,
+		            tkl->set_by);
+	} else
+	if (TKLIsBanException(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		if (tkl->expire_at != 0)
+		{
+			ircsnprintf(buf, sizeof(buf), "%s added for %s for types '%s' on %s GMT (from %s to expire at %s GMT: %s)",
+				tkl_type_str, uhost,
+				tkl->ptr.banexception->bantypes,
+				set_at, tkl->set_by, expire_at, tkl->ptr.banexception->reason);
+		} else {
+			ircsnprintf(buf, sizeof(buf), "Permanent %s added for %s for types '%s' on %s GMT (from %s: %s)",
+				tkl_type_str, uhost,
+				tkl->ptr.banexception->bantypes,
+				set_at, tkl->set_by, tkl->ptr.banexception->reason);
+		}
+	} else
+	{
+		ircsnprintf(buf, sizeof(buf), "[BUG] %s added but type unhandled in sendnotice_tkl_add()!!!", tkl_type_str);
+	}
+
+	sendto_snomask(SNO_TKL, "*** %s", buf);
+	ircd_log(LOG_TKL, "%s", buf);
+}
+
+/** Send a notice to opers about the TKL that is being deleted */
+void _sendnotice_tkl_del(char *removed_by, TKL *tkl)
+{
+	char buf[512];
+	char set_at[128];
+	char *tkl_type_str;
+
+	/* Don't show notices for temporary nick holds (issued by services) */
+	if (TKLIsNameBan(tkl) && tkl->ptr.nameban->hold)
+		return;
+
+	tkl_type_str = tkl_type_string(tkl); /* eg: "K-Line" */
+
+	*buf = *set_at = '\0';
+	short_date(tkl->set_at, set_at);
+
+	if (TKLIsServerBan(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		ircsnprintf(buf, sizeof(buf),
+			       "%s removed %s %s (set at %s - reason: %s)",
+			       removed_by, tkl_type_str, uhost,
+			       set_at, tkl->ptr.serverban->reason);
+	} else
+	if (TKLIsNameBan(tkl))
+	{
+		ircsnprintf(buf, sizeof(buf),
+			"%s removed %s %s (set at %s - reason: %s)",
+			removed_by, tkl_type_str, tkl->ptr.nameban->name, set_at, tkl->ptr.nameban->reason);
+	} else
+	if (TKLIsSpamfilter(tkl))
+	{
+		ircsnprintf(buf, sizeof(buf),
+			"%s removed Spamfilter '%s' (set at %s)",
+			removed_by, tkl->ptr.spamfilter->match->str, set_at);
+	} else
+	if (TKLIsBanException(tkl))
+	{
+		char uhostbuf[BUFSIZE];
+		char *uhost = tkl_uhost(tkl, uhostbuf, sizeof(uhostbuf), 0);
+		ircsnprintf(buf, sizeof(buf),
+			       "%s removed exception on %s (set at %s - reason: %s)",
+			       removed_by, uhost,
+			       set_at, tkl->ptr.banexception->reason);
+	} else
+	{
+		ircsnprintf(buf, sizeof(buf), "[BUG] %s added but type unhandled in sendnotice_tkl_del()!!!!!", tkl_type_str);
+	}
+
+	sendto_snomask(SNO_TKL, "*** %s", buf);
+	ircd_log(LOG_TKL, "%s", buf);
+}
+
+/** Add a TKL using the TKL layer. See cmd_tkl for parv[] and protocol documentation. */
+CMD_FUNC(cmd_tkl_add)
+{
+	TKL *tkl;
+	int type;
+	time_t expire_at, set_at;
+	char *set_by;
+	char tkl_entry_exists = 0;
+
+	/* we rely on servers to be failsafe.. */
+	if (!IsServer(client) && !IsMe(client))
+		return;
+
+	if (parc < 9)
+		return;
+
+	type = tkl_chartotype(parv[2][0]);
+	if (!type)
+		return;
+
+	/* All TKL types have the following fields in common when adding:
+	 * parv[5]: set_by
+	 * parv[6]: expire_at
+	 * parv[7]: set_at
+	 * ... so we validate them here at the beginning.
+	 */
+
+	set_by = parv[5];
+	expire_at = atol(parv[6]);
+	set_at = atol(parv[7]);
+
+	/* Validate set and expiry time */
+	if ((set_at < 0) || !short_date(set_at, NULL))
+	{
+		sendto_realops("Invalid TKL entry from %s, set-at time is out of range (%lld) -- not added. Clock on other server incorrect or bogus entry.",
+			client->name, (long long)set_at);
+		return;
+	}
+	if ((expire_at < 0) || !short_date(expire_at, NULL))
+	{
+		sendto_realops("Invalid TKL entry from %s, expiry time is out of range (%lld) -- not added. Clock on other server incorrect or bogus entry.",
+			client->name, (long long)expire_at);
+		return;
+	}
+
+	/* Now comes type-specific validation
+	 * and we check if the TKL entry already exists and needs updating too.
+	 */
+
+	if (TKLIsServerBanType(type))
+	{
+		/* Validate server ban TKL fields */
+		int softban = 0;
+		char *usermask = parv[3];
+		char *hostmask = parv[4];
+		char *reason = parv[8];
+
+		/* Some simple validation on usermask and hostmask:
+		 * may not contain an @. Yeah, some services or self-written
+		 * linked servers are known to have sent this in the past.
+		 */
+		if (strchr(usermask, '@') || strchr(hostmask, '@'))
+		{
+			sendto_realops("Ignoring TKL entry %s@%s from %s. "
+			               "Invalid usermask '%s' or hostmask '%s'.",
+			               usermask, hostmask, client->name, usermask, hostmask);
+			return;
+		}
+
+		/* In case of a soft ban, strip the percent sign early,
+		 * so parv[3] (username) is really the username without any prefix.
+		 * Set the 'softban' flag if this is the case.
+		 */
+		if (*usermask == '%')
+		{
+			usermask++;
+			softban = 1;
+		}
+
+		tkl = find_tkl_serverban(type, usermask, hostmask, softban);
+		if (tkl)
+		{
+			tkl_entry_exists = 1;
+		} else {
+			tkl = tkl_add_serverban(type, usermask, hostmask, reason,
+			                        set_by, expire_at, set_at, softban, 0);
+		}
+	} else
+	if (TKLIsBanExceptionType(type))
+	{
+		/* Validate ban exception TKL fields */
+		int softban = 0;
+		char *usermask = parv[3];
+		char *hostmask = parv[4];
+		char *bantypes = parv[8];
+		char *reason;
+
+		if (parc < 10)
+			return;
+
+		reason = parv[9];
+
+		/* Some simple validation on usermask and hostmask:
+		 * may not contain an @. Yeah, some services or self-written
+		 * linked servers are known to have sent this in the past.
+		 */
+		if (strchr(usermask, '@') || strchr(hostmask, '@'))
+		{
+			sendto_realops("Ignoring TKL exception entry %s@%s from %s. "
+			               "Invalid usermask '%s' or hostmask '%s'.",
+			               usermask, hostmask, client->name, usermask, hostmask);
+			return;
+		}
+
+		/* In case of a soft ban, strip the percent sign early,
+		 * so parv[3] (username) is really the username without any prefix.
+		 * Set the 'softban' flag if this is the case.
+		 */
+		if (*usermask == '%')
+		{
+			usermask++;
+			softban = 1;
+		}
+
+		/* At this moment we do not validate 'bantypes' since a missing
+		 * or wrong type does not cause harm anyway.
+		 */
+		tkl = find_tkl_banexception(type, usermask, hostmask, softban);
+		if (tkl)
+		{
+			tkl_entry_exists = 1;
+		} else {
+			tkl = tkl_add_banexception(type, usermask, hostmask, reason,
+			                           set_by, expire_at, set_at, softban, bantypes, 0);
+		}
+	} else
+	if (TKLIsNameBanType(type))
+	{
+		/* Validate name ban TKL fields */
+		int hold = 0;
+		char *name = parv[4];
+		char *reason = parv[8];
+
+		if (*parv[3] == 'H')
+			hold = 1;
+
+		tkl = find_tkl_nameban(type, name, hold);
+		if (tkl)
+		{
+			tkl_entry_exists = 1;
+		} else {
+			tkl = tkl_add_nameban(type, name, hold, reason, set_by, expire_at,
+			                      set_at, 0);
+		}
+	} else
+	if (TKLIsSpamfilterType(type))
+	{
+		/* Validate spamfilter-specific TKL fields */
+		MatchType match_method;
+		char *match_string;
+		Match *m; /* compiled match_string */
+		time_t tkl_duration;
+		char *tkl_reason;
+		BanAction action;
+		unsigned short target;
+		/* helper variables */
+		char *err;
+
+		if (parc < 12)
+		{
+			sendto_realops("Ignoring spamfilter from %s. Running very old UnrealIRCd protocol (3.2.X?)", client->name);
+			return;
+		}
+
+		match_string = parv[11];
+
+		if (!strcasecmp(parv[10], "posix"))
+		{
+			sendto_realops("Ignoring spamfilter from %s. Spamfilter is of type 'posix' (TRE) which "
+				       "is not supported in UnrealIRCd 5. Suggestion: upgrade the other server.",
+				       client->name);
+			return;
+		}
+		match_method = unreal_match_method_strtoval(parv[10]);
+		if (match_method == 0)
+		{
+			sendto_realops("Ignoring spamfilter '%s' from %s with unknown match type '%s'",
+				match_string, client->name, parv[10]);
+			return;
+		}
+
+		if (!(target = spamfilter_gettargets(parv[3], NULL)))
+		{
+			sendto_realops("Ignoring spamfilter '%s' from %s with unknown target type '%s'",
+				match_string, client->name, parv[3]);
+			return;
+		}
+
+		if (!(action = banact_chartoval(*parv[4])))
+		{
+			sendto_realops("Ignoring spamfilter '%s' from %s with unknown action type '%s'",
+				match_string, client->name, parv[4]);
+			return;
+		}
+
+		tkl_duration = config_checkval(parv[8], CFG_TIME);
+		tkl_reason = parv[9];
+
+		tkl = find_tkl_spamfilter(type, match_string, action, target);
+
+		if (tkl)
+		{
+			tkl_entry_exists = 1;
+		} else {
+			m = unreal_create_match(match_method, match_string, &err);
+			if (!m)
+			{
+				sendto_realops("[TKL ERROR] ERROR: Trying to add a spamfilter which does not compile. "
+					       " ERROR='%s', Spamfilter='%s', from='%s'",
+					       err, match_string, client->name);
+				return;
+			}
+			tkl = tkl_add_spamfilter(type, target, action, m, set_by, expire_at, set_at,
+			                         tkl_duration, tkl_reason, 0);
+		}
+	} else
+	{
+		/* Unhandled, should never happen */
+		abort();
+	}
+
+	if (!tkl)
+		return;
+
+	if (tkl_entry_exists)
+	{
+		/* Let's see if we need to update the existing entry.
+		 * Note that we only update common fields,
+		 * which is acceptable to me. -- Syzop
+		 */
+		if ((set_at < tkl->set_at) || (expire_at != tkl->expire_at) || strcmp(tkl->set_by, parv[5]))
+		{
+			/* here's how it goes:
+			 * set_at: oldest wins
+			 * expire_at: longest wins
+			 * set_by: highest strcmp wins
+			 *
+			 * We broadcast the result of this back to all servers except
+			 * sptr->direction, because that side will do the same thing and
+			 * send it back to his servers (except us)... no need for a
+			 * double networkwide flood ;p. -- Syzop
+			 */
+			tkl->set_at = MIN(tkl->set_at, set_at);
+
+			if (!tkl->expire_at || !expire_at)
+				tkl->expire_at = 0;
+			else
+				tkl->expire_at = MAX(tkl->expire_at, expire_at);
+
+			if (strcmp(tkl->set_by, parv[5]) < 0)
+				safe_strdup(tkl->set_by, parv[5]);
+
+			if (type & TKL_GLOBAL)
+				tkl_broadcast_entry(1, client, client, tkl);
+		}
+		return;
+	}
+
+	/* Below this line we will only use 'tkl'. No parc/parv reading anymore. */
+
+	RunHook2(HOOKTYPE_TKL_ADD, client, tkl);
+
+	sendnotice_tkl_add(tkl);
+
+	/* spamfilter 'warn' action is special */
+	if ((tkl->type & TKL_SPAMF) && (tkl->ptr.spamfilter->action == BAN_ACT_WARN) && (tkl->ptr.spamfilter->target & SPAMF_USER))
+		spamfilter_check_users(tkl);
+
+	/* Ban checking executes during run loop for efficiency */
+	loop.do_bancheck = 1;
+
+	if (type & TKL_GLOBAL)
+		tkl_broadcast_entry(1, client, client, tkl);
+}
+
+/** Delete a TKL using the TKL layer. See cmd_tkl for parv[] and protocol documentation. */
+CMD_FUNC(cmd_tkl_del)
+{
+	TKL *tkl;
+	int type;
+	char *removed_by;
+
+	if (!IsServer(client) && !IsMe(client))
+		return;
+
+	if (parc < 6)
+		return;
+
+	type = tkl_chartotype(parv[2][0]);
+	if (type == 0)
+		return;
+
+	removed_by = parv[5];
+
+	if (TKLIsServerBanType(type))
+	{
+		char *usermask = parv[3];
+		char *hostmask = parv[4];
+		int softban = 0;
+
+		if (*usermask == '%')
+		{
+			usermask++;
+			softban = 1;
+		}
+
+		tkl = find_tkl_serverban(type, usermask, hostmask, softban);
+	}
+	else if (TKLIsBanExceptionType(type))
+	{
+		char *usermask = parv[3];
+		char *hostmask = parv[4];
+		int softban = 0;
+		/* other parameters are ignored */
+
+		if (*usermask == '%')
+		{
+			usermask++;
+			softban = 1;
+		}
+
+		tkl = find_tkl_banexception(type, usermask, hostmask, softban);
+	}
+	else if (TKLIsNameBanType(type))
+	{
+		int hold = 0;
+		char *name = parv[4];
+
+		if (*parv[3] == 'H')
+			hold = 1;
+		tkl = find_tkl_nameban(type, name, hold);
+	}
+	else if (TKLIsSpamfilterType(type))
+	{
+		char *match_string;
+		unsigned short target;
+		BanAction action;
+
+		if (parc < 9)
+		{
+			sendto_realops("[BUG] cmd_tkl called with bogus spamfilter removal request [f/F], from=%s, parc=%d",
+				       client->name, parc);
+			return; /* bogus */
+		}
+		if (parc >= 12)
+			match_string = parv[11];
+		else if (parc >= 11)
+			match_string = parv[10];
+		else
+			match_string = parv[8];
+
+		if (!(target = spamfilter_gettargets(parv[3], NULL)))
+		{
+			sendto_realops("Ignoring spamfilter deletion request for '%s' from %s with unknown target type '%s'",
+				match_string, client->name, parv[3]);
+			return;
+		}
+
+		if (!(action = banact_chartoval(*parv[4])))
+		{
+			sendto_realops("Ignoring spamfilter deletion request for '%s' from %s with unknown action type '%s'",
+				match_string, client->name, parv[4]);
+			return;
+		}
+		tkl = find_tkl_spamfilter(type, match_string, action, target);
+	} else
+	{
+		/* This can never happen, unless someone added a TKL type
+		 * to UnrealIRCd but forgot to add the removal code :D.
+		 */
+		abort();
+	}
+
+	if (!tkl)
+		return; /* Item not found, nothing to remove. */
+
+	if (tkl->flags & TKL_FLAG_CONFIG)
+		return; /* Item is in the configuration file (persistent) */
+
+	/* broadcast remove msg to opers... */
+	sendnotice_tkl_del(removed_by, tkl);
+
+	if (type & TKL_SHUN)
+		tkl_check_local_remove_shun(tkl);
+
+	RunHook2(HOOKTYPE_TKL_DEL, client, tkl);
+
+	if (type & TKL_GLOBAL)
+		tkl_broadcast_entry(0, client, client, tkl);
+
+
+	if (TKLIsBanException(tkl))
+	{
+		/* Since an exception has been removed we have to re-check if
+		 * any connected user is now matched by a ban.
+		 * Set flag here, actual checking takes place in main loop.
+		 */
+		loop.do_bancheck = 1;
+	}
+
+	tkl_del_line(tkl);
+}
+
+/** TKL command: server to server handling of *LINEs and SPAMFILTERs.
+ * HISTORY:
+ * This was originall called Timed KLines, but today it's
+ * used by various *line types eg: zline, gline, gzline, shun,
+ * but also by spamfilter etc...
+ * DOCUMENTATION
+ * See (also) https://www.unrealircd.org/docs/Server_protocol:TKL_command
+ * USAGE:
+ * This routine is used both internally by the ircd (to
+ * for example add local klines, zlines, etc) and over the
+ * network (glines, gzlines, spamfilter, etc).
+ *
+ *           serverban  serverban  spamfilter      spamfilter         sqline:    ban exception:
+ *           add:       remove:    remove in U4:   with TKLEXT2:
+ * parv[ 1]: +          -          -               +/-                +/-        +/-
+ * parv[ 2]: type       type       type            type               type       type
+ * parv[ 3]: user       user       target          target             hold       user
+ * parv[ 4]: host       host       action          action             host       host
+ * parv[ 5]: set_by     removedby  (un)set_by      set_by/unset_by    set_by     set_by
+ * parv[ 6]: expire_at             expire_at (0)   expire_at (0)      expire_at  expire_at
+ * parv[ 7]: set_at                set_at          set_at             set_at     set_at
+ * parv[ 8]: reason                regex           tkl duration       reason     except_type
+ * parv[ 9]:                                       tkl reason [A]                reason
+ * parv[10]:                                       match-type [B]
+ * parv[11]:                                       match-string [C]
+ *
+ * [A] tkl reason field must be escaped by caller [eg: use unreal_encodespace()
+ *     if cmd_tkl is called internally].
+ * [B] match-type must be one of: regex, simple, posix.
+ * [C] Could be a regex or a regular string with wildcards, depending on [B]
+ */
+CMD_FUNC(_cmd_tkl)
+{
+	if (!IsServer(client) && !IsOper(client) && !IsMe(client))
+		return;
+
+	if (parc < 2)
+		return;
+
+	switch (*parv[1])
+	{
+		case '+':
+			cmd_tkl_add(client, recv_mtags, parc, parv);
+			break;
+		case '-':
+			cmd_tkl_del(client, recv_mtags, parc, parv);
+			break;
+		default:
+			break;
+	}
+}
+
+/** Configure the username/hostname TKL layer based on the BAN_TARGET_* configuration */
+void ban_target_to_tkl_layer(BanTarget ban_target, BanAction action, Client *client, char **tkl_username, char **tkl_hostname)
+{
+	static char username[USERLEN+1];
+	static char hostname[HOSTLEN+8];
+
+	if ((action == BAN_ACT_ZLINE) || (action == BAN_ACT_GZLINE))
+		ban_target = BAN_TARGET_IP; /* The only possible choice with ZLINE/GZLINE, other info is unavailable */
+
+	if (ban_target == BAN_TARGET_ACCOUNT)
+	{
+		if (client->user && client->user->svid &&
+		    strcmp(client->user->svid, "0") &&
+		    (*client->user->svid != ':'))
+		{
+			/* Place a ban on ~a:Accountname */
+			strlcpy(username, "~a:", sizeof(username));
+			strlcpy(hostname, client->user->svid, sizeof(hostname));
+			*tkl_username = username;
+			*tkl_hostname = hostname;
+			return;
+		}
+		ban_target = BAN_TARGET_IP; /* fallback */
+	} else
+	if (ban_target == BAN_TARGET_CERTFP)
+	{
+		char *fp = moddata_client_get(client, "certfp");
+		if (fp)
+		{
+			/* Place a ban on ~S:sha256sumofclientcertificate */
+			strlcpy(username, "~S:", sizeof(username));
+			strlcpy(hostname, fp, sizeof(hostname));
+			*tkl_username = username;
+			*tkl_hostname = hostname;
+			return;
+		}
+		ban_target = BAN_TARGET_IP; /* fallback */
+	}
+
+	/* Below we deal with the more common choices... */
+
+	/* First, set the username */
+	if (((ban_target == BAN_TARGET_USERIP) || (ban_target == BAN_TARGET_USERHOST)) && client->ident && strcmp(client->ident, "unknown"))
+		strlcpy(username, client->ident, sizeof(username));
+	else
+		strlcpy(username, "*", sizeof(username));
+
+	/* Now set the host-portion of the TKL */
+	if (((ban_target == BAN_TARGET_HOST) || (ban_target == BAN_TARGET_USERHOST)) && client->user && *client->user->realhost)
+		strlcpy(hostname, client->user->realhost, sizeof(hostname));
+	else
+		strlcpy(hostname, GetIP(client), sizeof(hostname));
+
+	*tkl_username = username;
+	*tkl_hostname = hostname;
+}
+
+/** Take an action on the user, such as banning or killing.
+ * @author Bram Matthys (Syzop), 2003-present
+ * @param client     The client which is affected.
+ * @param action   The type of ban (one of BAN_ACT_*).
+ * @param reason   The ban reason.
+ * @param duration The ban duration in seconds.
+ * @note This function assumes that client is a locally connected user.
+ * @retval 1 if action is taken, 0 if user is exempted.
+ * @note Be sure to check IsDead(client) if return value is 1 and you are
+ *       considering to continue processing.
+ */
+int _place_host_ban(Client *client, BanAction action, char *reason, long duration)
+{
+	/* If this is a soft action and the user is logged in, then the ban does not apply.
+	 * NOTE: Actually in such a case it would be better if place_host_ban() would not
+	 * be called at all. Or at least, the caller should not take any action
+	 * (eg: the message should be delivered, the user may connect, etc..)
+	 * The following is more like secondary protection in case the caller forgets...
+	 */
+	if (IsSoftBanAction(action) && IsLoggedIn(client))
+		return 0;
+
+	switch(action)
+	{
+		case BAN_ACT_TEMPSHUN:
+			/* We simply mark this connection as shunned and do not add a ban record */
+			sendto_snomask(SNO_TKL, "Temporary shun added at user %s (%s@%s) [%s]",
+				client->name,
+				client->user ? client->user->username : "unknown",
+				client->user ? client->user->realhost : GetIP(client),
+				reason);
+			SetShunned(client);
+			break;
+		case BAN_ACT_GZLINE:
+		case BAN_ACT_GLINE:
+		case BAN_ACT_SOFT_GLINE:
+		case BAN_ACT_ZLINE:
+		case BAN_ACT_KLINE:
+		case BAN_ACT_SOFT_KLINE:
+		case BAN_ACT_SHUN:
+		case BAN_ACT_SOFT_SHUN:
+		{
+			char ip[128], user[USERLEN+3], mo[100], mo2[100];
+			char *tkllayer[9] = {
+				me.name,	/*0  server.name */
+				"+",		/*1  +|- */
+				"?",		/*2  type */
+				"*",		/*3  user */
+				NULL,		/*4  host */
+				NULL,
+				NULL,		/*6  expire_at */
+				NULL,		/*7  set_at */
+				NULL		/*8  reason */
+			};
+
+			ban_target_to_tkl_layer(iConf.automatic_ban_target, action, client, &tkllayer[3], &tkllayer[4]);
+
+			/* For soft bans we need to prefix the % in the username */
+			if (IsSoftBanAction(action))
+			{
+				char tmp[USERLEN+3];
+				snprintf(tmp, sizeof(tmp), "%%%s", tkllayer[3]);
+				strlcpy(user, tmp, sizeof(user));
+				tkllayer[3] = user;
+			}
+
+			if ((action == BAN_ACT_KLINE) || (action == BAN_ACT_SOFT_KLINE))
+				tkllayer[2] = "k";
+			else if (action == BAN_ACT_ZLINE)
+				tkllayer[2] = "z";
+			else if (action == BAN_ACT_GZLINE)
+				tkllayer[2] = "Z";
+			else if ((action == BAN_ACT_GLINE) || (action == BAN_ACT_SOFT_GLINE))
+				tkllayer[2] = "G";
+			else if ((action == BAN_ACT_SHUN) || (action == BAN_ACT_SOFT_SHUN))
+				tkllayer[2] = "s";
+			tkllayer[5] = me.name;
+			if (!duration)
+				strlcpy(mo, "0", sizeof(mo)); /* perm */
+			else
+				ircsnprintf(mo, sizeof(mo), "%lld", (long long)(duration + TStime()));
+			ircsnprintf(mo2, sizeof(mo2), "%lld", (long long)TStime());
+			tkllayer[6] = mo;
+			tkllayer[7] = mo2;
+			tkllayer[8] = reason;
+			cmd_tkl(&me, NULL, 9, tkllayer);
+			RunHookReturnInt4(HOOKTYPE_PLACE_HOST_BAN, client, action, reason, duration, !=99);
+			if ((action == BAN_ACT_SHUN) || (action == BAN_ACT_SOFT_SHUN))
+			{
+				find_shun(client);
+				return 1;
+			} /* else.. */
+			return find_tkline_match(client, 0);
+		}
+		case BAN_ACT_SOFT_KILL:
+		case BAN_ACT_KILL:
+		default:
+			RunHookReturnInt4(HOOKTYPE_PLACE_HOST_BAN, client, action, reason, duration, !=99);
+			exit_client(client, NULL, reason);
+			return 1;
+	}
+	return 0; /* no action taken (weird) */
+}
+
+/** This function compares two spamfilters ('one' and 'two') and will return
+ * a 'winner' based on which one has the strongest action.
+ * If both have equal action then some additional logic is applied simply
+ * to ensure we (almost) always return the same winner regardless of the
+ * order of the spamfilters (which may differ between servers).
+ */
+TKL *choose_winning_spamfilter(TKL *one, TKL *two)
+{
+	int n;
+
+	if (!TKLIsSpamfilter(one) || !TKLIsSpamfilter(two))
+		abort();
+
+	/* First, see if the action field differs... */
+	if (one->ptr.spamfilter->action != two->ptr.spamfilter->action)
+	{
+		/* We can simply compare the action. Highest (strongest) wins. */
+		if (one->ptr.spamfilter->action > two->ptr.spamfilter->action)
+			return one;
+		else
+			return two;
+	}
+
+	/* Ok, try comparing the regex then.. */
+	n = strcmp(one->ptr.spamfilter->match->str, two->ptr.spamfilter->match->str);
+	if (n < 0)
+		return one;
+	if (n > 0)
+		return two;
+
+	/* Hmm.. regex is identical. Try the 'reason' field. */
+	n = strcmp(one->ptr.spamfilter->tkl_reason, two->ptr.spamfilter->tkl_reason);
+	if (n < 0)
+		return one;
+	if (n > 0)
+		return two;
+
+	/* Hmm.. 'reason' is identical as well.
+	 * Make a final decision, could still be identical but would be unlikely.
+	 */
+	return (one->ptr.spamfilter->target > two->ptr.spamfilter->target) ? one : two;
+}
+
+/** Checks if 'target' is on the spamfilter exception list.
+ * RETURNS 1 if found in list, 0 if not.
+ */
+static int target_is_spamexcept(char *target)
+{
+	SpamExcept *e;
+
+	for (e = iConf.spamexcept; e; e = e->next)
+	{
+		if (match_simple(e->name, target))
+			return 1;
+	}
+	return 0;
+}
+
+/** Make user join the virus channel.
+ * @param client  The user that was doing something bad.
+ * @param tk    The TKL entry that matched this user.
+ * @param type  The spamfilter type (SPAMF_*)
+ *              TODO: Looks redundant?
+ */
+int _join_viruschan(Client *client, TKL *tkl, int type)
+{
+	char *xparv[3], chbuf[CHANNELLEN + 16], buf[2048];
+	Channel *channel;
+	int ret;
+
+	snprintf(buf, sizeof(buf), "0,%s", SPAMFILTER_VIRUSCHAN);
+	xparv[0] = client->name;
+	xparv[1] = buf;
+	xparv[2] = NULL;
+
+	/* RECURSIVE CAUTION in case we ever add blacklisted chans */
+	spamf_ugly_vchanoverride = 1;
+	do_cmd(client, NULL, "JOIN", 2, xparv);
+	spamf_ugly_vchanoverride = 0;
+
+	if (IsDead(client))
+		return 0; /* killed due to JOIN */
+
+	sendnotice(client, "You are now restricted to talking in %s: %s",
+		SPAMFILTER_VIRUSCHAN, unreal_decodespace(tkl->ptr.spamfilter->tkl_reason));
+
+	channel = find_channel(SPAMFILTER_VIRUSCHAN, NULL);
+	if (channel)
+	{
+		MessageTag *mtags = NULL;
+		ircsnprintf(chbuf, sizeof(chbuf), "@%s", channel->chname);
+		ircsnprintf(buf, sizeof(buf), "[Spamfilter] %s matched filter '%s' [%s] [%s]",
+			client->name, tkl->ptr.spamfilter->match->str, cmdname_by_spamftarget(type),
+			unreal_decodespace(tkl->ptr.spamfilter->tkl_reason));
+		new_message(&me, NULL, &mtags);
+		sendto_channel(channel, &me, NULL, PREFIX_OP|PREFIX_ADMIN|PREFIX_OWNER,
+		               0, SEND_ALL|SKIP_DEAF, mtags,
+		               ":%s NOTICE %s :%s", me.name, chbuf, buf);
+		free_message_tags(mtags);
+	}
+	SetVirus(client);
+	return 1;
+}
+
+/** match_spamfilter: executes the spamfilter on the input string.
+ * @param str		The text (eg msg text, notice text, part text, quit text, etc
+ * @param target	The spamfilter target (SPAMF_*)
+ * @param destination	The destination as a text string (eg: "somenick", can be NULL.. eg for away)
+ * @param flags		Any flags (SPAMFLAG_*)
+ * @param rettkl	Pointer to an aTKLline struct, _used for special circumstances only_
+ * RETURN VALUE:
+ * 1 if spamfilter matched and it should be blocked (or client exited), 0 if not matched.
+ * In case of 1, be sure to check IsDead(client)..
+ */
+int _match_spamfilter(Client *client, char *str_in, int target, char *destination, int flags, TKL **rettkl)
+{
+	TKL *tkl;
+	TKL *winner_tkl = NULL;
+	char *str;
+	int ret = -1;
+	char *reason = NULL;
+#ifdef SPAMFILTER_DETECTSLOW
+	struct rusage rnow, rprev;
+	long ms_past;
+#endif
+
+	if (rettkl)
+		*rettkl = NULL; /* initialize to NULL */
+
+	if (target == SPAMF_USER)
+		str = str_in;
+	else
+		str = (char *)StripControlCodes(str_in);
+
+	/* (note: using client->user check here instead of IsUser()
+	 * due to SPAMF_USER where user isn't marked as client/person yet.
+	 */
+	if (!client->user || ValidatePermissionsForPath("immune:server-ban:spamfilter",client,NULL,NULL,NULL) || IsULine(client))
+		return 0;
+
+	for (tkl = tklines[tkl_hash('F')]; tkl; tkl = tkl->next)
+	{
+		if (!(tkl->ptr.spamfilter->target & target))
+			continue;
+
+		if ((flags & SPAMFLAG_NOWARN) && (tkl->ptr.spamfilter->action == BAN_ACT_WARN))
+			continue;
+
+		/* If the action is 'soft' (for non-logged in users only) then
+		 * don't bother running the spamfilter if the user is logged in.
+		 */
+		if (IsSoftBanAction(tkl->ptr.spamfilter->action) && IsLoggedIn(client))
+			continue;
+
+#ifdef SPAMFILTER_DETECTSLOW
+		memset(&rnow, 0, sizeof(rnow));
+		memset(&rprev, 0, sizeof(rnow));
+
+		getrusage(RUSAGE_SELF, &rprev);
+#endif
+
+		ret = unreal_match(tkl->ptr.spamfilter->match, str);
+
+#ifdef SPAMFILTER_DETECTSLOW
+		getrusage(RUSAGE_SELF, &rnow);
+
+		ms_past = ((rnow.ru_utime.tv_sec - rprev.ru_utime.tv_sec) * 1000) +
+		          ((rnow.ru_utime.tv_usec - rprev.ru_utime.tv_usec) / 1000);
+
+		if ((SPAMFILTER_DETECTSLOW_FATAL > 0) && (ms_past > SPAMFILTER_DETECTSLOW_FATAL))
+		{
+			sendto_realops("[Spamfilter] WARNING: Too slow spamfilter detected (took %ld msec to execute) "
+			               "-- spamfilter will be \002REMOVED!\002: %s", ms_past, tkl->ptr.spamfilter->match->str);
+			tkl_del_line(tkl);
+			return 0; /* Act as if it didn't match, even if it did.. it's gone now anyway.. */
+		} else
+		if ((SPAMFILTER_DETECTSLOW_WARN > 0) && (ms_past > SPAMFILTER_DETECTSLOW_WARN))
+		{
+			sendto_realops("[Spamfilter] WARNING: SLOW Spamfilter detected (took %ld msec to execute): %s",
+				ms_past, tkl->ptr.spamfilter->match->str);
+		}
+#endif
+
+		if (ret)
+		{
+			/* We have a match! */
+			char buf[1024];
+			char destinationbuf[48];
+
+			if (destination) {
+				destinationbuf[0] = ' ';
+				strlcpy(destinationbuf+1, destination, sizeof(destinationbuf)-1); /* cut it off */
+			} else
+				destinationbuf[0] = '\0';
+
+			/* Hold on.. perhaps it's on the exceptions list... */
+			if (!winner_tkl && destination && target_is_spamexcept(destination))
+				return 0; /* No problem! */
+
+			ircsnprintf(buf, sizeof(buf), "[Spamfilter] %s!%s@%s matches filter '%s': [%s%s: '%s'] [%s]",
+				client->name, client->user->username, client->user->realhost,
+				tkl->ptr.spamfilter->match->str,
+				cmdname_by_spamftarget(target), destinationbuf, str,
+				unreal_decodespace(tkl->ptr.spamfilter->tkl_reason));
+
+			sendto_snomask_global(SNO_SPAMF, "%s", buf);
+			ircd_log(LOG_SPAMFILTER, "%s", buf);
+			RunHook6(HOOKTYPE_LOCAL_SPAMFILTER, client, str, str_in, target, destination, tkl);
+
+			/* If we should stop after the first match, we end here... */
+			if (SPAMFILTER_STOP_ON_FIRST_MATCH)
+			{
+				winner_tkl = tkl;
+				break;
+			}
+
+			/* Otherwise.. we set 'winner_tkl' to the spamfilter with the strongest action. */
+			if (!winner_tkl)
+				winner_tkl = tkl;
+			else
+				winner_tkl = choose_winning_spamfilter(tkl, winner_tkl);
+
+			/* and continue.. */
+		}
+	}
+
+	tkl = winner_tkl;
+
+	if (!tkl)
+		return 0; /* NOMATCH, we are done */
+
+	/* Spamfilter matched, take action: */
+
+	reason = unreal_decodespace(tkl->ptr.spamfilter->tkl_reason);
+	if ((tkl->ptr.spamfilter->action == BAN_ACT_BLOCK) || (tkl->ptr.spamfilter->action == BAN_ACT_SOFT_BLOCK))
+	{
+		switch(target)
+		{
+			case SPAMF_USERMSG:
+			case SPAMF_USERNOTICE:
+			{
+				char errmsg[512];
+				ircsnprintf(errmsg, sizeof(errmsg), "Message blocked: %s", reason);
+				sendnumeric(client, ERR_CANTSENDTOUSER, destination, errmsg);
+				break;
+			}
+			case SPAMF_CHANNOTICE:
+				break; /* no replies to notices */
+			case SPAMF_CHANMSG:
+			{
+				sendto_one(client, NULL, ":%s 404 %s %s :Message blocked: %s",
+					me.name, client->name, destination, reason);
+				break;
+			}
+			case SPAMF_DCC:
+			{
+				char errmsg[512];
+				ircsnprintf(errmsg, sizeof(errmsg), "DCC blocked: %s", reason);
+				sendnumeric(client, ERR_CANTSENDTOUSER, destination, errmsg);
+				break;
+			}
+			case SPAMF_AWAY:
+				/* hack to deal with 'after-away-was-set-filters' */
+				if (client->user->away && !strcmp(str_in, client->user->away))
+				{
+					/* free away & broadcast the unset */
+					safe_free(client->user->away);
+					client->user->away = NULL;
+					sendto_server(client, 0, 0, NULL, ":%s AWAY", client->id);
+				}
+				break;
+			case SPAMF_TOPIC:
+				//...
+				sendnotice(client, "Setting of topic on %s to that text is blocked: %s",
+					destination, reason);
+				break;
+			default:
+				break;
+		}
+		return 1;
+	} else
+	if ((tkl->ptr.spamfilter->action == BAN_ACT_WARN) || (tkl->ptr.spamfilter->action == BAN_ACT_SOFT_WARN))
+	{
+		if ((target != SPAMF_USER) && (target != SPAMF_QUIT))
+			sendnumeric(client, RPL_SPAMCMDFWD, cmdname_by_spamftarget(target), reason);
+		return 0;
+	} else
+	if ((tkl->ptr.spamfilter->action == BAN_ACT_DCCBLOCK) || (tkl->ptr.spamfilter->action == BAN_ACT_SOFT_DCCBLOCK))
+	{
+		if (target == SPAMF_DCC)
+		{
+			sendnotice(client, "DCC to %s blocked: %s", destination, reason);
+			sendnotice(client, "*** You have been blocked from sending files, reconnect to regain permission to send files");
+			SetDCCBlock(client);
+		}
+		return 1;
+	} else
+	if ((tkl->ptr.spamfilter->action == BAN_ACT_VIRUSCHAN) || (tkl->ptr.spamfilter->action == BAN_ACT_SOFT_VIRUSCHAN))
+	{
+		if (IsVirus(client)) /* Already tagged */
+			return 0;
+
+		/* There's a race condition for SPAMF_USER, so 'rettk' is used for SPAMF_USER
+		 * when a user is currently connecting and filters are checked:
+		 */
+		if (!IsUser(client))
+		{
+			if (rettkl)
+				*rettkl = tkl;
+			return 1;
+		}
+
+		join_viruschan(client, tkl, target);
+		return 1;
+	} else
+	{
+		return place_host_ban(client, tkl->ptr.spamfilter->action, reason, tkl->ptr.spamfilter->tkl_duration);
+	}
+
+	return 0; /* NOTREACHED */
+}
+
+/** CIDR function to compare the first 'mask' bits.
+ * @author Taken from atheme
+ * @returns 1 if equal, 0 if not.
+ */
+static int comp_with_mask(void *addr, void *dest, u_int mask)
+{
+	if (memcmp(addr, dest, mask / 8) == 0)
+	{
+		int n = mask / 8;
+		int m = (0xffff << (8 - (mask % 8)));
+		if (mask % 8 == 0 || (((u_char *) addr)[n] & m) == (((u_char *) dest)[n] & m))
+		{
+			return (1);
+		}
+	}
+	return (0);
+}
+
+#define IPSZ 16
+
+/** Match a user against a mask.
+ * This will deal with 'nick!user@host', 'user@host' and just 'host'.
+ * We try to match the 'host' portion against the client IP, real host, etc...
+ * CIDR support is available so 'host' may be like '1.2.0.0/16'.
+ * @returns 1 on match, 0 on no match.
+ */
+int _match_user(char *rmask, Client *client, int options)
+{
+	char mask[NICKLEN+USERLEN+HOSTLEN+8];
+	char clientip[IPSZ], maskip[IPSZ];
+	char *p = NULL;
+	char *nmask = NULL, *umask = NULL, *hmask = NULL;
+	int cidr = -1; /* CIDR length, -1 for no CIDR */
+
+	strlcpy(mask, rmask, sizeof(mask));
+
+	if ((options & MATCH_CHECK_EXTENDED) &&
+	    is_extended_ban(mask) &&
+	    client && client->user)
+	{
+		/* Check user properties / extbans style */
+		return _match_user_extended_server_ban(rmask, client);
+	}
+
+	if (!(options & MATCH_MASK_IS_UHOST))
+	{
+		p = strchr(mask, '!');
+		if (p)
+		{
+			*p++ = '\0';
+			if (!*mask)
+				return 0; /* NOMATCH: '!...' */
+			nmask = mask;
+			umask = p;
+
+			/* Could just as well check nick right now */
+			if (!match_simple(nmask, client->name))
+				return 0; /* NOMATCH: nick mask did not match */
+		}
+	}
+
+	if (!(options & (MATCH_MASK_IS_HOST)))
+	{
+		p = strchr(p ? p : mask, '@');
+		if (p)
+		{
+			char *client_username = (client->user && *client->user->username) ? client->user->username : client->ident;
+
+			*p++ = '\0';
+			if (!*p || !*mask)
+				return 0; /* NOMATCH: '...@' or '@...' */
+			hmask = p;
+			if (!umask)
+				umask = mask;
+
+			/* Check user portion right away */
+			if (!match_simple(umask, client_username))
+				return 0; /* NOMATCH: user mask did not match */
+		} else {
+			if (nmask)
+				return 0; /* NOMATCH: 'abc!def' (or even just 'abc!') */
+			hmask = mask;
+		}
+	} else {
+		hmask = mask;
+	}
+
+	/* If we get here then we have done checking nick / ident (if it was needed)
+	 * and now need to match the 'host' portion.
+	 */
+
+	/**** Check visible host ****/
+	if (options & MATCH_CHECK_VISIBLE_HOST)
+	{
+		char *hostname = client->user ? GetHost(client) : (MyUser(client) ? client->local->sockhost : NULL);
+		if (hostname && match_simple(hmask, hostname))
+			return 1; /* MATCH: visible host */
+	}
+
+	/**** Check cloaked host ****/
+	if (options & MATCH_CHECK_CLOAKED_HOST)
+	{
+		if (client->user && match_simple(hmask, client->user->cloakedhost))
+			return 1; /* MATCH: cloaked host */
+	}
+
+	/**** check on IP ****/
+	if (options & MATCH_CHECK_IP)
+	{
+		p = strchr(hmask, '/');
+		if (p)
+		{
+			*p++ = '\0';
+			cidr = atoi(p);
+			if (cidr <= 0)
+				return 0; /* NOMATCH: invalid CIDR */
+		}
+
+		if (strchr(hmask, '?') || strchr(hmask, '*'))
+		{
+			/* Wildcards */
+			if (client->ip && match_simple(hmask, client->ip))
+				return 1; /* MATCH (IP with wildcards) */
+		} else
+		if (strchr(hmask, ':'))
+		{
+			/* IPv6 hostmask */
+
+			/* We can actually return here on match/nomatch as we don't need to check the
+			 * virtual host and things like that since ':' can never be in a hostname.
+			 */
+			if (!client->ip || !strchr(client->ip, ':'))
+				return 0; /* NOMATCH: hmask is IPv6 address and client is not IPv6 */
+			if (!inet_pton(AF_INET6, client->ip, clientip))
+				return 0; /* NOMATCH: unusual failure */
+			if (!inet_pton(AF_INET6, hmask, maskip))
+				return 0; /* NOMATCH: invalid IPv6 IP in hostmask */
+
+			if (cidr < 0)
+				return comp_with_mask(clientip, maskip, 128); /* MATCH/NOMATCH by exact IP */
+
+			if (cidr > 128)
+				return 0; /* NOMATCH: invalid CIDR */
+
+			return comp_with_mask(clientip, maskip, cidr);
+		} else
+		{
+			/* Host is not IPv6 and does not contain wildcards.
+			 * So could be a literal IPv4 address or IPv4 CIDR.
+			 * NOTE: could also be neither (like a real hostname), so don't return 0 on nomatch,
+			 * in that case we should just continue...
+			 * The exception is CIDR. If we have CIDR mask then don't bother checking for
+			 * virtual hosts and things like that since '/' can never be in a hostname.
+			 */
+			if (client->ip && inet_pton(AF_INET, client->ip, clientip) && inet_pton(AF_INET, hmask, maskip))
+			{
+				if (cidr < 0)
+				{
+					if (comp_with_mask(clientip, maskip, 32))
+						return 1; /* MATCH: exact IP */
+				}
+				else if (cidr > 32)
+					return 0; /* NOMATCH: invalid CIDR */
+				else
+					return comp_with_mask(clientip, maskip, cidr); /* MATCH/NOMATCH by CIDR */
+			}
+		}
+	}
+
+	/**** Check real host ****/
+	if (options & MATCH_CHECK_REAL_HOST)
+	{
+		char *hostname = client->user ? client->user->realhost : (MyUser(client) ? client->local->sockhost : NULL);
+		if (hostname && match_simple(hmask, hostname))
+			return 1; /* MATCH: hostname match */
+	}
+
+	return 0; /* NOMATCH: nothing of the above matched */
+}
+
+int _match_user_extended_server_ban(char *banstr, Client *client)
+{
+	char *msg = NULL, *errmsg = NULL;
+	Extban *extban;
+
+	if (!is_extended_ban(banstr))
+		return 0; /* we should never have been called */
+
+	extban = findmod_by_bantype(banstr[1]);
+	if (!extban || !(extban->options & EXTBOPT_TKL))
+		return 0; /* extban not found or of incorrect type (eg ~T) */
+
+	return extban->is_banned(client, NULL, banstr, BANCHK_TKL, &msg, &errmsg);
+}
diff --git a/src/modules/tkldb.c b/src/modules/tkldb.c
new file mode 100644
index 0000000..0e0ef18
--- /dev/null
+++ b/src/modules/tkldb.c
@@ -0,0 +1,699 @@
+/*
+ * Stores active *-Lines (G-Lines etc) inside a .db file for persistency
+ * (C) Copyright 2019 Gottem and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER = {
+	"tkldb",
+	"1.10",
+	"Stores active TKL entries (*-Lines) persistently/across IRCd restarts",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+#define TKL_DB_MAGIC 0x10101010
+#define TKL_DB_VERSION 4999
+#define TKL_DB_SAVE_EVERY 299
+
+#ifdef DEBUGMODE
+ #define BENCHMARK
+/* Benchmark results (2GHz Xeon Skylake, compiled with -O2, Linux):
+ * 100,000 zlines:
+ * - load db: 510 ms
+ * - save db:  72 ms
+ * Thus, saving does not take much time and can be done by a timer
+ * which executes every 5 minutes.
+ * Of course, exact figures will depend on the machine.
+ */
+#endif
+
+#define FreeTKLRead() \
+ 	do { \
+		/* Some of these might be NULL */ \
+		if (tkl) \
+			free_tkl(tkl); \
+	} while(0)
+
+#define WARN_WRITE_ERROR(fname) \
+	do { \
+		sendto_realops_and_log("[tkldb] Error writing to temporary database file " \
+		                       "'%s': %s (DATABASE NOT SAVED)", \
+		                       fname, strerror(errno)); \
+	} while(0)
+
+#define R_SAFE(x) \
+	do { \
+		if (!(x)) { \
+			config_warn("[tkldb] Read error from database file '%s' (possible corruption): %s", cfg.database, strerror(errno)); \
+			fclose(fd); \
+			FreeTKLRead(); \
+			return 0; \
+		} \
+	} while(0)
+
+#define W_SAFE(x) \
+	do { \
+		if (!(x)) { \
+			WARN_WRITE_ERROR(tmpfname); \
+			fclose(fd); \
+			return 0; \
+		} \
+	} while(0)
+
+#define IsMDErr(x, y, z) \
+	do { \
+		if (!(x)) { \
+			config_error("A critical error occurred when registering ModData for %s: %s", MOD_HEADER.name, ModuleGetErrorStr((z)->handle)); \
+			return MOD_FAILED; \
+		} \
+	} while(0)
+
+/* Forward declarations */
+void tkldb_moddata_free(ModData *md);
+void setcfg(void);
+void freecfg(void);
+int tkldb_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int tkldb_configrun(ConfigFile *cf, ConfigEntry *ce, int type);
+EVENT(write_tkldb_evt);
+int write_tkldb(void);
+int write_tkline(FILE *fd, const char *tmpfname, TKL *tkl);
+int read_tkldb(void);
+
+/* Globals variables */
+const uint32_t tkl_db_version = TKL_DB_VERSION;
+struct cfgstruct {
+	char *database;
+};
+static struct cfgstruct cfg;
+
+static int tkls_loaded = 0;
+
+MOD_TEST()
+{
+	memset(&cfg, 0, sizeof(cfg));
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, tkldb_configtest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	LoadPersistentInt(modinfo, tkls_loaded);
+
+	setcfg();
+
+	if (!tkls_loaded)
+	{
+		/* If this is the first time that our module is loaded, then
+		 * read the TKL DB and add all *-Lines.
+		 */
+		if (!read_tkldb())
+		{
+			char fname[512];
+			snprintf(fname, sizeof(fname), "%s.corrupt", cfg.database);
+			if (rename(cfg.database, fname) == 0)
+				config_warn("[tkldb] Existing database renamed to %s and starting a new one...", fname);
+			else
+				config_warn("[tkldb] Failed to rename database from %s to %s: %s", cfg.database, fname, strerror(errno));
+		}
+		tkls_loaded = 1;
+	}
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, tkldb_configrun);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	EventAdd(modinfo->handle, "tkldb_write_tkldb", write_tkldb_evt, NULL, TKL_DB_SAVE_EVERY*1000, 0);
+	if (ModuleGetError(modinfo->handle) != MODERR_NOERROR)
+	{
+		config_error("A critical error occurred when loading module %s: %s", MOD_HEADER.name, ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	write_tkldb();
+	freecfg();
+	SavePersistentInt(modinfo, tkls_loaded);
+	return MOD_SUCCESS;
+}
+
+void tkldb_moddata_free(ModData *md)
+{
+	if (md->i)
+		md->i = 0;
+}
+
+void setcfg(void)
+{
+	// Default: data/tkl.db
+	safe_strdup(cfg.database, "tkl.db");
+	convert_to_absolute_path(&cfg.database, PERMDATADIR);
+}
+
+void freecfg(void)
+{
+	safe_free(cfg.database);
+}
+
+int tkldb_configtest(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+
+	// We are only interested in set::tkldb::database
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!ce || strcmp(ce->ce_varname, "tkldb"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata) {
+			config_error("%s:%i: blank set::tkldb::%s without value", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "database")) {
+			convert_to_absolute_path(&cep->ce_vardata, PERMDATADIR);
+			continue;
+		}
+		config_error("%s:%i: unknown directive set::tkldb::%s", cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int tkldb_configrun(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	// We are only interested in set::tkldb::database
+	if (type != CONFIG_SET)
+		return 0;
+
+	if (!ce || strcmp(ce->ce_varname, "tkldb"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "database"))
+			safe_strdup(cfg.database, cep->ce_vardata);
+	}
+	return 1;
+}
+
+EVENT(write_tkldb_evt)
+{
+	write_tkldb();
+}
+
+int write_tkldb(void)
+{
+	char tmpfname[512];
+	FILE *fd;
+	uint64_t tklcount;
+	int index, index2;
+	TKL *tkl;
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	// Write to a tempfile first, then rename it if everything succeeded
+	snprintf(tmpfname, sizeof(tmpfname), "%s.tmp", cfg.database);
+	fd = fopen(tmpfname, "wb");
+	if (!fd)
+	{
+		WARN_WRITE_ERROR(tmpfname);
+		return 0;
+	}
+
+	W_SAFE(write_int32(fd, TKL_DB_MAGIC));
+	W_SAFE(write_data(fd, &tkl_db_version, sizeof(tkl_db_version)));
+
+	// Count the *-Lines
+	tklcount = 0;
+
+	// First the ones in the hash table
+	for (index = 0; index < TKLIPHASHLEN1; index++)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+			{
+				if (tkl->flags & TKL_FLAG_CONFIG)
+					continue; /* config entry */
+				tklcount++;
+			}
+		}
+	}
+	// Then the regular *-Lines
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tkl = tklines[index]; tkl; tkl = tkl->next)
+		{
+			if (tkl->flags & TKL_FLAG_CONFIG)
+				continue; /* config entry */
+			tklcount++;
+		}
+	}
+	W_SAFE(write_data(fd, &tklcount, sizeof(tklcount)));
+
+	// Now write the actual *-Lines, first the ones in the hash table
+	for (index = 0; index < TKLIPHASHLEN1; index++)
+	{
+		for (index2 = 0; index2 < TKLIPHASHLEN2; index2++)
+		{
+			for (tkl = tklines_ip_hash[index][index2]; tkl; tkl = tkl->next)
+			{
+				if (tkl->flags & TKL_FLAG_CONFIG)
+					continue; /* config entry */
+				if (!write_tkline(fd, tmpfname, tkl)) // write_tkline() closes the fd on errors itself
+					return 0;
+			}
+		}
+	}
+	// Then the regular *-Lines
+	for (index = 0; index < TKLISTLEN; index++)
+	{
+		for (tkl = tklines[index]; tkl; tkl = tkl->next)
+		{
+			if (tkl->flags & TKL_FLAG_CONFIG)
+				continue; /* config entry */
+			if (!write_tkline(fd, tmpfname, tkl))
+				return 0;
+		}
+	}
+
+	// Everything seems to have gone well, attempt to close and rename the tempfile
+	if (fclose(fd) != 0)
+	{
+		WARN_WRITE_ERROR(tmpfname);
+		return 0;
+	}
+#ifdef _WIN32
+	/* The rename operation cannot be atomic on Windows as it will cause a "file exists" error */
+	unlink(cfg.database);
+#endif
+	if (rename(tmpfname, cfg.database) < 0)
+	{
+		sendto_realops_and_log("[tkldb] Error renaming '%s' to '%s': %s (DATABASE NOT SAVED)", tmpfname, cfg.database, strerror(errno));
+		return 0;
+	}
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	config_status("[tkldb] Benchmark: SAVE DB: %lld microseconds",
+		(long long)(((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec)));
+#endif
+	return 1;
+}
+
+/** Write a TKL entry */
+int write_tkline(FILE *fd, const char *tmpfname, TKL *tkl)
+{
+	char tkltype;
+	char buf[256];
+
+	/* First, write the common attributes */
+	tkltype = tkl_typetochar(tkl->type);
+	W_SAFE(write_data(fd, &tkltype, sizeof(tkltype))); // TKL char
+
+	W_SAFE(write_str(fd, tkl->set_by));
+	W_SAFE(write_int64(fd, tkl->set_at));
+	W_SAFE(write_int64(fd, tkl->expire_at));
+
+	if (TKLIsServerBan(tkl))
+	{
+		char *usermask = tkl->ptr.serverban->usermask;
+		if (tkl->ptr.serverban->subtype & TKL_SUBTYPE_SOFT)
+		{
+			snprintf(buf, sizeof(buf), "%%%s", tkl->ptr.serverban->usermask);
+			usermask = buf;
+		}
+		W_SAFE(write_str(fd, usermask));
+		W_SAFE(write_str(fd, tkl->ptr.serverban->hostmask));
+		W_SAFE(write_str(fd, tkl->ptr.serverban->reason));
+	} else
+	if (TKLIsBanException(tkl))
+	{
+		char *usermask = tkl->ptr.banexception->usermask;
+		if (tkl->ptr.banexception->subtype & TKL_SUBTYPE_SOFT)
+		{
+			snprintf(buf, sizeof(buf), "%%%s", tkl->ptr.banexception->usermask);
+			usermask = buf;
+		}
+		W_SAFE(write_str(fd, usermask));
+		W_SAFE(write_str(fd, tkl->ptr.banexception->hostmask));
+		W_SAFE(write_str(fd, tkl->ptr.banexception->bantypes));
+		W_SAFE(write_str(fd, tkl->ptr.banexception->reason));
+	} else
+	if (TKLIsNameBan(tkl))
+	{
+		char *hold = tkl->ptr.nameban->hold ? "H" : "*";
+		W_SAFE(write_str(fd, hold));
+		W_SAFE(write_str(fd, tkl->ptr.nameban->name));
+		W_SAFE(write_str(fd, tkl->ptr.nameban->reason));
+	} else
+	if (TKLIsSpamfilter(tkl))
+	{
+		char *match_type = unreal_match_method_valtostr(tkl->ptr.spamfilter->match->type);
+		char *target = spamfilter_target_inttostring(tkl->ptr.spamfilter->target);
+		char action = banact_valtochar(tkl->ptr.spamfilter->action);
+
+		W_SAFE(write_str(fd, match_type));
+		W_SAFE(write_str(fd, tkl->ptr.spamfilter->match->str));
+		W_SAFE(write_str(fd, target));
+		W_SAFE(write_data(fd, &action, sizeof(action)));
+		W_SAFE(write_str(fd, tkl->ptr.spamfilter->tkl_reason));
+		W_SAFE(write_int64(fd, tkl->ptr.spamfilter->tkl_duration));
+	}
+
+	return 1;
+}
+
+/** Read all entries from the TKL db */
+int read_tkldb(void)
+{
+	FILE *fd;
+	TKL *tkl = NULL;
+	uint32_t magic = 0;
+	uint64_t cnt;
+	uint64_t tklcount = 0;
+	uint32_t version;
+	int added_cnt = 0;
+	char c;
+	char *str;
+
+#ifdef BENCHMARK
+	struct timeval tv_alpha, tv_beta;
+
+	gettimeofday(&tv_alpha, NULL);
+#endif
+
+	fd = fopen(cfg.database, "rb");
+	if (!fd)
+	{
+		if (errno == ENOENT)
+		{
+			/* Database does not exist. Could be first boot */
+			config_warn("[tkldb] No database present at '%s', will start a new one", cfg.database);
+			return 1;
+		} else {
+			config_warn("[tkldb] Unable to open database file '%s' for reading: %s", cfg.database, strerror(errno));
+			return 0;
+		}
+	}
+
+	/* The database starts with a "magic value" - unless it's some old version or corrupt */
+	R_SAFE(read_data(fd, &magic, sizeof(magic)));
+	if (magic != TKL_DB_MAGIC)
+	{
+		config_warn("[tkldb] Database '%s' uses an old and unsupported format OR is corrupt", cfg.database);
+		config_status("If you are upgrading from UnrealIRCd 4 (or 5.0.0-alpha1) then we suggest you to "
+		              "delete the existing database. Just keep at least 1 server linked during the upgrade "
+		              "process to preserve your global *LINES and Spamfilters.");
+		fclose(fd);
+		return 0;
+	}
+
+	/* Now do a version check */
+	R_SAFE(read_data(fd, &version, sizeof(version)));
+	if (version < 4999)
+	{
+		config_warn("[tkldb] Database '%s' uses an unsupport - possibly old - format (%ld).", cfg.database, (long)version);
+		fclose(fd);
+		return 0;
+	}
+	if (version > tkl_db_version)
+	{
+		config_warn("[tkldb] Database '%s' has version %lu while we only support %lu. Did you just downgrade UnrealIRCd? Sorry this is not suported",
+			cfg.database, (unsigned long)tkl_db_version, (unsigned long)version);
+		fclose(fd);
+		return 0;
+	}
+
+	R_SAFE(read_data(fd, &tklcount, sizeof(tklcount)));
+
+	for (cnt = 0; cnt < tklcount; cnt++)
+	{
+		int do_not_add = 0;
+
+		tkl = safe_alloc(sizeof(TKL));
+
+		/* First, fetch the TKL type.. */
+		R_SAFE(read_data(fd, &c, sizeof(c)));
+		tkl->type = tkl_chartotype(c);
+		if (!tkl->type)
+		{
+			/* We can't continue reading the DB if we don't know the TKL type,
+			 * since we don't know how long the entry will be, we can't skip it.
+			 * This is "impossible" anyway, unless we some day remove a TKL type
+			 * in core UnrealIRCd. In which case we should add some skipping code
+			 * here to gracefully handle that situation ;)
+			 */
+			config_warn("[tkldb] Invalid type '%c' encountered - STOPPED READING DATABASE!", tkl->type);
+			FreeTKLRead();
+			break; /* we MUST stop reading */
+		}
+
+		/* Read the common types (same for all TKLs) */
+		R_SAFE(read_str(fd, &tkl->set_by));
+		R_SAFE(read_int64(fd, &tkl->set_at));
+		R_SAFE(read_int64(fd, &tkl->expire_at));
+
+		/* Save some CPU... if it's already expired then don't bother adding */
+		if (tkl->expire_at != 0 && tkl->expire_at <= TStime())
+			do_not_add = 1;
+
+		/* Now handle all the specific types */
+		if (TKLIsServerBan(tkl))
+		{
+			int softban = 0;
+
+			tkl->ptr.serverban = safe_alloc(sizeof(ServerBan));
+
+			/* Usermask - but taking into account that the
+			 * %-prefix means a soft ban.
+			 */
+			R_SAFE(read_str(fd, &str));
+			if (*str == '%')
+			{
+				softban = 1;
+				safe_strdup(tkl->ptr.serverban->usermask, str+1);
+			} else {
+				safe_strdup(tkl->ptr.serverban->usermask, str);
+			}
+			safe_free(str);
+
+			/* And the other 2 fields.. */
+			R_SAFE(read_str(fd, &tkl->ptr.serverban->hostmask));
+			R_SAFE(read_str(fd, &tkl->ptr.serverban->reason));
+
+			if (find_tkl_serverban(tkl->type, tkl->ptr.serverban->usermask,
+			                       tkl->ptr.serverban->hostmask, softban))
+			{
+				do_not_add = 1;
+			}
+
+			if (!do_not_add)
+			{
+				tkl_add_serverban(tkl->type, tkl->ptr.serverban->usermask,
+				                  tkl->ptr.serverban->hostmask,
+				                  tkl->ptr.serverban->reason,
+				                  tkl->set_by, tkl->expire_at,
+				                  tkl->set_at, softban, 0);
+			}
+		} else
+		if (TKLIsBanException(tkl))
+		{
+			int softban = 0;
+
+			tkl->ptr.banexception = safe_alloc(sizeof(BanException));
+
+			/* Usermask - but taking into account that the
+			 * %-prefix means a soft ban.
+			 */
+			R_SAFE(read_str(fd, &str));
+			if (*str == '%')
+			{
+				softban = 1;
+				safe_strdup(tkl->ptr.banexception->usermask, str+1);
+			} else {
+				safe_strdup(tkl->ptr.banexception->usermask, str);
+			}
+			safe_free(str);
+
+			/* And the other 3 fields.. */
+			R_SAFE(read_str(fd, &tkl->ptr.banexception->hostmask));
+			R_SAFE(read_str(fd, &tkl->ptr.banexception->bantypes));
+			R_SAFE(read_str(fd, &tkl->ptr.banexception->reason));
+
+			if (find_tkl_banexception(tkl->type, tkl->ptr.banexception->usermask,
+			                          tkl->ptr.banexception->hostmask, softban))
+			{
+				do_not_add = 1;
+			}
+
+			if (!do_not_add)
+			{
+				tkl_add_banexception(tkl->type, tkl->ptr.banexception->usermask,
+				                     tkl->ptr.banexception->hostmask,
+				                     tkl->ptr.banexception->reason,
+				                     tkl->set_by, tkl->expire_at,
+				                     tkl->set_at, softban,
+				                     tkl->ptr.banexception->bantypes,
+				                     0);
+			}
+		} else
+		if (TKLIsNameBan(tkl))
+		{
+			tkl->ptr.nameban = safe_alloc(sizeof(NameBan));
+
+			R_SAFE(read_str(fd, &str));
+			if (*str == 'H')
+				tkl->ptr.nameban->hold = 1;
+			safe_free(str);
+			R_SAFE(read_str(fd, &tkl->ptr.nameban->name));
+			R_SAFE(read_str(fd, &tkl->ptr.nameban->reason));
+
+			if (find_tkl_nameban(tkl->type, tkl->ptr.nameban->name,
+			                     tkl->ptr.nameban->hold))
+			{
+				do_not_add = 1;
+			}
+
+			if (!do_not_add)
+			{
+				tkl_add_nameban(tkl->type, tkl->ptr.nameban->name,
+				                tkl->ptr.nameban->hold,
+				                tkl->ptr.nameban->reason,
+				                tkl->set_by, tkl->expire_at,
+				                tkl->set_at, 0);
+			}
+		} else
+		if (TKLIsSpamfilter(tkl))
+		{
+			int match_method;
+			char *err = NULL;
+
+			tkl->ptr.spamfilter = safe_alloc(sizeof(Spamfilter));
+
+			/* Match method */
+			R_SAFE(read_str(fd, &str));
+			match_method = unreal_match_method_strtoval(str);
+			if (!match_method)
+			{
+				config_warn("[tkldb] Unhandled spamfilter match method '%s' -- spamfilter entry not added", str);
+				do_not_add = 1;
+			}
+			safe_free(str);
+
+			/* Match string (eg: regex) */
+			R_SAFE(read_str(fd, &str));
+			tkl->ptr.spamfilter->match = unreal_create_match(match_method, str, &err);
+			if (!tkl->ptr.spamfilter->match)
+			{
+				config_warn("[tkldb] Spamfilter '%s' does not compile: %s -- spamfilter entry not added", str, err);
+				do_not_add = 1;
+			}
+			safe_free(str);
+
+			/* Target (eg: cpn) */
+			R_SAFE(read_str(fd, &str));
+			tkl->ptr.spamfilter->target = spamfilter_gettargets(str, NULL);
+			if (!tkl->ptr.spamfilter->target)
+			{
+				config_warn("[tkldb] Spamfilter '%s' without any valid targets (%s) -- spamfilter entry not added",
+					tkl->ptr.spamfilter->match->str, str);
+				do_not_add = 1;
+			}
+			safe_free(str);
+
+			/* Action */
+			R_SAFE(read_data(fd, &c, sizeof(c)));
+			tkl->ptr.spamfilter->action = banact_chartoval(c);
+			if (!tkl->ptr.spamfilter->action)
+			{
+				config_warn("[tkldb] Spamfilter '%s' without valid action (%c) -- spamfilter entry not added",
+					tkl->ptr.spamfilter->match->str, c);
+				do_not_add = 1;
+			}
+
+			R_SAFE(read_str(fd, &tkl->ptr.spamfilter->tkl_reason));
+			R_SAFE(read_int64(fd, &tkl->ptr.spamfilter->tkl_duration));
+
+			if (find_tkl_spamfilter(tkl->type, tkl->ptr.spamfilter->match->str,
+			                        tkl->ptr.spamfilter->action,
+			                        tkl->ptr.spamfilter->target))
+			{
+				do_not_add = 1;
+			}
+
+			if (!do_not_add)
+			{
+				tkl_add_spamfilter(tkl->type, tkl->ptr.spamfilter->target,
+				                   tkl->ptr.spamfilter->action,
+				                   tkl->ptr.spamfilter->match,
+				                   tkl->set_by, tkl->expire_at, tkl->set_at,
+				                   tkl->ptr.spamfilter->tkl_duration,
+				                   tkl->ptr.spamfilter->tkl_reason,
+				                   0);
+				/* tkl_add_spamfilter() does not copy the match but assign it.
+				 * so set to NULL here to avoid a read-after-free later on.
+				 */
+				tkl->ptr.spamfilter->match = NULL;
+			}
+		} else
+		{
+			config_warn("[tkldb] Unhandled type!! TKLDB is missing support for type %ld -- STOPPED reading db entries!", (long)tkl->type);
+			FreeTKLRead();
+			break; /* we MUST stop reading */
+		}
+
+		if (!do_not_add)
+			added_cnt++;
+
+		FreeTKLRead();
+	}
+
+	/* If everything went fine, then reading a single byte should cause an EOF error */
+	if (fread(&c, 1, 1, fd) == 1)
+		config_warn("[tkldb] Database invalid. Extra data found at end of DB file.");
+	fclose(fd);
+
+	if (added_cnt)
+		sendto_realops_and_log("[tkldb] Re-added %d *-Lines", added_cnt);
+
+#ifdef BENCHMARK
+	gettimeofday(&tv_beta, NULL);
+	ircd_log(LOG_ERROR, "[tkldb] Benchmark: LOAD DB: %lld microseconds",
+		(long long)(((tv_beta.tv_sec - tv_alpha.tv_sec) * 1000000) + (tv_beta.tv_usec - tv_alpha.tv_usec)));
+#endif
+	return 1;
+}
+
diff --git a/src/modules/tls_antidos.c b/src/modules/tls_antidos.c
new file mode 100644
index 0000000..03615cd
--- /dev/null
+++ b/src/modules/tls_antidos.c
@@ -0,0 +1,112 @@
+/*
+ * SSL/TLS Anti DoS module
+ * This protects against SSL renegotiation attacks while still allowing us
+ * to leave renegotiation on with all it's security benefits.
+ *
+ * (C) Copyright 2015- Bram Matthys and the UnrealIRCd team.
+ * 
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"tls_antidos",
+	"5.0",
+	"TLS Renegotiation DoS protection",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+#define HANDSHAKE_LIMIT_COUNT 3
+#define HANDSHAKE_LIMIT_SECS 300
+
+typedef struct SAD SAD;
+struct SAD {
+	Client *client; /**< client */
+	time_t ts; /**< time */
+	int n; /**< number of times */
+};
+
+int tls_antidos_index = 0; /* slot# we acquire from OpenSSL. Hmm.. looks awfully similar to our moddata system ;) */
+
+/* Forward declaration */
+int tls_antidos_handshake(Client *client);
+
+void tls_antidos_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, long argl, void *argp);
+
+MOD_INIT()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_HANDSHAKE, 0, tls_antidos_handshake);
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	ModuleSetOptions(modinfo->handle, MOD_OPT_PERM, 1);
+	/* Note that we cannot be MOD_OPT_PERM_RELOADABLE as we use OpenSSL functions to register
+	 * an index and callback function.
+	 */
+	
+	tls_antidos_index = SSL_get_ex_new_index(0, "tls_antidos", NULL, NULL, tls_antidos_free);
+	
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon handshake (and other events) */
+void ssl_info_callback(const SSL *ssl, int where, int ret)
+{
+	if (where & SSL_CB_HANDSHAKE_START)
+	{
+		SAD *e = SSL_get_ex_data(ssl, tls_antidos_index);
+		Client *client = e->client;
+		
+		if (IsServer(client) || IsDeadSocket(client))
+			return; /* if it's a server, or already pending to be killed off then we don't care */
+
+		if (e->ts < TStime() - HANDSHAKE_LIMIT_SECS)
+		{
+			e->ts = TStime();
+			e->n = 1;
+		} else {
+			e->n++;
+			if (e->n >= HANDSHAKE_LIMIT_COUNT)
+			{
+				ircd_log(LOG_ERROR, "TLS Handshake flood detected from %s -- killed", get_client_name(client, TRUE));
+				sendto_realops("TLS Handshake flood detected from %s -- killed", get_client_name(client, TRUE));
+				dead_socket(client, "TLS Handshake flood detected");
+			}
+		}
+	}
+}
+
+/** Called when a client has just connected to us.
+ * This function is called quite quickly after accept(),
+ * in any case very likely before any data has been received.
+ */
+int tls_antidos_handshake(Client *client)
+{
+	if (client->local->ssl)
+	{
+		SAD *sad = safe_alloc(sizeof(SAD));
+		sad->client = client;
+		SSL_set_info_callback(client->local->ssl, ssl_info_callback);
+		SSL_set_ex_data(client->local->ssl, tls_antidos_index, sad);
+	}
+	return 0;
+}
+
+/** Called by OpenSSL when the SSL structure is freed (so we can free up our custom struct too) */
+void tls_antidos_free(void *parent, void *ptr, CRYPTO_EX_DATA *ad, int idx, long argl, void *argp)
+{
+	safe_free(ptr);
+}
diff --git a/src/modules/topic.c b/src/modules/topic.c
new file mode 100644
index 0000000..2aa1708
--- /dev/null
+++ b/src/modules/topic.c
@@ -0,0 +1,281 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/topic.c
+ *   (C) 2004-present The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_topic);
+
+#define MSG_TOPIC 	"TOPIC"
+
+ModuleHeader MOD_HEADER
+  = {
+	"topic",
+	"5.0",
+	"command /topic", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_TOPIC, cmd_topic, 4, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+void topicoverride(Client *client, Channel *channel, char *topic)
+{
+	sendto_snomask(SNO_EYES,
+	    "*** OperOverride -- %s (%s@%s) TOPIC %s \'%s\'",
+	    client->name, client->user->username, client->user->realhost,
+	    channel->chname, topic);
+
+	/* Logging implementation added by XeRXeS */
+	ircd_log(LOG_OVERRIDE, "OVERRIDE: %s (%s@%s) TOPIC %s \'%s\'",
+		client->name, client->user->username, client->user->realhost,
+		channel->chname, topic);
+}
+
+/** Query or change the channel topic.
+ *
+ * Syntax for clients:
+ * parv[1] = channel
+ * parv[2] = new topic
+ *
+ * Syntax for server to server traffic:
+ * parv[1] = channel name
+ * parv[2] = topic nickname
+ * parv[3] = topic time
+ * parv[4] = topic text
+ */
+CMD_FUNC(cmd_topic)
+{
+	Channel *channel = NULL;
+	char *topic = NULL, *name, *tnick = client->name;
+	char *errmsg = NULL;
+	time_t ttime = 0;
+	int i = 0;
+	Hook *h;
+	int ismember; /* cache: IsMember() */
+	long flags = 0; /* cache: membership flags */
+	MessageTag *mtags = NULL;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "TOPIC");
+		return;
+	}
+
+	name = parv[1];
+
+	channel = find_channel(parv[1], NULL);
+	if (!channel)
+	{
+		sendnumeric(client, ERR_NOSUCHCHANNEL, name);
+		return;
+	}
+
+	ismember = IsMember(client, channel); /* CACHE */
+	if (ismember)
+		flags = get_access(client, channel); /* CACHE */
+
+	if (parc > 2 || SecretChannel(channel))
+	{
+		if (!ismember && !IsServer(client)
+		    && !ValidatePermissionsForPath("channel:see:list:secret",client,NULL,channel,NULL) && !IsULine(client))
+		{
+			sendnumeric(client, ERR_NOTONCHANNEL, name);
+			return;
+		}
+		if (parc > 2)
+			topic = parv[2];
+	}
+	if (parc > 4)
+	{
+		tnick = parv[2];
+		ttime = atol(parv[3]);
+		topic = parv[4];
+	}
+
+	/* Only asking for the topic */
+	if (!topic)
+	{
+		if (IsServer(client))
+			return; /* Servers must maintain state, not ask */
+
+		for (h = Hooks[HOOKTYPE_VIEW_TOPIC_OUTSIDE_CHANNEL]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(client,channel);
+			if (i != HOOK_CONTINUE)
+				break;
+		}
+
+		/* If you're not a member, and you can't view outside channel, deny */
+		if ((!ismember && i == HOOK_DENY) ||
+		    (is_banned(client,channel,BANCHK_JOIN,NULL,NULL) &&
+		     !ValidatePermissionsForPath("channel:see:topic",client,NULL,channel,NULL)))
+		{
+			sendnumeric(client, ERR_NOTONCHANNEL, name);
+			return;
+		}
+
+		if (!channel->topic)
+			sendnumeric(client, RPL_NOTOPIC, channel->chname);
+		else
+		{
+			sendnumeric(client, RPL_TOPIC,
+			    channel->chname, channel->topic);
+			sendnumeric(client, RPL_TOPICWHOTIME, channel->chname,
+			    channel->topic_nick, channel->topic_time);
+		}
+		return;
+	}
+
+	if (ttime && topic && (IsServer(client) || IsULine(client)))
+	{
+		if (!channel->topic_time || ttime > channel->topic_time || IsULine(client))
+		/* The IsUline is to allow services to use an old TS. Apparently
+		 * some services do this in their topic enforcement -- codemastr 
+		 */
+		{
+			/* Set the topic */
+			safe_strldup(channel->topic, topic, iConf.topic_length+1);
+			safe_strldup(channel->topic_nick, tnick, NICKLEN+USERLEN+HOSTLEN+5);
+			channel->topic_time = ttime;
+
+			new_message(client, recv_mtags, &mtags);
+			RunHook4(HOOKTYPE_TOPIC, client, channel, mtags, topic);
+			sendto_server(client, 0, 0, mtags, ":%s TOPIC %s %s %lld :%s",
+			    client->id, channel->chname, channel->topic_nick,
+			    (long long)channel->topic_time, channel->topic);
+			sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+				       ":%s TOPIC %s :%s",
+				       client->name, channel->chname, channel->topic);
+			free_message_tags(mtags);
+		}
+		return;
+	}
+
+	/* Topic change. Either locally (check permissions!) or remote, check permissions: */
+	if (IsUser(client))
+	{
+		char *newtopic = NULL;
+
+		/* +t and not +hoaq ? */
+		if ((channel->mode.mode & MODE_TOPICLIMIT) &&
+		    !is_skochanop(client, channel) && !IsULine(client) && !IsServer(client))
+		{
+			if (MyUser(client) && !ValidatePermissionsForPath("channel:override:topic", client, NULL, channel, NULL))
+			{
+				sendnumeric(client, ERR_CHANOPRIVSNEEDED, channel->chname);
+				return;
+			}
+			topicoverride(client, channel, topic);
+		}
+
+		/* -t and banned? */
+		newtopic = topic;
+		if (!(channel->mode.mode & MODE_TOPICLIMIT) &&
+		    !is_skochanop(client, channel) && is_banned(client, channel, BANCHK_MSG, &newtopic, &errmsg))
+		{
+			char buf[512];
+
+			if (MyUser(client) && !ValidatePermissionsForPath("channel:override:topic", client, NULL, channel, NULL))
+			{
+				ircsnprintf(buf, sizeof(buf), "You cannot change the topic on %s while being banned", channel->chname);
+				sendnumeric(client, ERR_CANNOTDOCOMMAND, "TOPIC",  buf);
+				return;
+			}
+			topicoverride(client, channel, topic);
+		}
+		if (MyUser(client) && newtopic)
+			topic = newtopic; /* process is_banned() changes of topic (eg: text replacement), but only for local clients */
+
+		/* -t, +m, and not +vhoaq */
+		if (((flags&CHFL_OVERLAP) == 0) && (channel->mode.mode & MODE_MODERATED))
+		{
+			char buf[512];
+
+			if (MyUser(client) && ValidatePermissionsForPath("channel:override:topic", client, NULL, channel, NULL))
+			{
+				topicoverride(client, channel, topic);
+			} else {
+				/* With +m and -t, only voice and higher may change the topic */
+				ircsnprintf(buf, sizeof(buf), "Voice (+v) or higher is required in order to change the topic on %s (channel is +m)", channel->chname);
+				sendnumeric(client, ERR_CANNOTDOCOMMAND, "TOPIC",  buf);
+				return;
+			}
+		}
+
+		/* For local users, run spamfilters and hooks.. */
+		if (MyUser(client))
+		{
+			Hook *tmphook;
+			int n;
+
+			if (match_spamfilter(client, topic, SPAMF_TOPIC, channel->chname, 0, NULL))
+				return;
+
+			for (tmphook = Hooks[HOOKTYPE_PRE_LOCAL_TOPIC]; tmphook; tmphook = tmphook->next) {
+				topic = (*(tmphook->func.pcharfunc))(client, channel, topic);
+				if (!topic)
+					return;
+			}
+		}
+
+		/* At this point 'tnick' is set to client->name.
+		 * If set::topic-setter nick-user-host; is set
+		 * then we update it here to nick!user@host.
+		 */
+		if (iConf.topic_setter == SETTER_NICK_USER_HOST)
+			tnick = make_nick_user_host(client->name, client->user->username, GetHost(client));
+	}
+
+	/* Set the topic */
+	safe_strldup(channel->topic, topic, iConf.topic_length+1);
+	safe_strldup(channel->topic_nick, tnick, NICKLEN+USERLEN+HOSTLEN+5);
+
+	if (ttime && !MyUser(client))
+		channel->topic_time = ttime;
+	else
+		channel->topic_time = TStime();
+
+	new_message(client, recv_mtags, &mtags);
+	RunHook4(HOOKTYPE_TOPIC, client, channel, mtags, topic);
+	sendto_server(client, 0, 0, mtags, ":%s TOPIC %s %s %lld :%s",
+	    client->id, channel->chname, channel->topic_nick,
+	    (long long)channel->topic_time, channel->topic);
+	sendto_channel(channel, client, NULL, 0, 0, SEND_LOCAL, mtags,
+		       ":%s TOPIC %s :%s",
+		       client->name, channel->chname, channel->topic);
+	free_message_tags(mtags);
+}
diff --git a/src/modules/trace.c b/src/modules/trace.c
new file mode 100644
index 0000000..8d88d11
--- /dev/null
+++ b/src/modules/trace.c
@@ -0,0 +1,234 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/trace.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_trace);
+
+#define MSG_TRACE 	"TRACE"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"trace",
+	"5.0",
+	"command /trace", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_TRACE, cmd_trace, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_trace
+**	parv[1] = servername
+*/
+CMD_FUNC(cmd_trace)
+{
+	int  i;
+	Client *acptr;
+	ConfigItem_class *cltmp;
+	char *tname;
+	int  doall, link_s[MAXCONNECTIONS], link_u[MAXCONNECTIONS];
+	int  cnt = 0, wilds, dow;
+	time_t now;
+
+	/* This is one of the (few) commands that cannot be handled
+	 * by labeled-response because responses from multiple servers
+	 * are involved.
+	 */
+	labeled_response_inhibit = 1;
+
+	if (parc > 2)
+		if (hunt_server(client, NULL, ":%s TRACE %s :%s", 2, parc, parv))
+			return;
+
+	if (parc > 1)
+		tname = parv[1];
+	else
+		tname = me.name;
+
+	if (!ValidatePermissionsForPath("client:see:trace:global",client,NULL,NULL,NULL))
+	{
+		if (ValidatePermissionsForPath("client:see:trace:local",client,NULL,NULL,NULL))
+		{
+			/* local opers may not /TRACE remote servers! */
+			if (strcasecmp(tname, me.name))
+			{
+				sendnotice(client, "You can only /TRACE local servers as a locop");
+				sendnumeric(client, ERR_NOPRIVILEGES);
+				return;
+			}
+		} else {
+			sendnumeric(client, ERR_NOPRIVILEGES);
+			return;
+		}
+	}
+
+	switch (hunt_server(client, NULL, ":%s TRACE :%s", 1, parc, parv))
+	{
+	  case HUNTED_PASS:	/* note: gets here only if parv[1] exists */
+	  {
+		  Client *ac2ptr;
+
+		  ac2ptr = find_client(tname, NULL);
+		  sendnumeric(client, RPL_TRACELINK,
+		      version, debugmode, tname, ac2ptr->direction->name);
+		  return;
+	  }
+	  case HUNTED_ISME:
+		  break;
+	  default:
+		  return;
+	}
+
+	doall = (parv[1] && (parc > 1)) ? match_simple(tname, me.name) : TRUE;
+	wilds = !parv[1] || strchr(tname, '*') || strchr(tname, '?');
+	dow = wilds || doall;
+
+	for (i = 0; i < MAXCONNECTIONS; i++)
+		link_s[i] = 0, link_u[i] = 0;
+
+
+	if (doall) {
+		list_for_each_entry(acptr, &client_list, client_node)
+		{
+			if (acptr->direction->local->fd < 0)
+				continue;
+			if (IsUser(acptr))
+				link_u[acptr->direction->local->fd]++;
+			else if (IsServer(acptr))
+				link_s[acptr->direction->local->fd]++;
+		}
+	}
+
+	/* report all direct connections */
+
+	now = TStime();
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		char *name;
+		char *class;
+
+		if (!ValidatePermissionsForPath("client:see:trace:invisible-users",client,acptr,NULL,NULL) && (acptr != client))
+			continue;
+		if (!doall && wilds && !match_simple(tname, acptr->name))
+			continue;
+		if (!dow && mycmp(tname, acptr->name))
+			continue;
+		name = get_client_name(acptr, FALSE);
+		class = acptr->local->class ? acptr->local->class->name : "default";
+		switch (acptr->status)
+		{
+			case CLIENT_STATUS_CONNECTING:
+				sendnumeric(client, RPL_TRACECONNECTING, class, name);
+				cnt++;
+				break;
+
+			case CLIENT_STATUS_HANDSHAKE:
+				sendnumeric(client, RPL_TRACEHANDSHAKE, class, name);
+				cnt++;
+				break;
+
+			case CLIENT_STATUS_ME:
+				break;
+
+			case CLIENT_STATUS_UNKNOWN:
+				sendnumeric(client, RPL_TRACEUNKNOWN, class, name);
+				cnt++;
+				break;
+
+			case CLIENT_STATUS_USER:
+				/* Only opers see users if there is a wildcard
+				 * but anyone can see all the opers.
+				 */
+				if (ValidatePermissionsForPath("client:see:trace:invisible-users",client,acptr,NULL,NULL) ||
+				    (!IsInvisible(acptr) && ValidatePermissionsForPath("client:see:trace",client,acptr,NULL,NULL)))
+				{
+					if (ValidatePermissionsForPath("client:see:trace",client,acptr,NULL,NULL) || ValidatePermissionsForPath("client:see:trace:invisible-users",client,acptr,NULL,NULL))
+						sendnumeric(client, RPL_TRACEOPERATOR,
+						    class, acptr->name,
+						    GetHost(acptr),
+						    now - acptr->local->lasttime);
+					else
+						sendnumeric(client, RPL_TRACEUSER,
+						    class, acptr->name,
+						    acptr->user->realhost,
+						    now - acptr->local->lasttime);
+					cnt++;
+				}
+				break;
+
+			case CLIENT_STATUS_SERVER:
+				sendnumeric(client, RPL_TRACESERVER, class, acptr->local->fd >= 0 ? link_s[acptr->local->fd] : -1,
+				    acptr->local->fd >= 0 ? link_u[acptr->local->fd] : -1, name, *(acptr->serv->by) ?
+				    acptr->serv->by : "*", "*", me.name,
+				    now - acptr->local->lasttime);
+				cnt++;
+				break;
+
+			case CLIENT_STATUS_LOG:
+				sendnumeric(client, RPL_TRACELOG, LOGFILE, acptr->local->port);
+				cnt++;
+				break;
+
+			case CLIENT_STATUS_TLS_CONNECT_HANDSHAKE:
+				sendnumeric(client, RPL_TRACENEWTYPE, "TLS-Connect-Handshake", name);
+				cnt++;
+				break;
+
+			case CLIENT_STATUS_TLS_ACCEPT_HANDSHAKE:
+				sendnumeric(client, RPL_TRACENEWTYPE, "TLS-Accept-Handshake", name);
+				cnt++;
+				break;
+
+			default:	/* ...we actually shouldn't come here... --msa */
+				sendnumeric(client, RPL_TRACENEWTYPE, "<newtype>", name);
+				cnt++;
+				break;
+		}
+	}
+	/*
+	 * Add these lines to summarize the above which can get rather long
+	 * and messy when done remotely - Avalon
+	 */
+	if (!ValidatePermissionsForPath("client:see:trace",client,acptr,NULL,NULL) || !cnt)
+		return;
+
+	for (cltmp = conf_class; doall && cltmp; cltmp = cltmp->next)
+	/*	if (cltmp->clients > 0) */
+			sendnumeric(client, RPL_TRACECLASS, cltmp->name ? cltmp->name : "[noname]", cltmp->clients);
+}
diff --git a/src/modules/tsctl.c b/src/modules/tsctl.c
new file mode 100644
index 0000000..aa8d9e8
--- /dev/null
+++ b/src/modules/tsctl.c
@@ -0,0 +1,72 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/tsctl.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"tsctl",	/* Name of module */
+	"5.0", /* Version */
+	"command /tsctl", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+CMD_FUNC(cmd_tsctl);
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, "TSCTL", cmd_tsctl, MAXPARA, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+CMD_FUNC(cmd_tsctl)
+{
+	if (!ValidatePermissionsForPath("server:tsctl:view",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (MyUser(client) && (!parv[1] || strcasecmp(parv[1], "alltime")))
+	{
+		sendnotice(client, "/TSCTL now shows the time on all servers. You can no longer modify the time.");
+		parv[1] = "alltime";
+	}
+
+	if (parv[1] && !strcasecmp(parv[1], "alltime"))
+	{
+		sendnotice(client, "*** Server=%s TStime=%lld",
+			me.name, (long long)TStime());
+		sendto_server(client, 0, 0, NULL, ":%s TSCTL alltime", client->id);
+		return;
+	}
+}
diff --git a/src/modules/umode2.c b/src/modules/umode2.c
new file mode 100644
index 0000000..8deb930
--- /dev/null
+++ b/src/modules/umode2.c
@@ -0,0 +1,74 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/umode2.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_umode2);
+
+#define MSG_UMODE2 	"UMODE2"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"umode2",
+	"5.0",
+	"command /umode2", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_UMODE2, cmd_umode2, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+    cmd_umode2 added by Stskeeps
+    parv[1] - modes to change
+    Small wrapper to save bandwidth
+*/
+
+CMD_FUNC(cmd_umode2)
+{
+	char *xparv[5] = {
+		client->name,
+		client->name,
+		parv[1],
+		(parc > 3) ? parv[3] : NULL,
+		NULL
+	};
+
+	if (!parv[1])
+		return;
+	cmd_umode(client, recv_mtags, (parc > 3) ? 4 : 3, xparv);
+}
diff --git a/src/modules/unsqline.c b/src/modules/unsqline.c
new file mode 100644
index 0000000..1c07c6a
--- /dev/null
+++ b/src/modules/unsqline.c
@@ -0,0 +1,74 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/unsqline.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_unsqline);
+
+#define MSG_UNSQLINE    "UNSQLINE"      /* UNSQLINE */
+
+ModuleHeader MOD_HEADER
+  = {
+	"unsqline",	/* Name of module */
+	"5.0", /* Version */
+	"command /unsqline", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_UNSQLINE, cmd_unsqline, MAXPARA, CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* cmd_unsqline
+**	parv[1] = nickmask
+*/
+CMD_FUNC(cmd_unsqline)
+{
+	char *tkllayer[6] = {
+		me.name,           /*0  server.name */
+		"-",               /*1  - */
+		"Q",               /*2  Q   */
+		"*",               /*3  unused */
+		parv[1],           /*4  host */
+		client->name         /*5  whoremoved */
+	};
+
+	if (parc < 2)
+		return;
+
+	cmd_tkl(&me, NULL, 6, tkllayer);
+}
diff --git a/src/modules/user.c b/src/modules/user.c
new file mode 100644
index 0000000..ccc3980
--- /dev/null
+++ b/src/modules/user.c
@@ -0,0 +1,115 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/user.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_user);
+
+#define MSG_USER 	"USER"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"user",
+	"5.0",
+	"command /user", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_USER, cmd_user, 4, CMD_UNREGISTERED);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** The USER command, together with NICK this will register a user.
+ * As per UnrealIRCd 5 this command is only available to local clients.
+ * Intraserver traffic is handled through the UID command.
+ *	parv[1] = username
+ *	parv[2] = client host name (ignored)
+ *	parv[3] = server host name (ignored)
+ *	parv[4] = real name / gecos
+ *
+ * NOTE: Be advised that multiple USER messages are possible,
+ *       hence, always check if a certain struct is already allocated... -- Syzop
+ */
+CMD_FUNC(cmd_user)
+{
+	char *username;
+	char *realname;
+
+	if (!MyConnect(client) || IsServer(client))
+		return;
+
+	if (MyConnect(client) && (client->local->listener->options & LISTENER_SERVERSONLY))
+	{
+		exit_client(client, NULL, "This port is for servers only");
+		return;
+	}
+
+	if ((parc < 5) || BadPtr(parv[4]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "USER");
+		return;
+	}
+
+	/* This cuts the username off at @, uh okay.. */
+	if ((username = strchr(parv[1], '@')))
+		*username = '\0';
+
+	username = parv[1];
+	realname = parv[4];
+	
+	if (strlen(username) > USERLEN)
+		username[USERLEN] = '\0'; /* cut-off */
+
+	make_user(client);
+
+	/* set::modes-on-connect */
+	client->umodes |= CONN_MODES;
+	client->user->server = me_hash;
+	strlcpy(client->info, realname, sizeof(client->info));
+	strlcpy(client->user->username, username, USERLEN + 1);
+
+	if (*client->name && is_handshake_finished(client))
+	{
+		/* NICK and no-spoof already received, now we have USER... */
+		if (USE_BAN_VERSION && MyConnect(client))
+		{
+			sendto_one(client, NULL, ":IRC!IRC@%s PRIVMSG %s :\1VERSION\1",
+				me.name, client->name);
+		}
+		register_user(client, client->name, username, NULL, NULL, NULL);
+		return;
+	}
+}
diff --git a/src/modules/userhost-tag.c b/src/modules/userhost-tag.c
new file mode 100644
index 0000000..864775c
--- /dev/null
+++ b/src/modules/userhost-tag.c
@@ -0,0 +1,111 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/userhost-tag.c
+ *   (C) 2020 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"userhost-tag",
+	"5.0",
+	"userhost message tag",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Variables */
+long CAP_ACCOUNT_TAG = 0L;
+
+int userhost_mtag_is_ok(Client *client, char *name, char *value);
+int userhost_mtag_can_send(Client *target);
+void mtag_add_userhost(Client *client, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature);
+
+MOD_INIT()
+{
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "unrealircd.org/userhost";
+	mtag.is_ok = userhost_mtag_is_ok;
+	mtag.can_send = userhost_mtag_can_send;
+	mtag.flags = MTAG_HANDLER_FLAGS_NO_CAP_NEEDED;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	HookAddVoid(modinfo->handle, HOOKTYPE_NEW_MESSAGE, 0, mtag_add_userhost);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This function verifies if the client sending
+ * 'userhost-tag' is permitted to do so and uses a permitted
+ * syntax.
+ * We simply allow userhost-tag ONLY from servers and with any syntax.
+ */
+int userhost_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (IsServer(client))
+		return 1;
+
+	return 0;
+}
+
+void mtag_add_userhost(Client *client, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature)
+{
+	MessageTag *m;
+
+	if (IsUser(client))
+	{
+		MessageTag *m = find_mtag(recv_mtags, "unrealircd.org/userhost");
+		if (m)
+		{
+			m = duplicate_mtag(m);
+		} else {
+			char nuh[USERLEN+HOSTLEN+1];
+
+			snprintf(nuh, sizeof(nuh), "%s@%s", client->user->username, client->user->realhost);
+
+			m = safe_alloc(sizeof(MessageTag));
+			safe_strdup(m->name, "unrealircd.org/userhost");
+			safe_strdup(m->value, nuh);
+		}
+		AddListItem(m, *mtag_list);
+	}
+}
+
+/** Outgoing filter for this message tag */
+int userhost_mtag_can_send(Client *target)
+{
+	if (IsServer(target) || IsOper(target))
+		return 1;
+	return 0;
+}
diff --git a/src/modules/userhost.c b/src/modules/userhost.c
new file mode 100644
index 0000000..4352c5d
--- /dev/null
+++ b/src/modules/userhost.c
@@ -0,0 +1,113 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/userhost.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_userhost);
+
+#define MSG_USERHOST 	"USERHOST"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"userhost",
+	"5.0",
+	"command /userhost", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_USERHOST, cmd_userhost, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * cmd_userhost added by Darren Reed 13/8/91 to aid clients and reduce
+ * the need for complicated requests like WHOIS. It returns user/host
+ * information only (no spurious AWAY labels or channels).
+ * Re-written by Dianora 1999
+ */
+/* Keep this at 5!!!! */
+#define MAXUSERHOSTREPLIES 5
+CMD_FUNC(cmd_userhost)
+{
+	char *p;		/* scratch end pointer */
+	char *cn;		/* current name */
+	Client *acptr;
+	char response[MAXUSERHOSTREPLIES][NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30];
+	int i;			/* loop counter */
+	int w;
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "USERHOST");
+		return;
+	}
+
+	/* The idea is to build up the response string out of pieces
+	 * none of this strlen() nonsense.
+	 * MAXUSERHOSTREPLIES * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf)
+	 * and our ircsnprintf() truncates it to fit anyway. There is
+	 * no danger of an overflow here. -Dianora
+	 */
+	response[0][0] = response[1][0] = response[2][0] = response[3][0] = response[4][0] = '\0';
+
+	cn = parv[1];
+
+	for (w = 0, i = 0; (i < MAXUSERHOSTREPLIES) && cn; i++)
+	{
+		if ((p = strchr(cn, ' ')))
+			*p = '\0';
+
+		if ((acptr = find_person(cn, NULL)))
+		{
+			ircsnprintf(response[w], NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30,
+                            "%s%s=%c%s@%s",
+			    acptr->name,
+			    (IsOper(acptr) && (!IsHideOper(acptr) || client == acptr || IsOper(client)))
+				? "*" : "",
+			    (acptr->user->away) ? '-' : '+',
+			    acptr->user->username,
+			    ((acptr != client) && !IsOper(client)
+			    && IsHidden(acptr) ? acptr->user->virthost :
+			    acptr->user->realhost));
+			w++;
+		}
+		if (p)
+			p++;
+		cn = p;
+	}
+
+	sendnumeric(client, RPL_USERHOST, response[0], response[1], response[2], response[3], response[4]);
+}
diff --git a/src/modules/userip-tag.c b/src/modules/userip-tag.c
new file mode 100644
index 0000000..cb7d20a
--- /dev/null
+++ b/src/modules/userip-tag.c
@@ -0,0 +1,111 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/userip-tag.c
+ *   (C) 2020 Syzop & The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+  = {
+	"userip-tag",
+	"5.0",
+	"userip message tag",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+	};
+
+/* Variables */
+long CAP_ACCOUNT_TAG = 0L;
+
+int userip_mtag_is_ok(Client *client, char *name, char *value);
+int userip_mtag_can_send(Client *target);
+void mtag_add_userip(Client *client, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature);
+
+MOD_INIT()
+{
+	MessageTagHandlerInfo mtag;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	memset(&mtag, 0, sizeof(mtag));
+	mtag.name = "unrealircd.org/userip";
+	mtag.is_ok = userip_mtag_is_ok;
+	mtag.can_send = userip_mtag_can_send;
+	mtag.flags = MTAG_HANDLER_FLAGS_NO_CAP_NEEDED;
+	MessageTagHandlerAdd(modinfo->handle, &mtag);
+
+	HookAddVoid(modinfo->handle, HOOKTYPE_NEW_MESSAGE, 0, mtag_add_userip);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** This function verifies if the client sending
+ * 'userip-tag' is permitted to do so and uses a permitted
+ * syntax.
+ * We simply allow userip-tag ONLY from servers and with any syntax.
+ */
+int userip_mtag_is_ok(Client *client, char *name, char *value)
+{
+	if (IsServer(client))
+		return 1;
+
+	return 0;
+}
+
+void mtag_add_userip(Client *client, MessageTag *recv_mtags, MessageTag **mtag_list, char *signature)
+{
+	MessageTag *m;
+
+	if (IsUser(client) && client->ip)
+	{
+		MessageTag *m = find_mtag(recv_mtags, "unrealircd.org/userip");
+		if (m)
+		{
+			m = duplicate_mtag(m);
+		} else {
+			char nuh[USERLEN+HOSTLEN+1];
+
+			snprintf(nuh, sizeof(nuh), "%s@%s", client->user->username, GetIP(client));
+
+			m = safe_alloc(sizeof(MessageTag));
+			safe_strdup(m->name, "unrealircd.org/userip");
+			safe_strdup(m->value, nuh);
+		}
+		AddListItem(m, *mtag_list);
+	}
+}
+
+/** Outgoing filter for this message tag */
+int userip_mtag_can_send(Client *target)
+{
+	if (IsServer(target) || IsOper(target))
+		return 1;
+	return 0;
+}
diff --git a/src/modules/userip.c b/src/modules/userip.c
new file mode 100644
index 0000000..7802184
--- /dev/null
+++ b/src/modules/userip.c
@@ -0,0 +1,125 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/userip.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_userip);
+
+#define MSG_USERIP 	"USERIP"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"userip",
+	"5.0",
+	"command /userip", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_USERIP, cmd_userip, 1, CMD_USER);
+	ISupportAdd(modinfo->handle, "USERIP", NULL);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * cmd_userip is based on cmd_userhost
+ * cmd_userhost added by Darren Reed 13/8/91 to aid clients and reduce
+ * the need for complicated requests like WHOIS. It returns user/host
+ * information only (no spurious AWAY labels or channels).
+ * Re-written by Dianora 1999
+ */
+/* Keep this at 5!!!! */
+#define MAXUSERHOSTREPLIES 5
+CMD_FUNC(cmd_userip)
+{
+
+	char *p;		/* scratch end pointer */
+	char *cn;		/* current name */
+	char *ip, ipbuf[HOSTLEN+1];
+	Client *acptr;
+	char response[MAXUSERHOSTREPLIES][NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30];
+	int  i;			/* loop counter */
+	int w;
+
+	if (!MyUser(client))
+		return;
+		
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "USERIP");
+		return;
+	}
+
+	/* The idea is to build up the response string out of pieces
+	 * none of this strlen() nonsense.
+	 * MAXUSERHOSTREPLIES * (NICKLEN*2+CHANNELLEN+USERLEN+HOSTLEN+30) is still << sizeof(buf)
+	 * and our ircsnprintf() truncates it to fit anyway. There is
+	 * no danger of an overflow here. -Dianora
+	 */
+	response[0][0] = response[1][0] = response[2][0] =
+	    response[3][0] = response[4][0] = '\0';
+
+	cn = parv[1];
+
+	for (w = 0, i = 0; (i < MAXUSERHOSTREPLIES) && cn; i++)
+	{
+		if ((p = strchr(cn, ' ')))
+			*p = '\0';
+
+		if ((acptr = find_person(cn, NULL)))
+		{
+			if (!(ip = GetIP(acptr)))
+				ip = "<unknown>";
+			if (client != acptr && !ValidatePermissionsForPath("client:see:ip",client,acptr,NULL,NULL) && IsHidden(acptr))
+			{
+				make_cloakedhost(acptr, GetIP(acptr), ipbuf, sizeof(ipbuf));
+				ip = ipbuf;
+			}
+
+			ircsnprintf(response[w], NICKLEN * 2 + CHANNELLEN + USERLEN + HOSTLEN + 30, "%s%s=%c%s@%s",
+			    acptr->name,
+			    (IsOper(acptr) && (!IsHideOper(acptr) || client == acptr || IsOper(client)))
+				? "*" : "",
+			    (acptr->user->away) ? '-' : '+',
+			    acptr->user->username, ip);
+			w++;
+		}
+		if (p)
+			p++;
+		cn = p;
+	}
+
+	sendnumeric(client, RPL_USERIP, response[0], response[1], response[2], response[3], response[4]);
+}
diff --git a/src/modules/usermodes/Makefile.in b/src/modules/usermodes/Makefile.in
new file mode 100644
index 0000000..68c7dae
--- /dev/null
+++ b/src/modules/usermodes/Makefile.in
@@ -0,0 +1,91 @@
+#************************************************************************
+#*   IRC - Internet Relay Chat, src/modules/usermodes/Makefile
+#*   Copyright (C) The UnrealIRCd team
+#*
+#*   This program is free software; you can redistribute it and/or modify
+#*   it under the terms of the GNU General Public License as published by
+#*   the Free Software Foundation; either version 1, or (at your option)
+#*   any later version.
+#*
+#*   This program is distributed in the hope that it will be useful,
+#*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#*   GNU General Public License for more details.
+#*
+#*   You should have received a copy of the GNU General Public License
+#*   along with this program; if not, write to the Free Software
+#*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#*/
+
+CC = "==== DO NOT RUN MAKE FROM THIS DIRECTORY ===="
+
+INCLUDES = ../../include/channel.h \
+	../../include/common.h ../../include/config.h ../../include/dbuf.h \
+	../../include/dynconf.h ../../include/fdlist.h ../../include/h.h \
+	../../include/ircsprintf.h \
+	../../include/license.h \
+	../../include/modules.h ../../include/modversion.h ../../include/msg.h \
+	../../include/numeric.h ../../include/proto.h ../../include/dns.h \
+	../../include/resource.h ../../include/setup.h \
+	../../include/struct.h ../../include/sys.h \
+	../../include/types.h ../../include/url.h \
+	../../include/version.h ../../include/whowas.h
+
+R_MODULES=\
+	noctcp.so censor.so bot.so showwhois.so nokick.so servicebot.so \
+	privacy.so regonlymsg.so secureonlymsg.so privdeaf.so
+
+MODULES=$(R_MODULES)
+MODULEFLAGS=@MODULEFLAGS@
+RM=@RM@
+
+all: build
+
+build: $(MODULES)
+
+clean:
+	$(RM) -f *.o *.so *~ core
+
+#############################################################################
+#             .so's section
+#############################################################################
+
+noctcp.so: noctcp.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o noctcp.so noctcp.c
+
+censor.so: censor.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o censor.so censor.c
+
+bot.so: bot.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o bot.so bot.c
+
+showwhois.so: showwhois.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o showwhois.so showwhois.c
+
+nokick.so: nokick.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o nokick.so nokick.c
+
+servicebot.so: servicebot.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o servicebot.so servicebot.c
+
+privacy.so: privacy.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o privacy.so privacy.c
+
+regonlymsg.so: regonlymsg.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o regonlymsg.so regonlymsg.c
+
+secureonlymsg.so: secureonlymsg.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o secureonlymsg.so secureonlymsg.c
+
+privdeaf.so: privdeaf.c $(INCLUDES)
+	$(CC) $(CFLAGS) $(MODULEFLAGS) -DDYNAMIC_LINKING \
+		-o privdeaf.so privdeaf.c
diff --git a/src/modules/usermodes/bot.c b/src/modules/usermodes/bot.c
new file mode 100644
index 0000000..4cb9779
--- /dev/null
+++ b/src/modules/usermodes/bot.c
@@ -0,0 +1,97 @@
+/*
+ * Bot user mode (User mode +B)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsBot(cptr)    (cptr->umodes & UMODE_BOT)
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/bot",
+	"4.2",
+	"User Mode +B",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_BOT = 0L;
+
+/* Forward declarations */
+int bot_whois(Client *client, Client *acptr);
+int bot_who_status(Client *client, Client *acptr, Channel *channel, Member *cm, char *status, int cansee);
+int bot_umode_change(Client *client, long oldmode, long newmode);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'B', UMODE_GLOBAL, 0, NULL, &UMODE_BOT);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_WHOIS, 0, bot_whois);
+	HookAdd(modinfo->handle, HOOKTYPE_WHO_STATUS, 0, bot_who_status);
+	HookAdd(modinfo->handle, HOOKTYPE_UMODE_CHANGE, 0, bot_umode_change);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int bot_whois(Client *requester, Client *acptr)
+{
+	if (IsBot(acptr))
+		sendnumeric(requester, RPL_WHOISBOT, acptr->name, ircnetwork);
+
+	return 0;
+}
+
+int bot_who_status(Client *requester, Client *acptr, Channel *channel, Member *cm, char *status, int cansee)
+{
+	if (IsBot(acptr))
+		return 'B';
+	
+	return 0;
+}
+
+int bot_umode_change(Client *client, long oldmode, long newmode)
+{
+	if ((newmode & UMODE_BOT) && !(oldmode & UMODE_BOT) && MyUser(client))
+	{
+		/* now +B */
+		char *parv[2];
+		parv[0] = client->name;
+		parv[1] = NULL;
+		do_cmd(client, NULL, "BOTMOTD", 1, parv);
+	}
+
+	return 0;
+}
diff --git a/src/modules/usermodes/censor.c b/src/modules/usermodes/censor.c
new file mode 100644
index 0000000..68452ab
--- /dev/null
+++ b/src/modules/usermodes/censor.c
@@ -0,0 +1,270 @@
+/*
+ * User Mode +G
+ * (C) Copyright 2005-current Bram Matthys and The UnrealIRCd team.
+ */
+
+#include "unrealircd.h"
+
+
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/censor",
+	"4.2",
+	"User Mode +G",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+
+long UMODE_CENSOR = 0L;
+
+#define IsCensored(x) (x->umodes & UMODE_CENSOR)
+
+int censor_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+
+int censor_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int censor_config_run(ConfigFile *, ConfigEntry *, int);
+
+ModuleInfo *ModInfo = NULL;
+
+ConfigItem_badword *conf_badword_message = NULL;
+
+static ConfigItem_badword *copy_badword_struct(ConfigItem_badword *ca, int regex, int regflags);
+
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, censor_config_test);
+	return MOD_SUCCESS;
+}
+	
+MOD_INIT()
+{
+	ModInfo = modinfo;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	UmodeAdd(modinfo->handle, 'G', UMODE_GLOBAL, 0, NULL, &UMODE_CENSOR);
+
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, 0, censor_can_send_to_user);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, censor_config_run);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+MOD_UNLOAD()
+{
+ConfigItem_badword *badword, *next;
+
+	for (badword = conf_badword_message; badword; badword = next)
+	{
+		next = badword->next;
+		DelListItem(badword, conf_badword_message);
+		badword_config_free(badword);
+	}
+	return MOD_SUCCESS;
+}
+
+int censor_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+	char has_word = 0, has_replace = 0, has_action = 0, action = 'r';
+
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "badword"))
+		return 0; /* not interested */
+
+	if (!ce->ce_vardata)
+	{
+		config_error("%s:%i: badword without type",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		return 1;
+	}
+	else if (strcmp(ce->ce_vardata, "message") && strcmp(ce->ce_vardata, "all")) {
+/*			config_error("%s:%i: badword with unknown type",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum); -- can't do that.. */
+		return 0; /* unhandled */
+	}
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (config_is_blankorempty(cep, "badword"))
+		{
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "word"))
+		{
+			char *errbuf;
+			if (has_word)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "badword::word");
+				continue;
+			}
+			has_word = 1;
+			if ((errbuf = badword_config_check_regex(cep->ce_vardata,1,1)))
+			{
+				config_error("%s:%i: badword::%s contains an invalid regex: %s",
+					cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum,
+					cep->ce_varname, errbuf);
+				errors++;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "replace"))
+		{
+			if (has_replace)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "badword::replace");
+				continue;
+			}
+			has_replace = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (has_action)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "badword::action");
+				continue;
+			}
+			has_action = 1;
+			if (!strcmp(cep->ce_vardata, "replace"))
+				action = 'r';
+			else if (!strcmp(cep->ce_vardata, "block"))
+				action = 'b';
+			else
+			{
+				config_error("%s:%d: Unknown badword::action '%s'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+					cep->ce_vardata);
+				errors++;
+			}
+				
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"badword", cep->ce_varname);
+			errors++;
+		}
+	}
+
+	if (!has_word)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"badword::word");
+		errors++;
+	}
+	if (has_action)
+	{
+		if (has_replace && action == 'b')
+		{
+			config_error("%s:%i: badword::action is block but badword::replace exists",
+				ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+			errors++;
+		}
+	}
+	
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+
+int censor_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep, *word = NULL;
+	ConfigItem_badword *ca;
+
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "badword"))
+		return 0; /* not interested */
+
+	if (strcmp(ce->ce_vardata, "message") && strcmp(ce->ce_vardata, "all"))
+	        return 0; /* not for us */
+
+	ca = safe_alloc(sizeof(ConfigItem_badword));
+	ca->action = BADWORD_REPLACE;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "action"))
+		{
+			if (!strcmp(cep->ce_vardata, "block"))
+			{
+				ca->action = BADWORD_BLOCK;
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "replace"))
+		{
+			safe_strdup(ca->replace, cep->ce_vardata);
+		}
+		else if (!strcmp(cep->ce_varname, "word"))
+		{
+			word = cep;
+		}
+	}
+
+	badword_config_process(ca, word->ce_vardata);
+
+	if (!strcmp(ce->ce_vardata, "message"))
+	{
+		AddListItem(ca, conf_badword_message);
+	} else
+	if (!strcmp(ce->ce_vardata, "all"))
+	{
+		AddListItem(ca, conf_badword_message);
+		return 0; /* pretend we didn't see it, so other modules can handle 'all' as well */
+	}
+
+	return 1;
+}
+
+char *stripbadwords_message(char *str, int *blocked)
+{
+	return stripbadwords(str, conf_badword_message, blocked);
+}
+
+int censor_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	int blocked = 0;
+
+	if (MyUser(client) && IsCensored(target))
+	{
+		*text = stripbadwords_message(*text, &blocked);
+		if (blocked)
+		{
+			*errmsg = "User does not accept private messages containing swearing";
+			return HOOK_DENY;
+		}
+	}
+
+	return HOOK_CONTINUE;
+}
+
+// TODO: when stats is modular, make it call this for badwords
+int stats_badwords(Client *client, char *para)
+{
+	ConfigItem_badword *words;
+
+	for (words = conf_badword_message; words; words = words->next)
+	{
+		sendtxtnumeric(client, "m %c %s%s%s %s", words->type & BADW_TYPE_REGEX ? 'R' : 'F',
+		           (words->type & BADW_TYPE_FAST_L) ? "*" : "", words->word,
+		           (words->type & BADW_TYPE_FAST_R) ? "*" : "",
+		           words->action == BADWORD_REPLACE ? (words->replace ? words->replace : "<censored>") : "");
+	}
+	return 0;
+}
diff --git a/src/modules/usermodes/noctcp.c b/src/modules/usermodes/noctcp.c
new file mode 100644
index 0000000..9249809
--- /dev/null
+++ b/src/modules/usermodes/noctcp.c
@@ -0,0 +1,85 @@
+/*
+ * Block user-to-user CTCP UnrealIRCd Module (User Mode +T)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(noctcp);
+
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/noctcp",
+	"4.2",
+	"User Mode +T",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+long UMODE_NOCTCP = 0L;
+
+#define IsNoCTCP(client)    (client->umodes & UMODE_NOCTCP)
+
+int noctcp_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+CmodeInfo req;
+
+	UmodeAdd(modinfo->handle, 'T', UMODE_GLOBAL, 0, NULL, &UMODE_NOCTCP);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, 0, noctcp_can_send_to_user);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static int IsACTCP(char *s)
+{
+	if (!s)
+		return 0;
+
+	if ((*s == '\001') && strncmp(&s[1], "ACTION ", 7) && strncmp(&s[1], "DCC ", 4))
+		return 1;
+
+	return 0;
+}
+
+int noctcp_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	if (MyUser(client) && !notice && IsNoCTCP(target) && !IsOper(client) && IsACTCP(*text))
+	{
+		*errmsg = "User does not accept CTCPs";
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/usermodes/nokick.c b/src/modules/usermodes/nokick.c
new file mode 100644
index 0000000..7ea2440
--- /dev/null
+++ b/src/modules/usermodes/nokick.c
@@ -0,0 +1,100 @@
+/*
+ * Prevents you from being kicked (User mode +q)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsNokick(client)    (client->umodes & UMODE_NOKICK)
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/nokick",
+	"4.2",
+	"User Mode +q",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_NOKICK = 0L;
+
+/* Forward declarations */
+int umode_allow_unkickable_oper(Client *client, int what);
+int nokick_can_kick(Client *client, Client *target, Channel *channel,
+                    char *comment, long client_flags, long target_flags, char **reject_reason);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'q', UMODE_GLOBAL, 1, umode_allow_unkickable_oper, &UMODE_NOKICK);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_KICK, 0, nokick_can_kick);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int umode_allow_unkickable_oper(Client *client, int what)
+{
+	if (MyUser(client))
+	{
+		if (IsOper(client) && ValidatePermissionsForPath("self:unkickablemode",client,NULL,NULL,NULL))
+			return 1;
+		return 0;
+	}
+	/* Always allow remotes: */
+	return 1;
+}
+
+int nokick_can_kick(Client *client, Client *target, Channel *channel, char *comment,
+                    long client_flags, long target_flags, char **reject_reason)
+{
+	static char errmsg[NICKLEN+256];
+
+	if (IsNokick(target) && !IsULine(client) && MyUser(client) && !ValidatePermissionsForPath("channel:override:kick:nokick",client,target,channel,NULL))
+	{
+		ircsnprintf(errmsg, sizeof(errmsg), ":%s %d %s %s :%s",
+		            me.name, ERR_CANNOTDOCOMMAND, client->name, "KICK",
+				   "user is unkickable (user mode +q)");
+
+		*reject_reason = errmsg;
+
+		sendnotice(target,
+			"*** umode q: %s tried to kick you from channel %s (%s)",
+			client->name, channel->chname, comment);
+		
+		return EX_ALWAYS_DENY;
+	}
+
+	return EX_ALLOW;
+}
diff --git a/src/modules/usermodes/privacy.c b/src/modules/usermodes/privacy.c
new file mode 100644
index 0000000..5a0fcce
--- /dev/null
+++ b/src/modules/usermodes/privacy.c
@@ -0,0 +1,69 @@
+/*
+ * Privacy - hide channels in /WHOIS (User mode +p)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsPrivacy(client)    (client->umodes & UMODE_PRIVACY)
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/privacy",
+	"4.2",
+	"User Mode +p",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_PRIVACY = 0L;
+
+/* Forward declarations */
+int privacy_see_channel_in_whois(Client *client, Client *target, Channel *channel);
+                    
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'p', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_PRIVACY);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_SEE_CHANNEL_IN_WHOIS, 0, privacy_see_channel_in_whois);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* This hides channels in /WHOIS output, unless the requestor is in the same channel
+ * or some IRCOp is overriding.
+ */
+int privacy_see_channel_in_whois(Client *client, Client *target, Channel *channel)
+{
+	if (IsPrivacy(target) && !IsMember(client, channel))
+		return EX_DENY;
+	
+	return EX_ALLOW;
+}
diff --git a/src/modules/usermodes/privdeaf.c b/src/modules/usermodes/privdeaf.c
new file mode 100644
index 0000000..a788c00
--- /dev/null
+++ b/src/modules/usermodes/privdeaf.c
@@ -0,0 +1,59 @@
+/*
+ * usermode +D: makes it so you cannot receive private messages/notices
+ * except from opers, U-lines and servers. -- Syzop
+ */
+
+#include "unrealircd.h"
+
+ModuleHeader MOD_HEADER
+= {
+	"usermodes/privdeaf",
+	"1.2",
+	"Private Messages Deaf (+D) -- by Syzop",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+static long UMODE_PRIVDEAF = 0;
+static Umode *UmodePrivdeaf = NULL;
+
+int privdeaf_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	UmodePrivdeaf = UmodeAdd(modinfo->handle, 'D', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_PRIVDEAF);
+	if (!UmodePrivdeaf)
+	{
+		/* I use config_error() here because it's printed to stderr in case of a load
+		 * on cmd line, and to all opers in case of a /rehash.
+		 */
+		config_error("privdeaf: Could not add usermode 'D': %s", ModuleGetErrorStr(modinfo->handle));
+		return MOD_FAILED;
+	}
+	
+	 HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, 0, privdeaf_can_send_to_user);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int privdeaf_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	if ((target->umodes & UMODE_PRIVDEAF) && !IsOper(client) &&
+	    !IsULine(client) && !IsServer(client) && (client != target))
+	{
+		*errmsg = "User does not accept private messages";
+		return HOOK_DENY;
+	}
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/usermodes/regonlymsg.c b/src/modules/usermodes/regonlymsg.c
new file mode 100644
index 0000000..bc9cc78
--- /dev/null
+++ b/src/modules/usermodes/regonlymsg.c
@@ -0,0 +1,72 @@
+/*
+ * Recieve private messages only from registered users (User mode +R)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsRegOnlyMsg(client)    (client->umodes & UMODE_REGONLYMSG)
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/regonlymsg",
+	"4.2",
+	"User Mode +R",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_REGONLYMSG = 0L;
+
+/* Forward declarations */
+int regonlymsg_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+                    
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'R', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_REGONLYMSG);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, 0, regonlymsg_can_send_to_user);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int regonlymsg_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	if (IsRegOnlyMsg(target) && !IsServer(client) && !IsULine(client) && !IsLoggedIn(client))
+	{
+		if (ValidatePermissionsForPath("client:override:message:regonlymsg",client,target,NULL,text))
+			return HOOK_CONTINUE; /* bypass this restriction */
+
+		*errmsg = "You must identify to a registered nick to private message this user";
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/usermodes/secureonlymsg.c b/src/modules/usermodes/secureonlymsg.c
new file mode 100644
index 0000000..ecc8183
--- /dev/null
+++ b/src/modules/usermodes/secureonlymsg.c
@@ -0,0 +1,86 @@
+/*
+ * Recieve private messages only from SSL/TLS users (User mode +Z)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ * Idea from "Stealth" <stealth@x-tab.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsSecureOnlyMsg(client)    (client->umodes & UMODE_SECUREONLYMSG)
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/secureonlymsg",
+	"4.2",
+	"User Mode +Z",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_SECUREONLYMSG = 0L;
+
+/* Forward declarations */
+int secureonlymsg_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice);
+                    
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'Z', UMODE_GLOBAL, 0, umode_allow_all, &UMODE_SECUREONLYMSG);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_SEND_TO_USER, 0, secureonlymsg_can_send_to_user);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int secureonlymsg_can_send_to_user(Client *client, Client *target, char **text, char **errmsg, int notice)
+{
+	if (IsSecureOnlyMsg(target) && !IsServer(client) && !IsULine(client) && !IsSecureConnect(client))
+	{
+		if (ValidatePermissionsForPath("client:override:message:secureonlymsg",client,target,NULL,text))
+			return HOOK_CONTINUE; /* bypass this restriction */
+
+		*errmsg = "You must be connected via SSL/TLS to message this user";
+		return HOOK_DENY;
+	} else
+	if (IsSecureOnlyMsg(client) && !IsSecureConnect(target) && !IsULine(target))
+	{
+		if (ValidatePermissionsForPath("client:override:message:secureonlymsg",client,target,NULL,text))
+			return HOOK_CONTINUE; /* bypass this restriction */
+		
+		/* Similar to above but in this case we are +Z and are trying to message
+		 * an SSL user (who does not have +Z set, note the 'else'). This does not
+		 * make sense since they could never message back to us. Better block the
+		 * message than leave the user confused.
+		 */
+		*errmsg = "Recipient is not connected via SSL/TLS and you are +Z";
+		return HOOK_DENY;
+	}
+
+	return HOOK_CONTINUE;
+}
diff --git a/src/modules/usermodes/servicebot.c b/src/modules/usermodes/servicebot.c
new file mode 100644
index 0000000..ba94e0a
--- /dev/null
+++ b/src/modules/usermodes/servicebot.c
@@ -0,0 +1,143 @@
+/*
+ * Prevents you from being kicked (User mode +q)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsServiceBot(client)    (client->umodes & UMODE_SERVICEBOT)
+
+#define WHOIS_SERVICE_STRING ":%s 313 %s %s :is a Network Service"
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/servicebot",
+	"4.2",
+	"User Mode +S",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_SERVICEBOT = 0L;
+
+/* Forward declarations */
+int servicebot_can_kick(Client *client, Client *target, Channel *channel,
+                    char *comment, long client_flags, long target_flags, char **reject_reason);
+int servicebot_mode_deop(Client *client, Client *target, Channel *channel,
+                    u_int what, int modechar, long my_access, char **reject_reason);
+int servicebot_pre_kill(Client *client, Client *target, char *reason);
+int servicebot_whois(Client *requester, Client *acptr);
+int servicebot_see_channel_in_whois(Client *client, Client *target, Channel *channel);
+                    
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'S', UMODE_GLOBAL, 1, umode_allow_none, &UMODE_SERVICEBOT);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_CAN_KICK, 0, servicebot_can_kick);
+	HookAdd(modinfo->handle, HOOKTYPE_MODE_DEOP, 0, servicebot_mode_deop);
+	HookAdd(modinfo->handle, HOOKTYPE_PRE_KILL, 0, servicebot_pre_kill);
+	HookAdd(modinfo->handle, HOOKTYPE_WHOIS, 0, servicebot_whois);
+	HookAdd(modinfo->handle, HOOKTYPE_SEE_CHANNEL_IN_WHOIS, 0, servicebot_see_channel_in_whois);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int servicebot_can_kick(Client *client, Client *target, Channel *channel, char *comment,
+                    long client_flags, long target_flags, char **reject_reason)
+{
+	static char errmsg[NICKLEN+256];
+
+	if (MyUser(client) && !IsULine(client) && IsServiceBot(target))
+	{
+		char errmsg2[NICKLEN+32];
+		snprintf(errmsg2, sizeof(errmsg2), "%s is a Service Bot", target->name);
+		
+		snprintf(errmsg, sizeof(errmsg), ":%s %d %s %s :%s",
+		         me.name, ERR_CANNOTDOCOMMAND, client->name, "KICK", errmsg2);
+
+		*reject_reason = errmsg;
+
+		return EX_DENY;
+	}
+
+	return EX_ALLOW;
+}
+
+int servicebot_mode_deop(Client *client, Client *target, Channel *channel,
+                    u_int what, int modechar, long my_access, char **reject_reason)
+{
+	static char errmsg[NICKLEN+256];
+	
+	if (IsServiceBot(target) && MyUser(client) && !ValidatePermissionsForPath("services:servicebot:deop",client,target,channel,NULL) && (what == MODE_DEL))
+	{
+		snprintf(errmsg, sizeof(errmsg), ":%s %d %s %c :%s is a Service Bot",
+			me.name, ERR_CANNOTCHANGECHANMODE, client->name, (char)modechar, target->name);
+		
+		*reject_reason = errmsg;
+		
+		return EX_DENY;
+	}
+	
+	return EX_ALLOW;
+}
+
+int servicebot_pre_kill(Client *client, Client *target, char *reason)
+{
+	if (IsServiceBot(target) && !(ValidatePermissionsForPath("services:servicebot:kill",client,target,NULL,NULL) || IsULine(client)))
+	{
+		sendnumeric(client, ERR_KILLDENY, target->name);
+		return EX_ALWAYS_DENY;
+	}
+	return EX_ALLOW;
+}
+
+int servicebot_whois(Client *requester, Client *acptr)
+{
+	int hideoper = (IsHideOper(acptr) && (requester != acptr) && !IsOper(requester)) ? 1 : 0;
+
+	if (IsServiceBot(acptr) && !hideoper)
+		sendto_one(requester, NULL, WHOIS_SERVICE_STRING, me.name, requester->name, acptr->name);
+
+	return 0;
+}
+
+/* This hides the servicebot, even if you are in the same channel, unless oper overriding */
+int servicebot_see_channel_in_whois(Client *client, Client *target, Channel *channel)
+{
+	if (IsServiceBot(target))
+		return EX_DENY;
+	
+	return EX_ALLOW;
+}
diff --git a/src/modules/usermodes/showwhois.c b/src/modules/usermodes/showwhois.c
new file mode 100644
index 0000000..453fd61
--- /dev/null
+++ b/src/modules/usermodes/showwhois.c
@@ -0,0 +1,76 @@
+/*
+ * Show when someone does a /WHOIS on you (User mode +W)
+ * (C) Copyright 2000-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+#define IsWhois(cptr)    (cptr->umodes & UMODE_SHOWWHOIS)
+
+/* Module header */
+ModuleHeader MOD_HEADER
+  = {
+	"usermodes/showwhois",
+	"4.2",
+	"User Mode +W",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* Global variables */
+long UMODE_SHOWWHOIS = 0L;
+
+/* Forward declarations */
+int showwhois_whois(Client *requester, Client *target);
+
+MOD_TEST()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	UmodeAdd(modinfo->handle, 'W', UMODE_GLOBAL, 1, umode_allow_opers, &UMODE_SHOWWHOIS);
+	
+	HookAdd(modinfo->handle, HOOKTYPE_WHOIS, 0, showwhois_whois);
+	
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+int showwhois_whois(Client *requester, Client *target)
+{
+	if (IsWhois(target) && (requester != target))
+	{
+		sendnotice(target,
+			"*** %s (%s@%s) did a /whois on you.",
+			requester->name,
+			requester->user->username, requester->user->realhost);
+	}
+
+	return 0;
+}
diff --git a/src/modules/vhost.c b/src/modules/vhost.c
new file mode 100644
index 0000000..e55969d
--- /dev/null
+++ b/src/modules/vhost.c
@@ -0,0 +1,172 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/vhost.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_vhost);
+
+/* Place includes here */
+#define MSG_VHOST       "VHOST"
+
+ModuleHeader MOD_HEADER
+  = {
+	"vhost",	/* Name of module */
+	"5.0", /* Version */
+	"command /vhost", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_VHOST, cmd_vhost, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;	
+}
+
+CMD_FUNC(cmd_vhost)
+{
+	ConfigItem_vhost *vhost;
+	char *login, *password;
+	char olduser[USERLEN+1];
+
+	if (!MyUser(client))
+		return;
+
+	if ((parc < 2) || BadPtr(parv[1]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "VHOST");
+		return;
+
+	}
+
+	login = parv[1];
+	password = (parc > 2) ? parv[2] : "";
+
+	/* cut-off too long login names. HOSTLEN is arbitrary, we just don't want our
+	 * error messages to be cut off because the user is sending huge login names.
+	 */
+	if (strlen(login) > HOSTLEN)
+		login[HOSTLEN] = '\0';
+
+	if (!(vhost = find_vhost(login)))
+	{
+		sendto_snomask(SNO_VHOST,
+		    "[\2vhost\2] Failed login for vhost %s by %s!%s@%s - incorrect password",
+		    login, client->name,
+		    client->user->username,
+		    client->user->realhost);
+		sendnotice(client, "*** [\2vhost\2] Login for %s failed - password incorrect", login);
+		return;
+	}
+	
+	if (!unreal_mask_match(client, vhost->mask))
+	{
+		sendto_snomask(SNO_VHOST,
+		    "[\2vhost\2] Failed login for vhost %s by %s!%s@%s - host does not match",
+		    login, client->name, client->user->username, client->user->realhost);
+		sendnotice(client, "*** No vHost lines available for your host");
+		return;
+	}
+
+	if (!Auth_Check(client, vhost->auth, password))
+	{
+		sendto_snomask(SNO_VHOST,
+		    "[\2vhost\2] Failed login for vhost %s by %s!%s@%s - incorrect password",
+		    login, client->name,
+		    client->user->username,
+		    client->user->realhost);
+		sendnotice(client, "*** [\2vhost\2] Login for %s failed - password incorrect", login);
+		return;
+	}
+
+	/* Authentication passed, but.. there could still be other restrictions: */
+	switch (UHOST_ALLOWED)
+	{
+		case UHALLOW_NEVER:
+			if (MyUser(client))
+			{
+				sendnotice(client, "*** /vhost is disabled");
+				return;
+			}
+			break;
+		case UHALLOW_ALWAYS:
+			break;
+		case UHALLOW_NOCHANS:
+			if (MyUser(client) && client->user->joined)
+			{
+				sendnotice(client, "*** /vhost can not be used while you are on a channel");
+				return;
+			}
+			break;
+		case UHALLOW_REJOIN:
+			/* join sent later when the host has been changed */
+			break;
+	}
+
+	/* All checks passed, now let's go ahead and change the host */
+
+	userhost_save_current(client);
+
+	safe_strdup(client->user->virthost, vhost->virthost);
+	if (vhost->virtuser)
+	{
+		strcpy(olduser, client->user->username);
+		strlcpy(client->user->username, vhost->virtuser, USERLEN);
+		sendto_server(client, 0, 0, NULL, ":%s SETIDENT %s", client->id,
+		    client->user->username);
+	}
+	client->umodes |= UMODE_HIDE;
+	client->umodes |= UMODE_SETHOST;
+	sendto_server(client, 0, 0, NULL, ":%s SETHOST %s", client->id, client->user->virthost);
+	sendto_one(client, NULL, ":%s MODE %s :+tx", client->name, client->name);
+	if (vhost->swhois)
+	{
+		SWhois *s;
+		for (s = vhost->swhois; s; s = s->next)
+			swhois_add(client, "vhost", -100, s->line, &me, NULL);
+	}
+	sendnumeric(client, RPL_HOSTHIDDEN, vhost->virthost);
+	sendnotice(client, "*** Your vhost is now %s%s%s",
+		vhost->virtuser ? vhost->virtuser : "",
+		vhost->virtuser ? "@" : "",
+		vhost->virthost);
+	sendto_snomask(SNO_VHOST,
+	    "[\2vhost\2] %s (%s!%s@%s) is now using vhost %s%s%s",
+	    login, client->name,
+	    vhost->virtuser ? olduser : client->user->username,
+	    client->user->realhost, vhost->virtuser ? vhost->virtuser : "", 
+		vhost->virtuser ? "@" : "", vhost->virthost);
+
+	userhost_changed(client);
+}
diff --git a/src/modules/wallops.c b/src/modules/wallops.c
new file mode 100644
index 0000000..869e930
--- /dev/null
+++ b/src/modules/wallops.c
@@ -0,0 +1,77 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/wallops.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_wallops);
+
+#define MSG_WALLOPS 	"WALLOPS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"wallops",
+	"5.0",
+	"command /wallops", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_WALLOPS, cmd_wallops, 1, CMD_USER|CMD_SERVER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+** cmd_wallops (write to *all* opers currently online)
+**	parv[1] = message text
+*/
+CMD_FUNC(cmd_wallops)
+{
+	char *message;
+	message = parc > 1 ? parv[1] : NULL;
+
+	if (BadPtr(message))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "WALLOPS");
+		return;
+	}
+
+	if (!ValidatePermissionsForPath("chat:wallops",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	sendto_ops_butone(client->direction, client, ":%s WALLOPS :%s", client->name, message);
+}
diff --git a/src/modules/watch.c b/src/modules/watch.c
new file mode 100644
index 0000000..f84b607
--- /dev/null
+++ b/src/modules/watch.c
@@ -0,0 +1,266 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/watch.c
+ *   (C) 2005 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_watch);
+
+#define MSG_WATCH 	"WATCH"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"watch",
+	"5.0",
+	"command /watch", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_WATCH, cmd_watch, 1, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/*
+ * RPL_NOWON	- Online at the moment (Successfully added to WATCH-list)
+ * RPL_NOWOFF	- Offline at the moement (Successfully added to WATCH-list)
+ * RPL_WATCHOFF	- Successfully removed from WATCH-list.
+ * ERR_TOOMANYWATCH - Take a guess :>  Too many WATCH entries.
+ */
+static void show_watch(Client *client, char *name, int rpl1, int rpl2, int awaynotify)
+{
+	Client *target;
+
+	if ((target = find_person(name, NULL)))
+	{
+		if (awaynotify && target->user->away)
+		{
+			sendnumeric(client, RPL_NOWISAWAY,
+			    target->name, target->user->username,
+			    IsHidden(target) ? target->user->virthost : target->user->
+			    realhost, target->user->lastaway);
+			return;
+		}
+		
+		sendnumeric(client, rpl1,
+		    target->name, target->user->username,
+		    IsHidden(target) ? target->user->virthost : target->user->
+		    realhost, target->lastnick);
+	}
+	else
+	{
+		sendnumeric(client, rpl2, name, "*", "*", 0L);
+	}
+}
+
+static char buf[BUFSIZE];
+
+/*
+ * cmd_watch
+ */
+CMD_FUNC(cmd_watch)
+{
+	Client *target;
+	char *s, **pav = parv, *user;
+	char *p = NULL, *def = "l";
+	int awaynotify = 0;
+	int did_l=0, did_s=0;
+
+	if (!MyUser(client))
+		return;
+
+	if (parc < 2)
+	{
+		/*
+		 * Default to 'l' - list who's currently online
+		 */
+		parc = 2;
+		parv[1] = def;
+	}
+
+	for (s = strtoken(&p, *++pav, " "); s; s = strtoken(&p, NULL, " "))
+	{
+		if ((user = strchr(s, '!')))
+			*user++ = '\0';	/* Not used */
+			
+		if (!strcmp(s, "A") && WATCH_AWAY_NOTIFICATION)
+			awaynotify = 1;
+
+		/*
+		 * Prefix of "+", they want to add a name to their WATCH
+		 * list.
+		 */
+		if (*s == '+')
+		{
+			if (!*(s+1))
+				continue;
+			if (do_nick_name(s + 1))
+			{
+				if (client->local->watches >= MAXWATCH)
+				{
+					sendnumeric(client, ERR_TOOMANYWATCH, s + 1);
+					continue;
+				}
+
+				add_to_watch_hash_table(s + 1, client, awaynotify);
+			}
+
+			show_watch(client, s + 1, RPL_NOWON, RPL_NOWOFF, awaynotify);
+			continue;
+		}
+
+		/*
+		 * Prefix of "-", coward wants to remove somebody from their
+		 * WATCH list.  So do it. :-)
+		 */
+		if (*s == '-')
+		{
+			if (!*(s+1))
+				continue;
+			del_from_watch_hash_table(s + 1, client);
+			show_watch(client, s + 1, RPL_WATCHOFF, RPL_WATCHOFF, 0);
+
+			continue;
+		}
+
+		/*
+		 * Fancy "C" or "c", they want to nuke their WATCH list and start
+		 * over, so be it.
+		 */
+		if (*s == 'C' || *s == 'c')
+		{
+			hash_del_watch_list(client);
+
+			continue;
+		}
+
+		/*
+		 * Now comes the fun stuff, "S" or "s" returns a status report of
+		 * their WATCH list.  I imagine this could be CPU intensive if its
+		 * done alot, perhaps an auto-lag on this?
+		 */
+		if ((*s == 'S' || *s == 's') && !did_s)
+		{
+			Link *lp;
+			Watch *anptr;
+			int  count = 0;
+			
+			did_s = 1;
+			
+			/*
+			 * Send a list of how many users they have on their WATCH list
+			 * and how many WATCH lists they are on.
+			 */
+			anptr = hash_get_watch(client->name);
+			if (anptr)
+				for (lp = anptr->watch, count = 1;
+				    (lp = lp->next); count++)
+					;
+			sendnumeric(client, RPL_WATCHSTAT, client->local->watches, count);
+
+			/*
+			 * Send a list of everybody in their WATCH list. Be careful
+			 * not to buffer overflow.
+			 */
+			if ((lp = client->local->watch) == NULL)
+			{
+				sendnumeric(client, RPL_ENDOFWATCHLIST, *s);
+				continue;
+			}
+			*buf = '\0';
+			strlcpy(buf, lp->value.wptr->nick, sizeof buf);
+			count =
+			    strlen(client->name) + strlen(me.name) + 10 +
+			    strlen(buf);
+			while ((lp = lp->next))
+			{
+				if (count + strlen(lp->value.wptr->nick) + 1 >
+				    BUFSIZE - 2)
+				{
+					sendnumeric(client, RPL_WATCHLIST, buf);
+					*buf = '\0';
+					count = strlen(client->name) + strlen(me.name) + 10;
+				}
+				strcat(buf, " ");
+				strcat(buf, lp->value.wptr->nick);
+				count += (strlen(lp->value.wptr->nick) + 1);
+			}
+			sendnumeric(client, RPL_WATCHLIST, buf);
+
+			sendnumeric(client, RPL_ENDOFWATCHLIST, *s);
+			continue;
+		}
+
+		/*
+		 * Well that was fun, NOT.  Now they want a list of everybody in
+		 * their WATCH list AND if they are online or offline? Sheesh,
+		 * greedy arn't we?
+		 */
+		if ((*s == 'L' || *s == 'l') && !did_l)
+		{
+			Link *lp = client->local->watch;
+
+			did_l = 1;
+
+			while (lp)
+			{
+				if ((target = find_person(lp->value.wptr->nick, NULL)))
+				{
+					sendnumeric(client, RPL_NOWON, target->name,
+					    target->user->username,
+					    IsHidden(target) ? target->user->
+					    virthost : target->user->realhost,
+					    target->lastnick);
+				}
+				/*
+				 * But actually, only show them offline if its a capital
+				 * 'L' (full list wanted).
+				 */
+				else if (isupper(*s))
+					sendnumeric(client, RPL_NOWOFF,
+					    lp->value.wptr->nick, "*", "*",
+					    lp->value.wptr->lasttime);
+				lp = lp->next;
+			}
+
+			sendnumeric(client, RPL_ENDOFWATCHLIST, *s);
+
+			continue;
+		}
+
+		/*
+		 * Hmm.. unknown prefix character.. Ignore it. :-)
+		 */
+	}
+}
diff --git a/src/modules/webirc.c b/src/modules/webirc.c
new file mode 100644
index 0000000..42762f5
--- /dev/null
+++ b/src/modules/webirc.c
@@ -0,0 +1,498 @@
+/*
+ * WebIRC / CGI:IRC Support
+ * (C) Copyright 2006-.. Bram Matthys (Syzop) and the UnrealIRCd team
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#include "unrealircd.h"
+
+/* Types */
+typedef struct ConfigItem_webirc ConfigItem_webirc;
+
+typedef enum {
+	WEBIRC_PASS=1, WEBIRC_WEBIRC=2
+} WEBIRCType;
+
+struct ConfigItem_webirc {
+	ConfigItem_webirc *prev, *next;
+	ConfigFlag flag;
+	ConfigItem_mask *mask;
+	WEBIRCType type;
+	AuthConfig *auth;
+};
+
+/* Module header */
+ModuleHeader MOD_HEADER
+= {
+	"webirc",
+	"5.0",
+	"WebIRC/CGI:IRC Support",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+};
+
+/* Global variables */
+ModDataInfo *webirc_md = NULL;
+ConfigItem_webirc *conf_webirc = NULL;
+
+/* Forward declarations */
+CMD_FUNC(cmd_webirc);
+int webirc_check_init(Client *client, char *sockn, size_t size);
+int webirc_local_pass(Client *client, char *password);
+int webirc_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int webirc_config_run(ConfigFile *, ConfigEntry *, int);
+void webirc_free_conf(void);
+void delete_webircblock(ConfigItem_webirc *e);
+char *webirc_md_serialize(ModData *m);
+void webirc_md_unserialize(char *str, ModData *m);
+void webirc_md_free(ModData *md);
+int webirc_secure_connect(Client *client);
+
+#define IsWEBIRC(x)			(moddata_client(x, webirc_md).l)
+#define IsWEBIRCSecure(x)	(moddata_client(x, webirc_md).l == 2)
+#define ClearWEBIRC(x)		do { moddata_client(x, webirc_md).l = 0; } while(0)
+#define SetWEBIRC(x)		do { moddata_client(x, webirc_md).l = 1; } while(0)
+#define SetWEBIRCSecure(x)	do { moddata_client(x, webirc_md).l = 2; } while(0)
+
+#define MSG_WEBIRC "WEBIRC"
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, webirc_config_test);
+	return MOD_SUCCESS;
+}
+
+/** Called upon module init */
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "webirc";
+	mreq.type = MODDATATYPE_CLIENT;
+	mreq.serialize = webirc_md_serialize;
+	mreq.unserialize = webirc_md_unserialize;
+	mreq.free = webirc_md_free;
+	mreq.sync = 1;
+	webirc_md = ModDataAdd(modinfo->handle, mreq);
+	if (!webirc_md)
+	{
+		config_error("could not register webirc moddata");
+		return MOD_FAILED;
+	}
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, webirc_config_run);
+	HookAdd(modinfo->handle, HOOKTYPE_CHECK_INIT, 0, webirc_check_init);
+	HookAdd(modinfo->handle, HOOKTYPE_LOCAL_PASS, 0, webirc_local_pass);
+	HookAdd(modinfo->handle, HOOKTYPE_SECURE_CONNECT, 0, webirc_secure_connect);
+
+	CommandAdd(modinfo->handle, MSG_WEBIRC, cmd_webirc, MAXPARA, CMD_UNREGISTERED);
+		
+	return MOD_SUCCESS;
+}
+
+/** Called upon module load */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** Called upon unload */
+MOD_UNLOAD()
+{
+	webirc_free_conf();
+	return MOD_SUCCESS;
+}
+
+void webirc_free_conf(void)
+{
+	ConfigItem_webirc *webirc_ptr, *next;
+
+	for (webirc_ptr = conf_webirc; webirc_ptr; webirc_ptr = next)
+	{
+		next = webirc_ptr->next;
+		delete_webircblock(webirc_ptr);
+	}
+	conf_webirc = NULL;
+}
+
+void delete_webircblock(ConfigItem_webirc *e)
+{
+	unreal_delete_masks(e->mask);
+	if (e->auth)
+		Auth_FreeAuthConfig(e->auth);
+	DelListItem(e, conf_webirc);
+	safe_free(e);
+}
+
+int webirc_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	ConfigEntry *cep;
+	int errors = 0;
+	char has_mask = 0; /* mandatory */
+	char has_password = 0; /* mandatory */
+	char has_type = 0; /* optional (used for dup checking) */
+	WEBIRCType webirc_type = WEBIRC_WEBIRC; /* the default */
+
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce)
+		return 0;
+	
+	if (!strcmp(ce->ce_varname, "cgiirc"))
+	{
+		config_error("%s:%i: the cgiirc block has been renamed to webirc and "
+		             "the syntax has changed in UnrealIRCd 4",
+		             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		need_34_upgrade = 1;
+		*errs = 1;
+		return -1;
+	}
+
+	if (strcmp(ce->ce_varname, "webirc"))
+		return 0; /* not interested in non-webirc stuff.. */
+
+	/* Now actually go parse the webirc { } block */
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"webirc", cep->ce_varname);
+			errors++;
+			continue;
+		}
+		if (!strcmp(cep->ce_varname, "mask"))
+		{
+			if (cep->ce_vardata || cep->ce_entries)
+				has_mask = 1;
+		}
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			if (has_password)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename, 
+					cep->ce_varlinenum, "webirc::password");
+				continue;
+			}
+			has_password = 1;
+			if (Auth_CheckError(cep) < 0)
+				errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "type"))
+		{
+			if (has_type)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "webirc::type");
+			}
+			has_type = 1;
+			if (!strcmp(cep->ce_vardata, "webirc"))
+				webirc_type = WEBIRC_WEBIRC;
+			else if (!strcmp(cep->ce_vardata, "old"))
+				webirc_type = WEBIRC_PASS;
+			else
+			{
+				config_error("%s:%i: unknown webirc::type '%s', should be either 'webirc' or 'old'",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		}
+		else
+		{
+			config_error_unknown(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"webirc", cep->ce_varname);
+			errors++;
+		}
+	}
+	if (!has_mask)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"webirc::mask");
+		errors++;
+	}
+
+	if (!has_password && (webirc_type == WEBIRC_WEBIRC))
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"webirc::password");
+		errors++;
+	}
+	
+	if (has_password && (webirc_type == WEBIRC_PASS))
+	{
+		config_error("%s:%i: webirc block has type set to 'old' but has a password set. "
+		             "Passwords are not used with type 'old'. Either remove the password or "
+		             "use the 'webirc' method instead.",
+		             ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int webirc_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+	ConfigItem_webirc *webirc = NULL;
+	
+	if (type != CONFIG_MAIN)
+		return 0;
+	
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "webirc"))
+		return 0; /* not interested */
+
+	webirc = safe_alloc(sizeof(ConfigItem_webirc));
+	webirc->type = WEBIRC_WEBIRC; /* default */
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "mask"))
+			unreal_add_masks(&webirc->mask, cep);
+		else if (!strcmp(cep->ce_varname, "password"))
+			webirc->auth = AuthBlockToAuthConfig(cep);
+		else if (!strcmp(cep->ce_varname, "type"))
+		{
+			if (!strcmp(cep->ce_vardata, "webirc"))
+				webirc->type = WEBIRC_WEBIRC;
+			else if (!strcmp(cep->ce_vardata, "old"))
+				webirc->type = WEBIRC_PASS;
+			else
+				abort();
+		}
+	}
+	
+	AddListItem(webirc, conf_webirc);
+	
+	return 0;
+}
+
+char *webirc_md_serialize(ModData *m)
+{
+	static char buf[32];
+	if (m->i == 0)
+		return NULL; /* not set */
+	snprintf(buf, sizeof(buf), "%d", m->i);
+	return buf;
+}
+
+void webirc_md_unserialize(char *str, ModData *m)
+{
+	m->i = atoi(str);
+}
+
+void webirc_md_free(ModData *md)
+{
+	/* we have nothing to free actually, but we must set to zero */
+	md->l = 0;
+}
+
+ConfigItem_webirc *find_webirc(Client *client, char *password, WEBIRCType type, char **errorstr)
+{
+	ConfigItem_webirc *e;
+	char *error = NULL;
+
+	for (e = conf_webirc; e; e = e->next)
+	{
+		if ((e->type == type) && unreal_mask_match(client, e->mask))
+		{
+			if (type == WEBIRC_WEBIRC)
+			{
+				/* Check password */
+				if (!Auth_Check(client, e->auth, password))
+					error = "CGI:IRC -- Invalid password";
+				else
+					return e; /* Found matching block, return straight away */
+			} else {
+				return e; /* The WEBIRC_PASS type has no password checking */
+			}
+		}
+	}
+
+	if (error)
+		*errorstr = error; /* Invalid password (this error was delayed) */
+	else
+		*errorstr = "CGI:IRC -- No access"; /* No match found */
+
+	return NULL;
+}
+
+#define WEBIRC_STRING     "WEBIRC_"
+#define WEBIRC_STRINGLEN  (sizeof(WEBIRC_STRING)-1)
+
+/* Does the CGI:IRC host spoofing work */
+void dowebirc(Client *client, char *ip, char *host, char *options)
+{
+	char scratch[64];
+
+	if (IsWEBIRC(client))
+	{
+		exit_client(client, NULL, "Double CGI:IRC request (already identified)");
+		return;
+	}
+
+	if (host && !strcmp(ip, host))
+		host = NULL; /* host did not resolve, make it NULL */
+
+	/* STEP 1: Update client->local->ip
+	   inet_pton() returns 1 on success, 0 on bad input, -1 on bad AF */
+	if ((inet_pton(AF_INET, ip, scratch) != 1) &&
+	    (inet_pton(AF_INET6, ip, scratch) != 1))
+	{
+		/* then we have an invalid IP */
+		exit_client(client, NULL, "Invalid IP address");
+		return;
+	}
+
+	/* STEP 2: Update GetIP() */
+	safe_strdup(client->ip, ip);
+		
+	/* STEP 3: Update client->local->hostp */
+	/* (free old) */
+	if (client->local->hostp)
+	{
+		unreal_free_hostent(client->local->hostp);
+		client->local->hostp = NULL;
+	}
+	/* (create new) */
+	if (host && verify_hostname(host))
+		client->local->hostp = unreal_create_hostent(host, client->ip);
+
+	/* STEP 4: Update sockhost
+	   Make sure that if this any IPv4 address is _not_ prefixed with
+	   "::ffff:" by using Inet_ia2p().
+	 */
+	// Hmm I ignored above warning. May be bad during transition period.
+	strlcpy(client->local->sockhost, client->ip, sizeof(client->local->sockhost));
+
+	SetWEBIRC(client);
+
+	if (options)
+	{
+		char *name, *p = NULL, *p2;
+		for (name = strtoken(&p, options, " "); name; name = strtoken(&p, NULL, " "))
+		{
+			p2 = strchr(name, '=');
+			if (p2)
+				*p2 = '\0';
+			if (!strcmp(name, "secure") && IsSecure(client))
+			{
+				/* The entire [client]--[webirc gw]--[server] chain is secure */
+				SetWEBIRCSecure(client);
+			}
+		}
+	}
+
+	/* blacklist_start_check() */
+	if (RCallbacks[CALLBACKTYPE_BLACKLIST_CHECK] != NULL)
+		RCallbacks[CALLBACKTYPE_BLACKLIST_CHECK]->func.intfunc(client);
+
+	/* Check (g)zlines right now; these are normally checked upon accept(),
+	 * but since we know the IP only now after PASS/WEBIRC, we have to check
+	 * here again...
+	 */
+	check_banned(client, 0);
+}
+
+/* WEBIRC <pass> "cgiirc" <hostname> <ip> [:option1 [option2...]]*/
+CMD_FUNC(cmd_webirc)
+{
+	char *ip, *host, *password, *options;
+	ConfigItem_webirc *e;
+	char *error = NULL;
+
+	if ((parc < 5) || BadPtr(parv[4]))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "WEBIRC");
+		return;
+	}
+
+	password = parv[1];
+	host = !DONT_RESOLVE ? parv[3] : parv[4];
+	ip = parv[4];
+	options = parv[5]; /* can be NULL */
+
+	/* Check if allowed host */
+	e = find_webirc(client, password, WEBIRC_WEBIRC, &error);
+	if (!e)
+	{
+		exit_client(client, NULL, error);
+		return;
+	}
+
+	/* And do our job.. */
+	dowebirc(client, ip, host, options);
+}
+
+int webirc_check_init(Client *client, char *sockn, size_t size)
+{
+	if (IsWEBIRC(client))
+	{
+		strlcpy(sockn, GetIP(client), size); /* use already set value */
+		return HOOK_DENY;
+	}
+	
+	return HOOK_CONTINUE; /* nothing to do */
+}
+
+int webirc_local_pass(Client *client, char *password)
+{
+	if (!strncmp(password, WEBIRC_STRING, WEBIRC_STRINGLEN))
+	{
+		char *ip, *host;
+		ConfigItem_webirc *e;
+		char *error = NULL;
+
+		e = find_webirc(client, NULL, WEBIRC_PASS, &error);
+		if (e)
+		{
+			/* Ok now we got that sorted out, proceed:
+			 * Syntax: WEBIRC_<ip>_<resolvedhostname>
+			 * The <resolvedhostname> has been checked ip->host AND host->ip by CGI:IRC itself
+			 * already so we trust it.
+			 */
+			ip = password + WEBIRC_STRINGLEN;
+			host = strchr(ip, '_');
+			if (!host)
+			{
+				exit_client(client, NULL, "Invalid CGI:IRC IP received");
+				return HOOK_DENY;
+			}
+			*host++ = '\0';
+		
+			dowebirc(client, ip, host, NULL);
+			return HOOK_DENY;
+		}
+		/* fallthrough if not in webirc block.. */
+	}
+
+	return HOOK_CONTINUE; /* not webirc */
+}
+
+/** Called from register_user() right after setting user +z */
+int webirc_secure_connect(Client *client)
+{
+	/* Remove secure mode (-z) if the WEBIRC gateway did not ensure
+	 * us that their [client]--[webirc gateway] connection is also
+	 * secure (eg: using https)
+	 */
+	if (IsWEBIRC(client) && IsSecureConnect(client) && !IsWEBIRCSecure(client))
+		client->umodes &= ~UMODE_SECURE;
+	return 0;
+}
diff --git a/src/modules/webredir.c b/src/modules/webredir.c
new file mode 100644
index 0000000..d1261a0
--- /dev/null
+++ b/src/modules/webredir.c
@@ -0,0 +1,201 @@
+/*
+ * webredir UnrealIRCd module
+ * (C) Copyright 2019 i <info@servx.org> and the UnrealIRCd team
+ *
+ * This module will 301-redirect any clients issuing GET's/POST's during pre-connect stage.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 1, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(webredir);
+
+ModuleHeader MOD_HEADER
+  = {
+	"webredir",
+	"1.0",
+	"Do 301 redirect for HEAD/GET/POST/PUT commands", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+struct {
+	char *url;
+} cfg;
+
+static int nowebredir = 1;
+
+static void free_config(void);
+static void init_config(void);
+int webredir_config_posttest(int *errs);
+int webredir_config_test(ConfigFile *, ConfigEntry *, int, int *);
+int webredir_config_run(ConfigFile *, ConfigEntry *, int);
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, webredir_config_test);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGPOSTTEST, 0, webredir_config_posttest);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	init_config();
+	CommandAdd(modinfo->handle, "HEAD", webredir, MAXPARA, CMD_UNREGISTERED);
+	CommandAdd(modinfo->handle, "GET", webredir, MAXPARA, CMD_UNREGISTERED);
+	CommandAdd(modinfo->handle, "POST", webredir, MAXPARA, CMD_UNREGISTERED);
+	CommandAdd(modinfo->handle, "PUT", webredir, MAXPARA, CMD_UNREGISTERED);
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN, 0, webredir_config_run);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	if (SHOWCONNECTINFO)
+	{
+		config_warn("I'm disabling set::options::show-connect-info for you "
+			    "as this setting is incompatible with the webredir module.");
+		SHOWCONNECTINFO = 0;
+	}
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	free_config();
+	return MOD_SUCCESS;
+}
+
+static void init_config(void)
+{
+	memset(&cfg, 0, sizeof(cfg));
+}
+
+static void free_config(void)
+{
+	safe_free(cfg.url);
+
+	memset(&cfg, 0, sizeof(cfg)); /* needed! */
+}
+
+int webredir_config_posttest(int *errs)
+{
+	int errors = 0;
+
+	if (nowebredir)
+	{
+		config_error("set::webredir is missing!");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int webredir_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	int has_url = 0;
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+
+	/* We are only interrested in set::webredir... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "webredir"))
+		return 0;
+
+	nowebredir = 0;
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+		{
+			config_error("%s:%i: set::webredir::%s with no value",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+		else if (!strcmp(cep->ce_varname, "url"))
+		{
+			if (!*cep->ce_vardata || strchr(cep->ce_vardata, ' '))
+			{
+				config_error("%s:%i: set::webredir::%s with empty value",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+				errors++;
+			}
+			if (!strstr(cep->ce_vardata, "://") || !strcmp(cep->ce_vardata, "https://..."))
+			{
+				config_error("%s:%i: set::webredir::url needs to be a valid URL",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum);
+				errors++;
+			}
+			if (has_url)
+			{
+				config_warn_duplicate(cep->ce_fileptr->cf_filename,
+					cep->ce_varlinenum, "set::webredir::url");
+				continue;
+			}
+			has_url = 1;
+		}
+		else
+		{
+			config_error("%s:%i: unknown directive set::webredir::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+		}
+	}
+
+	if (!has_url)
+	{
+		config_error_missing(ce->ce_fileptr->cf_filename, ce->ce_varlinenum,
+			"set::webredir::url");
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int webredir_config_run(ConfigFile *cf, ConfigEntry *ce, int type)
+{
+	ConfigEntry *cep;
+
+	if (type != CONFIG_SET)
+		return 0;
+	
+	/* We are only interrested in set::webredir... */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "webredir"))
+		return 0;
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "url"))
+		{
+			safe_strdup(cfg.url, cep->ce_vardata);
+		}
+	}
+	return 1;
+}
+
+CMD_FUNC(webredir)
+{
+	if (!MyConnect(client))
+		return;
+
+	sendto_one(client, NULL, "HTTP/1.1 301 Moved Permanently");
+	sendto_one(client, NULL, "Location: %s\r\n\r\n", cfg.url);
+	dead_socket(client, "Connection closed");
+}
diff --git a/src/modules/websocket.c b/src/modules/websocket.c
new file mode 100644
index 0000000..c966b39
--- /dev/null
+++ b/src/modules/websocket.c
@@ -0,0 +1,786 @@
+/*
+ * websocket - WebSocket support (RFC6455)
+ * (C)Copyright 2016 Bram Matthys and the UnrealIRCd team
+ * License: GPLv2
+ * This module was sponsored by Aberrant Software Inc.
+ */
+   
+#include "unrealircd.h"
+#include <limits.h>
+
+#define WEBSOCKET_VERSION "1.0.0"
+
+ModuleHeader MOD_HEADER
+  = {
+	"websocket",
+	WEBSOCKET_VERSION,
+	"WebSocket support (RFC6455)",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+#if CHAR_MIN < 0
+ #error "In UnrealIRCd char should always be unsigned. Check your compiler"
+#endif
+
+typedef struct WebSocketUser WebSocketUser;
+struct WebSocketUser {
+	char get; /**< GET initiated */
+	char handshake_completed; /**< Handshake completed, use data frames */
+	char *handshake_key; /**< Handshake key (used during handshake) */
+	char *lefttoparse; /**< Leftover buffer to parse */
+	int lefttoparselen; /**< Length of lefttoparse buffer */
+};
+
+#define WEBSOCKET_TYPE_BINARY	0x1
+#define WEBSOCKET_TYPE_TEXT	0x2
+
+#define WSU(client)	((WebSocketUser *)moddata_client(client, websocket_md).ptr)
+
+#define WEBSOCKET_TYPE(client)	((client->local && client->local->listener) ? client->local->listener->websocket_options : 0)
+
+#define WEBSOCKET_MAGIC_KEY "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" /* see RFC6455 */
+
+#define WSOP_CONTINUATION 0x00
+#define WSOP_TEXT         0x01
+#define WSOP_BINARY       0x02
+#define WSOP_CLOSE        0x08
+#define WSOP_PING         0x09
+#define WSOP_PONG         0x0a
+
+/* Forward declarations */
+int websocket_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs);
+int websocket_config_run_ex(ConfigFile *cf, ConfigEntry *ce, int type, void *ptr);
+int websocket_packet_out(Client *from, Client *to, Client *intended_to, char **msg, int *length);
+int websocket_packet_in(Client *client, char *readbuf, int *length);
+void websocket_mdata_free(ModData *m);
+int websocket_handle_packet(Client *client, char *readbuf, int length);
+int websocket_handle_handshake(Client *client, char *readbuf, int *length);
+int websocket_complete_handshake(Client *client);
+int websocket_handle_packet_ping(Client *client, char *buf, int len);
+int websocket_handle_packet_pong(Client *client, char *buf, int len);
+int websocket_create_frame(int opcode, char **buf, int *len);
+int websocket_send_frame(Client *client, int opcode, char *buf, int len);
+
+/* Global variables */
+ModDataInfo *websocket_md;
+
+MOD_TEST()
+{
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGTEST, 0, websocket_config_test);
+	return MOD_SUCCESS;
+}
+
+MOD_INIT()
+{
+	ModDataInfo mreq;
+
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+
+	HookAdd(modinfo->handle, HOOKTYPE_CONFIGRUN_EX, 0, websocket_config_run_ex);
+	HookAdd(modinfo->handle, HOOKTYPE_PACKET, 0, websocket_packet_out);
+	HookAdd(modinfo->handle, HOOKTYPE_RAWPACKET_IN, 0, websocket_packet_in);
+
+	memset(&mreq, 0, sizeof(mreq));
+	mreq.name = "websocket";
+	mreq.serialize = NULL;
+	mreq.unserialize = NULL;
+	mreq.free = websocket_mdata_free;
+	mreq.sync = 0;
+	mreq.type = MODDATATYPE_CLIENT;
+	websocket_md = ModDataAdd(modinfo->handle, mreq);
+
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+#ifndef CheckNull
+ #define CheckNull(x) if ((!(x)->ce_vardata) || (!(*((x)->ce_vardata)))) { config_error("%s:%i: missing parameter", (x)->ce_fileptr->cf_filename, (x)->ce_varlinenum); errors++; continue; }
+#endif
+
+int websocket_config_test(ConfigFile *cf, ConfigEntry *ce, int type, int *errs)
+{
+	int errors = 0;
+	ConfigEntry *cep;
+	int has_type = 0;
+	static char errored_once_nick = 0;
+
+	if (type != CONFIG_LISTEN_OPTIONS)
+		return 0;
+
+	/* We are only interrested in listen::options::websocket.. */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "websocket"))
+		return 0;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "type"))
+		{
+			CheckNull(cep);
+			has_type = 1;
+			if (!strcmp(cep->ce_vardata, "text"))
+			{
+				if (non_utf8_nick_chars_in_use && !errored_once_nick)
+				{
+					/* This one is a hard error, since the consequences are grave */
+					config_error("You have a websocket listener with type 'text' AND your set::allowed-nickchars contains at least one non-UTF8 character set.");
+					config_error("This is a very BAD idea as this makes your websocket vulnerable to UTF8 conversion attacks. "
+					             "This can cause things like unkickable users and 'ghosts' for websocket users.");
+					config_error("You have 4 options: 1) Remove the websocket listener, 2) Use websocket type 'binary', "
+					             "3) Remove the non-UTF8 character set from set::allowed-nickchars, 4) Replace the non-UTF8 with an UTF8 character set in set::allowed-nickchars");
+					config_error("For more details see https://www.unrealircd.org/docs/WebSocket_support#websockets-and-non-utf8");
+					errored_once_nick = 1;
+					errors++;
+				}
+			}
+			else if (!strcmp(cep->ce_vardata, "binary"))
+			{
+			}
+			else
+			{
+				config_error("%s:%i: listen::options::websocket::type must be either 'binary' or 'text' (not '%s')",
+					cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_vardata);
+				errors++;
+			}
+		} else
+		{
+			config_error("%s:%i: unknown directive listen::options::websocket::%s",
+				cep->ce_fileptr->cf_filename, cep->ce_varlinenum, cep->ce_varname);
+			errors++;
+			continue;
+		}
+	}
+
+	if (!has_type)
+	{
+		config_error("%s:%i: websocket set, but type unspecified. Use something like: listen { ip *; port 443; websocket { type text; } }",
+			ce->ce_fileptr->cf_filename, ce->ce_varlinenum);
+		errors++;
+	}
+
+	*errs = errors;
+	return errors ? -1 : 1;
+}
+
+int websocket_config_run_ex(ConfigFile *cf, ConfigEntry *ce, int type, void *ptr)
+{
+	ConfigEntry *cep, *cepp;
+	ConfigItem_listen *l;
+	static char warned_once_channel = 0;
+
+	if (type != CONFIG_LISTEN_OPTIONS)
+		return 0;
+
+	/* We are only interrested in listen::options::websocket.. */
+	if (!ce || !ce->ce_varname || strcmp(ce->ce_varname, "websocket"))
+		return 0;
+
+	l = (ConfigItem_listen *)ptr;
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "type"))
+		{
+			if (!strcmp(cep->ce_vardata, "binary"))
+				l->websocket_options = WEBSOCKET_TYPE_BINARY;
+			else if (!strcmp(cep->ce_vardata, "text"))
+			{
+				l->websocket_options = WEBSOCKET_TYPE_TEXT;
+				if ((tempiConf.allowed_channelchars == ALLOWED_CHANNELCHARS_ANY) && !warned_once_channel)
+				{
+					/* This one is a warning, since the consequences are less grave than with nicks */
+					config_warn("You have a websocket listener with type 'text' AND your set::allowed-channelchars is set to 'any'.");
+					config_warn("This is not a recommended combination as this makes your websocket vulnerable to UTF8 conversion attacks. "
+					            "This can cause things like unpartable channels for websocket users.");
+					config_warn("It is highly recommended that you use set { allowed-channelchars utf8; }");
+					config_warn("For more details see https://www.unrealircd.org/docs/WebSocket_support#websockets-and-non-utf8");
+					warned_once_channel = 1;
+				}
+			}
+		}
+	}
+	return 1;
+}
+
+/** UnrealIRCd internals: free WebSocketUser object. */
+void websocket_mdata_free(ModData *m)
+{
+	WebSocketUser *wsu = (WebSocketUser *)m->ptr;
+	if (wsu)
+	{
+		safe_free(wsu->handshake_key);
+		safe_free(wsu->lefttoparse);
+		safe_free(m->ptr);
+	}
+}
+
+/** Outgoing packet hook.
+ * This transforms the output to be Websocket-compliant, if necessary.
+ */
+int websocket_packet_out(Client *from, Client *to, Client *intended_to, char **msg, int *length)
+{
+	if (MyConnect(to) && WSU(to) && WSU(to)->handshake_completed)
+	{
+		if (WEBSOCKET_TYPE(to) == WEBSOCKET_TYPE_BINARY)
+			websocket_create_frame(WSOP_BINARY, msg, length);
+		else if (WEBSOCKET_TYPE(to) == WEBSOCKET_TYPE_TEXT)
+		{
+			/* Some more conversions are needed */
+			char *safe_msg = unrl_utf8_make_valid(*msg);
+			*msg = safe_msg;
+			*length = *msg ? strlen(safe_msg) : 0;
+			websocket_create_frame(WSOP_TEXT, msg, length);
+		}
+		return 0;
+	}
+	return 0;
+}
+
+int websocket_handle_websocket(Client *client, char *readbuf2, int length2)
+{
+	int n;
+	char *ptr;
+	int length;
+	int length1 = WSU(client)->lefttoparselen;
+	char readbuf[4096];
+
+	length = length1 + length2;
+	if (length > sizeof(readbuf)-1)
+	{
+		dead_socket(client, "Illegal buffer stacking/Excess flood");
+		return 0;
+	}
+
+	if (length1 > 0)
+		memcpy(readbuf, WSU(client)->lefttoparse, length1);
+	memcpy(readbuf+length1, readbuf2, length2);
+
+	safe_free(WSU(client)->lefttoparse);
+	WSU(client)->lefttoparselen = 0;
+
+	ptr = readbuf;
+	do {
+		n = websocket_handle_packet(client, ptr, length);
+		if (n < 0)
+			return -1; /* killed -- STOP processing */
+		if (n == 0)
+		{
+			/* Short read. Stop processing for now, but save data for next time */
+			safe_free(WSU(client)->lefttoparse);
+			WSU(client)->lefttoparse = safe_alloc(length);
+			WSU(client)->lefttoparselen = length;
+			memcpy(WSU(client)->lefttoparse, ptr, length);
+			return 0;
+		}
+		length -= n;
+		ptr += n;
+		if (length < 0)
+			abort(); /* less than 0 is impossible */
+	} while(length > 0);
+
+	return 0;
+}
+
+/** Incoming packet hook.
+ * This processes Websocket frames, if this is a websocket connection.
+ * NOTE The different return values:
+ * -1 means: don't touch this client anymore, it has or might have been killed!
+ * 0 means: don't process this data, but you can read another packet if you want
+ * >0 means: process this data (regular IRC data, non-websocket stuff)
+ */
+int websocket_packet_in(Client *client, char *readbuf, int *length)
+{
+	if ((client->local->receiveM == 0) && WEBSOCKET_TYPE(client) && !WSU(client) && (*length > 8) && !strncmp(readbuf, "GET ", 4))
+	{
+		/* Allocate a new WebSocketUser struct for this session */
+		moddata_client(client, websocket_md).ptr = safe_alloc(sizeof(WebSocketUser));
+		WSU(client)->get = 1;
+	}
+
+	if (!WSU(client))
+		return 1; /* "normal" IRC client */
+
+	if (WSU(client)->handshake_completed)
+		return websocket_handle_websocket(client, readbuf, *length);
+	/* else.. */
+	return websocket_handle_handshake(client, readbuf, length);
+}
+
+/** Helper function to parse the HTTP header consisting of multiple 'Key: value' pairs */
+int websocket_handshake_helper(char *buffer, int len, char **key, char **value, char **lastloc, int *end_of_request)
+{
+	static char buf[4096], *nextptr;
+	char *p;
+	char *k = NULL, *v = NULL;
+	int foundlf = 0;
+
+	if (buffer)
+	{
+		/* Initialize */
+		if (len > sizeof(buf) - 1)
+			len = sizeof(buf) - 1;
+
+		memcpy(buf, buffer, len);
+		buf[len] = '\0';
+		nextptr = buf;
+	}
+
+	*end_of_request = 0;
+
+	p = nextptr;
+
+	if (!p)
+	{
+		*key = *value = NULL;
+		return 0; /* done processing data */
+	}
+
+	if (!strncmp(p, "\n", 1) || !strncmp(p, "\r\n", 2))
+	{
+		*key = *value = NULL;
+		*end_of_request = 1;
+		return 0;
+	}
+
+	/* Note: p *could* point to the NUL byte ('\0') */
+
+	/* Special handling for GET line itself. */
+	if (!strncmp(p, "GET ", 4))
+	{
+		k = "GET";
+		p += 4;
+		v = p; /* SET VALUE */
+		nextptr = NULL; /* set to "we are done" in case next for loop fails */
+		for (; *p; p++)
+		{
+			if (*p == ' ')
+			{
+				*p = '\0'; /* terminate before "HTTP/1.X" part */
+			}
+			else if (*p == '\r')
+			{
+				*p = '\0'; /* eat silently, but don't consider EOL */
+			}
+			else if (*p == '\n')
+			{
+				*p = '\0';
+				nextptr = p+1; /* safe, there is data or at least a \0 there */
+				break;
+			}
+		}
+		*key = k;
+		*value = v;
+		return 1;
+	}
+
+	/* Header parsing starts here.
+	 * Example line "Host: www.unrealircd.org"
+	 */
+	k = p; /* SET KEY */
+
+	/* First check if the line contains a terminating \n. If not, don't process it
+	 * as it may have been a cut header.
+	 */
+	for (; *p; p++)
+	{
+		if (*p == '\n')
+		{
+			foundlf = 1;
+			break;
+		}
+	}
+
+	if (!foundlf)
+	{
+		*key = *value = NULL;
+		*lastloc = k;
+		return 0;
+	}
+
+	p = k;
+
+	for (; *p; p++)
+	{
+		if ((*p == '\n') || (*p == '\r'))
+		{
+			/* Reached EOL but 'value' not found */
+			*p = '\0';
+			break;
+		}
+		if (*p == ':')
+		{
+			*p++ = '\0';
+			if (*p++ != ' ')
+				break; /* missing mandatory space after ':' */
+
+			v = p; /* SET VALUE */
+			nextptr = NULL; /* set to "we are done" in case next for loop fails */
+			for (; *p; p++)
+			{
+				if (*p == '\r')
+				{
+					*p = '\0'; /* eat silently, but don't consider EOL */
+				}
+				else if (*p == '\n')
+				{
+					*p = '\0';
+					nextptr = p+1; /* safe, there is data or at least a \0 there */
+					break;
+				}
+			}
+			/* A key-value pair was succesfully parsed, return it */
+			*key = k;
+			*value = v;
+			return 1;
+		}
+	}
+
+	/* Fatal parse error */
+	*key = *value = NULL;
+	return 0;
+}
+
+/** Handle client GET WebSocket handshake.
+ * Yes, I'm going to assume that the header fits in one packet and one packet only.
+ */
+int websocket_handle_handshake(Client *client, char *readbuf, int *length)
+{
+	char *key, *value;
+	int r, end_of_request;
+	char netbuf[2048];
+	char *lastloc = NULL;
+	int n, maxcopy, nprefix=0;
+
+	/** Frame re-assembling starts here **/
+	*netbuf = '\0';
+	if (WSU(client)->lefttoparse)
+	{
+		strlcpy(netbuf, WSU(client)->lefttoparse, sizeof(netbuf));
+		nprefix = strlen(netbuf);
+	}
+	maxcopy = sizeof(netbuf) - nprefix - 1;
+	/* (Need to some manual checking here as strlen() can't be safely used
+	 *  on readbuf. Same is true for strlncat since it uses strlen().)
+	 */
+	n = *length;
+	if (n > maxcopy)
+		n = maxcopy;
+	if (n <= 0)
+	{
+		dead_socket(client, "Oversized line");
+		return -1;
+	}
+	memcpy(netbuf+nprefix, readbuf, n); /* SAFE: see checking above */
+	netbuf[n+nprefix] = '\0';
+	safe_free(WSU(client)->lefttoparse);
+
+	/** Now step through the lines.. **/
+	for (r = websocket_handshake_helper(netbuf, strlen(netbuf), &key, &value, &lastloc, &end_of_request);
+	     r;
+	     r = websocket_handshake_helper(NULL, 0, &key, &value, &lastloc, &end_of_request))
+	{
+		if (!strcasecmp(key, "Sec-WebSocket-Key"))
+		{
+			if (strchr(value, ':'))
+			{
+				/* This would cause unserialization issues. Should be base64 anyway */
+				dead_socket(client, "Invalid characters in Sec-WebSocket-Key");
+				return -1;
+			}
+			safe_strdup(WSU(client)->handshake_key, value);
+		}
+	}
+
+	if (end_of_request)
+	{
+		if (!WSU(client)->handshake_key)
+		{
+			if (is_module_loaded("webredir"))
+			{
+				char *parx[2] = { NULL, NULL };
+				do_cmd(client, NULL, "GET", 1, parx);
+			}
+			dead_socket(client, "Invalid WebSocket request");
+			return -1;
+		}
+		websocket_complete_handshake(client);
+		return 0;
+	}
+
+	if (lastloc)
+	{
+		/* Last line was cut somewhere, save it for next round. */
+		safe_strdup(WSU(client)->lefttoparse, lastloc);
+	}
+	return 0; /* don't let UnrealIRCd process this */
+}
+
+/** Complete the handshake by sending the appropriate HTTP 101 response etc. */
+int websocket_complete_handshake(Client *client)
+{
+	char buf[512], hashbuf[64];
+	SHA_CTX hash;
+	char sha1out[20]; /* 160 bits */
+
+	WSU(client)->handshake_completed = 1;
+
+	snprintf(buf, sizeof(buf), "%s%s", WSU(client)->handshake_key, WEBSOCKET_MAGIC_KEY);
+	SHA1_Init(&hash);
+	SHA1_Update(&hash, buf, strlen(buf));
+	SHA1_Final(sha1out, &hash);
+
+	b64_encode(sha1out, sizeof(sha1out), hashbuf, sizeof(hashbuf));
+
+	snprintf(buf, sizeof(buf),
+	         "HTTP/1.1 101 Switching Protocols\r\n"
+	         "Upgrade: websocket\r\n"
+	         "Connection: Upgrade\r\n"
+	         "Sec-WebSocket-Accept: %s\r\n"
+	         "\r\n",
+	         hashbuf);
+
+	/* Caution: we bypass sendQ flood checking by doing it this way.
+	 * Risk is minimal, though, as we only permit limited text only
+	 * once per session.
+	 */
+	dbuf_put(&client->local->sendQ, buf, strlen(buf));
+	send_queued(client);
+
+	return 0;
+}
+
+/* Add LF (if needed) to a buffer. Max 4K. */
+void add_lf_if_needed(char **buf, int *len)
+{
+	static char newbuf[4096];
+	char *b = *buf;
+	int l = *len;
+
+	if (l <= 0)
+		return; /* too short */
+
+	if (b[l - 1] == '\n')
+		return; /* already contains \n */
+
+	if (l >= sizeof(newbuf)-2)
+		l = sizeof(newbuf)-2; /* cut-off if necessary */
+
+	memcpy(newbuf, b, l);
+	newbuf[l] = '\n';
+	newbuf[l + 1] = '\0'; /* not necessary, but I like zero termination */
+	l++;
+	*buf = newbuf; /* new buffer */
+	*len = l; /* new length */
+}
+
+/** WebSocket packet handler.
+ * For more information on the format, check out page 28 of RFC6455.
+ * @returns The number of bytes processed (the size of the frame)
+ *          OR 0 to indicate a possible short read (want more data)
+ *          OR -1 in case of an error.
+ */
+int websocket_handle_packet(Client *client, char *readbuf, int length)
+{
+	char opcode; /**< Opcode */
+	char masked; /**< Masked */
+	int len; /**< Length of the packet */
+	char maskkey[4]; /**< Key used for masking */
+	char *p, *payload;
+	int total_packet_size;
+
+	if (length < 4)
+	{
+		/* WebSocket packet too short */
+		return 0;
+	}
+
+	/* fin    = readbuf[0] & 0x80; -- unused */
+	opcode = readbuf[0] & 0x7F;
+	masked = readbuf[1] & 0x80;
+	len    = readbuf[1] & 0x7F;
+	p = &readbuf[2]; /* point to next element */
+
+	/* actually 'fin' is unused.. we don't care. */
+
+	if (!masked)
+	{
+		dead_socket(client, "WebSocket packet not masked");
+		return -1; /* Having the masked bit set is required (RFC6455 p29) */
+	}
+
+	if (len == 127)
+	{
+		dead_socket(client, "WebSocket packet with insane size");
+		return -1; /* Packets requiring 64bit lengths are not supported. Would be insane. */
+	}
+
+	total_packet_size = len + 2 + 4; /* 2 for header, 4 for mask key, rest for payload */
+
+	/* Early (minimal) length check */
+	if (length < total_packet_size)
+	{
+		/* WebSocket frame too short */
+		return 0;
+	}
+
+	/* Len=126 is special. It indicates the data length is actually "126 or more" */
+	if (len == 126)
+	{
+		/* Extended payload length (16 bit). For packets of >=126 bytes */
+		len = (readbuf[2] << 8) + readbuf[3];
+		if (len < 126)
+		{
+			dead_socket(client, "WebSocket protocol violation (extended payload length too short)");
+			return -1; /* This is a violation (not a short read), see page 29 */
+		}
+		p += 2; /* advance pointer 2 bytes */
+
+		/* Need to check the length again, now it has changed: */
+		if (length < len + 4 + 4)
+		{
+			/* WebSocket frame too short */
+			return 0;
+		}
+		/* And update the packet size */
+		total_packet_size = len + 4 + 4; /* 4 for header, 4 for mask key, rest for payload */
+	}
+
+	memcpy(maskkey, p, 4);
+	p+= 4;
+	payload = (len > 0) ? p : NULL;
+
+	if (len > 0)
+	{
+		/* Unmask this thing (page 33, section 5.3) */
+		int n;
+		char v;
+		for (n = 0; n < len; n++)
+		{
+			v = *p;
+			*p++ = v ^ maskkey[n % 4];
+		}
+	}
+
+	switch(opcode)
+	{
+		case WSOP_CONTINUATION:
+		case WSOP_TEXT:
+		case WSOP_BINARY:
+			if (len > 0)
+			{
+				add_lf_if_needed(&payload, &len);
+				if (!process_packet(client, payload, len, 1)) /* let UnrealIRCd process this data */
+					return -1; /* fatal error occured (such as flood kill) */
+			}
+			return total_packet_size;
+
+		case WSOP_CLOSE:
+			dead_socket(client, "Connection closed"); /* TODO: Improve I guess */
+			return -1;
+
+		case WSOP_PING:
+			if (websocket_handle_packet_ping(client, payload, len) < 0)
+				return -1;
+			return total_packet_size;
+
+		case WSOP_PONG:
+			if (websocket_handle_packet_pong(client, payload, len) < 0)
+				return -1;
+			return total_packet_size;
+
+		default:
+			dead_socket(client, "WebSocket: Unknown opcode");
+			return -1;
+	}
+
+	return -1; /* NOTREACHED */
+}
+
+int websocket_handle_packet_ping(Client *client, char *buf, int len)
+{
+	if (len > 500)
+	{
+		dead_socket(client, "WebSocket: oversized PING request");
+		return -1;
+	}
+	websocket_send_frame(client, WSOP_PONG, buf, len);
+	client->local->since++; /* lag penalty of 1 second */
+	return 0;
+}
+
+int websocket_handle_packet_pong(Client *client, char *buf, int len)
+{
+	/* We don't care */
+	return 0;
+}
+
+/** Create a frame. Used for OUTGOING data. */
+int websocket_create_frame(int opcode, char **buf, int *len)
+{
+	static char sendbuf[8192];
+
+	sendbuf[0] = opcode | 0x80; /* opcode & final */
+
+	if (*len > sizeof(sendbuf) - 8)
+		abort(); /* should never happen (safety) */
+
+	/* strip LF */
+	if (*len > 0)
+	{
+		if (*(*buf + *len - 1) == '\n')
+			*len = *len - 1;
+	}
+	/* strip CR */
+	if (*len > 0)
+	{
+		if (*(*buf + *len - 1) == '\r')
+			*len = *len - 1;
+	}
+
+	if (*len < 126)
+	{
+		/* Short payload */
+		sendbuf[1] = (char)*len;
+		memcpy(&sendbuf[2], *buf, *len);
+		*buf = sendbuf;
+		*len += 2;
+	} else {
+		/* Long payload */
+		sendbuf[1] = 126;
+		sendbuf[2] = (char)((*len >> 8) & 0xFF);
+		sendbuf[3] = (char)(*len & 0xFF);
+		memcpy(&sendbuf[4], *buf, *len);
+		*buf = sendbuf;
+		*len += 4;
+	}
+	return 0;
+}
+
+/** Create and send a frame */
+int websocket_send_frame(Client *client, int opcode, char *buf, int len)
+{
+	char *b = buf;
+	int l = len;
+
+	if (websocket_create_frame(opcode, &b, &l) < 0)
+		return -1;
+
+	if (DBufLength(&client->local->sendQ) > get_sendq(client))
+	{
+		dead_socket(client, "Max SendQ exceeded");
+		return -1;
+	}
+
+	dbuf_put(&client->local->sendQ, b, l);
+	send_queued(client);
+	return 0;
+}
diff --git a/src/modules/who_old.c b/src/modules/who_old.c
new file mode 100644
index 0000000..df21686
--- /dev/null
+++ b/src/modules/who_old.c
@@ -0,0 +1,865 @@
+/*   src/modules/who_old.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free softwmare; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* rewritten 06/02 by larne, the old one was unreadable. */
+/* changed indentation + some parts rewritten by Syzop. */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_who);
+
+/* Place includes here */
+#define MSG_WHO 	"WHO"
+
+ModuleHeader MOD_HEADER
+  = {
+	"who_old",	/* Name of module */
+	"5.0", /* Version */
+	"command /who (old version)", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	if (!CommandAdd(modinfo->handle, MSG_WHO, cmd_who, MAXPARA, CMD_USER))
+	{
+		config_warn("You cannot load both the cmd_whox and cmd_who module. You should ONLY load the cmd_whox module.");
+		return MOD_FAILED;
+	}
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+static void do_channel_who(Client *client, Channel *channel, char *mask);
+static void make_who_status(Client *, Client *, Channel *, Member *, char *, int);
+static void do_other_who(Client *client, char *mask);
+static void send_who_reply(Client *, Client *, char *, char *, char *);
+static char *first_visible_channel(Client *, Client *, int *);
+static int parse_who_options(Client *, int, char**);
+static void who_sendhelp(Client *);
+
+#define WF_OPERONLY  0x01 /**< only show opers */
+#define WF_ONCHANNEL 0x02 /**< we're on the channel we're /who'ing */
+#define WF_WILDCARD  0x04 /**< a wildcard /who */
+#define WF_REALHOST  0x08 /**< want real hostnames */
+#define WF_IP	     0x10 /**< want IP addresses */
+
+static int who_flags;
+
+#define WHO_CANTSEE 0x01 /**< set if we can't see them */
+#define WHO_CANSEE  0x02 /**< set if we can */
+#define WHO_OPERSEE 0x04 /**< set if we only saw them because we're an oper */
+
+#define FVC_HIDDEN  0x01
+
+#define WHO_WANT 1
+#define WHO_DONTWANT 2
+#define WHO_DONTCARE 0
+
+struct {
+	int want_away;
+	int want_channel;
+	char *channel; /**< if they want one */
+	int want_gecos;
+	char *gecos;
+	int want_server;
+	char *server;
+	int want_host;
+	char *host;
+	int want_nick;
+	char *nick;
+	int want_user;
+	char *user;
+	int want_ip;
+	char *ip;
+	int want_port;
+	int port;
+	int want_umode;
+	int umodes_dontwant;
+	int umodes_want;
+	int common_channels_only;
+} wfl;
+
+/** The /who command: retrieves information from users. */
+CMD_FUNC(cmd_who)
+{
+	Channel *target_channel;
+	char *mask = parv[1];
+	char star[] = "*";
+	int i = 0;
+
+	if (!MyUser(client))
+		return;
+
+	who_flags = 0;
+	memset(&wfl, 0, sizeof(wfl));
+
+	if (parc > 1)
+	{
+		i = parse_who_options(client, parc - 1, parv + 1);
+		if (i < 0)
+		{
+			sendnumeric(client, RPL_ENDOFWHO, mask);
+			return;
+		}
+	}
+
+	if (parc-i < 2 || strcmp(parv[1 + i], "0") == 0)
+		mask = star;
+	else
+		mask = parv[1 + i];
+
+	if (!i && parc > 2 && *parv[2] == 'o')
+		who_flags |= WF_OPERONLY;
+
+	collapse(mask);
+
+	if (*mask == '\0')
+	{
+		/* no mask given */
+		sendnumeric(client, RPL_ENDOFWHO, "*");
+		return;
+	}
+
+	if ((target_channel = find_channel(mask, NULL)) != NULL)
+	{
+		do_channel_who(client, target_channel, mask);
+		sendnumeric(client, RPL_ENDOFWHO, mask);
+		return;
+	}
+
+	if (wfl.channel && wfl.want_channel == WHO_WANT && 
+	    (target_channel = find_channel(wfl.channel, NULL)) != NULL)
+	{
+		do_channel_who(client, target_channel, mask);
+		sendnumeric(client, RPL_ENDOFWHO, mask);
+		return;
+	}
+	else
+	{
+		do_other_who(client, mask);
+		sendnumeric(client, RPL_ENDOFWHO, mask);
+		return;
+	}
+
+	return;
+}
+
+static void who_sendhelp(Client *client)
+{
+  char *who_help[] = {
+    "/WHO [+|-][achmnsuM] [args]",
+    "Flags are specified like channel modes, the flags chmnsu all have arguments",
+    "Flags are set to a positive check by +, a negative check by -",
+    "The flags work as follows:",
+    "Flag a: user is away",
+    "Flag c <channel>:       user is on <channel>,",
+    "                        no wildcards accepted",
+    "Flag h <host>:          user has string <host> in their hostname,",
+    "                        wildcards accepted",
+    "Flag m <usermodes>:     user has <usermodes> set, only",
+    "                        O/o/C/A/a/N/B are allowed",
+    "Flag n <nick>:          user has string <nick> in their nickname,",
+    "                        wildcards accepted",
+    "Flag s <server>:        user is on server <server>,",
+    "                        wildcards not accepted",
+    "Flag u <user>:          user has string <user> in their username,",
+    "                        wildcards accepted",
+    "Behavior flags:",
+    "Flag M: check for user in channels I am a member of",
+    NULL
+  };
+
+  char *who_oper_help[] = {
+    "/WHO [+|-][acghimnsuMRI] [args]",
+    "Flags are specified like channel modes, the flags chigmnsu all have arguments",
+    "Flags are set to a positive check by +, a negative check by -",
+    "The flags work as follows:",
+    "Flag a: user is away",
+    "Flag c <channel>:       user is on <channel>,",
+    "                        no wildcards accepted",
+    "Flag g <gcos/realname>: user has string <gcos> in their GCOS,",
+    "                        wildcards accepted",
+    "Flag h <host>:          user has string <host> in their hostname,",
+    "                        wildcards accepted",
+    "Flag i <ip>:            user has string <ip> in their IP address,",
+    "                        wildcards accepted",
+    "Flag p <port>:          user is connecting on port <port>,",
+    "                        local connections only",
+    "Flag m <usermodes>:     user has <usermodes> set",
+    "Flag n <nick>:          user has string <nick> in their nickname,",
+    "                        wildcards accepted",
+    "Flag s <server>:        user is on server <server>,",
+    "                        wildcards not accepted",
+    "Flag u <user>:          user has string <user> in their username,",
+    "                        wildcards accepted",
+    "Behavior flags:",
+    "Flag M: check for user in channels I am a member of",
+    "Flag R: show users' real hostnames",
+    "Flag I: show users' IP addresses",
+    NULL
+  };
+  char **s;
+
+	if (IsOper(client))
+		s = who_oper_help;
+	else
+		s = who_help;
+
+	for (; *s; s++)
+		sendnumeric(client, RPL_LISTSYNTAX, *s);
+}
+
+#define WHO_ADD 1
+#define WHO_DEL 2
+
+static int parse_who_options(Client *client, int argc, char **argv)
+{
+char *s = argv[0];
+int what = WHO_ADD;
+int i = 1;
+
+/* A few helper macro's because this is used a lot, added during recode by Syzop. */
+
+/** function requiress a parameter: check if there's one, if not: return -1. */
+#define REQUIRE_PARAM() { if (i >= argc) { \
+                           who_sendhelp(client); \
+                           return -1; \
+                      } } while(0);
+/** set option 'x' depending on 'what' (add/want or del/dontwant) */
+#define SET_OPTION(x) { if (what == WHO_ADD) \
+                           x = WHO_WANT; \
+                      else \
+                           x = WHO_DONTWANT; \
+                      } while(0);
+/** Eat a param, set the param in memory and set the option to want or dontwant */
+#define DOIT(x,y) { REQUIRE_PARAM(); x = argv[i]; SET_OPTION(y); i++; } while(0);
+
+	if (*s != '-' && *s != '+')
+		return 0;
+
+	while (*s)
+ 	{
+		switch (*s)
+		{
+			case '+':
+	  			what = WHO_ADD;
+	  			break;
+			case '-':
+				what = WHO_DEL;
+				break;
+			case 'a':
+				SET_OPTION(wfl.want_away);
+				break;
+			case 'c':
+				DOIT(wfl.channel, wfl.want_channel);
+				break;
+			case 'g':
+				REQUIRE_PARAM()
+				if (!IsOper(client))
+					break; /* oper-only */
+				wfl.gecos = argv[i];
+				SET_OPTION(wfl.want_gecos);
+				i++;
+				break;
+			case 's':
+				DOIT(wfl.server, wfl.want_server);
+				break;
+			case 'h':
+				DOIT(wfl.host, wfl.want_host);
+				break;
+			case 'i':
+				REQUIRE_PARAM()
+				if (!IsOper(client))
+					break; /* oper-only */
+				wfl.ip = argv[i];
+				SET_OPTION(wfl.want_ip);
+				i++;
+				break;
+			case 'n':
+				DOIT(wfl.nick, wfl.want_nick);
+				break;
+			case 'u':
+				DOIT(wfl.user, wfl.want_user);
+				break;
+			case 'm':
+				REQUIRE_PARAM()
+				{
+					char *s = argv[i];
+					int *umodes;
+
+					if (what == WHO_ADD)
+						umodes = &wfl.umodes_want;
+					else
+						umodes = &wfl.umodes_dontwant;
+
+					while (*s)
+					{
+					int i;
+						for (i = 0; i <= Usermode_highest; i++)
+							if (*s == Usermode_Table[i].flag)
+							{
+								*umodes |= Usermode_Table[i].mode;
+								break;
+							}
+					s++;
+					}
+
+					if (!IsOper(client))
+						*umodes = *umodes & UMODE_OPER; /* these are usermodes regular users may search for. just oper now. */
+					if (*umodes == 0)
+						return -1;
+				}
+				i++;
+				break;
+			case 'p':
+				REQUIRE_PARAM()
+				if (!IsOper(client))
+					break; /* oper-only */
+				wfl.port = atoi(argv[i]);
+				SET_OPTION(wfl.want_port);
+				i++;
+				break;
+			case 'M':
+				SET_OPTION(wfl.common_channels_only);
+				break;
+			case 'R':
+				if (!IsOper(client))
+					break;
+				if (what == WHO_ADD)
+					who_flags |= WF_REALHOST;
+				else
+					who_flags &= ~WF_REALHOST;
+				break;
+			case 'I':
+				if (!IsOper(client))
+					break;
+				if (what == WHO_ADD)
+					who_flags |= WF_IP;
+				
+				else
+					who_flags &= ~WF_IP;
+				break;
+			default:
+				who_sendhelp(client);
+				return -1;
+		}
+		s++;
+    }
+
+  return i;
+#undef REQUIRE_PARAM
+#undef SET_OPTION
+#undef DOIT
+}
+
+static int can_see(Client *requester, Client *target, Channel *channel)
+{
+	int ret = 0;
+	char has_common_chan = 0;
+
+	do {
+		/* can only see people */
+		if (!IsUser(target))
+			return WHO_CANTSEE;
+
+		/* can only see opers if thats what they want */
+		if (who_flags & WF_OPERONLY)
+		{
+			if (!IsOper(target))
+				return ret | WHO_CANTSEE;
+			if (IsHideOper(target)) {
+				if (IsOper(requester))
+					ret |= WHO_OPERSEE;
+				else
+					return ret | WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people who are away */
+		if ((wfl.want_away == WHO_WANT && !target->user->away) ||
+		    (wfl.want_away == WHO_DONTWANT && target->user->away))
+			return WHO_CANTSEE;
+
+		/* if they only want people on a certain channel. */
+		if (wfl.want_channel != WHO_DONTCARE)
+ 		{
+			Channel *chan = find_channel(wfl.channel, NULL);
+			if (!chan && wfl.want_channel == WHO_WANT)
+				return WHO_CANTSEE;
+			if ((wfl.want_channel == WHO_WANT) && !IsMember(target, chan))
+				return WHO_CANTSEE;
+			if ((wfl.want_channel == WHO_DONTWANT) && IsMember(target, chan))
+				return WHO_CANTSEE;
+		}
+
+		/* if they only want people with a certain gecos */
+		if (wfl.want_gecos != WHO_DONTCARE)
+		{
+			if (((wfl.want_gecos == WHO_WANT) && !match_simple(wfl.gecos, target->info)) ||
+			    ((wfl.want_gecos == WHO_DONTWANT) && match_simple(wfl.gecos, target->info)))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people with a certain server */
+		if (wfl.want_server != WHO_DONTCARE)
+		{
+			if (((wfl.want_server == WHO_WANT) && strcasecmp(wfl.server, target->user->server)) ||
+			    ((wfl.want_server == WHO_DONTWANT) && !strcasecmp(wfl.server, target->user->server)))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people with a certain host */
+		if (wfl.want_host != WHO_DONTCARE)
+		{
+			char *host;
+
+			if (IsOper(requester))
+				host = target->user->realhost;
+			else
+				host = GetHost(target);
+
+			if (((wfl.want_host == WHO_WANT) && !match_simple(wfl.host, host)) ||
+			    ((wfl.want_host == WHO_DONTWANT) && match_simple(wfl.host, host)))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people with a certain IP */
+		if (wfl.want_ip != WHO_DONTCARE)
+		{
+			char *ip;
+
+			ip = target->ip;
+			if (!ip)
+				return WHO_CANTSEE;
+
+			if (((wfl.want_ip == WHO_WANT) && !match_simple(wfl.ip, ip)) ||
+			    ((wfl.want_ip == WHO_DONTWANT) && match_simple(wfl.ip, ip)))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people connecting on a certain port */
+		if (wfl.want_port != WHO_DONTCARE)
+		{
+			int port;
+			
+			if (!MyUser(target))
+				return WHO_CANTSEE;
+
+			port = target->local->listener->port;
+
+			if (((wfl.want_port == WHO_WANT) && wfl.port != port) ||
+			    ((wfl.want_port == WHO_DONTWANT) && wfl.port == port))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people with a certain nick.. */
+		if (wfl.want_nick != WHO_DONTCARE)
+		{
+			if (((wfl.want_nick == WHO_WANT) && !match_simple(wfl.nick, target->name)) ||
+			    ((wfl.want_nick == WHO_DONTWANT) && match_simple(wfl.nick, target->name)))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people with a certain username */
+		if (wfl.want_user != WHO_DONTCARE)
+		{
+			if (((wfl.want_user == WHO_WANT) && !match_simple(wfl.user, target->user->username)) ||
+			    ((wfl.want_user == WHO_DONTWANT) && match_simple(wfl.user, target->user->username)))
+			{
+				return WHO_CANTSEE;
+			}
+		}
+
+		/* if they only want people with a certain umode */
+		if (wfl.umodes_want)
+		{
+			if (!(target->umodes & wfl.umodes_want) || (!IsOper(requester) && (target->umodes & UMODE_HIDEOPER)))
+				return WHO_CANTSEE;
+		}
+
+		if (wfl.umodes_dontwant)
+		{
+			if ((target->umodes & wfl.umodes_dontwant) && (!(target->umodes & UMODE_HIDEOPER) || IsOper(requester)))
+				return WHO_CANTSEE;
+		}
+
+		/* if they only want common channels */
+		if (wfl.common_channels_only)
+		{
+			if (!has_common_channels(requester, target))
+				return WHO_CANTSEE;
+			has_common_chan = 1;
+		}
+
+		if (channel)
+		{
+			int member = who_flags & WF_ONCHANNEL;
+
+			if (SecretChannel(channel) || HiddenChannel(channel))
+			{
+				/* if they aren't on it.. they can't see it */
+				if (!(who_flags & WF_ONCHANNEL))
+					break;
+			}
+			if (IsInvisible(target) && !member)
+				break;
+
+			if (!user_can_see_member(requester, target, channel))
+				break; /* invisible (eg: due to delayjoin) */
+		}
+		else
+		{
+			/* a user/mask who */
+
+			/* If the common channel info hasn't been set, set it now */
+			if (!wfl.common_channels_only)
+				has_common_chan = has_common_channels(requester, target);
+
+			if (IsInvisible(target) && !has_common_chan)
+			{
+				/* don't show them unless it's an exact match 
+				   or it is the user requesting the /who */
+				if ((who_flags & WF_WILDCARD) && requester != target)
+					break;
+			}
+		}
+
+		/* phew.. show them. */
+		return WHO_CANSEE;
+	} while (0);
+
+	/* if we get here, it's oper-dependant. */
+	if (IsOper(requester))
+		return ret | WHO_OPERSEE | WHO_CANSEE;
+	else
+	{
+		if (requester == target)
+			return ret | WHO_CANSEE;
+		else
+			return ret | WHO_CANTSEE;
+	}
+}
+
+static void do_channel_who(Client *client, Channel *channel, char *mask)
+{
+	Member *cm = channel->members;
+	if (IsMember(client, channel) || ValidatePermissionsForPath("channel:see:who:onchannel",client,NULL,channel,NULL))
+		who_flags |= WF_ONCHANNEL;
+
+	for (cm = channel->members; cm; cm = cm->next)
+	{
+		Client *acptr = cm->client;
+		char status[32];
+		int cansee;
+		if ((cansee = can_see(client, acptr, channel)) & WHO_CANTSEE)
+			continue;
+
+		make_who_status(client, acptr, channel, cm, status, cansee);
+		send_who_reply(client, acptr, channel->chname, status, "");
+    }
+}
+
+static void make_who_status(Client *client, Client *acptr, Channel *channel, 
+			    Member *cm, char *status, int cansee)
+{
+	int i = 0;
+	Hook *h;
+
+	if (acptr->user->away)
+		status[i++] = 'G';
+	else
+		status[i++] = 'H';
+
+	if (IsARegNick(acptr))
+		status[i++] = 'r';
+
+	if (IsSecureConnect(acptr))
+		status[i++] = 's';
+
+	for (h = Hooks[HOOKTYPE_WHO_STATUS]; h; h = h->next)
+	{
+		int ret = (*(h->func.intfunc))(client, acptr, channel, cm, status, cansee);
+		if (ret != 0)
+			status[i++] = (char)ret;
+	}
+	
+	if (IsOper(acptr) && (!IsHideOper(acptr) || client == acptr || IsOper(client)))
+		status[i++] = '*';
+
+	if (IsOper(acptr) && (IsHideOper(acptr) && client != acptr && IsOper(client)))
+		status[i++] = '!';
+  
+	if (cansee & WHO_OPERSEE)
+		status[i++] = '?';
+
+	if (cm)
+	{
+		if (HasCapability(client, "multi-prefix"))
+		{
+#ifdef PREFIX_AQ
+			if (cm->flags & CHFL_CHANOWNER)
+				status[i++] = '~';
+			if (cm->flags & CHFL_CHANADMIN)
+				status[i++] = '&';
+#endif
+			if (cm->flags & CHFL_CHANOP)
+				status[i++] = '@';
+			if (cm->flags & CHFL_HALFOP)
+				status[i++] = '%';
+			if (cm->flags & CHFL_VOICE)
+				status[i++] = '+';
+		} else {
+#ifdef PREFIX_AQ
+			if (cm->flags & CHFL_CHANOWNER)
+				status[i++] = '~';
+			else if (cm->flags & CHFL_CHANADMIN)
+				status[i++] = '&';
+			else
+#endif
+			if (cm->flags & CHFL_CHANOP)
+				status[i++] = '@';
+			else if (cm->flags & CHFL_HALFOP)
+				status[i++] = '%';
+			else if (cm->flags & CHFL_VOICE)
+				status[i++] = '+';
+		}
+	}
+
+	status[i] = '\0';
+}
+
+static void do_other_who(Client *client, char *mask)
+{
+int oper = IsOper(client);
+
+	if (strchr(mask, '*') || strchr(mask, '?'))
+	{
+		int i = 0;
+		/* go through all users.. */
+		Client *acptr;
+		who_flags |= WF_WILDCARD;
+
+		list_for_each_entry(acptr, &client_list, client_node)
+		{
+		int cansee;
+		char status[20];
+		char *channel;
+		int flg;
+
+			if (!IsUser(acptr))
+				continue;
+			if (!oper) {
+				/* non-opers can only search on nick here */
+				if (!match_simple(mask, acptr->name))
+					continue;
+			} else {
+				/* opers can search on name, ident, virthost, ip and realhost.
+				 * Yes, I like readable if's -- Syzop.
+				 */
+				if (match_simple(mask, acptr->name) || match_simple(mask, acptr->user->realhost) ||
+				    match_simple(mask, acptr->user->username))
+					goto matchok;
+				if (IsHidden(acptr) && match_simple(mask, acptr->user->virthost))
+					goto matchok;
+				if (acptr->ip && match_simple(mask, acptr->ip))
+					goto matchok;
+				/* nothing matched... */
+				continue;
+			}
+matchok:
+			if ((cansee = can_see(client, acptr, NULL)) & WHO_CANTSEE)
+				continue;
+			if (WHOLIMIT && !IsOper(client) && ++i > WHOLIMIT)
+			{
+				sendnumeric(client, ERR_WHOLIMEXCEED, WHOLIMIT);
+				return;
+			}
+
+			channel = first_visible_channel(client, acptr, &flg);
+			make_who_status(client, acptr, NULL, NULL, status, cansee);
+			send_who_reply(client, acptr, channel, status, (flg & FVC_HIDDEN) ? "~" : "");
+		}
+	}
+	else
+	{
+		/* just a single client (no wildcards detected) */
+		Client *acptr = find_client(mask, NULL);
+		int cansee;
+		char status[20];
+		char *channel;
+		int flg;
+
+		if (!acptr)
+			return;
+
+		if ((cansee = can_see(client, acptr, NULL)) == WHO_CANTSEE)
+			return;
+
+		channel = first_visible_channel(client, acptr, &flg);
+		make_who_status(client, acptr, NULL, NULL, status, cansee);
+		send_who_reply(client, acptr, channel, status, (flg & FVC_HIDDEN) ? "~" : "");
+	}
+}
+
+static void send_who_reply(Client *client, Client *acptr, 
+			   char *channel, char *status, char *xstat)
+{
+	char *stat;
+	char *host;
+	int flat = (FLAT_MAP && !IsOper(client)) ? 1 : 0;
+
+	stat = safe_alloc(strlen(status) + strlen(xstat) + 1);
+	sprintf(stat, "%s%s", status, xstat);
+
+	if (IsOper(client))
+	{
+		if (who_flags & WF_REALHOST)
+			host = acptr->user->realhost;
+		else if (who_flags & WF_IP)
+			host = (acptr->ip ? acptr->ip : acptr->user->realhost);
+		else
+			host = GetHost(acptr);
+	}
+	else
+		host = GetHost(acptr);
+					
+
+	if (IsULine(acptr) && !IsOper(client) && !ValidatePermissionsForPath("server:info:map:ulines",client,acptr,NULL,NULL) && HIDE_ULINES)
+	{
+	        sendnumeric(client, RPL_WHOREPLY,
+        	     channel,       /* channel name */
+	             acptr->user->username, /* user name */
+        	     host,		    /* hostname */
+	             "hidden",              /* let's hide the server from normal users if the server is a uline and HIDE_ULINES is on */
+        	     acptr->name,           /* nick */
+	             stat,                  /* status */
+        	     0,                     /* hops (hidden) */
+	             acptr->info            /* realname */
+             	);
+
+	} else {
+		sendnumeric(client, RPL_WHOREPLY,
+		     channel,       /* channel name */
+		     acptr->user->username,      /* user name */
+		     host,		         /* hostname */
+		     acptr->user->server,        /* server name */
+		     acptr->name,                /* nick */
+		     stat,                       /* status */
+		     flat ? 0 : acptr->hopcount, /* hops */ 
+		     acptr->info                 /* realname */
+		     );
+	}
+	safe_free(stat);
+}
+
+static char *first_visible_channel(Client *client, Client *acptr, int *flg)
+{
+	Membership *lp;
+
+	*flg = 0;
+
+	for (lp = acptr->user->channel; lp; lp = lp->next)
+	{
+		Channel *channel = lp->channel;
+		Hook *h;
+		int ret = EX_ALLOW;
+		int operoverride = 0;
+		int showchannel = 0;
+		
+		/* Note that the code below is almost identical to the one in /WHOIS */
+
+		if (ShowChannel(client, channel))
+			showchannel = 1;
+
+		for (h = Hooks[HOOKTYPE_SEE_CHANNEL_IN_WHOIS]; h; h = h->next)
+		{
+			int n = (*(h->func.intfunc))(client, acptr, channel);
+			/* Hook return values:
+			 * EX_ALLOW means 'yes is ok, as far as modules are concerned'
+			 * EX_DENY means 'hide this channel, unless oper overriding'
+			 * EX_ALWAYS_DENY means 'hide this channel, always'
+			 * ... with the exception that we always show the channel if you /WHOIS yourself
+			 */
+			if (n == EX_DENY)
+			{
+				ret = EX_DENY;
+			}
+			else if (n == EX_ALWAYS_DENY)
+			{
+				ret = EX_ALWAYS_DENY;
+				break;
+			}
+		}
+		
+		if (ret == EX_DENY)
+			showchannel = 0;
+		
+		if (!showchannel && (ValidatePermissionsForPath("channel:see:who:secret",client,NULL,channel,NULL) || ValidatePermissionsForPath("channel:see:whois",client,NULL,channel,NULL)))
+		{
+			showchannel = 1; /* OperOverride */
+			operoverride = 1;
+		}
+		
+		if ((ret == EX_ALWAYS_DENY) && (acptr != client))
+			continue; /* a module asked us to really not expose this channel, so we don't (except target==ourselves). */
+
+		if (acptr == client)
+			showchannel = 1;
+
+		if (operoverride)
+			*flg |= FVC_HIDDEN;
+
+		if (showchannel)
+			return channel->chname;
+	}
+
+	/* no channels that they can see */
+	return "*";
+}
diff --git a/src/modules/whois.c b/src/modules/whois.c
new file mode 100644
index 0000000..b739327
--- /dev/null
+++ b/src/modules/whois.c
@@ -0,0 +1,349 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/modules/whois.c
+ *   (C) 2000-2001 Carsten V. Munk and the UnrealIRCd Team
+ *   Moved to modules by Fish (Justin Hammond)
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+static char buf[BUFSIZE];
+
+CMD_FUNC(cmd_whois);
+
+#define MSG_WHOIS       "WHOIS"
+
+ModuleHeader MOD_HEADER
+  = {
+	"whois",	/* Name of module */
+	"5.0", /* Version */
+	"command /whois", /* Short description of module */
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+/* This is called on module init, before Server Ready */
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_WHOIS, cmd_whois, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+/* Is first run when server is 100% ready */
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* Called when module is unloaded */
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+
+/*
+** cmd_whois
+**	parv[1] = nickname masklist
+*/
+CMD_FUNC(cmd_whois)
+{
+	Membership *lp;
+	Client *target;
+	Channel *channel;
+	char *nick, *tmp, *name;
+	char *p = NULL;
+	int  found, len, mlen;
+	char querybuf[BUFSIZE];
+	int ntargets = 0;
+	int maxtargets = max_targets_for_command("WHOIS");
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NONICKNAMEGIVEN);
+		return;
+	}
+
+	if (parc > 2)
+	{
+		if (hunt_server(client, recv_mtags, ":%s WHOIS %s :%s", 1, parc, parv) != HUNTED_ISME)
+			return;
+		parv[1] = parv[2];
+	}
+
+	strlcpy(querybuf, parv[1], sizeof(querybuf));
+
+	for (tmp = canonize(parv[1]); (nick = strtoken(&p, tmp, ",")); tmp = NULL)
+	{
+		unsigned char showchannel, wilds, hideoper; /* <- these are all boolean-alike */
+
+		if (MyUser(client) && (++ntargets > maxtargets))
+		{
+			sendnumeric(client, ERR_TOOMANYTARGETS, nick, maxtargets, "WHOIS");
+			break;
+		}
+
+		found = 0;
+		/* We do not support "WHOIS *" */
+		wilds = (strchr(nick, '?') || strchr(nick, '*'));
+		if (wilds)
+			continue;
+
+		if ((target = find_client(nick, NULL)))
+		{
+			if (IsServer(target))
+				continue;
+			/*
+			 * I'm always last :-) and target->next == NULL!!
+			 */
+			if (IsMe(target))
+				break;
+			/*
+			 * 'Rules' established for sending a WHOIS reply:
+			 * - only send replies about common or public channels
+			 *   the target user(s) are on;
+			 */
+
+			if (!IsUser(target))
+				continue;
+
+			name = (!*target->name) ? "?" : target->name;
+
+			hideoper = 0;
+			if (IsHideOper(target) && (target != client) && !IsOper(client))
+				hideoper = 1;
+
+			sendnumeric(client, RPL_WHOISUSER, name,
+			    target->user->username,
+			    IsHidden(target) ? target->user->virthost : target->user->realhost,
+			    target->info);
+
+			if (IsOper(client) || target == client)
+			{
+				char sno[128];
+				strlcpy(sno, get_snomask_string(target), sizeof(sno));
+				
+				/* send the target user's modes */
+				sendnumeric(client, RPL_WHOISMODES, name,
+				    get_usermode_string(target), sno[1] == 0 ? "" : sno);
+			}
+			if ((target == client) || IsOper(client))
+			{
+				sendnumeric(client, RPL_WHOISHOST, target->name,
+					(MyConnect(target) && strcmp(target->ident, "unknown")) ? target->ident : "*",
+					target->user->realhost, target->ip ? target->ip : "");
+			}
+
+			if (IsARegNick(target))
+				sendnumeric(client, RPL_WHOISREGNICK, name);
+			
+			found = 1;
+			mlen = strlen(me.name) + strlen(client->name) + 10 + strlen(name);
+			for (len = 0, *buf = '\0', lp = target->user->channel; lp; lp = lp->next)
+			{
+				Hook *h;
+				int ret = EX_ALLOW;
+				int operoverride = 0;
+				
+				channel = lp->channel;
+				showchannel = 0;
+
+				if (ShowChannel(client, channel))
+					showchannel = 1;
+
+				for (h = Hooks[HOOKTYPE_SEE_CHANNEL_IN_WHOIS]; h; h = h->next)
+				{
+					int n = (*(h->func.intfunc))(client, target, channel);
+					/* Hook return values:
+					 * EX_ALLOW means 'yes is ok, as far as modules are concerned'
+					 * EX_DENY means 'hide this channel, unless oper overriding'
+					 * EX_ALWAYS_DENY means 'hide this channel, always'
+					 * ... with the exception that we always show the channel if you /WHOIS yourself
+					 */
+					if (n == EX_DENY)
+					{
+						ret = EX_DENY;
+					}
+					else if (n == EX_ALWAYS_DENY)
+					{
+						ret = EX_ALWAYS_DENY;
+						break;
+					}
+				}
+				
+				if (ret == EX_DENY)
+					showchannel = 0;
+				
+				if (!showchannel && (ValidatePermissionsForPath("channel:see:whois",client,NULL,channel,NULL)))
+				{
+					showchannel = 1; /* OperOverride */
+					operoverride = 1;
+				}
+				
+				if ((ret == EX_ALWAYS_DENY) && (target != client))
+					continue; /* a module asked us to really not expose this channel, so we don't (except target==ourselves). */
+
+				if (target == client)
+					showchannel = 1;
+
+				if (showchannel)
+				{
+					long access;
+					if (len + strlen(channel->chname) > (size_t)BUFSIZE - 4 - mlen)
+					{
+						sendto_one(client, NULL,
+						    ":%s %d %s %s :%s",
+						    me.name,
+						    RPL_WHOISCHANNELS,
+						    client->name, name, buf);
+						*buf = '\0';
+						len = 0;
+					}
+
+					if (operoverride)
+					{
+						/* '?' and '!' both mean we can see the channel in /WHOIS and normally wouldn't,
+						 * but there's still a slight difference between the two...
+						 */
+						if (!PubChannel(channel))
+						{
+							/* '?' means it's a secret/private channel (too) */
+							*(buf + len++) = '?';
+						}
+						else
+						{
+							/* public channel but hidden in WHOIS (umode +p, service bot, etc) */
+							*(buf + len++) = '!';
+						}
+					}
+
+					access = get_access(target, channel);
+					if (!MyUser(client) || !HasCapability(client, "multi-prefix"))
+					{
+#ifdef PREFIX_AQ
+						if (access & CHFL_CHANOWNER)
+							*(buf + len++) = '~';
+						else if (access & CHFL_CHANADMIN)
+							*(buf + len++) = '&';
+						else
+#endif
+						if (access & CHFL_CHANOP)
+							*(buf + len++) = '@';
+						else if (access & CHFL_HALFOP)
+							*(buf + len++) = '%';
+						else if (access & CHFL_VOICE)
+							*(buf + len++) = '+';
+					}
+					else
+					{
+#ifdef PREFIX_AQ
+						if (access & CHFL_CHANOWNER)
+							*(buf + len++) = '~';
+						if (access & CHFL_CHANADMIN)
+							*(buf + len++) = '&';
+#endif
+						if (access & CHFL_CHANOP)
+							*(buf + len++) = '@';
+						if (access & CHFL_HALFOP)
+							*(buf + len++) = '%';
+						if (access & CHFL_VOICE)
+							*(buf + len++) = '+';
+					}
+					if (len)
+						*(buf + len) = '\0';
+					strcpy(buf + len, channel->chname);
+					len += strlen(channel->chname);
+					strcat(buf + len, " ");
+					len++;
+				}
+			}
+
+			if (buf[0] != '\0')
+				sendnumeric(client, RPL_WHOISCHANNELS, name, buf); 
+
+                        if (!(IsULine(target) && !IsOper(client) && HIDE_ULINES))
+				sendnumeric(client, RPL_WHOISSERVER, name, target->user->server,
+				    target->srvptr ? target->srvptr->info : "*Not On This Net*");
+
+			if (target->user->away)
+				sendnumeric(client, RPL_AWAY, name, target->user->away);
+
+			if (IsOper(target) && !hideoper)
+			{
+				buf[0] = '\0';
+				if (IsOper(target))
+					strlcat(buf, "an IRC Operator", sizeof buf);
+
+				else
+					strlcat(buf, "a Local IRC Operator", sizeof buf);
+				if (buf[0])
+				{
+					if (IsOper(client) && MyUser(target))
+					{
+						char *operclass = "???";
+						ConfigItem_oper *oper = find_oper(target->user->operlogin);
+						if (oper && oper->operclass)
+							operclass = oper->operclass;
+						sendto_one(client, NULL,
+						    ":%s 313 %s %s :is %s (%s) [%s]", me.name,
+						    client->name, name, buf,
+						    target->user->operlogin ? target->user->operlogin : "unknown",
+						    operclass);
+					}
+					else
+						sendnumeric(client, RPL_WHOISOPERATOR, name, buf);
+				}
+			}
+
+			if (target->umodes & UMODE_SECURE)
+				sendnumeric(client, RPL_WHOISSECURE, name,
+					"is using a Secure Connection");
+			
+			RunHook2(HOOKTYPE_WHOIS, client, target);
+
+			if (target->user->swhois && !hideoper)
+			{
+				SWhois *s;
+				
+				for (s = target->user->swhois; s; s = s->next)
+					sendto_one(client, NULL, ":%s %d %s %s :%s",
+					    me.name, RPL_WHOISSPECIAL, client->name,
+					    name, s->line);
+			}
+
+			/*
+			 * display services account name if it's actually a services account name and
+			 * not a legacy timestamp.  --nenolod
+			 */
+			if (!isdigit(*target->user->svid))
+				sendnumeric(client, RPL_WHOISLOGGEDIN, name, target->user->svid);
+
+			/*
+			 * Umode +I hides an oper's idle time from regular users.
+			 * -Nath.
+			 */
+			if (MyConnect(target) && (IsOper(client) || !(target->umodes & UMODE_HIDLE)))
+			{
+				sendnumeric(client, RPL_WHOISIDLE, name,
+				    TStime() - target->local->last, target->local->firsttime);
+			}
+		}
+		if (!found)
+			sendnumeric(client, ERR_NOSUCHNICK, nick);
+	}
+	sendnumeric(client, RPL_ENDOFWHOIS, querybuf);
+}
diff --git a/src/modules/whowas.c b/src/modules/whowas.c
new file mode 100644
index 0000000..8cb41c6
--- /dev/null
+++ b/src/modules/whowas.c
@@ -0,0 +1,113 @@
+/*
+ *   IRC - Internet Relay Chat, src/modules/out.c
+ *   (C) 2004 The UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+CMD_FUNC(cmd_whowas);
+
+#define MSG_WHOWAS 	"WHOWAS"	
+
+ModuleHeader MOD_HEADER
+  = {
+	"whowas",
+	"5.0",
+	"command /whowas", 
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	CommandAdd(modinfo->handle, MSG_WHOWAS, cmd_whowas, MAXPARA, CMD_USER);
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/* externally defined functions */
+extern aWhowas MODVAR WHOWAS[NICKNAMEHISTORYLENGTH];
+extern aWhowas MODVAR *WHOWASHASH[WHOWAS_HASH_TABLE_SIZE];
+
+/*
+** cmd_whowas
+**      parv[1] = nickname queried
+*/
+CMD_FUNC(cmd_whowas)
+{
+	aWhowas *temp;
+	int  cur = 0;
+	int  max = -1, found = 0;
+	char *p, *nick;
+
+	if (parc < 2)
+	{
+		sendnumeric(client, ERR_NONICKNAMEGIVEN);
+		return;
+	}
+	if (parc > 2)
+		max = atoi(parv[2]);
+	if (parc > 3)
+		if (hunt_server(client, recv_mtags, ":%s WHOWAS %s %s :%s", 3, parc, parv))
+			return;
+
+	if (!MyConnect(client) && (max > 20))
+		max = 20;
+
+	p = strchr(parv[1], ',');
+	if (p)
+		*p = '\0';
+	nick = parv[1];
+	temp = WHOWASHASH[hash_whowas_name(nick)];
+	found = 0;
+	for (; temp; temp = temp->next)
+	{
+		if (!mycmp(nick, temp->name))
+		{
+			sendnumeric(client, RPL_WHOWASUSER, temp->name,
+			    temp->username,
+			    (IsOper(client) ? temp->hostname :
+			    (*temp->virthost !=
+			    '\0') ? temp->virthost : temp->hostname),
+			    temp->realname);
+                	if (!((find_uline(temp->servername)) && !IsOper(client) && HIDE_ULINES))
+				sendnumeric(client, RPL_WHOISSERVER, temp->name, temp->servername,
+				    myctime(temp->logoff));
+			cur++;
+			found++;
+		}
+		if (max > 0 && cur >= max)
+			break;
+	}
+	if (!found)
+		sendnumeric(client, ERR_WASNOSUCHNICK, nick);
+
+	sendnumeric(client, RPL_ENDOFWHOWAS, parv[1]);
+}
diff --git a/src/modules/whox.c b/src/modules/whox.c
new file mode 100644
index 0000000..3e34e96
--- /dev/null
+++ b/src/modules/whox.c
@@ -0,0 +1,944 @@
+/* cmd_whox.c / WHOX.
+ * based on code from charybdis and ircu.
+ * was originally made for tircd and modified to work with u4.
+ * - 2018 i <ircd@servx.org>
+ * - 2019 Bram Matthys (Syzop) <syzop@vulnscan.org>
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+#define MSG_WHO 	"WHO"
+
+#define FLAGS_MARK	0x400000 /* marked client (was hybnotice) */
+
+#define FIELD_CHANNEL	0x0001
+#define FIELD_HOP	0x0002
+#define FIELD_FLAGS	0x0004
+#define FIELD_HOST	0x0008
+#define FIELD_IP	0x0010
+#define FIELD_IDLE	0x0020
+#define FIELD_NICK	0x0040
+#define FIELD_INFO	0x0080
+#define FIELD_SERVER	0x0100
+#define FIELD_QUERYTYPE	0x0200 /* cookie for client */
+#define FIELD_USER	0x0400
+#define FIELD_ACCOUNT	0x0800
+#define FIELD_OPLEVEL	0x1000 /* meaningless and stupid, but whatever */
+#define FIELD_REALHOST	0x2000
+#define FIELD_MODES	0x4000
+
+#define WMATCH_NICK	0x0001
+#define WMATCH_USER	0x0002
+#define WMATCH_OPER	0x0004
+#define WMATCH_HOST	0x0008
+#define WMATCH_INFO	0x0010
+#define WMATCH_SERVER	0x0020
+#define WMATCH_ACCOUNT	0x0040
+#define WMATCH_IP	0x0080
+#define WMATCH_MODES	0x0100
+
+#define RPL_WHOSPCRPL	354
+
+#define WHO_ADD 1
+#define WHO_DEL 0
+
+#define SetMark(x) ((x)->flags |= FLAGS_MARK)
+#define ClearMark(x) ((x)->flags &= ~FLAGS_MARK)
+#define IsMarked(x) ((x)->flags & FLAGS_MARK)
+
+#define HasField(x, y) ((x)->fields & (y))
+#define IsMatch(x, y) ((x)->matchsel & (y))
+
+struct who_format
+{
+	int fields;
+	int matchsel;
+	int umodes;
+	int noumodes;
+	const char *querytype;
+	int show_realhost;
+	int show_ip;
+};
+
+CMD_FUNC(cmd_whox);
+static void who_global(Client *client, char *mask, int operspy, struct who_format *fmt);
+static void do_who(Client *client, Client *acptr, Channel *channel, struct who_format *fmt);
+static void do_who_on_channel(Client *client, Channel *channel,
+                              int member, int operspy, struct who_format *fmt);
+static int convert_classical_who_request(Client *client, int *parc, char *parv[], char **orig_mask, struct who_format *fmt);
+
+ModuleHeader MOD_HEADER
+  = {
+	"whox",
+	"5.0",
+	"command /who",
+	"UnrealIRCd Team",
+	"unrealircd-5",
+    };
+
+MOD_INIT()
+{
+	MARK_AS_OFFICIAL_MODULE(modinfo);
+	if (!CommandAdd(modinfo->handle, MSG_WHO, cmd_whox, MAXPARA, CMD_USER))
+	{
+		config_warn("You cannot load both cmd_whox and cmd_who. You should ONLY load the cmd_whox module.");
+		return MOD_FAILED;
+	}
+	ISupportAdd(modinfo->handle, "WHOX", NULL);
+	return MOD_SUCCESS;
+}
+
+MOD_LOAD()
+{
+	return MOD_SUCCESS;
+}
+
+MOD_UNLOAD()
+{
+	return MOD_SUCCESS;
+}
+
+/** cmd_whox: standardized "extended" version of WHO.
+ * The good thing about WHOX is that it allows the client to define what
+ * output they want to see. Another good thing is that it is standardized
+ * (ok, actually it isn't... but hey!).
+ * The bad thing is that it's a lot less flexible than the original WHO
+ * we had in UnrealIRCd in 3.2.x and 4.0.x and that the WHOX spec defines
+ * that there are two ways to specify a mask (neither one is logical):
+ * WHO <mask> <flags>
+ * WHO <mask> <flags> <mask2>
+ * In case the latter is present then mask2 overrides the mask
+ * (and the original 'mask' is ignored)
+ * Yes, this indeed damn ugly. It shows (yet again) that they should never
+ * have put the mask before the flags.. what kind of logic was that?
+ * I wonder if the person who invented this also writes C functions like:
+ * int (char *param)func
+ * or types:
+ * cp mode,time=--preserve
+ * or creates configuration files like:
+ * Syzop oper {
+ * 5 maxlogins;
+ * I mean... really...? -- Syzop
+ * So, we will try to abide to the WHOX spec as much as possible but
+ * try to warn our users in case they use the 'original' UnrealIRCd
+ * WHO syntax which was WHO [+-]<flags> <mask>.
+ * Note that we won't catch all cases, but we do our best.
+ * When in doubt, we will assume WHOX so to not break the spec
+ * (which again.. doesn't exist... but hey..)
+ */
+CMD_FUNC(cmd_whox)
+{
+	char *mask;
+	char *orig_mask;
+	char ch; /* Scratch char register */
+	char *p; /* Scratch char pointer */
+	int member;
+	int operspy = 0;
+	struct who_format fmt;
+	const char *s;
+	char maskcopy[BUFSIZE];
+	Membership *lp;
+	Client *acptr;
+
+	memset(&fmt, 0, sizeof(fmt));
+
+	if (!MyUser(client))
+		return;
+
+	if ((parc < 2))
+	{
+		sendnumeric(client, ERR_NEEDMOREPARAMS, "WHO");
+		return;
+	}
+
+	if ((parc > 3) && parv[3])
+		orig_mask = parv[3];
+	else
+		orig_mask = parv[1];
+
+	if (!convert_classical_who_request(client, &parc, parv, &orig_mask, &fmt))
+		return;
+
+	/* Evaluate the flags now, we consider the second parameter
+	 * as "matchFlags%fieldsToInclude,querytype" */
+
+	if ((parc > 2) && parv[2] && *parv[2])
+	{
+		p = parv[2];
+		while (((ch = *(p++))) && (ch != '%') && (ch != ','))
+		{
+			switch (ch)
+			{
+				case 'o': fmt.matchsel |= WMATCH_OPER; continue;
+				case 'n': fmt.matchsel |= WMATCH_NICK; continue;
+				case 'u': fmt.matchsel |= WMATCH_USER; continue;
+				case 'h': fmt.matchsel |= WMATCH_HOST; continue;
+				case 'i': fmt.matchsel |= WMATCH_IP; continue;
+				case 'r': fmt.matchsel |= WMATCH_INFO; continue;
+				case 's': fmt.matchsel |= WMATCH_SERVER; continue;
+				case 'a': fmt.matchsel |= WMATCH_ACCOUNT; continue;
+				case 'm': fmt.matchsel |= WMATCH_MODES; continue;
+				case 'R':
+					if (IsOper(client))
+						fmt.show_realhost = 1;
+					continue;
+				case 'I':
+					if (IsOper(client))
+						fmt.show_ip = 1;
+					continue;
+			}
+		}
+	}
+
+	if ((parc > 2) && (s = strchr(parv[2], '%')) != NULL)
+	{
+		s++;
+		for (; *s != '\0'; s++)
+		{
+			switch (*s)
+			{
+				case 'c': fmt.fields |= FIELD_CHANNEL; break;
+				case 'd': fmt.fields |= FIELD_HOP; break;
+				case 'f': fmt.fields |= FIELD_FLAGS; break;
+				case 'h': fmt.fields |= FIELD_HOST; break;
+				case 'H': fmt.fields |= FIELD_REALHOST; break;
+				case 'i': fmt.fields |= FIELD_IP; break;
+				case 'l': fmt.fields |= FIELD_IDLE; break;
+				case 'n': fmt.fields |= FIELD_NICK; break;
+				case 'r': fmt.fields |= FIELD_INFO; break;
+				case 's': fmt.fields |= FIELD_SERVER; break;
+				case 't': fmt.fields |= FIELD_QUERYTYPE; break;
+				case 'u': fmt.fields |= FIELD_USER; break;
+				case 'a': fmt.fields |= FIELD_ACCOUNT; break;
+				case 'm': fmt.fields |= FIELD_MODES; break;
+				case 'o': fmt.fields |= FIELD_OPLEVEL; break;
+				case ',':
+					s++;
+					fmt.querytype = s;
+					s += strlen(s);
+					s--;
+					break;
+			}
+		}
+		if (BadPtr(fmt.querytype) || (strlen(fmt.querytype) > 3))
+			fmt.querytype = "0";
+	}
+
+	strlcpy(maskcopy, orig_mask, sizeof maskcopy);
+	mask = maskcopy;
+
+	collapse(mask);
+
+	if ((ValidatePermissionsForPath("channel:see:who:secret",client,NULL,NULL,NULL) &&
+	     ValidatePermissionsForPath("channel:see:whois",client,NULL,NULL,NULL)))
+	{
+		operspy = 1;
+	}
+
+	if (fmt.matchsel & WMATCH_MODES)
+	{
+		char *s = mask;
+		int *umodes;
+		int what = WHO_ADD;
+	
+		while (*s)
+		{
+			int i;
+
+			switch (*s)
+			{
+				case '+':
+					what = WHO_ADD;
+					s++;
+					break;
+				case '-':
+					what = WHO_DEL;
+					s++;
+					break;
+			}
+
+			if (!*s)
+				break;
+
+			if (what == WHO_ADD)
+				umodes = &fmt.umodes;
+			else
+				umodes = &fmt.noumodes;
+
+			for (i = 0; i <= Usermode_highest; i++)
+			{
+				if (*s == Usermode_Table[i].flag)
+				{
+					*umodes |= Usermode_Table[i].mode;
+					break;
+				}
+			}
+			s++;
+		}
+
+		if (!IsOper(client))
+		{
+			/* these are usermodes regular users may search for. just oper now. */
+			fmt.umodes &= UMODE_OPER;
+			fmt.noumodes &= UMODE_OPER;
+		}
+	}
+
+	/* '/who #some_channel' */
+	if (IsChannelName(mask))
+	{
+		Channel *channel = NULL;
+
+		/* List all users on a given channel */
+		if ((channel = find_channel(orig_mask, NULL)) != NULL)
+		{
+			if (IsMember(client, channel) || operspy)
+				do_who_on_channel(client, channel, 1, operspy, &fmt);
+			else if (!SecretChannel(channel))
+				do_who_on_channel(client, channel, 0, operspy, &fmt);
+		}
+
+		sendnumeric(client, RPL_ENDOFWHO, mask);
+		return;
+	}
+
+	/* '/who nick' */
+	if (((acptr = find_person(mask, NULL)) != NULL) &&
+		(!(fmt.matchsel & WMATCH_MODES)) &&
+		(!(fmt.matchsel & WMATCH_OPER) || IsOper(acptr)))
+	{
+		int isinvis = 0;
+		int i = 0;
+		Hook *h;
+
+		isinvis = IsInvisible(acptr);
+		for (lp = acptr->user->channel; lp; lp = lp->next)
+		{
+			member = IsMember(client, lp->channel);
+
+			if (isinvis && !member)
+				continue;
+
+			for (h = Hooks[HOOKTYPE_VISIBLE_IN_CHANNEL]; h; h = h->next)
+			{
+				i = (*(h->func.intfunc))(acptr,lp->channel);
+				if (i != 0)
+					break;
+			}
+
+			if (i != 0 && !(is_skochanop(client, lp->channel)) && !(is_skochanop(acptr, lp->channel) || has_voice(acptr,lp->channel)))
+				continue;
+
+			if (member || (!isinvis && PubChannel(lp->channel)))
+				break;
+		}
+		if (lp != NULL)
+			do_who(client, acptr, lp->channel, &fmt);
+		else
+			do_who(client, acptr, NULL, &fmt);
+
+		sendnumeric(client, RPL_ENDOFWHO, orig_mask);
+		return;
+	}
+
+	if (ValidatePermissionsForPath("channel:see:who:secret",client,NULL,NULL,NULL) ||
+                ValidatePermissionsForPath("channel:see:whois",client,NULL,NULL,NULL))
+	{
+		operspy = 1;
+	}
+
+	/* '/who 0' for a global list.  this forces clients to actually
+	 * request a full list.  I presume its because of too many typos
+	 * with "/who" ;) --fl
+	 */
+	if (!strcmp(mask, "0"))
+		who_global(client, NULL, 0, &fmt);
+	else
+		who_global(client, mask, operspy, &fmt);
+
+	sendnumeric(client, RPL_ENDOFWHO, mask);
+}
+
+/* do_match
+ * inputs	- pointer to client requesting who
+ *		- pointer to client to do who on
+ *		- char * mask to match
+ *		- format options
+ * output	- 1 if match, 0 if no match
+ * side effects	- NONE
+ */
+static int do_match(Client *client, Client *acptr, char *mask, struct who_format *fmt)
+{
+	if (mask == NULL)
+		return 1;
+
+	/* default */
+	if (fmt->matchsel == 0 && (match_simple(mask, acptr->name) ||
+		match_simple(mask, acptr->user->username) ||
+		match_simple(mask, GetHost(acptr)) ||
+		(IsOper(client) &&
+		(match_simple(mask, acptr->user->realhost) ||
+		(acptr->ip &&
+		match_simple(mask, acptr->ip))))))
+	{
+		return 1;
+	}
+
+	/* match nick */
+	if (IsMatch(fmt, WMATCH_NICK) && match_simple(mask, acptr->name))
+		return 1;
+
+	/* match username */
+	if (IsMatch(fmt, WMATCH_USER) && match_simple(mask, acptr->user->username))
+		return 1;
+
+	/* match server */
+	if (IsMatch(fmt, WMATCH_SERVER) && IsOper(client) && match_simple(mask, acptr->user->server))
+		return 1;
+
+	/* match hostname */
+	if (IsMatch(fmt, WMATCH_HOST) && (match_simple(mask, GetHost(acptr)) ||
+		(IsOper(client) && (match_simple(mask, acptr->user->realhost) ||
+		(acptr->ip && match_simple(mask, acptr->ip))))))
+	{
+		return 1;
+	}
+
+	/* match realname */
+	if (IsMatch(fmt, WMATCH_INFO) && match_simple(mask, acptr->info))
+		return 1;
+
+	/* match ip address */
+	if (IsMatch(fmt, WMATCH_IP) && IsOper(client) && acptr->ip &&
+		match_user(mask, acptr, MATCH_CHECK_IP))
+		return 1;
+
+	/* match account */
+	if (IsMatch(fmt, WMATCH_ACCOUNT) && !BadPtr(acptr->user->svid) &&
+		!isdigit(*acptr->user->svid) && match_simple(mask, acptr->user->svid))
+	{
+		return 1;
+	}
+
+	/* match usermodes */
+	if (IsMatch(fmt, WMATCH_MODES) && (fmt->umodes || fmt->noumodes))
+	{
+		long umodes = acptr->umodes;
+		if ((acptr->umodes & UMODE_HIDEOPER) && !IsOper(client))
+			umodes &= ~UMODE_OPER; /* pretend -o if +H */
+		/* Now check 'umodes' (not acptr->umodes),
+		 * If multiple conditions are specified it is an
+		 * AND condition and not an OR.
+		 */
+		if (((umodes & fmt->umodes) == fmt->umodes) &&
+		    ((umodes & fmt->noumodes) == 0))
+		{
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+/* who_common_channel
+ * inputs		- pointer to client requesting who
+ *			- pointer to channel.
+ *			- char * mask to match
+ *			- int if oper on a server or not
+ *			- pointer to int maxmatches
+ *			- format options
+ * output		- NONE
+ * side effects 	- lists matching invisible clients on specified channel,
+ *			  marks matched clients.
+ */
+
+static void who_common_channel(Client *client, Channel *channel,
+	char *mask, int *maxmatches, struct who_format *fmt)
+{
+	Member *cm = channel->members;
+	Client *acptr;
+	Hook *h;
+	int i = 0;
+
+	for (cm = channel->members; cm; cm = cm->next)
+	{
+		acptr = cm->client;
+
+		if (!IsInvisible(acptr) || IsMarked(acptr))
+			continue;
+
+		if(IsMatch(fmt, WMATCH_OPER) && !IsOper(acptr))
+			continue;
+
+		for (h = Hooks[HOOKTYPE_VISIBLE_IN_CHANNEL]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(acptr,channel);
+			if (i != 0)
+				break;
+		}
+
+		if (i != 0 && !(is_skochanop(client, channel)) && !(is_skochanop(acptr, channel) || has_voice(acptr,channel)))
+			continue;
+
+		SetMark(acptr);
+
+		if(*maxmatches > 0)
+		{
+			if (do_match(client, acptr, mask, fmt))
+			{
+				do_who(client, acptr, NULL, fmt);
+				--(*maxmatches);
+			}
+		}
+	}
+}
+
+/*
+ * who_global
+ *
+ * inputs		- pointer to client requesting who
+ *			- char * mask to match
+ *			- int if oper on a server or not
+ *			- int if operspy or not
+ *			- format options
+ * output		- NONE
+ * side effects		- do a global scan of all clients looking for match
+ *			  this is slightly expensive on EFnet ...
+ *			  marks assumed cleared for all clients initially
+ *			  and will be left cleared on return
+ */
+
+static void who_global(Client *client, char *mask, int operspy, struct who_format *fmt)
+{
+	Client *acptr;
+	int maxmatches = WHOLIMIT ? WHOLIMIT : 100;
+
+	/* first, list all matching INvisible clients on common channels
+	 * if this is not an operspy who
+	 */
+	if(!operspy)
+	{
+		Membership *lp;
+
+		for (lp = client->user->channel; lp; lp = lp->next)
+			who_common_channel(client, lp->channel, mask, &maxmatches, fmt);
+	}
+
+	/* second, list all matching visible clients and clear all marks
+	 * on invisible clients
+	 * if this is an operspy who, list all matching clients, no need
+	 * to clear marks
+	 */
+	list_for_each_entry(acptr, &client_list, client_node)
+	{
+		if(!IsUser(acptr))
+			continue;
+
+		if(IsInvisible(acptr) && !operspy)
+ 		{
+			ClearMark(acptr);
+			continue;
+		}
+
+		if(IsMatch(fmt, WMATCH_OPER) && !IsOper(acptr))
+			continue;
+
+		if(maxmatches > 0)
+		{
+			if (do_match(client, acptr, mask, fmt))
+ 			{
+				do_who(client, acptr, NULL, fmt);
+				--maxmatches;
+ 			}
+ 		}
+	}
+
+	if (maxmatches <= 0)
+		sendnumeric(client, ERR_TOOMANYMATCHES, "WHO", "output too large, truncated");
+}
+
+/*
+ * do_who_on_channel
+ *
+ * inputs		- pointer to client requesting who
+ *			- pointer to channel to do who on
+ *			- The "real name" of this channel
+ *			- int if client is a server oper or not
+ *			- int if client is member or not
+ *			- format options
+ * output		- NONE
+ * side effects		- do a who on given channel
+ */
+
+static void do_who_on_channel(Client *client, Channel *channel,
+	int member, int operspy, struct who_format *fmt)
+{
+	Member *cm = channel->members;
+	Hook *h;
+	int i = 0;
+
+	for (cm = channel->members; cm; cm = cm->next)
+	{
+		Client *acptr = cm->client;
+
+		if (IsMatch(fmt, WMATCH_OPER) && !IsOper(acptr))
+			continue;
+
+		for (h = Hooks[HOOKTYPE_VISIBLE_IN_CHANNEL]; h; h = h->next)
+		{
+			i = (*(h->func.intfunc))(acptr,channel);
+			if (i != 0)
+				break;
+		}
+
+		if (!operspy && (acptr != client) && i != 0 && !(is_skochanop(client, channel)) && !(is_skochanop(acptr, channel) || has_voice(acptr,channel)))
+			continue;
+
+		if(member || !IsInvisible(acptr))
+			do_who(client, acptr, channel, fmt);
+	}
+}
+
+/*
+ * append_format
+ *
+ * inputs		- pointer to buffer
+ *			- size of buffer
+ *			- pointer to position
+ *			- format string
+ *			- arguments for format
+ * output		- NONE
+ * side effects 	- position incremented, possibly beyond size of buffer
+ *			  this allows detecting overflow
+ */
+
+static void append_format(char *buf, size_t bufsize, size_t *pos, const char *fmt, ...)
+{
+	size_t max, result;
+	va_list ap;
+
+	max = *pos >= bufsize ? 0 : bufsize - *pos;
+	va_start(ap, fmt);
+	result = vsnprintf(buf + *pos, max, fmt, ap);
+	va_end(ap);
+	*pos += result;
+}
+
+/*
+ * show_ip()		- asks if the true IP should be shown when source is
+ *			  asking for info about target
+ *
+ * Inputs		- client who is asking
+ *			- acptr who do we want the info on
+ * Output		- returns 1 if clear IP can be shown, otherwise 0
+ * Side Effects		- none
+ */
+
+static int show_ip(Client *client, Client *acptr)
+{
+	if (IsServer(acptr))
+		return 0;
+	else if ((client != NULL) && (MyConnect(client) && !IsOper(client)) && (client == acptr))
+		return 1;
+	else if (IsHidden(acptr) && ((client != NULL) && !IsOper(client)))
+		return 0;
+	else
+		return 1;
+}
+
+/*
+ * do_who
+ *
+ * inputs	- pointer to client requesting who
+ *		- pointer to client to do who on
+ *		- channel or NULL
+ *		- format options
+ * output	- NONE
+ * side effects - do a who on given person
+ */
+
+static void do_who(Client *client, Client *acptr, Channel *channel, struct who_format *fmt)
+{
+	char status[20];
+	char str[510 + 1];
+	size_t pos;
+	int hide = (FLAT_MAP && !IsOper(client)) ? 1 : 0;
+	int i = 0;
+	Hook *h;
+
+	if (acptr->user->away)
+ 		status[i++] = 'G';
+ 	else
+ 		status[i++] = 'H';
+
+	if (IsARegNick(acptr))
+		status[i++] = 'r';
+
+	if (IsSecureConnect(acptr))
+		status[i++] = 's';
+
+	for (h = Hooks[HOOKTYPE_WHO_STATUS]; h; h = h->next)
+	{
+		int ret = (*(h->func.intfunc))(client, acptr, NULL, NULL, status, 0);
+		if (ret != 0)
+			status[i++] = (char)ret;
+	}
+
+	if (IsOper(acptr) && (!IsHideOper(acptr) || client == acptr || IsOper(client)))
+		status[i++] = '*';
+
+	if (IsOper(acptr) && (IsHideOper(acptr) && client != acptr && IsOper(client)))
+		status[i++] = '!';
+
+	if (channel)
+	{
+		Membership *lp;
+
+		if ((lp = find_membership_link(acptr->user->channel, channel)))
+		{
+			if (!(fmt->fields || HasCapability(client, "multi-prefix")))
+			{
+				/* Standard NAMES reply */
+#ifdef PREFIX_AQ
+				if (lp->flags & CHFL_CHANOWNER)
+					status[i++] = '~';
+				else if (lp->flags & CHFL_CHANADMIN)
+					status[i++] = '&';
+				else
+#endif
+				if (lp->flags & CHFL_CHANOP)
+					status[i++] = '@';
+				else if (lp->flags & CHFL_HALFOP)
+					status[i++] = '%';
+				else if (lp->flags & CHFL_VOICE)
+					status[i++] = '+';
+			}
+			else
+			{
+				/* NAMES reply with all rights included (multi-prefix / NAMESX) */
+#ifdef PREFIX_AQ
+				if (lp->flags & CHFL_CHANOWNER)
+					status[i++] = '~';
+				if (lp->flags & CHFL_CHANADMIN)
+					status[i++] = '&';
+#endif
+				if (lp->flags & CHFL_CHANOP)
+					status[i++] = '@';
+				if (lp->flags & CHFL_HALFOP)
+					status[i++] = '%';
+				if (lp->flags & CHFL_VOICE)
+					status[i++] = '+';
+			}
+		}
+	}
+
+	status[i] = '\0';
+ 
+	if (fmt->fields == 0)
+	{
+		char *host;
+		if (fmt->show_realhost)
+			host = acptr->user->realhost;
+		else if (fmt->show_ip)
+			host = GetIP(acptr);
+		else
+			host = GetHost(acptr);
+		sendnumeric(client, RPL_WHOREPLY,
+			channel ? channel->chname : "*",
+			acptr->user->username, host,
+			hide ? "*" : acptr->user->server,
+			acptr->name, status, hide ? 0 : acptr->hopcount, acptr->info);
+	} else
+	{
+		str[0] = '\0';
+		pos = 0;
+		append_format(str, sizeof str, &pos, ":%s %d %s", me.name, RPL_WHOSPCRPL, client->name);
+		if (HasField(fmt, FIELD_QUERYTYPE))
+			append_format(str, sizeof str, &pos, " %s", fmt->querytype);
+		if (HasField(fmt, FIELD_CHANNEL))
+			append_format(str, sizeof str, &pos, " %s", channel ? channel->chname : "*");
+		if (HasField(fmt, FIELD_USER))
+			append_format(str, sizeof str, &pos, " %s", acptr->user->username);
+		if (HasField(fmt, FIELD_IP))
+		{
+			if (show_ip(client, acptr) && acptr->ip)
+				append_format(str, sizeof str, &pos, " %s", acptr->ip);
+			else
+				append_format(str, sizeof str, &pos, " %s", "255.255.255.255");
+		}
+
+		if (HasField(fmt, FIELD_HOST) || HasField(fmt, FIELD_REALHOST))
+		{
+			if (IsOper(client) && HasField(fmt, FIELD_REALHOST))
+				append_format(str, sizeof str, &pos, " %s", acptr->user->realhost);
+			else
+				append_format(str, sizeof str, &pos, " %s", GetHost(acptr));
+		}
+
+		if (HasField(fmt, FIELD_SERVER))
+			append_format(str, sizeof str, &pos, " %s", hide ? "*" : acptr->user->server);
+		if (HasField(fmt, FIELD_NICK))
+			append_format(str, sizeof str, &pos, " %s", acptr->name);
+		if (HasField(fmt, FIELD_FLAGS))
+			append_format(str, sizeof str, &pos, " %s", status);
+		if (HasField(fmt, FIELD_MODES))
+		{
+			if (IsOper(client))
+				append_format(str, sizeof str, &pos, " %s", strtok(get_usermode_string(acptr), "+"));
+			else
+				append_format(str, sizeof str, &pos, " %s", "*");
+		}
+		if (HasField(fmt, FIELD_HOP))
+			append_format(str, sizeof str, &pos, " %d", hide ? 0 : acptr->hopcount);
+		if (HasField(fmt, FIELD_IDLE))
+			append_format(str, sizeof str, &pos, " %d", (int)(MyUser(acptr) &&
+				(!(acptr->umodes & UMODE_HIDLE) || IsOper(client) ||
+				(client == acptr)) ? TStime() - acptr->local->last : 0));
+		if (HasField(fmt, FIELD_ACCOUNT))
+			append_format(str, sizeof str, &pos, " %s", (!isdigit(*acptr->user->svid)) ? acptr->user->svid : "0");
+		if (HasField(fmt, FIELD_OPLEVEL))
+			append_format(str, sizeof str, &pos, " %s", (channel && is_skochanop(acptr, channel)) ? "999" : "n/a");
+		if (HasField(fmt, FIELD_INFO))
+			append_format(str, sizeof str, &pos, " :%s", acptr->info);
+
+		if (pos >= sizeof str)
+		{
+			static int warned = 0;
+			if (!warned)
+				sendto_snomask(SNO_JUNK, "*** WHOX overflow while sending information about %s to %s", acptr->name, client->name);
+			warned = 1;
+ 		}
+		sendto_one(client, NULL, "%s", str);
+	}
+}
+
+/* Yeah, this is fun. Thank you WHOX !!! */
+static int convert_classical_who_request(Client *client, int *parc, char *parv[], char **orig_mask, struct who_format *fmt)
+{
+	char *p;
+	static char pbuf1[256];
+	int points;
+
+	/* Figure out if the user is doing a 'classical' UnrealIRCd request,
+	 * which can be recognized as follows:
+	 * 1) Always a + or - as 1st character for the 1st parameter.
+	 * 2) Unlikely to have a % (percent sign) in the 2nd parameter
+	 * 3) Unlikely to have a 3rd parameter
+	 * On the other hand WHOX requests are:
+	 * 4) never going to have a '*', '?' or '.' as 2nd parameter
+	 * 5) never going to have a '+' or '-' as 1st character in 2nd parameter
+	 * Additionally, WHOX requests are useless - and thus unlikely -
+	 * to search for a mask mask starting with + or -  except when:
+	 * 6) searching for 'm' (mode)
+	 * 7) or 'r' (info, realname)
+	 * ..for which this would be a meaningful request.
+	 * The end result is that we can do quite some useful heuristics
+	 * except for some corner cases.
+	 */
+	if (((*parv[1] == '+') || (*parv[1] == '-')) &&
+	    (!parv[2] || !strchr(parv[2], '%')) &&
+	    (*parc < 4))
+	{
+		/* Conditions 1-3 of above comment are met, now we deal
+		 * with conditions 4-7.
+		 */
+		if (parv[2] &&
+		    !strchr(parv[2], '*') && !strchr(parv[2], '?') &&
+		    !strchr(parv[2], '.') &&
+		    !strchr(parv[2], '+') && !strchr(parv[2], '-') &&
+		    (strchr(parv[2], 'm') || strchr(parv[2], 'r')))
+		{
+			/* 'WHO +something m" or even
+			 * 'WHO +c #something' (which includes 'm')
+			 * could mean either WHO or WHOX style
+			 */
+		} else {
+			/* If we get here then it's an classical
+			 * UnrealIRCd-style WHO request which has
+			 * the order: WHO <options> <mask>
+			 */
+			char oldrequest[256];
+			snprintf(oldrequest, sizeof(oldrequest), "WHO %s%s%s",
+			         parv[1], parv[2] ? " " : "", parv[2] ? parv[2] : "");
+			if (parv[2])
+			{
+				char *swap = parv[1];
+				parv[1] = parv[2];
+				parv[2] = swap;
+			} else {
+				/* A request like 'WHO +I' or 'WHO +R' */
+				parv[2] = parv[1];
+				parv[1] = "*";
+				parv[3] = NULL;
+				*parc = 3;
+			}
+
+			/* Ok, that was the first step, now we need to convert the
+			 * flags since they have changed a little as well:
+			 * Flag a: user is away                                            << no longer exists
+			 * Flag c <channel>: user is on <channel>                          << no longer exists
+			 * Flag g <gcos/realname>: user has string <gcos> in his/her GCOS  << now called 'r'
+			 * Flag h <host>: user has string <host> in his/her hostname       << no change
+			 * Flag i <ip>: user has string <ip> in his/her IP address         << no change
+			 * Flag m <usermodes>: user has <usermodes> set                    << behavior change
+			 * Flag n <nick>: user has string <nick> in his/her nickname       << no change
+			 * Flag s <server>: user is on server <server>                     << no change
+			 * Flag u <user>: user has string <user> in his/her username       << no change
+			 * Behavior flags:
+			 * Flag M: check for user in channels I am a member of             << no longer exists
+			 * Flag R: show users' real hostnames                              << no change (re-added)
+			 * Flag I: show users' IP addresses                                << no change (re-added)
+			 */
+
+			if (strchr(parv[2], 'a'))
+			{
+				sendnotice(client, "WHO request '%s' failed: flag 'a' no longer exists with WHOX.", oldrequest);
+				return 0;
+			}
+			if (strchr(parv[2], 'c'))
+			{
+				sendnotice(client, "WHO request '%s' failed: flag 'c' no longer exists with WHOX.", oldrequest);
+				return 0;
+			}
+			for (p = parv[2]; *p; p++)
+			{
+				if (*p == 'g')
+				{
+					*p = 'r';
+					break;
+				}
+			}
+
+			/* "WHO -m xyz" (now: xyz -m) should become "WHO -xyz m"
+			 * Wow, this seems overly complex, but okay...
+			 */
+			points = 0;
+			for (p = parv[2]; *p; p++)
+			{
+				if (*p == '-')
+					points = 1;
+				else if (*p == '+')
+					points = 0;
+				else if (points && (*p == 'm'))
+				{
+					points = 2;
+					break;
+				}
+			}
+			if (points == 2)
+			{
+				snprintf(pbuf1, sizeof(pbuf1), "-%s", parv[1]);
+				parv[1] = pbuf1;
+			}
+
+			if ((*parv[2] == '+') || (*parv[2] == '-'))
+				parv[2] = parv[2]+1; /* strip '+'/'-' prefix, which does not exist in WHOX */
+
+			sendnotice(client, "WHO request '%s' changed to match new WHOX syntax: 'WHO %s %s'",
+				oldrequest, parv[1], parv[2]);
+			*orig_mask = parv[1];
+		}
+	}
+	return 1;
+}
diff --git a/src/numeric.c b/src/numeric.c
new file mode 100644
index 0000000..37b5bdb
--- /dev/null
+++ b/src/numeric.c
@@ -0,0 +1,1056 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/numeric.c
+ *   Copyright (C) 1992 Darren Reed
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Numeric replies in the IRC protocol.
+ */
+
+#include "unrealircd.h"
+
+/** Numeric replies */
+static char *replies[] = {
+/* 000 */ NULL,
+/* 001    RPL_WELCOME */  ":Welcome to the %s IRC Network %s!%s@%s",
+/* 002    RPL_YOURHOST */ ":Your host is %s, running version %s",
+/* 003    RPL_CREATED */  ":This server was created %s",
+/* 004    RPL_MYINFO */   "%s %s %s %s",
+/* 005    RPL_ISUPPORT */ "%s :are supported by this server",
+/* 006    RPL_MAP */      ":%s%-*s(%ld) %s",
+/* 007    RPL_MAPEND */   ":End of /MAP",
+/* 008    RPL_SNOMASK */  "%s :Server notice mask",
+/* 009 */ NULL, /* ircu */
+/* 010    RPL_REDIR */	  "%s %d :Please use this Server/Port instead",
+/* 011 */ NULL,
+/* 012 */ NULL,
+/* 013 */ NULL,
+/* 014 */ NULL, /* hybrid */
+/* 015 */ NULL,
+/* 016 */ NULL,
+/* 017 */ NULL,
+/* 018 */ NULL,
+/* 019 */ NULL,
+/* 020 */ NULL,
+/* 021 */ NULL,
+/* 022 */ NULL,
+/* 023 */ NULL,
+/* 024 */ NULL,
+/* 025 */ NULL,
+/* 026 */ NULL,
+/* 027 */ NULL,
+/* 028 */ NULL,
+/* 029 */ NULL,
+/* 030 */ NULL,
+/* 031 */ NULL,
+/* 032 */ NULL,
+/* 033 */ NULL,
+/* 034 */ NULL,
+/* 035 */ NULL,
+/* 036 */ NULL,
+/* 037 */ NULL,
+/* 038 */ NULL,
+/* 039 */ NULL,
+/* 040 */ NULL,
+/* 041 */ NULL,
+/* 042    RPL_YOURID */	"%s :your unique ID",
+/* 043 */ NULL, /* ircnet */
+/* 044 */ NULL,
+/* 045 */ NULL,
+/* 046 */ NULL,
+/* 047 */ NULL,
+/* 048 */ NULL,
+/* 049 */ NULL,
+/* 050 */ NULL, /* aircd */
+/* 051 */ NULL, /* aircd */
+/* 052 */ NULL,
+/* 053 */ NULL,
+/* 054 */ NULL,
+/* 055 */ NULL,
+/* 056 */ NULL,
+/* 057 */ NULL,
+/* 058 */ NULL,
+/* 059 */ NULL,
+/* 060 */ NULL,
+/* 061 */ NULL,
+/* 062 */ NULL,
+/* 063 */ NULL,
+/* 064 */ NULL,
+/* 065 */ NULL,
+/* 066 */ NULL,
+/* 067 */ NULL,
+/* 068 */ NULL,
+/* 069 */ NULL,
+/* 070 */ NULL,
+/* 071 */ NULL,
+/* 072 */ NULL,
+/* 073 */ NULL,
+/* 074 */ NULL,
+/* 075 */ NULL,
+/* 076 */ NULL,
+/* 077 */ NULL,
+/* 078 */ NULL,
+/* 079 */ NULL,
+/* 080 */ NULL,
+/* 081 */ NULL,
+/* 082 */ NULL,
+/* 083 */ NULL,
+/* 084 */ NULL,
+/* 085 */ NULL,
+/* 086 */ NULL,
+/* 087 */ NULL,
+/* 088 */ NULL,
+/* 089 */ NULL,
+/* 090 */ NULL,
+/* 091 */ NULL,
+/* 092 */ NULL,
+/* 093 */ NULL,
+/* 094 */ NULL,
+/* 095 */ NULL,
+/* 096 */ NULL,
+/* 097 */ NULL,
+/* 098 */ NULL,
+/* 099 */ NULL,
+/* 100 */ NULL,
+/* 101 */ NULL,
+/* 102 */ NULL,
+/* 103 */ NULL,
+/* 104 */ NULL,
+/* 105    RPL_REMOTEISUPPORT */ "%s :are supported by this server",
+/* 106 */ NULL,
+/* 107 */ NULL,
+/* 108 */ NULL,
+/* 109 */ NULL,
+/* 110 */ NULL,
+/* 111 */ NULL,
+/* 112 */ NULL,
+/* 113 */ NULL,
+/* 114 */ NULL,
+/* 115 */ NULL,
+/* 116 */ NULL,
+/* 117 */ NULL,
+/* 118 */ NULL,
+/* 119 */ NULL,
+/* 120 */ NULL,
+/* 121 */ NULL,
+/* 122 */ NULL,
+/* 123 */ NULL,
+/* 124 */ NULL,
+/* 125 */ NULL,
+/* 126 */ NULL,
+/* 127 */ NULL,
+/* 128 */ NULL,
+/* 129 */ NULL,
+/* 130 */ NULL,
+/* 131 */ NULL,
+/* 132 */ NULL,
+/* 133 */ NULL,
+/* 134 */ NULL,
+/* 135 */ NULL,
+/* 136 */ NULL,
+/* 137 */ NULL,
+/* 138 */ NULL,
+/* 139 */ NULL,
+/* 140 */ NULL,
+/* 141 */ NULL,
+/* 142 */ NULL,
+/* 143 */ NULL,
+/* 144 */ NULL,
+/* 145 */ NULL,
+/* 146 */ NULL,
+/* 147 */ NULL,
+/* 148 */ NULL,
+/* 149 */ NULL,
+/* 150 */ NULL,
+/* 151 */ NULL,
+/* 152 */ NULL,
+/* 153 */ NULL,
+/* 154 */ NULL,
+/* 155 */ NULL,
+/* 156 */ NULL,
+/* 157 */ NULL,
+/* 158 */ NULL,
+/* 159 */ NULL,
+/* 160 */ NULL,
+/* 161 */ NULL,
+/* 162 */ NULL,
+/* 163 */ NULL,
+/* 164 */ NULL,
+/* 165 */ NULL,
+/* 166 */ NULL,
+/* 167 */ NULL,
+/* 168 */ NULL,
+/* 169 */ NULL,
+/* 170 */ NULL,
+/* 171 */ NULL,
+/* 172 */ NULL,
+/* 173 */ NULL,
+/* 174 */ NULL,
+/* 175 */ NULL,
+/* 176 */ NULL,
+/* 177 */ NULL,
+/* 178 */ NULL,
+/* 179 */ NULL,
+/* 180 */ NULL,
+/* 181 */ NULL,
+/* 182 */ NULL,
+/* 183 */ NULL,
+/* 184 */ NULL,
+/* 185 */ NULL,
+/* 186 */ NULL,
+/* 187 */ NULL,
+/* 188 */ NULL,
+/* 189 */ NULL,
+/* 190 */ NULL,
+/* 191 */ NULL,
+/* 192 */ NULL,
+/* 193 */ NULL,
+/* 194 */ NULL,
+/* 195 */ NULL,
+/* 196 */ NULL,
+/* 197 */ NULL,
+/* 198 */ NULL,
+/* 199 */ NULL,
+/* 200    RPL_TRACELINK */       "Link %s%s %s %s",
+/* 201    RPL_TRACECONNECTING */ "Attempt %s %s",
+/* 202    RPL_TRACEHANDSHAKE */  "Handshaking %s %s",
+/* 203    RPL_TRACEUNKNOWN */    "???? %s %s",
+/* 204    RPL_TRACEOPERATOR */   "Operator %s %s [%s] %ld",
+/* 205    RPL_TRACEUSER */       "User %s %s [%s] %ld",
+/* 206    RPL_TRACESERVER */     "Server %s %dS %dC %s %s!%s@%s %ld",
+/* 207    RPL_TRACESERVICE */    "Service %s %s",
+/* 208    RPL_TRACENEWTYPE */    "%s 0 %s",
+/* 209    RPL_TRACECLASS */      "Class %s %d",
+/* 210    RPL_STATSHELP */       ":%s",
+/* 211 */ NULL, /* Used */
+#ifdef DEBUGMODE
+/* 212    RPL_STATSCOMMANDS */ "%s %u %lu %lu %lu %lu %lu",
+#else
+/* 212    RPL_STATSCOMMANDS */ "%s %u %lu",
+#endif
+/* 213    RPL_STATSCLINE */ "%c %s * %s %d %d %s",
+/* 214    RPL_STATSOLDNLINE */ "%c %s * %s %d %d %s",
+/* 215    RPL_STATSILINE */ "I %s * %s %d %s %s %d",
+/* 216    RPL_STATSKLINE */ "%s %s %s",
+/* 217    RPL_STATSQLINE */ "%c %s %ld %ld %s :%s",
+/* 218    RPL_STATSYLINE */ "Y %s %d %d %d %d %d",
+/* 219    RPL_ENDOFSTATS */ "%c :End of /STATS report",
+/* 220    RPL_STATSBLINE */ "%c %s %s %s %d %d",
+/* 221    RPL_UMODEIS */ "%s",
+/* 222    RPL_SQLINE_NICK */ "%s :%s",
+/* 223    RPL_STATSGLINE */ "%c %s %li %li %s :%s",
+/* 224    RPL_STATSTLINE */ "T %s %s %s",
+/* 225    RPL_STATSELINE (we use 230 instead) */ NULL,
+/* 226    RPL_STATSNLINE */ "n %s %s",
+/* 227    RPL_STATSVLINE */ "v %s %s %s",
+/* 228    RPL_STATSBANVER */ "%s %s",
+/* 229    RPL_STATSSPAMF */  "%c %s %s %s %li %li %li %s %s :%s",
+/* 230    RPL_STATSEXCEPTTKL */ "%s %s %li %li %s :%s",
+/* 231 */ NULL, /* rfc1459 */
+/* 232    RPL_RULES */ ":- %s",
+/* 233 */ NULL, /* rfc1459 */
+/* 234 */ NULL, /* rfc2812 */
+/* 235 */ NULL, /* rfc2812 */
+/* 236 */ NULL, /* ircu */
+/* 237 */ NULL, /* ircu */
+/* 238 */ NULL, /* ircu, ircnet */
+/* 239 */ NULL, /* ircnet */
+/* 240 */ NULL, /* rfc2812, austhex */
+/* 241    RPL_STATSLLINE */ "%c %s * %s %d %d",
+/* 242    RPL_STATSUPTIME */ ":Server Up %ld days, %ld:%02ld:%02ld",
+/* 243    RPL_STATSOLINE */ "%c %s * %s %s %s",
+/* 244    RPL_STATSHLINE */ "%c %s * %s %d %d",
+/* 245    RPL_STATSSLINE */ "%c %s * %s %d %d",
+/* 246 */ NULL, /* rfc2812 */
+/* 247    RPL_STATSXLINE */ "X %s %d",
+/* 248    RPL_STATSULINE */ "U %s",
+/* 249    RPL_STATSDEBUG */ ":%s",
+/* 250    RPL_STATSCONN */ ":Highest connection count: %d (%d clients)",
+/* 251    RPL_LUSERCLIENT */ ":There are %d users and %d invisible on %d servers",
+/* 252    RPL_LUSEROP */   "%d :operator(s) online",
+/* 253    RPL_LUSERUNKNOWN */ "%d :unknown connection(s)",
+/* 254    RPL_LUSERCHANNELS */ "%d :channels formed",
+/* 255    RPL_LUSERME */    ":I have %d clients and %d servers",
+/* 256    RPL_ADMINME */    ":Administrative info about %s",
+/* 257    RPL_ADMINLOC1 */  ":%s",
+/* 258    RPL_ADMINLOC2 */  ":%s",
+/* 259    RPL_ADMINEMAIL */ ":%s",
+/* 260 */  NULL,
+/* 261    RPL_TRACELOG */   "File %s %d",
+/* 262 */ NULL, /* rfc2812 */
+/* 263    RPL_TRYAGAIN */   "%s :Flooding detected. Please wait a while and try again.",
+/* 264 */ NULL,
+/* 265    RPL_LOCALUSERS */ "%d %d :Current local users %d, max %d",
+/* 266    RPL_GLOBALUSERS */ "%d %d :Current global users %d, max %d",
+/* 267 */ NULL, /* aircd */
+/* 268 */ NULL, /* aircd */
+/* 269 */ NULL, /* aircd */
+/* 270 */ NULL, /* ircu */
+/* 271    RPL_SILELIST */ "%s",
+/* 272    RPL_ENDOFSILELIST */ ":End of Silence List",
+/* 273 */ NULL, /* aircd */
+/* 274 */ NULL, /* ircnet */
+/* 275    RPL_STATSDLINE */ "%c %s %s",
+/* 276    RPL_WHOISCERTFP */ "%s :has client certificate fingerprint %s",
+/* 277 */ NULL, /* hybrid */
+/* 278 */ NULL, /* hybrid */
+/* 279 */ NULL,
+/* 280 */ NULL, /* ircu */
+/* 281 */ NULL, /* ircu, hybrid */
+/* 282 */ NULL, /* ircu, hybrid */
+/* 283 */ NULL, /* ircu, hybrid */
+/* 284 */ NULL, /* hybrid, quakenet */
+/* 285 */ NULL, /* ircu, aircd, quakenet */
+/* 286 */ NULL, /* aircd, quakenet */
+/* 287 */ NULL, /* aircd, quakenet */
+/* 288 */ NULL, /* aircd, quakenet */
+/* 289 */ NULL, /* aircd, quakenet */
+/* 290 */ NULL, /* aircd, quakenet */
+/* 291 */ NULL, /* aircd, quakenet */
+/* 292 */ NULL, /* aircd */
+/* 293 */ NULL, /* aircd */
+/* 294    RPL_HELPFWD */ ":Your help-request has been forwarded to Help Operators",
+/* 295    RPL_HELPIGN */ ":Your address has been ignored from forwarding",
+/* 296 */ NULL, /* aircd */
+/* 297 */ NULL,
+/* 298 */ NULL, /* Used */
+/* 299 */ NULL, /* aircd */
+/* 300 */ NULL, /* rfc1459 */
+/* 301    RPL_AWAY */ "%s :%s",
+/* 302    RPL_USERHOST */ ":%s %s %s %s %s",
+/* 303    RPL_ISON */ ":",
+/* 304 */ NULL, /* RPL_TEXT */
+/* 305    RPL_UNAWAY */ ":You are no longer marked as being away",
+/* 306    RPL_NOWAWAY */ ":You have been marked as being away",
+/* 307    RPL_WHOISREGNICK */ "%s :is identified for this nick",
+/* 308    RPL_RULESSTART */ ":- %s Server Rules - ",
+/* 309    RPL_ENDOFRULES */ ":End of RULES command.",
+/* 310    RPL_WHOISHELPOP */ "%s :is available for help.",
+/* 311    RPL_WHOISUSER */ "%s %s %s * :%s",
+/* 312    RPL_WHOISSERVER */ "%s %s :%s",
+/* 313    RPL_WHOISOPERATOR */ "%s :is %s",
+/* 314    RPL_WHOWASUSER */ "%s %s %s * :%s",
+/* 315    RPL_ENDOFWHO */ "%s :End of /WHO list.",
+/* 316 */ NULL, /* rfc1459 */
+/* 317    RPL_WHOISIDLE */ "%s %ld %ld :seconds idle, signon time",
+/* 318    RPL_ENDOFWHOIS */ "%s :End of /WHOIS list.",
+/* 319    RPL_WHOISCHANNELS */ "%s :%s",
+/* 320    RPL_WHOISSPECIAL */ "%s :%s",
+/* 321    RPL_LISTSTART */ "Channel :Users  Name",
+#ifndef LIST_SHOW_MODES
+/* 322    RPL_LIST */ "%s %d :%s",
+#else
+/* 322    RPL_LIST */ "%s %d :%s %s",
+#endif
+/* 323    RPL_LISTEND */ ":End of /LIST",
+/* 324    RPL_CHANNELMODEIS */ "%s %s %s",
+/* 325 */ NULL, /* rfc2812 */
+/* 326 */ NULL, /* Used */
+/* 327 */ NULL, /* Used */
+/* 328 */ NULL, /* bahamut, austhex */
+/* 329    RPL_CREATIONTIME */ "%s %lu",
+/* 330    RPL_WHOISLOGGEDIN */ "%s %s :is logged in as", 
+/* 331    RPL_NOTOPIC */ "%s :No topic is set.",
+/* 332    RPL_TOPIC */ "%s :%s",
+/* 333    RPL_TOPICWHOTIME */ "%s %s %lu",
+/* 334    RPL_LISTSYNTAX */ ":%s",
+/* 335    RPL_WHOISBOT */ "%s :is a \2Bot\2 on %s",
+/* 336    RPL_INVITELIST */ ":%s",
+/* 337    RPL_ENDOFINVITELIST */ ":End of /INVITE list.",
+/* 338 */ NULL, /* ircu, bahamut */
+/* 339 */ NULL, /* Used */
+/* 340    RPL_USERIP */ ":%s %s %s %s %s",
+/* 341    RPL_INVITING */ "%s %s",
+/* 342    RPL_SUMMONING */ "%s :User summoned to irc",
+/* 343 */ NULL,
+/* 344 */ NULL,
+/* 345 */ NULL, /* gamesurge */
+/* 346    RPL_INVEXLIST */ "%s %s %s %lu",
+/* 347    RPL_ENDOFINVEXLIST */ "%s :End of Channel Invite List",
+/* 348    RPL_EXLIST */ "%s %s %s %lu",
+/* 349    RPL_ENDOFEXLIST */ "%s :End of Channel Exception List",
+/* 350 */ NULL,
+/* 351    RPL_VERSION */ "%s.%s %s :%s%s%s [%s=%d]",
+/* 352    RPL_WHOREPLY */ "%s %s %s %s %s %s :%d %s",
+/* 353    RPL_NAMREPLY */ "%s",
+/* 354 */ NULL, /* ircu */
+/* 355 */ NULL, /* quakenet */
+/* 356 */ NULL,
+/* 357 */ NULL, /* austhex */
+/* 358 */ NULL, /* austhex */
+/* 359 */ NULL, /* austhex */
+/* 360 */ NULL,
+/* 361 */ NULL, /* rfc1459 */
+/* 362    RPL_CLOSING */ "%s :Closed. Status = %d",
+/* 363    RPL_CLOSEEND */ "%d: Connections Closed",
+/* 364    RPL_LINKS */ "%s %s :%d %s",
+/* 365    RPL_ENDOFLINKS */ "%s :End of /LINKS list.",
+/* 366    RPL_ENDOFNAMES */ "%s :End of /NAMES list.",
+/* 367    RPL_BANLIST */ "%s %s %s %lu",
+/* 368    RPL_ENDOFBANLIST  */ "%s :End of Channel Ban List",
+/* 369    RPL_ENDOFWHOWAS */ "%s :End of WHOWAS",
+/* 370 */ NULL,
+/* 371    RPL_INFO */ ":%s",
+/* 372    RPL_MOTD */ ":- %s",
+/* 373    RPL_INFOSTART */ ":Server INFO",
+/* 374    RPL_ENDOFINFO */ ":End of /INFO list.",
+/* 375    RPL_MOTDSTART */ ":- %s Message of the Day - ",
+/* 376    RPL_ENDOFMOTD */ ":End of /MOTD command.",
+/* 377 */ NULL, /* aircd, austhex */
+/* 378    RPL_WHOISHOST */ "%s :is connecting from %s@%s %s",
+/* 379    RPL_WHOISMODES */ "%s :is using modes %s %s",
+/* 380 */ NULL, /* aircd, austhex */
+/* 381    RPL_YOUREOPER */ ":You are now an IRC Operator",
+/* 382    RPL_REHASHING */ "%s :Rehashing",
+/* 383 */ NULL, /* rfc2812 */
+/* 384    RPL_MYPORTIS */ "%d :Port to local server is\r\n",
+/* 385 */ NULL, /* austhex, hybrid */
+/* 386    RPL_QLIST */ "%s %s",
+/* 387    RPL_ENDOFQLIST */ "%s :End of Channel Owner List",
+/* 388    RPL_ALIST */ "%s %s",
+/* 389    RPL_ENDOFALIST */ "%s :End of Protected User List",
+/* 390 */ NULL,
+/* 391    RPL_TIME */ "%s :%s",
+#ifdef	ENABLE_USERS
+/* 392    RPL_USERSSTART */ ":UserID   Terminal  Host",
+/* 393    RPL_USERS */ ":%-8s %-9s %-8s",
+/* 394    RPL_ENDOFUSERS */ ":End of Users",
+/* 395    RPL_NOUSERS */ ":Nobody logged in.",
+#else
+/* 392 */ NULL,
+/* 393 */ NULL,
+/* 394 */ NULL,
+/* 395 */ NULL, 
+#endif
+/* 396    RPL_HOSTHIDDEN */ "%s :is now your displayed host",
+/* 397 */ NULL,
+/* 398 */ NULL,
+/* 399 */ NULL,
+/* 400 */ NULL, /* Used */
+/* 401    ERR_NOSUCHNICK */ "%s :No such nick/channel",
+/* 402    ERR_NOSUCHSERVER */ "%s :No such server",
+/* 403    ERR_NOSUCHCHANNEL */ "%s :No such channel",
+/* 404    ERR_CANNOTSENDTOCHAN */ "%s :%s (%s)",
+/* 405    ERR_TOOMANYCHANNELS */ "%s :You have joined too many channels",
+/* 406    ERR_WASNOSUCHNICK */ "%s :There was no such nickname",
+/* 407    ERR_TOOMANYTARGETS */ "%s :Too many targets. The maximum is %d for %s.",
+/* 408 */ NULL, /* rfc2812, bahamut */
+/* 409    ERR_NOORIGIN */ ":No origin specified",
+/* 410    ERR_INVALIDCAPCMD */ "%s :Invalid CAP subcommand", 
+/* 411    ERR_NORECIPIENT */ ":No recipient given (%s)",
+/* 412    ERR_NOTEXTTOSEND */ ":No text to send",
+/* 413    ERR_NOTOPLEVEL */ "%s :No toplevel domain specified",
+/* 414    ERR_WILDTOPLEVEL */ "%s :Wildcard in toplevel Domain",
+/* 415 */ NULL, /* rfc2812 */
+/* 416    ERR_TOOMANYMATCHES */ "%s :%s",
+/* 417 */ NULL,
+/* 418 */ NULL,
+/* 419 */ NULL, /* aircd */
+/* 420 */ NULL,
+/* 421    ERR_UNKNOWNCOMMAND */ "%s :Unknown command",
+/* 422    ERR_NOMOTD */ ":MOTD File is missing",
+/* 423    ERR_NOADMININFO */ "%s :No administrative info available",
+/* 424    ERR_FILEERROR */ ":File error doing %s on %s",
+/* 425    ERR_NOOPERMOTD */ ":OPERMOTD File is missing",
+/* 426 */ NULL,
+/* 427 */ NULL,
+/* 428 */ NULL,
+/* 429 ERR_TOOMANYAWAY */ ":Too Many aways - Flood Protection activated",
+/* 430 */ NULL, /* austhex */
+/* 431    ERR_NONICKNAMEGIVEN */ ":No nickname given",
+/* 432    ERR_ERRONEUSNICKNAME */ "%s :Nickname is unavailable: %s",
+/* 433    ERR_NICKNAMEINUSE */ "%s :Nickname is already in use.",
+/* 434    ERR_NORULES */ ":RULES File is missing",
+/* 435 */ NULL, /* bahamut */
+/* 436    ERR_NICKCOLLISION */ "%s :Nickname collision KILL",
+/* 437    ERR_BANNICKCHANGE */ "%s :Cannot change nickname while banned on channel",
+/* 438    ERR_NCHANGETOOFAST */ "%s :Nick change too fast. Please wait %d seconds",
+/* 439    ERR_TARGETTOOFAST */ "%s :Message target change too fast. Please wait %ld seconds",
+/* 440    ERR_SERVICESDOWN */  "%s :Services are currently down. Please try again later.",
+/* 441    ERR_USERNOTINCHANNEL */ "%s %s :They aren't on that channel",
+/* 442    ERR_NOTONCHANNEL */ "%s :You're not on that channel",
+/* 443    ERR_USERONCHANNEL */ "%s %s :is already on channel",
+/* 444    ERR_NOLOGIN */ "%s :User not logged in",
+/* 445    ERR_SUMMONDISABLED */ ":SUMMON has been disabled",
+/* 446    ERR_USERSDISABLED */ ":USERS has been disabled",
+/* 447    ERR_NONICKCHANGE */ ":Can not change nickname while on %s (+N)",
+/* 448 	ERR_FORBIDDENCHANNEL */ "%s :Cannot join channel: %s",
+/* 449 */ NULL, /* ircu */
+/* 450 */ NULL,
+/* 451    ERR_NOTREGISTERED */ ":You have not registered",
+/* 452 */ NULL, /* Used */
+/* 453 */ NULL, /* Used */
+/* 454 */ NULL,
+/* 455    ERR_HOSTILENAME */ ":Your username %s contained the invalid "
+	    "character(s) %s and has been changed to %s. "
+	    "Please use only the characters 0-9 a-z A-Z _ - "
+	    "or . in your username. Your username is the part "
+	    "before the @ in your email address.",
+/* 456 */ NULL, /* hybrid */
+/* 457 */ NULL, /* hybrid */
+/* 458 */ NULL, /* hybrid */
+/* 459    ERR_NOHIDING */ "%s :Cannot join channel (+H)",
+/* 460    ERR_NOTFORHALFOPS */ ":Halfops cannot set mode %c",
+/* 461    ERR_NEEDMOREPARAMS */ "%s :Not enough parameters",
+/* 462    ERR_ALREADYREGISTRED */ ":You may not reregister",
+/* 463    ERR_NOPERMFORHOST */ ":Your host isn't among the privileged",
+/* 464    ERR_PASSWDMISMATCH */ ":Password Incorrect",
+/* 465    ERR_YOUREBANNEDCREEP */	":%s",
+/* 466 */ NULL, /* rfc1459 */
+/* 467    ERR_KEYSET */ "%s :Channel key already set",
+/* 468    ERR_ONLYSERVERSCANCHANGE */ "%s :Only servers can change that mode",
+/* 469    ERR_LINKSET */ "%s :Channel link already set",
+/* 470    ERR_LINKCHANNEL */ "%s %s :[Link] %s has become full, so you are automatically being transferred to the linked channel %s",
+/* 471    ERR_CHANNELISFULL */ "%s :Cannot join channel (+l)",
+/* 472    ERR_UNKNOWNMODE */ "%c :is unknown mode char to me",
+/* 473    ERR_INVITEONLYCHAN */ "%s :Cannot join channel (+i)",
+/* 474    ERR_BANNEDFROMCHAN */ "%s :Cannot join channel (+b)",
+/* 475    ERR_BADCHANNELKEY */ "%s :Cannot join channel (+k)",
+/* 476    ERR_BADCHANMASK */ "%s :Bad Channel Mask",
+/* 477    ERR_NEEDREGGEDNICK */ "%s :You need a registered nick to join that channel.",
+/* 478    ERR_BANLISTFULL */ "%s %s :Channel ban/ignore list is full",
+/* 479    ERR_LINKFAIL */ "%s :Sorry, the channel has an invalid channel link set.",
+/* 480    ERR_CANNOTKNOCK */ ":Cannot knock on %s (%s)",
+/* 481    ERR_NOPRIVILEGES */ ":Permission Denied- You do not have the correct IRC operator privileges",
+/* 482    ERR_CHANOPRIVSNEEDED */ "%s :You're not channel operator",
+/* 483    ERR_CANTKILLSERVER */ ":You cant kill a server!",
+/* 484    ERR_ATTACKDENY */ "%s :Cannot kick protected user %s.",
+/* 485    ERR_KILLDENY */ ":Cannot kill protected user %s.",
+/* 486    ERR_NONONREG */ ":You must identify to a registered nick to private message %s",
+/* 487    ERR_NOTFORUSERS */ ":%s is a server only command",
+/* 488 */ NULL,
+/* 489    ERR_SECUREONLYCHAN */ "%s :Cannot join channel (Secure connection is required)",
+/* 490    ERR_NOSWEAR */ ":%s does not accept private messages containing swearing.",
+/* 491    ERR_NOOPERHOST */ ":No O-lines for your host",
+/* 492    ERR_NOCTCP */ ":%s does not accept CTCPs",
+/* 493 */ NULL, /* ircu */
+/* 494 */ NULL, /* ircu */
+/* 495 */ NULL, /* ircu */
+/* 496 */ NULL, /* ircu */
+/* 497 */ NULL, /* ircu */
+/* 498 */ NULL, /* ircu */
+/* 499    ERR_CHANOWNPRIVNEEDED */ "%s :You're not a channel owner",
+/* 500    ERR_TOOMANYJOINS */ "%s :Too many join requests. Please wait a while and try again.",
+/* 501    ERR_UMODEUNKNOWNFLAG */ ":Unknown MODE flag",
+/* 502    ERR_USERSDONTMATCH */ ":Cant change mode for other users",
+/* 503 */ NULL, /* austhex */
+/* 504 */ NULL, /* Used */
+/* 505 */ NULL,
+/* 506 */ NULL,
+/* 507 */ NULL,
+/* 508 */ NULL,
+/* 509 */ NULL,
+/* 510 */ NULL,
+/* 511    ERR_SILELISTFULL */ "%s :Your silence list is full",
+/* 512    ERR_TOOMANYWATCH */ "%s :Maximum size for WATCH-list is 128 entries",
+/* 513    ERR_NEEDPONG */ ":To connect, type /QUOTE PONG %lX",
+/* 514    ERR_TOOMANYDCC */ "%s :Your dcc allow list is full. Maximum size is %d entries",
+/* 515 */ NULL, /* ircu */
+/* 516 */ NULL, /* ircu */
+/* 517    ERR_DISABLED*/ "%s :%s", /* ircu */
+/* 518    518 */ ":Cannot invite (+V) at channel %s",
+/* 519    519 */ ":Cannot join channel %s (Admin only)",
+/* 520    520 */ ":Cannot join channel %s (IRCops only)",
+/* 521    ERR_LISTSYNTAX */ ":Bad list syntax, type /quote list ? or /raw list ?",
+/* 522    ERR_WHOSYNTAX */ ":/WHO Syntax incorrect, use /who ? for help",
+/* 523 	  ERR_WHOLIMEXCEED */ ":Error, /who limit of %d exceeded. Please narrow your search down and try again",
+/* 524    ERR_OPERSPVERIFY */ ":Trying to join +s or +p channel as an oper. Please invite yourself first.",
+/* 525 */ NULL, /* draft-brocklesby-irc-usercmdpfx */
+/* 526 */ NULL, /* draft-brocklesby-irc-usercmdpfx */
+/* 527 */ NULL,
+/* 528 */ NULL,
+/* 529 */ NULL,
+/* 530 */ NULL,
+/* 531    ERR_CANTSENDTOUSER */ "%s :%s",
+/* 532 */ NULL,
+/* 533 */ NULL,
+/* 534 */ NULL,
+/* 535 */ NULL,
+/* 536 */ NULL,
+/* 537 */ NULL,
+/* 538 */ NULL,
+/* 539 */ NULL,
+/* 540 */ NULL,
+/* 541 */ NULL,
+/* 542 */ NULL,
+/* 543 */ NULL,
+/* 544 */ NULL,
+/* 545 */ NULL,
+/* 546 */ NULL,
+/* 547 */ NULL,
+/* 548 */ NULL,
+/* 549 */ NULL,
+/* 550 */ NULL, /* quakenet */
+/* 551 */ NULL, /* quakenet */
+/* 552 */ NULL, /* quakenet */
+/* 553 */ NULL, /* quakenet */
+/* 554 */ NULL,
+/* 555 */ NULL,
+/* 556 */ NULL,
+/* 557 */ NULL,
+/* 558 */ NULL,
+/* 559 */ NULL,
+/* 560 */ NULL,
+/* 561 */ NULL,
+/* 562 */ NULL,
+/* 563 */ NULL,
+/* 564 */ NULL,
+/* 565 */ NULL,
+/* 566 */ NULL,
+/* 567 */ NULL,
+/* 568 */ NULL,
+/* 569 */ NULL,
+/* 570 */ NULL,
+/* 571 */ NULL,
+/* 572 */ NULL,
+/* 573 */ NULL,
+/* 574 */ NULL,
+/* 575 */ NULL,
+/* 576 */ NULL,
+/* 577 */ NULL,
+/* 578 */ NULL,
+/* 579 */ NULL,
+/* 580 */ NULL,
+/* 581 */ NULL,
+/* 582 */ NULL,
+/* 583 */ NULL,
+/* 584 */ NULL,
+/* 585 */ NULL,
+/* 586 */ NULL,
+/* 587 */ NULL,
+/* 588 */ NULL,
+/* 589 */ NULL,
+/* 590 */ NULL,
+/* 591 */ NULL,
+/* 592 */ NULL,
+/* 593 */ NULL,
+/* 594 */ NULL,
+/* 595 */ NULL,
+/* 596 */ NULL,
+/* 597    RPL_REAWAY */ "%s %s %s %d :%s",
+/* 598    RPL_GONEAWAY */ "%s %s %s %d :%s",
+/* 599    RPL_NOTAWAY */ "%s %s %s %d :is no longer away",
+/* 600    RPL_LOGON */ "%s %s %s %d :logged online",
+/* 601    RPL_LOGOFF */ "%s %s %s %d :logged offline",
+/* 602    RPL_WATCHOFF */ "%s %s %s %d :stopped watching",
+/* 603    RPL_WATCHSTAT */ ":You have %d and are on %d WATCH entries",
+/* 604    RPL_NOWON */ "%s %s %s %ld :is online",
+/* 605    RPL_NOWOFF */ "%s %s %s %ld :is offline",
+/* 606    RPL_WATCHLIST */ ":%s",
+/* 607    RPL_ENDOFWATCHLIST */ ":End of WATCH %c",
+/* 608    RPL_CLEARWATCH */ ":Your WATCH list is now empty",
+/* 609    RPL_NOWISAWAY */ "%s %s %s %ld :is away",
+/* 610    RPL_MAPMORE */ ":%s%-*s --> *more*",
+/* 611 */ NULL, /* ultimate */
+/* 612 */ NULL, /* ultimate */
+/* 613 */ NULL, /* ultimate */
+/* 614 */ NULL,
+/* 615 */ NULL, /* ptlink, ultimate */
+/* 616 */ NULL, /* ultimate */
+/* 617    RPL_DCCSTATUS */ ":%s has been %s your DCC allow list",
+/* 618    RPL_DCCLIST */ ":%s",
+/* 619    RPL_ENDOFDCCLIST */ ":End of DCCALLOW %s",
+/* 620    RPL_DCCINFO */ ":%s",
+/* 621 */ NULL, /* ultimate */
+/* 622 */ NULL, /* ultimate */
+/* 623 */ NULL, /* ultimate */
+/* 624 */ NULL, /* ultimate */
+/* 625 */ NULL, /* ultimate */
+/* 626 */ NULL, /* ultimate */
+/* 627 */ NULL,
+/* 628 */ NULL,
+/* 629 */ NULL,
+/* 630 */ NULL, /* ultimate */
+/* 631 */ NULL, /* ultimate */
+/* 632 */ NULL,
+/* 633 */ NULL,
+/* 634 */ NULL,
+/* 635 */ NULL,
+/* 636 */ NULL,
+/* 637 */ NULL,
+/* 638 */ NULL,
+/* 639 */ NULL,
+/* 640 */ NULL,
+/* 641 */ NULL,
+/* 642 */ NULL,
+/* 643 */ NULL,
+/* 644 */ NULL,
+/* 645 */ NULL,
+/* 646 */ NULL,
+/* 647 */ NULL,
+/* 648 */ NULL,
+/* 649 */ NULL,
+/* 650 */ NULL,
+/* 651 */ NULL,
+/* 652 */ NULL,
+/* 653 */ NULL,
+/* 654 */ NULL,
+/* 655 */ NULL,
+/* 656 */ NULL,
+/* 657 */ NULL,
+/* 658 */ NULL,
+/* 659 RPL_SPAMCMDFWD */ "%s :Command processed, but a copy has been sent to ircops for evaluation (anti-spam) purposes. [%s]",
+/* 660 */ NULL, /* kineircd */
+/* 661 */ NULL, /* kineircd */
+/* 662 */ NULL, /* kineircd */
+/* 663 */ NULL, /* kineircd */
+/* 664 */ NULL, /* kineircd */
+/* 665 */ NULL, /* kineircd */
+/* 666 */ NULL, /* kineircd */
+/* 667 */ NULL,
+/* 668 */ NULL,
+/* 669 */ NULL,
+/* 670 RPL_STARTTLS */ ":STARTTLS successful, go ahead with TLS handshake", /* kineircd */
+/* 671 RPL_WHOISSECURE */ "%s :%s", /* our variation on the kineircd numeric */
+/* 672 */ NULL, /* ithildin */
+/* 673 */ NULL, /* ithildin */
+/* 674 */ NULL,
+/* 675 */ NULL,
+/* 676 */ NULL,
+/* 677 */ NULL,
+/* 678 */ NULL, /* kineircd */
+/* 679 */ NULL, /* kineircd */
+/* 680 */ NULL,
+/* 681 */ NULL,
+/* 682 */ NULL, /* kineircd */
+/* 683 */ NULL,
+/* 684 */ NULL,
+/* 685 */ NULL,
+/* 686 */ NULL,
+/* 687 */ NULL, /* kineircd */
+/* 688 */ NULL, /* kineircd */
+/* 689 */ NULL, /* kineircd */
+/* 690 */ NULL, /* kineircd */
+/* 691 ERR_STARTTLS */ ":%s",
+/* 692 */ NULL,
+/* 693 */ NULL,
+/* 694 */ NULL,
+/* 695 */ NULL,
+/* 696 */ NULL,
+/* 697 */ NULL,
+/* 698 */ NULL,
+/* 699 */ NULL,
+/* 700 */ NULL,
+/* 701 */ NULL,
+/* 702 */ NULL,
+/* 703 */ NULL,
+/* 704 */ NULL,
+/* 705 */ NULL,
+/* 706 */ NULL,
+/* 707 */ NULL,
+/* 708 */ NULL,
+/* 709 */ NULL,
+/* 710 */ NULL,
+/* 711 */ NULL,
+/* 712 */ NULL,
+/* 713 */ NULL,
+/* 714 */ NULL,
+/* 715 */ NULL,
+/* 716 */ NULL, /* ratbox */
+/* 717 */ NULL, /* ratbox */
+/* 718 */ NULL, /* ratbox */
+/* 719 */ NULL,
+/* 720 */ NULL,
+/* 721 */ NULL,
+/* 722 */ NULL,
+/* 723 */ NULL,
+/* 724 */ NULL,
+/* 725 */ NULL,
+/* 726 */ NULL,
+/* 727 */ NULL,
+/* 728 */ NULL,
+/* 729 */ NULL,
+/* 730 */ NULL,
+/* 731 */ NULL,
+/* 732 */ NULL,
+/* 733 */ NULL,
+/* 734 */ NULL,
+/* 735 */ NULL,
+/* 736 */ NULL,
+/* 737 */ NULL,
+/* 738 */ NULL,
+/* 739 */ NULL,
+/* 740 */ NULL,
+/* 741 */ NULL,
+/* 742 ERR_MLOCKRESTRICTED */ "%s %c %s :MODE cannot be set due to channel having an active MLOCK restriction policy",
+/* 743 */ NULL,
+/* 744 */ NULL,
+/* 745 */ NULL,
+/* 746 */ NULL,
+/* 747 */ NULL,
+/* 748 */ NULL,
+/* 749 */ NULL,
+/* 750 */ NULL,
+/* 751 */ NULL,
+/* 752 */ NULL,
+/* 753 */ NULL,
+/* 754 */ NULL,
+/* 755 */ NULL,
+/* 756 */ NULL,
+/* 757 */ NULL,
+/* 758 */ NULL,
+/* 759 */ NULL,
+/* 760 */ NULL,
+/* 761 */ NULL,
+/* 762 */ NULL,
+/* 763 */ NULL,
+/* 764 */ NULL,
+/* 765 */ NULL,
+/* 766 */ NULL,
+/* 767 */ NULL,
+/* 768 */ NULL,
+/* 769 */ NULL,
+/* 770 */ NULL,
+/* 771 */ NULL, /* ithildin */
+/* 772 */ NULL,
+/* 773 */ NULL, /* ithildin */
+/* 774 */ NULL, /* ithildin */
+/* 775 */ NULL,
+/* 776 */ NULL,
+/* 777 */ NULL,
+/* 778 */ NULL,
+/* 779 */ NULL,
+/* 780 */ NULL,
+/* 781 */ NULL,
+/* 782 */ NULL,
+/* 783 */ NULL,
+/* 784 */ NULL,
+/* 785 */ NULL,
+/* 786 */ NULL,
+/* 787 */ NULL,
+/* 788 */ NULL,
+/* 789 */ NULL,
+/* 790 */ NULL,
+/* 791 */ NULL,
+/* 792 */ NULL,
+/* 793 */ NULL,
+/* 794 */ NULL,
+/* 795 */ NULL,
+/* 796 */ NULL,
+/* 797 */ NULL,
+/* 798 */ NULL,
+/* 799 */ NULL,
+/* 800 */ NULL,
+/* 801 */ NULL,
+/* 802 */ NULL,
+/* 803 */ NULL,
+/* 804 */ NULL,
+/* 805 */ NULL,
+/* 806 */ NULL,
+/* 807 */ NULL,
+/* 808 */ NULL,
+/* 809 */ NULL,
+/* 810 */ NULL,
+/* 811 */ NULL,
+/* 812 */ NULL,
+/* 813 */ NULL,
+/* 814 */ NULL,
+/* 815 */ NULL,
+/* 816 */ NULL,
+/* 817 */ NULL,
+/* 818 */ NULL,
+/* 819 */ NULL,
+/* 820 */ NULL,
+/* 821 */ NULL,
+/* 822 */ NULL,
+/* 823 */ NULL,
+/* 824 */ NULL,
+/* 825 */ NULL,
+/* 826 */ NULL,
+/* 827 */ NULL,
+/* 828 */ NULL,
+/* 829 */ NULL,
+/* 830 */ NULL,
+/* 831 */ NULL,
+/* 832 */ NULL,
+/* 833 */ NULL,
+/* 834 */ NULL,
+/* 835 */ NULL,
+/* 836 */ NULL,
+/* 837 */ NULL,
+/* 838 */ NULL,
+/* 839 */ NULL,
+/* 840 */ NULL,
+/* 841 */ NULL,
+/* 842 */ NULL,
+/* 843 */ NULL,
+/* 844 */ NULL,
+/* 845 */ NULL,
+/* 846 */ NULL,
+/* 847 */ NULL,
+/* 848 */ NULL,
+/* 849 */ NULL,
+/* 850 */ NULL,
+/* 851 */ NULL,
+/* 852 */ NULL,
+/* 853 */ NULL,
+/* 854 */ NULL,
+/* 855 */ NULL,
+/* 856 */ NULL,
+/* 857 */ NULL,
+/* 858 */ NULL,
+/* 859 */ NULL,
+/* 860 */ NULL,
+/* 861 */ NULL,
+/* 862 */ NULL,
+/* 863 */ NULL,
+/* 864 */ NULL,
+/* 865 */ NULL,
+/* 866 */ NULL,
+/* 867 */ NULL,
+/* 868 */ NULL,
+/* 869 */ NULL,
+/* 870 */ NULL,
+/* 871 */ NULL,
+/* 872 */ NULL,
+/* 873 */ NULL,
+/* 874 */ NULL,
+/* 875 */ NULL,
+/* 876 */ NULL,
+/* 877 */ NULL,
+/* 878 */ NULL,
+/* 879 */ NULL,
+/* 880 */ NULL,
+/* 881 */ NULL,
+/* 882 */ NULL,
+/* 883 */ NULL,
+/* 884 */ NULL,
+/* 885 */ NULL,
+/* 886 */ NULL,
+/* 887 */ NULL,
+/* 888 */ NULL,
+/* 889 */ NULL,
+/* 890 */ NULL,
+/* 891 */ NULL,
+/* 892 */ NULL,
+/* 893 */ NULL,
+/* 894 */ NULL,
+/* 895 */ NULL,
+/* 896 */ NULL,
+/* 897 */ NULL,
+/* 898 */ NULL,
+/* 899 */ NULL,
+/* 900 RPL_LOGGEDIN */          "%s!%s@%s %s :You are now logged in as %s.",
+/* 901 RPL_LOGGEDOUT */         "%s!%s@%s :You are now logged out.",
+/* 902 ERR_NICKLOCKED */        ":You must use a nick assigned to you.",
+/* 903 RPL_SASLSUCCESS */       ":SASL authentication successful",
+/* 904 ERR_SASLFAIL */          ":SASL authentication failed",
+/* 905 ERR_SASLTOOLONG */       ":SASL message too long",
+/* 906 ERR_SASLABORTED */       ":SASL authentication aborted",
+/* 907 ERR_SASLALREADY */       ":You have already completed SASL authentication",
+/* 908 RPL_SASLMECHS */         "%s :are available SASL mechanisms",
+/* 909 */ NULL,
+/* 910 */ NULL,
+/* 911 */ NULL,
+/* 912 */ NULL,
+/* 913 */ NULL,
+/* 914 */ NULL,
+/* 915 */ NULL,
+/* 916 */ NULL,
+/* 917 */ NULL,
+/* 918 */ NULL,
+/* 919 */ NULL,
+/* 920 */ NULL,
+/* 921 */ NULL,
+/* 922 */ NULL,
+/* 923 */ NULL,
+/* 924 */ NULL,
+/* 925 */ NULL,
+/* 926 */ NULL,
+/* 927 */ NULL,
+/* 928 */ NULL,
+/* 929 */ NULL,
+/* 930 */ NULL,
+/* 931 */ NULL,
+/* 932 */ NULL,
+/* 933 */ NULL,
+/* 934 */ NULL,
+/* 935 */ NULL,
+/* 936 */ NULL,
+/* 937 */ NULL,
+/* 938 */ NULL,
+/* 939 */ NULL,
+/* 940 */ NULL,
+/* 941 */ NULL,
+/* 942 */ NULL,
+/* 943 */ NULL,
+/* 944 */ NULL,
+/* 945 */ NULL,
+/* 946 */ NULL,
+/* 947 */ NULL,
+/* 948 */ NULL,
+/* 949 */ NULL,
+/* 950 */ NULL,
+/* 951 */ NULL,
+/* 952 */ NULL,
+/* 953 */ NULL,
+/* 954 */ NULL,
+/* 955 */ NULL,
+/* 956 */ NULL,
+/* 957 */ NULL,
+/* 958 */ NULL,
+/* 959 */ NULL,
+/* 960 */ NULL,
+/* 961 */ NULL,
+/* 962 */ NULL,
+/* 963 */ NULL,
+/* 964 */ NULL,
+/* 965 */ NULL,
+/* 966 */ NULL,
+/* 967 */ NULL,
+/* 968 */ NULL,
+/* 969 */ NULL,
+/* 970 */ NULL,
+/* 971 */ NULL,
+/* 972 ERR_CANNOTDOCOMMAND */ "%s :%s",
+/* 973 */ NULL, /* kineircd */
+/* 974 ERR_CANNOTCHANGECHANMODE */ "%c :%s",
+/* 975 */ NULL, /* kineircd */
+/* 976 */ NULL, /* kineircd */
+/* 977 */ NULL, /* kineircd */
+/* 978 */ NULL, /* kineircd */
+/* 979 */ NULL, /* kineircd */
+/* 980 */ NULL, /* kineircd */
+/* 981 */ NULL, /* kineircd */
+/* 982 */ NULL, /* kineircd */
+/* 983 */ NULL, /* kineircd */
+/* 984 */ NULL,
+/* 985 */ NULL,
+/* 986 */ NULL,
+/* 987 */ NULL,
+/* 988 */ NULL,
+/* 989 */ NULL,
+/* 990 */ NULL,
+/* 991 */ NULL,
+/* 992 */ NULL,
+/* 993 */ NULL,
+/* 994 */ NULL,
+/* 995 */ NULL,
+/* 996 */ NULL,
+/* 997 */ NULL,
+/* 998 */ NULL,
+/* 999    ERR_NUMERICERR */ "Numeric error!",
+/* 1000 */ NULL,
+};
+
+char *getreply(int numeric)
+{
+	if ((numeric < 0) || (numeric > 999) || !replies[numeric])
+		return replies[ERR_NUMERICERR];
+	else
+		return replies[numeric];
+}
diff --git a/src/openssl_hostname_validation.c b/src/openssl_hostname_validation.c
new file mode 100644
index 0000000..5d9f0eb
--- /dev/null
+++ b/src/openssl_hostname_validation.c
@@ -0,0 +1,402 @@
+/* This file contains both code from cURL and hostname
+ * validation code from the ssl conservatory (in that order).
+ *
+ * The goal is that all this code won't be needed anymore once
+ * everyone is running a recent OpenSSL/LibreSSL that has
+ * X509_check_host(). Until that time, unfortunately, we need
+ * these 400+ lines to do just that... -- Syzop, Sep/2017
+ */
+
+// Get rid of OSX 10.7 and greater deprecation warnings.
+#if defined(__APPLE__) && defined(__clang__)
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#include <openssl/x509v3.h>
+#include <openssl/ssl.h>
+#include <string.h>
+
+#include "openssl_hostname_validation.h"
+
+#define HOSTNAME_MAX_SIZE 255
+
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER)
+#define ASN1_STRING_get0_data ASN1_STRING_data
+#endif
+
+/***************************************************************************
+ *                                  _   _ ____  _
+ *  Project                     ___| | | |  _ \| |
+ *                             / __| | | | |_) | |
+ *                            | (__| |_| |  _ <| |___
+ *                             \___|\___/|_| \_\_____|
+ *
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ *
+ * This software is licensed as described in the file COPYING, which
+ * you should have received as part of this distribution. The terms
+ * are also available at http://curl.haxx.se/docs/copyright.html.
+ *
+ * You may opt to use, copy, modify, merge, publish, distribute and/or sell
+ * copies of the Software, and permit persons to whom the Software is
+ * furnished to do so, under the terms of the COPYING file.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ***************************************************************************/
+
+/* This file is an amalgamation of hostcheck.c and most of rawstr.c
+   from cURL.  The contents of the COPYING file mentioned above are:
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2013, Daniel Stenberg, <daniel@haxx.se>.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
+*/
+
+/* Portable, consistent toupper (remember EBCDIC). Do not use toupper() because
+   its behavior is altered by the current locale. */
+static char Curl_raw_toupper(char in)
+{
+  switch (in) {
+  case 'a':
+    return 'A';
+  case 'b':
+    return 'B';
+  case 'c':
+    return 'C';
+  case 'd':
+    return 'D';
+  case 'e':
+    return 'E';
+  case 'f':
+    return 'F';
+  case 'g':
+    return 'G';
+  case 'h':
+    return 'H';
+  case 'i':
+    return 'I';
+  case 'j':
+    return 'J';
+  case 'k':
+    return 'K';
+  case 'l':
+    return 'L';
+  case 'm':
+    return 'M';
+  case 'n':
+    return 'N';
+  case 'o':
+    return 'O';
+  case 'p':
+    return 'P';
+  case 'q':
+    return 'Q';
+  case 'r':
+    return 'R';
+  case 's':
+    return 'S';
+  case 't':
+    return 'T';
+  case 'u':
+    return 'U';
+  case 'v':
+    return 'V';
+  case 'w':
+    return 'W';
+  case 'x':
+    return 'X';
+  case 'y':
+    return 'Y';
+  case 'z':
+    return 'Z';
+  }
+  return in;
+}
+
+/*
+ * Curl_raw_equal() is for doing "raw" case insensitive strings. This is meant
+ * to be locale independent and only compare strings we know are safe for
+ * this.  See http://daniel.haxx.se/blog/2008/10/15/strcasecmp-in-turkish/ for
+ * some further explanation to why this function is necessary.
+ *
+ * The function is capable of comparing a-z case insensitively even for
+ * non-ascii.
+ */
+
+static int Curl_raw_equal(const char *first, const char *second)
+{
+  while(*first && *second) {
+    if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second))
+      /* get out of the loop as soon as they don't match */
+      break;
+    first++;
+    second++;
+  }
+  /* we do the comparison here (possibly again), just to make sure that if the
+     loop above is skipped because one of the strings reached zero, we must not
+     return this as a successful match */
+  return (Curl_raw_toupper(*first) == Curl_raw_toupper(*second));
+}
+
+static int Curl_raw_nequal(const char *first, const char *second, size_t max)
+{
+  while(*first && *second && max) {
+    if(Curl_raw_toupper(*first) != Curl_raw_toupper(*second)) {
+      break;
+    }
+    max--;
+    first++;
+    second++;
+  }
+  if(0 == max)
+    return 1; /* they are equal this far */
+
+  return Curl_raw_toupper(*first) == Curl_raw_toupper(*second);
+}
+
+/*
+ * Match a hostname against a wildcard pattern.
+ * E.g.
+ *  "foo.host.com" matches "*.host.com".
+ *
+ * We use the matching rule described in RFC6125, section 6.4.3.
+ * http://tools.ietf.org/html/rfc6125#section-6.4.3
+ */
+
+static int hostmatch(const char *hostname, const char *pattern)
+{
+  const char *pattern_label_end, *pattern_wildcard, *hostname_label_end;
+  int wildcard_enabled;
+  size_t prefixlen, suffixlen;
+  pattern_wildcard = strchr(pattern, '*');
+  if(pattern_wildcard == NULL)
+    return Curl_raw_equal(pattern, hostname) ?
+      CURL_HOST_MATCH : CURL_HOST_NOMATCH;
+
+  /* We require at least 2 dots in pattern to avoid too wide wildcard
+     match. */
+  wildcard_enabled = 1;
+  pattern_label_end = strchr(pattern, '.');
+  if(pattern_label_end == NULL || strchr(pattern_label_end+1, '.') == NULL ||
+     pattern_wildcard > pattern_label_end ||
+     Curl_raw_nequal(pattern, "xn--", 4)) {
+    wildcard_enabled = 0;
+  }
+  if(!wildcard_enabled)
+    return Curl_raw_equal(pattern, hostname) ?
+      CURL_HOST_MATCH : CURL_HOST_NOMATCH;
+
+  hostname_label_end = strchr(hostname, '.');
+  if(hostname_label_end == NULL ||
+     !Curl_raw_equal(pattern_label_end, hostname_label_end))
+    return CURL_HOST_NOMATCH;
+
+  /* The wildcard must match at least one character, so the left-most
+     label of the hostname is at least as large as the left-most label
+     of the pattern. */
+  if(hostname_label_end - hostname < pattern_label_end - pattern)
+    return CURL_HOST_NOMATCH;
+
+  prefixlen = pattern_wildcard - pattern;
+  suffixlen = pattern_label_end - (pattern_wildcard+1);
+  return Curl_raw_nequal(pattern, hostname, prefixlen) &&
+    Curl_raw_nequal(pattern_wildcard+1, hostname_label_end - suffixlen,
+                    suffixlen) ?
+    CURL_HOST_MATCH : CURL_HOST_NOMATCH;
+}
+
+int Curl_cert_hostcheck(const char *match_pattern, const char *hostname)
+{
+  if(!match_pattern || !*match_pattern ||
+      !hostname || !*hostname) /* sanity check */
+    return 0;
+
+  if(Curl_raw_equal(hostname, match_pattern)) /* trivial case */
+    return 1;
+
+  if(hostmatch(hostname,match_pattern) == CURL_HOST_MATCH)
+    return 1;
+  return 0;
+}
+/* End of cURL related functions */
+
+/* Start of host validation code */
+/* Obtained from: https://github.com/iSECPartners/ssl-conservatory */
+
+/*
+Copyright (C) 2012, iSEC Partners.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+ */
+
+/*
+ * Helper functions to perform basic hostname validation using OpenSSL.
+ *
+ * Please read "everything-you-wanted-to-know-about-openssl.pdf" before
+ * attempting to use this code. This whitepaper describes how the code works,
+ * how it should be used, and what its limitations are.
+ *
+ * Author:  Alban Diquet
+ * License: See LICENSE
+ *
+ */
+
+/**
+* Tries to find a match for hostname in the certificate's Common Name field.
+*
+* Returns MatchFound if a match was found.
+* Returns MatchNotFound if no matches were found.
+* Returns MalformedCertificate if the Common Name had a NUL character embedded in it.
+* Returns Error if the Common Name could not be extracted.
+*/
+static HostnameValidationResult matches_common_name(const char *hostname, const X509 *server_cert) {
+        int common_name_loc = -1;
+        X509_NAME_ENTRY *common_name_entry = NULL;
+        ASN1_STRING *common_name_asn1 = NULL;
+        const char *common_name_str = NULL;
+
+        // Find the position of the CN field in the Subject field of the certificate
+        common_name_loc = X509_NAME_get_index_by_NID(X509_get_subject_name((X509 *) server_cert), NID_commonName, -1);
+        if (common_name_loc < 0) {
+                return Error;
+        }
+
+        // Extract the CN field
+        common_name_entry = X509_NAME_get_entry(X509_get_subject_name((X509 *) server_cert), common_name_loc);
+        if (common_name_entry == NULL) {
+                return Error;
+        }
+
+        // Convert the CN field to a C string
+        common_name_asn1 = X509_NAME_ENTRY_get_data(common_name_entry);
+        if (common_name_asn1 == NULL) {
+                return Error;
+        }
+        common_name_str = (char *) ASN1_STRING_get0_data(common_name_asn1);
+
+        // Make sure there isn't an embedded NUL character in the CN
+        if ((size_t)ASN1_STRING_length(common_name_asn1) != strlen(common_name_str)) {
+                return MalformedCertificate;
+        }
+
+        // Compare expected hostname with the CN
+        if (Curl_cert_hostcheck(common_name_str, hostname) == CURL_HOST_MATCH) {
+                return MatchFound;
+        }
+        else {
+                return MatchNotFound;
+        }
+}
+
+
+/**
+* Tries to find a match for hostname in the certificate's Subject Alternative Name extension.
+*
+* Returns MatchFound if a match was found.
+* Returns MatchNotFound if no matches were found.
+* Returns MalformedCertificate if any of the hostnames had a NUL character embedded in it.
+* Returns NoSANPresent if the SAN extension was not present in the certificate.
+*/
+static HostnameValidationResult matches_subject_alternative_name(const char *hostname, const X509 *server_cert) {
+        HostnameValidationResult result = MatchNotFound;
+        int i;
+        int san_names_nb = -1;
+        STACK_OF(GENERAL_NAME) *san_names = NULL;
+
+        // Try to extract the names within the SAN extension from the certificate
+        san_names = X509_get_ext_d2i((X509 *) server_cert, NID_subject_alt_name, NULL, NULL);
+        if (san_names == NULL) {
+                return NoSANPresent;
+        }
+        san_names_nb = sk_GENERAL_NAME_num(san_names);
+
+        // Check each name within the extension
+        for (i=0; i<san_names_nb; i++) {
+                const GENERAL_NAME *current_name = sk_GENERAL_NAME_value(san_names, i);
+
+                if (current_name->type == GEN_DNS) {
+                        // Current name is a DNS name, let's check it
+                        const char *dns_name = (char *) ASN1_STRING_get0_data(current_name->d.dNSName);
+
+                        // Make sure there isn't an embedded NUL character in the DNS name
+                        if ((size_t)ASN1_STRING_length(current_name->d.dNSName) != strlen(dns_name)) {
+                                result = MalformedCertificate;
+                                break;
+                        }
+                        else { // Compare expected hostname with the DNS name
+                                if (Curl_cert_hostcheck(dns_name, hostname)
+                                    == CURL_HOST_MATCH) {
+                                        result = MatchFound;
+                                        break;
+                                }
+                        }
+                }
+        }
+        sk_GENERAL_NAME_pop_free(san_names, GENERAL_NAME_free);
+
+        return result;
+}
+
+
+/**
+* Validates the server's identity by looking for the expected hostname in the
+* server's certificate. As described in RFC 6125, it first tries to find a match
+* in the Subject Alternative Name extension. If the extension is not present in
+* the certificate, it checks the Common Name instead.
+*
+* Returns MatchFound if a match was found.
+* Returns MatchNotFound if no matches were found.
+* Returns MalformedCertificate if any of the hostnames had a NUL character embedded in it.
+* Returns Error if there was an error.
+*/
+HostnameValidationResult validate_hostname(const char *hostname, const X509 *server_cert) {
+        HostnameValidationResult result;
+
+        if((hostname == NULL) || (server_cert == NULL))
+                return Error;
+
+        // First try the Subject Alternative Names extension
+        result = matches_subject_alternative_name(hostname, server_cert);
+        if (result == NoSANPresent) {
+                // Extension was not found: try the Common Name
+                result = matches_common_name(hostname, server_cert);
+        }
+
+        return result;
+}
diff --git a/src/operclass.c b/src/operclass.c
new file mode 100644
index 0000000..86899ca
--- /dev/null
+++ b/src/operclass.c
@@ -0,0 +1,344 @@
+/** Oper classes code.
+ * (C) Copyright 2015-present tmcarthur and the UnrealIRCd team
+ * License: GPLv2
+ */
+
+#include "unrealircd.h"
+
+typedef struct OperClassPathNode OperClassPathNode;
+typedef struct OperClassCallbackNode OperClassCallbackNode;
+
+struct OperClassPathNode
+{
+	OperClassPathNode *prev,*next;
+	OperClassPathNode *children;
+	char *identifier;
+	OperClassCallbackNode *callbacks;
+};
+
+struct OperClassCallbackNode
+{
+	OperClassCallbackNode *prev, *next;
+	OperClassPathNode *parent;
+	OperClassEntryEvalCallback callback;
+};
+
+struct OperClassValidator
+{
+	Module *owner;
+	OperClassCallbackNode *node;
+};
+
+OperClassACLPath *OperClass_parsePath(char *path);
+void OperClass_freePath(OperClassACLPath *path);
+OperClassPathNode *OperClass_findPathNodeForIdentifier(char *identifier, OperClassPathNode *head);
+
+OperClassPathNode *rootEvalNode = NULL;
+
+OperClassValidator *OperClassAddValidator(Module *module, char *pathStr, OperClassEntryEvalCallback callback)
+{
+	OperClassPathNode *node,*nextNode;
+	OperClassCallbackNode *callbackNode;
+	OperClassValidator *validator; 
+	OperClassACLPath *path = OperClass_parsePath(pathStr);
+
+	if (!rootEvalNode)
+	{
+		rootEvalNode = safe_alloc(sizeof(OperClassPathNode));
+	}
+
+	node = rootEvalNode;
+
+	while (path)
+	{
+		nextNode = OperClass_findPathNodeForIdentifier(path->identifier,node->children);
+		if (!nextNode)
+		{
+			nextNode = safe_alloc(sizeof(OperClassPathNode));
+			safe_strdup(nextNode->identifier, path->identifier);
+			AddListItem(nextNode,node->children);
+		}
+		node = nextNode;
+		path = path->next;
+	}
+
+	callbackNode = safe_alloc(sizeof(OperClassCallbackNode));
+	callbackNode->callback = callback;
+	callbackNode->parent = node;	
+	AddListItem(callbackNode,node->callbacks);
+
+	validator = safe_alloc(sizeof(OperClassValidator));
+	validator->node = callbackNode;	
+	validator->owner = module;
+
+	if (module)
+	{
+		ModuleObject *mobj = safe_alloc(sizeof(ModuleObject));
+		mobj->object.validator = validator;
+		mobj->type = MOBJ_VALIDATOR;
+		AddListItem(mobj, module->objects);
+		module->errorcode = MODERR_NOERROR;
+	}
+
+	OperClass_freePath(path);
+
+	return validator;
+}
+
+void OperClassValidatorDel(OperClassValidator *validator)
+{
+	if (validator->owner)
+	{
+		ModuleObject *mdobj;
+		for (mdobj = validator->owner->objects; mdobj; mdobj = mdobj->next)
+		{
+			if ((mdobj->type == MOBJ_VALIDATOR) && (mdobj->object.validator == validator))
+			{
+				DelListItem(mdobj, validator->owner->objects);
+				safe_free(mdobj);
+				break;
+			}
+		}
+		validator->owner = NULL;
+	}
+	
+	/* Technically, the below leaks memory if you don't re-register
+	 * another validator at same path, but it is cheaper than walking
+	 * back up and doing cleanup in practice, since this tree is very small
+	 */
+	DelListItem(validator->node,validator->node->parent->callbacks);
+	safe_free(validator->node);
+	safe_free(validator);	
+}
+
+OperClassACLPath *OperClass_parsePath(char *path)
+{
+	char *pathCopy = raw_strdup(path);
+	OperClassACLPath *pathHead = NULL;
+	OperClassACLPath *tmpPath;
+	char *str = strtok(pathCopy,":");
+	while (str)
+	{
+		tmpPath = safe_alloc(sizeof(OperClassACLPath));
+		safe_strdup(tmpPath->identifier, str);
+		AddListItem(tmpPath,pathHead);
+		str = strtok(NULL,":");
+	}
+
+	while (pathHead->next)
+	{
+		tmpPath = pathHead->next;
+		pathHead->next = pathHead->prev;
+		pathHead->prev = tmpPath;
+		pathHead = tmpPath;
+	}
+	pathHead->next = pathHead->prev;
+	pathHead->prev = NULL;	
+
+	safe_free(pathCopy);
+	return pathHead;
+}
+
+void OperClass_freePath(OperClassACLPath *path)
+{
+	OperClassACLPath *next;
+	while (path)
+	{
+		next = path->next;
+		safe_free(path->identifier);
+		safe_free(path);
+		path = next;
+	}	
+}
+
+OperClassACL *OperClass_FindACL(OperClassACL *acl, char *name)
+{
+	for (;acl;acl = acl->next)
+	{
+		if (!strcmp(acl->name,name))
+		{ 
+			return acl;
+		}
+	}
+	return NULL;
+}
+
+OperClassPathNode *OperClass_findPathNodeForIdentifier(char *identifier, OperClassPathNode *head)
+{
+	for (; head; head = head->next)
+	{
+		if (!strcmp(head->identifier,identifier))
+		{
+			return head;
+		}
+	}
+	return NULL;
+}
+
+unsigned char OperClass_evaluateACLEntry(OperClassACLEntry *entry, OperClassACLPath *path, OperClassCheckParams *params)
+{
+	OperClassPathNode *node = rootEvalNode;	
+	OperClassCallbackNode *callbackNode = NULL;
+	unsigned char eval = 0;
+
+	/* If no variables, always match */
+	if (!entry->variables)
+	{
+		return 1;
+	}
+
+	/* Go as deep as possible */
+	while (path->next && node)
+	{
+		node = OperClass_findPathNodeForIdentifier(path->identifier,node);	
+		/* If we can't find a node we need, and we have vars, no match */
+		if (!node)
+		{
+			return 0;
+		}
+		node = node->children;
+		path = path->next;
+	}
+
+	/* If no evals for full path, no match */
+	if (path->next)
+	{
+		return 0;
+	}
+
+
+	/* We have a valid node, execute all callback nodes */
+	for (callbackNode = node->callbacks; callbackNode; callbackNode = callbackNode->next)
+	{
+		eval = callbackNode->callback(entry->variables,params);
+	}
+
+	return eval;	
+}
+
+OperPermission ValidatePermissionsForPathEx(OperClassACL *acl, OperClassACLPath *path, OperClassCheckParams *params)
+{
+	/** Evaluate into ACL struct as deep as possible **/
+	OperClassACLPath *basePath = path;
+	OperClassACL *tmp;
+	OperClassACLEntry *entry;
+	unsigned char allow = 0;
+	unsigned char deny = 0;
+	unsigned char aclNotFound = 0;
+
+	path = path->next; /* Avoid first level since we have resolved it */
+	while (path && acl->acls)
+	{
+		tmp = OperClass_FindACL(acl->acls,path->identifier);
+		if (!tmp)
+		{
+			aclNotFound = 1;
+			break;
+		}
+		path = path->next;
+		acl = tmp;
+	}
+	/** If node does not exist, but most specific one has other ACLs, deny **/
+	if (acl->acls && aclNotFound)
+	{
+		return OPER_DENY;
+	}
+
+	/** If node exists for this but has no ACL entries, allow **/
+	if (!acl->entries)
+	{
+		return OPER_ALLOW;
+	}
+	/** Process entries **/
+	for (entry = acl->entries; entry; entry = entry->next)
+	{
+		unsigned char result;
+		/* Short circuit if we already have valid block */
+		if (entry->type == OPERCLASSENTRY_ALLOW && allow)
+			continue;
+		if (entry->type == OPERCLASSENTRY_DENY && deny)
+			continue;
+
+		result = OperClass_evaluateACLEntry(entry,basePath,params);
+		if (entry->type == OPERCLASSENTRY_ALLOW)
+		{
+			allow = result;
+		}
+		else
+		{
+			deny = result;
+		}
+	}
+
+	/** We only permit if an allow matched AND no deny matched **/
+	if (allow && !deny)
+	{
+		return OPER_ALLOW;
+	}
+
+	return OPER_DENY;
+}
+
+OperPermission ValidatePermissionsForPath(char *path, Client *client, Client *victim, Channel *channel, void *extra)
+{
+	ConfigItem_oper *ce_oper;
+	ConfigItem_operclass *ce_operClass;
+	OperClass *oc = NULL;
+	OperClassACLPath *operPath;
+
+	if (!client)
+		return OPER_DENY;
+
+	/* Trust Servers, U-Lines and remote opers */
+	if (IsServer(client) || IsULine(client) || (IsOper(client) && !MyUser(client)))
+		return OPER_ALLOW;
+
+	if (!IsOper(client))
+		return OPER_DENY;
+
+	ce_oper = find_oper(client->user->operlogin);
+	if (!ce_oper)
+	{
+		return OPER_DENY;
+	}
+	
+	ce_operClass = find_operclass(ce_oper->operclass);
+	if (!ce_operClass)
+	{
+		return OPER_DENY;
+	}
+
+	oc = ce_operClass->classStruct;
+	operPath = OperClass_parsePath(path);
+	while (oc && operPath)
+	{
+		OperClassACL *acl = OperClass_FindACL(oc->acls,operPath->identifier);
+		if (acl)
+		{
+			OperPermission perm;
+			OperClassCheckParams *params = safe_alloc(sizeof(OperClassCheckParams));
+			params->client = client;
+			params->victim = victim;
+			params->channel = channel;
+			params->extra = extra;
+			
+			perm = ValidatePermissionsForPathEx(acl, operPath, params);
+			OperClass_freePath(operPath);
+			safe_free(params);
+			return perm;
+		}
+		if (!oc->ISA)
+		{
+			break;
+		}
+		ce_operClass = find_operclass(oc->ISA);
+		if (ce_operClass)
+		{
+			oc = ce_operClass->classStruct;
+		} else {
+			break; /* parent not found */
+		}
+	}
+	OperClass_freePath(operPath);
+	return OPER_DENY;
+}
diff --git a/src/parse.c b/src/parse.c
new file mode 100644
index 0000000..80ab224
--- /dev/null
+++ b/src/parse.c
@@ -0,0 +1,747 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, src/parse.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Main line parsing functions - for incoming lines from clients.
+ */
+#include "unrealircd.h"
+
+/** Last (or current) command that we processed. Useful for post-mortem. */
+char backupbuf[8192];
+
+static char *para[MAXPARA + 2];
+
+/* Forward declarations of functions that are local (static) */
+static int do_numeric(int, Client *, MessageTag *, int, char **);
+static void cancel_clients(Client *, Client *, char *);
+static void remove_unknown(Client *, char *);
+static void parse2(Client *client, Client **fromptr, MessageTag *mtags, char *ch);
+static void parse_addlag(Client *client, int cmdbytes);
+static int client_lagged_up(Client *client);
+
+/** Put a packet in the client receive queue and process the data (if
+ * the 'fake lag' rules permit doing so).
+ * @param client      The client
+ * @param readbuf     The read buffer
+ * @param length      The length of the data
+ * @param killsafely  If 1 then we may call exit_client() if the client
+ *                    is flooding. If 0 then we use dead_socket().
+ * @returns 1 in normal circumstances, 0 if client was killed.
+ * @note  If killsafely is 1 and the return value is 0 then
+ *        the client was killed - IsDead() is true.
+ *        If this is a problem, then set killsafely to 0 when calling.
+ */
+int process_packet(Client *client, char *readbuf, int length, int killsafely)
+{
+	dbuf_put(&client->local->recvQ, readbuf, length);
+
+	/* parse some of what we have (inducing fakelag, etc) */
+	parse_client_queued(client);
+
+	/* We may be killed now, so check for it.. */
+	if (IsDead(client))
+		return 0;
+
+	/* flood from unknown connection */
+	if (IsUnknown(client) && (DBufLength(&client->local->recvQ) > UNKNOWN_FLOOD_AMOUNT*1024))
+	{
+		sendto_snomask(SNO_FLOOD, "Flood from unknown connection %s detected",
+			client->local->sockhost);
+		if (!killsafely)
+			ban_flooder(client);
+		else
+			dead_socket(client, "Flood from unknown connection");
+		return 0;
+	}
+
+	/* excess flood check */
+	if (IsUser(client) && DBufLength(&client->local->recvQ) > get_recvq(client))
+	{
+		sendto_snomask(SNO_FLOOD,
+			"*** Flood -- %s!%s@%s (%d) exceeds %d recvQ",
+			client->name[0] ? client->name : "*",
+			client->user ? client->user->username : "*",
+			client->user ? client->user->realhost : "*",
+			DBufLength(&client->local->recvQ), get_recvq(client));
+		if (!killsafely)
+			exit_client(client, NULL, "Excess Flood");
+		else
+			dead_socket(client, "Excess Flood");
+		return 0;
+	}
+
+	return 1;
+}
+
+/** Parse any queued data for 'client', if permitted.
+ * @param client	The client.
+ */
+void parse_client_queued(Client *client)
+{
+	int dolen = 0;
+	char buf[READBUFSIZE];
+
+	if (IsDNSLookup(client))
+		return; /* we delay processing of data until the host is resolved */
+
+	if (IsIdentLookup(client))
+		return; /* we delay processing of data until identd has replied */
+
+	if (!IsUser(client) && !IsServer(client) && (iConf.handshake_delay > 0) &&
+	    (TStime() - client->local->firsttime < iConf.handshake_delay))
+	{
+		return; /* we delay processing of data until set::handshake-delay is reached */
+	}
+
+	while (DBufLength(&client->local->recvQ) && !client_lagged_up(client))
+	{
+		dolen = dbuf_getmsg(&client->local->recvQ, buf);
+
+		if (dolen == 0)
+			return;
+
+		dopacket(client, buf, dolen);
+		
+		if (IsDead(client))
+			return;
+	}
+}
+
+/*
+** dopacket
+**	client - pointer to client structure for which the buffer data
+**	       applies.
+**	buffer - pointr to the buffer containing the newly read data
+**	length - number of valid bytes of data in the buffer
+**
+** Note:
+**	It is implicitly assumed that dopacket is called only
+**	with client of "local" variation, which contains all the
+**	necessary fields (buffer etc..)
+**
+** Rewritten for linebufs, 19th May 2013. --kaniini
+*/
+void dopacket(Client *client, char *buffer, int length)
+{
+	me.local->receiveB += length;	/* Update bytes received */
+	client->local->receiveB += length;
+	if (client->local->receiveB > 1023)
+	{
+		client->local->receiveK += (client->local->receiveB >> 10);
+		client->local->receiveB &= 0x03ff;	/* 2^10 = 1024, 3ff = 1023 */
+	}
+	if (me.local->receiveB > 1023)
+	{
+		me.local->receiveK += (me.local->receiveB >> 10);
+		me.local->receiveB &= 0x03ff;
+	}
+
+	me.local->receiveM += 1;	/* Update messages received */
+	client->local->receiveM += 1;
+
+	parse(client, buffer, length);
+}
+
+
+/** Parse an incoming line.
+ * A line was received previously, buffered via dbuf, now popped from the dbuf stack,
+ * and we should now process it.
+ * @param cptr    The client from which the message was received
+ * @param buffer  The buffer
+ * @param length  The length of the buffer
+ * @note parse() cannot not be called recusively by any other functions!
+ */
+void parse(Client *cptr, char *buffer, int length)
+{
+	Hook *h;
+	Client *from = cptr;
+	char *ch;
+	int i, ret;
+	MessageTag *mtags = NULL;
+
+	/* Take extreme care in this function, as messages can be up to READBUFSIZE
+	 * in size, which is 8192 at the time of writing.
+	 * This, while all the rest of the IRCd code assumes a maximum length
+	 * of BUFSIZE, which is 512 (including NUL byte).
+	 */
+	for (h = Hooks[HOOKTYPE_PACKET]; h; h = h->next)
+	{
+		(*(h->func.intfunc))(from, &me, NULL, &buffer, &length);
+		if(!buffer)
+			return;
+	}
+
+	Debug((DEBUG_ERROR, "Parsing: %s (from %s)", buffer, (*cptr->name ? cptr->name : "*")));
+
+	if (IsDeadSocket(cptr))
+		return;
+
+	if ((cptr->local->receiveK >= UNKNOWN_FLOOD_AMOUNT) && IsUnknown(cptr))
+	{
+		sendto_snomask(SNO_FLOOD, "Flood from unknown connection %s detected",
+			cptr->local->sockhost);
+		ban_flooder(cptr);
+		return;
+	}
+
+	/* This stores the last executed command in 'backupbuf', useful for debugging crashes */
+	strlcpy(backupbuf, buffer, sizeof(backupbuf));
+
+#if defined(DEBUGMODE) && defined(RAWCMDLOGGING)
+	ircd_log(LOG_ERROR, "<- %s: %s", cptr->name, backupbuf);
+#endif
+
+	/* This poisons unused para elements that code should never access */
+	for (i = 0; i < MAXPARA+2; i++)
+		para[i] = (char *)DEADBEEF_ADDR;
+
+	/* First, skip any whitespace */
+	for (ch = buffer; *ch == ' '; ch++)
+		;
+
+	/* Now, parse message tags, if any */
+	if (*ch == '@')
+	{
+		parse_message_tags(cptr, &ch, &mtags);
+		/* Skip whitespace again */
+		for (; *ch == ' '; ch++)
+			;
+	}
+
+	parse2(cptr, &from, mtags, ch);
+
+	if (IsDead(cptr))
+		RunHook3(HOOKTYPE_POST_COMMAND, NULL, mtags, ch);
+	else
+		RunHook3(HOOKTYPE_POST_COMMAND, from, mtags, ch);
+
+	free_message_tags(mtags);
+	return;
+}
+
+/** Parse the remaining line - helper function for parse().
+ * @param cptr   The client from which the message was received
+ * @param from   The sender, this may be changed by parse2() when
+ *               the message has a sender, eg :xyz PRIVMSG ..
+ * @param mtags  Message tags received for this message.
+ * @param ch     The incoming line received (buffer), excluding message tags.
+ */
+static void parse2(Client *cptr, Client **fromptr, MessageTag *mtags, char *ch)
+{
+	Client *from = cptr;
+	char *s;
+	int len, i, numeric = 0, paramcount;
+#ifdef DEBUGMODE
+	time_t then, ticks;
+	int retval;
+#endif
+	RealCommand *cmptr = NULL;
+	int bytes;
+
+	*fromptr = cptr; /* The default, unless a source is specified (and permitted) */
+
+	/* The remaining part should never be more than 510 bytes
+	 * (that is 512 minus CR LF, as specified in RFC1459 section 2.3).
+	 * If it is too long, then we cut it off here.
+	 */
+	if (strlen(ch) > 510)
+	{
+		ch[510] = '\0';
+	}
+
+	para[0] = (char *)DEADBEEF_ADDR; /* helps us catch bugs :) */
+
+	if (*ch == ':' || *ch == '@')
+	{
+		char sender[HOSTLEN + 1];
+		s = sender;
+		*s = '\0';
+
+		/* Deal with :sender ... */
+		for (++ch, i = 0; *ch && *ch != ' '; ++ch)
+		{
+			if (s < sender + sizeof(sender) - 1)
+				*s++ = *ch;
+		}
+		*s = '\0';
+
+		/* For servers we lookup the sender and change 'from' accordingly.
+		 * For other clients we ignore the sender.
+		 */
+		if (*sender && IsServer(cptr))
+		{
+			from = find_client(sender, NULL);
+
+			if (!from && strchr(sender, '@'))
+				from = hash_find_nickatserver(sender, NULL);
+
+			/* Sender not found. Possibly a ghost, so kill it.
+			 * This can happen in normal circumstances. For example
+			 * in case of A-B-C where we are B. If a KILL came from C
+			 * for a client on A and we processed it at B, then until
+			 * A has processed it we may still receive messages from A
+			 * about it's soon-to-be-killed-client (all due to lag).
+			 */
+			if (!from)
+			{
+				ircstats.is_unpf++;
+				remove_unknown(cptr, sender);
+				return;
+			}
+			/* This is more severe. The server gave a source of a client
+			 * that cannot exist from that direction.
+			 * Eg in case of a topology of A-B-C-D and we are B,
+			 * we got a message from A with ":D MODE...".
+			 * In that case we send a SQUIT to that direction telling to
+			 * unlink D from that side. This will likely lead to a
+			 * problematic situation, though.
+			 * This is, by the way, also why we try to prevent this situation
+			 * in the first place by using PROTOCTL SERVERS=...
+			 * in which case we reject such a flawed link very early
+			 * in the server handshake process. -- Syzop
+			 */
+			if (from->direction != cptr)
+			{
+				ircstats.is_wrdi++;
+				cancel_clients(cptr, from, ch);
+				return;
+			}
+			*fromptr = from; /* Update source client */
+		}
+		while (*ch == ' ')
+			ch++;
+	}
+
+	RunHook3(HOOKTYPE_PRE_COMMAND, from, mtags, ch);
+
+	if (*ch == '\0')
+	{
+		if (!IsServer(cptr))
+			cptr->local->since++; /* 1s fake lag */
+		return;
+	}
+
+	/* Recalculate string length, now that we have skipped the sender */
+	bytes = strlen(ch);
+
+	/* Now let's figure out the command (or numeric)... */
+	s = strchr(ch, ' ');	/* s -> End of the command code */
+	len = (s) ? (s - ch) : 0;
+
+	if (len == 3 && isdigit(*ch) && isdigit(*(ch + 1)) && isdigit(*(ch + 2)))
+	{
+		/* Numeric (eg: 311) */
+		cmptr = NULL;
+		numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
+		paramcount = MAXPARA;
+		ircstats.is_num++;
+		parse_addlag(cptr, bytes);
+	}
+	else
+	{
+		/* Command (eg: PRIVMSG) */
+		int flags = 0;
+		if (s)
+			*s++ = '\0';
+
+		/* Set the appropriate flags for the command lookup */
+		if (!IsRegistered(from))
+			flags |= CMD_UNREGISTERED;
+		if (IsUser(from))
+			flags |= CMD_USER;
+		if (IsServer(from))
+			flags |= CMD_SERVER;
+		if (IsShunned(from))
+			flags |= CMD_SHUN;
+		if (IsVirus(from))
+			flags |= CMD_VIRUS;
+		if (IsOper(from))
+			flags |= CMD_OPER;
+		cmptr = find_command(ch, flags);
+		if (!cmptr || !(cmptr->flags & CMD_NOLAG))
+		{
+			/* Add fake lag (doing this early in the code, so we don't forget) */
+			parse_addlag(cptr, bytes);
+		}
+		if (!cmptr)
+		{
+			/* Don't send error messages in response to NOTICEs
+			 * in pre-connection state.
+			 */
+			if (!IsRegistered(cptr) && strcasecmp(ch, "NOTICE"))
+			{
+				sendnumericfmt(from, ERR_NOTREGISTERED, ":You have not registered");
+				return;
+			}
+			/* If the user is shunned then don't send anything back in case
+			 * of an unknown command, since we want to save data.
+			 */
+			if (IsShunned(cptr))
+				return;
+				
+			if (ch[0] != '\0')
+			{
+				if (IsUser(from))
+				{
+					sendto_one(from, NULL, ":%s %d %s %s :Unknown command",
+					                       me.name, ERR_UNKNOWNCOMMAND,
+					                       from->name, ch);
+					Debug((DEBUG_ERROR, "Unknown (%s) from %s",
+					    ch, get_client_name(cptr, TRUE)));
+				}
+			}
+			ircstats.is_unco++;
+			return;
+		}
+		if (cmptr->flags != 0) { /* temporary until all commands are updated */
+
+		/* Logic in comparisons below is a bit complicated, see notes */
+
+		/* If you're a user, and this command does not permit users or opers, deny */
+		if ((flags & CMD_USER) && !(cmptr->flags & CMD_USER) && !(cmptr->flags & CMD_OPER))
+		{
+			sendnumeric(cptr, ERR_NOTFORUSERS, cmptr->cmd);
+			return;
+		}
+
+		/* If you're a server, but command doesn't want servers, deny */
+		if ((flags & CMD_SERVER) && !(cmptr->flags & CMD_SERVER))
+			return;
+		}
+
+		/* If you're a user, but not an operator, and this requires operators, deny */
+		if ((cmptr->flags & CMD_OPER) && (flags & CMD_USER) && !(flags & CMD_OPER))
+		{
+			sendnumeric(cptr, ERR_NOPRIVILEGES);
+			return;
+		}
+		paramcount = cmptr->parameters;
+		cmptr->bytes += bytes;
+	}
+	/*
+	   ** Must the following loop really be so devious? On
+	   ** surface it splits the message to parameters from
+	   ** blank spaces. But, if paramcount has been reached,
+	   ** the rest of the message goes into this last parameter
+	   ** (about same effect as ":" has...) --msa
+	 */
+
+	/* Note initially true: s==NULL || *(s-1) == '\0' !! */
+
+	i = 0;
+	if (s)
+	{
+		/*
+		if (paramcount > MAXPARA)
+			paramcount = MAXPARA;
+		We now use functions to create commands, so we can just check this 
+		once when the command is created rather than each time the command
+		is used -- codemastr
+		*/
+		for (;;)
+		{
+			/*
+			   ** Never "FRANCE " again!! ;-) Clean
+			   ** out *all* blanks.. --msa
+			 */
+			while (*s == ' ')
+				*s++ = '\0';
+
+			if (*s == '\0')
+				break;
+			if (*s == ':')
+			{
+				/*
+				   ** The rest is single parameter--can
+				   ** include blanks also.
+				 */
+				para[++i] = s + 1;
+				break;
+			}
+			para[++i] = s;
+			if (i >= paramcount)
+				break;
+			for (; *s != ' ' && *s; s++)
+				;
+		}
+	}
+	para[++i] = NULL;
+	if (cmptr == NULL)
+	{
+		do_numeric(numeric, from, mtags, i, para);
+		return;
+	}
+	cmptr->count++;
+	if (IsUser(cptr) && (cmptr->flags & CMD_RESETIDLE))
+		cptr->local->last = TStime();
+
+#ifndef DEBUGMODE
+	if (cmptr->flags & CMD_ALIAS)
+	{
+		(*cmptr->aliasfunc) (from, mtags, i, para, cmptr->cmd);
+	} else {
+		if (!cmptr->overriders)
+			(*cmptr->func) (from, mtags, i, para);
+		else
+			(*cmptr->overriders->func) (cmptr->overriders, from, mtags, i, para);
+	}
+#else
+	then = clock();
+	if (cmptr->flags & CMD_ALIAS)
+	{
+		(*cmptr->aliasfunc) (from, mtags, i, para, cmptr->cmd);
+	} else {
+		if (!cmptr->overriders)
+			(*cmptr->func) (from, mtags, i, para);
+		else
+			(*cmptr->overriders->func) (cmptr->overriders, from, mtags, i, para);
+	}
+	if (!IsDead(cptr))
+	{
+		ticks = (clock() - then);
+		if (IsServer(cptr))
+			cmptr->rticks += ticks;
+		else
+			cmptr->lticks += ticks;
+		cptr->local->cputime += ticks;
+	}
+#endif
+}
+
+/** Ban user that is "flooding from an unknown connection".
+ * This is basically a client sending lots of data but not registering.
+ * Note that "lots" in terms of IRC is a few KB's, since more is rather unusual.
+ * @param client The client.
+ */
+void ban_flooder(Client *client)
+{
+	if (find_tkl_exception(TKL_UNKNOWN_DATA_FLOOD, client))
+	{
+		/* If the user is exempt we will still KILL the client, since it is
+		 * clearly misbehaving. We just won't ZLINE the host, so it won't
+		 * affect any other connections from the same IP address.
+		 */
+		exit_client(client, NULL, "Flood from unknown connection");
+	}
+	else
+	{
+		/* place_host_ban also takes care of removing any other clients with same host/ip */
+		place_host_ban(client, BAN_ACT_ZLINE, "Flood from unknown connection", UNKNOWN_FLOOD_BANTIME);
+	}
+}
+
+/** Add "fake lag" if needed.
+ * The main purpose of fake lag is to create artificial lag when
+ * processing incoming data from the client. So, if a client sends
+ * a lot of commands, then next command will be processed at a rate
+ * of 1 per second, or even slower. The exact algorithm is defined in this function.
+ *
+ * Servers are exempt from fake lag, so are IRCOps and clients tagged as
+ * 'no fake lag' by services (rarely used). Finally, there is also an
+ * option called class::options::nofakelag which exempts fakelag.
+ * Exemptions should be granted with extreme care, since a client will
+ * be able to flood at full speed causing potentially many Mbits or even
+ * GBits of data to be sent out to other clients.
+ *
+ * @param client    The client.
+ * @param cmdbytes  Number of bytes in the command.
+ */
+void parse_addlag(Client *client, int cmdbytes)
+{
+	if (!IsServer(client) && !IsNoFakeLag(client) &&
+#ifdef FAKELAG_CONFIGURABLE
+	    !(client->local->class && (client->local->class->options & CLASS_OPT_NOFAKELAG)) &&
+#endif
+	    !ValidatePermissionsForPath("immune:lag",client,NULL,NULL,NULL))
+	{
+		client->local->since += (1 + cmdbytes/90);
+	}
+}
+
+/** Returns 1 if the client is lagged up and data should NOT be parsed.
+ * See also parse_addlag() for more information on "fake lag".
+ * @param client	The client to check
+ * @returns 1 if client is lagged up and data should not be parsed, 0 otherwise.
+ */
+static int client_lagged_up(Client *client)
+{
+	if (client->status < CLIENT_STATUS_UNKNOWN)
+		return 0;
+	if (IsServer(client))
+		return 0;
+	if (ValidatePermissionsForPath("immune:lag",client,NULL,NULL,NULL))
+		return 0;
+	if (client->local->since - TStime() < 10)
+		return 0;
+	return 1;
+}
+
+
+/** Numeric received from a connection.
+ * @param numeric     The numeric code (range 000-999)
+ * @param cptr        The client
+ * @param recv_mtags  Received message tags
+ * @param parc        Parameter count
+ * @param parv        Parameters
+ * @note  In general you should NOT send anything back if you receive
+ *        a numeric, this to prevent creating loops.
+ */
+static int do_numeric(int numeric, Client *client, MessageTag *recv_mtags, int parc, char *parv[])
+{
+	Client *acptr;
+	Channel *channel;
+	char *nick, *p;
+	int i;
+	char buffer[BUFSIZE];
+
+	if ((numeric < 0) || (numeric > 999))
+		return -1;
+
+	if (MyConnect(client) && !IsServer(client) && !IsUser(client) && IsHandshake(client) && client->serv && !IsServerSent(client))
+	{
+		/* This is an outgoing server connect that is currently not yet IsServer() but in 'unknown' state.
+		 * We need to handle a few responses here.
+		 */
+
+		/* STARTTLS: unknown command */
+		if ((numeric == 451) && (parc > 2) && strstr(parv[1], "STARTTLS"))
+		{
+			if (client->serv->conf && (client->serv->conf->outgoing.options & CONNECT_INSECURE))
+				start_server_handshake(client);
+			else
+				reject_insecure_server(client);
+			return 0;
+		}
+
+		/* STARTTLS failed */
+		if (numeric == 691)
+		{
+			sendto_umode(UMODE_OPER, "STARTTLS failed for link %s. Please check the other side of the link.", client->name);
+			reject_insecure_server(client);
+			return 0;
+		}
+
+		/* STARTTLS OK */
+		if (numeric == 670)
+		{
+			int ret = client_starttls(client);
+			if (ret < 0)
+			{
+				sendto_umode(UMODE_OPER, "STARTTLS handshake failed for link %s. Strange.", client->name);
+				reject_insecure_server(client);
+				return ret;
+			}
+			/* We don't call start_server_handshake() here. First the TLS handshake will
+			 * be completed, then completed_connection() will be called for a second time,
+			 * which will call completed_connection() from there.
+			 */
+			return 0;
+		}
+	}
+
+	/* Other than the (strange) code from above, we actually
+	 * don't process numerics from non-servers. So return here.
+	 */
+	if ((parc < 2) || BadPtr(parv[1]) || !IsServer(client))
+		return 0;
+
+	/* Remap low number numerics. */
+	if (numeric < 100)
+		numeric += 100;
+
+	/* Convert parv[] back to a string 'buffer', since that is
+	 * what we use in the sendto_* functions below.
+	 */
+	concat_params(buffer, sizeof(buffer), parc, parv);
+
+	/* Now actually process the numeric, IOTW: send it on */
+	for (; (nick = strtoken(&p, parv[1], ",")); parv[1] = NULL)
+	{
+		if ((acptr = find_client(nick, NULL)))
+		{
+			if (!IsMe(acptr) && IsUser(acptr))
+			{
+				if (MyConnect(acptr) && isdigit(*nick))
+				{
+					/* Hack to prevent leaking UID */
+					char *skip = strchr(buffer, ' ');
+					if (skip)
+					{
+						sendto_prefix_one(acptr, client, recv_mtags, ":%s %d %s %s",
+						    client->name, numeric, acptr->name, skip+1);
+					} /* else.. malformed (no content) */
+				} else {
+					sendto_prefix_one(acptr, client, recv_mtags, ":%s %d %s",
+					    client->name, numeric, buffer);
+				}
+			}
+			else if (IsServer(acptr) && acptr->direction != client->direction)
+				sendto_prefix_one(acptr, client, recv_mtags, ":%s %d %s",
+				    client->name, numeric, buffer);
+		}
+		else if ((acptr = find_server_quick(nick)))
+		{
+			if (!IsMe(acptr) && acptr->direction != client->direction)
+				sendto_prefix_one(acptr, client, recv_mtags, ":%s %d %s",
+				    client->name, numeric, buffer);
+		}
+		else if ((channel = find_channel(nick, NULL)))
+		{
+			sendto_channel(channel, client, client->direction,
+			               0, 0, SEND_ALL, recv_mtags,
+			               ":%s %d %s", client->name, numeric, buffer);
+		}
+	}
+
+	return 0;
+}
+
+// FIXME: aren't we exiting the wrong client?
+static void cancel_clients(Client *cptr, Client *client, char *cmd)
+{
+	if (IsServer(cptr) || IsServer(client) || IsMe(client))
+		return;
+	exit_client(cptr, NULL, "Fake prefix");
+}
+
+static void remove_unknown(Client *client, char *sender)
+{
+	if (!IsRegistered(client) || IsUser(client))
+		return;
+	/*
+	 * Not from a server so don't need to worry about it.
+	 */
+	if (!IsServer(client))
+		return;
+
+#ifdef DEVELOP
+	sendto_ops("Killing %s (%s)", sender, backupbuf);
+	return;
+#endif
+	/*
+	 * Do kill if it came from a server because it means there is a ghost
+	 * user on the other server which needs to be removed. -avalon
+	 */
+	if ((isdigit(*sender) && strlen(sender) <= SIDLEN) || strchr(sender, '.'))
+		sendto_one(client, NULL, ":%s SQUIT %s :Unknown prefix (%s) from %s",
+		    me.id, sender, sender, client->name);
+	else
+		sendto_one(client, NULL, ":%s KILL %s :Ghost user", me.id, sender);
+}
diff --git a/src/random.c b/src/random.c
new file mode 100644
index 0000000..00c8814
--- /dev/null
+++ b/src/random.c
@@ -0,0 +1,522 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, random.c
+ *   (C) 2004-2019 Bram Matthys (Syzop) and the UnrealIRCd Team
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers. 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#include "unrealircd.h"
+
+#ifndef HAVE_ARC4RANDOM
+
+#define KEYSTREAM_ONLY
+
+/* chacha_private.h from openssh/openssh-portable
+ * "chacha-merged.c version 20080118
+ *  D. J. Bernstein
+ *  Public domain."
+ */
+
+/* $OpenBSD: chacha_private.h,v 1.2 2013/10/04 07:02:27 djm Exp $ */
+
+typedef unsigned char u8;
+typedef unsigned int u32;
+
+typedef struct
+{
+  u32 input[16]; /* could be compressed */
+} chacha_ctx;
+
+#define U8C(v) (v##U)
+#define U32C(v) (v##U)
+
+#define U8V(v) ((u8)(v) & U8C(0xFF))
+#define U32V(v) ((u32)(v) & U32C(0xFFFFFFFF))
+
+#define ROTL32(v, n) \
+  (U32V((v) << (n)) | ((v) >> (32 - (n))))
+
+#define U8TO32_LITTLE(p) \
+  (((u32)((p)[0])      ) | \
+   ((u32)((p)[1]) <<  8) | \
+   ((u32)((p)[2]) << 16) | \
+   ((u32)((p)[3]) << 24))
+
+#define U32TO8_LITTLE(p, v) \
+  do { \
+    (p)[0] = U8V((v)      ); \
+    (p)[1] = U8V((v) >>  8); \
+    (p)[2] = U8V((v) >> 16); \
+    (p)[3] = U8V((v) >> 24); \
+  } while (0)
+
+#define ROTATE(v,c) (ROTL32(v,c))
+#define XOR(v,w) ((v) ^ (w))
+#define PLUS(v,w) (U32V((v) + (w)))
+#define PLUSONE(v) (PLUS((v),1))
+
+#define QUARTERROUND(a,b,c,d) \
+  a = PLUS(a,b); d = ROTATE(XOR(d,a),16); \
+  c = PLUS(c,d); b = ROTATE(XOR(b,c),12); \
+  a = PLUS(a,b); d = ROTATE(XOR(d,a), 8); \
+  c = PLUS(c,d); b = ROTATE(XOR(b,c), 7);
+
+static const char sigma[16] = "expand 32-byte k";
+static const char tau[16] = "expand 16-byte k";
+
+static void
+chacha_keysetup(chacha_ctx *x,const u8 *k,u32 kbits,u32 ivbits)
+{
+  const char *constants;
+
+  x->input[4] = U8TO32_LITTLE(k + 0);
+  x->input[5] = U8TO32_LITTLE(k + 4);
+  x->input[6] = U8TO32_LITTLE(k + 8);
+  x->input[7] = U8TO32_LITTLE(k + 12);
+  if (kbits == 256) { /* recommended */
+    k += 16;
+    constants = sigma;
+  } else { /* kbits == 128 */
+    constants = tau;
+  }
+  x->input[8] = U8TO32_LITTLE(k + 0);
+  x->input[9] = U8TO32_LITTLE(k + 4);
+  x->input[10] = U8TO32_LITTLE(k + 8);
+  x->input[11] = U8TO32_LITTLE(k + 12);
+  x->input[0] = U8TO32_LITTLE(constants + 0);
+  x->input[1] = U8TO32_LITTLE(constants + 4);
+  x->input[2] = U8TO32_LITTLE(constants + 8);
+  x->input[3] = U8TO32_LITTLE(constants + 12);
+}
+
+static void
+chacha_ivsetup(chacha_ctx *x,const u8 *iv)
+{
+  x->input[12] = 0;
+  x->input[13] = 0;
+  x->input[14] = U8TO32_LITTLE(iv + 0);
+  x->input[15] = U8TO32_LITTLE(iv + 4);
+}
+
+static void
+chacha_encrypt_bytes(chacha_ctx *x,const u8 *m,u8 *c,u32 bytes)
+{
+  u32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15;
+  u32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15;
+  u8 *ctarget = NULL;
+  u8 tmp[64];
+  u_int i;
+
+  if (!bytes) return;
+
+  j0 = x->input[0];
+  j1 = x->input[1];
+  j2 = x->input[2];
+  j3 = x->input[3];
+  j4 = x->input[4];
+  j5 = x->input[5];
+  j6 = x->input[6];
+  j7 = x->input[7];
+  j8 = x->input[8];
+  j9 = x->input[9];
+  j10 = x->input[10];
+  j11 = x->input[11];
+  j12 = x->input[12];
+  j13 = x->input[13];
+  j14 = x->input[14];
+  j15 = x->input[15];
+
+  for (;;) {
+    if (bytes < 64) {
+      for (i = 0;i < bytes;++i) tmp[i] = m[i];
+      m = tmp;
+      ctarget = c;
+      c = tmp;
+    }
+    x0 = j0;
+    x1 = j1;
+    x2 = j2;
+    x3 = j3;
+    x4 = j4;
+    x5 = j5;
+    x6 = j6;
+    x7 = j7;
+    x8 = j8;
+    x9 = j9;
+    x10 = j10;
+    x11 = j11;
+    x12 = j12;
+    x13 = j13;
+    x14 = j14;
+    x15 = j15;
+    for (i = 20;i > 0;i -= 2) {
+      QUARTERROUND( x0, x4, x8,x12)
+      QUARTERROUND( x1, x5, x9,x13)
+      QUARTERROUND( x2, x6,x10,x14)
+      QUARTERROUND( x3, x7,x11,x15)
+      QUARTERROUND( x0, x5,x10,x15)
+      QUARTERROUND( x1, x6,x11,x12)
+      QUARTERROUND( x2, x7, x8,x13)
+      QUARTERROUND( x3, x4, x9,x14)
+    }
+    x0 = PLUS(x0,j0);
+    x1 = PLUS(x1,j1);
+    x2 = PLUS(x2,j2);
+    x3 = PLUS(x3,j3);
+    x4 = PLUS(x4,j4);
+    x5 = PLUS(x5,j5);
+    x6 = PLUS(x6,j6);
+    x7 = PLUS(x7,j7);
+    x8 = PLUS(x8,j8);
+    x9 = PLUS(x9,j9);
+    x10 = PLUS(x10,j10);
+    x11 = PLUS(x11,j11);
+    x12 = PLUS(x12,j12);
+    x13 = PLUS(x13,j13);
+    x14 = PLUS(x14,j14);
+    x15 = PLUS(x15,j15);
+
+#ifndef KEYSTREAM_ONLY
+    x0 = XOR(x0,U8TO32_LITTLE(m + 0));
+    x1 = XOR(x1,U8TO32_LITTLE(m + 4));
+    x2 = XOR(x2,U8TO32_LITTLE(m + 8));
+    x3 = XOR(x3,U8TO32_LITTLE(m + 12));
+    x4 = XOR(x4,U8TO32_LITTLE(m + 16));
+    x5 = XOR(x5,U8TO32_LITTLE(m + 20));
+    x6 = XOR(x6,U8TO32_LITTLE(m + 24));
+    x7 = XOR(x7,U8TO32_LITTLE(m + 28));
+    x8 = XOR(x8,U8TO32_LITTLE(m + 32));
+    x9 = XOR(x9,U8TO32_LITTLE(m + 36));
+    x10 = XOR(x10,U8TO32_LITTLE(m + 40));
+    x11 = XOR(x11,U8TO32_LITTLE(m + 44));
+    x12 = XOR(x12,U8TO32_LITTLE(m + 48));
+    x13 = XOR(x13,U8TO32_LITTLE(m + 52));
+    x14 = XOR(x14,U8TO32_LITTLE(m + 56));
+    x15 = XOR(x15,U8TO32_LITTLE(m + 60));
+#endif
+
+    j12 = PLUSONE(j12);
+    if (!j12) {
+      j13 = PLUSONE(j13);
+      /* stopping at 2^70 bytes per nonce is user's responsibility */
+    }
+
+    U32TO8_LITTLE(c + 0,x0);
+    U32TO8_LITTLE(c + 4,x1);
+    U32TO8_LITTLE(c + 8,x2);
+    U32TO8_LITTLE(c + 12,x3);
+    U32TO8_LITTLE(c + 16,x4);
+    U32TO8_LITTLE(c + 20,x5);
+    U32TO8_LITTLE(c + 24,x6);
+    U32TO8_LITTLE(c + 28,x7);
+    U32TO8_LITTLE(c + 32,x8);
+    U32TO8_LITTLE(c + 36,x9);
+    U32TO8_LITTLE(c + 40,x10);
+    U32TO8_LITTLE(c + 44,x11);
+    U32TO8_LITTLE(c + 48,x12);
+    U32TO8_LITTLE(c + 52,x13);
+    U32TO8_LITTLE(c + 56,x14);
+    U32TO8_LITTLE(c + 60,x15);
+
+    if (bytes <= 64) {
+      if (bytes < 64) {
+        for (i = 0;i < bytes;++i) ctarget[i] = c[i];
+      }
+      x->input[12] = j12;
+      x->input[13] = j13;
+      return;
+    }
+    bytes -= 64;
+    c += 64;
+#ifndef KEYSTREAM_ONLY
+    m += 64;
+#endif
+  }
+}
+
+/* The following is taken from arc4random.c
+ * from openssh/openssh-portable/, which has an ISC license,
+ * which is GPL compatible.
+ */
+
+/* OPENBSD ORIGINAL: lib/libc/crypto/arc4random.c */
+/* $OpenBSD: arc4random.c,v 1.25 2013/10/01 18:34:57 markus Exp $	*/
+/*
+ * Copyright (c) 1996, David Mazieres <dm@uun.org>
+ * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
+ * Copyright (c) 2013, Markus Friedl <markus@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* Modified for UnrealIRCd by Bram Matthys ("Syzop") in 2019.
+ * Things like taking out #if(n)def's for openssl (which we always
+ * compile with), re-indenting, removing various stuff, etc.
+ */
+
+
+
+#define KEYSZ	32
+#define IVSZ	8
+#define BLOCKSZ	64
+#define RSBUFSZ	(16*BLOCKSZ)
+static int rs_initialized;
+static chacha_ctx rs;		/* chacha context for random keystream */
+static u_char rs_buf[RSBUFSZ];	/* keystream blocks */
+static size_t rs_have;		/* valid bytes at end of rs_buf */
+static size_t rs_count;		/* bytes till reseed */
+
+static inline void _rs_rekey(u_char *dat, size_t datlen);
+
+static inline void _rs_init(u_char *buf, size_t n)
+{
+	if (n < KEYSZ + IVSZ)
+		return;
+	chacha_keysetup(&rs, buf, KEYSZ * 8, 0);
+	chacha_ivsetup(&rs, buf + KEYSZ);
+}
+
+static void _rs_stir(void)
+{
+	u_char rnd[KEYSZ + IVSZ];
+
+	if (RAND_bytes(rnd, sizeof(rnd)) <= 0)
+	{
+		ircd_log(LOG_ERROR, "Couldn't obtain random bytes (error 0x%lx)",
+		    (unsigned long)ERR_get_error());
+		abort();
+	}
+
+	if (!rs_initialized) {
+		rs_initialized = 1;
+		_rs_init(rnd, sizeof(rnd));
+	} else
+		_rs_rekey(rnd, sizeof(rnd));
+#ifdef HAVE_EXPLICIT_BZERO
+	explicit_bzero(rnd, sizeof(rnd));
+#else
+	/* Not terribly important in this case */
+	memset(rnd, 0, sizeof(rnd));
+#endif
+	/* invalidate rs_buf */
+	rs_have = 0;
+	memset(rs_buf, 0, RSBUFSZ);
+
+	rs_count = 1600000;
+}
+
+static inline void _rs_stir_if_needed(size_t len)
+{
+	if (rs_count <= len || !rs_initialized) {
+		_rs_stir();
+	} else
+		rs_count -= len;
+}
+
+static inline void _rs_rekey(u_char *dat, size_t datlen)
+{
+#ifndef KEYSTREAM_ONLY
+	memset(rs_buf, 0,RSBUFSZ);
+#endif
+	/* fill rs_buf with the keystream */
+	chacha_encrypt_bytes(&rs, rs_buf, rs_buf, RSBUFSZ);
+	/* mix in optional user provided data */
+	if (dat) {
+		size_t i, m;
+
+		m = MIN(datlen, KEYSZ + IVSZ);
+		for (i = 0; i < m; i++)
+			rs_buf[i] ^= dat[i];
+	}
+	/* immediately reinit for backtracking resistance */
+	_rs_init(rs_buf, KEYSZ + IVSZ);
+	memset(rs_buf, 0, KEYSZ + IVSZ);
+	rs_have = RSBUFSZ - KEYSZ - IVSZ;
+}
+
+static inline void _rs_random_buf(void *_buf, size_t n)
+{
+	u_char *buf = (u_char *)_buf;
+	size_t m;
+
+	_rs_stir_if_needed(n);
+	while (n > 0) {
+		if (rs_have > 0) {
+			m = MIN(n, rs_have);
+			memcpy(buf, rs_buf + RSBUFSZ - rs_have, m);
+			memset(rs_buf + RSBUFSZ - rs_have, 0, m);
+			buf += m;
+			n -= m;
+			rs_have -= m;
+		}
+		if (rs_have == 0)
+			_rs_rekey(NULL, 0);
+	}
+}
+
+static inline void _rs_random_u32(uint32_t *val)
+{
+	_rs_stir_if_needed(sizeof(*val));
+	if (rs_have < sizeof(*val))
+		_rs_rekey(NULL, 0);
+	memcpy(val, rs_buf + RSBUFSZ - rs_have, sizeof(*val));
+	memset(rs_buf + RSBUFSZ - rs_have, 0, sizeof(*val));
+	rs_have -= sizeof(*val);
+	return;
+}
+
+void arc4random_stir(void)
+{
+	_rs_stir();
+}
+
+void arc4random_doaddrandom(u_char *dat, int datlen)
+{
+	int m;
+
+	if (!rs_initialized)
+		_rs_stir();
+	while (datlen > 0) {
+		m = MIN(datlen, KEYSZ + IVSZ);
+		_rs_rekey(dat, m);
+		dat += m;
+		datlen -= m;
+	}
+}
+
+#endif /* !HAVE_ARC4RANDOM */
+
+/* UnrealIRCd-specific functions follow */
+
+static void arc4_addrandom(void *dat, int datlen)
+{
+	arc4random_doaddrandom((unsigned char *)dat, datlen);
+	return;
+}
+
+void add_entropy_configfile(struct stat *st, char *buf)
+{
+	unsigned char mdbuf[16];
+
+	arc4_addrandom(&st->st_size, sizeof(st->st_size));
+	arc4_addrandom(&st->st_mtime, sizeof(st->st_mtime));
+	DoMD5(mdbuf, buf, strlen(buf));
+	arc4_addrandom(&mdbuf, sizeof(mdbuf));
+}
+
+/*
+ * init_random, written by Syzop.
+ * This function tries to initialize the arc4 random number generator securely.
+ */
+void init_random()
+{
+	struct {
+#ifndef _WIN32
+		struct timeval nowt;	/* time */
+		char rnd[32];			/* /dev/urandom */
+#else
+		MEMORYSTATUS mstat;		/* memory status */
+		struct _timeb nowt;		/* time */
+#endif
+	} rdat;
+
+#ifndef _WIN32
+	int fd;
+#else
+	MEMORYSTATUS mstat;
+#endif
+
+	_rs_stir();
+
+	/* Grab OS specific "random" data */
+#ifndef _WIN32
+	gettimeofday(&rdat.nowt, NULL);
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd >= 0)
+	{
+		int n = read(fd, &rdat.rnd, sizeof(rdat.rnd));
+		Debug((DEBUG_INFO, "init_random: read from /dev/urandom returned %d", n));
+		close(fd);
+	}
+#else
+	_ftime(&rdat.nowt);
+	GlobalMemoryStatus (&rdat.mstat);
+#endif	
+
+	arc4_addrandom(&rdat, sizeof(rdat));
+
+	/* NOTE: addtional entropy is added by add_entropy_* function(s) */
+}
+
+uint32_t arc4random(void)
+{
+	uint32_t val;
+
+	_rs_random_u32(&val);
+	return val;
+}
+
+/** Get 8 bits (1 byte) of randomness */
+u_char getrandom8()
+{
+	return arc4random() & 0xff;
+}
+
+/** Get 16 bits (2 bytes) of randomness */
+uint16_t getrandom16()
+{
+	return arc4random() & 0xffff;
+}
+
+/** Get 32 bits (4 bytes) of randomness */
+uint32_t getrandom32()
+{
+	return arc4random();
+}
+
+/** Generate an alphanumeric string (eg: XzHe5G).
+ * @param buf      The buffer
+ * @param numbytes The number of random bytes.
+ * @note  Note that numbytes+1 bytes are written to buf.
+ *        In other words, numbytes does NOT include the NUL byte.
+ */
+void gen_random_alnum(char *buf, int numbytes)
+{
+	for (; numbytes > 0; numbytes--)
+	{
+		unsigned char v = getrandom8() % (26+26+10);
+		if (v < 26)
+			*buf++ = 'a'+v;
+		else if (v < 52)
+			*buf++ = 'A'+(v-26);
+		else
+			*buf++ = '0'+(v-52);
+	}
+	*buf = '\0';
+}
diff --git a/src/scache.c b/src/scache.c
new file mode 100644
index 0000000..7525ea2
--- /dev/null
+++ b/src/scache.c
@@ -0,0 +1,99 @@
+/* License: GPLv1 */
+
+/** @file
+ * @brief String cache - only used for server names.
+ */
+
+#include "unrealircd.h"
+
+/*
+ * ircd used to store full servernames in ClientUser as well as in the
+ * whowas info.  there can be some 40k such structures alive at any
+ * given time, while the number of unique server names a server sees in
+ * its lifetime is at most a few hundred.  by tokenizing server names
+ * internally, the server can easily save 2 or 3 megs of RAM.
+ * -orabidoo
+ */
+/*
+ * I could have tucked this code into hash.c I suppose but lets keep it
+ * separate for now -Dianora
+ */
+
+#define SCACHE_HASH_SIZE 257
+
+typedef struct SCACHE SCACHE;
+struct SCACHE {
+	char name[HOSTLEN + 1];
+	SCACHE *next;
+};
+
+static SCACHE *scache_hash[SCACHE_HASH_SIZE];
+
+/*
+ * renamed to keep it consistent with the other hash functions -Dianora 
+ */
+/*
+ * orabidoo had named it init_scache_hash(); 
+ */
+
+void clear_scache_hash_table(void)
+{
+	memset((char *)scache_hash, '\0', sizeof(scache_hash));
+}
+
+static int hash(char *string)
+{
+	int  hash_value;
+
+	hash_value = 0;
+	while (*string)
+		hash_value += (*string++ & 0xDF);
+
+	return hash_value % SCACHE_HASH_SIZE;
+}
+
+/** Add a string to the string cache.
+ * this takes a server name, and returns a pointer to the same string
+ * (up to case) in the server name token list, adding it to the list if
+ * it's not there.  care must be taken not to call this with
+ * user-supplied arguments that haven't been verified to be a valid,
+ * existing, servername.  use the hash in list.c for those.  -orabidoo
+ * @param name	A valid server name
+ * @returns Pointer to the server name
+ */
+char *find_or_add(char *name)
+{
+	int  hash_index;
+	SCACHE *ptr, *newptr;
+
+	ptr = scache_hash[hash_index = hash(name)];
+	while (ptr)
+	{
+		if (!mycmp(ptr->name, name))
+		{
+			return (ptr->name);
+		}
+		else
+		{
+			ptr = ptr->next;
+		}
+	}
+
+	/*
+	 * not found -- add it 
+	 */
+	if ((ptr = scache_hash[hash_index]))
+	{
+		newptr = scache_hash[hash_index] = safe_alloc(sizeof(SCACHE));
+		strlcpy(newptr->name, name, sizeof(newptr->name));
+		newptr->next = ptr;
+		return (newptr->name);
+	}
+	else
+	{
+		ptr = scache_hash[hash_index] = safe_alloc(sizeof(SCACHE));
+		strlcpy(ptr->name, name, sizeof(newptr->name));
+		ptr->next = (SCACHE *) NULL;
+		return (ptr->name);
+	}
+}
diff --git a/src/send.c b/src/send.c
new file mode 100644
index 0000000..51d0090
--- /dev/null
+++ b/src/send.c
@@ -0,0 +1,1202 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/send.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *		      University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/* send.c 2.32 2/28/94 (C) 1988 University of Oulu, Computing Center and Jarkko Oikarinen */
+
+/** @file
+ * @brief The sending functions to users, channels, servers.
+ */
+
+#include "unrealircd.h"
+
+/* Some forward declarions are needed */
+void vsendto_one(Client *to, MessageTag *mtags, const char *pattern, va_list vl);
+void vsendto_prefix_one(Client *to, Client *from, MessageTag *mtags, const char *pattern, va_list vl);
+static int vmakebuf_local_withprefix(char *buf, size_t buflen, Client *from, const char *pattern, va_list vl);
+
+#define ADD_CRLF(buf, len) { if (len > 510) len = 510; \
+                             buf[len++] = '\r'; buf[len++] = '\n'; buf[len] = '\0'; } while(0)
+
+/* These are two local (static) buffers used by the various send functions */
+static char sendbuf[2048];
+static char sendbuf2[4096];
+
+/** This is used to ensure no duplicate messages are sent
+ * to the same server uplink/direction. In send functions
+ * that deliver to multiple users or servers the value is
+ * increased by 1 and then for each delivery in the loop
+ * it is checked if to->direction->local->serial == current_serial
+ * and if so, sending is skipped.
+ */
+MODVAR int  current_serial;
+
+/** Mark the socket as "dead".
+ * This is used when exit_client() cannot be used from the
+ * current code because doing so would be (too) unexpected.
+ * The socket is closed later in the main loop.
+ * NOTE: this function is becoming less important, now that
+ *       exit_client() will not actively free the client.
+ *       Still, sometimes we need to use dead_socket()
+ *       since we don't want to be doing IsDead() checks after
+ *       each and every sendto...().
+ * @param to		Client to mark as dead
+ * @param notice	The quit reason to use
+ */
+int dead_socket(Client *to, char *notice)
+{
+	DBufClear(&to->local->recvQ);
+	DBufClear(&to->local->sendQ);
+
+	if (IsDeadSocket(to))
+		return -1; /* already pending to be closed */
+
+	SetDeadSocket(to);
+
+	/* We may get here because of the 'CPR' in check_deadsockets().
+	 * In which case, we return -1 as well.
+	 */
+	if (to->local->error_str)
+		return -1; /* don't overwrite & don't send multiple times */
+	
+	if (!IsUser(to) && !IsUnknown(to) && !IsClosing(to))
+		sendto_ops_and_log("Link to server %s (%s) closed: %s",
+			to->name, to->ip?to->ip:"<no-ip>", notice);
+	Debug((DEBUG_ERROR, "dead_socket: %s - %s", notice, get_client_name(to, FALSE)));
+	safe_strdup(to->local->error_str, notice);
+	return -1;
+}
+
+/** This is a callback function from the event loop.
+ * All it does is call send_queued().
+ */
+void send_queued_cb(int fd, int revents, void *data)
+{
+	Client *to = data;
+
+	if (IsDeadSocket(to))
+		return;
+
+	send_queued(to);
+}
+
+/** This function is called when queued data might be ready to be
+ * sent to the client. It is called from the event loop and also
+ * a couple of other places (such as when closing the connection).
+ */
+int send_queued(Client *to)
+{
+	int  len, rlen;
+	dbufbuf *block;
+	int want_read;
+
+	/* We NEVER write to dead sockets. */
+	if (IsDeadSocket(to))
+		return -1;
+
+	while (DBufLength(&to->local->sendQ) > 0)
+	{
+		block = container_of(to->local->sendQ.dbuf_list.next, dbufbuf, dbuf_node);
+		len = block->size;
+
+		/* Deliver it and check for fatal error.. */
+		if ((rlen = deliver_it(to, block->data, len, &want_read)) < 0)
+		{
+			char buf[256];
+			snprintf(buf, 256, "Write error: %s", STRERROR(ERRNO));
+			return dead_socket(to, buf);
+		}
+		dbuf_delete(&to->local->sendQ, rlen);
+		to->local->lastsq = DBufLength(&to->local->sendQ) / 1024;
+		if (want_read)
+		{
+			/* SSL_write indicated that it cannot write data at this
+			 * time and needs to READ data first. Let's stop talking
+			 * to the user and ask to notify us when there's data
+			 * to read.
+			 */
+			fd_setselect(to->local->fd, FD_SELECT_READ, send_queued_cb, to);
+			fd_setselect(to->local->fd, FD_SELECT_WRITE, NULL, to);
+			break;
+		}
+		/* Restore handling of reads towards read_packet(), since
+		 * it may be overwritten in an earlier call to send_queued(),
+		 * to handle reads by send_queued_cb(), see directly above.
+		 */
+		fd_setselect(to->local->fd, FD_SELECT_READ, read_packet, to);
+		if (rlen < len)
+		{
+			/* incomplete write due to EWOULDBLOCK, reschedule */
+			fd_setselect(to->local->fd, FD_SELECT_WRITE, send_queued_cb, to);
+			break;
+		}
+	}
+	
+	/* Nothing left to write, stop asking for write-ready notification. */
+	if ((DBufLength(&to->local->sendQ) == 0) && (to->local->fd >= 0))
+		fd_setselect(to->local->fd, FD_SELECT_WRITE, NULL, to);
+
+	return (IsDeadSocket(to)) ? -1 : 0;
+}
+
+/** Mark "to" with "there is data to be send" */
+void mark_data_to_send(Client *to)
+{
+	if (!IsDeadSocket(to) && (to->local->fd >= 0) && (DBufLength(&to->local->sendQ) > 0))
+	{
+		fd_setselect(to->local->fd, FD_SELECT_WRITE, send_queued_cb, to);
+	}
+}
+
+/** Send a message to a single client.
+ * @param to		The client to send to
+ * @param mtags		Any message tags associated with this message (can be NULL)
+ * @param pattern	The format string / pattern to use.
+ * @param ...		Format string parameters.
+ */
+void sendto_one(Client *to, MessageTag *mtags, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	va_start(vl, pattern);
+	vsendto_one(to, mtags, pattern, vl);
+	va_end(vl);
+}
+
+/** Send a message to a single client - va_list variant.
+ * This function is similar to sendto_one() except that it
+ * doesn't use varargs but a va_list instead.
+ * Generally this is NOT used outside send.c, so not by modules.
+ * @param to		The client to send to
+ * @param mtags		Any message tags associated with this message (can be NULL)
+ * @param pattern	The format string / pattern to use.
+ * @param vl		Format string parameters.
+ */
+void vsendto_one(Client *to, MessageTag *mtags, const char *pattern, va_list vl)
+{
+	char *mtags_str = mtags ? mtags_to_string(mtags, to) : NULL;
+
+	ircvsnprintf(sendbuf, sizeof(sendbuf), pattern, vl);
+
+	if (BadPtr(mtags_str))
+	{
+		/* Simple message without message tags */
+		sendbufto_one(to, sendbuf, 0);
+	} else {
+		/* Message tags need to be prepended */
+		snprintf(sendbuf2, sizeof(sendbuf2), "@%s %s", mtags_str, sendbuf);
+		sendbufto_one(to, sendbuf2, 0);
+	}
+}
+
+
+/** Send a line buffer to the client.
+ * This function is used (usually indirectly) for pretty much all
+ * cases where a line needs to be sent to a client.
+ * @param to    The client to which the buffer should be send.
+ * @param msg   The message.
+ * @param quick Normally set to 0, see the notes.
+ * @note
+ * - Neither 'to' or 'msg' may be NULL.
+ * - If quick is set to 0 then the length is calculated,
+ *   the string is cut off at 510 bytes if needed, and
+ *   CR+LF is added if needed.
+ *   If quick is >0 then it is assumed the message already
+ *   is within boundaries and passed all safety checks and
+ *   contains CR+LF at the end. This if, for example, used in
+ *   channel broadcasts to save some CPU cycles. It is NOT
+ *   recommended as normal usage since you need to be very
+ *   careful to take everything into account, including side-
+ *   effects not mentioned here.
+ */
+void sendbufto_one(Client *to, char *msg, unsigned int quick)
+{
+	int len;
+	Hook *h;
+	Client *intended_to = to;
+	
+	Debug((DEBUG_ERROR, "Sending [%s] to %s", msg, to->name));
+
+	if (to->direction)
+		to = to->direction;
+	if (IsDeadSocket(to))
+		return;		/* This socket has already
+				   been marked as dead */
+	if (to->local->fd < 0)
+	{
+		/* This is normal when 'to' was being closed (via exit_client
+		 *  and close_connection) --Run
+		 * Print the debug message anyway...
+		 */
+		Debug((DEBUG_ERROR,
+		    "Local socket %s with negative fd %d... AARGH!", to->name,
+		    to->local->fd));
+		return;
+	}
+
+	/* Unless 'quick' is set, we do some safety checks,
+	 * cut the string off at the appropriate place and add
+	 * CR+LF if needed (nearly always).
+	 */
+	if (!quick)
+	{
+		char *p = msg;
+		if (*msg == '@')
+		{
+			/* The message includes one or more message tags:
+			 * Spec-wise the rules allow about 8K for message tags
+			 * and then 512 bytes for the remainder of the message.
+			 * Since we do not allow user tags and only permit a
+			 * limited set of tags we can have our own limits for
+			 * the outgoing messages that we generate: a maximum of
+			 * 500 bytes for message tags and 512 for the remainder.
+			 * These limits will never be hit unless there is a bug
+			 * somewhere.
+			 */
+			p = strchr(msg+1, ' ');
+			if (!p)
+			{
+				ircd_log(LOG_ERROR, "[BUG] sendbufto_one(): Malformed message: %s",
+					msg);
+				return;
+			}
+			if (p - msg > 500)
+			{
+				ircd_log(LOG_ERROR, "[BUG] sendbufto_one(): Spec-wise legal, but massively oversized message-tag (len %d)",
+				         (int)(p - msg));
+				return;
+			}
+			p++; /* skip space character */
+		}
+		len = strlen(p);
+		if (!len || (p[len - 1] != '\n'))
+		{
+			if (len > 510)
+				len = 510;
+			p[len++] = '\r';
+			p[len++] = '\n';
+			p[len] = '\0';
+		}
+		len = strlen(msg); /* (note: we could use pointer jugling to avoid a strlen here) */
+	} else {
+		len = quick;
+	}
+
+	if (len >= 1024)
+	{
+		ircd_log(LOG_ERROR, "sendbufto_one: len=%d, quick=%u", len, quick);
+		abort();
+	}
+
+	if (IsMe(to))
+	{
+		char tmp_msg[500], *p;
+
+		p = strchr(msg, '\r');
+		if (p) *p = '\0';
+		snprintf(tmp_msg, 500, "Trying to send data to myself! '%s'", msg);
+		ircd_log(LOG_ERROR, "%s", tmp_msg);
+		sendto_ops("%s", tmp_msg); /* recursion? */
+		return;
+	}
+
+	for (h = Hooks[HOOKTYPE_PACKET]; h; h = h->next)
+	{
+		(*(h->func.intfunc))(&me, to, intended_to, &msg, &len);
+		if (!msg)
+			return;
+	}
+
+#if defined(DEBUGMODE) && defined(RAWCMDLOGGING)
+	{
+		char copy[512], *p;
+		strlcpy(copy, msg, len > sizeof(copy) ? sizeof(copy) : len);
+		p = strchr(copy, '\n');
+		if (p) *p = '\0';
+		p = strchr(copy, '\r');
+		if (p) *p = '\0';
+		ircd_log(LOG_ERROR, "-> %s: %s", to->name, copy);
+	}
+#endif
+
+	if (DBufLength(&to->local->sendQ) > get_sendq(to))
+	{
+		if (IsServer(to))
+			sendto_ops("Max SendQ limit exceeded for %s: %u > %d",
+			    get_client_name(to, FALSE), DBufLength(&to->local->sendQ),
+			    get_sendq(to));
+		dead_socket(to, "Max SendQ exceeded");
+		return;
+	}
+
+	dbuf_put(&to->local->sendQ, msg, len);
+
+	/*
+	 * Update statistics. The following is slightly incorrect
+	 * because it counts messages even if queued, but bytes
+	 * only really sent. Queued bytes get updated in SendQueued.
+	 */
+	// FIXME: something is wrong here, I think we do double counts, either in message or in traffic, I forgot.. CHECK !!!!
+	to->local->sendM += 1;
+	me.local->sendM += 1;
+
+	/* Previously we ran send_queued() here directly, but that is
+	 * a bad idea, CPU-wise. So now we just mark the client indicating
+	 * that there is data to send.
+	 */
+	mark_data_to_send(to);
+}
+
+/** A single function to send data to a channel.
+ * Previously there were 6, now there is 1. This means there
+ * are likely some parameters that you will pass as NULL or 0
+ * but at least we can all use one single function.
+ * @param channel       The channel to send to
+ * @param from        The source of the message
+ * @param skip        The client to skip (can be NULL).
+ *                    Note that if you specify a remote link then
+ *                    you usually mean xyz->direction and not xyz.
+ * @param prefix      Any combination of PREFIX_* (can be 0 for all)
+ * @param clicap      Client capability the recipient should have
+ *                    (this only works for local clients, we will
+ *                     always send the message to remote clients and
+ *                     assume the server there will handle it)
+ * @param sendflags   Determines whether to send the message to local/remote users
+ * @param mtags       The message tags to attach to this message
+ * @param pattern     The pattern (eg: ":%s PRIVMSG %s :%s")
+ * @param ...         The parameters for the pattern.
+ */
+void sendto_channel(Channel *channel, Client *from, Client *skip,
+                    int prefix, long clicap, int sendflags,
+                    MessageTag *mtags,
+                    FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Member *lp;
+	Client *acptr;
+
+	++current_serial;
+	for (lp = channel->members; lp; lp = lp->next)
+	{
+		acptr = lp->client;
+
+		/* Skip sending to 'skip' */
+		if ((acptr == skip) || (acptr->direction == skip))
+			continue;
+		/* Don't send to deaf clients (unless 'senddeaf' is set) */
+		if (IsDeaf(acptr) && (sendflags & SKIP_DEAF))
+			continue;
+		/* Don't send to NOCTCP clients */
+		if (has_user_mode(acptr, 'T') && (sendflags & SKIP_CTCP))
+			continue;
+		/* Now deal with 'prefix' (if non-zero) */
+		if (!prefix)
+			goto good;
+		if ((prefix & PREFIX_HALFOP) && (lp->flags & CHFL_HALFOP))
+			goto good;
+		if ((prefix & PREFIX_VOICE) && (lp->flags & CHFL_VOICE))
+			goto good;
+		if ((prefix & PREFIX_OP) && (lp->flags & CHFL_CHANOP))
+			goto good;
+#ifdef PREFIX_AQ
+		if ((prefix & PREFIX_ADMIN) && (lp->flags & CHFL_CHANADMIN))
+			goto good;
+		if ((prefix & PREFIX_OWNER) && (lp->flags & CHFL_CHANOWNER))
+			goto good;
+#endif
+		continue;
+good:
+		/* Now deal with 'clicap' (if non-zero) */
+		if (clicap && MyUser(acptr) && !HasCapabilityFast(acptr, clicap))
+			continue;
+
+		if (MyUser(acptr))
+		{
+			/* Local client */
+			if (sendflags & SEND_LOCAL)
+			{
+				va_start(vl, pattern);
+				vsendto_prefix_one(acptr, from, mtags, pattern, vl);
+				va_end(vl);
+			}
+		}
+		else
+		{
+			/* Remote client */
+			if (sendflags & SEND_REMOTE)
+			{
+				/* Message already sent to remote link? */
+				if (acptr->direction->local->serial != current_serial)
+				{
+					va_start(vl, pattern);
+					vsendto_prefix_one(acptr, from, mtags, pattern, vl);
+					va_end(vl);
+
+					acptr->direction->local->serial = current_serial;
+				}
+			}
+		}
+	}
+
+	if (sendflags & SEND_REMOTE)
+	{
+		/* For the remaining uplinks that we have not sent a message to yet...
+		 * broadcast-channel-messages=never: don't send it to them
+		 * broadcast-channel-messages=always: always send it to them
+		 * broadcast-channel-messages=auto: send it to them if the channel is set +H (history)
+		 */
+
+		if ((iConf.broadcast_channel_messages == BROADCAST_CHANNEL_MESSAGES_ALWAYS) ||
+		    ((iConf.broadcast_channel_messages == BROADCAST_CHANNEL_MESSAGES_AUTO) && has_channel_mode(channel, 'H')))
+		{
+			list_for_each_entry(acptr, &server_list, special_node)
+			{
+				if ((acptr == skip) || (acptr->direction == skip))
+					continue; /* still obey this rule.. */
+				if (acptr->direction->local->serial != current_serial)
+				{
+					va_start(vl, pattern);
+					vsendto_prefix_one(acptr, from, mtags, pattern, vl);
+					va_end(vl);
+
+					acptr->direction->local->serial = current_serial;
+				}
+			}
+		}
+	}
+}
+
+/** Send a message to a server, taking into account server options if needed.
+ * @param one		The client to skip (can be NULL)
+ * @param servercaps	Server capabilities which must be present (OR'd together, if multiple)
+ * @param noservercaps	Server capabilities which must NOT be present (OR'd together, if multiple)
+ * @param mtags		The message tags to attach to this message.
+ * @param format	The format string / pattern, such as ":%s NICK %s".
+ * @param ...		The parameters for the format string
+ */
+void sendto_server(Client *one, unsigned long servercaps, unsigned long noservercaps, MessageTag *mtags, FORMAT_STRING(const char *format), ...)
+{
+	Client *acptr;
+
+	/* noone to send to.. */
+	if (list_empty(&server_list))
+		return;
+
+	list_for_each_entry(acptr, &server_list, special_node)
+	{
+		va_list vl;
+
+		if (one && acptr == one->direction)
+			continue;
+
+		if (servercaps && !CHECKSERVERPROTO(acptr, servercaps))
+			continue;
+
+		if (noservercaps && CHECKSERVERPROTO(acptr, noservercaps))
+			continue;
+
+		va_start(vl, format);
+		vsendto_one(acptr, mtags, format, vl);
+		va_end(vl);
+	}
+}
+
+/** Send a message to all local users on all channels where
+ * the user 'user' is on.
+ * This is used for events such as a nick change and quit.
+ * @param user        The user and source of the message.
+ * @param skip        The client to skip (can be NULL)
+ * @param clicap      Client capability the recipient should have
+ *                    (this only works for local clients, we will
+ *                     always send the message to remote clients and
+ *                     assume the server there will handle it)
+ * @param mtags       The message tags to attach to this message.
+ * @param pattern     The pattern (eg: ":%s NICK %s").
+ * @param ...         The parameters for the pattern.
+ */
+void sendto_local_common_channels(Client *user, Client *skip, long clicap, MessageTag *mtags, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Membership *channels;
+	Member *users;
+	Client *acptr;
+
+	/* We now create the buffer _before_ we send it to the clients. -- Syzop */
+	*sendbuf = '\0';
+	va_start(vl, pattern);
+	vmakebuf_local_withprefix(sendbuf, sizeof sendbuf, user, pattern, vl);
+	va_end(vl);
+
+	++current_serial;
+
+	if (user->user)
+	{
+		for (channels = user->user->channel; channels; channels = channels->next)
+		{
+			for (users = channels->channel->members; users; users = users->next)
+			{
+				acptr = users->client;
+
+				if (!MyConnect(acptr))
+					continue; /* only process local clients */
+
+				if (acptr->local->serial == current_serial)
+					continue; /* message already sent to this client */
+
+				if (clicap && !HasCapabilityFast(acptr, clicap))
+					continue; /* client does not have the specified capability */
+
+				if (acptr == skip)
+					continue; /* the one to skip */
+
+				if (!user_can_see_member(acptr, user, channels->channel))
+					continue; /* the sending user (quit'ing or nick changing) is 'invisible' -- skip */
+
+				acptr->local->serial = current_serial;
+				sendto_one(acptr, mtags, "%s", sendbuf);
+			}
+		}
+	}
+}
+
+/*
+** send a msg to all ppl on servers/hosts that match a specified mask
+** (used for enhanced PRIVMSGs)
+**
+** addition -- Armin, 8jun90 (gruner@informatik.tu-muenchen.de)
+*/
+
+static int match_it(Client *one, char *mask, int what)
+{
+	switch (what)
+	{
+		case MATCH_HOST:
+			return match_simple(mask, one->user->realhost);
+		case MATCH_SERVER:
+		default:
+			return match_simple(mask, one->user->server);
+	}
+}
+
+/*
+ * sendto_match_butone
+ *
+ * Send to all clients which match the mask in a way defined on 'what';
+ * either by user hostname or user servername.
+ */
+void sendto_match_butone(Client *one, Client *from, char *mask, int what,
+                         MessageTag *mtags, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	char cansendlocal, cansendglobal;
+
+	if (MyConnect(from))
+	{
+		cansendlocal = (ValidatePermissionsForPath("chat:notice:local",from,NULL,NULL,NULL)) ? 1 : 0;
+		cansendglobal = (ValidatePermissionsForPath("chat:notice:global",from,NULL,NULL,NULL)) ? 1 : 0;
+	}
+	else
+		cansendlocal = cansendglobal = 1;
+
+	/* To servers... */
+	if (cansendglobal)
+	{
+		char buf[512];
+
+		va_start(vl, pattern);
+		ircvsnprintf(buf, sizeof(buf), pattern, vl);
+		va_end(vl);
+
+		sendto_server(one, 0, 0, mtags, "%s", buf);
+	}
+
+	/* To local clients... */
+	if (cansendlocal)
+	{
+		list_for_each_entry(acptr, &lclient_list, lclient_node)
+		{
+			if (!IsMe(acptr) && (acptr != one) && IsUser(acptr) && match_it(acptr, mask, what))
+			{
+				va_start(vl, pattern);
+				vsendto_prefix_one(acptr, from, mtags, pattern, vl);
+				va_end(vl);
+			}
+		}
+	}
+}
+
+/*
+ * sendto_ops
+ *
+ *	Send to *local* ops only.
+ */
+void sendto_ops(FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	char nbuf[1024];
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+		if (!IsServer(acptr) && !IsMe(acptr) && SendServNotice(acptr))
+		{
+			ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :*** ", me.name, acptr->name);
+			strlcat(nbuf, pattern, sizeof nbuf);
+
+			va_start(vl, pattern);
+			vsendto_one(acptr, NULL, nbuf, vl);
+			va_end(vl);
+		}
+}
+
+/*
+ * sendto_umode
+ *
+ *  Send to specified umode
+ */
+void sendto_umode(int umodes, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	char nbuf[1024];
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+		if (IsUser(acptr) && (acptr->umodes & umodes) == umodes)
+		{
+			ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :", me.name, acptr->name);
+			strlcat(nbuf, pattern, sizeof nbuf);
+
+			va_start(vl, pattern);
+			vsendto_one(acptr, NULL, nbuf, vl);
+			va_end(vl);
+		}
+}
+
+/*
+ * sendto_umode_global
+ *
+ * Send to specified umode *GLOBALLY* (on all servers)
+ */
+void sendto_umode_global(int umodes, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	char nbuf[1024];
+	int i;
+	char modestr[128];
+	char *p;
+
+	/* Convert 'umodes' (int) to 'modestr' (string) */
+	*modestr = '\0';
+	p = modestr;
+	for(i = 0; i <= Usermode_highest; i++)
+	{
+		if (!Usermode_Table[i].flag)
+			continue;
+		if (umodes & Usermode_Table[i].mode)
+			*p++ = Usermode_Table[i].flag;
+	}
+	*p = '\0';
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		if (IsUser(acptr) && (acptr->umodes & umodes) == umodes)
+		{
+			ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :", me.name, acptr->name);
+			strlcat(nbuf, pattern, sizeof nbuf);
+
+			va_start(vl, pattern);
+			vsendto_one(acptr, NULL, nbuf, vl);
+			va_end(vl);
+		} else
+		if (IsServer(acptr) && *modestr)
+		{
+			snprintf(nbuf, sizeof(nbuf), ":%s SENDUMODE %s :%s", me.id, modestr, pattern);
+			va_start(vl, pattern);
+			vsendto_one(acptr, NULL, nbuf, vl);
+			va_end(vl);
+		}
+	}
+}
+
+/** Send to specified snomask - local / operonly.
+ * @param snomask Snomask to send to (can be a bitmask [AND])
+ * @param pattern printf-style pattern, followed by parameters.
+ * This function does not send snomasks to non-opers.
+ */
+void sendto_snomask(int snomask, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	char nbuf[2048];
+
+	va_start(vl, pattern);
+	ircvsnprintf(nbuf, sizeof(nbuf), pattern, vl);
+	va_end(vl);
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		if (acptr->user->snomask & snomask)
+			sendnotice(acptr, "%s", nbuf);
+	}
+}
+
+/** Send to specified snomask - global / operonly.
+ * @param snomask Snomask to send to (can be a bitmask [AND])
+ * @param pattern printf-style pattern, followed by parameters
+ * This function does not send snomasks to non-opers.
+ */
+void sendto_snomask_global(int snomask, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	int  i;
+	char nbuf[2048], snobuf[32], *p;
+
+	va_start(vl, pattern);
+	ircvsnprintf(nbuf, sizeof(nbuf), pattern, vl);
+	va_end(vl);
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		if (acptr->user->snomask & snomask)
+			sendnotice(acptr, "%s", nbuf);
+	}
+
+	/* Build snomasks-to-send-to buffer */
+	snobuf[0] = '\0';
+	for (i = 0, p=snobuf; i<= Snomask_highest; i++)
+		if (snomask & Snomask_Table[i].mode)
+			*p++ = Snomask_Table[i].flag;
+	*p = '\0';
+
+	sendto_server(NULL, 0, 0, NULL, ":%s SENDSNO %s :%s", me.id, snobuf, nbuf);
+}
+
+/*
+ * send_cap_notify
+ *
+ * Send CAP DEL or CAP NEW to clients supporting this.
+ */
+void send_cap_notify(int add, char *token)
+{
+	Client *client;
+	ClientCapability *clicap = ClientCapabilityFindReal(token);
+	long CAP_NOTIFY = ClientCapabilityBit("cap-notify");
+
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (HasCapabilityFast(client, CAP_NOTIFY))
+		{
+			if (add)
+			{
+				char *args = NULL;
+				if (clicap)
+				{
+					if (clicap->visible && !clicap->visible(client))
+						continue; /* invisible CAP, so don't announce it */
+					if (clicap->parameter && (client->local->cap_protocol >= 302))
+						args = clicap->parameter(client);
+				}
+				if (!args)
+				{
+					sendto_one(client, NULL, ":%s CAP %s NEW :%s",
+						me.name, (*client->name ? client->name : "*"), token);
+				} else {
+					sendto_one(client, NULL, ":%s CAP %s NEW :%s=%s",
+						me.name, (*client->name ? client->name : "*"), token, args);
+				}
+			} else {
+				sendto_one(client, NULL, ":%s CAP %s DEL :%s",
+					me.name, (*client->name ? client->name : "*"), token);
+			}
+		}
+	}
+}
+
+/* ** sendto_ops_butone
+**	Send message to all operators.
+** one - client not to send message to
+** from- client which message is from *NEVER* NULL!!
+*/
+void sendto_ops_butone(Client *one, Client *from, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+
+	++current_serial;
+	list_for_each_entry(acptr, &client_list, client_node)
+	{
+		if (!SendWallops(acptr))
+			continue;
+		if (acptr->direction->local->serial == current_serial)	/* sent message along it already ? */
+			continue;
+		if (acptr->direction == one)
+			continue;	/* ...was the one I should skip */
+		acptr->direction->local->serial = current_serial;
+
+		va_start(vl, pattern);
+		vsendto_prefix_one(acptr->direction, from, NULL, pattern, vl);
+		va_end(vl);
+	}
+}
+
+/* Prepare buffer based on format string and 'from' for LOCAL delivery.
+ * The prefix (:<something>) will be expanded to :nick!user@host if 'from'
+ * is a person, taking into account the rules for hidden/cloaked host.
+ * NOTE: Do not send this prepared buffer to remote clients or servers,
+ *       they do not want or need the expanded prefix. In that case, simply
+ *       use ircvsnprintf() directly.
+ */
+static int vmakebuf_local_withprefix(char *buf, size_t buflen, Client *from, const char *pattern, va_list vl)
+{
+	int len;
+
+	/* This expands the ":%s " part of the pattern
+	 * into ":nick!user@host ".
+	 * In case of a non-person (server) it doesn't do
+	 * anything since no expansion is needed.
+	 */
+	if (from && from->user && !strncmp(pattern, ":%s ", 4))
+	{
+		va_arg(vl, char *); /* eat first parameter */
+
+		*buf = ':';
+		strcpy(buf+1, from->name);
+
+		if (IsUser(from))
+		{
+			char *username = from->user->username;
+			char *host = GetHost(from);
+
+			if (*username)
+			{
+				strcat(buf, "!");
+				strcat(buf, username);
+			}
+			if (*host)
+			{
+				strcat(buf, "@");
+				strcat(buf, host);
+			}
+		}
+		/* Now build the remaining string */
+		ircvsnprintf(buf + strlen(buf), buflen - strlen(buf), &pattern[3], vl);
+	}
+	else
+	{
+		ircvsnprintf(buf, buflen, pattern, vl);
+	}
+
+	len = strlen(buf);
+	ADD_CRLF(buf, len);
+	return len;
+}
+
+void vsendto_prefix_one(Client *to, Client *from, MessageTag *mtags, const char *pattern, va_list vl)
+{
+	char *mtags_str = mtags ? mtags_to_string(mtags, to) : NULL;
+
+	if (to && from && MyUser(to) && from->user)
+		vmakebuf_local_withprefix(sendbuf, sizeof sendbuf, from, pattern, vl);
+	else
+		ircvsnprintf(sendbuf, sizeof(sendbuf), pattern, vl);
+
+	if (BadPtr(mtags_str))
+	{
+		/* Simple message without message tags */
+		sendbufto_one(to, sendbuf, 0);
+	} else {
+		/* Message tags need to be prepended */
+		snprintf(sendbuf2, sizeof(sendbuf2), "@%s %s", mtags_str, sendbuf);
+		sendbufto_one(to, sendbuf2, 0);
+	}
+}
+
+/*
+ * sendto_prefix_one
+ *
+ * to - destination client
+ * from - client which message is from
+ *
+ * NOTE: NEITHER OF THESE SHOULD *EVER* BE NULL!!
+ * -avalon
+ */
+
+void sendto_prefix_one(Client *to, Client *from, MessageTag *mtags, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	va_start(vl, pattern);
+	vsendto_prefix_one(to, from, mtags, pattern, vl);
+	va_end(vl);
+}
+
+/*
+ * sendto_realops
+ *
+ *	Send to *local* ops only but NOT +s nonopers.
+ */
+void sendto_realops(FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	Client *acptr;
+	char nbuf[1024];
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		ircsnprintf(nbuf, sizeof(nbuf), ":%s NOTICE %s :*** ", me.name, acptr->name);
+		strlcat(nbuf, pattern, sizeof nbuf);
+
+		va_start(vl, pattern);
+		vsendto_one(acptr, NULL, nbuf, vl);
+		va_end(vl);
+	}
+}
+
+/* Sends a message to all (local) opers AND logs to the ircdlog (as LOG_ERROR) */
+void sendto_realops_and_log(FORMAT_STRING(const char *fmt), ...)
+{
+va_list vl;
+static char buf[2048];
+
+	va_start(vl, fmt);
+	vsnprintf(buf, sizeof(buf), fmt, vl);
+	va_end(vl);
+
+	sendto_realops("%s", buf);
+	ircd_log(LOG_ERROR, "%s", buf);
+}
+
+void sendto_connectnotice(Client *newuser, int disconnect, char *comment)
+{
+	Client *acptr;
+	char connect[512], secure[256];
+
+	if (!disconnect)
+	{
+		RunHook(HOOKTYPE_LOCAL_CONNECT, newuser);
+
+		*secure = '\0';
+		if (IsSecure(newuser))
+			snprintf(secure, sizeof(secure), " [secure %s]", SSL_get_cipher(newuser->local->ssl));
+
+		ircsnprintf(connect, sizeof(connect),
+		    "*** Client connecting: %s (%s@%s) [%s] {%s}%s", newuser->name,
+		    newuser->user->username, newuser->user->realhost, newuser->ip,
+		    newuser->local->class ? newuser->local->class->name : "0",
+		    secure);
+	}
+	else
+	{
+		ircsnprintf(connect, sizeof(connect), "*** Client exiting: %s (%s@%s) [%s] (%s)",
+			newuser->name, newuser->user->username, newuser->user->realhost, newuser->ip, comment);
+	}
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		if (acptr->user->snomask & SNO_CLIENT)
+			sendnotice(acptr, "%s", connect);
+	}
+}
+
+void sendto_fconnectnotice(Client *newuser, int disconnect, char *comment)
+{
+	Client *acptr;
+	char connect[512], secure[256];
+
+	if (!disconnect)
+	{
+		*secure = '\0';
+		if (IsSecureConnect(newuser))
+			strcpy(secure, " [secure]"); /* will we ever expand this? */
+
+		ircsnprintf(connect, sizeof(connect),
+		    "*** Client connecting: %s (%s@%s) [%s] {0}%s", newuser->name,
+		    newuser->user->username, newuser->user->realhost, newuser->ip ? newuser->ip : "0",
+		    secure);
+	}
+	else
+	{
+		ircsnprintf(connect, sizeof(connect), "*** Client exiting: %s (%s@%s) [%s] (%s)",
+			newuser->name, newuser->user->username, newuser->user->realhost,
+			newuser->ip ? newuser->ip : "0", comment);
+	}
+
+	list_for_each_entry(acptr, &oper_list, special_node)
+	{
+		if (acptr->user->snomask & SNO_FCLIENT)
+			sendto_one(acptr, NULL, ":%s NOTICE %s :%s", newuser->user->server, acptr->name, connect);
+	}
+}
+
+/** Introduce user to all other servers, except the one to skip.
+ * @param one    Server to skip (can be NULL)
+ * @param client Client to introduce
+ * @param umodes User modes of client
+ */
+void sendto_serv_butone_nickcmd(Client *one, Client *client, char *umodes)
+{
+	Client *acptr;
+
+	list_for_each_entry(acptr, &server_list, special_node)
+	{
+		if (one && acptr == one->direction)
+			continue;
+		
+		sendto_one_nickcmd(acptr, client, umodes);
+	}
+}
+
+/** Introduce user to a server.
+ * @param server  Server to send to (locally connected!)
+ * @param client  Client to introduce
+ * @param umodes  User modes of client
+ */
+void sendto_one_nickcmd(Client *server, Client *client, char *umodes)
+{
+	char *vhost;
+
+	if (!*umodes)
+		umodes = "+";
+
+	if (SupportVHP(server))
+	{
+		if (IsHidden(client))
+			vhost = client->user->virthost;
+		else
+			vhost = client->user->realhost;
+	}
+	else
+	{
+		if (IsHidden(client) && client->umodes & UMODE_SETHOST)
+			vhost = client->user->virthost;
+		else
+			vhost = "*";
+	}
+
+	sendto_one(server, NULL,
+		":%s UID %s %d %lld %s %s %s %s %s %s %s %s :%s",
+		client->srvptr->id, client->name, client->hopcount,
+		(long long)client->lastnick,
+		client->user->username, client->user->realhost, client->id,
+		client->user->svid, umodes, vhost, getcloak(client),
+		encode_ip(client->ip), client->info);
+}
+
+/* sidenote: sendnotice() and sendtxtnumeric() assume no client or server
+ * has a % in their nick, which is a safe assumption since % is illegal.
+ */
+ 
+void sendnotice(Client *to, FORMAT_STRING(const char *pattern), ...)
+{
+	static char realpattern[1024];
+	va_list vl;
+	char *name = *to->name ? to->name : "*";
+
+	ircsnprintf(realpattern, sizeof(realpattern), ":%s NOTICE %s :%s", me.name, name, pattern);
+
+	va_start(vl, pattern);
+	vsendto_one(to, NULL, realpattern, vl);
+	va_end(vl);
+}
+
+/** Send MultiLine list as a notice, one for each line */
+void sendnotice_multiline(Client *client, MultiLine *m)
+{
+	for (; m; m = m->next)
+		sendnotice(client, "%s", m->line);
+}
+void sendtxtnumeric(Client *to, FORMAT_STRING(const char *pattern), ...)
+{
+	static char realpattern[1024];
+	va_list vl;
+
+	ircsnprintf(realpattern, sizeof(realpattern), ":%s %d %s :%s", me.name, RPL_TEXT, to->name, pattern);
+
+	va_start(vl, pattern);
+	vsendto_one(to, NULL, realpattern, vl);
+	va_end(vl);
+}
+
+/** Send numeric to IRC client */
+void sendnumeric(Client *to, int numeric, ...)
+{
+	va_list vl;
+	char pattern[512];
+
+	snprintf(pattern, sizeof(pattern), ":%s %.3d %s %s", me.name, numeric, to->name[0] ? to->name : "*", rpl_str(numeric));
+
+	va_start(vl, numeric);
+	vsendto_one(to, NULL, pattern, vl);
+	va_end(vl);
+}
+
+/** Send numeric to IRC client */
+void sendnumericfmt(Client *to, int numeric, FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	char realpattern[512];
+
+	snprintf(realpattern, sizeof(realpattern), ":%s %.3d %s %s", me.name, numeric, to->name[0] ? to->name : "*", pattern);
+
+	va_start(vl, pattern);
+	vsendto_one(to, NULL, realpattern, vl);
+	va_end(vl);
+}
+
+/** Send raw data directly to socket, bypassing everything.
+ * Looks like an interesting function to call? NO! STOP!
+ * Don't use this function. It may only be used by the initial
+ * Z-Line check via the codepath to banned_client().
+ * YOU SHOULD NEVER USE THIS FUNCTION.
+ * If you want to send raw data (without formatting) to a client
+ * then have a look at sendbufto_one() instead.
+ *
+ * Side-effects:
+ * Too many to list here. Only in the early accept code the
+ * "if's" and side-effects are under control.
+ *
+ * By the way, did I already mention that you SHOULD NOT USE THIS
+ * FUNCTION? ;)
+ */
+void send_raw_direct(Client *user, FORMAT_STRING(FORMAT_STRING(const char *pattern)), ...)
+{
+	va_list vl;
+	int sendlen;
+
+	*sendbuf = '\0';
+	va_start(vl, pattern);
+	sendlen = vmakebuf_local_withprefix(sendbuf, sizeof sendbuf, user, pattern, vl);
+	va_end(vl);
+	(void)send(user->local->fd, sendbuf, sendlen, 0);
+}
+
+/** Send a message to all locally connected IRCOps and log the error.
+ */
+void sendto_ops_and_log(FORMAT_STRING(const char *pattern), ...)
+{
+	va_list vl;
+	char buf[1024];
+
+	va_start(vl, pattern);
+	ircvsnprintf(buf, sizeof(buf), pattern, vl);
+	va_end(vl);
+
+	ircd_log(LOG_ERROR, "%s", buf);
+	sendto_umode(UMODE_OPER, "%s", buf);
+}
diff --git a/src/serv.c b/src/serv.c
new file mode 100644
index 0000000..a6a2650
--- /dev/null
+++ b/src/serv.c
@@ -0,0 +1,1281 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/serv.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Server-related functions
+ */
+
+/* s_serv.c 2.55 2/7/94 (C) 1988 University of Oulu, Computing Center and Jarkko Oikarinen */
+
+#include "unrealircd.h"
+#ifndef _WIN32
+/* for uname(), is POSIX so should be OK... */
+#include <sys/utsname.h>
+#endif
+extern void s_die();
+
+MODVAR int  max_connection_count = 1, max_client_count = 1;
+extern int do_garbage_collect;
+/* We need all these for cached MOTDs -- codemastr */
+extern char *buildid;
+MOTDFile opermotd;
+MOTDFile rules;
+MOTDFile motd;
+MOTDFile svsmotd;
+MOTDFile botmotd;
+MOTDFile smotd;
+
+/** Hash list of TKL entries */
+MODVAR TKL *tklines[TKLISTLEN];
+/** 2D hash list of TKL entries + IP address */
+MODVAR TKL *tklines_ip_hash[TKLIPHASHLEN1][TKLIPHASHLEN2];
+int MODVAR spamf_ugly_vchanoverride = 0;
+
+void read_motd(const char *filename, MOTDFile *motd);
+void do_read_motd(const char *filename, MOTDFile *themotd);
+#ifdef USE_LIBCURL
+void read_motd_async_downloaded(const char *url, const char *filename, const char *errorbuf, int cached, MOTDDownload *motd_download);
+#endif
+
+extern MOTDLine *find_file(char *, short);
+
+void reread_motdsandrules();
+
+/** Send a message upstream if necessary and check if it's for us.
+ * @param client	The sender
+ * @param mtags		Message tags associated with this message
+ * @param command	The command (eg: "NOTICE")
+ * @param server	This indicates parv[server] contains the destination
+ * @param parc		Parameter count (MAX 8!!)
+ * @param parv		Parameter values (MAX 8!!)
+ * @note Command can have only max 8 parameters (parv[8])
+ * @note parv[server] is replaced with the name of the matched client.
+ */
+int hunt_server(Client *client, MessageTag *mtags, char *command, int server, int parc, char *parv[])
+{
+	Client *acptr;
+	char *saved;
+
+	/* This would be strange and bad. Previous version assumed "it's for me". Hmm.. okay. */
+	if (parc <= server || BadPtr(parv[server]))
+		return HUNTED_ISME;
+
+	acptr = find_client(parv[server], NULL);
+
+	/* find_client() may find a variety of clients. Only servers/persons please, no 'unknowns'. */
+	if (acptr && MyConnect(acptr) && !IsMe(acptr) && !IsUser(acptr) && !IsServer(acptr))
+		acptr = NULL;
+
+	if (!acptr)
+	{
+		sendnumeric(client, ERR_NOSUCHSERVER, parv[server]);
+		return HUNTED_NOSUCH;
+	}
+
+	if (IsMe(acptr) || MyUser(acptr))
+		return HUNTED_ISME;
+
+	/* Never send the message back from where it came from */
+	if (acptr->direction == client->direction)
+	{
+		sendnumeric(client, ERR_NOSUCHSERVER, parv[server]);
+		return HUNTED_NOSUCH;
+	}
+
+	/* Replace "server" part with actual servername (eg: 'User' -> 'x.y.net')
+	 * Ugly. Previous version didn't even restore the state, now we do.
+	 */
+	saved = parv[server];
+	parv[server] = acptr->id;
+
+	sendto_one(acptr, mtags, command, client->id,
+	    parv[1], parv[2], parv[3], parv[4],
+	    parv[5], parv[6], parv[7], parv[8]);
+
+	parv[server] = saved;
+
+	return HUNTED_PASS;
+}
+
+#ifndef _WIN32
+/** Grab operating system name on Windows (outdated) */
+char *getosname(void)
+{
+	static char buf[1024];
+	struct utsname osinf;
+	char *p;
+
+	memset(&osinf, 0, sizeof(osinf));
+	if (uname(&osinf) != 0)
+		return "<unknown>";
+	snprintf(buf, sizeof(buf), "%s %s %s %s %s",
+		osinf.sysname,
+		osinf.nodename,
+		osinf.release,
+		osinf.version,
+		osinf.machine);
+	/* get rid of cr/lf */
+	for (p=buf; *p; p++)
+		if ((*p == '\n') || (*p == '\r'))
+		{
+			*p = '\0';
+			break;
+		}
+	return buf;
+}
+#endif
+
+/** Helper function to send version strings */
+void send_version(Client *client, int reply)
+{
+	int i;
+
+	for (i = 0; ISupportStrings[i]; i++)
+		sendnumeric(client, reply, ISupportStrings[i]);
+}
+
+/** VERSION command:
+ * Syntax: VERSION [server]
+ */
+CMD_FUNC(cmd_version)
+{
+	/* Only allow remote VERSIONs if registered -- Syzop */
+	if (!IsUser(client) && !IsServer(client))
+	{
+		send_version(client, RPL_ISUPPORT);
+		return;
+	}
+
+	if (hunt_server(client, recv_mtags, ":%s VERSION :%s", 1, parc, parv) == HUNTED_ISME)
+	{
+		sendnumeric(client, RPL_VERSION, version, debugmode, me.name,
+			    (ValidatePermissionsForPath("server:info",client,NULL,NULL,NULL) ? serveropts : "0"),
+			    extraflags ? extraflags : "",
+			    tainted ? "3" : "",
+			    (ValidatePermissionsForPath("server:info",client,NULL,NULL,NULL) ? MYOSNAME : "*"),
+			    UnrealProtocol);
+		if (ValidatePermissionsForPath("server:info",client,NULL,NULL,NULL))
+		{
+			sendnotice(client, "%s", SSLeay_version(SSLEAY_VERSION));
+			sendnotice(client, "%s", pcre2_version());
+#ifdef USE_LIBCURL
+			sendnotice(client, "%s", curl_version());
+#endif
+		}
+		if (MyUser(client))
+			send_version(client,RPL_ISUPPORT);
+		else
+			send_version(client,RPL_REMOTEISUPPORT);
+	}
+}
+
+char *num = NULL;
+
+/** Send all our PROTOCTL messages to remote server.
+ * We send multiple PROTOCTL's since 4.x. If this breaks your services
+ * because you fail to maintain PROTOCTL state, then fix them!
+ */
+void send_proto(Client *client, ConfigItem_link *aconf)
+{
+	ISupport *prefix = ISupportFind("PREFIX");
+
+	/* CAUTION: If adding a token to an existing PROTOCTL line below,
+	 *          then ensure that MAXPARA is not reached!
+	 */
+
+	/* First line */
+	sendto_one(client, NULL, "PROTOCTL NOQUIT NICKv2 SJOIN SJOIN2 UMODE2 VL SJ3 TKLEXT TKLEXT2 NICKIP ESVID %s %s",
+	           iConf.ban_setter_sync ? "SJSBY" : "",
+	           ClientCapabilityFindReal("message-tags") ? "MTAGS" : "");
+
+	/* Second line */
+	sendto_one(client, NULL, "PROTOCTL CHANMODES=%s%s,%s%s,%s%s,%s%s USERMODES=%s BOOTED=%lld PREFIX=%s SID=%s MLOCK TS=%lld EXTSWHOIS",
+		CHPAR1, EXPAR1, CHPAR2, EXPAR2, CHPAR3, EXPAR3, CHPAR4, EXPAR4,
+		umodestring, (long long)me.local->since, prefix->value,
+		me.id, (long long)TStime());
+
+	/* Third line */
+	sendto_one(client, NULL, "PROTOCTL NICKCHARS=%s CHANNELCHARS=%s",
+		charsys_get_current_languages(),
+		allowed_channelchars_valtostr(iConf.allowed_channelchars));
+}
+
+#ifndef IRCDTOTALVERSION
+#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
+#endif
+
+/** Special filter for remote commands */
+int remotecmdfilter(Client *client, int parc, char *parv[])
+{
+	/* no remote requests permitted from non-ircops */
+	if (MyUser(client) && !ValidatePermissionsForPath("server:remote",client,NULL,NULL,NULL) && !BadPtr(parv[1]))
+	{
+		parv[1] = NULL;
+		parc = 1;
+	}
+
+	/* same as above, but in case an old server forwards a request to us: we ignore it */
+	if (!MyUser(client) && !ValidatePermissionsForPath("server:remote",client,NULL,NULL,NULL))
+		return 1; /* STOP (return) */
+	
+	return 0; /* Continue */
+}
+
+/** Output for /INFO */
+char *unrealinfo[] =
+{
+	"This release was brought to you by the following people:",
+	"",
+	"Head coder:",
+	"* Bram Matthys (Syzop) <syzop@unrealircd.org>",
+	"",
+	"Coders:",
+	"* Gottem <gottem@unrealircd.org>",
+	"* i <i@unrealircd.org>",
+	"",
+	"Past UnrealIRCd 4.x coders/contributors:",
+	"* Heero, binki, nenolod, ..",
+	"",
+	"Past UnrealIRCd 3.2.x coders/contributors:",
+	"* Stskeeps (ret. head coder / project leader)",
+	"* codemastr (ret. u3.2 head coder)",
+	"* aquanight, WolfSage, ..",
+	"* McSkaf, Zogg, NiQuiL, chasm, llthangel, nighthawk, ..",
+	NULL
+};
+
+/** Send /INFO output */
+void cmd_info_send(Client *client)
+{
+	char **text = unrealinfo;
+
+	sendnumericfmt(client, RPL_INFO, ":========== %s ==========", IRCDTOTALVERSION);
+
+	while (*text)
+		sendnumericfmt(client, RPL_INFO, ":| %s", *text++);
+
+	sendnumericfmt(client, RPL_INFO, ":|");
+	sendnumericfmt(client, RPL_INFO, ":|");
+	sendnumericfmt(client, RPL_INFO, ":| Credits - Type /CREDITS");
+	sendnumericfmt(client, RPL_INFO, ":|");
+	sendnumericfmt(client, RPL_INFO, ":| This is an UnrealIRCd-style server");
+	sendnumericfmt(client, RPL_INFO, ":| If you find any bugs, please report them at:");
+	sendnumericfmt(client, RPL_INFO, ":|  https://bugs.unrealircd.org/");
+	sendnumericfmt(client, RPL_INFO, ":| UnrealIRCd Homepage: https://www.unrealircd.org");
+	sendnumericfmt(client, RPL_INFO, ":============================================");
+	sendnumericfmt(client, RPL_INFO, ":Birth Date: %s, compile # %s", creation, generation);
+	sendnumericfmt(client, RPL_INFO, ":On-line since %s", myctime(me.local->firsttime));
+	sendnumericfmt(client, RPL_INFO, ":ReleaseID (%s)", buildid);
+	sendnumeric(client, RPL_ENDOFINFO);
+}
+
+/** The INFO command.
+ * Syntax: INFO [server]
+ */
+CMD_FUNC(cmd_info)
+{
+	if (remotecmdfilter(client, parc, parv))
+		return;
+
+	if (hunt_server(client, recv_mtags, ":%s INFO :%s", 1, parc, parv) == HUNTED_ISME)
+		cmd_info_send(client);
+}
+
+/** LICENSE command
+ * Syntax: LICENSE [server]
+ */
+CMD_FUNC(cmd_license)
+{
+	char **text = gnulicense;
+
+	if (remotecmdfilter(client, parc, parv))
+		return;
+
+	if (hunt_server(client, recv_mtags, ":%s LICENSE :%s", 1, parc, parv) == HUNTED_ISME)
+	{
+		while (*text)
+			sendnumeric(client, RPL_INFO, *text++);
+
+		sendnumeric(client, RPL_INFO, "");
+		sendnumeric(client, RPL_ENDOFINFO);
+	}
+}
+
+/** CREDITS command
+ * Syntax: CREDITS [servername]
+ */
+CMD_FUNC(cmd_credits)
+{
+	char **text = unrealcredits;
+
+	if (remotecmdfilter(client, parc, parv))
+		return;
+
+	if (hunt_server(client, recv_mtags, ":%s CREDITS :%s", 1, parc, parv) == HUNTED_ISME)
+	{
+		while (*text)
+			sendnumeric(client, RPL_INFO, *text++);
+
+		sendnumeric(client, RPL_INFO, "");
+		sendnumericfmt(client, RPL_INFO, ":Birth Date: %s, compile # %s", creation, generation);
+		sendnumericfmt(client, RPL_INFO, ":On-line since %s", myctime(me.local->firsttime));
+		sendnumeric(client, RPL_ENDOFINFO);
+	}
+}
+
+/** Return flags for a client (connection), eg 's' for SSL/TLS - used in STATS L/l */
+char *get_client_status(Client *client)
+{
+	static char buf[10];
+	char *p = buf;
+
+	*p = '\0';
+	*p++ = '[';
+	if (IsListening(client))
+	{
+		if (client->umodes & LISTENER_NORMAL)
+			*p++ = '*';
+		if (client->umodes & LISTENER_SERVERSONLY)
+			*p++ = 'S';
+		if (client->umodes & LISTENER_CLIENTSONLY)
+			*p++ = 'C';
+		if (client->umodes & LISTENER_TLS)
+			*p++ = 's';
+	}
+	else
+	{
+		if (IsTLS(client))
+			*p++ = 's';
+	}
+	*p++ = ']';
+	*p++ = '\0';
+	return (buf);
+}
+
+/** Used to blank out ports -- Barubary - only used in STATS l/L */
+char *get_client_name2(Client *client, int showports)
+{
+	char *pointer = get_client_name(client, TRUE);
+
+	if (!pointer)
+		return NULL;
+	if (showports)
+		return pointer;
+	if (!strrchr(pointer, '.'))
+		return NULL;
+	/*
+	 * This may seem like wack but remind this is only used 
+	 * in rows of get_client_name2's, so it's perfectly fair
+	 * 
+	*/
+	strcpy(strrchr(pointer, '.'), ".0]");
+
+	return pointer;
+}
+
+/** ERROR command - used by servers to indicate errors.
+ * Syntax: ERROR :<reason>
+ */
+CMD_FUNC(cmd_error)
+{
+	char *para;
+
+	if (!MyConnect(client))
+		return;
+
+	para = (parc > 1 && *parv[1] != '\0') ? parv[1] : "<>";
+
+	Debug((DEBUG_ERROR, "Received ERROR message from %s: %s",
+	    client->name, para));
+
+	/* Errors from untrusted sources only go to the junk snomask
+	 * (which is only for debugging issues and such).
+	 * This to prevent flooding and confusing IRCOps by
+	 * malicious users.
+	 */
+	if (!IsServer(client) && !client->serv)
+	{
+		sendto_snomask(SNO_JUNK, "ERROR from %s -- %s",
+			get_client_name(client, FALSE), para);
+		return;
+	}
+
+	sendto_umode_global(UMODE_OPER, "ERROR from %s -- %s",
+	    get_client_name(client, FALSE), para);
+}
+
+/** Save the tunefile (such as: highest seen connection count) */
+EVENT(save_tunefile)
+{
+	FILE *tunefile;
+
+	tunefile = fopen(conf_files->tune_file, "w");
+	if (!tunefile)
+	{
+#if !defined(_WIN32) && !defined(_AMIGA)
+		sendto_ops("Unable to write tunefile.. %s", strerror(errno));
+#else
+		sendto_ops("Unable to write tunefile..");
+#endif
+		return;
+	}
+	fprintf(tunefile, "0\n");
+	fprintf(tunefile, "%d\n", irccounts.me_max);
+	fclose(tunefile);
+}
+
+/** Load the tunefile (such as: highest seen connection count) */
+void load_tunefile(void)
+{
+	FILE *tunefile;
+	char buf[1024];
+
+	tunefile = fopen(conf_files->tune_file, "r");
+	if (!tunefile)
+		return;
+	fprintf(stderr, "Loading tunefile..\n");
+	if (!fgets(buf, sizeof(buf), tunefile))
+	    fprintf(stderr, "Warning: error while reading the timestamp offset from the tunefile%s%s\n",
+		errno? ": ": "", errno? strerror(errno): "");
+
+	if (!fgets(buf, sizeof(buf), tunefile))
+	    fprintf(stderr, "Warning: error while reading the peak user count from the tunefile%s%s\n",
+		errno? ": ": "", errno? strerror(errno): "");
+	irccounts.me_max = atol(buf);
+	fclose(tunefile);
+}
+
+/** Rehash motd and rule files (motd_file/rules_file and all tld entries). */
+void rehash_motdrules()
+{
+ConfigItem_tld *tlds;
+
+	reread_motdsandrules();
+	for (tlds = conf_tld; tlds; tlds = tlds->next)
+	{
+		/* read_motd() accepts NULL in first arg and acts sanely */
+		read_motd(tlds->motd_file, &tlds->motd);
+		read_motd(tlds->rules_file, &tlds->rules);
+		read_motd(tlds->smotd_file, &tlds->smotd);
+		read_motd(tlds->opermotd_file, &tlds->opermotd);
+		read_motd(tlds->botmotd_file, &tlds->botmotd);
+	}
+}
+
+/** Rehash motd and rules (only the default files) */
+void reread_motdsandrules()
+{
+	read_motd(conf_files->motd_file, &motd);
+	read_motd(conf_files->rules_file, &rules);
+	read_motd(conf_files->smotd_file, &smotd);
+	read_motd(conf_files->botmotd_file, &botmotd);
+	read_motd(conf_files->opermotd_file, &opermotd);
+	read_motd(conf_files->svsmotd_file, &svsmotd);
+}
+
+extern void reinit_resolver(Client *client);
+
+/** REHASH command - reload configuration file on server(s).
+ * Syntax: see HELPOP REHASH
+ */
+CMD_FUNC(cmd_rehash)
+{
+	int x = 0;
+
+	/* This is one of the (few) commands that cannot be handled
+	 * by labeled-response accurately in all circumstances.
+	 */
+	labeled_response_inhibit = 1;
+
+	if (!ValidatePermissionsForPath("server:rehash",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if ((parc < 3) || BadPtr(parv[2])) {
+		/* If the argument starts with a '-' (like -motd, -opermotd, etc) then it's
+		 * assumed not to be a server. -- Syzop
+		 */
+		if (parv[1] && (parv[1][0] == '-'))
+			x = HUNTED_ISME;
+		else
+			x = hunt_server(client, recv_mtags, ":%s REHASH :%s", 1, parc, parv);
+	} else {
+		if (match_simple("-glob*", parv[1])) /* This is really ugly... hack to make /rehash -global -something work */
+		{
+			x = HUNTED_ISME;
+		} else {
+			x = hunt_server(client, NULL, ":%s REHASH %s :%s", 1, parc, parv);
+		}
+	}
+	if (x != HUNTED_ISME)
+		return; /* Now forwarded or server didnt exist */
+
+	if (MyUser(client) && IsWebsocket(client))
+	{
+		sendnotice(client, "Sorry, for technical reasons it is not possible to REHASH "
+		                 "the local server from a WebSocket connection.");
+		/* Issue details:
+		 * websocket_handle_packet -> process_packet -> parse_client_queued ->
+		 * dopacket -> parse -> cmd_rehash... and then 'websocket' is unloaded so
+		 * we "cannot get back" as that websocket_handle_packet function is gone.
+		 *
+		 * Solution would be either to delay the rehash or to make websocket perm.
+		 * The latter removes all our ability to upgrade the module on the fly
+		 * and the former is rather ugly.. not going to do that hassle now anyway.
+		 */
+		return;
+	}
+
+	if (!MyConnect(client))
+	{
+#ifndef REMOTE_REHASH
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+#endif
+		if (parv[2] == NULL)
+		{
+			if (loop.ircd_rehashing)
+			{
+				sendnotice(client, "A rehash is already in progress");
+				return;
+			}
+			sendto_umode_global(UMODE_OPER, "%s is remotely rehashing server %s config file", client->name, me.name);
+			remote_rehash_client = client;
+			reread_motdsandrules();
+			// TODO: clean this next line up, wtf man.
+			rehash(client, (parc > 1) ? ((*parv[1] == 'q') ? 2 : 0) : 0);
+			return;
+		}
+		parv[1] = parv[2];
+	} else {
+		/* Ok this is in an 'else' because it should be only executed for local clients,
+		 * but it's totally unrelated to the above ;).
+		 */
+		if (parv[1] && match_simple("-glob*", parv[1]))
+		{
+			/* /REHASH -global [options] */
+			Client *acptr;
+			
+			/* Shift parv's to the left */
+			parv[1] = parv[2];
+			parv[2] = NULL;
+			parc--;
+			/* Only netadmins may use /REHASH -global, which is because:
+			 * a) it makes sense
+			 * b) remote servers don't support remote rehashes by non-netadmins
+			 */
+			if (!ValidatePermissionsForPath("server:rehash",client,NULL,NULL,NULL))
+			{
+				sendnumeric(client, ERR_NOPRIVILEGES);
+				sendnotice(client, "'/REHASH -global' requires you to have server::rehash permissions");
+				return;
+			}
+			if (parv[1] && *parv[1] != '-')
+			{
+				sendnotice(client, "You cannot specify a server name after /REHASH -global, for obvious reasons");
+				return;
+			}
+			/* Broadcast it in an inefficient, but backwards compatible way. */
+			list_for_each_entry(acptr, &global_server_list, client_node)
+			{
+				if (acptr == &me)
+					continue;
+				sendto_one(acptr, NULL, ":%s REHASH %s %s",
+					client->name,
+					acptr->name,
+					parv[1] ? parv[1] : "-all");
+			}
+			/* Don't return, continue, because we need to REHASH ourselves as well. */
+		}
+	}
+
+	if (!BadPtr(parv[1]) && strcasecmp(parv[1], "-all"))
+	{
+
+		if (!ValidatePermissionsForPath("server:rehash",client,NULL,NULL,NULL))
+		{
+			sendnumeric(client, ERR_NOPRIVILEGES);
+			return;
+		}
+
+		if (*parv[1] == '-')
+		{
+			if (!strncasecmp("-gar", parv[1], 4))
+			{
+				loop.do_garbage_collect = 1;
+				RunHook2(HOOKTYPE_REHASHFLAG, client, parv[1]);
+				return;
+			}
+			if (!strncasecmp("-dns", parv[1], 4))
+			{
+				reinit_resolver(client);
+				return;
+			}
+			if (match_simple("-ssl*", parv[1]) || match_simple("-tls*", parv[1]))
+			{
+				reinit_ssl(client);
+				return;
+			}
+			if (match_simple("-o*motd", parv[1]))
+			{
+				if (MyUser(client))
+					sendto_ops("Rehashing OPERMOTD on request of %s", client->name);
+				else
+					sendto_umode_global(UMODE_OPER, "Remotely rehashing OPERMOTD on request of %s", client->name);
+				read_motd(conf_files->opermotd_file, &opermotd);
+				RunHook2(HOOKTYPE_REHASHFLAG, client, parv[1]);
+				return;
+			}
+			if (match_simple("-b*motd", parv[1]))
+			{
+				if (MyUser(client))
+					sendto_ops("Rehashing BOTMOTD on request of %s", client->name);
+				else
+					sendto_umode_global(UMODE_OPER, "Remotely rehashing BOTMOTD on request of %s", client->name);
+				read_motd(conf_files->botmotd_file, &botmotd);
+				RunHook2(HOOKTYPE_REHASHFLAG, client, parv[1]);
+				return;
+			}
+			if (!strncasecmp("-motd", parv[1], 5) || !strncasecmp("-rules", parv[1], 6))
+			{
+				if (MyUser(client))
+					sendto_ops("Rehashing all MOTDs and RULES on request of %s", client->name);
+				else
+					sendto_umode_global(UMODE_OPER, "Remotely rehasing all MOTDs and RULES on request of %s", client->name);
+				rehash_motdrules();
+				RunHook2(HOOKTYPE_REHASHFLAG, client, parv[1]);
+				return;
+			}
+			RunHook2(HOOKTYPE_REHASHFLAG, client, parv[1]);
+			return;
+		}
+	}
+	else
+	{
+		if (loop.ircd_rehashing)
+		{
+			sendnotice(client, "A rehash is already in progress");
+			return;
+		}
+		sendto_ops("%s is rehashing server config file", client->name);
+	}
+
+	/* Normal rehash, rehash motds&rules too, just like the on in the tld block will :p */
+	sendnumeric(client, RPL_REHASHING, configfile);
+	// TODO: fix next line - occurence #2
+	x = rehash(client, (parc > 1) ? ((*parv[1] == 'q') ? 2 : 0) : 0);
+	reread_motdsandrules();
+}
+
+/** RESTART command - restart the server (discouraged command)
+ * parv[1] - password *OR* reason if no drpass { } block exists
+ * parv[2] - reason for restart (optional & only if drpass block exists)
+ */
+CMD_FUNC(cmd_restart)
+{
+	char *reason = parv[1];
+	Client *acptr;
+
+	if (!MyUser(client))
+		return;
+
+	/* Check permissions */
+	if (!ValidatePermissionsForPath("server:restart",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	/* Syntax: /restart */
+	if (parc == 1)
+	{
+		if (conf_drpass)
+		{
+			sendnumeric(client, ERR_NEEDMOREPARAMS, "RESTART");
+			return;
+		}
+	} else
+	if (parc >= 2)
+	{
+		/* Syntax: /restart <pass> [reason] */
+		if (conf_drpass)
+		{
+			if (!Auth_Check(client, conf_drpass->restartauth, parv[1]))
+			{
+				sendnumeric(client, ERR_PASSWDMISMATCH);
+				return;
+			}
+			reason = parv[2];
+		}
+	}
+	sendto_ops("Server is Restarting by request of %s", client->name);
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		if (IsUser(acptr))
+			sendnotice(acptr, "Server Restarted by %s", client->name);
+		else if (IsServer(acptr))
+			sendto_one(acptr, NULL, ":%s ERROR :Restarted by %s: %s",
+			    me.name, get_client_name(client, TRUE), reason ? reason : "No reason");
+	}
+
+	server_reboot(reason ? reason : "No reason");
+}
+
+/** Send short message of the day to the client */
+void short_motd(Client *client)
+{
+       ConfigItem_tld *tld;
+       MOTDFile *themotd;
+       MOTDLine *motdline;
+       struct tm *tm;
+       char is_short;
+
+       tm = NULL;
+       is_short = 1;
+
+       tld = find_tld(client);
+
+       /*
+	* Try different sources of short MOTDs, falling back to the
+	* long MOTD.
+       */
+       themotd = &smotd;
+       if (tld && tld->smotd.lines)
+	       themotd = &tld->smotd;
+
+       /* try long MOTDs */
+       if (!themotd->lines)
+       {
+	       is_short = 0;
+	       if (tld && tld->motd.lines)
+		       themotd = &tld->motd;
+	       else
+		       themotd = &motd;
+       }
+
+       if (!themotd->lines)
+       {
+               sendnumeric(client, ERR_NOMOTD);
+               return;
+       }
+       if (themotd->last_modified.tm_year)
+       {
+	       tm = &themotd->last_modified; /* for readability */
+               sendnumeric(client, RPL_MOTDSTART, me.name);
+               sendnumericfmt(client, RPL_MOTD, ":- %d/%d/%d %d:%02d", tm->tm_mday, tm->tm_mon + 1,
+                   1900 + tm->tm_year, tm->tm_hour, tm->tm_min);
+       }
+       if (is_short)
+       {
+               sendnumeric(client, RPL_MOTD, "This is the short MOTD. To view the complete MOTD type /motd");
+               sendnumeric(client, RPL_MOTD, "");
+       }
+
+       motdline = NULL;
+       if (themotd)
+	       motdline = themotd->lines;
+       while (motdline)
+       {
+               sendnumeric(client, RPL_MOTD, motdline->line);
+               motdline = motdline->next;
+       }
+       sendnumeric(client, RPL_ENDOFMOTD);
+}
+
+/*
+ * A merge from ircu and bahamut, and some extra stuff added by codemastr
+ * we can now use 1 function for multiple files -- codemastr
+ * Merged read_motd/read_rules stuff into this -- Syzop
+ */
+
+/** Read motd-like file, used for rules/motd/botmotd/opermotd/etc.
+ *  Multiplexes to either directly reading the MOTD or downloading it asynchronously.
+ * @param filename Filename of file to read or URL. NULL is accepted and causes the *motd to be free()d.
+ * @param motd Reference to motd pointer (used for freeing if needed and for asynchronous remote MOTD support)
+ */
+void read_motd(const char *filename, MOTDFile *themotd)
+{
+#ifdef USE_LIBCURL
+	time_t modtime;
+	MOTDDownload *motd_download;
+#endif
+
+	/* TODO: if themotd points to a tld's motd,
+	   could a rehash disrupt this pointer?*/
+#ifdef USE_LIBCURL
+	if(themotd->motd_download)
+	{
+		themotd->motd_download->themotd = NULL;
+		/*
+		 * It is not our job to free() motd_download, the
+		 * read_motd_async_downloaded() function will do that
+		 * when it sees that ->themod == NULL.
+		 */
+		themotd->motd_download = NULL;
+	}
+
+	/* if filename is NULL, do_read_motd will catch it */
+	if(filename && url_is_valid(filename))
+	{
+		/* prepare our payload for read_motd_async_downloaded() */
+		motd_download = safe_alloc(sizeof(MOTDDownload));
+		motd_download->themotd = themotd;
+		themotd->motd_download = motd_download;
+
+		modtime = unreal_getfilemodtime(unreal_mkcache(filename));
+
+		download_file_async(filename, modtime, (vFP)read_motd_async_downloaded, motd_download);
+		return;
+	}
+#endif /* USE_LIBCURL */
+
+	do_read_motd(filename, themotd);
+
+	return;
+}
+
+#ifdef USE_LIBCURL
+/** Callback for download_file_async() called from read_motd() below.
+ * @param url the URL curl groked or NULL if the MOTD is stored locally.
+ * @param filename the path to the local copy of the MOTD or NULL if either cached=1 or there's an error.
+ * @param errorbuf NULL or an errorstring if there was an error while downloading the MOTD.
+ * @param cached 0 if the URL was downloaded freshly or 1 if the last download was canceled and the local copy should be used.
+ */
+void read_motd_async_downloaded(const char *url, const char *filename, const char *errorbuf, int cached, MOTDDownload *motd_download)
+{
+	MOTDFile *themotd;
+
+	themotd = motd_download->themotd;
+	/*
+	  check if the download was soft-canceled. See struct.h's docs on
+	  struct MOTDDownload for details.
+	*/
+	if(!themotd)
+	{
+		safe_free(motd_download);
+		return;
+	}
+
+	/* errors -- check for specialcached version if applicable */
+	if(!cached && !filename)
+	{
+		if(has_cached_version(url))
+		{
+			config_warn("Error downloading MOTD file from \"%s\": %s -- using cached version instead.", displayurl(url), errorbuf);
+			filename = unreal_mkcache(url);
+		} else {
+			config_error("Error downloading MOTD file from \"%s\": %s", displayurl(url), errorbuf);
+
+			/* remove reference to this chunk of memory about to be freed. */
+			motd_download->themotd->motd_download = NULL;
+			safe_free(motd_download);
+			return;
+		}
+	}
+
+	/*
+	 * We need to move our newly downloaded file to its cache file
+	 * if it isn't there already.
+	 */
+	if(!cached)
+	{
+		/* create specialcached version for later */
+		unreal_copyfileex(filename, unreal_mkcache(url), 1);
+	} else {
+		/*
+		 * The file is cached. Thus we must look for it at the
+		 * cache location where we placed it earlier.
+		 */
+		filename = unreal_mkcache(url);
+	}
+
+	do_read_motd(filename, themotd);
+	safe_free(motd_download);
+}
+#endif /* USE_LIBCURL */
+
+
+/** The actual reading of the MOTD - used by read_motd() and read_motd_async_downloaded()
+ */
+void do_read_motd(const char *filename, MOTDFile *themotd)
+{
+	FILE *fd;
+	struct tm *tm_tmp;
+	time_t modtime;
+
+	char line[512];
+	char *tmp;
+
+	MOTDLine *last, *temp;
+
+	free_motd(themotd);
+
+	if(!filename)
+		return;
+
+	fd = fopen(filename, "r");
+	if (!fd)
+		return;
+
+	/* record file modification time */
+	modtime = unreal_getfilemodtime(filename);
+	tm_tmp = localtime(&modtime);
+	memcpy(&themotd->last_modified, tm_tmp, sizeof(struct tm));
+
+	last = NULL;
+	while (fgets(line, sizeof(line), fd))
+	{
+		if ((tmp = strchr(line, '\n')))
+			*tmp = '\0';
+		if ((tmp = strchr(line, '\r')))
+			*tmp = '\0';
+		
+		if (strlen(line) > 510)
+			line[510] = '\0';
+
+		temp = safe_alloc(sizeof(MOTDLine));
+		safe_strdup(temp->line, line);
+
+		if(last)
+			last->next = temp;
+		else
+			/* handle the special case of the first line */
+			themotd->lines = temp;
+
+		last = temp;
+	}
+	/* the file could be zero bytes long? */
+	if(last)
+		last->next = NULL;
+
+	fclose(fd);
+	
+	return;
+}
+
+/** Free the contents of a MOTDFile structure.
+ * The MOTDFile structure itself should be statically
+ * allocated and deallocated. If the caller wants, it must
+ * manually free the MOTDFile structure itself.
+ */
+void free_motd(MOTDFile *themotd)
+{
+	MOTDLine *next, *motdline;
+
+	if(!themotd)
+		return;
+
+	for (motdline = themotd->lines; motdline; motdline = next)
+	{
+		next = motdline->next;
+		safe_free(motdline->line);
+		safe_free(motdline);
+	}
+
+	themotd->lines = NULL;
+	memset(&themotd->last_modified, '\0', sizeof(struct tm));
+
+#ifdef USE_LIBCURL
+	/* see struct.h for more information about motd_download */
+	themotd->motd_download = NULL;
+#endif
+}
+
+/** DIE command - terminate the server
+ * DIE [password]
+ */
+CMD_FUNC(cmd_die)
+{
+	Client *acptr;
+
+	if (!MyUser(client))
+		return;
+
+	if (!ValidatePermissionsForPath("server:die",client,NULL,NULL,NULL))
+	{
+		sendnumeric(client, ERR_NOPRIVILEGES);
+		return;
+	}
+
+	if (conf_drpass)	/* See if we have and DIE/RESTART password */
+	{
+		if (parc < 2)	/* And if so, require a password :) */
+		{
+			sendnumeric(client, ERR_NEEDMOREPARAMS, "DIE");
+			return;
+		}
+		if (!Auth_Check(client, conf_drpass->dieauth, parv[1]))
+		{
+			sendnumeric(client, ERR_PASSWDMISMATCH);
+			return;
+		}
+	}
+
+	/* Let the +s know what is going on */
+	sendto_ops("Server Terminating by request of %s", client->name);
+
+	list_for_each_entry(acptr, &lclient_list, lclient_node)
+	{
+		if (IsUser(acptr))
+			sendnotice(acptr, "Server Terminated by %s", 
+				client->name);
+		else if (IsServer(acptr))
+			sendto_one(acptr, NULL, ":%s ERROR :Terminated by %s",
+			    me.name, get_client_name(client, TRUE));
+	}
+
+	s_die();
+}
+
+/** Server list (network) of pending connections */
+PendingNet *pendingnet = NULL;
+
+/** Add server list (network) from 'client' connection */
+void add_pending_net(Client *client, char *str)
+{
+	PendingNet *net;
+	PendingServer *srv;
+	char *p, *name;
+
+	if (BadPtr(str) || !client)
+		return;
+
+	/* Allocate */
+	net = safe_alloc(sizeof(PendingNet));
+	net->client = client;
+
+	/* Fill in */
+	if (*str == '*')
+		str++;
+	for (name = strtoken(&p, str, ","); name; name = strtoken(&p, NULL, ","))
+	{
+		if (!*name)
+			continue;
+		
+		srv = safe_alloc(sizeof(PendingServer));
+		strlcpy(srv->sid, name, sizeof(srv->sid));
+		AddListItem(srv, net->servers);
+	}
+	
+	AddListItem(net, pendingnet);
+}
+
+/** Free server list (network) previously added by 'client' */
+void free_pending_net(Client *client)
+{
+	PendingNet *net, *net_next;
+	PendingServer *srv, *srv_next;
+	
+	for (net = pendingnet; net; net = net_next)
+	{
+		net_next = net->next;
+		if (net->client == client)
+		{
+			for (srv = net->servers; srv; srv = srv_next)
+			{
+				srv_next = srv->next;
+				safe_free(srv);
+			}
+			DelListItem(net, pendingnet);
+			safe_free(net);
+			/* Don't break, there can be multiple objects */
+		}
+	}
+}
+
+/** Find SID in any server list (network) that is pending, except 'exempt' */
+PendingNet *find_pending_net_by_sid_butone(char *sid, Client *exempt)
+{
+	PendingNet *net;
+	PendingServer *srv;
+
+	if (BadPtr(sid))
+		return NULL;
+
+	for (net = pendingnet; net; net = net->next)
+	{
+		if (net->client == exempt)
+			continue;
+		for (srv = net->servers; srv; srv = srv->next)
+			if (!strcmp(srv->sid, sid))
+				return net;
+	}
+	return NULL;
+}
+
+/** Search the pending connections list for any identical sids */
+Client *find_pending_net_duplicates(Client *cptr, Client **srv, char **sid)
+{
+	PendingNet *net, *other;
+	PendingServer *s;
+
+	*srv = NULL;
+	*sid = NULL;
+	
+	for (net = pendingnet; net; net = net->next)
+	{
+		if (net->client != cptr)
+			continue;
+		/* Ok, found myself */
+		for (s = net->servers; s; s = s->next)
+		{
+			char *curr_sid = s->sid;
+			other = find_pending_net_by_sid_butone(curr_sid, cptr);
+			if (other)
+			{
+				*srv = net->client;
+				*sid = s->sid;
+				return other->client; /* Found another (pending) server with identical numeric */
+			}
+		}
+	}
+	
+	return NULL;
+}
+
+/** Like find_pending_net_duplicates() but the other way around? Eh.. */
+Client *find_non_pending_net_duplicates(Client *client)
+{
+	PendingNet *net;
+	PendingServer *s;
+	Client *acptr;
+
+	for (net = pendingnet; net; net = net->next)
+	{
+		if (net->client != client)
+			continue;
+		/* Ok, found myself */
+		for (s = net->servers; s; s = s->next)
+		{
+			acptr = find_server(s->sid, NULL);
+			if (acptr)
+				return acptr; /* Found another (fully CONNECTED) server with identical numeric */
+		}
+	}
+	
+	return NULL;
+}
+
+/** Parse CHANMODES= in PROTOCTL */
+void parse_chanmodes_protoctl(Client *client, char *str)
+{
+	char *modes, *p;
+	char copy[256];
+
+	strlcpy(copy, str, sizeof(copy));
+
+	modes = strtoken(&p, copy, ",");
+	if (modes)
+	{
+		safe_strdup(client->serv->features.chanmodes[0], modes);
+		modes = strtoken(&p, NULL, ",");
+		if (modes)
+		{
+			safe_strdup(client->serv->features.chanmodes[1], modes);
+			modes = strtoken(&p, NULL, ",");
+			if (modes)
+			{
+				safe_strdup(client->serv->features.chanmodes[2], modes);
+				modes = strtoken(&p, NULL, ",");
+				if (modes)
+				{
+					safe_strdup(client->serv->features.chanmodes[3], modes);
+				}
+			}
+		}
+	}
+}
+
+static char previous_langsinuse[512];
+static int previous_langsinuse_ready = 0;
+
+/** Check the nick character system (set::allowed-nickchars) for changes.
+ * If there are changes, then we broadcast the new PROTOCTL NICKCHARS= to all servers.
+ */
+void charsys_check_for_changes(void)
+{
+	char *langsinuse = charsys_get_current_languages();
+	/* already called by charsys_finish() */
+	safe_strdup(me.serv->features.nickchars, langsinuse);
+
+	if (!previous_langsinuse_ready)
+	{
+		previous_langsinuse_ready = 1;
+		strlcpy(previous_langsinuse, langsinuse, sizeof(previous_langsinuse));
+		return; /* not booted yet. then we are done here. */
+	}
+
+	if (strcmp(langsinuse, previous_langsinuse))
+	{
+		ircd_log(LOG_ERROR, "Permitted nick characters changed at runtime: %s -> %s",
+			previous_langsinuse, langsinuse);
+		sendto_realops("Permitted nick characters changed at runtime: %s -> %s",
+			previous_langsinuse, langsinuse);
+		/* Broadcast change to all (locally connected) servers */
+		sendto_server(NULL, 0, 0, NULL, "PROTOCTL NICKCHARS=%s", langsinuse);
+	}
+
+	strlcpy(previous_langsinuse, langsinuse, sizeof(previous_langsinuse));
+}
+
+/** Check if supplied server name is valid, that is: does not contain forbidden characters etc */
+int valid_server_name(char *name)
+{
+	char *p;
+
+	if (strlen(name) >= HOSTLEN)
+		return 0;
+
+	for (p = name; *p; p++)
+		if ((*p <= ' ') || (*p > '~'))
+			return 0;
+
+	if (!strchr(name, '.'))
+		return 0;
+
+	return 1;
+}
+
+/** Check if the supplied name is a valid SID, as in: syntax. */
+int valid_sid(char *name)
+{
+	if (strlen(name) != 3)
+		return 0;
+	if (!isdigit(*name))
+		return 0;
+	if (!isdigit(name[1]) && !isupper(name[1]))
+		return 0;
+	if (!isdigit(name[2]) && !isupper(name[2]))
+		return 0;
+	return 1;
+}
+
+/** Initialize the TKL subsystem */
+void tkl_init(void)
+{
+	memset(tklines, 0, sizeof(tklines));
+	memset(tklines_ip_hash, 0, sizeof(tklines_ip_hash));
+}
diff --git a/src/socket.c b/src/socket.c
new file mode 100644
index 0000000..d8b549a
--- /dev/null
+++ b/src/socket.c
@@ -0,0 +1,1534 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/socket.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Socket functions such as reading, writing, connecting.
+ *
+ * The actual data parsing functions (for incoming data) are in
+ * src/parse.c.
+ */
+
+#include "unrealircd.h"
+#include "dns.h"
+
+int OpenFiles = 0;    /* GLOBAL - number of files currently open */
+int readcalls = 0;
+
+void completed_connection(int, int, void *);
+void set_sock_opts(int, Client *, int);
+void set_ipv6_opts(int);
+void close_listener(ConfigItem_listen *listener);
+static char readbuf[BUFSIZE];
+char zlinebuf[BUFSIZE];
+extern char *version;
+MODVAR time_t last_allinuse = 0;
+
+#ifdef USE_LIBCURL
+extern void url_do_transfers_async(void);
+#endif
+
+void start_of_normal_client_handshake(Client *client);
+void proceed_normal_client_handshake(Client *client, struct hostent *he);
+
+/** Close all connections - only used when we terminate the server (eg: /DIE or SIGTERM) */
+void close_connections(void)
+{
+	Client *client;
+
+	list_for_each_entry(client, &lclient_list, lclient_node)
+	{
+		if (client->local->fd >= 0)
+		{
+			fd_close(client->local->fd);
+			client->local->fd = -2;
+		}
+	}
+
+	list_for_each_entry(client, &unknown_list, lclient_node)
+	{
+		if (client->local->fd >= 0)
+		{
+			fd_close(client->local->fd);
+			client->local->fd = -2;
+		}
+
+		if (client->local->authfd >= 0)
+		{
+			fd_close(client->local->authfd);
+			client->local->fd = -1;
+		}
+	}
+
+	close_unbound_listeners();
+
+	OpenFiles = 0;
+
+#ifdef _WIN32
+	WSACleanup();
+#endif
+}
+
+/** Report an error to the log and also send to all local opers.
+ * @param text		Format string for outputting the error.
+ *			It must contain only two '%s'. The first
+ *			one is replaced by the sockhost from the
+ *			client, and the latter will be the error
+ *			message from strerror(errno).
+ * @param client	The client - ALWAYS locally connected.
+ */
+void report_error(char *text, Client *client)
+{
+	int errtmp = ERRNO, origerr = ERRNO;
+	char *host, xbuf[256];
+	int  err, len = sizeof(err), n;
+	
+	host = (client) ? get_client_name(client, FALSE) : "";
+
+	Debug((DEBUG_ERROR, text, host, STRERROR(errtmp)));
+
+	/*
+	 * Get the *real* error from the socket (well try to anyway..).
+	 * This may only work when SO_DEBUG is enabled but its worth the
+	 * gamble anyway.
+	 */
+#ifdef	SO_ERROR
+	if (client && !IsMe(client) && client->local->fd >= 0)
+		if (!getsockopt(client->local->fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len))
+			if (err)
+				errtmp = err;
+#endif
+	if (origerr != errtmp) {
+		/* Socket error is different than original error,
+		 * some tricks are needed because of 2x strerror() (or at least
+		 * according to the man page) -- Syzop.
+		 */
+		snprintf(xbuf, 200, "[syserr='%s'", STRERROR(origerr));
+		n = strlen(xbuf);
+		snprintf(xbuf+n, 256-n, ", sockerr='%s']", STRERROR(errtmp));
+		sendto_snomask(SNO_JUNK, text, host, xbuf);
+		ircd_log(LOG_ERROR, text, host, xbuf);
+	} else {
+		sendto_snomask(SNO_JUNK, text, host, STRERROR(errtmp));
+		ircd_log(LOG_ERROR, text,host,STRERROR(errtmp));
+	}
+	return;
+}
+
+/** Report a BAD error to the log and also send to all local opers.
+ * TODO: Document the difference between report_error() and report_baderror()
+ * @param text		Format string for outputting the error.
+ *			It must contain only two '%s'. The first
+ *			one is replaced by the sockhost from the
+ *			client, and the latter will be the error
+ *			message from strerror(errno).
+ * @param client	The client - ALWAYS locally connected.
+ */
+void report_baderror(char *text, Client *client)
+{
+#ifndef _WIN32
+	int  errtmp = errno;	/* debug may change 'errno' */
+#else
+	int  errtmp = WSAGetLastError();	/* debug may change 'errno' */
+#endif
+	char *host;
+	int  err, len = sizeof(err);
+
+	host = (client) ? get_client_name(client, FALSE) : "";
+
+	Debug((DEBUG_ERROR, text, host, STRERROR(errtmp)));
+
+	/*
+	 * Get the *real* error from the socket (well try to anyway..).
+	 * This may only work when SO_DEBUG is enabled but its worth the
+	 * gamble anyway.
+	 */
+#ifdef	SO_ERROR
+	if (client && !IsMe(client) && client->local->fd >= 0)
+		if (!getsockopt(client->local->fd, SOL_SOCKET, SO_ERROR, (void *)&err, &len))
+			if (err)
+				errtmp = err;
+#endif
+	sendto_umode(UMODE_OPER, text, host, STRERROR(errtmp));
+	ircd_log(LOG_ERROR, text, host, STRERROR(errtmp));
+	return;
+}
+
+/** Accept an incoming connection.
+ * @param listener_fd	The file descriptor of a listen() socket.
+ * @param data		The listen { } block configuration data.
+ */
+static void listener_accept(int listener_fd, int revents, void *data)
+{
+	ConfigItem_listen *listener = data;
+	int cli_fd;
+
+	if ((cli_fd = fd_accept(listener->fd)) < 0)
+	{
+		if ((ERRNO != P_EWOULDBLOCK) && (ERRNO != P_ECONNABORTED))
+		{
+			/* Trouble! accept() returns a strange error.
+			 * Previously in such a case we would just log/broadcast the error and return,
+			 * causing this message to be triggered at a rate of XYZ per second (100% CPU).
+			 * Now we close & re-start the listener.
+			 * Of course the underlying cause of this issue should be investigated, as this
+			 * is very much a workaround.
+			 */
+			report_baderror("Cannot accept connections %s:%s", NULL);
+			sendto_realops("[BUG] Restarting listener on %s:%d due to fatal errors (see previous message)", listener->ip, listener->port);
+			close_listener(listener);
+			start_listeners();
+		}
+		return;
+	}
+
+	ircstats.is_ac++;
+
+	set_sock_opts(cli_fd, NULL, listener->ipv6);
+
+	if ((++OpenFiles >= maxclients) || (cli_fd >= maxclients))
+	{
+		ircstats.is_ref++;
+		if (last_allinuse < TStime() - 15)
+		{
+			sendto_ops_and_log("All connections in use. ([@%s/%u])", listener->ip, listener->port);
+			last_allinuse = TStime();
+		}
+
+		(void)send(cli_fd, "ERROR :All connections in use\r\n", 31, 0);
+
+		fd_close(cli_fd);
+		--OpenFiles;
+		return;
+	}
+
+	/* add_connection() may fail. we just don't care. */
+	add_connection(listener, cli_fd);
+}
+
+/** Create a listener port.
+ * @param listener	The listen { } block configuration
+ * @param ip		IP address to bind on
+ * @param port		Port to bind on
+ * @param ipv6		IPv6 (1) or IPv4 (0)
+ * @returns 0 on success and <0 on error. Yeah, confusing.
+ */
+int unreal_listen(ConfigItem_listen *listener, char *ip, int port, int ipv6)
+{
+	if (BadPtr(ip))
+		ip = "*";
+	
+	if (*ip == '*')
+	{
+		if (ipv6)
+			ip = "::";
+		else
+			ip = "0.0.0.0";
+	}
+
+	/* At first, open a new socket */
+	if (listener->fd >= 0)
+		abort(); /* Socket already exists but we are asked to create and listen on one. Bad! */
+	
+	if (port == 0)
+		abort(); /* Impossible as well, right? */
+
+	listener->fd = fd_socket(ipv6 ? AF_INET6 : AF_INET, SOCK_STREAM, 0, "Listener socket");
+	if (listener->fd < 0)
+	{
+		report_baderror("Cannot open stream socket() %s:%s", NULL);
+		return -1;
+	}
+
+	if (++OpenFiles >= maxclients)
+	{
+		sendto_ops_and_log("No more connections allowed (%s)", listener->ip);
+		fd_close(listener->fd);
+		listener->fd = -1;
+		--OpenFiles;
+		return -1;
+	}
+
+	set_sock_opts(listener->fd, NULL, ipv6);
+
+	if (!unreal_bind(listener->fd, ip, port, ipv6))
+	{
+		char buf[512];
+		ircsnprintf(buf, sizeof(buf), "Error binding stream socket to IP %s port %d", ip, port);
+		strlcat(buf, " - %s:%s", sizeof(buf));
+		report_baderror(buf, NULL);
+		fd_close(listener->fd);
+		listener->fd = -1;
+		--OpenFiles;
+		return -1;
+	}
+
+	if (listen(listener->fd, LISTEN_SIZE) < 0)
+	{
+		report_error("listen failed for %s:%s", NULL);
+		fd_close(listener->fd);
+		listener->fd = -1;
+		--OpenFiles;
+		return -1;
+	}
+
+#ifdef TCP_DEFER_ACCEPT
+	if (listener->options & LISTENER_DEFER_ACCEPT)
+	{
+		int yes = 1;
+
+		(void)setsockopt(listener->fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &yes, sizeof(int));
+	}
+#endif
+
+#ifdef SO_ACCEPTFILTER
+	if (listener->options & LISTENER_DEFER_ACCEPT)
+	{
+		struct accept_filter_arg afa;
+
+		memset(&afa, '\0', sizeof afa);
+		strlcpy(afa.af_name, "dataready", sizeof afa.af_name);
+		(void)setsockopt(listener->fd, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof afa);
+	}
+#endif
+
+	fd_setselect(listener->fd, FD_SELECT_READ, listener_accept, listener);
+
+	return 0;
+}
+
+/** Activate a listen { } block */
+int add_listener(ConfigItem_listen *conf)
+{
+	if (unreal_listen(conf, conf->ip, conf->port, conf->ipv6))
+	{
+		/* Error is already handled upstream */
+		conf->fd = -2;
+	}
+
+	if (conf->fd >= 0)
+	{
+		conf->options |= LISTENER_BOUND;
+		return 1;
+	}
+	else
+	{
+		conf->fd = -1;
+		return -1;
+	}
+}
+
+/** Close the listener socket, but do not free it (yet).
+ * This will only close the socket so no new clients are accepted.
+ * It also marks the listener as no longer "bound".
+ * Once the last client exits the listener will actually be freed.
+ * @param listener	The listen { } block.
+ */
+void close_listener(ConfigItem_listen *listener)
+{
+	if (listener->fd >= 0)
+	{
+		ircd_log(LOG_ERROR, "IRCd no longer listening on %s:%d (%s)%s",
+			listener->ip, listener->port,
+			listener->ipv6 ? "IPv6" : "IPv4",
+			listener->options & LISTENER_TLS ? " (SSL/TLS)" : "");
+		fd_close(listener->fd);
+		--OpenFiles;
+	}
+
+	listener->options &= ~LISTENER_BOUND;
+	listener->fd = -1;
+	/* We can already free the SSL/TLS context, since it is only
+	 * used for new connections, which we no longer accept.
+	 */
+	if (listener->ssl_ctx)
+	{
+		SSL_CTX_free(listener->ssl_ctx);
+		listener->ssl_ctx = NULL;
+	}
+}
+
+/** Close all listeners that were pending to be closed. */
+void close_unbound_listeners(void)
+{
+	ConfigItem_listen *aconf, *aconf_next;
+
+	/* close all 'extra' listening ports we have */
+	for (aconf = conf_listen; aconf != NULL; aconf = aconf_next)
+	{
+		aconf_next = aconf->next;
+		if (aconf->flag.temporary)
+			close_listener(aconf);
+	}
+}
+
+int maxclients = 1024 - CLIENTS_RESERVE;
+
+/** Check the maximum number of sockets (users) that we can handle - called on startup.
+ */
+void check_user_limit(void)
+{
+#ifdef RLIMIT_FD_MAX
+	struct rlimit limit;
+	long m;
+
+	if (!getrlimit(RLIMIT_FD_MAX, &limit))
+	{
+		if (limit.rlim_max < MAXCONNECTIONS)
+			m = limit.rlim_max;
+		else
+			m = MAXCONNECTIONS;
+
+		/* Adjust soft limit (if necessary, which is often the case) */
+		if (m != limit.rlim_cur)
+		{
+			limit.rlim_cur = limit.rlim_max = m;
+			if (setrlimit(RLIMIT_FD_MAX, &limit) == -1)
+			{
+				/* HACK: if it's mac os X then don't error... */
+#ifndef OSXTIGER
+				fprintf(stderr, "error setting maximum number of open files to %ld\n",
+					(long)limit.rlim_cur);
+				exit(-1);
+#endif // OSXTIGER
+			}
+		}
+		/* This can only happen if it is due to resource limits (./Config already rejects <100) */
+		if (m < 100)
+		{
+			fprintf(stderr, "\nERROR: Your OS has a limit placed on this account.\n"
+			                "This machine only allows UnrealIRCd to handle a maximum of %ld open connections/files, which is VERY LOW.\n"
+			                "Please check with your system administrator to bump this limit.\n"
+			                "The recommended ulimit -n setting is at least 1024 and "
+			                "preferably 4096.\n"
+			                "Note that this error is often seen on small web shells that are not meant for running IRC servers.\n",
+			                m);
+			exit(-1);
+		}
+		maxclients = m - CLIENTS_RESERVE;
+	}
+#endif // RLIMIT_FD_MAX
+
+#ifndef _WIN32
+#ifdef BACKEND_SELECT
+	if (MAXCONNECTIONS > FD_SETSIZE)
+	{
+		fprintf(stderr, "MAXCONNECTIONS (%d) is higher than FD_SETSIZE (%d)\n", MAXCONNECTIONS, FD_SETSIZE);
+		fprintf(stderr, "You should not see this error on Linux or FreeBSD\n");
+		fprintf(stderr, "You might need to recompile the IRCd and answer a lower value to the MAXCONNECTIONS question in ./Config\n");
+		exit(-1);
+	}
+#endif
+#endif
+#ifdef _WIN32
+	maxclients = MAXCONNECTIONS - CLIENTS_RESERVE;
+#endif
+}
+
+/** Initialize some systems - called on startup */
+void init_sys(void)
+{
+#ifndef _WIN32
+	/* Create new session / set process group */
+	(void)setsid();
+#endif
+
+	init_resolver(1);
+	return;
+}
+
+/** Replace a file descriptor (*NIX only).
+ * See close_std_descriptors() as for why.
+ * @param oldfd: the old FD to close and re-use
+ * @param name: descriptive string of the old fd, eg: "stdin".
+ * @param mode: an open() mode, such as O_WRONLY.
+ */
+void replacefd(int oldfd, char *name, int mode)
+{
+#ifndef _WIN32
+	int newfd = open("/dev/null", mode);
+	if (newfd < 0)
+	{
+		fprintf(stderr, "Warning: could not open /dev/null\n");
+		return;
+	}
+	if (oldfd < 0)
+	{
+		fprintf(stderr, "Warning: could not replace %s (invalid fd)\n", name);
+		return;
+	}
+	if (dup2(newfd, oldfd) < 0)
+	{
+		fprintf(stderr, "Warning: could not replace %s (dup2 error)\n", name);
+		return;
+	}
+#endif
+}
+
+/** Mass close standard file descriptors (stdin, stdout, stderr).
+ * We used to really just close them here (or in init_sys() actually),
+ * making the fd's available for other purposes such as internet sockets.
+ * For safety we now dup2() them to /dev/null. This in case someone
+ * accidentally does a fprintf(stderr,..) somewhere in the code or some
+ * library outputs error messages to stderr (such as libc with heap
+ * errors). We don't want any IRC client to receive such a thing!
+ */
+void close_std_descriptors(void)
+{
+#if !defined(_WIN32) && !defined(NOCLOSEFD)
+	replacefd(fileno(stdin), "stdin", O_RDONLY);
+	replacefd(fileno(stdout), "stdout", O_WRONLY);
+	replacefd(fileno(stderr), "stderr", O_WRONLY);
+#endif
+}
+
+/** Write PID file */
+void write_pidfile(void)
+{
+#ifdef IRCD_PIDFILE
+	int fd;
+	char buff[20];
+	if ((fd = open(conf_files->pid_file, O_CREAT | O_WRONLY, 0600)) < 0)
+	{
+		ircd_log(LOG_ERROR, "Error writing to pid file %s: %s", conf_files->pid_file, strerror(ERRNO));
+		return;
+	}
+	ircsnprintf(buff, sizeof(buff), "%5d\n", (int)getpid());
+	if (write(fd, buff, strlen(buff)) < 0)
+		ircd_log(LOG_ERROR, "Error writing to pid file %s: %s", conf_files->pid_file, strerror(ERRNO));
+	if (close(fd) < 0)
+		ircd_log(LOG_ERROR, "Error writing to pid file %s: %s", conf_files->pid_file, strerror(ERRNO));
+#endif
+}
+
+/** Reject an insecure (outgoing) server link that isn't SSL/TLS.
+ * This function is void and not int because it can be called from other void functions
+ */
+void reject_insecure_server(Client *client)
+{
+	sendto_umode(UMODE_OPER, "Could not link with server %s with SSL/TLS enabled. "
+	                         "Please check logs on the other side of the link. "
+	                         "If you insist with insecure linking then you can set link::options::outgoing::insecure "
+	                         "(NOT recommended!).",
+	                         client->name);
+	dead_socket(client, "Rejected link without SSL/TLS");
+}
+
+/** Start server handshake - called after the outgoing connection has been established.
+ * @param client	The remote server
+ */
+void start_server_handshake(Client *client)
+{
+	ConfigItem_link *aconf = client->serv ? client->serv->conf : NULL;
+
+	if (!aconf)
+	{
+		/* Should be impossible. */
+		sendto_ops_and_log("Lost configuration for %s in start_server_handshake()", get_client_name(client, FALSE));
+		return;
+	}
+
+	RunHook(HOOKTYPE_SERVER_HANDSHAKE_OUT, client);
+
+	sendto_one(client, NULL, "PASS :%s", (aconf->auth->type == AUTHTYPE_PLAINTEXT) ? aconf->auth->data : "*");
+
+	send_protoctl_servers(client, 0);
+	send_proto(client, aconf);
+	/* Sending SERVER message moved to cmd_protoctl, so it's send after the first PROTOCTL
+	 * that we receive from the remote server. -- Syzop
+	 */
+}
+
+/** Do an ident lookup if necessary.
+ * @param client	The incoming client
+ */
+void consider_ident_lookup(Client *client)
+{
+	char buf[BUFSIZE];
+
+	/* If ident checking is disabled or it's an outgoing connect, then no ident check */
+	if ((IDENT_CHECK == 0) || (client->serv && IsHandshake(client)))
+	{
+		ClearIdentLookupSent(client);
+		ClearIdentLookup(client);
+		return;
+	}
+	RunHook(HOOKTYPE_IDENT_LOOKUP, client);
+
+	return;
+}
+
+
+/** Called when TCP/IP connection is established (outgoing server connect) */
+void completed_connection(int fd, int revents, void *data)
+{
+	Client *client = data;
+	ConfigItem_link *aconf = client->serv ? client->serv->conf : NULL;
+
+	if (IsHandshake(client))
+	{
+		/* Due to delayed ircd_SSL_connect call */
+		start_server_handshake(client);
+		fd_setselect(fd, FD_SELECT_READ, read_packet, client);
+		return;
+	}
+
+	SetHandshake(client);
+
+	if (!aconf)
+	{
+		sendto_ops_and_log("Lost configuration for %s", get_client_name(client, FALSE));
+		return;
+	}
+
+	if (!client->local->ssl && !(aconf->outgoing.options & CONNECT_INSECURE))
+	{
+		sendto_one(client, NULL, "STARTTLS");
+	} else
+	{
+		start_server_handshake(client);
+	}
+
+	if (!IsDeadSocket(client))
+		consider_ident_lookup(client);
+
+	fd_setselect(fd, FD_SELECT_READ, read_packet, client);
+}
+
+/** Close the physical connection.
+ * @param client	The client connection to close (LOCAL!)
+ */
+void close_connection(Client *client)
+{
+	/* This function must make MyConnect(client) == FALSE,
+	 * and set client->direction == NULL.
+	 */
+	if (IsServer(client))
+	{
+		ircstats.is_sv++;
+		ircstats.is_sbs += client->local->sendB;
+		ircstats.is_sbr += client->local->receiveB;
+		ircstats.is_sks += client->local->sendK;
+		ircstats.is_skr += client->local->receiveK;
+		ircstats.is_sti += TStime() - client->local->firsttime;
+		if (ircstats.is_sbs > 1023)
+		{
+			ircstats.is_sks += (ircstats.is_sbs >> 10);
+			ircstats.is_sbs &= 0x3ff;
+		}
+		if (ircstats.is_sbr > 1023)
+		{
+			ircstats.is_skr += (ircstats.is_sbr >> 10);
+			ircstats.is_sbr &= 0x3ff;
+		}
+	}
+	else if (IsUser(client))
+	{
+		ircstats.is_cl++;
+		ircstats.is_cbs += client->local->sendB;
+		ircstats.is_cbr += client->local->receiveB;
+		ircstats.is_cks += client->local->sendK;
+		ircstats.is_ckr += client->local->receiveK;
+		ircstats.is_cti += TStime() - client->local->firsttime;
+		if (ircstats.is_cbs > 1023)
+		{
+			ircstats.is_cks += (ircstats.is_cbs >> 10);
+			ircstats.is_cbs &= 0x3ff;
+		}
+		if (ircstats.is_cbr > 1023)
+		{
+			ircstats.is_ckr += (ircstats.is_cbr >> 10);
+			ircstats.is_cbr &= 0x3ff;
+		}
+	}
+	else
+		ircstats.is_ni++;
+
+	/*
+	 * remove outstanding DNS queries.
+	 */
+	unrealdns_delreq_bycptr(client);
+
+	if (client->local->authfd >= 0)
+	{
+		fd_close(client->local->authfd);
+		client->local->authfd = -1;
+		--OpenFiles;
+	}
+
+	if (client->local->fd >= 0)
+	{
+		send_queued(client);
+		if (IsTLS(client) && client->local->ssl) {
+			SSL_set_shutdown(client->local->ssl, SSL_RECEIVED_SHUTDOWN);
+			SSL_smart_shutdown(client->local->ssl);
+			SSL_free(client->local->ssl);
+			client->local->ssl = NULL;
+		}
+		fd_close(client->local->fd);
+		client->local->fd = -2;
+		--OpenFiles;
+		DBufClear(&client->local->sendQ);
+		DBufClear(&client->local->recvQ);
+
+	}
+
+	client->direction = NULL;
+}
+
+/** Set IPv6 socket options, if possible. */
+void set_ipv6_opts(int fd)
+{
+#if defined(IPV6_V6ONLY)
+	int opt = 1;
+	(void)setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&opt, sizeof(opt));
+#endif
+}
+
+/** This sets the *OS* socket buffers.
+ * Note that setting these high is not always a good idea.
+ * For example for regular users we keep the receive buffer tight
+ * so we detect a high receive queue (Excess Flood) properly.
+ * See include/fdlist.h for more information
+ */
+void set_socket_buffers(int fd, int rcvbuf, int sndbuf)
+{
+	int opt;
+
+	opt = rcvbuf;
+	setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (void *)&opt, sizeof(opt));
+
+	opt = sndbuf;
+	setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (void *)&opt, sizeof(opt));
+}
+
+/** Set the appropriate socket options */
+void set_sock_opts(int fd, Client *client, int ipv6)
+{
+	int opt;
+
+	if (ipv6)
+		set_ipv6_opts(fd);
+#ifdef SO_REUSEADDR
+	opt = 1;
+	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)) < 0)
+			report_error("setsockopt(SO_REUSEADDR) %s:%s", client);
+#endif
+#if defined(SO_USELOOPBACK) && !defined(_WIN32)
+	opt = 1;
+	if (setsockopt(fd, SOL_SOCKET, SO_USELOOPBACK, (void *)&opt, sizeof(opt)) < 0)
+		report_error("setsockopt(SO_USELOOPBACK) %s:%s", client);
+#endif
+	set_socket_buffers(fd, USER_SOCKET_RECEIVE_BUFFER, USER_SOCKET_SEND_BUFFER);
+	/* Set to non blocking: */
+#if !defined(_WIN32)
+	if ((opt = fcntl(fd, F_GETFL, 0)) == -1)
+	{
+		if (client)
+		{
+			report_error("fcntl(fd, F_GETFL) failed for %s:%s", client);
+		}
+	}
+	else if (fcntl(fd, F_SETFL, opt | O_NONBLOCK) == -1)
+	{
+		if (client)
+		{
+			report_error("fcntl(fd, F_SETL, nonb) failed for %s:%s", client);
+		}
+	}
+#else
+	opt = 1;
+	if (ioctlsocket(fd, FIONBIO, &opt) < 0)
+	{
+		if (client)
+		{
+			report_error("ioctlsocket(fd,FIONBIO) failed for %s:%s", client);
+		}
+	}
+#endif
+}
+
+/** Returns 1 if using a loopback IP (127.0.0.1) or
+ * using a local IP number on the same machine (effectively the same;
+ * no network traffic travels outside this machine).
+ * @param ip	The IP address to check
+ * @returns 1 if loopback, 0 if not.
+ */
+int is_loopback_ip(char *ip)
+{
+	ConfigItem_listen *e;
+
+	if (!strcmp(ip, "127.0.0.1") || !strcmp(ip, "0:0:0:0:0:0:0:1") || !strcmp(ip, "0:0:0:0:0:ffff:127.0.0.1"))
+		return 1;
+
+	for (e = conf_listen; e; e = e->next)
+	{
+		if ((e->options & LISTENER_BOUND) && !strcmp(ip, e->ip))
+			return 1;
+	}
+	return 0;
+}
+
+/** Retrieve the remote IP address and port of a socket.
+ * @param client	Client to check
+ * @param fd		File descriptor
+ * @param port		Remote port (will be written)
+ * @returns The IP address
+ */
+char *getpeerip(Client *client, int fd, int *port)
+{
+	static char ret[HOSTLEN+1];
+
+	if (IsIPV6(client))
+	{
+		struct sockaddr_in6 addr;
+		int len = sizeof(addr);
+
+		if (getpeername(fd, (struct sockaddr *)&addr, &len) < 0)
+			return NULL;
+		*port = ntohs(addr.sin6_port);
+		return inetntop(AF_INET6, &addr.sin6_addr.s6_addr, ret, sizeof(ret));
+	} else
+	{
+		struct sockaddr_in addr;
+		int len = sizeof(addr);
+
+		if (getpeername(fd, (struct sockaddr *)&addr, &len) < 0)
+			return NULL;
+		*port = ntohs(addr.sin_port);
+		return inetntop(AF_INET, &addr.sin_addr.s_addr, ret, sizeof(ret));
+	}
+}
+
+/** This checks set::max-unknown-connections-per-ip,
+ * which is an important safety feature.
+ */
+static int check_too_many_unknown_connections(Client *client)
+{
+	int cnt = 1;
+	Client *c;
+
+	if (!find_tkl_exception(TKL_CONNECT_FLOOD, client))
+	{
+		list_for_each_entry(c, &unknown_list, lclient_node)
+		{
+			if (!strcmp(client->ip,GetIP(c)))
+			{
+				cnt++;
+				if (cnt > iConf.max_unknown_connections_per_ip)
+					return 1;
+			}
+		}
+	}
+
+	return 0;
+}
+
+/** Process the incoming connection which has just been accepted.
+ * This creates a client structure for the user.
+ * The sockhost field is initialized with the ip# of the host.
+ * The client is added to the linked list of clients but isnt added to any
+ * hash tables yuet since it doesnt have a name.
+ * @param listener	The listen { } block on which the client was accepted.
+ * @param fd		The file descriptor of the client
+ * @returns The new client, or NULL in case of trouble.
+ * @note  When NULL is returned, the client at socket 'fd' will be
+ *        closed by this function and OpenFiles is adjusted appropriately.
+ */
+Client *add_connection(ConfigItem_listen *listener, int fd)
+{
+	Client *client;
+	char *ip;
+	int port = 0;
+	
+	client = make_client(NULL, &me);
+
+	/* If listener is IPv6 then mark client (client) as IPv6 */
+	if (listener->ipv6)
+		SetIPV6(client);
+
+	ip = getpeerip(client, fd, &port);
+	
+	if (!ip)
+	{
+		/* On Linux 2.4 and FreeBSD the socket may just have been disconnected
+		 * so it's not a serious error and can happen quite frequently -- Syzop
+		 */
+		if (ERRNO != P_ENOTCONN)
+		{
+			report_error("Failed to accept new client %s :%s", client);
+		}
+refuse_client:
+			ircstats.is_ref++;
+			client->local->fd = -2;
+			free_client(client);
+			fd_close(fd);
+			--OpenFiles;
+			return NULL;
+	}
+
+	/* Fill in sockhost & ip ASAP */
+	set_sockhost(client, ip);
+	safe_strdup(client->ip, ip);
+	client->local->port = port;
+	client->local->fd = fd;
+
+	/* Tag loopback connections */
+	if (is_loopback_ip(client->ip))
+	{
+		ircstats.is_loc++;
+		SetLocalhost(client);
+	}
+
+	/* Check set::max-unknown-connections-per-ip */
+	if (check_too_many_unknown_connections(client))
+	{
+		ircsnprintf(zlinebuf, sizeof(zlinebuf),
+		            "ERROR :Closing Link: [%s] (Too many unknown connections from your IP)\r\n",
+		            client->ip);
+		(void)send(fd, zlinebuf, strlen(zlinebuf), 0);
+		goto refuse_client;
+	}
+
+	/* Check (G)Z-Lines and set::anti-flood::connect-flood */
+	if (check_banned(client, NO_EXIT_CLIENT))
+		goto refuse_client;
+
+	client->local->listener = listener;
+	if (client->local->listener != NULL)
+		client->local->listener->clients++;
+	add_client_to_list(client);
+
+	irccounts.unknown++;
+	client->status = CLIENT_STATUS_UNKNOWN;
+
+	list_add(&client->lclient_node, &unknown_list);
+
+	if ((listener->options & LISTENER_TLS) && ctx_server)
+	{
+		SSL_CTX *ctx = listener->ssl_ctx ? listener->ssl_ctx : ctx_server;
+
+		if (ctx)
+		{
+			SetTLSAcceptHandshake(client);
+			Debug((DEBUG_DEBUG, "Starting TLS accept handshake for %s", client->local->sockhost));
+			if ((client->local->ssl = SSL_new(ctx)) == NULL)
+			{
+				goto refuse_client;
+			}
+			SetTLS(client);
+			SSL_set_fd(client->local->ssl, fd);
+			SSL_set_nonblocking(client->local->ssl);
+			SSL_set_ex_data(client->local->ssl, ssl_client_index, client);
+			if (!ircd_SSL_accept(client, fd))
+			{
+				Debug((DEBUG_DEBUG, "Failed TLS accept handshake in instance 1: %s", client->local->sockhost));
+				SSL_set_shutdown(client->local->ssl, SSL_RECEIVED_SHUTDOWN);
+				SSL_smart_shutdown(client->local->ssl);
+				SSL_free(client->local->ssl);
+				goto refuse_client;
+			}
+		}
+	}
+	else
+		start_of_normal_client_handshake(client);
+	return client;
+}
+
+static int dns_special_flag = 0; /* This is for an "interesting" race condition  very ugly. */
+
+/** Start of normal client handshake - DNS and ident lookups, etc.
+ * @param client	The client
+ * @note This is called directly after accept() -> add_connection() for plaintext.
+ *       For SSL/TLS connections this is called after the SSL/TLS handshake is completed.
+ */
+void start_of_normal_client_handshake(Client *client)
+{
+	struct hostent *he;
+
+	client->status = CLIENT_STATUS_UNKNOWN; /* reset, to be sure (TLS handshake has ended) */
+
+	RunHook(HOOKTYPE_HANDSHAKE, client);
+
+	if (!DONT_RESOLVE)
+	{
+		if (should_show_connect_info(client))
+			sendto_one(client, NULL, ":%s %s", me.name, REPORT_DO_DNS);
+		dns_special_flag = 1;
+		he = unrealdns_doclient(client);
+		dns_special_flag = 0;
+
+		if (client->local->hostp)
+			goto doauth; /* Race condition detected, DNS has been done, continue with auth */
+
+		if (!he)
+		{
+			/* Resolving in progress */
+			SetDNSLookup(client);
+		} else {
+			/* Host was in our cache */
+			client->local->hostp = he;
+			if (should_show_connect_info(client))
+				sendto_one(client, NULL, ":%s %s", me.name, REPORT_FIN_DNSC);
+		}
+	}
+
+doauth:
+	consider_ident_lookup(client);
+	fd_setselect(client->local->fd, FD_SELECT_READ, read_packet, client);
+}
+
+/** Called when DNS lookup has been completed and we can proceed with the client handshake.
+ * @param client	The client
+ * @param he		The resolved or unresolved host
+ */
+void proceed_normal_client_handshake(Client *client, struct hostent *he)
+{
+	ClearDNSLookup(client);
+	client->local->hostp = he;
+	if (should_show_connect_info(client))
+	{
+		sendto_one(client, NULL, ":%s %s",
+		           me.name,
+		           client->local->hostp ? REPORT_FIN_DNS : REPORT_FAIL_DNS);
+	}
+}
+
+/** Read a packet from a client.
+ * @param fd		File descriptor
+ * @param revents	Read events (ignored)
+ * @param data		Associated data (the client)
+ */
+void read_packet(int fd, int revents, void *data)
+{
+	Client *client = data;
+	int length = 0;
+	time_t now = TStime();
+	Hook *h;
+	int processdata;
+
+	/* Don't read from dead sockets */
+	if (IsDeadSocket(client))
+	{
+		fd_setselect(fd, FD_SELECT_READ, NULL, client);
+		return;
+	}
+
+	SET_ERRNO(0);
+
+	fd_setselect(fd, FD_SELECT_READ, read_packet, client);
+	/* Restore handling of writes towards send_queued_cb(), since
+	 * it may be overwritten in an earlier call to read_packet(),
+	 * to handle (SSL) writes by read_packet(), see below under
+	 * SSL_ERROR_WANT_WRITE.
+	 */
+	fd_setselect(fd, FD_SELECT_WRITE, send_queued_cb, client);
+
+	while (1)
+	{
+		if (IsTLS(client) && client->local->ssl != NULL)
+		{
+			length = SSL_read(client->local->ssl, readbuf, sizeof(readbuf));
+
+			if (length < 0)
+			{
+				int err = SSL_get_error(client->local->ssl, length);
+
+				switch (err)
+				{
+				case SSL_ERROR_WANT_WRITE:
+					fd_setselect(fd, FD_SELECT_READ, NULL, client);
+					fd_setselect(fd, FD_SELECT_WRITE, read_packet, client);
+					length = -1;
+					SET_ERRNO(P_EWOULDBLOCK);
+					break;
+				case SSL_ERROR_WANT_READ:
+					fd_setselect(fd, FD_SELECT_READ, read_packet, client);
+					length = -1;
+					SET_ERRNO(P_EWOULDBLOCK);
+					break;
+				case SSL_ERROR_SYSCALL:
+					break;
+				case SSL_ERROR_SSL:
+					if (ERRNO == P_EAGAIN)
+						break;
+				default:
+					/*length = 0;
+					SET_ERRNO(0);
+					^^ why this? we should error. -- todo: is errno correct?
+					*/
+					break;
+				}
+			}
+		}
+		else
+			length = recv(client->local->fd, readbuf, sizeof(readbuf), 0);
+
+		if (length <= 0)
+		{
+			if (length < 0 && ((ERRNO == P_EWOULDBLOCK) || (ERRNO == P_EAGAIN) || (ERRNO == P_EINTR)))
+				return;
+
+			if (IsServer(client) || client->serv) /* server or outgoing connection */
+			{
+				sendto_umode_global(UMODE_OPER, "Lost connection to %s: Read error",
+					get_client_name(client, FALSE));
+				ircd_log(LOG_ERROR, "Lost connection to %s: Read error",
+					get_client_name(client, FALSE));
+			}
+
+			exit_client(client, NULL, "Read error");
+			return;
+		}
+
+		client->local->lasttime = now;
+		if (client->local->lasttime > client->local->since)
+			client->local->since = client->local->lasttime;
+		/* FIXME: Is this correct? I have my doubts. */
+		ClearPingSent(client);
+
+		ClearPingWarning(client);
+
+		processdata = 1;
+		for (h = Hooks[HOOKTYPE_RAWPACKET_IN]; h; h = h->next)
+		{
+			processdata = (*(h->func.intfunc))(client, readbuf, &length);
+			if (processdata < 0)
+				return;
+		}
+
+		if (processdata && !process_packet(client, readbuf, length, 0))
+			return;
+
+		/* bail on short read! */
+		if (length < sizeof(readbuf))
+			return;
+	}
+}
+
+/** Process input from clients that may have been deliberately delayed due to fake lag */
+void process_clients(void)
+{
+	Client *client;
+        
+	/* Problem:
+	 * When processing a client, that current client may exit due to eg QUIT.
+	 * Similarly, current->next may be killed due to /KILL.
+	 * When a client is killed, in the past we were not allowed to touch it anymore
+	 * so that was a bit problematic. Now we can touch current->next, but it may
+	 * have been removed from the lclient_list or unknown_list.
+	 * In other words, current->next->next may be NULL even though there are more
+	 * clients on the list.
+	 * This is why the whole thing is wrapped in an additional do { } while() loop
+	 * to make sure we re-run the list if we ended prematurely.
+	 * We could use some kind of 'tagging' to mark already processed clients.
+	 * However, parse_client_queued() already takes care not to read (fake) lagged
+	 * clients, and we don't actually read/recv anything in the meantime, so clients
+	 * in the beginning of the list won't benefit, they won't get higher prio.
+	 * Another alternative is not to run the loop again, but that WOULD be
+	 * unfair to clients later in the list which wouldn't be processed then
+	 * under a heavy (kill) load scenario.
+	 * I think the chosen solution is best, though it remains silly. -- Syzop
+	 */
+
+	do {
+		list_for_each_entry(client, &lclient_list, lclient_node)
+		{
+			if ((client->local->fd >= 0) && DBufLength(&client->local->recvQ) && !IsDead(client))
+			{
+				parse_client_queued(client);
+				if (IsDead(client))
+					break;
+			}
+		}
+	} while(&client->lclient_node != &lclient_list);
+
+	do {
+		list_for_each_entry(client, &unknown_list, lclient_node)
+		{
+			if ((client->local->fd >= 0) && DBufLength(&client->local->recvQ) && !IsDead(client))
+			{
+				parse_client_queued(client);
+				if (IsDead(client) || (client->status > CLIENT_STATUS_UNKNOWN))
+					break;
+			}
+		}
+	} while(&client->lclient_node != &unknown_list);
+}
+
+/** Returns 4 if 'str' is a valid IPv4 address
+ * and 6 if 'str' is a valid IPv6 IP address.
+ * Zero (0) is returned in any other case (eg: hostname).
+ */
+int is_valid_ip(char *str)
+{
+	char scratch[64];
+	
+	if (inet_pton(AF_INET, str, scratch) == 1)
+		return 4; /* IPv4 */
+	
+	if (inet_pton(AF_INET6, str, scratch) == 1)
+		return 6; /* IPv6 */
+	
+	return 0; /* not an IP address */
+}
+
+static int connect_server_helper(ConfigItem_link *, Client *);
+
+/** Start an outgoing connection to a server, for server linking.
+ * @param aconf		Configuration attached to this server
+ * @param by		The user initiating the connection (can be NULL)
+ * @param hp		The address to connect to.
+ * @returns <0 on error, 0 on success. Rather confusing.
+ */
+int connect_server(ConfigItem_link *aconf, Client *by, struct hostent *hp)
+{
+	Client *client;
+
+#ifdef DEBUGMODE
+	sendto_realops("connect_server() called with aconf %p, refcount: %d, TEMP: %s",
+		aconf, aconf->refcount, aconf->flag.temporary ? "YES" : "NO");
+#endif
+
+	if (!aconf->outgoing.hostname)
+		return -1; /* This is an incoming-only link block. Caller shouldn't call us. */
+		
+	if (!hp)
+	{
+		/* Remove "cache" */
+		safe_free(aconf->connect_ip);
+	}
+	/*
+	 * If we dont know the IP# for this host and itis a hostname and
+	 * not a ip# string, then try and find the appropriate host record.
+	 */
+	if (!aconf->connect_ip)
+	{
+		if (is_valid_ip(aconf->outgoing.hostname))
+		{
+			/* link::outgoing::hostname is an IP address. No need to resolve host. */
+			safe_strdup(aconf->connect_ip, aconf->outgoing.hostname);
+		} else
+		{
+			/* It's a hostname, let the resolver look it up. */
+			int ipv4_explicit_bind = 0;
+
+			if (aconf->outgoing.bind_ip && (is_valid_ip(aconf->outgoing.bind_ip) == 4))
+				ipv4_explicit_bind = 1;
+			
+			/* We need this 'aconf->refcount++' or else there's a race condition between
+			 * starting resolving the host and the result of the resolver (we could
+			 * REHASH in that timeframe) leading to an invalid (freed!) 'aconf'.
+			 * -- Syzop, bug #0003689.
+			 */
+			aconf->refcount++;
+			unrealdns_gethostbyname_link(aconf->outgoing.hostname, aconf, ipv4_explicit_bind);
+			return -2;
+		}
+	}
+	client = make_client(NULL, &me);
+	client->local->hostp = hp;
+	/*
+	 * Copy these in so we have something for error detection.
+	 */
+	strlcpy(client->name, aconf->servername, sizeof(client->name));
+	strlcpy(client->local->sockhost, aconf->outgoing.hostname, HOSTLEN + 1);
+
+	if (!connect_server_helper(aconf, client))
+	{
+		int errtmp = ERRNO;
+		report_error("Connect to host %s failed: %s", client);
+		if (by && IsUser(by) && !MyUser(by))
+			sendnotice(by, "*** Connect to host %s failed.", client->name);
+		fd_close(client->local->fd);
+		--OpenFiles;
+		client->local->fd = -2;
+		free_client(client);
+		SET_ERRNO(errtmp);
+		if (ERRNO == P_EINTR)
+			SET_ERRNO(P_ETIMEDOUT);
+		return -1;
+	}
+	/* The socket has been connected or connect is in progress. */
+	make_server(client);
+	client->serv->conf = aconf;
+	client->serv->conf->refcount++;
+#ifdef DEBUGMODE
+	sendto_realops("connect_server() CONTINUED (%s:%d), aconf %p, refcount: %d, TEMP: %s",
+		__FILE__, __LINE__, aconf, aconf->refcount, aconf->flag.temporary ? "YES" : "NO");
+#endif
+	Debug((DEBUG_ERROR, "reference count for %s (%s) is now %d",
+		client->name, client->serv->conf->servername, client->serv->conf->refcount));
+	if (by && IsUser(by))
+		strlcpy(client->serv->by, by->name, sizeof(client->serv->by));
+	else
+		strlcpy(client->serv->by, "AutoConn.", sizeof client->serv->by);
+	client->serv->up = me.name;
+	SetConnecting(client);
+	SetOutgoing(client);
+	irccounts.unknown++;
+	list_add(&client->lclient_node, &unknown_list);
+	set_sockhost(client, aconf->outgoing.hostname);
+	add_client_to_list(client);
+
+	if (aconf->outgoing.options & CONNECT_TLS)
+	{
+		SetTLSConnectHandshake(client);
+		fd_setselect(client->local->fd, FD_SELECT_WRITE, ircd_SSL_client_handshake, client);
+	}
+	else
+		fd_setselect(client->local->fd, FD_SELECT_WRITE, completed_connection, client);
+
+	return 0;
+}
+
+/** Helper function for connect_server() to prepare the actual bind()'ing and connect().
+ * @param aconf		Configuration entry of the server.
+ * @param client	The client entry that we will use and fill in.
+ * @returns 1 on success, 0 on failure.
+ */
+static int connect_server_helper(ConfigItem_link *aconf, Client *client)
+{
+	char *bindip;
+	char buf[BUFSIZE];
+
+	if (!aconf->connect_ip)
+		return 0; /* handled upstream or shouldn't happen */
+	
+	if (strchr(aconf->connect_ip, ':'))
+		SetIPV6(client);
+	
+	safe_strdup(client->ip, aconf->connect_ip);
+	
+	snprintf(buf, sizeof buf, "Outgoing connection: %s", get_client_name(client, TRUE));
+	client->local->fd = fd_socket(IsIPV6(client) ? AF_INET6 : AF_INET, SOCK_STREAM, 0, buf);
+	if (client->local->fd < 0)
+	{
+		if (ERRNO == P_EMFILE)
+		{
+			sendto_realops("opening stream socket to server %s: No more sockets",
+				get_client_name(client, TRUE));
+			return 0;
+		}
+		report_baderror("opening stream socket to server %s:%s", client);
+		return 0;
+	}
+	if (++OpenFiles >= maxclients)
+	{
+		sendto_ops_and_log("No more connections allowed (%s)", client->name);
+		return 0;
+	}
+
+	set_sockhost(client, aconf->outgoing.hostname);
+
+	if (!aconf->outgoing.bind_ip && iConf.link_bindip)
+		bindip = iConf.link_bindip;
+	else
+		bindip = aconf->outgoing.bind_ip;
+
+	if (bindip && strcmp("*", bindip))
+	{
+		if (!unreal_bind(client->local->fd, bindip, 0, IsIPV6(client)))
+		{
+			report_baderror("Error binding to local port for %s:%s -- "
+			                "Your link::outgoing::bind-ip is probably incorrect.", client);
+			return 0;
+		}
+	}
+
+	set_sock_opts(client->local->fd, client, IsIPV6(client));
+
+	return unreal_connect(client->local->fd, client->ip, aconf->outgoing.port, IsIPV6(client));
+}
+
+/** Checks if the system is IPv6 capable.
+ * IPv6 is always available at compile time (libs, headers), but the OS may
+ * not have IPv6 enabled (or ipv6 kernel module not loaded). So we better check..
+ */
+int ipv6_capable(void)
+{
+	int s = socket(AF_INET6, SOCK_STREAM, 0);
+	if (s < 0)
+		return 0; /* NO ipv6 */
+	
+	CLOSE_SOCK(s);
+	return 1; /* YES */
+}
+
+/** Attempt to deliver data to a client.
+ * This function is only called from send_queued() and will deal
+ * with sending to the SSL/TLS or plaintext connection.
+ * @param cptr The client
+ * @param str  The string to send
+ * @param len  The length of the string
+ * @param want_read In case of SSL/TLS it may happen that SSL_write()
+ *                  needs to READ data. If this happens then this
+ *                  function will set *want_read to 1.
+ *                  The upper layer should then call us again when
+ *                  there is data ready to be READ.
+ * @retval <0  Some fatal error occurred, (but not EWOULDBLOCK).
+ *             This return is a request to close the socket and
+ *             clean up the link.
+ * @retval >=0 No real error occurred, returns the number of
+ *             bytes actually transferred. EWOULDBLOCK and other
+ *             possibly similar conditions should be mapped to
+ *             zero return. Upper level routine will have to
+ *             decide what to do with those unwritten bytes...
+ */
+int deliver_it(Client *client, char *str, int len, int *want_read)
+{
+	int  retval;
+
+	*want_read = 0;
+
+	if (IsDeadSocket(client) || (!IsServer(client) && !IsUser(client)
+	    && !IsHandshake(client) 
+	    && !IsTLSHandshake(client)
+ 
+	    && !IsUnknown(client)))
+	{
+		str[len] = '\0';
+		sendto_ops
+		    ("* * * DEBUG ERROR * * * !!! Calling deliver_it() for %s, status %d %s, with message: %s",
+		    client->name, client->status, IsDeadSocket(client) ? "DEAD" : "", str);
+		return -1;
+	}
+
+	if (IsTLS(client) && client->local->ssl != NULL)
+	{
+		retval = SSL_write(client->local->ssl, str, len);
+
+		if (retval < 0)
+		{
+			switch (SSL_get_error(client->local->ssl, retval))
+			{
+			case SSL_ERROR_WANT_READ:
+				SET_ERRNO(P_EWOULDBLOCK);
+				*want_read = 1;
+				return 0;
+			case SSL_ERROR_WANT_WRITE:
+				SET_ERRNO(P_EWOULDBLOCK);
+				break;
+			case SSL_ERROR_SYSCALL:
+				break;
+			case SSL_ERROR_SSL:
+				if (ERRNO == P_EAGAIN)
+					break;
+				/* FALLTHROUGH */
+			default:
+				return -1; /* hm.. why was this 0?? we have an error! */
+			}
+		}
+	}
+	else
+		retval = send(client->local->fd, str, len, 0);
+	/*
+	   ** Convert WOULDBLOCK to a return of "0 bytes moved". This
+	   ** should occur only if socket was non-blocking. Note, that
+	   ** all is Ok, if the 'write' just returns '0' instead of an
+	   ** error and errno=EWOULDBLOCK.
+	   **
+	   ** ...now, would this work on VMS too? --msa
+	 */
+# ifndef _WIN32
+	if (retval < 0 && (errno == EWOULDBLOCK || errno == EAGAIN ||
+	    errno == ENOBUFS))
+# else
+		if (retval < 0 && (WSAGetLastError() == WSAEWOULDBLOCK ||
+		    WSAGetLastError() == WSAENOBUFS))
+# endif
+			retval = 0;
+
+	if (retval > 0)
+	{
+		client->local->sendB += retval;
+		me.local->sendB += retval;
+		if (client->local->sendB > 1023)
+		{
+			client->local->sendK += (client->local->sendB >> 10);
+			client->local->sendB &= 0x03ff;	/* 2^10 = 1024, 3ff = 1023 */
+		}
+		if (me.local->sendB > 1023)
+		{
+			me.local->sendK += (me.local->sendB >> 10);
+			me.local->sendB &= 0x03ff;
+		}
+	}
+
+	return (retval);
+}
+
+/** Initiate an outgoing connection, the actual connect() call. */
+int unreal_connect(int fd, char *ip, int port, int ipv6)
+{
+	int n;
+	
+	if (ipv6)
+	{
+		struct sockaddr_in6 server;
+		memset(&server, 0, sizeof(server));
+		server.sin6_family = AF_INET6;
+		inet_pton(AF_INET6, ip, &server.sin6_addr);
+		server.sin6_port = htons(port);
+		n = connect(fd, (struct sockaddr *)&server, sizeof(server));
+	} else {
+		struct sockaddr_in server;
+		memset(&server, 0, sizeof(server));
+		server.sin_family = AF_INET;
+		inet_pton(AF_INET, ip, &server.sin_addr);
+		server.sin_port = htons(port);
+		n = connect(fd, (struct sockaddr *)&server, sizeof(server));
+	}
+
+#ifndef _WIN32
+	if (n < 0 && (errno != EINPROGRESS))
+#else
+	if (n < 0 && (WSAGetLastError() != WSAEINPROGRESS) && (WSAGetLastError() != WSAEWOULDBLOCK))
+#endif
+	{
+		return 0; /* FATAL ERROR */
+	}
+	
+	return 1; /* SUCCESS (probably still in progress) */
+}
+
+/** Bind to an IP/port (port may be 0 for auto).
+ * @returns 0 on failure, other on success.
+ */
+int unreal_bind(int fd, char *ip, int port, int ipv6)
+{
+	if (ipv6)
+	{
+		struct sockaddr_in6 server;
+		memset(&server, 0, sizeof(server));
+		server.sin6_family = AF_INET6;
+		server.sin6_port = htons(port);
+		if (inet_pton(AF_INET6, ip, &server.sin6_addr.s6_addr) != 1)
+			return 0;
+		return !bind(fd, (struct sockaddr *)&server, sizeof(server));
+	} else {
+		struct sockaddr_in server;
+		memset(&server, 0, sizeof(server));
+		server.sin_family = AF_INET;
+		server.sin_port = htons(port);
+		if (inet_pton(AF_INET, ip, &server.sin_addr.s_addr) != 1)
+			return 0;
+		return !bind(fd, (struct sockaddr *)&server, sizeof(server));
+	}
+}
diff --git a/src/support.c b/src/support.c
new file mode 100644
index 0000000..a4196a7
--- /dev/null
+++ b/src/support.c
@@ -0,0 +1,1306 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/support.c
+ *   Copyright (C) 1990, 1991 Armin Gruner
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief Functions that don't always exist on every OS are provided here.
+ * That was the original idea, anyway. Right now it also contains some
+ * functions that should probably be in src/misc.c instead.
+ * In any case, most functions here don't have any special meaning
+ * specific for IRC, they could just as well be used in non-IRC code.
+ */
+
+/* support.c 2.21 4/13/94 1990, 1991 Armin Gruner; 1992, 1993 Darren Reed */
+
+#include "unrealircd.h"
+
+extern void outofmemory();
+
+#define is_enabled match
+
+/** Convert integer to string */
+char *my_itoa(int i)
+{
+	static char buf[128];
+	ircsnprintf(buf, sizeof(buf), "%d", i);
+	return buf;
+}
+
+/** Walk through a string of tokens, using a set of separators.
+ * @param save	Pointer used for saving between calls
+ * @param str	String to parse (will be altered!)
+ * @param fs	Separator character(s)
+ * @returns substring (token)
+ * @note This function works similar to (but not identical?) to strtok_r().
+ * @section Ex1 Example
+ * @code
+ * for (name = strtoken(&p, buf, ","); name; name = strtoken(&p, NULL, ","))
+ * {
+ *      ircd_log(LOG_ERROR, "Got: %s", name);
+ * }
+ * @endcode
+ */
+char *strtoken(char **save, char *str, char *fs)
+{
+	char *pos, *tmp;
+
+	if (str)
+		pos = str;	/* new string scan */
+	else
+		pos = *save; /* keep last position across calls */
+
+	while (pos && *pos && strchr(fs, *pos) != NULL)
+		pos++;		/* skip leading separators */
+
+	if (!pos || !*pos)
+		return (pos = *save = NULL);	/* string contains only sep's */
+
+	tmp = pos;		/* now, keep position of the token */
+
+	while (*pos && strchr(fs, *pos) == NULL)
+		pos++;		/* skip content of the token */
+
+	if (*pos)
+		*pos++ = '\0';	/* remove first sep after the token */
+	else
+		pos = NULL;	/* end of string */
+
+	*save = pos;
+	return (tmp);
+}
+
+/** Convert binary address to an IP string - like inet_ntop but will always return the uncompressed IPv6 form.
+ * @param af	Address family (AF_INET, AF_INET6)
+ * @param in	Address (binary)
+ * @param out	Buffer to use for storing the returned IP string
+ * @param size	Size of the 'out' buffer
+ * @returns IP address as a string (IPv4 or IPv6, in case of the latter:
+ *          always the uncompressed form without ::)
+ */
+char *inetntop(int af, const void *in, char *out, size_t size)
+{
+	char tmp[MYDUMMY_SIZE];
+
+	inet_ntop(af, in, tmp, size);
+	if (!strstr(tmp, "::"))
+	{
+		/* IPv4 or IPv6 that is already uncompressed */
+		strlcpy(out, tmp, size);
+	} else
+	{
+		char cnt = 0, *cp = tmp, *op = out;
+
+		/* It's an IPv6 compressed address that we need to expand */
+		while (*cp)
+		{
+			if (*cp == ':')
+				cnt += 1;
+			if (*cp++ == '.')
+			{
+				cnt += 1;
+				break;
+			}
+		}
+		cp = tmp;
+		while (*cp)
+		{
+			*op++ = *cp++;
+			if (*(cp - 1) == ':' && *cp == ':')
+			{
+				if ((cp - 1) == tmp)
+				{
+					op--;
+					*op++ = '0';
+					*op++ = ':';
+				}
+
+				*op++ = '0';
+				while (cnt++ < 7)
+				{
+					*op++ = ':';
+					*op++ = '0';
+				}
+			}
+		}
+		if (*(op - 1) == ':')
+			*op++ = '0';
+		*op = '\0';
+		Debug((DEBUG_DNS, "Expanding `%s' -> `%s'", tmp, out));
+	}
+	return out;
+}
+
+/** Cut string off at the first occurance of CR or LF */
+void stripcrlf(char *c)
+{
+	for (; *c; c++)
+	{
+		if ((*c == '\n') || (*c == '\r'))
+		{
+			*c = '\0';
+			return;
+		}
+	}
+}
+
+#ifndef HAVE_STRLCPY
+/** BSD'ish strlcpy().
+ * The strlcpy() function copies up to size-1 characters from the
+ * NUL-terminated string src to dst, NUL-terminating the result.
+ * Return: total length of the string tried to create.
+ */
+size_t strlcpy(char *dst, const char *src, size_t size)
+{
+	size_t len = strlen(src);
+	size_t ret = len;
+
+	if (size <= 0)
+		return 0;
+	if (len >= size)
+		len = size - 1;
+	memcpy(dst, src, len);
+	dst[len] = 0;
+
+	return ret;
+}
+#endif
+
+#ifndef HAVE_STRLCAT
+/* BSD'ish strlcat().
+ * The strlcat() function appends the NUL-terminated string src to the end of
+ * dst. It will append at most size - strlen(dst) - 1 bytes, NUL-terminating
+ * the result.
+ */
+size_t strlcat(char *dst, const char *src, size_t size)
+{
+	size_t len1 = strlen(dst);
+	size_t len2 = strlen(src);
+	size_t ret = len1 + len2;
+
+	if (size <= len1)
+		return size;
+	if (len1 + len2 >= size)
+		len2 = size - (len1 + 1);
+
+	if (len2 > 0) {
+		memcpy(dst + len1, src, len2);
+		dst[len1 + len2] = 0;
+	}
+	
+	return ret;
+}
+#endif
+
+#ifndef HAVE_STRLNCAT
+/** BSD'ish strlncat() - similar to strlcat but never cat more then n characters.
+ */
+size_t strlncat(char *dst, const char *src, size_t size, size_t n)
+{
+	size_t len1 = strlen(dst);
+	size_t len2 = strlen(src);
+	size_t ret = len1 + len2;
+
+	if (size <= len1)
+		return size;
+		
+	if (len2 > n)
+		len2 = n;
+
+	if (len1 + len2 >= size)
+		len2 = size - (len1 + 1);
+
+	if (len2 > 0) {
+		memcpy(dst + len1, src, len2);
+		dst[len1 + len2] = 0;
+	}
+
+	return ret;
+}
+#endif
+
+/** Copies a string and ensure the new buffer is at most 'max' size, including NUL.
+ * The syntax is pretty much identical to strlcpy() except that
+ * the buffer is newly allocated.
+ * If you wonder why not use strndup() instead?
+ * I feel that mixing code with strlcpy() and strndup() would be
+ * rather confusing since strlcpy() assumes buffer size INCLUDING
+ * the nul byte and strndup() assumes WITHOUT the nul byte and
+ * will write one character extra. Hence this strldup(). -- Syzop
+ */
+char *strldup(const char *src, size_t max)
+{
+	char *ptr;
+	int n;
+
+	if ((max == 0) || !src)
+		return NULL;
+
+	n = strlen(src);
+	if (n > max-1)
+		n = max-1;
+
+	ptr = safe_alloc(n+1);
+	memcpy(ptr, src, n);
+	ptr[n] = '\0';
+
+	return ptr;
+}
+
+static const char Base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+static const char Pad64 = '=';
+
+/* (From RFC1521 and draft-ietf-dnssec-secext-03.txt)
+   The following encoding technique is taken from RFC 1521 by Borenstein
+   and Freed.  It is reproduced here in a slightly edited form for
+   convenience.
+
+   A 65-character subset of US-ASCII is used, enabling 6 bits to be
+   represented per printable character. (The extra 65th character, "=",
+   is used to signify a special processing function.)
+
+   The encoding process represents 24-bit groups of input bits as output
+   strings of 4 encoded characters. Proceeding from left to right, a
+   24-bit input group is formed by concatenating 3 8-bit input groups.
+   These 24 bits are then treated as 4 concatenated 6-bit groups, each
+   of which is translated into a single digit in the base64 alphabet.
+
+   Each 6-bit group is used as an index into an array of 64 printable
+   characters. The character referenced by the index is placed in the
+   output string.
+
+                         Table 1: The Base64 Alphabet
+
+      Value Encoding  Value Encoding  Value Encoding  Value Encoding
+          0 A            17 R            34 i            51 z
+          1 B            18 S            35 j            52 0
+          2 C            19 T            36 k            53 1
+          3 D            20 U            37 l            54 2
+          4 E            21 V            38 m            55 3
+          5 F            22 W            39 n            56 4
+          6 G            23 X            40 o            57 5
+          7 H            24 Y            41 p            58 6
+          8 I            25 Z            42 q            59 7
+          9 J            26 a            43 r            60 8
+         10 K            27 b            44 s            61 9
+         11 L            28 c            45 t            62 +
+         12 M            29 d            46 u            63 /
+         13 N            30 e            47 v
+         14 O            31 f            48 w         (pad) =
+         15 P            32 g            49 x
+         16 Q            33 h            50 y
+
+   Special processing is performed if fewer than 24 bits are available
+   at the end of the data being encoded.  A full encoding quantum is
+   always completed at the end of a quantity.  When fewer than 24 input
+   bits are available in an input group, zero bits are added (on the
+   right) to form an integral number of 6-bit groups.  Padding at the
+   end of the data is performed using the '=' character.
+
+   Since all base64 input is an integral number of octets, only the
+         -------------------------------------------------                       
+   following cases can arise:
+   
+       (1) the final quantum of encoding input is an integral
+           multiple of 24 bits; here, the final unit of encoded
+	   output will be an integral multiple of 4 characters
+	   with no "=" padding,
+       (2) the final quantum of encoding input is exactly 8 bits;
+           here, the final unit of encoded output will be two
+	   characters followed by two "=" padding characters, or
+       (3) the final quantum of encoding input is exactly 16 bits;
+           here, the final unit of encoded output will be three
+	   characters followed by one "=" padding character.
+   */
+
+/** Base64 encode data.
+ * @param src		The data to encode (input)
+ * @param srclength	The length of the data to encode (input length)
+ * @param target	The output buffer to use (output)
+ * @param targetsize	The length of the output buffer to use (maximum output length)
+ * @returns length of the targetsize, or -1 in case of error.
+ */
+int b64_encode(unsigned char const *src, size_t srclength, char *target, size_t targsize)
+{
+	size_t datalength = 0;
+	u_char input[3];
+	u_char output[4];
+	size_t i;
+
+	while (2 < srclength) {
+		input[0] = *src++;
+		input[1] = *src++;
+		input[2] = *src++;
+		srclength -= 3;
+
+		output[0] = input[0] >> 2;
+		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
+		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
+		output[3] = input[2] & 0x3f;
+
+		if (datalength + 4 > targsize)
+			return (-1);
+		target[datalength++] = Base64[output[0]];
+		target[datalength++] = Base64[output[1]];
+		target[datalength++] = Base64[output[2]];
+		target[datalength++] = Base64[output[3]];
+	}
+    
+	/* Now we worry about padding. */
+	if (0 != srclength) {
+		/* Get what's left. */
+		input[0] = input[1] = input[2] = '\0';
+		for (i = 0; i < srclength; i++)
+			input[i] = *src++;
+	
+		output[0] = input[0] >> 2;
+		output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
+		output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
+
+		if (datalength + 4 > targsize)
+			return (-1);
+		target[datalength++] = Base64[output[0]];
+		target[datalength++] = Base64[output[1]];
+		if (srclength == 1)
+			target[datalength++] = Pad64;
+		else
+			target[datalength++] = Base64[output[2]];
+		target[datalength++] = Pad64;
+	}
+	if (datalength >= targsize)
+		return (-1);
+	target[datalength] = '\0';	/* Returned value doesn't count \0. */
+	return (datalength);
+}
+
+/** Base64 decode a string.
+ * @param src		The data to decode (input)
+ * @param srclength	The length of the data to decode (input length)
+ * @param target	The output buffer to use (output)
+ * @param targetsize	The length of the output buffer to use (maximum output length)
+ * @returns length of the targetsize, or -1 in case of error.
+ * @note Skips whitespace, and hmm.. I think we don't require padding? Not sure.
+ */
+int b64_decode(char const *src, unsigned char *target, size_t targsize)
+{
+	int tarindex, state, ch;
+	char *pos;
+
+	state = 0;
+	tarindex = 0;
+
+	while ((ch = *src++) != '\0') {
+		if (isspace(ch))	/* Skip whitespace anywhere. */
+			continue;
+
+		if (ch == Pad64)
+			break;
+
+		pos = strchr(Base64, ch);
+		if (pos == 0) 		/* A non-base64 character. */
+			return (-1);
+
+		switch (state) {
+		case 0:
+			if (target) {
+				if ((size_t)tarindex >= targsize)
+					return (-1);
+				target[tarindex] = (pos - Base64) << 2;
+			}
+			state = 1;
+			break;
+		case 1:
+			if (target) {
+				if ((size_t)tarindex + 1 >= targsize)
+					return (-1);
+				target[tarindex]   |=  (pos - Base64) >> 4;
+				target[tarindex+1]  = ((pos - Base64) & 0x0f)
+							<< 4 ;
+			}
+			tarindex++;
+			state = 2;
+			break;
+		case 2:
+			if (target) {
+				if ((size_t)tarindex + 1 >= targsize)
+					return (-1);
+				target[tarindex]   |=  (pos - Base64) >> 2;
+				target[tarindex+1]  = ((pos - Base64) & 0x03)
+							<< 6;
+			}
+			tarindex++;
+			state = 3;
+			break;
+		case 3:
+			if (target) {
+				if ((size_t)tarindex >= targsize)
+					return (-1);
+				target[tarindex] |= (pos - Base64);
+			}
+			tarindex++;
+			state = 0;
+			break;
+		default:
+			abort();
+		}
+	}
+
+	/*
+	 * We are done decoding Base-64 chars.  Let's see if we ended
+	 * on a byte boundary, and/or with erroneous trailing characters.
+	 */
+
+	if (ch == Pad64) {		/* We got a pad char. */
+		ch = *src++;		/* Skip it, get next. */
+		switch (state) {
+		case 0:		/* Invalid = in first position */
+		case 1:		/* Invalid = in second position */
+			return (-1);
+
+		case 2:		/* Valid, means one byte of info */
+			/* Skip any number of spaces. */
+			for (; ch != '\0'; ch = *src++)
+				if (!isspace(ch))
+					break;
+			/* Make sure there is another trailing = sign. */
+			if (ch != Pad64)
+				return (-1);
+			ch = *src++;		/* Skip the = */
+			/* Fall through to "single trailing =" case. */
+			/* FALLTHROUGH */
+
+		case 3:		/* Valid, means two bytes of info */
+			/*
+			 * We know this char is an =.  Is there anything but
+			 * whitespace after it?
+			 */
+			for (; ch != '\0'; ch = *src++)
+				if (!isspace(ch))
+					return (-1);
+
+			/*
+			 * Now make sure for cases 2 and 3 that the "extra"
+			 * bits that slopped past the last full byte were
+			 * zeros.  If we don't check them, they become a
+			 * subliminal channel.
+			 */
+			if (target && target[tarindex] != 0)
+				return (-1);
+		}
+	} else {
+		/*
+		 * We ended by seeing the end of the string.  Make sure we
+		 * have no partial bytes lying around.
+		 */
+		if (state != 0)
+			return (-1);
+	}
+
+	return (tarindex);
+}
+
+/* Natural sort case comparison routines. The following copyright header applies:
+  strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
+  Copyright (C) 2000, 2004 by Martin Pool <mbp sourcefrog net>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+ The code was modified / UnrealIRCderized by Bram Matthys ("Syzop").
+ We always have unsigned char and this makes it possible to get rid
+ of various stuff.. also re-indent this monster.
+*/
+
+static int compare_right(char const *a, char const *b)
+{
+	int bias = 0;
+
+	/* The longest run of digits wins.  That aside, the greatest
+	 * value wins, but we can't know that it will until we've scanned
+	 * both numbers to know that they have the same magnitude, so we
+	 * remember it in BIAS.
+	 */
+	for (;; a++, b++)
+	{
+		if (!isdigit(*a) && !isdigit(*b))
+			return bias;
+		if (!isdigit(*a))
+			return -1;
+		if (!isdigit(*b))
+			return +1;
+		if (*a < *b)
+		{
+			if (!bias)
+				bias = -1;
+		} else
+		if (*a > *b)
+		{
+			if (!bias)
+				bias = +1;
+		} else
+		if (!*a && !*b)
+			return bias;
+	}
+
+	return 0;
+}
+
+
+static int compare_left(char const *a, char const *b)
+{
+	/* Compare two left-aligned numbers: the first to have a
+	 * different value wins.
+	 */
+	for (;; a++, b++)
+	{
+		if (!isdigit(*a) && !isdigit(*b))
+			return 0;
+		if (!isdigit(*a))
+			return -1;
+		if (!isdigit(*b))
+			return +1;
+		if (*a < *b)
+			return -1;
+		if (*a > *b)
+			return +1;
+	}
+
+	return 0;
+}
+
+static int strnatcmp0(char const *a, char const *b, int fold_case)
+{
+	int ai, bi;
+	char ca, cb;
+	int fractional, result;
+
+	ai = bi = 0;
+	while (1)
+	{
+		ca = a[ai]; cb = b[bi];
+
+		/* skip over leading spaces or zeros */
+		while (isspace(ca))
+			ca = a[++ai];
+
+		while (isspace(cb))
+			cb = b[++bi];
+
+		/* process run of digits */
+		if (isdigit(ca)  &&  isdigit(cb))
+		{
+			fractional = (ca == '0' || cb == '0');
+			if (fractional)
+			{
+				if ((result = compare_left(a+ai, b+bi)) != 0)
+					return result;
+			} else {
+				if ((result = compare_right(a+ai, b+bi)) != 0)
+					return result;
+			}
+		}
+
+		if (!ca && !cb)
+		{
+			/* The strings compare the same.  Perhaps the caller
+			 * will want to call strcmp to break the tie.
+			 */
+			return 0;
+		}
+
+		if (fold_case)
+		{
+			ca = toupper(ca);
+			cb = toupper(cb);
+		}
+
+		if (ca < cb)
+			return -1;
+
+		if (ca > cb)
+			return +1;
+
+		ai++;
+		bi++;
+	}
+}
+
+/** Like strcmp() but with "natural sort", so that for example
+ * the string "1.4.10" is seen as higher than "1.4.9"
+ * This is the case sensitive version.
+ */
+int strnatcmp(char const *a, char const *b)
+{
+	return strnatcmp0(a, b, 0);
+}
+
+/** Like strcmp() but with "natural sort", so that for example
+ * the string "1.4.10" is seen as higher than "1.4.9"
+ * This is the case insensitive version.
+ */
+int strnatcasecmp(char const *a, char const *b)
+{
+	return strnatcmp0(a, b, 1);
+}
+
+/* End of natural sort case comparison functions */
+
+/* Memory allocation routines */
+
+/** Allocate memory - should always be used instead of malloc/calloc.
+ * @param size How many bytes to allocate
+ * @returns A pointer to the newly allocated memory.
+ * @note If out of memory then the IRCd will exit.
+ */
+void *safe_alloc(size_t size)
+{
+	void *p;
+	if (size == 0)
+		return NULL;
+	p = calloc(1, size);
+	if (!p)
+		outofmemory(size);
+	return p;
+}
+
+/** Safely duplicate a string */
+char *our_strdup(const char *str)
+{
+	char *ret = strdup(str);
+	if (!ret)
+		outofmemory(strlen(str));
+	return ret;
+}
+
+/** Safely duplicate a string with a maximum size */
+char *our_strldup(const char *str, size_t max)
+{
+	char *ret = strldup(str, max);
+	if (!ret)
+		outofmemory(MAX(strlen(str), max));
+	return ret;
+}
+
+/** Called when out of memory */
+void outofmemory(size_t bytes)
+{
+	static int log_attempt = 1;
+
+	if (log_attempt)
+	{
+		log_attempt = 0;
+		if (bytes)
+			ircd_log(LOG_ERROR, "Out of memory while trying to allocate %lld bytes!", (long long)bytes);
+		else
+			ircd_log(LOG_ERROR, "Out of memory");
+	}
+	exit(7);
+}
+
+/** Check if the specified file exists */
+int file_exists(char *file)
+{
+	FILE *fd;
+	fd = fopen(file, "r");
+	if (!fd)
+		return 0;
+	fclose(fd);
+	return 1;
+}
+
+/** Returns a unique filename in the specified directory
+ * using the specified suffix. The returned value will
+ * be of the form <dir>/<random-hex>.<suffix>
+ */
+char *unreal_mktemp(const char *dir, const char *suffix)
+{
+	FILE *fd;
+	unsigned int i;
+	static char tempbuf[PATH_MAX+1];
+
+	for (i = 500; i > 0; i--)
+	{
+		snprintf(tempbuf, PATH_MAX, "%s/%X.%s", dir, getrandom32(), suffix);
+		fd = fopen(tempbuf, "r");
+		if (!fd)
+			return tempbuf;
+		fclose(fd);
+	}
+	config_error("Unable to create temporary file in directory '%s': %s",
+		dir, strerror(errno)); /* eg: permission denied :p */
+	return NULL; 
+}
+
+/** Returns the path portion of the given path/file
+ * in the specified location (must be at least PATH_MAX bytes).
+ */
+char *unreal_getpathname(char *filepath, char *path)
+{
+	char *end = filepath+strlen(filepath);
+
+	while (*end != '\\' && *end != '/' && end > filepath)
+		end--;
+	if (end == filepath)
+		path = NULL;
+	else
+	{
+		int size = end-filepath;
+		if (size >= PATH_MAX)
+			path = NULL;
+		else
+		{
+			memcpy(path, filepath, size);
+			path[size] = 0;
+		}
+	}
+	return path;
+}
+
+/** Returns the filename portion of the given path.
+ * The original string is not modified
+ */
+char *unreal_getfilename(char *path)
+{
+        int len = strlen(path);
+        char *end;
+        if (!len)
+                return NULL;
+        end = path+len-1;
+	if (*end == '\\' || *end == '/')
+		return NULL;
+        while (end > path)
+        {
+                if (*end == '\\' || *end == '/')
+                {
+                        end++;
+                        break;
+                }
+                end--;
+        }
+        return end;
+}
+
+/** Returns the special module tmp name for a given path.
+ * The original string is not modified.
+ */
+char *unreal_getmodfilename(char *path)
+{
+	static char ret[512];
+	char buf[512];
+	char *p;
+	char *name = NULL;
+	char *directory = NULL;
+	
+	if (BadPtr(path))
+		return path;
+	
+	strlcpy(buf, path, sizeof(buf));
+	
+	/* Backtrack... */
+	for (p = buf + strlen(buf); p >= buf; p--)
+	{
+		if ((*p == '/') || (*p == '\\'))
+		{
+			name = p+1;
+			*p = '\0';
+			directory = buf; /* fallback */
+			for (; p >= buf; p--)
+			{
+				if ((*p == '/') || (*p == '\\'))
+				{
+					directory = p + 1;
+					break;
+				}
+			}
+			break;
+		}
+	}
+	
+	if (!name)
+		name = buf;
+	
+	if (!directory || !strcmp(directory, "modules"))
+		snprintf(ret, sizeof(ret), "%s", name);
+	else
+		snprintf(ret, sizeof(ret), "%s.%s", directory, name);
+	
+	return ret;
+}
+
+/* Returns a consistent filename for the cache/ directory.
+ * Returned value will be like: cache/<hash of url>
+ */
+char *unreal_mkcache(const char *url)
+{
+	static char tempbuf[PATH_MAX+1];
+	char tmp2[33];
+	
+	snprintf(tempbuf, PATH_MAX, "%s/%s", CACHEDIR, md5hash(tmp2, url, strlen(url)));
+	return tempbuf;
+}
+
+/** Returns 1 if a cached version of the url exists, otherwise 0. */
+int has_cached_version(const char *url)
+{
+	return file_exists(unreal_mkcache(url));
+}
+
+/** Used to blow away result of bad copy or cancel file copy */
+void cancel_copy(int srcfd, int destfd, const char *dest)
+{
+        close(srcfd);
+        close(destfd);
+        unlink(dest);
+}
+
+/** Copys the contents of the src file to the dest file.
+ * The dest file will have permissions r-x------
+ */
+int unreal_copyfile(const char *src, const char *dest)
+{
+	char buf[2048];
+	time_t mtime;
+	int srcfd, destfd, len;
+
+	mtime = unreal_getfilemodtime(src);
+
+#ifndef _WIN32
+	srcfd = open(src, O_RDONLY);
+#else
+	srcfd = open(src, _O_RDONLY|_O_BINARY);
+#endif
+
+	if (srcfd < 0)
+	{
+		config_error("Unable to open file '%s': %s", src, strerror(errno));
+		return 0;
+	}
+
+#ifndef _WIN32
+#if defined(DEFAULT_PERMISSIONS) && (DEFAULT_PERMISSIONS != 0)
+	destfd  = open(dest, O_WRONLY|O_CREAT, DEFAULT_PERMISSIONS);
+#else
+	destfd  = open(dest, O_WRONLY|O_CREAT, S_IRUSR | S_IXUSR);
+#endif /* DEFAULT_PERMISSIONS */
+#else
+	destfd = open(dest, _O_BINARY|_O_WRONLY|_O_CREAT, _S_IWRITE);
+#endif /* _WIN32 */
+	if (destfd < 0)
+	{
+		config_error("Unable to create file '%s': %s", dest, strerror(errno));
+		close(srcfd);
+		return 0;
+	}
+
+	while ((len = read(srcfd, buf, 1023)) > 0)
+		if (write(destfd, buf, len) != len)
+		{
+			config_error("Write error to file '%s': %s [not enough free hd space / quota? need several mb's!]",
+				dest, strerror(ERRNO));
+			cancel_copy(srcfd,destfd,dest);
+			return 0;
+		}
+
+	if (len < 0) /* very unusual.. perhaps an I/O error */
+	{
+		config_error("Read error from file '%s': %s", src, strerror(errno));
+		cancel_copy(srcfd,destfd,dest);
+		return 0;
+	}
+
+	close(srcfd);
+	close(destfd);
+	unreal_setfilemodtime(dest, mtime);
+	return 1;
+}
+
+/** Same as unreal_copyfile, but with an option to try hardlinking first */
+int unreal_copyfileex(const char *src, const char *dest, int tryhardlink)
+{
+	unlink(dest);
+#ifndef _WIN32
+	/* Try a hardlink first... */
+	if (tryhardlink && !link(src, dest))
+		return 1; /* success */
+#endif
+	return unreal_copyfile(src, dest);
+}
+
+/** Set the modification time on a file */
+void unreal_setfilemodtime(const char *filename, time_t mtime)
+{
+#ifndef _WIN32
+	struct utimbuf utb;
+	utb.actime = utb.modtime = mtime;
+	utime(filename, &utb);
+#else
+	FILETIME mTime;
+	LONGLONG llValue;
+	HANDLE hFile = CreateFile(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING,
+				  FILE_ATTRIBUTE_NORMAL, NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+		return;
+	llValue = Int32x32To64(mtime, 10000000) + 116444736000000000;
+	mTime.dwLowDateTime = (long)llValue;
+	mTime.dwHighDateTime = llValue >> 32;
+	
+	SetFileTime(hFile, &mTime, &mTime, &mTime);
+	CloseHandle(hFile);
+#endif
+}
+
+/** Get the modification time ("last modified") of a file */
+time_t unreal_getfilemodtime(const char *filename)
+{
+#ifndef _WIN32
+	struct stat sb;
+	if (stat(filename, &sb))
+		return 0;
+	return sb.st_mtime;
+#else
+	/* See how much more fun WinAPI programming is??? */
+	FILETIME cTime;
+	SYSTEMTIME sTime, lTime;
+	ULARGE_INTEGER fullTime;
+	time_t result;
+	HANDLE hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
+				  FILE_ATTRIBUTE_NORMAL, NULL);
+	if (hFile == INVALID_HANDLE_VALUE)
+		return 0;
+	if (!GetFileTime(hFile, NULL, NULL, &cTime))
+		return 0;
+
+	CloseHandle(hFile);
+
+	FileTimeToSystemTime(&cTime, &sTime);
+	SystemTimeToTzSpecificLocalTime(NULL, &sTime, &lTime);
+	SystemTimeToFileTime(&sTime, &cTime);
+
+	fullTime.LowPart = cTime.dwLowDateTime;
+	fullTime.HighPart = cTime.dwHighDateTime;
+	fullTime.QuadPart -= 116444736000000000;
+	fullTime.QuadPart /= 10000000;
+	
+	return fullTime.LowPart;	
+#endif
+}
+
+#ifndef	AF_INET6
+#define	AF_INET6	AF_MAX+1	/* just to let this compile */
+#endif
+
+/** Encode an IP string (eg: "1.2.3.4") to a BASE64 encoded value for S2S traffic */
+char *encode_ip(char *ip)
+{
+	static char retbuf[25]; /* returned string */
+	char addrbuf[16];
+
+	if (!ip)
+		return "*";
+
+	if (strchr(ip, ':'))
+	{
+		/* IPv6 (likely) */
+		inet_pton(AF_INET6, ip, addrbuf);
+		/* hack for IPv4-in-IPv6 (::ffff:1.2.3.4) */
+		if (addrbuf[0] == 0 && addrbuf[1] == 0 && addrbuf[2] == 0 && addrbuf[3] == 0
+		    && addrbuf[4] == 0 && addrbuf[5] == 0 && addrbuf[6] == 0
+			&& addrbuf[7] == 0 && addrbuf[8] == 0 && addrbuf[9] == 0
+			&& addrbuf[10] == 0xff && addrbuf[11] == 0xff)
+		{
+			b64_encode(&addrbuf[12], sizeof(struct in_addr), retbuf, sizeof(retbuf));
+		} else {
+			b64_encode(addrbuf, 16, retbuf, sizeof(retbuf));
+		}
+	}
+	else
+	{
+		/* IPv4 */
+		inet_pton(AF_INET, ip, addrbuf);
+		b64_encode((char *)&addrbuf, sizeof(struct in_addr), retbuf, sizeof(retbuf));
+	}
+	return retbuf;
+}
+
+/** Decode a BASE64 encoded string to an IP address string. Used for S2S traffic. */
+char *decode_ip(char *buf)
+{
+	int n;
+	char targ[25];
+	static char result[64];
+
+	n = b64_decode(buf, targ, sizeof(targ));
+	if (n == 4) /* should be IPv4 */
+		return inetntop(AF_INET, targ, result, sizeof(result));
+	else if (n == 16) /* should be IPv6 */
+		return inetntop(AF_INET6, targ, result, sizeof(result));
+	else /* Error! */
+		return NULL;
+}
+
+/* IPv6 stuff */
+
+#ifndef IN6ADDRSZ
+#define	IN6ADDRSZ	16
+#endif
+
+#ifndef INT16SZ
+#define	INT16SZ		 2
+#endif
+
+#ifndef INADDRSZ
+#define	INADDRSZ	 4
+#endif
+
+#ifdef _WIN32
+/* Microsoft makes things nice and fun for us! */
+struct u_WSA_errors {
+	int error_code;
+	char *error_string;
+};
+
+/* Must be sorted ascending by error code */
+struct u_WSA_errors WSAErrors[] = {
+ { WSAEINTR,              "Interrupted system call" },
+ { WSAEBADF,              "Bad file number" },
+ { WSAEACCES,             "Permission denied" },
+ { WSAEFAULT,             "Bad address" },
+ { WSAEINVAL,             "Invalid argument" },
+ { WSAEMFILE,             "Too many open sockets" },
+ { WSAEWOULDBLOCK,        "Operation would block" },
+ { WSAEINPROGRESS,        "Operation now in progress" },
+ { WSAEALREADY,           "Operation already in progress" },
+ { WSAENOTSOCK,           "Socket operation on non-socket" },
+ { WSAEDESTADDRREQ,       "Destination address required" },
+ { WSAEMSGSIZE,           "Message too long" },
+ { WSAEPROTOTYPE,         "Protocol wrong type for socket" },
+ { WSAENOPROTOOPT,        "Bad protocol option" },
+ { WSAEPROTONOSUPPORT,    "Protocol not supported" },
+ { WSAESOCKTNOSUPPORT,    "Socket type not supported" },
+ { WSAEOPNOTSUPP,         "Operation not supported on socket" },
+ { WSAEPFNOSUPPORT,       "Protocol family not supported" },
+ { WSAEAFNOSUPPORT,       "Address family not supported" },
+ { WSAEADDRINUSE,         "Address already in use" },
+ { WSAEADDRNOTAVAIL,      "Can't assign requested address" },
+ { WSAENETDOWN,           "Network is down" },
+ { WSAENETUNREACH,        "Network is unreachable" },
+ { WSAENETRESET,          "Net connection reset" },
+ { WSAECONNABORTED,       "Software caused connection abort" },
+ { WSAECONNRESET,         "Connection reset by peer" },
+ { WSAENOBUFS,            "No buffer space available" },
+ { WSAEISCONN,            "Socket is already connected" },
+ { WSAENOTCONN,           "Socket is not connected" },
+ { WSAESHUTDOWN,          "Can't send after socket shutdown" },
+ { WSAETOOMANYREFS,       "Too many references, can't splice" },
+ { WSAETIMEDOUT,          "Connection timed out" },
+ { WSAECONNREFUSED,       "Connection refused" },
+ { WSAELOOP,              "Too many levels of symbolic links" },
+ { WSAENAMETOOLONG,       "File name too long" },
+ { WSAEHOSTDOWN,          "Host is down" },
+ { WSAEHOSTUNREACH,       "No route to host" },
+ { WSAENOTEMPTY,          "Directory not empty" },
+ { WSAEPROCLIM,           "Too many processes" },
+ { WSAEUSERS,             "Too many users" },
+ { WSAEDQUOT,             "Disc quota exceeded" },
+ { WSAESTALE,             "Stale NFS file handle" },
+ { WSAEREMOTE,            "Too many levels of remote in path" },
+ { WSASYSNOTREADY,        "Network subsystem is unavailable" },
+ { WSAVERNOTSUPPORTED,    "Winsock version not supported" },
+ { WSANOTINITIALISED,     "Winsock not yet initialized" },
+ { WSAHOST_NOT_FOUND,     "Host not found" },
+ { WSATRY_AGAIN,          "Non-authoritative host not found" },
+ { WSANO_RECOVERY,        "Non-recoverable errors" },
+ { WSANO_DATA,            "Valid name, no data record of requested type" },
+ { WSAEDISCON,            "Graceful disconnect in progress" },
+ { WSASYSCALLFAILURE,     "System call failure" },
+ { 0,NULL}
+};
+
+/** Get socket error string */
+char *sock_strerror(int error)
+{
+	static char unkerr[64];
+	int start = 0;
+	int stop = sizeof(WSAErrors)/sizeof(WSAErrors[0])-1;
+	int mid;
+	
+	if (!error)
+		return "No error";
+
+	if (error < WSABASEERR) /* Just a regular error code */
+		return strerror(error);
+
+	/* Microsoft decided not to use sequential numbers for the error codes,
+	 * so we can't just use the array index for the code. But, at least
+	 * use a binary search to make it as fast as possible. 
+	 */
+	while (start <= stop)
+	{
+		mid = (start+stop)/2;
+		if (WSAErrors[mid].error_code > error)
+			stop = mid-1;
+		
+		else if (WSAErrors[mid].error_code < error)
+			start = mid+1;
+		else
+			return WSAErrors[mid].error_string;	
+	}
+	snprintf(unkerr, sizeof(unkerr), "Unknown Error: %d", error);
+	return unkerr;
+}
+#endif
+
+/** Build a string and replace $variables where needed.
+ * See src/modules/blacklist.c for an example.
+ * @param inbuf		The input string
+ * @param outbuf	The output string
+ * @param len		The maximum size of the output string (including NUL)
+ * @param name		Array of variables names
+ * @param value		Array of variable values
+ */
+void buildvarstring(const char *inbuf, char *outbuf, size_t len, const char *name[], const char *value[])
+{
+	const char *i, *p;
+	char *o;
+	int left = len - 1;
+	int cnt, found;
+
+#ifdef DEBUGMODE
+	if (len <= 0)
+		abort();
+#endif
+
+	for (i = inbuf, o = outbuf; *i; i++)
+	{
+		if (*i == '$')
+		{
+			i++;
+
+			/* $$ = literal $ */
+			if (*i == '$')
+				goto literal;
+
+			if (!isalnum(*i))
+			{
+				/* What do we do with things like '$/' ? -- treat literal */
+				i--;
+				goto literal;
+			}
+			
+			/* find termination */
+			for (p=i; isalnum(*p); p++);
+			
+			/* find variable name in list */
+			found = 0;
+			for (cnt = 0; name[cnt]; cnt++)
+				if (!strncasecmp(name[cnt], i, p - i))
+				{
+					/* Found */
+					found = 1;
+
+					if (!BadPtr(value[cnt]))
+					{
+						strlcpy(o, value[cnt], left);
+						left -= strlen(value[cnt]); /* may become <0 */
+						if (left <= 0)
+							return; /* return - don't write \0 to 'o'. ensured by strlcpy already */
+						o += strlen(value[cnt]); /* value entirely written */
+					}
+
+					break; /* done */
+				}
+			
+			if (!found)
+			{
+				/* variable name does not exist -- treat literal */
+				i--;
+				goto literal;
+			}
+
+			/* value written. we're done. */
+			i = p - 1;
+			continue;
+		}
+literal:
+		if (!left)
+			break;
+		*o++ = *i;
+		left--;
+		if (!left)
+			break;
+	}
+	*o = '\0';
+}
+
+/** Return the PCRE2 library version in use */
+char *pcre2_version(void)
+{
+	static char buf[256];
+
+	strlcpy(buf, "PCRE2 ", sizeof(buf));
+	pcre2_config(PCRE2_CONFIG_VERSION, buf+6);
+	return buf;
+}
+
+
+#ifdef _WIN32
+/** POSIX gettimeofday function for Windows (ignoring timezones) */
+int gettimeofday(struct timeval *tp, void *tzp)
+{
+	// This magic number is the number of 100 nanosecond intervals since January 1, 1601 (UTC)
+	// until 00:00:00 January 1, 1970
+	static const uint64_t EPOCH = ((uint64_t) 116444736000000000ULL);
+
+	SYSTEMTIME system_time;
+	FILETIME file_time;
+	uint64_t time;
+
+	GetSystemTime( &system_time );
+	SystemTimeToFileTime( &system_time, &file_time );
+	time =  ((uint64_t)file_time.dwLowDateTime )      ;
+	time += ((uint64_t)file_time.dwHighDateTime) << 32;
+
+	tp->tv_sec  = (long) ((time - EPOCH) / 10000000L);
+	tp->tv_usec = (long) (system_time.wMilliseconds * 1000);
+	return 0;
+}
+#endif
+
+/** Get the numer of characters per line that fit on the terminal (the width) */
+int get_terminal_width(void)
+{
+#if defined(_WIN32) || !defined(TIOCGWINSZ)
+	return 80;
+#else
+	struct winsize w;
+	ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
+	return w.ws_col;
+#endif
+}
diff --git a/src/tls.c b/src/tls.c
new file mode 100644
index 0000000..7da64df
--- /dev/null
+++ b/src/tls.c
@@ -0,0 +1,1354 @@
+/************************************************************************
+ *   Unreal Internet Relay Chat Daemon, src/tls.c
+ *      (C) 2000 hq.alert.sk (base)
+ *      (C) 2000 Carsten V. Munk <stskeeps@tspre.org> 
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief SSL/TLS functions
+ */
+
+#include "unrealircd.h"
+#include "openssl_hostname_validation.h"
+
+#ifdef _WIN32
+#define IDC_PASS                        1166
+extern HINSTANCE hInst;
+extern HWND hwIRCDWnd;
+#endif
+
+#define SAFE_SSL_READ 1
+#define SAFE_SSL_WRITE 2
+#define SAFE_SSL_ACCEPT 3
+#define SAFE_SSL_CONNECT 4
+
+static int fatal_ssl_error(int ssl_error, int where, int my_errno, Client *client);
+extern int cipher_check(SSL_CTX *ctx, char **errstr);
+extern int certificate_quality_check(SSL_CTX *ctx, char **errstr);
+
+/* The SSL structures */
+SSL_CTX *ctx_server;
+SSL_CTX *ctx_client;
+
+char *SSLKeyPasswd;
+
+typedef struct {
+	int *size;
+	char **buffer;
+} StreamIO;
+
+MODVAR int ssl_client_index = 0;
+
+#define CHK_SSL(err) if ((err)==-1) { ERR_print_errors_fp(stderr); }
+#ifdef _WIN32
+/** Ask SSL private key password (Windows GUI mode only) */
+LRESULT SSLPassDLG(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam)
+{
+	static StreamIO *stream;
+	switch (Message) {
+		case WM_INITDIALOG:
+			stream = (StreamIO*)lParam;
+			return TRUE;
+		case WM_COMMAND:
+			if (LOWORD(wParam) == IDCANCEL) {
+				*stream->buffer = NULL;
+				EndDialog(hDlg, IDCANCEL);
+			}
+			else if (LOWORD(wParam) == IDOK) {
+				GetDlgItemText(hDlg, IDC_PASS, *stream->buffer, *stream->size);
+				EndDialog(hDlg, IDOK);
+			}
+			return FALSE;
+		case WM_CLOSE:
+			*stream->buffer = NULL;
+			EndDialog(hDlg, IDCANCEL);
+		default:
+			return FALSE;
+	}
+}
+#endif				
+
+/** Return error string for OpenSSL error.
+ * @param err		OpenSSL error number to lookup
+ * @param my_errno	The value of errno to use in case we want to call strerror().
+ * @returns Error string, only valid until next call to this function.
+ */
+char *ssl_error_str(int err, int my_errno)
+{
+	static char ssl_errbuf[256];
+	char *ssl_errstr = NULL;
+
+	switch(err)
+	{
+		case SSL_ERROR_NONE:
+			ssl_errstr = "SSL: No error";
+			break;
+		case SSL_ERROR_SSL:
+			ssl_errstr = "Internal OpenSSL error or protocol error";
+			break;
+		case SSL_ERROR_WANT_READ:
+			ssl_errstr = "OpenSSL functions requested a read()";
+			break;
+		case SSL_ERROR_WANT_WRITE:
+			ssl_errstr = "OpenSSL functions requested a write()";
+			break;
+		case SSL_ERROR_WANT_X509_LOOKUP:
+			ssl_errstr = "OpenSSL requested a X509 lookup which didn't arrive";
+			break;
+		case SSL_ERROR_SYSCALL:
+			snprintf(ssl_errbuf, sizeof(ssl_errbuf), "%s", STRERROR(my_errno));
+			ssl_errstr = ssl_errbuf;
+			break;
+		case SSL_ERROR_ZERO_RETURN:
+			ssl_errstr = "Underlying socket operation returned zero";
+			break;
+		case SSL_ERROR_WANT_CONNECT:
+			ssl_errstr = "OpenSSL functions wanted a connect()";
+			break;
+		default:
+			ssl_errstr = "Unknown OpenSSL error (huh?)";
+	}
+	return ssl_errstr;
+}
+
+/** Write official OpenSSL error string to ircd log / sendto_realops, using config_status.
+ * Note that you are expected to announce earlier that you actually encountered an SSL error.
+ * Also note that multiple error strings may be written out (with a slight chance of including
+ * irrelevent ones[?]).
+ */
+void config_report_ssl_error()
+{
+unsigned long e;
+char buf[512];
+
+	do {
+		e = ERR_get_error();
+		if (e == 0)
+			break; /* no (more) errors */
+		ERR_error_string_n(e, buf, sizeof(buf));
+		config_status(" %s", buf);
+	} while(e);
+}
+
+/** Ask SSL private key password (rare) */
+int ssl_pem_passwd_cb(char *buf, int size, int rwflag, void *password)
+{
+	char *pass;
+	static int before = 0;
+	static char beforebuf[1024];
+#ifdef _WIN32
+	StreamIO stream;
+	char passbuf[512];	
+	int passsize = 512;
+#endif
+	if (before)
+	{
+		strlcpy(buf, beforebuf, size);
+		return strlen(buf);
+	}
+#ifndef _WIN32
+	pass = getpass("Password for SSL private key: ");
+#else
+	pass = passbuf;
+	stream.buffer = &pass;
+	stream.size = &passsize;
+	DialogBoxParam(hInst, "SSLPass", hwIRCDWnd, (DLGPROC)SSLPassDLG, (LPARAM)&stream); 
+#endif
+	if (pass)
+	{
+		strlcpy(buf, pass, size);
+		strlcpy(beforebuf, pass, sizeof(beforebuf));
+		before = 1;
+		SSLKeyPasswd = beforebuf;
+		return (strlen(buf));
+	}
+	return 0;
+}
+
+/** Verify certificate callback. */
+static int ssl_verify_callback(int preverify_ok, X509_STORE_CTX *ctx)
+{
+	/* We accept the connection. Certificate verifiction takes
+	 * place elsewhere, such as in _verify_link().
+	 */
+	return 1;
+}
+
+/** Get Client pointer by SSL pointer */
+Client *get_client_by_ssl(SSL *ssl)
+{
+	return SSL_get_ex_data(ssl, ssl_client_index);
+}
+
+/** Set requested server name as indicated by SNI */
+static void set_client_sni_name(SSL *ssl, char *name)
+{
+	Client *client = get_client_by_ssl(ssl);
+	if (client)
+		safe_strdup(client->local->sni_servername, name);
+}
+
+/** Hostname callback, used for SNI */
+static int ssl_hostname_callback(SSL *ssl, int *unk, void *arg)
+{
+	char *name = (char *)SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
+	ConfigItem_sni *sni;
+
+	if (name && (sni = find_sni(name)))
+	{
+		SSL_set_SSL_CTX(ssl, sni->ssl_ctx);
+		set_client_sni_name(ssl, name);
+	}
+
+	return SSL_TLSEXT_ERR_OK;
+}
+
+/** Special logging function for SSL/TLS (? make more generic?) */
+static void mylog(char *fmt, ...)
+{
+	va_list vl;
+	static char buf[2048];
+
+	va_start(vl, fmt);
+	ircvsnprintf(buf, sizeof(buf), fmt, vl);
+	va_end(vl);
+	sendto_realops("[SSL rehash] %s", buf);
+	ircd_log(LOG_ERROR, "%s", buf);
+}
+
+/** Set DH (Diffie-Hellman) parameters.
+ * We don't use this anymore, unless explicitly instructed,
+ * as we use the more secure ECDHE/EECDH instead
+ * (Ephemeral Elliptic-Curve Diffie-Hellman)
+ */
+static int setup_dh_params(SSL_CTX *ctx)
+{
+	DH *dh;
+	BIO *bio;
+	char *dh_file = iConf.tls_options ? iConf.tls_options->dh_file : tempiConf.tls_options->dh_file;
+	/* ^^ because we can be called both before config file initalization or after */
+
+	if (dh_file == NULL)
+		return 1;
+
+	bio = BIO_new_file(dh_file, "r");
+	if (bio == NULL)
+	{
+		config_error("Failed to load DH parameters %s", dh_file);
+		config_report_ssl_error();
+		return 0;
+	}
+
+	dh = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
+	if (dh == NULL)
+	{
+		config_error("Failed to use DH parameters %s", dh_file);
+		config_report_ssl_error();
+		BIO_free(bio);
+		return 0;
+	}
+
+	BIO_free(bio);
+	SSL_CTX_set_tmp_dh(ctx, dh);
+	return 1;
+}
+
+/** Disable SSL/TLS protocols as set by config */
+void disable_ssl_protocols(SSL_CTX *ctx, TLSOptions *tlsoptions)
+{
+	/* OpenSSL has two mechanisms for protocol version control:
+	 *
+	 * The old way, which is most flexible, is to use:
+	 * SSL_CTX_set_options(... SSL_OP_NO_<version>) which allows
+	 * you to disable each and every specific SSL/TLS version.
+	 *
+	 * And the new way, which only allows setting a
+	 * minimum and maximum protocol version, using:
+	 * SSL_CTX_set_min_proto_version(... <version>)
+	 * SSL_CTX_set_max_proto_version(....<version>)
+	 *
+	 * We prefer the old way, but because OpenSSL 1.0.1 and
+	 * OS's like Debian use system-wide options we are also
+	 * forced to use the new way... or at least to set a
+	 * minimum protocol version to begin with.
+	 */
+#ifdef HAS_SSL_CTX_SET_MIN_PROTO_VERSION
+	if (!(tlsoptions->protocols & TLS_PROTOCOL_TLSV1) &&
+	    !(tlsoptions->protocols & TLS_PROTOCOL_TLSV1_1))
+	{
+		SSL_CTX_set_min_proto_version(ctx, TLS1_2_VERSION);
+	} else
+	if (!(tlsoptions->protocols & TLS_PROTOCOL_TLSV1))
+	{
+		SSL_CTX_set_min_proto_version(ctx, TLS1_1_VERSION);
+	} else
+	{
+		SSL_CTX_set_min_proto_version(ctx, TLS1_VERSION);
+	}
+#endif
+	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2); /* always disable SSLv2 */
+	SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv3); /* always disable SSLv3 */
+
+#ifdef SSL_OP_NO_TLSv1
+	if (!(tlsoptions->protocols & TLS_PROTOCOL_TLSV1))
+		SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1);
+#endif
+
+#ifdef SSL_OP_NO_TLSv1_1
+	if (!(tlsoptions->protocols & TLS_PROTOCOL_TLSV1_1))
+		SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_1);
+#endif
+
+#ifdef SSL_OP_NO_TLSv1_2
+	if (!(tlsoptions->protocols & TLS_PROTOCOL_TLSV1_2))
+		SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_2);
+#endif
+
+#ifdef SSL_OP_NO_TLSv1_3
+	if (!(tlsoptions->protocols & TLS_PROTOCOL_TLSV1_3))
+		SSL_CTX_set_options(ctx, SSL_OP_NO_TLSv1_3);
+#endif
+}
+
+/** Initialize SSL/TLS context
+ * @param tlsoptions	The ::tls-options configuration
+ * @param server	Set to 1 if we are initializing a server, 0 for client.
+ * @returns The SSL/TLS context (SSL_CTX) or NULL in case of error.
+ */
+SSL_CTX *init_ctx(TLSOptions *tlsoptions, int server)
+{
+	SSL_CTX *ctx;
+	char *errstr = NULL;
+
+	if (server)
+		ctx = SSL_CTX_new(SSLv23_server_method());
+	else
+		ctx = SSL_CTX_new(SSLv23_client_method());
+
+	if (!ctx)
+	{
+		config_error("Failed to do SSL CTX new");
+		config_report_ssl_error();
+		return NULL;
+	}
+	disable_ssl_protocols(ctx, tlsoptions);
+	SSL_CTX_set_default_passwd_cb(ctx, ssl_pem_passwd_cb);
+
+	if (server && !(tlsoptions->options & TLSFLAG_DISABLECLIENTCERT))
+	{
+		/* We tell OpenSSL/LibreSSL to verify the certificate and set our callback.
+		 * Our callback will always accept the certificate since actual checking
+		 * will take place elsewhere. Why? Because certificate is (often) delayed
+		 * until after the SSL handshake. Such as in the case of link blocks where
+		 * _verify_link() will take care of it only after we learned what server
+		 * we are dealing with (and if we should verify certificates for that server).
+		 */
+		SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE | (tlsoptions->options & TLSFLAG_FAILIFNOCERT ? SSL_VERIFY_FAIL_IF_NO_PEER_CERT : 0), ssl_verify_callback);
+	}
+	SSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF);
+#ifndef SSL_OP_NO_TICKET
+ #error "Your system has an outdated OpenSSL version. Please upgrade OpenSSL."
+#endif
+	SSL_CTX_set_options(ctx, SSL_OP_NO_TICKET);
+
+	if (!setup_dh_params(ctx))
+		goto fail;
+
+	if (!tlsoptions->certificate_file)
+	{
+		config_error("No SSL certificate configured (set::options::ssl::certificate or in a listen block)");
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (SSL_CTX_use_certificate_chain_file(ctx, tlsoptions->certificate_file) <= 0)
+	{
+		config_error("Failed to load SSL certificate %s", tlsoptions->certificate_file);
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (!tlsoptions->key_file)
+	{
+		config_error("No SSL key configured (set::options::ssl::key or in a listen block)");
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (SSL_CTX_use_PrivateKey_file(ctx, tlsoptions->key_file, SSL_FILETYPE_PEM) <= 0)
+	{
+		config_error("Failed to load SSL private key %s", tlsoptions->key_file);
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (!SSL_CTX_check_private_key(ctx))
+	{
+		config_error("Failed to check SSL private key");
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (SSL_CTX_set_cipher_list(ctx, tlsoptions->ciphers) == 0)
+	{
+		config_error("Failed to set SSL cipher list");
+		config_report_ssl_error();
+		goto fail;
+	}
+
+#ifdef SSL_OP_NO_TLSv1_3
+	if (SSL_CTX_set_ciphersuites(ctx, tlsoptions->ciphersuites) == 0)
+	{
+		config_error("Failed to set SSL ciphersuites list");
+		config_report_ssl_error();
+		goto fail;
+	}
+#endif
+
+	if (!cipher_check(ctx, &errstr))
+	{
+		config_error("There is a problem with your SSL/TLS 'ciphers' configuration setting: %s", errstr);
+		config_error("Remove the ciphers setting from your configuration file to use safer defaults, or change the cipher setting.");
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (!certificate_quality_check(ctx, &errstr))
+	{
+		config_error("There is a problem with your SSL/TLS certificate: %s. Please use another certificate/keypair.", errstr);
+		config_error("If you use the standard UnrealIRCd certificates then you can simply run 'make pem' and 'make install' "
+		             "from your UnrealIRCd source directory (eg: ~/unrealircd-5.X.Y/) to create and install new certificates");
+		config_report_ssl_error();
+		goto fail;
+	}
+
+	if (server)
+		SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+
+	if (tlsoptions->trusted_ca_file)
+	{
+		if (!SSL_CTX_load_verify_locations(ctx, tlsoptions->trusted_ca_file, NULL))
+		{
+			config_error("Failed to load Trusted CA's from %s", tlsoptions->trusted_ca_file);
+			config_report_ssl_error();
+			goto fail;
+		}
+	}
+
+	if (server)
+	{
+#if defined(SSL_CTX_set_ecdh_auto)
+		/* OpenSSL 1.0.x requires us to explicitly turn this on */
+		SSL_CTX_set_ecdh_auto(ctx, 1);
+#elif OPENSSL_VERSION_NUMBER < 0x10100000L
+		/* Even older versions require require setting a fixed curve.
+		 * NOTE: Don't be confused by the <1.1.x check.
+		 * Yes, it must be there. Do not remove it!
+		 */
+		SSL_CTX_set_tmp_ecdh(ctx, EC_KEY_new_by_curve_name(NID_X9_62_prime256v1));
+#else
+		/* If we end up here we don't have SSL_CTX_set_ecdh_auto
+		 * and we are on OpenSSL 1.1.0 or later. We don't need to
+		 * do anything then, since auto ecdh is the default.
+		 */
+#endif
+		/* Let's see if we need to (and can) set specific curves */
+		if (tlsoptions->ecdh_curves)
+		{
+#ifdef HAS_SSL_CTX_SET1_CURVES_LIST
+			if (!SSL_CTX_set1_curves_list(ctx, tlsoptions->ecdh_curves))
+			{
+				config_error("Failed to apply ecdh-curves '%s'. "
+				             "To get a list of supported curves with the "
+				             "appropriate names, run "
+				             "'openssl ecparam -list_curves' on the server. "
+				             "Separate multiple curves by colon, "
+				             "for example: ecdh-curves \"secp521r1:secp384r1\".",
+				             tlsoptions->ecdh_curves);
+				config_report_ssl_error();
+				goto fail;
+			}
+#else
+			/* We try to avoid this in the config code, but better have
+			 * it here too than be sorry if someone screws up:
+			 */
+			config_error("ecdh-curves specified but not supported by library -- BAD!");
+			config_report_ssl_error();
+			goto fail;
+#endif
+		}
+		/* We really want the ECDHE/ECDHE to be generated per-session.
+		 * Added in 2015 for safety. Seems OpenSSL was smart enough
+		 * to make this the default in 2016 after a security advisory.
+		 */
+		SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE|SSL_OP_SINGLE_DH_USE);
+	}
+
+	if (server)
+	{
+		SSL_CTX_set_tlsext_servername_callback(ctx, ssl_hostname_callback);
+	}
+
+	return ctx;
+fail:
+	SSL_CTX_free(ctx);
+	return NULL;
+}
+
+/** Early initalization of SSL/TLS subsystem - called on startup */
+int early_init_ssl(void)
+{
+	SSL_load_error_strings();
+	SSLeay_add_ssl_algorithms();
+
+	/* This is used to track (SSL *) <--> (Client *) relationships: */
+	ssl_client_index = SSL_get_ex_new_index(0, "ssl_client", NULL, NULL, NULL);
+	return 1;
+}
+
+/** Initialize the server and client contexts.
+ * This is only possible after reading the configuration file.
+ */
+int init_ssl(void)
+{
+	/* SSL preliminaries. We keep the certificate and key with the context. */
+	ctx_server = init_ctx(iConf.tls_options, 1);
+	if (!ctx_server)
+		return 0;
+	ctx_client = init_ctx(iConf.tls_options, 0);
+	if (!ctx_client)
+		return 0;
+	return 1;
+}
+
+/** Reinitialize SSL/TLS server and client contexts - after REHASH -tls
+ */
+void reinit_ssl(Client *client)
+{
+	SSL_CTX *tmp;
+	ConfigItem_listen *listen;
+	ConfigItem_sni *sni;
+	ConfigItem_link *link;
+
+	if (!client)
+		mylog("Reloading all SSL related data (./unrealircd reloadtls)");
+	else if (IsUser(client))
+		mylog("%s (%s@%s) requested a reload of all SSL related data (/rehash -tls)",
+			client->name, client->user->username, client->user->realhost);
+	else
+		mylog("%s requested a reload of all SSL related data (/rehash -tls)",
+			client->name);
+
+	tmp = init_ctx(iConf.tls_options, 1);
+	if (!tmp)
+	{
+		config_error("SSL Reload failed.");
+		config_report_ssl_error();
+		return;
+	}
+	ctx_server = tmp; /* activate */
+	
+	tmp = init_ctx(iConf.tls_options, 0);
+	if (!tmp)
+	{
+		config_error("SSL Reload partially failed. Server context is reloaded, client context failed");
+		config_report_ssl_error();
+		return;
+	}
+	ctx_client = tmp; /* activate */
+
+	/* listen::tls-options.... */
+	for (listen = conf_listen; listen; listen = listen->next)
+	{
+		if (listen->tls_options)
+		{
+			tmp = init_ctx(listen->tls_options, 1);
+			if (!tmp)
+			{
+				config_error("SSL Reload partially failed. listen::tls-options error, see above");
+				config_report_ssl_error();
+				return;
+			}
+			listen->ssl_ctx = tmp; /* activate */
+		}
+	}
+
+	/* sni::tls-options.... */
+	for (sni = conf_sni; sni; sni = sni->next)
+	{
+		if (sni->tls_options)
+		{
+			tmp = init_ctx(sni->tls_options, 1);
+			if (!tmp)
+			{
+				config_error("SSL Reload partially failed. sni::tls-options error, see above");
+				config_report_ssl_error();
+				return;
+			}
+			sni->ssl_ctx = tmp; /* activate */
+		}
+	}
+
+	/* link::outgoing::tls-options.... */
+	for (link = conf_link; link; link = link->next)
+	{
+		if (link->tls_options)
+		{
+			tmp = init_ctx(link->tls_options, 1);
+			if (!tmp)
+			{
+				config_error("SSL Reload partially failed. link::outgoing::tls-options error in link %s { }, see above",
+					link->servername);
+				config_report_ssl_error();
+				return;
+			}
+			link->ssl_ctx = tmp; /* activate */
+		}
+	}
+}
+
+/** Set SSL connection as nonblocking */
+void SSL_set_nonblocking(SSL *s)
+{
+	BIO_set_nbio(SSL_get_rbio(s),1);
+	BIO_set_nbio(SSL_get_wbio(s),1);
+}
+
+/** Get SSL/TLS ciphersuite */
+char *tls_get_cipher(SSL *ssl)
+{
+	static char buf[256];
+	
+	buf[0] = '\0';
+	strlcpy(buf, SSL_get_version(ssl), sizeof(buf));
+	strlcat(buf, "-", sizeof(buf));
+	strlcat(buf, SSL_get_cipher(ssl), sizeof(buf));
+
+	return buf;
+}
+
+/** Get the applicable ::tls-options block for this local client,
+ * which may be defined in the link block, listen block, or set block.
+ */
+TLSOptions *get_tls_options_for_client(Client *client)
+{
+	if (!client->local)
+		return NULL;
+	if (client->serv && client->serv->conf && client->serv->conf->tls_options)
+		return client->serv->conf->tls_options;
+	if (client->local && client->local->listener && client->local->listener->tls_options)
+		return client->local->listener->tls_options;
+	return iConf.tls_options;
+}
+
+/** Outgoing SSL connect (read: handshake) to another server. */
+void ircd_SSL_client_handshake(int fd, int revents, void *data)
+{
+	Client *client = data;
+	SSL_CTX *ctx = (client->serv && client->serv->conf && client->serv->conf->ssl_ctx) ? client->serv->conf->ssl_ctx : ctx_client;
+	TLSOptions *tlsoptions = get_tls_options_for_client(client);
+
+	if (!ctx)
+	{
+		sendto_realops("Could not start SSL client handshake: SSL was not loaded correctly on this server (failed to load cert or key)");
+		return;
+	}
+
+	client->local->ssl = SSL_new(ctx);
+	if (!client->local->ssl)
+	{
+		sendto_realops("Failed to SSL_new(ctx)");
+		return;
+	}
+
+	SSL_set_fd(client->local->ssl, client->local->fd);
+	SSL_set_connect_state(client->local->ssl);
+	SSL_set_nonblocking(client->local->ssl);
+
+	if (tlsoptions->renegotiate_bytes > 0)
+	{
+		BIO_set_ssl_renegotiate_bytes(SSL_get_rbio(client->local->ssl), tlsoptions->renegotiate_bytes);
+		BIO_set_ssl_renegotiate_bytes(SSL_get_wbio(client->local->ssl), tlsoptions->renegotiate_bytes);
+	}
+
+	if (tlsoptions->renegotiate_timeout > 0)
+	{
+		BIO_set_ssl_renegotiate_timeout(SSL_get_rbio(client->local->ssl), tlsoptions->renegotiate_timeout);
+		BIO_set_ssl_renegotiate_timeout(SSL_get_wbio(client->local->ssl), tlsoptions->renegotiate_timeout);
+	}
+
+	if (client->serv && client->serv->conf)
+	{
+		/* Client: set hostname for SNI */
+		SSL_set_tlsext_host_name(client->local->ssl, client->serv->conf->servername);
+	}
+
+	SetTLS(client);
+
+	switch (ircd_SSL_connect(client, fd))
+	{
+		case -1:
+			fd_close(fd);
+			client->local->fd = -1;
+			--OpenFiles;
+			return;
+		case 0: 
+			Debug((DEBUG_DEBUG, "SetTLSConnectHandshake(%s)", get_client_name(client, TRUE)));
+			SetTLSConnectHandshake(client);
+			return;
+		case 1:
+			Debug((DEBUG_DEBUG, "SSL_init_finished should finish this job (%s)", get_client_name(client, TRUE)));
+			return;
+		default:
+			return;
+	}
+
+}
+
+/** Called by I/O engine to (re)try accepting an SSL/TLS connection */
+static void ircd_SSL_accept_retry(int fd, int revents, void *data)
+{
+	Client *client = data;
+	ircd_SSL_accept(client, fd);
+}
+
+/** Accept an SSL/TLS connection - that is: do the TLS handshake */
+int ircd_SSL_accept(Client *client, int fd)
+{
+	int ssl_err;
+
+#ifdef MSG_PEEK
+	if (!IsNextCall(client))
+	{
+		char buf[1024];
+		int n;
+		
+		n = recv(fd, buf, sizeof(buf), MSG_PEEK);
+		if ((n >= 8) && !strncmp(buf, "STARTTLS", 8))
+		{
+			char buf[512];
+			snprintf(buf, sizeof(buf),
+				"ERROR :STARTTLS received but this is an SSL-only port. Check your connect settings. "
+				"If this is a server linking in then add 'ssl' in your link::outgoing::options block.\r\n");
+			(void)send(fd, buf, strlen(buf), 0);
+			return fatal_ssl_error(SSL_ERROR_SSL, SAFE_SSL_ACCEPT, ERRNO, client);
+		}
+		if ((n >= 4) && (!strncmp(buf, "USER", 4) || !strncmp(buf, "NICK", 4) || !strncmp(buf, "PASS", 4) || !strncmp(buf, "CAP ", 4)))
+		{
+			char buf[512];
+			snprintf(buf, sizeof(buf),
+				"ERROR :NON-SSL command received on SSL-only port. Check your connection settings.\r\n");
+			(void)send(fd, buf, strlen(buf), 0);
+			return fatal_ssl_error(SSL_ERROR_SSL, SAFE_SSL_ACCEPT, ERRNO, client);
+		}
+		if ((n >= 8) && (!strncmp(buf, "PROTOCTL", 8) || !strncmp(buf, "SERVER", 6)))
+		{
+			char buf[512];
+			snprintf(buf, sizeof(buf),
+				"ERROR :NON-SSL command received on SSL-only port. Check your connection settings.\r\n");
+			(void)send(fd, buf, strlen(buf), 0);
+			return fatal_ssl_error(SSL_ERROR_SSL, SAFE_SSL_ACCEPT, ERRNO, client);
+		}
+		if (n > 0)
+			SetNextCall(client);
+	}
+#endif
+	if ((ssl_err = SSL_accept(client->local->ssl)) <= 0)
+	{
+		switch (ssl_err = SSL_get_error(client->local->ssl, ssl_err))
+		{
+			case SSL_ERROR_SYSCALL:
+				if (ERRNO == P_EINTR || ERRNO == P_EWOULDBLOCK || ERRNO == P_EAGAIN)
+				{
+					return 1;
+				}
+				return fatal_ssl_error(ssl_err, SAFE_SSL_ACCEPT, ERRNO, client);
+			case SSL_ERROR_WANT_READ:
+				fd_setselect(fd, FD_SELECT_READ, ircd_SSL_accept_retry, client);
+				fd_setselect(fd, FD_SELECT_WRITE, NULL, client);
+				return 1;
+			case SSL_ERROR_WANT_WRITE:
+				fd_setselect(fd, FD_SELECT_READ, NULL, client);
+				fd_setselect(fd, FD_SELECT_WRITE, ircd_SSL_accept_retry, client);
+				return 1;
+			default:
+				return fatal_ssl_error(ssl_err, SAFE_SSL_ACCEPT, ERRNO, client);
+		}
+		/* NOTREACHED */
+		return -1;
+	}
+
+	start_of_normal_client_handshake(client);
+
+	return 1;
+}
+
+/** Called by the I/O engine to (re)try to connect to a remote host */
+static void ircd_SSL_connect_retry(int fd, int revents, void *data)
+{
+	Client *client = data;
+	ircd_SSL_connect(client, fd);
+}
+
+/** Connect to a remote host - that is: connect and do the TLS handshake */
+int ircd_SSL_connect(Client *client, int fd)
+{
+	int ssl_err;
+
+	if ((ssl_err = SSL_connect(client->local->ssl)) <= 0)
+	{
+		ssl_err = SSL_get_error(client->local->ssl, ssl_err);
+		switch(ssl_err)
+		{
+			case SSL_ERROR_SYSCALL:
+				if (ERRNO == P_EINTR || ERRNO == P_EWOULDBLOCK || ERRNO == P_EAGAIN)
+				{
+					/* Hmmm. This implementation is different than in ircd_SSL_accept().
+					 * One of them must be wrong -- better check! (TODO)
+					 */
+					fd_setselect(fd, FD_SELECT_READ|FD_SELECT_WRITE, ircd_SSL_connect_retry, client);
+					return 0;
+				}
+				return fatal_ssl_error(ssl_err, SAFE_SSL_CONNECT, ERRNO, client);
+			case SSL_ERROR_WANT_READ:
+				fd_setselect(fd, FD_SELECT_READ, ircd_SSL_connect_retry, client);
+				fd_setselect(fd, FD_SELECT_WRITE, NULL, client);
+				return 0;
+			case SSL_ERROR_WANT_WRITE:
+				fd_setselect(fd, FD_SELECT_READ, NULL, client);
+				fd_setselect(fd, FD_SELECT_WRITE, ircd_SSL_connect_retry, client);
+				return 0;
+			default:
+				return fatal_ssl_error(ssl_err, SAFE_SSL_CONNECT, ERRNO, client);
+		}
+		/* NOTREACHED */
+		return -1;
+	}
+
+	fd_setselect(fd, FD_SELECT_READ | FD_SELECT_WRITE, NULL, client);
+	completed_connection(fd, FD_SELECT_READ | FD_SELECT_WRITE, client);
+
+	return 1;
+}
+
+/** Shutdown a SSL/TLS connection (gracefully) */
+int SSL_smart_shutdown(SSL *ssl)
+{
+	char i;
+	int rc = 0;
+
+	for(i = 0; i < 4; i++)
+	{
+		if ((rc = SSL_shutdown(ssl)))
+			break;
+	}
+	return rc;
+}
+
+/**
+ * Report a fatal SSL error and disconnect the associated client.
+ *
+ * @param ssl_error The error as from OpenSSL.
+ * @param where The location, one of the SAFE_SSL_* defines.
+ * @param my_errno A preserved value of errno to pass to ssl_error_str().
+ * @param client The client the error is associated with.
+ */
+static int fatal_ssl_error(int ssl_error, int where, int my_errno, Client *client)
+{
+	/* don`t alter ERRNO */
+	int errtmp = ERRNO;
+	char *ssl_errstr, *ssl_func;
+	unsigned long additional_errno = ERR_get_error();
+	char additional_info[256];
+	const char *one, *two;
+
+	if (IsDeadSocket(client))
+	{
+#ifdef DEBUGMODE
+		/* This is quite possible I guess.. especially if we don't pay attention upstream :p */
+		ircd_log(LOG_ERROR, "Warning: fatal_ssl_error() called for already-dead-socket (%d/%s)",
+			client->local->fd, client->name);
+#endif
+		return -1;
+	}
+
+	switch(where)
+	{
+		case SAFE_SSL_READ:
+			ssl_func = "SSL_read()";
+			break;
+		case SAFE_SSL_WRITE:
+			ssl_func = "SSL_write()";
+			break;
+		case SAFE_SSL_ACCEPT:
+			ssl_func = "SSL_accept()";
+			break;
+		case SAFE_SSL_CONNECT:
+			ssl_func = "SSL_connect()";
+			break;
+		default:
+			ssl_func = "undefined SSL func";
+	}
+
+	/* Fetch additional error information from OpenSSL. This is new as of Nov 2017 (4.0.16+) */
+	one = ERR_func_error_string(additional_errno);
+	two = ERR_reason_error_string(additional_errno);
+	if (one && *one && two && *two)
+	{
+		snprintf(additional_info, sizeof(additional_info), ": %s: %s", one, two);
+	} else {
+		*additional_info = '\0';
+	}
+
+	ssl_errstr = ssl_error_str(ssl_error, my_errno);
+
+	/* if we reply() something here, we might just trigger another
+	 * fatal_ssl_error() call and loop until a stack overflow... 
+	 * the client won`t get the ERROR : ... string, but this is
+	 * the only way to do it.
+	 * IRC protocol wasn`t SSL enabled .. --vejeta
+	 */
+	SetDeadSocket(client);
+	sendto_snomask(SNO_JUNK, "Exiting ssl client %s: %s: %s%s",
+		get_client_name(client, TRUE), ssl_func, ssl_errstr, additional_info);
+
+	if (where == SAFE_SSL_CONNECT)
+	{
+		char extra[256];
+		*extra = '\0';
+		if (ssl_error == SSL_ERROR_SSL)
+		{
+			snprintf(extra, sizeof(extra),
+			         ". Please verify that listen::options::ssl is enabled on port %d in %s's configuration file.",
+			         (client->serv && client->serv->conf) ? client->serv->conf->outgoing.port : -1,
+			         client->name);
+		}
+		sendto_umode(UMODE_OPER, "Lost connection to %s: %s: %s%s%s",
+			get_client_name(client, FALSE), ssl_func, ssl_errstr, additional_info, extra);
+		/* This is a connect() that fails, we don't broadcast that for non-SSL either (noisy) */
+	} else
+	if ((IsServer(client) || (client->serv && client->serv->conf)) && (where != SAFE_SSL_WRITE))
+	{
+		/* if server (either judged by IsServer() or clearly an outgoing connect),
+		 * and not writing (since otherwise deliver_it will take care of the error), THEN
+		 * send a closing link error...
+		 */
+		sendto_umode_global(UMODE_OPER, "Lost connection to %s: %s: %d (%s%s)",
+			get_client_name(client, FALSE), ssl_func, ssl_error, ssl_errstr, additional_info);
+	}
+
+	if (errtmp)
+	{
+		SET_ERRNO(errtmp);
+		safe_strdup(client->local->error_str, strerror(errtmp));
+	} else {
+		SET_ERRNO(P_EIO);
+		safe_strdup(client->local->error_str, ssl_errstr);
+	}
+
+	/* deregister I/O notification since we don't care anymore. the actual closing of socket will happen later. */
+	if (client->local->fd >= 0)
+		fd_unnotify(client->local->fd);
+
+	return -1;
+}
+
+/** Do a SSL/TLS handshake after a STARTTLS, as a client */
+int client_starttls(Client *client)
+{
+	if ((client->local->ssl = SSL_new(ctx_client)) == NULL)
+		goto fail_starttls;
+
+	SetTLS(client);
+
+	SSL_set_fd(client->local->ssl, client->local->fd);
+	SSL_set_nonblocking(client->local->ssl);
+
+	if (client->serv && client->serv->conf)
+	{
+		/* Client: set hostname for SNI */
+		SSL_set_tlsext_host_name(client->local->ssl, client->serv->conf->servername);
+	}
+
+	if (ircd_SSL_connect(client, client->local->fd) < 0)
+	{
+		Debug((DEBUG_DEBUG, "Failed SSL connect handshake in instance 1: %s", client->name));
+		SSL_set_shutdown(client->local->ssl, SSL_RECEIVED_SHUTDOWN);
+		SSL_smart_shutdown(client->local->ssl);
+		SSL_free(client->local->ssl);
+		goto fail_starttls;
+	}
+
+	/* HANDSHAKE IN PROGRESS */
+	return 0;
+fail_starttls:
+	/* Failure */
+	sendnumeric(client, ERR_STARTTLS, "STARTTLS failed");
+	client->local->ssl = NULL;
+	ClearTLS(client);
+	SetUnknown(client);
+	return 0; /* hm. we allow to continue anyway. not sure if we want that. */
+}
+
+/** Find the appropriate TLSOptions structure for a client.
+ * NOTE: The default global SSL options will be returned if not found,
+ *       or NULL if no such options are available (unlikely, but possible?).
+ */
+TLSOptions *FindTLSOptionsForUser(Client *client)
+{
+	ConfigItem_sni *sni;
+	TLSOptions *sslopt = iConf.tls_options; /* default */
+	
+	if (!MyConnect(client) || !IsSecure(client))
+		return NULL;
+
+	/* Different sts-policy depending on SNI: */
+	if (client->local->sni_servername)
+	{
+		sni = find_sni(client->local->sni_servername);
+		if (sni)
+		{
+			sslopt = sni->tls_options;
+		}
+		/* It is perfectly possible that 'name' is not found and 'sni' is NULL,
+		 * if a client used a hostname which we do not know about (eg: 'dummy').
+		 */
+	}
+
+	return sslopt;
+}
+
+/** Verify certificate and make sure the certificate is valid for 'hostname'.
+ * @param ssl: The SSL structure of the client or server
+ * @param hostname: The hostname we should expect the certificate to be valid for
+ * @param errstr: Error will be stored in here (optional)
+ * @returns Returns 1 on success and 0 on error.
+ */
+int verify_certificate(SSL *ssl, char *hostname, char **errstr)
+{
+	static char buf[512];
+	X509 *cert;
+	int n;
+
+	*buf = '\0';
+
+	if (errstr)
+		*errstr = NULL; /* default */
+
+	if (!ssl)
+	{
+		strlcpy(buf, "Not using SSL/TLS", sizeof(buf));
+		if (errstr)
+			*errstr = buf;
+		return 0; /* Cannot verify a non-SSL connection */
+	}
+
+	if (SSL_get_verify_result(ssl) != X509_V_OK)
+	{
+		strlcpy(buf, "Certificate is not issued by a trusted Certificate Authority", sizeof(buf));
+		if (errstr)
+			*errstr = buf;
+		return 0; /* Certificate verify failed */
+	}
+
+	/* Now verify if the name of the certificate matches hostname */
+	cert = SSL_get_peer_certificate(ssl);
+
+	if (!cert)
+	{
+		strlcpy(buf, "No certificate provided", sizeof(buf));
+		if (errstr)
+			*errstr = buf;
+		return 0;
+	}
+
+#if 1
+	n = validate_hostname(hostname, cert);
+	X509_free(cert);
+	if (n == MatchFound)
+		return 1; /* Hostname matched. All tests passed. */
+#else
+	/* TODO: make autoconf test for X509_check_host() and verify that this code works:
+	 * (When doing that, also disable the openssl_hostname_validation.c/.h code since
+	 *  it would be unused)
+	 */
+	n = X509_check_host(cert, hostname, strlen(hostname), X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS, NULL);
+	X509_free(cert);
+	if (n == 1)
+		return 1; /* Hostname matched. All tests passed. */
+#endif
+
+	/* Certificate is verified but is issued for a different hostname */
+	snprintf(buf, sizeof(buf), "Certificate '%s' is not valid for hostname '%s'",
+		certificate_name(ssl), hostname);
+	if (errstr)
+		*errstr = buf;
+	return 0;
+}
+
+/** Grab the certificate name */
+char *certificate_name(SSL *ssl)
+{
+	static char buf[384];
+	X509 *cert;
+	X509_NAME *n;
+
+	if (!ssl)
+		return NULL;
+
+	cert = SSL_get_peer_certificate(ssl);
+	if (!cert)
+		return NULL;
+
+	n = X509_get_subject_name(cert);
+	if (n)
+	{
+		buf[0] = '\0';
+		X509_NAME_oneline(n, buf, sizeof(buf));
+		X509_free(cert);
+		return buf;
+	} else {
+		X509_free(cert);
+		return NULL;
+	}
+}
+
+/** Check if any weak ciphers are in use */
+int cipher_check(SSL_CTX *ctx, char **errstr)
+{
+	SSL *ssl;
+	static char errbuf[256];
+	int i;
+	const char *cipher;
+
+	*errbuf = '\0'; // safety
+
+	if (errstr)
+		*errstr = errbuf;
+
+	/* there isn't an SSL_CTX_get_cipher_list() unfortunately. */
+	ssl = SSL_new(ctx);
+	if (!ssl)
+	{
+		snprintf(errbuf, sizeof(errbuf), "Could not create SSL structure");
+		return 0;
+	}
+
+	/* Very weak */
+	i = 0;
+	while ((cipher = SSL_get_cipher_list(ssl, i++)))
+	{
+		if (strstr(cipher, "DES-"))
+		{
+			snprintf(errbuf, sizeof(errbuf), "DES is enabled but is a weak cipher");
+			SSL_free(ssl);
+			return 0;
+		}
+		else if (strstr(cipher, "3DES-"))
+		{
+			snprintf(errbuf, sizeof(errbuf), "3DES is enabled but is a weak cipher");
+			SSL_free(ssl);
+			return 0;
+		}
+		else if (strstr(cipher, "RC4-"))
+		{
+			snprintf(errbuf, sizeof(errbuf), "RC4 is enabled but is a weak cipher");
+			SSL_free(ssl);
+			return 0;
+		}
+		else if (strstr(cipher, "NULL-"))
+		{
+			snprintf(errbuf, sizeof(errbuf), "NULL cipher provides no encryption");
+			SSL_free(ssl);
+			return 0;
+		}
+	}
+
+	SSL_free(ssl);
+	return 1;
+}
+
+/** Check if a certificate (or actually: key) is weak */
+int certificate_quality_check(SSL_CTX *ctx, char **errstr)
+{
+	SSL *ssl;
+	X509 *cert;
+	EVP_PKEY *public_key;
+	RSA *rsa_key;
+	int key_length;
+	static char errbuf[256];
+
+	*errbuf = '\0'; // safety
+
+	if (errstr)
+		*errstr = errbuf;
+
+	/* there isn't an SSL_CTX_get_cipher_list() unfortunately. */
+	ssl = SSL_new(ctx);
+	if (!ssl)
+	{
+		snprintf(errbuf, sizeof(errbuf), "Could not create SSL structure");
+		return 0;
+	}
+
+	cert = SSL_get_certificate(ssl);
+	if (!cert)
+	{
+		snprintf(errbuf, sizeof(errbuf), "Could not retrieve SSL/TLS certificate");
+		SSL_free(ssl);
+		return 0;
+	}
+
+	public_key = X509_get_pubkey(cert);
+	if (!public_key)
+	{
+		/* Now this is unexpected.. */
+		config_warn("certificate_quality_check(): could not check public key !? BUG?");
+		SSL_free(ssl);
+		return 1;
+	}
+	rsa_key = EVP_PKEY_get1_RSA(public_key);
+	if (!rsa_key)
+	{
+		/* Not an RSA key, then we are done. */
+		EVP_PKEY_free(public_key);
+		SSL_free(ssl);
+		return 1;
+	}
+	key_length = RSA_size(rsa_key) * 8;
+
+	EVP_PKEY_free(public_key);
+	RSA_free(rsa_key);
+	SSL_free(ssl);
+
+	if (key_length < 2048)
+	{
+		snprintf(errbuf, sizeof(errbuf), "Your SSL/TLS certificate key is only %d bits, which is insecure", key_length);
+		return 0;
+	}
+
+	return 1;
+}
+
+char *spki_fingerprint_ex(X509 *x509_cert);
+
+/** Return the SPKI Fingerprint for a client.
+ *
+ * This is basically the same output as
+ * openssl x509 -noout -in certificate.pem -pubkey | openssl asn1parse -noout -inform pem -out public.key
+ * openssl dgst -sha256 -binary public.key | openssl enc -base64
+ * ( from https://tools.ietf.org/html/draft-ietf-websec-key-pinning-21#appendix-A )
+ */
+char *spki_fingerprint(Client *cptr)
+{
+	X509 *x509_cert = NULL;
+	char *ret;
+
+	if (!MyConnect(cptr) || !cptr->local->ssl)
+		return NULL;
+
+	x509_cert = SSL_get_peer_certificate(cptr->local->ssl);
+	if (!x509_cert)
+		return NULL;
+	ret = spki_fingerprint_ex(x509_cert);
+	X509_free(x509_cert);
+	return ret;
+}
+
+char *spki_fingerprint_ex(X509 *x509_cert)
+{
+	unsigned char *der_cert = NULL, *p;
+	int der_cert_len, n;
+	static char retbuf[256];
+	SHA256_CTX ckctx;
+	unsigned char checksum[SHA256_DIGEST_LENGTH];
+
+	memset(retbuf, 0, sizeof(retbuf));
+
+	der_cert_len = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509_cert), NULL);
+	if ((der_cert_len > 0) && (der_cert_len < 16384))
+	{
+		der_cert = p = safe_alloc(der_cert_len);
+		n = i2d_X509_PUBKEY(X509_get_X509_PUBKEY(x509_cert), &p);
+
+		if ((n > 0) && ((p - der_cert) == der_cert_len))
+		{
+			/* The DER encoded SPKI is stored in 'der_cert' with length 'der_cert_len'.
+			 * Now we need to create an SHA256 hash out of it.
+			 */
+			SHA256_Init(&ckctx);
+			SHA256_Update(&ckctx, der_cert, der_cert_len);
+			SHA256_Final(checksum, &ckctx);
+
+			/* And convert the binary to a base64 string... */
+			n = b64_encode(checksum, SHA256_DIGEST_LENGTH, retbuf, sizeof(retbuf));
+			safe_free(der_cert);
+			return retbuf; /* SUCCESS */
+		}
+		safe_free(der_cert);
+	}
+	return NULL;
+}
+
+/** Returns 1 if the client is using an outdated protocol or cipher, 0 otherwise */
+int outdated_tls_client(Client *client)
+{
+	TLSOptions *tlsoptions = get_tls_options_for_client(client);
+	char buf[1024], *name, *p;
+	const char *client_protocol = SSL_get_version(client->local->ssl);
+	const char *client_ciphersuite = SSL_get_cipher(client->local->ssl);
+
+	if (!tlsoptions)
+		return 0; /* odd.. */
+
+	strlcpy(buf, tlsoptions->outdated_protocols, sizeof(buf));
+	for (name = strtoken(&p, buf, ","); name; name = strtoken(&p, NULL, ","))
+	{
+		if (match_simple(name, client_protocol))
+			 return 1; /* outdated protocol */
+	}
+
+	strlcpy(buf, tlsoptions->outdated_ciphers, sizeof(buf));
+	for (name = strtoken(&p, buf, ","); name; name = strtoken(&p, NULL, ","))
+	{
+		if (match_simple(name, client_ciphersuite))
+			return 1; /* outdated cipher */
+	}
+
+	return 0; /* OK, not outdated */
+}
+
+/** Returns the expanded string used for set::outdated-tls-policy::user-message etc. */
+char *outdated_tls_client_build_string(char *pattern, Client *client)
+{
+	static char buf[512];
+	const char *name[3], *value[3];
+	const char *str;
+
+	str = SSL_get_version(client->local->ssl);
+	name[0] = "protocol";
+	value[0] = str ? str : "???";
+
+	str = SSL_get_cipher(client->local->ssl);
+	name[1] = "cipher";
+	value[1] = str ? str : "???";
+
+	name[2] = value[2] = NULL;
+
+	buildvarstring(pattern, buf, sizeof(buf), name, value);
+	return buf;
+}
diff --git a/src/updconf.c b/src/updconf.c
new file mode 100644
index 0000000..8294960
--- /dev/null
+++ b/src/updconf.c
@@ -0,0 +1,1730 @@
+/*
+ * Configuration file updater - upgrade from 3.2.x to 4.x
+ * (C) Copyright 2015 Bram Matthys and the UnrealIRCd team
+ *
+ * License: GPLv2
+ */
+ 
+#include "unrealircd.h"
+
+extern void config_free(ConfigFile *cfptr);
+
+char configfiletmp[512];
+
+struct Upgrade
+{
+	char *locop_host;
+	char *oper_host;
+	char *coadmin_host;
+	char *admin_host;
+	char *sadmin_host;
+	char *netadmin_host;
+	int host_on_oper_up;
+};
+
+struct Upgrade upgrade;
+
+typedef struct FlagMapping FlagMapping;
+struct FlagMapping
+{
+	char shortflag;
+	char *longflag;
+};
+
+static FlagMapping FlagMappingTable[] = {
+	{ 'o', "local" },
+	{ 'O', "global" },
+	{ 'r', "can_rehash" },
+	{ 'D', "can_die" },
+	{ 'R', "can_restart" },
+	{ 'w', "can_wallops" },
+	{ 'g', "can_globops" },
+	{ 'c', "can_localroute" },
+	{ 'L', "can_globalroute" },
+	{ 'K', "can_globalkill" },
+	{ 'b', "can_kline" },
+	{ 'B', "can_unkline" },
+	{ 'n', "can_localnotice" },
+	{ 'G', "can_globalnotice" },
+	{ 'A', "admin" },
+	{ 'a', "services-admin" },
+	{ 'N', "netadmin" },
+	{ 'C', "coadmin" },
+	{ 'z', "can_zline" },
+	{ 'W', "get_umodew" },
+	{ 'H', "get_host" },
+	{ 't', "can_gkline" },
+	{ 'Z', "can_gzline" },
+	{ 'v', "can_override" },
+	{ 'q', "can_setq" },
+	{ 'd', "can_dccdeny" },
+	{ 'T', "can_tsctl" },
+	{ 0, NULL },
+};
+
+int needs_modules_default_conf = 1;
+int needs_operclass_default_conf = 1;
+
+static void die()
+{
+#ifdef _WIN32
+	win_error(); /* ? */
+#endif
+	exit(0);
+}
+
+#define CFGBUFSIZE 1024
+void modify_file(int start, char *ins, int stop)
+{
+	char configfiletmp2[512];
+	FILE *fdi, *fdo;
+	char *rdbuf = NULL, *wbuf;
+	int n;
+	int first = 1;
+		
+	snprintf(configfiletmp2, sizeof(configfiletmp2), "%s.tmp", configfiletmp); // .tmp.tmp :D
+
+#ifndef _WIN32
+	fdi = fopen(configfiletmp, "r");
+	fdo = fopen(configfiletmp2, "w");
+#else
+	fdi = fopen(configfiletmp, "rb");
+	fdo = fopen(configfiletmp2, "wb");
+#endif
+
+	if (!fdi || !fdo)
+	{
+		config_error("could not read/write to %s/%s", configfiletmp, configfiletmp2);
+		die();
+	}
+
+	rdbuf = safe_alloc(start);
+	
+	if ((n = fread(rdbuf, 1, start, fdi)) != start)
+	{
+		config_error("read error in remove_section(%d,%d): %d", start, stop, n);
+		die();
+	}
+	
+	fwrite(rdbuf, 1, start, fdo);
+	
+	safe_free(rdbuf);
+
+	if (ins)
+		fwrite(ins, 1, strlen(ins), fdo); /* insert this piece */
+
+	if (stop > 0)
+	{
+		if (fseek(fdi, stop+1, SEEK_SET) != 0)
+			goto end; /* end of file we hope.. */
+	}
+	
+	// read the remaining stuff
+	rdbuf = safe_alloc(CFGBUFSIZE);
+	
+	while(1)
+	{
+		n = fread(rdbuf, 1, CFGBUFSIZE, fdi);
+		if (n <= 0)
+			break; // done
+		
+		wbuf = rdbuf;
+		
+		if (first && (stop > 0))
+		{
+			if ((n > 0) && (*wbuf == '\r'))
+			{
+				wbuf++;
+				n--;
+			}
+			if ((n > 0) && (*wbuf == '\n'))
+			{
+				wbuf++;
+				n--;
+			}
+			first = 0;
+			if (n <= 0)
+				break; /* we are done (EOF) */
+		}
+		
+		fwrite(wbuf, 1, n, fdo);
+	}
+
+end:
+	fclose(fdi);
+	fclose(fdo);
+	
+	safe_free(rdbuf);
+	// todo: handle write errors and such..
+
+	unlink(configfiletmp);
+	if (rename(configfiletmp2, configfiletmp) < 0)
+	{
+		config_error("Could not rename '%s' to '%s': %s", configfiletmp2, configfiletmp, strerror(errno));
+		die();
+	}
+}
+
+void remove_section(int start, int stop)
+{
+	modify_file(start, NULL, stop);
+}
+
+void insert_section(int start, char *buf)
+{
+#ifdef _WIN32
+static char realbuf[16384];
+char *i, *o;
+
+	if (strlen(buf) > ((sizeof(realbuf)/2)-2))
+		abort(); /* damn lazy you !!! */
+
+	for (i = buf, o = realbuf; *i; i++)
+	{
+		if (*i == '\n')
+		{
+			*o++ = '\r';
+			*o++ = '\n';
+		} else
+		{
+			*o++ = *i;
+		}
+	}
+	*o = '\0';
+	
+	modify_file(start, realbuf, 0);
+#else
+	modify_file(start, buf, 0);
+#endif
+}
+
+void replace_section(ConfigEntry *ce, char *buf)
+{
+	remove_section(ce->ce_fileposstart, ce->ce_fileposend);
+	insert_section(ce->ce_fileposstart, buf);
+}
+
+static char buf[8192];
+
+int upgrade_me_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	char *name = NULL;
+	char *info = NULL;
+	int numeric = 0;
+
+	char sid[16];
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "sid"))
+			return 0; /* no upgrade needed */
+		else if (!cep->ce_vardata)
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"me", cep->ce_varname);
+			return 0;
+		}
+		else if (!strcmp(cep->ce_varname, "name"))
+			name = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "info"))
+			info = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "numeric"))
+			numeric = atoi(cep->ce_vardata);
+	}
+	
+	if (!name || !info || !numeric)
+	{
+		/* Invalid block as it does not contain the 3.2.x mandatory items */
+		return 0;
+	}
+
+	snprintf(sid, sizeof(sid), "%.3d", numeric);
+		
+	snprintf(buf, sizeof(buf),
+			 "me {\n"
+			 "\tname %s;\n"
+			 "\tinfo \"%s\";\n"
+			 "\tsid %s;\n"
+			 "};\n",
+			 name,
+			 info,
+			 sid);
+
+	replace_section(ce, buf);
+	
+	config_status("- me block upgraded");
+	return 1;
+}
+
+int upgrade_link_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	char *bind_ip = NULL;
+	char *username = NULL;
+	char *hostname = NULL;
+	char *port = NULL;
+	char *password_receive = NULL;
+	char *password_connect = NULL;
+	char *class = NULL;
+	int options_ssl = 0;
+	int options_autoconnect = 0;
+	int options_nohostcheck = 0;
+	int options_quarantine = 0;
+	/* options_nodnscache is deprecated, always now.. */
+	char *hub = NULL;
+	char *leaf = NULL;
+	int leaf_depth = -1;
+	char *ciphers = NULL;
+	char *password_receive_authmethod = NULL;
+	int need_incoming = 0, need_outgoing = 0;
+
+	/* ripped from test_link */
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "incoming") || !strcmp(cep->ce_varname, "outgoing"))
+			return 0; /* no upgrade needed */
+		else if (!strcmp(cep->ce_varname, "options"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "ssl"))
+					options_ssl = 1;
+				if (!strcmp(cepp->ce_varname, "autoconnect"))
+					options_autoconnect = 1;
+				if (!strcmp(cepp->ce_varname, "nohostcheck"))
+					options_nohostcheck = 1;
+				if (!strcmp(cepp->ce_varname, "quarantine"))
+					options_quarantine = 1;
+			}
+		}
+		else if (!cep->ce_vardata)
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"link", cep->ce_varname);
+			return 0;
+		}
+		else if (!strcmp(cep->ce_varname, "username"))
+			username = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "hostname"))
+			hostname = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "bind-ip"))
+			bind_ip = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "port"))
+			port = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "password-receive"))
+		{
+			password_receive = cep->ce_vardata;
+			if (cep->ce_entries)
+				password_receive_authmethod = cep->ce_entries->ce_varname;
+		}
+		else if (!strcmp(cep->ce_varname, "password-connect"))
+			password_connect = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "class"))
+			class = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "hub"))
+			hub = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "leaf"))
+			leaf = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "leafdepth"))
+			leaf_depth = atoi(cep->ce_vardata);
+		else if (!strcmp(cep->ce_varname, "ciphers"))
+			ciphers = cep->ce_vardata;
+	}
+	
+	if (!username || !hostname || !class || !password_receive ||
+	    !password_connect || !port)
+	{
+		/* Invalid link block as it does not contain the 3.2.x mandatory items */
+		return 0;
+	}
+	
+	if (strchr(hostname, '?') || strchr(hostname, '*'))
+	{
+		/* Wildcards in hostname: incoming only */
+		need_incoming = 1;
+		need_outgoing = 0;
+	}
+	else
+	{
+		/* IP (or hostname with nohostcheck) */
+		need_incoming = 1;
+		need_outgoing = 1;
+	}
+
+	snprintf(buf, sizeof(buf), "link %s {\n", ce->ce_vardata);
+	
+	if (need_incoming)
+	{
+		char upg_mask[HOSTLEN+USERLEN+8];
+		
+		if (options_nohostcheck)
+		{
+			strlcpy(upg_mask, "*", sizeof(upg_mask));
+		}
+		else
+		{
+			if (!strcmp(username, "*"))
+				strlcpy(upg_mask, hostname, sizeof(upg_mask)); /* just host */
+			else
+				snprintf(upg_mask, sizeof(upg_mask), "%s@%s", username, hostname); /* user@host */
+		}
+
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tincoming {\n\t\tmask %s;\n\t};\n", upg_mask);
+	}
+
+	if (need_outgoing)
+	{
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf),
+		         "\toutgoing {\n"
+		         "\t\tbind-ip %s;\n"
+		         "\t\thostname %s;\n"
+		         "\t\tport %s;\n"
+		         "\t\toptions { %s%s};\n"
+		         "\t};\n",
+		         bind_ip,
+		         hostname,
+		         port,
+		         options_ssl ? "ssl; " : "",
+		         options_autoconnect ? "autoconnect; " : "");
+	}
+
+	if (strcasecmp(password_connect, password_receive))
+	{
+		if (!password_receive_authmethod)
+		{
+			/* Prompt user ? */
+			config_warn("Link block '%s' has a different connect/receive password. "
+			            "This is no longer supported in UnrealIRCd 4.x",
+			            ce->ce_vardata);
+			
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf),
+			         "\tpassword \"%s\"; /* WARNING: password changed due to 4.x upgrade */\n",
+			         options_autoconnect ? password_connect : password_receive);
+		} else
+		{
+			/* sslcertificate or sslcertficatefp */
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf),
+			         "\tpassword \"%s\" { %s; };\n",
+			         password_receive,
+			         password_receive_authmethod);
+		}
+	} else {
+		/* identical connect & receive passwords. easy. */
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf),
+		         "\tpassword \"%s\";\n", password_receive);
+	}
+
+	if (hub)
+	{
+		if (strcmp(hub, "*")) // only if it's something other than *, as * is the default anyway..
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\thub %s;\n", hub);
+	} else
+	if (leaf)
+	{
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tleaf %s;\n", leaf);
+		if (leaf_depth)
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tleaf-depth %d;\n", leaf_depth);
+	}
+
+	snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tclass %s;\n", class);
+
+	if (ciphers)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tciphers %s;\n", ciphers);
+
+	if (options_quarantine)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\toptions { quarantine; };\n");
+
+	snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "};\n"); /* end */
+	
+	replace_section(ce, buf);
+	
+	config_status("- link block '%s' upgraded", ce->ce_vardata);
+	return 1;
+}
+
+/** oper::from::userhost becomes oper::mask & vhost::from::userhost becomes vhost::mask */
+#define MAXFROMENTRIES 100
+int upgrade_from_subblock(ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	char *list[MAXFROMENTRIES];
+	int listcnt = 0;
+
+	memset(list, 0, sizeof(list));
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+			continue;
+		else if (!strcmp(cep->ce_varname, "userhost"))
+		{
+			if (listcnt == MAXFROMENTRIES)
+				break; // no room, sorry.
+			list[listcnt++] = cep->ce_vardata;
+		}
+	}
+	
+	if (listcnt == 0)
+		return 0; /* invalid block. strange. */
+
+	if (listcnt == 1)
+	{
+		char *m = !strncmp(list[0], "*@", 2) ? list[0]+2 : list[0]; /* skip or don't skip the user@ part */
+		snprintf(buf, sizeof(buf), "mask %s;\n", m);
+	} else
+	{
+		/* Multiple (list of masks) */
+		int i;
+		snprintf(buf, sizeof(buf), "mask {\n");
+		
+		for (i=0; i < listcnt; i++)
+		{
+			char *m = !strncmp(list[i], "*@", 2) ? list[i]+2 : list[i]; /* skip or don't skip the user@ part */
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\t%s;\n", m);
+		}
+		
+		strlcat(buf, "\t};\n", sizeof(buf));
+	}
+
+	replace_section(ce, buf);
+	
+	config_status("- %s::from::userhost sub-block upgraded", ce->ce_prevlevel ? ce->ce_prevlevel->ce_varname : "???");
+	return 1;
+}
+
+int upgrade_loadmodule(ConfigEntry *ce)
+{
+	char *file = ce->ce_vardata;
+	char tmp[512], *p, *newfile;
+	
+	if (!file)
+		return 0;
+
+	if (our_strcasestr(file, "commands.dll") || our_strcasestr(file, "/commands.so"))
+	{
+		snprintf(buf, sizeof(buf), "include \"modules.default.conf\";\n");
+		needs_modules_default_conf = 0;
+		if (needs_operclass_default_conf)
+		{
+			/* This is a nice place :) */
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "include \"operclass.default.conf\";\n");
+			needs_operclass_default_conf = 0;
+		}
+		replace_section(ce, buf);
+		config_status("- loadmodule for '%s' replaced with an include \"modules.default.conf\"", file);
+		return 1;
+	}
+	
+	if (our_strcasestr(file, "cloak.dll") || our_strcasestr(file, "/cloak.so"))
+	{
+		replace_section(ce, "/* NOTE: cloaking module is included in modules.default.conf */");
+		config_status("- loadmodule for '%s' removed as this is now in modules.default.conf", file);
+		return 1;
+	}
+
+	/* All other loadmodule commands... */
+	
+	strlcpy(tmp, file, sizeof(tmp));
+	p = strstr(tmp, ".so");
+	if (p)
+		*p = '\0';
+	p = our_strcasestr(tmp, ".dll");
+	if (p)
+		*p = '\0';
+
+	newfile = !strncmp(tmp, "src/", 4) ? tmp+4 : tmp;
+	
+	newfile = !strncmp(newfile, "modules/", 8) ? newfile+8 : newfile;
+	
+	if (!strcmp(newfile, file))
+		return 0; /* no change */
+	
+	snprintf(buf, sizeof(buf), "loadmodule \"%s\";\n", newfile);
+	replace_section(ce, buf);
+	config_status("- loadmodule line converted to new syntax");
+	return 1;
+}
+
+int upgrade_include(ConfigEntry *ce)
+{
+	char *file = ce->ce_vardata;
+	static int badwords_upgraded_already = 0;
+	
+	if (!file)
+		return 0;
+
+	if (!strstr(file, "help/") && match_simple("help*.conf", file))
+	{
+		snprintf(buf, sizeof(buf), "include \"help/%s\";\n", file);
+		replace_section(ce, buf);
+		config_status("- include for '%s' replaced with 'help/%s'", file, file);
+		return 1;
+	}
+	
+	if (!strcmp("badwords.quit.conf", file))
+	{
+		*buf = '\0';
+		replace_section(ce, buf);
+		config_status("- include for '%s' removed (now in badwords.conf)", file);
+		return 1;
+	}
+
+	if (match_simple("badwords.*.conf", file))
+	{
+		if (badwords_upgraded_already)
+		{
+			*buf = '\0';
+			config_status("- include for '%s' removed (now in badwords.conf)", file);
+		} else {
+			strcpy(buf, "/* all badwords are now in badwords.conf */\ninclude \"badwords.conf\";\n");
+			badwords_upgraded_already = 1;
+			config_status("- include for '%s' replaced with 'badwords.conf'", file);
+		}
+		replace_section(ce, buf);
+		return 1;
+	}
+	
+	return 0;
+}
+
+#define MAXSPFTARGETS 32
+int upgrade_spamfilter_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	char *reason = NULL;
+	char *regex = NULL;
+	char *action = NULL;
+	char *ban_time = NULL;
+	char *target[MAXSPFTARGETS];
+	char targets[512];
+	int targetcnt = 0;
+	char *match_type = NULL;
+	char *p;
+
+	memset(target, 0, sizeof(target));
+		
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "match") || !strcmp(cep->ce_varname, "match-type"))
+			return 0; /* no upgrade needed */
+		else if (!strcmp(cep->ce_varname, "target"))
+		{
+			if (cep->ce_vardata)
+			{
+				target[0] = cep->ce_vardata;
+			}
+			else if (cep->ce_entries)
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (targetcnt == MAXSPFTARGETS)
+						break;
+					target[targetcnt++] = cepp->ce_varname;
+				}
+			}
+		}
+		else if (!cep->ce_vardata)
+			continue; /* invalid */
+		else if (!strcmp(cep->ce_varname, "regex"))
+		{
+			regex = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "action"))
+		{
+			action = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "reason"))
+		{
+			reason = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "ban-time"))
+		{
+			ban_time = cep->ce_vardata;
+		}
+	}
+
+	if (!regex || !target[0] || !action)
+		return 0; /* invalid spamfilter block */
+
+	/* build target(s) list */
+	if (targetcnt > 1)
+	{
+		int i;
+		
+		strlcpy(targets, "{ ", sizeof(targets));
+		
+		for (i=0; i < targetcnt; i++)
+		{
+			snprintf(targets+strlen(targets), sizeof(targets)-strlen(targets),
+			         "%s; ", target[i]);
+		}
+		strlcat(targets, "}", sizeof(target));
+	} else {
+		strlcpy(targets, target[0], sizeof(targets));
+	}
+
+	/* Determine match-type, fallback to 'posix' (=3.2.x regex engine) */
+	
+	match_type = "simple";
+	for (p = regex; *p; p++)
+		if (!isalnum(*p) && !isspace(*p))
+		{
+			match_type = "posix";
+			break;
+		}
+
+	snprintf(buf, sizeof(buf), "spamfilter {\n"
+	                           "\tmatch-type %s;\n"
+	                           "\tmatch \"%s\";\n"
+	                           "\ttarget %s;\n"
+	                           "\taction %s;\n",
+	                           match_type,
+	                           unreal_add_quotes(regex),
+	                           targets,
+	                           action);
+
+	/* optional: reason */
+	if (reason)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\treason \"%s\";\n", unreal_add_quotes(reason));
+	
+	/* optional: ban-time */
+	if (ban_time)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tban-time \"%s\";\n", ban_time);
+
+	strlcat(buf, "};\n", sizeof(buf));
+	
+	replace_section(ce, buf);
+	config_status("- spamfilter block converted to new syntax");
+	return 1;
+}
+
+#define MAXOPTIONS 32
+int upgrade_allow_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	char *hostname = NULL;
+	char *ip = NULL;
+	char *maxperip = NULL;
+	char *ipv6_clone_mask = NULL;
+	char *password = NULL;
+	char *password_type = NULL;
+	char *class = NULL;
+	char *redirect_server = NULL;
+	int redirect_port = 0;
+	char *options[MAXOPTIONS];
+	int optionscnt = 0;
+	char options_str[512], comment[512];
+
+	memset(options, 0, sizeof(options));
+	*comment = *options_str = '\0';
+		
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "options"))
+		{
+			if (cep->ce_vardata)
+			{
+				options[0] = cep->ce_vardata;
+				optionscnt = 1;
+			}
+			else if (cep->ce_entries)
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (optionscnt == MAXOPTIONS)
+						break;
+					options[optionscnt++] = cepp->ce_varname;
+				}
+			}
+		}
+		else if (!cep->ce_vardata)
+			continue; /* invalid */
+		else if (!strcmp(cep->ce_varname, "hostname"))
+		{
+			hostname = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "ip"))
+		{
+			ip = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "maxperip"))
+		{
+			maxperip = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "ipv6-clone-mask"))
+		{
+			ipv6_clone_mask = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			password = cep->ce_vardata;
+			if (cep->ce_entries)
+				password_type = cep->ce_entries->ce_varname;
+		}
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			class = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "redirect-server"))
+		{
+			redirect_server = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "redirect-port"))
+		{
+			redirect_port = atoi(cep->ce_vardata);
+		}
+	}
+
+	if (!ip || !hostname || !class)
+		return 0; /* missing 3.2.x items in allow block, upgraded already! (or invalid) */
+
+	/* build target(s) list */
+	if (optionscnt == 0)
+	{
+		*options_str = '\0';
+	}
+	else
+	{
+		int i;
+		
+		for (i=0; i < optionscnt; i++)
+		{
+			snprintf(options_str+strlen(options_str), sizeof(options_str)-strlen(options_str),
+			         "%s; ", options[i]);
+		}
+	}
+
+	/* drop either 'ip' or 'hostname' */
+	if (!strcmp(ip, "*@*") && !strcmp(hostname, "*@*"))
+		hostname = NULL; /* just ip */
+	else if (strstr(ip, "NOMATCH"))
+		ip = NULL;
+	else if (strstr(hostname, "NOMATCH"))
+		hostname = NULL;
+	else if (!strchr(hostname, '.') && strcmp(hostname, "localhost"))
+		hostname = NULL;
+	else if (!strchr(ip, '.'))
+		ip = NULL;
+	else
+	{
+		/* very rare case -- let's bet on IP */
+		snprintf(comment, sizeof(comment), "/* CHANGED BY 3.2.x TO 4.x CONF UPGRADE!! Was: ip %s; hostname %s; */\n", ip, hostname);
+		hostname = NULL;
+	}
+
+	snprintf(buf, sizeof(buf), "allow {\n");
+
+	if (*comment)
+		strlcat(buf, comment, sizeof(buf));
+
+	if (ip)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tip \"%s\";\n", ip);
+
+	if (hostname)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\thostname \"%s\";\n", hostname);
+
+	snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tclass %s;\n", class);
+	
+	/* maxperip: optional in 3.2.x, mandatory in 4.x */
+	if (maxperip)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxperip %s;\n", maxperip);
+	else
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxperip 3; /* CHANGED BY 3.2.x TO 4.x CONF UPGRADE! */\n");
+	
+	if (ipv6_clone_mask)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tipv6-clone-mask %s;\n", ipv6_clone_mask);
+
+	if (password)
+	{
+		if (password_type)
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tpassword \"%s\" { %s; };\n", password, password_type);
+		else
+			snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tpassword \"%s\";\n", password);
+	}
+
+	if (redirect_server)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tredirect-server %s;\n", redirect_server);
+
+	if (redirect_port)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tredirect-port %d;\n", redirect_port);
+
+	if (*options_str)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\toptions { %s};\n", options_str);
+
+	strlcat(buf, "};\n", sizeof(buf));
+	
+	replace_section(ce, buf);
+	config_status("- allow block converted to new syntax");
+	return 1;
+}
+
+/* Pick out the ip address and the port number from a string.
+ * The string syntax is:  ip:port.  ip must be enclosed in brackets ([]) if its an ipv6
+ * address because they contain colon (:) separators.  The ip part is optional.  If the string
+ * contains a single number its assumed to be a port number.
+ *
+ * Returns with ip pointing to the ip address (if one was specified), a "*" (if only a port
+ * was specified), or an empty string if there was an error.  port is returned pointing to the
+ * port number if one was specified, otherwise it points to a empty string.
+ */
+void ipport_separate(char *string, char **ip, char **port)
+{
+	char *f;
+
+	/* assume failure */
+	*ip = *port = "";
+
+	/* sanity check */
+	if (string && strlen(string) > 0)
+	{
+		/* handle ipv6 type of ip address */
+		if (*string == '[')
+		{
+			if ((f = strrchr(string, ']')))
+			{
+				*ip = string + 1;	/* skip [ */
+				*f = '\0';			/* terminate the ip string */
+				/* next char must be a : if a port was specified */
+				if (*++f == ':')
+				{
+					*port = ++f;
+				}
+			}
+		}
+		/* handle ipv4 and port */
+		else if ((f = strchr(string, ':')))
+		{
+			/* we found a colon... we may have ip:port or just :port */
+			if (f == string)
+			{
+				/* we have just :port */
+				*ip = "*";
+			}
+			else
+			{
+				/* we have ip:port */
+				*ip = string;
+				*f = '\0';
+			}
+			*port = ++f;
+		}
+		/* no ip was specified, just a port number */
+		else if (!strcmp(string, my_itoa(atoi(string))))
+		{
+			*ip = "*";
+			*port = string;
+		}
+	}
+}
+
+int upgrade_listen_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	char *ip = NULL;
+	char *port = NULL;
+	char *options[MAXOPTIONS];
+	int optionscnt = 0;
+	char options_str[512];
+	char copy[128];
+
+	memset(options, 0, sizeof(options));
+	*options_str = '\0';
+
+	if (!ce->ce_vardata)
+		return 0; /* already upgraded */
+
+	strlcpy(copy, ce->ce_vardata, sizeof(copy));
+	ipport_separate(copy, &ip, &port);
+	if (!ip || !*ip || !port || !*port)
+		return 0; /* invalid conf */
+	
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "options"))
+		{
+			if (cep->ce_entries)
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (optionscnt == MAXOPTIONS)
+						break;
+					options[optionscnt++] = cepp->ce_varname;
+				}
+			}
+		}
+	}
+
+	/* build options list */
+	if (optionscnt == 0)
+	{
+		*options_str = '\0';
+	}
+	else
+	{
+		int i;
+		
+		for (i=0; i < optionscnt; i++)
+		{
+			snprintf(options_str+strlen(options_str), sizeof(options_str)-strlen(options_str),
+			         "%s; ", options[i]);
+		}
+	}
+
+	snprintf(buf, sizeof(buf), "listen {\n"
+	                           "\tip %s;\n"
+	                           "\tport %s;\n",
+	                           ip,
+	                           port);
+
+	if (*options_str)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\toptions { %s};\n", options_str);
+
+	strlcat(buf, "};\n", sizeof(buf));
+	
+	replace_section(ce, buf);
+	config_status("- listen block converted to new syntax");
+	return 1;
+}
+
+int upgrade_cgiirc_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep;
+	char *type = NULL;
+	char *username = NULL;
+	char *hostname = NULL;
+	char *password = NULL, *password_type = NULL;
+	char mask[USERLEN+HOSTLEN+8];
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!cep->ce_vardata)
+		{
+			config_error_empty(cep->ce_fileptr->cf_filename, cep->ce_varlinenum,
+				"cgiirc", cep->ce_varname);
+			return 0;
+		}
+		else if (!strcmp(cep->ce_varname, "type"))
+			type = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "username"))
+			username = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "hostname"))
+			hostname = cep->ce_vardata;
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			password = cep->ce_vardata;
+			if (cep->ce_entries)
+				password_type = cep->ce_entries->ce_varname;
+		}
+	}
+	
+	if (!type || !hostname)
+	{
+		/* Invalid block as it does not contain the 3.2.x mandatory items */
+		return 0;
+	}
+
+	if (username)
+		snprintf(mask, sizeof(mask), "%s@%s", username, hostname);
+	else
+		strlcpy(mask, hostname, sizeof(mask));
+
+	if (!strcmp(type, "old"))
+	{
+		snprintf(buf, sizeof(buf),
+		         "webirc {\n"
+		         "\ttype old;\n"
+		         "\tmask %s;\n",
+		         mask);
+	} else
+	{
+		if (password_type)
+		{
+			snprintf(buf, sizeof(buf),
+					 "webirc {\n"
+					 "\tmask %s;\n"
+					 "\tpassword \"%s\" { %s; };\n"
+					 "};\n",
+					 mask,
+					 password,
+					 password_type);
+		} else
+		{
+			snprintf(buf, sizeof(buf),
+					 "webirc {\n"
+					 "\tmask %s;\n"
+					 "\tpassword \"%s\";\n"
+					 "};\n",
+					 mask,
+					 password);
+		}
+	}
+
+	replace_section(ce, buf);
+	
+	config_status("- cgiirc block upgraded and renamed to webirc");
+	return 1;
+}
+
+int contains_flag(char **flags, int flagscnt, char *needle)
+{
+	int i;
+	
+	for (i = 0; i < flagscnt; i++)
+		if (!strcmp(flags[i], needle))
+			return 1;
+
+	return 0;
+}
+
+int upgrade_oper_block(ConfigEntry *ce)
+{
+	ConfigEntry *cep, *cepp;
+	char *name = NULL;
+	char *password = NULL;
+	char *password_type = NULL;
+	char *require_modes = NULL;
+	char *class = NULL;
+	char *flags[MAXOPTIONS];
+	int flagscnt = 0;
+	char *swhois = NULL;
+	char *snomask = NULL;
+	char *modes = NULL;
+	int maxlogins = -1;
+	char *fromlist[MAXFROMENTRIES];
+	int fromlistcnt = 0;
+	char maskbuf[1024];
+	char *operclass = NULL; /* set by us, not read from conf */
+	char *vhost = NULL; /* set by us, not read from conf */
+	int i;
+	char silly[64];
+
+	memset(flags, 0, sizeof(flags));
+	*maskbuf = '\0';
+
+	name = ce->ce_vardata;
+	
+	if (!name)
+		return 0; /* oper block without a name = invalid */
+
+	for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+	{
+		if (!strcmp(cep->ce_varname, "operclass"))
+			return 0; /* already 4.x conf */
+		else if (!strcmp(cep->ce_varname, "flags"))
+		{
+			if (cep->ce_vardata) /* short options (flag letters) */
+			{
+				char *p;
+				for (p = cep->ce_vardata; *p; p++)
+				{
+					if (flagscnt == MAXOPTIONS)
+						break;
+					for (i = 0; FlagMappingTable[i].shortflag; i++)
+					{
+						if (FlagMappingTable[i].shortflag == *p)
+						{
+							flags[flagscnt] = FlagMappingTable[i].longflag;
+							flagscnt++;
+							break;
+						}
+					}
+				}
+			}
+			else if (cep->ce_entries) /* long options (flags written out) */
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (flagscnt == MAXOPTIONS)
+						break;
+					flags[flagscnt++] = cepp->ce_varname;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "from"))
+		{
+			for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+			{
+				if (!strcmp(cepp->ce_varname, "userhost") && cepp->ce_vardata)
+				{
+					if (fromlistcnt == MAXFROMENTRIES)
+						break; // no room, sorry.
+					fromlist[fromlistcnt++] = cepp->ce_vardata;
+				}
+			}
+		}
+		else if (!strcmp(cep->ce_varname, "mask"))
+		{
+			/* processing mask here means we can also upgrade 3.4-alphaX oper blocks.. */
+			if (cep->ce_vardata)
+			{
+				if (fromlistcnt == MAXFROMENTRIES)
+					break; // no room, sorry.
+				fromlist[fromlistcnt++] = cep->ce_vardata;
+			} else
+			{
+				for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+				{
+					if (fromlistcnt == MAXFROMENTRIES)
+						break; // no room, sorry.
+					fromlist[fromlistcnt++] = cepp->ce_varname;
+				}
+			}
+		}
+		else if (!cep->ce_vardata)
+			continue; /* invalid */
+		else if (!strcmp(cep->ce_varname, "password"))
+		{
+			password = cep->ce_vardata;
+			if (cep->ce_entries)
+				password_type = cep->ce_entries->ce_varname;
+		}
+		else if (!strcmp(cep->ce_varname, "require-modes"))
+		{
+			require_modes = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "class"))
+		{
+			class = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "swhois"))
+		{
+			swhois = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "snomasks"))
+		{
+			snomask = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "modes"))
+		{
+			modes = cep->ce_vardata;
+		}
+		else if (!strcmp(cep->ce_varname, "maxlogins"))
+		{
+			maxlogins = atoi(cep->ce_vardata);
+		}
+	}
+
+	if ((fromlistcnt == 0) || !password || !class)
+		return 0; /* missing 3.2.x items in allow block (invalid or upgraded already) */
+
+	/* build oper::mask list in 'maskbuf' (includes variable name) */
+	if (fromlistcnt == 1)
+	{
+		char *m = !strncmp(fromlist[0], "*@", 2) ? fromlist[0]+2 : fromlist[0]; /* skip or don't skip the user@ part */
+		snprintf(maskbuf, sizeof(maskbuf), "mask %s;\n", m);
+	} else
+	{
+		/* Multiple (list of masks) */
+		int i;
+		snprintf(maskbuf, sizeof(maskbuf), "mask {\n");
+		
+		for (i=0; i < fromlistcnt; i++)
+		{
+			char *m = !strncmp(fromlist[i], "*@", 2) ? fromlist[i]+2 : fromlist[i]; /* skip or don't skip the user@ part */
+			snprintf(maskbuf+strlen(maskbuf), sizeof(maskbuf)-strlen(maskbuf), "\t%s;\n", m);
+		}
+		strlcat(maskbuf, "\t};\n", sizeof(maskbuf));
+	}
+	
+	/* Figure out which default operclass looks most suitable (="find highest rank") */
+	if (contains_flag(flags, flagscnt, "netadmin"))
+		operclass = "netadmin";
+	else if (contains_flag(flags, flagscnt, "services-admin"))
+		operclass = "services-admin";
+	else if (contains_flag(flags, flagscnt, "coadmin"))
+		operclass = "coadmin";
+	else if (contains_flag(flags, flagscnt, "admin"))
+		operclass = "admin";
+	else if (contains_flag(flags, flagscnt, "global"))
+		operclass = "globop";
+	else if (contains_flag(flags, flagscnt, "local"))
+		operclass = "locop";
+	else
+	{
+		/* Hmm :) */
+		config_status("WARNING: I have trouble converting oper block '%s' to the new system. "
+		              "I made it use the locop operclass. Feel free to change", name);
+		operclass = "locop";
+	}
+
+	if (contains_flag(flags, flagscnt, "get_host") || upgrade.host_on_oper_up)
+	{
+		if (!strcmp(operclass, "netadmin"))
+			vhost = upgrade.netadmin_host;
+		else if (!strcmp(operclass, "services-admin"))
+			vhost = upgrade.sadmin_host;
+		else if (!strcmp(operclass, "coadmin"))
+			vhost = upgrade.coadmin_host;
+		else if (!strcmp(operclass, "admin"))
+			vhost = upgrade.admin_host;
+		else if (!strcmp(operclass, "globop"))
+			vhost = upgrade.oper_host;
+		else if (!strcmp(operclass, "locop"))
+			vhost = upgrade.locop_host;
+	}
+
+	/* If no swhois is set, then set a title. Just because people are used to it. */
+	if (!swhois)
+	{
+		if (!strcmp(operclass, "netadmin"))
+			swhois = "is a Network Administrator";
+		else if (!strcmp(operclass, "services-admin"))
+			swhois = "is a Services Administrator";
+		else if (!strcmp(operclass, "coadmin"))
+			swhois = "is a Co Administrator";
+		else if (!strcmp(operclass, "admin"))
+			swhois = "is a Server Administrator";
+	}
+
+	/* The 'coadmin' operclass is actually 'admin'. There's no difference in privileges. */
+	if (!strcmp(operclass, "coadmin"))
+		operclass = "admin";
+	
+	/* convert globop and above w/override to operclassname-with-override */
+	if (contains_flag(flags, flagscnt, "can_override") && strcmp(operclass, "locop"))
+	{
+		snprintf(silly, sizeof(silly), "%s-with-override", operclass);
+		operclass = silly;
+	}
+
+	/* Ok, we got everything we need. Now we will write out the actual new oper block! */
+
+	/* oper block header & oper::mask */
+	snprintf(buf, sizeof(buf), "oper %s {\n"
+	                           "\t%s",
+	                           name,
+	                           maskbuf);
+
+	/* oper::password */
+	if (password_type)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tpassword \"%s\" { %s; };\n", password, password_type);
+	else
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tpassword \"%s\";\n", password);
+
+	/* oper::require-modes */
+	if (require_modes)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\trequire-modes \"%s\";\n", require_modes);
+
+	/* oper::maxlogins */
+	if (maxlogins != -1)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmaxlogins %d;\n", maxlogins);
+
+	/* oper::class */
+	snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tclass %s;\n", class);
+
+	/* oper::operclass */
+	snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\toperclass %s;\n", operclass);
+	
+	/* oper::modes */
+	if (modes)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tmodes \"%s\";\n", modes);
+
+	/* oper::snomask */
+	if (snomask)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tsnomask \"%s\";\n", snomask);
+
+	/* oper::vhost */
+	if (vhost)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tvhost \"%s\";\n", vhost);
+
+	/* oper::swhois */
+	if (swhois)
+		snprintf(buf+strlen(buf), sizeof(buf)-strlen(buf), "\tswhois \"%s\";\n", swhois);
+
+	strlcat(buf, "};\n", sizeof(buf));
+	
+	replace_section(ce, buf);
+	config_status("- oper block (%s) converted to new syntax", name);
+	return 1;
+}
+
+void update_read_settings(char *cfgfile)
+{
+	ConfigFile *cf = NULL;
+	ConfigEntry *ce = NULL, *cep, *cepp;
+
+	cf = config_load(cfgfile, NULL);
+	if (!cf)
+		return;
+		
+	if (strstr(cfgfile, "modules.default.conf"))
+		needs_modules_default_conf = 0;
+	else if (strstr(cfgfile, "operclass.default.conf"))
+		needs_operclass_default_conf = 0;
+
+	/* This needs to be read early, as the rest may depend on it */
+	for (ce = cf->cf_entries; ce; ce = ce->ce_next)
+	{
+		if (!strcmp(ce->ce_varname, "set"))
+		{
+			for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			{
+				if (!strcmp(cep->ce_varname, "hosts"))
+				{
+					for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					{
+						if (!cepp->ce_vardata)
+							continue;
+						if (!strcmp(cepp->ce_varname, "local")) {
+							safe_strdup(upgrade.locop_host, cepp->ce_vardata);
+						}
+						else if (!strcmp(cepp->ce_varname, "global")) {
+							safe_strdup(upgrade.oper_host, cepp->ce_vardata);
+						}
+						else if (!strcmp(cepp->ce_varname, "coadmin")) {
+							safe_strdup(upgrade.coadmin_host, cepp->ce_vardata);
+						}
+						else if (!strcmp(cepp->ce_varname, "admin")) {
+							safe_strdup(upgrade.admin_host, cepp->ce_vardata);
+						}
+						else if (!strcmp(cepp->ce_varname, "servicesadmin")) {
+							safe_strdup(upgrade.sadmin_host, cepp->ce_vardata);
+						}
+						else if (!strcmp(cepp->ce_varname, "netadmin")) {
+							safe_strdup(upgrade.netadmin_host, cepp->ce_vardata);
+						}
+						else if (!strcmp(cepp->ce_varname, "host-on-oper-up")) {
+							upgrade.host_on_oper_up = config_checkval(cepp->ce_vardata,CFG_YESNO);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	config_free(cf);
+}
+
+
+int update_conf_file(void)
+{
+	ConfigFile *cf = NULL;
+	ConfigEntry *ce = NULL, *cep, *cepp;
+	int update_conf_runs = 0;
+
+again:
+	if (update_conf_runs++ > 100)
+	{
+		config_error("update conf re-run overflow. whoops! upgrade failed! sorry!");
+		return 0;
+	}
+	
+	if (cf)
+	{
+		config_free(cf);
+		cf = NULL;
+	}
+
+	cf = config_load(configfiletmp, NULL);
+	if (!cf)
+	{
+		config_error("could not load configuration file '%s'", configfile);
+		return 0;
+	}
+
+	for (ce = cf->cf_entries; ce; ce = ce->ce_next)
+	{
+		/*printf("%s%s%s\n",
+			ce->ce_varname,
+			ce->ce_vardata ? " " : "",
+			ce->ce_vardata ? ce->ce_vardata : ""); */
+		
+		if (!strcmp(ce->ce_varname, "loadmodule"))
+		{
+			if (upgrade_loadmodule(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "include"))
+		{
+			if (upgrade_include(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "me"))
+		{
+			if (upgrade_me_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "link"))
+		{
+			if (upgrade_link_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "oper"))
+		{
+			if (upgrade_oper_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "vhost"))
+		{
+			for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			{
+				if (!strcmp(cep->ce_varname, "from"))
+				{
+					if (upgrade_from_subblock(cep))
+						goto again;
+				}
+			}
+		}
+		if (!strcmp(ce->ce_varname, "spamfilter"))
+		{
+			if (upgrade_spamfilter_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "allow") && !ce->ce_vardata) /* 'allow' block for clients, not 'allow channel' etc.. */
+		{
+			if (upgrade_allow_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "listen"))
+		{
+			if (upgrade_listen_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "cgiirc"))
+		{
+			if (upgrade_cgiirc_block(ce))
+				goto again;
+		}
+		if (!strcmp(ce->ce_varname, "set"))
+		{
+			for (cep = ce->ce_entries; cep; cep = cep->ce_next)
+			{
+				if (!strcmp(cep->ce_varname, "throttle"))
+				{
+					int n = 0, t = 0;
+					for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+					{
+						if (!cepp->ce_vardata)
+							continue;
+						if (!strcmp(cepp->ce_varname, "period"))
+							t = config_checkval(cepp->ce_vardata, CFG_TIME);
+						else if (!strcmp(cepp->ce_varname, "connections"))
+							n = atoi(cepp->ce_vardata);
+					}
+
+					remove_section(cep->ce_fileposstart, cep->ce_fileposend);
+					snprintf(buf, sizeof(buf), "anti-flood { connect-flood %d:%d; };\n",
+					         n, t);
+						
+					insert_section(cep->ce_fileposstart, buf);
+					goto again;
+				} else
+				if (!strcmp(cep->ce_varname, "hosts"))
+				{
+					config_status("- removed set::hosts. we now use oper::vhost for this.");
+					remove_section(cep->ce_fileposstart, cep->ce_fileposend); /* hmm something is wrong here */
+					goto again;
+				} else
+				if (!strcmp(cep->ce_varname, "dns"))
+				{
+					for (cepp = cep->ce_entries; cepp; cepp = cepp->ce_next)
+						if (!strcmp(cepp->ce_varname, "nameserver") ||
+						    !strcmp(cepp->ce_varname, "timeout") ||
+						    !strcmp(cepp->ce_varname, "retries"))
+						{
+							config_status("- removed set::dns::%s. this option is never used.", cepp->ce_varname);
+							remove_section(cepp->ce_fileposstart, cepp->ce_fileposend);
+							goto again;
+						}
+				}
+			}
+		}
+		
+	}	
+
+	if (cf)
+		config_free(cf);
+	
+	return (update_conf_runs > 1) ? 1 : 0;
+}
+
+static int already_included(char *fname, ConfigFile *cf)
+{
+	for (; cf; cf = cf->cf_next)
+		if (!strcmp(cf->cf_filename, fname))
+			return 1;
+
+	return 0;
+}
+
+static void add_include_list(char *fname, ConfigFile **cf)
+{
+	ConfigFile *n = safe_alloc(sizeof(ConfigFile));
+	
+//	config_status("INCLUDE: %s", fname);
+	safe_strdup(n->cf_filename, fname);
+	n->cf_next = *cf;
+	*cf = n;
+}
+
+void build_include_list_ex(char *fname, ConfigFile **cf_list)
+{
+	ConfigFile *cf;
+	ConfigEntry *ce;
+
+	if (strstr(fname, "://"))
+		return; /* Remote include - ignored */
+
+	add_include_list(fname, cf_list);
+
+	cf = config_load(fname, NULL);
+	if (!cf)
+		return;
+
+	for (ce = cf->cf_entries; ce; ce = ce->ce_next)
+		if (!strcmp(ce->ce_varname, "include"))
+		{
+			if ((ce->ce_vardata[0] != '/') && (ce->ce_vardata[0] != '\\') && strcmp(ce->ce_vardata, CPATH))
+			{
+				char *str = safe_alloc(strlen(ce->ce_vardata) + strlen(CONFDIR) + 4);
+				sprintf(str, "%s/%s", CONFDIR, ce->ce_vardata);
+				safe_free(ce->ce_vardata);
+				ce->ce_vardata = str;
+			}
+			if (!already_included(ce->ce_vardata, *cf_list))
+				build_include_list_ex(ce->ce_vardata, cf_list);
+		}
+	
+	config_free(cf);
+}
+
+ConfigFile *build_include_list(char *fname)
+{
+	ConfigFile *cf_list = NULL;
+	
+	build_include_list_ex(fname, &cf_list);
+	return cf_list;
+}
+
+void update_conf(void)
+{
+	ConfigFile *files;
+	ConfigFile *cf;
+	char *mainconf = configfile;
+	int upgraded_files = 0;
+	char answerbuf[128], *answer;
+
+	config_status("You have requested to upgrade your configuration files.");
+	config_status("If you are upgrading from 4.x to 5.x then DO NOT run this script. This script does NOT update config files from 4.x -> 5.x.");
+	config_status("UnrealIRCd 4.2.x configuration files should work OK on 5.x, with only some warnings printed when you boot the IRCd.");
+	config_status("See https://www.unrealircd.org/docs/Upgrading_from_4.x#Configuration_changes");
+	config_status("This upgrade-conf script is only useful if you are upgrading from 3.2.x.");
+	config_status("");
+#ifndef _WIN32
+	do
+	{
+		printf("Continue upgrading 3.2.x to 4.x configuration file format? (Y/N): ");
+		*answerbuf = '\0';
+		answer = fgets(answerbuf, sizeof(answerbuf), stdin);
+		if (answer && (toupper(*answer) == 'N'))
+		{
+			printf("Configuration unchanged.\n");
+			return;
+		}
+		if (answer && (toupper(*answer) == 'Y'))
+		{
+			break;
+		}
+		printf("Invalid response. Please enter either Y or N\n\n");
+	} while(1);
+#endif
+	
+	strlcpy(me.name, "<server>", sizeof(me.name));
+	memset(&upgrade, 0, sizeof(upgrade));
+
+	files = build_include_list(mainconf);
+
+	/* We need to read some original settings first, before we touch anything... */
+	for (cf = files; cf; cf = cf->cf_next)
+	{
+		update_read_settings(cf->cf_filename);
+	}
+	
+	/* Now go upgrade... */
+	for (cf = files; cf; cf = cf->cf_next)
+	{
+		if (!file_exists(cf->cf_filename))
+			continue; /* skip silently. errors were already shown earlier by build_include_list anyway. */
+		configfile = cf->cf_filename;
+		config_status("Checking '%s'...", cf->cf_filename);
+		snprintf(configfiletmp, sizeof(configfiletmp), "%s.tmp", configfile);
+		unlink(configfiletmp);
+		if (!unreal_copyfileex(configfile, configfiletmp, 0))
+		{
+			config_error("Could not create temp file for processing!");
+			die();
+		}
+		if (update_conf_file())
+		{
+			char buf[512];
+			snprintf(buf, sizeof(buf), "%s.old", configfile);
+			if (file_exists(buf))
+			{
+				int i;
+				for (i=0; i<100; i++)
+				{
+					snprintf(buf, sizeof(buf), "%s.old.%d", configfile, i);
+					if (!file_exists(buf))
+						break;
+				}
+			}
+			/* rename original config file to ... */
+			if (rename(configfile, buf) < 0)
+			{
+				config_error("Could not rename original conf '%s' to '%s'", configfile, buf);
+				die();
+			}
+			
+			/* Rename converted conf to config file */
+#ifdef _WIN32
+			/* "If newpath already exists it will be atomically replaced"..
+			 * well.. not on Windows! Error: "File exists"...
+			 */
+			unlink(configfile);
+#endif
+			if (rename(configfiletmp, configfile) < 0)
+			{
+				config_error("Could not rename converted configuration file '%s' to '%s' -- please rename this file yourself!",
+					configfiletmp, configfile);
+				die();
+			}
+			
+			config_status("File '%s' upgrade complete.", configfile);
+			upgraded_files++;
+		} else {
+			unlink(configfiletmp);
+			config_status("File '%s' left unchanged (no upgrade necessary)", configfile);
+		}
+	}
+	configfile = mainconf; /* restore */
+
+	if (needs_operclass_default_conf)
+	{
+		/* There's a slight chance we never added this include, and you get mysterious
+		 * oper permissions errors if you try to use such an operclass and it's missing.
+		 */
+		FILE *fd = fopen(mainconf, "a");
+		if (fd)
+		{
+			fprintf(fd, "\ninclude \"operclass.default.conf\";\n");
+			fclose(fd);
+			config_status("Oh wait, %s needs an include for operclass.default.conf. Added.", mainconf);
+			upgraded_files++;
+		}
+	}	
+	
+	if (upgraded_files > 0)
+	{
+		config_status("");
+		config_status("%d configuration file(s) upgraded. You can now boot UnrealIRCd with your freshly converted conf's!", upgraded_files);
+		config_status("You should probably take a look at the converted configuration files now or at a later time.");
+		config_status("See also https://www.unrealircd.org/docs/Upgrading_from_3.2.x and the sections in there (eg: Oper block)");
+		config_status("");
+	} else {
+		config_status("");
+		config_status("No configuration files were changed. No upgrade was needed. If this is incorrect then please report on https://bugs.unrealircd.org/ !");
+		config_status("");
+	}
+}
+
diff --git a/src/url.c b/src/url.c
new file mode 100644
index 0000000..8535651
--- /dev/null
+++ b/src/url.c
@@ -0,0 +1,458 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/url.c
+ *   (C) 2003 Dominick Meglio and the UnrealIRCd Team
+ *   (C) 2012 William Pitcock <nenolod@dereferenced.org>
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+extern char *SSLKeyPasswd;
+
+#ifndef _WIN32
+extern uid_t irc_uid;
+extern gid_t irc_gid;
+#endif
+
+CURLM *multihandle;
+
+/* Stores information about the async transfer.
+ * Used to maintain information about the transfer
+ * to trigger the callback upon completion.
+ */
+typedef struct
+{
+	vFP callback;
+	void *callback_data;
+	FILE *fd;
+	char filename[PATH_MAX];
+	char *url; /*< must be free()d by url_do_transfers_async() */
+	char errorbuf[CURL_ERROR_SIZE];
+	time_t cachetime;
+} FileHandle;
+
+/*
+ * Determines if the given string is a valid URL. Since libcurl
+ * supports telnet, ldap, and dict such strings are treated as
+ * invalid URLs here since we don't want them supported in
+ * unreal.
+ */
+int url_is_valid(const char *string)
+{
+	if (strstr(string, "telnet://") == string ||
+	    strstr(string, "ldap://") == string ||
+	    strstr(string, "dict://") == string)
+	{
+		return 0;
+	}
+	return (strstr(string, "://") != NULL);
+}
+
+/** A displayable URL for in error messages and such.
+ * This leaves out any authentication information (user:pass)
+ * the URL may contain.
+ */
+const char *displayurl(const char *url)
+{
+	static char buf[512];
+	char *proto, *rest;
+
+	/* protocol://user:pass@host/etc.. */
+	rest = strchr(url, '@');
+
+	if (!rest)
+		return url; /* contains no auth information */
+
+	rest++; /* now points to the rest (remainder) of the URL */
+
+	proto = strstr(url, "://");
+	if (!proto || (proto > rest) || (proto == url))
+		return url; /* incorrectly formatted, just show entire URL. */
+
+	/* funny, we don't ship strlncpy.. */
+	*buf = '\0';
+	strlncat(buf, url, sizeof(buf), proto - url);
+	strlcat(buf, "://***:***@", sizeof(buf));
+	strlcat(buf, rest, sizeof(buf));
+
+	return buf;
+}
+
+/*
+ * Returns the filename portion of the URL. The returned string
+ * is malloc()'ed and must be freed by the caller. If the specified
+ * URL does not contain a filename, a '-' is allocated and returned.
+ */
+char *url_getfilename(const char *url)
+{
+	const char *c, *start;
+
+	if ((c = strstr(url, "://")))
+		c += 3;
+	else
+		c = url;
+
+	while (*c && *c != '/')
+		c++;
+
+	if (*c == '/')
+	{
+		c++;
+		if (!*c || *c == '?')
+			return raw_strdup("-");
+		start = c;
+		while (*c && *c != '?')
+			c++;
+		if (!*c)
+			return raw_strdup(start);
+		else
+			return raw_strldup(start, c-start+1);
+
+	}
+	return raw_strdup("-");
+}
+
+/*
+ * Sets up all of the SSL options necessary to support HTTPS/FTPS
+ * transfers.
+ */
+static void set_curl_tls_options(CURL *curl)
+{
+	char buf[512];
+	
+#if 0
+	/* This would only be necessary if you use client certificates over HTTPS and such.
+	 * But this information is not known yet since the configuration file has not been
+	 * parsed yet at this point.
+	 */
+	curl_easy_setopt(curl, CURLOPT_SSLCERT, iConf.tls_options->certificate_file);
+	if (SSLKeyPasswd)
+		curl_easy_setopt(curl, CURLOPT_SSLKEYPASSWD, SSLKeyPasswd);
+	curl_easy_setopt(curl, CURLOPT_SSLKEY, iConf.tls_options->key_file);
+#endif
+
+	snprintf(buf, sizeof(buf), "%s/tls/curl-ca-bundle.crt", CONFDIR);
+	curl_easy_setopt(curl, CURLOPT_CAINFO, buf);
+}
+
+/*
+ * Used by CURLOPT_WRITEFUNCTION to actually write the data to
+ * a stream.
+ */
+static size_t do_download(void *ptr, size_t size, size_t nmemb, void *stream)
+{
+	return fwrite(ptr, size, nmemb, (FILE *)stream);
+}
+
+/*
+ * Handles synchronous downloading of a file. This function allows
+ * a download to be made transparently without the caller having any
+ * knowledge of how libcurl works. If the function succeeds, the
+ * filename the file was downloaded to is returned. Otherwise NULL
+ * is returned and the string pointed to by error contains the error
+ * message. The returned filename is malloc'ed and must be freed by
+ * the caller.
+ */
+char *download_file(const char *url, char **error)
+{
+	static char errorbuf[CURL_ERROR_SIZE];
+	CURL *curl = curl_easy_init();
+	CURLcode res;
+	char *file = url_getfilename(url);
+	char *filename = unreal_getfilename(file);
+	char *tmp = unreal_mktemp(TMPDIR, filename ? filename : "download.conf");
+	FILE *fd;
+
+
+	if (!curl)
+	{
+		safe_free(file);
+		strlcpy(errorbuf, "curl_easy_init() failed", sizeof(errorbuf));
+		*error = errorbuf;
+		return NULL;
+	}
+
+	fd = fopen(tmp, "wb");
+	if (!fd)
+	{
+		snprintf(errorbuf, CURL_ERROR_SIZE, "Cannot write to %s: %s", tmp, strerror(errno));
+		safe_free(file);
+		*error = errorbuf;
+		return NULL;
+	}
+	curl_easy_setopt(curl, CURLOPT_URL, url);
+	curl_easy_setopt(curl, CURLOPT_WRITEDATA, fd);
+	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, do_download);
+	curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+	curl_easy_setopt(curl, CURLOPT_FILETIME, 1);
+ 	curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
+ 	curl_easy_setopt(curl, CURLOPT_TIMEOUT, 45);
+ 	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
+#if LIBCURL_VERSION_NUM >= 0x070f01
+ 	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+ 	curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 1);
+#endif
+	/* We need to set CURLOPT_FORBID_REUSE because otherwise libcurl does not
+	 * notify us (or not in time) about FD close/opens, thus we end up closing and
+	 * screwing up another innocent FD, like a listener (BAD!). In my view a bug, but
+	 * mailing list archives seem to indicate curl devs have a different opinion
+	 * on these matters...
+	 * Actually I don't know for sure if this option alone fixes 100% of the cases
+	 * but at least I can't crash my server anymore.
+	 * As a side-effect we also fix useless CLOSE_WAIT connections.
+	 */
+	curl_easy_setopt(curl, CURLOPT_FORBID_REUSE, 1);
+
+	set_curl_tls_options(curl);
+	memset(errorbuf, 0, CURL_ERROR_SIZE);
+	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errorbuf);
+	res = curl_easy_perform(curl);
+	fclose(fd);
+	safe_free(file);
+	if (res == CURLE_OK)
+	{
+		long last_mod;
+
+		curl_easy_getinfo(curl, CURLINFO_FILETIME, &last_mod);
+		curl_easy_cleanup(curl);
+
+		if (last_mod != -1)
+			unreal_setfilemodtime(tmp, last_mod);
+		return raw_strdup(tmp);
+	}
+	else
+	{
+		curl_easy_cleanup(curl);
+		remove(tmp);
+		*error = errorbuf;
+		return NULL;
+	}
+}
+
+/*
+ * Interface for new-style evented I/O.
+ *
+ * url_socket_pollcb is the callback from our eventing system into
+ * cURL.
+ *
+ * The other callbacks are for cURL notifying our event system what
+ * it wants to do.
+ */
+static void url_check_multi_handles(void)
+{
+	CURLMsg *msg;
+	int msgs_left;
+
+	while ((msg = curl_multi_info_read(multihandle, &msgs_left)) != NULL)
+	{
+		if (msg->msg == CURLMSG_DONE)
+		{
+			FileHandle *handle;
+			long code;
+			long last_mod;
+			CURL *easyhand = msg->easy_handle;
+
+			curl_easy_getinfo(easyhand, CURLINFO_RESPONSE_CODE, &code);
+			curl_easy_getinfo(easyhand, CURLINFO_PRIVATE, (char **) &handle);
+			curl_easy_getinfo(easyhand, CURLINFO_FILETIME, &last_mod);
+			fclose(handle->fd);
+
+			if (msg->data.result == CURLE_OK)
+			{
+				if (code == 304 || (last_mod != -1 && last_mod <= handle->cachetime))
+				{
+					handle->callback(handle->url, NULL, NULL, 1, handle->callback_data);
+					remove(handle->filename);
+				}
+				else
+				{
+					if (last_mod != -1)
+						unreal_setfilemodtime(handle->filename, last_mod);
+
+					handle->callback(handle->url, handle->filename, NULL, 0, handle->callback_data);
+					remove(handle->filename);
+				}
+			}
+			else
+			{
+				handle->callback(handle->url, NULL, handle->errorbuf, 0, handle->callback_data);
+				remove(handle->filename);
+			}
+
+			safe_free(handle->url);
+			safe_free(handle);
+			curl_multi_remove_handle(multihandle, easyhand);
+
+			/* NOTE: after curl_multi_remove_handle() you cannot use
+			 * 'msg' anymore because it has freed by curl (as of v7.11.0),
+			 * therefore 'easyhand' is used... fun! -- Syzop
+			 */
+			curl_easy_cleanup(easyhand);
+		}
+	}
+}
+
+static void url_socket_pollcb(int fd, int revents, void *data)
+{
+	int flags = 0;
+	int dummy;
+
+	if (revents & FD_SELECT_READ)
+		flags |= CURL_CSELECT_IN;
+	if (revents & FD_SELECT_WRITE)
+		flags |= CURL_CSELECT_OUT;
+
+	curl_multi_socket_action(multihandle, fd, flags, &dummy);
+	url_check_multi_handles();
+}
+
+static int url_socket_cb(CURL *e, curl_socket_t s, int what, void *cbp, void *sockp)
+{
+	Debug((DEBUG_DEBUG, "url_socket_cb: %d (%s)", (int)s, (what == CURL_POLL_REMOVE)?"remove":"add-or-modify"));
+	if (what == CURL_POLL_REMOVE)
+	{
+		/* Socket is going to be closed *BY CURL*.. so don't call fd_close() but fd_unmap().
+		 * Otherwise we (or actually, they) may end up closing the wrong fd.
+		 */
+		fd_unmap(s);
+	}
+	else
+	{
+		FDEntry *fde = &fd_table[s];
+		int flags = 0;
+		
+		if (!fde->is_open)
+		{
+			fd_open(s, "CURL transfer");
+		}
+
+		if (what == CURL_POLL_IN || what == CURL_POLL_INOUT)
+			flags |= FD_SELECT_READ;
+
+		if (what == CURL_POLL_OUT || what == CURL_POLL_INOUT)
+			flags |= FD_SELECT_WRITE;
+
+		fd_setselect(s, flags, url_socket_pollcb, NULL);
+	}
+
+	return 0;
+}
+
+/* Handle timeouts. */
+static EVENT(curl_socket_timeout)
+{
+	int dummy;
+
+	curl_multi_socket_action(multihandle, CURL_SOCKET_TIMEOUT, 0, &dummy);
+	url_check_multi_handles();
+}
+
+static Event *curl_socket_timeout_hdl = NULL;
+
+/*
+ * Initializes the URL system
+ */
+void url_init(void)
+{
+	curl_global_init(CURL_GLOBAL_ALL);
+	multihandle = curl_multi_init();
+
+	curl_multi_setopt(multihandle, CURLMOPT_SOCKETFUNCTION, url_socket_cb);
+	curl_socket_timeout_hdl = EventAdd(NULL, "curl_socket_timeout", curl_socket_timeout, NULL, 500, 0);
+}
+
+/*
+ * Handles asynchronous downloading of a file. This function allows
+ * a download to be made transparently without the caller having any
+ * knowledge of how libcurl works. The specified callback function is
+ * called when the download completes, or the download fails. The 
+ * callback function is defined as:
+ *
+ * void callback(const char *url, const char *filename, char *errorbuf, int cached, void *data);
+ *  - url will contain the original URL used to download the file.
+ *  - filename will contain the name of the file (if successful, NULL on error or if cached).
+ *    This file will be cleaned up after the callback returns, so save a copy to support caching.
+ *  - errorbuf will contain the error message (if failed, NULL otherwise).
+ *  - cached 1 if the specified cachetime is >= the current file on the server,
+ *    if so, errorbuf will be NULL, filename will contain the path to the file.
+ *  - data will be the value of callback_data, allowing you to figure
+ *    out how to use the data contained in the downloaded file ;-).
+ *    Make sure that if you access the contents of this pointer, you
+ *    know that this pointer will persist. A download could take more
+ *    than 10 seconds to happen and the config file can be rehashed
+ *    multiple times during that time.
+ */
+void download_file_async(const char *url, time_t cachetime, vFP callback, void *callback_data)
+{
+	static char errorbuf[CURL_ERROR_SIZE];
+	CURL *curl = curl_easy_init();
+	if (curl)
+	{
+		char *file = url_getfilename(url);
+		char *filename = unreal_getfilename(file);
+		char *tmp = unreal_mktemp(TMPDIR, filename ? filename : "download.conf");
+		FileHandle *handle = safe_alloc(sizeof(FileHandle));
+		handle->fd = fopen(tmp, "wb");
+		if (!handle->fd)
+		{
+			snprintf(errorbuf, sizeof(errorbuf), "Cannot create '%s': %s", tmp, strerror(ERRNO));
+			callback(url, NULL, errorbuf, 0, callback_data);
+			safe_free(file);
+			safe_free(handle);
+			return;
+		}
+		handle->callback = callback;
+		handle->callback_data = callback_data;
+		handle->cachetime = cachetime;
+		safe_strdup(handle->url, url);
+		strlcpy(handle->filename, tmp, sizeof(handle->filename));
+		safe_free(file);
+
+		curl_easy_setopt(curl, CURLOPT_URL, url);
+		curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, do_download);
+		curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void *)handle->fd);
+		curl_easy_setopt(curl, CURLOPT_FAILONERROR, 1);
+		set_curl_tls_options(curl);
+		memset(handle->errorbuf, 0, CURL_ERROR_SIZE);
+		curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, handle->errorbuf);
+		curl_easy_setopt(curl, CURLOPT_PRIVATE, (char *)handle);
+		curl_easy_setopt(curl, CURLOPT_FILETIME, 1);
+		/* We need to set CURLOPT_FORBID_REUSE because otherwise libcurl does not
+		 * notify us (or not in time) about FD close/opens, thus we end up closing and
+		 * screwing up another innocent FD, like a listener (BAD!). In my view a bug, but
+		 * mailing list archives seem to indicate curl devs have a different opinion
+		 * on these matters...
+		 * Actually I don't know for sure if this option alone fixes 100% of the cases
+		 * but at least I can't crash my server anymore.
+		 * As a side-effect we also fix useless CLOSE_WAIT connections.
+		 */
+		curl_easy_setopt(curl, CURLOPT_FORBID_REUSE, 1);
+		if (cachetime)
+		{
+			curl_easy_setopt(curl, CURLOPT_TIMECONDITION, CURL_TIMECOND_IFMODSINCE);
+			curl_easy_setopt(curl, CURLOPT_TIMEVALUE, cachetime);
+		}
+		curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
+		curl_easy_setopt(curl, CURLOPT_TIMEOUT, 45);
+		curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15);
+#if LIBCURL_VERSION_NUM >= 0x070f01
+		curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1);
+		curl_easy_setopt(curl, CURLOPT_MAXREDIRS, 1);
+#endif
+
+		curl_multi_add_handle(multihandle, curl);
+	}
+}
diff --git a/src/user.c b/src/user.c
new file mode 100644
index 0000000..2d8016c
--- /dev/null
+++ b/src/user.c
@@ -0,0 +1,701 @@
+/*
+ *   Unreal Internet Relay Chat Daemon, src/user.c
+ *   Copyright (C) 1990 Jarkko Oikarinen and
+ *                      University of Oulu, Computing Center
+ *
+ *   See file AUTHORS in IRC package for additional names of
+ *   the programmers.
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+/** @file
+ * @brief User-related functions
+ */
+
+/* s_user.c 2.74 2/8/94 (C) 1988 University of Oulu, Computing Center and Jarkko Oikarinen */
+
+#include "unrealircd.h"
+
+MODVAR int dontspread = 0;
+static char buf[BUFSIZE];
+
+/** Inhibit labeled/response reply. This means it will result in an empty ACK
+ *  because we cannot handle the command via labeled-reponse. Rare, but
+ *  possible in for example /TRACE which multiple servers handle and which
+ *  has no clear end.
+ */
+MODVAR int labeled_response_inhibit = 0;
+
+/** Force a labeled/response reply (of course, only if a label is present etc.).
+ * This is used in case the "a remote server is handling the request" was
+ * incorrect and there were 0 responses. This is the case for PRIVMSG.
+ * It will force an empty ACK.
+ * No, this cannot be merged with the other one. Also, the other one
+ * (labeled_response_inhibit) has priority over this one (labeled_response_force).
+ */
+MODVAR int labeled_response_force = 0;
+
+/** Inhibit labeled/response END. Only used in /LIST.
+ */
+MODVAR int labeled_response_inhibit_end = 0;
+
+/** Set to 1 if an UTF8 incompatible nick character set is in use */
+MODVAR int non_utf8_nick_chars_in_use = 0;
+
+/** Set a new vhost on the user
+ * @param client	The client (user)
+ * @param host		The new vhost
+ */
+void iNAH_host(Client *client, char *host)
+{
+	if (!client->user)
+		return;
+
+	userhost_save_current(client);
+
+	safe_strdup(client->user->virthost, host);
+	if (MyConnect(client))
+		sendto_server(NULL, 0, 0, NULL, ":%s SETHOST :%s", client->id, client->user->virthost);
+	client->umodes |= UMODE_SETHOST;
+
+	userhost_changed(client);
+
+	sendnumeric(client, RPL_HOSTHIDDEN, client->user->virthost);
+}
+
+/** Convert a user mode string to a bitmask - only used by config.
+ * @param umode		The user mode string
+ * @returns the user mode value (long)
+ */
+long set_usermode(char *umode)
+{
+	int  newumode;
+	int  what;
+	char *m;
+	int i;
+
+	newumode = 0;
+	what = MODE_ADD;
+	for (m = umode; *m; m++)
+		switch (*m)
+		{
+		  case '+':
+			  what = MODE_ADD;
+			  break;
+		  case '-':
+			  what = MODE_DEL;
+			  break;
+		  case ' ':
+		  case '\n':
+		  case '\r':
+		  case '\t':
+			  break;
+		  default:
+		 	 for (i = 0; i <= Usermode_highest; i++)
+		 	 {
+		 	 	if (!Usermode_Table[i].flag)
+		 	 		continue;
+		 	 	if (*m == Usermode_Table[i].flag)
+		 	 	{
+		 	 		if (what == MODE_ADD)
+			 	 		newumode |= Usermode_Table[i].mode;
+			 	 	else
+			 	 		newumode &= ~Usermode_Table[i].mode;
+		 	 	}
+		 	 } 	  
+		}
+
+	return (newumode);
+}
+
+/** Convert a target pointer to an 8 bit hash, used for target limiting. */
+unsigned char hash_target(void *target)
+{
+	unsigned long long v = (unsigned long long)target;
+	/* ircu does >> 16 and 8 but since our sizeof(Client) is
+	 * towards 512 (and hence the alignment), that bit is useless.
+	 * So we do >> 17 and 9.
+	 */
+	return (unsigned char)((v >> 17) ^ (v >> 9));
+}
+
+/** target_limit_exceeded
+ * @param client   The client.
+ * @param target The target client
+ * @param name   The name of the target client (used in the error message)
+ * @retval Returns 1 if too many targets were addressed (do not send!), 0 if ok to send.
+ */
+int target_limit_exceeded(Client *client, void *target, const char *name)
+{
+	u_char hash = hash_target(target);
+	int i;
+
+	if (ValidatePermissionsForPath("immune:max-concurrent-conversations",client,NULL,NULL,NULL))
+		return 0;
+
+	if (client->local->targets[0] == hash)
+		return 0;
+
+	for (i = 1; i < iConf.max_concurrent_conversations_users; i++)
+	{
+		if (client->local->targets[i] == hash)
+		{
+			/* Move this target hash to the first position */
+			memmove(&client->local->targets[1], &client->local->targets[0], i);
+			client->local->targets[0] = hash;
+			return 0;
+		}
+	}
+
+	if (TStime() < client->local->nexttarget)
+	{
+		/* Target limit reached */
+		client->local->nexttarget += 2; /* punish them some more */
+		client->local->since += 2; /* lag them up as well */
+
+		sendnumeric(client, ERR_TARGETTOOFAST, name, client->local->nexttarget - TStime());
+
+		return 1;
+	}
+
+	/* If not set yet or in the very past, then adjust it.
+	 * This is so client->local->nexttarget=0 will become client->local->nexttarget=currenttime-...
+	 */
+	if (TStime() > client->local->nexttarget +
+	    (iConf.max_concurrent_conversations_users * iConf.max_concurrent_conversations_new_user_every))
+	{
+		client->local->nexttarget = TStime() - ((iConf.max_concurrent_conversations_users-1) * iConf.max_concurrent_conversations_new_user_every);
+	}
+
+	client->local->nexttarget += iConf.max_concurrent_conversations_new_user_every;
+
+	/* Add the new target (first move the rest, then add us at position 0 */
+	memmove(&client->local->targets[1], &client->local->targets[0], iConf.max_concurrent_conversations_users - 1);
+	client->local->targets[0] = hash;
+
+	return 0;
+}
+
+/** De-duplicate a string of "x,x,y,z" to "x,y,z"
+ * @param buffer	Input string
+ * @returns The new de-duplicated buffer (temporary storage, only valid until next canonize call)
+ */
+char *canonize(char *buffer)
+{
+	static char cbuf[2048];
+	char *s, *t, *cp = cbuf;
+	int  l = 0;
+	char *p = NULL, *p2;
+
+	*cp = '\0';
+
+	if (!buffer)
+		return NULL;
+
+	/* Ohh.. so lazy. But then again, this should never happen with a 2K buffer anyway. */
+	if (strlen(buffer) >= sizeof(cbuf))
+		buffer[sizeof(cbuf)-1] = '\0';
+
+	for (s = strtoken(&p, buffer, ","); s; s = strtoken(&p, NULL, ","))
+	{
+		if (l)
+		{
+			for (p2 = NULL, t = strtoken(&p2, cbuf, ","); t;
+			    t = strtoken(&p2, NULL, ","))
+				if (!mycmp(s, t))
+					break;
+				else if (p2)
+					p2[-1] = ',';
+		}
+		else
+			t = NULL;
+		if (!t)
+		{
+			if (l)
+				*(cp - 1) = ',';
+			else
+				l = 1;
+			strcpy(cp, s);
+			if (p)
+				cp += (p - s);
+		}
+		else if (p2)
+			p2[-1] = ',';
+	}
+	return cbuf;
+}
+
+/** Get snomasks as a string.
+ * @param client	The client
+ * @returns string of snomasks (temporary storage)
+ */
+char *get_snomask_string(Client *client)
+{
+	int i;
+	char *m;
+
+	m = buf;
+
+	*m++ = '+';
+	for (i = 0; i <= Snomask_highest && (m - buf < BUFSIZE - 4); i++)
+		if (Snomask_Table[i].flag && client->user->snomask & Snomask_Table[i].mode)
+			*m++ = Snomask_Table[i].flag;
+	*m = 0;
+	return buf;
+}
+
+/** Get user modes as a string.
+ * @param client	The client
+ * @returns string of user modes (temporary storage)
+ */
+char *get_usermode_string(Client *client)
+{
+	int  i;
+	char *m;
+
+	m = buf;
+	*m++ = '+';
+	for (i = 0; (i <= Usermode_highest) && (m - buf < BUFSIZE - 4); i++)
+		if (Usermode_Table[i].flag && (client->umodes & Usermode_Table[i].mode))
+			*m++ = Usermode_Table[i].flag;
+	*m = '\0';
+	return buf;
+}
+
+
+/** Get user modes as a string - this one does not work on 'client' but directly on 'umodes'.
+ * @param umodes	The user modes that are set
+ * @returns string of user modes (temporary storage)
+ */
+char *get_usermode_string_raw(long umodes)
+{
+	int  i;
+	char *m;
+
+	m = buf;
+	*m++ = '+';
+	for (i = 0; (i <= Usermode_highest) && (m - buf < BUFSIZE - 4); i++)
+		
+		if (Usermode_Table[i].flag && (umodes & Usermode_Table[i].mode))
+			*m++ = Usermode_Table[i].flag;
+	*m = '\0';
+	return buf;
+}
+
+/** Get snomasks as a string - this one does not work on 'client' but directly on 'sno'.
+ * @param sno	The snomasks that are set
+ * @returns string of snomasks (temporary storage)
+ */
+char *get_snomask_string_raw(long sno)
+{
+	int i;
+	char *m;
+
+	m = buf;
+
+	*m++ = '+';
+	for (i = 0; i <= Snomask_highest && (m - buf < BUFSIZE - 4); i++)
+		if (Snomask_Table[i].flag && sno & Snomask_Table[i].mode)
+			*m++ = Snomask_Table[i].flag;
+	*m = 0;
+	return buf;
+}
+
+/** Set a new snomask on the user.
+ * The user is not informed of the change by this function.
+ * @param client	The client
+ * @param snomask	The snomask to add or delete (eg: "+k-c")
+ */
+void set_snomask(Client *client, char *snomask)
+{
+	int what = MODE_ADD; /* keep this an int. -- Syzop */
+	char *p;
+	int i;
+	if (snomask == NULL) {
+		client->user->snomask = 0;
+		return;
+	}
+	
+	for (p = snomask; p && *p; p++) {
+		switch (*p) {
+			case '+':
+				what = MODE_ADD;
+				break;
+			case '-':
+				what = MODE_DEL;
+				break;
+			default:
+		 	 for (i = 0; i <= Snomask_highest; i++)
+		 	 {
+		 	 	if (!Snomask_Table[i].flag)
+		 	 		continue;
+		 	 	if (*p == Snomask_Table[i].flag)
+		 	 	{
+					if (Snomask_Table[i].allowed && !Snomask_Table[i].allowed(client,what))
+						continue;
+		 	 		if (what == MODE_ADD)
+			 	 		client->user->snomask |= Snomask_Table[i].mode;
+			 	 	else
+			 	 		client->user->snomask &= ~Snomask_Table[i].mode;
+		 	 	}
+		 	 }				
+		}
+	}
+}
+
+/** Build the MODE line with (modified) user modes for this user.
+ * @author Originally by avalon.
+ */
+void build_umode_string(Client *client, long old, long sendmask, char *umode_buf)
+{
+	int i;
+	long flag;
+	char *m;
+	int what = MODE_NULL;
+
+	/*
+	 * build a string in umode_buf to represent the change in the user's
+	 * mode between the new (client->flag) and 'old'.
+	 */
+	m = umode_buf;
+	*m = '\0';
+	for (i = 0; i <= Usermode_highest; i++)
+	{
+		if (!Usermode_Table[i].flag)
+			continue;
+		flag = Usermode_Table[i].mode;
+		if (MyUser(client) && !(flag & sendmask))
+			continue;
+		if ((flag & old) && !(client->umodes & flag))
+		{
+			if (what == MODE_DEL)
+				*m++ = Usermode_Table[i].flag;
+			else
+			{
+				what = MODE_DEL;
+				*m++ = '-';
+				*m++ = Usermode_Table[i].flag;
+			}
+		}
+		else if (!(flag & old) && (client->umodes & flag))
+		{
+			if (what == MODE_ADD)
+				*m++ = Usermode_Table[i].flag;
+			else
+			{
+				what = MODE_ADD;
+				*m++ = '+';
+				*m++ = Usermode_Table[i].flag;
+			}
+		}
+	}
+	*m = '\0';
+}
+
+/** Send usermode change to other servers.
+ * @param client	The client
+ * @param show_to_user	Set to 1 to show the MODE change to the user
+ * @param old		The old user modes set on the client
+ */
+void send_umode_out(Client *client, int show_to_user, long old)
+{
+	Client *acptr;
+
+	build_umode_string(client, old, SEND_UMODES, buf);
+
+	list_for_each_entry(acptr, &server_list, special_node)
+	{
+		if ((acptr != client) && (acptr != client->direction) && *buf)
+		{
+			sendto_one(acptr, NULL, ":%s UMODE2 %s",
+			           client->name, buf);
+		}
+	}
+
+	if (MyUser(client) && show_to_user)
+	{
+		build_umode_string(client, old, ALL_UMODES, buf);
+		if (*buf)
+			sendto_one(client, NULL, ":%s MODE %s :%s", client->name, client->name, buf);
+	}
+}
+
+static MaxTarget *maxtargets = NULL; /**< For set::max-targets-per-command configuration */
+
+static void maxtarget_add_sorted(MaxTarget *n)
+{
+	MaxTarget *e;
+
+	if (!maxtargets)
+	{
+		maxtargets = n;
+		return;
+	}
+
+	for (e = maxtargets; e; e = e->next)
+	{
+		if (strcmp(n->cmd, e->cmd) < 0)
+		{
+			/* Insert us before */
+			if (e->prev)
+				e->prev->next = n;
+			else
+				maxtargets = n; /* new head */
+			n->prev = e->prev;
+
+			n->next = e;
+			e->prev = n;
+			return;
+		}
+		if (!e->next)
+		{
+			/* Append us at end */
+			e->next = n;
+			n->prev = e;
+			return;
+		}
+	}
+}
+
+/** Find a maxtarget structure for a cmd (internal) */
+MaxTarget *findmaxtarget(char *cmd)
+{
+	MaxTarget *m;
+
+	for (m = maxtargets; m; m = m->next)
+		if (!strcasecmp(m->cmd, cmd))
+			return m;
+	return NULL;
+}
+
+/** Set a maximum targets per command restriction */
+void setmaxtargets(char *cmd, int limit)
+{
+	MaxTarget *m = findmaxtarget(cmd);
+	if (!m)
+	{
+		char cmdupper[64], *i, *o;
+		if (strlen(cmd) > 63)
+			cmd[63] = '\0';
+		for (i=cmd,o=cmdupper; *i; i++)
+			*o++ = toupper(*i);
+		*o = '\0';
+		m = safe_alloc(sizeof(MaxTarget));
+		safe_strdup(m->cmd, cmdupper);
+		maxtarget_add_sorted(m);
+	}
+	m->limit = limit;
+}
+
+/** Free all set::max-targets-per-command configuration (internal) */
+void freemaxtargets(void)
+{
+	MaxTarget *m, *m_next;
+
+	for (m = maxtargets; m; m = m_next)
+	{
+		m_next = m->next;
+		safe_free(m->cmd);
+		safe_free(m);
+	}
+	maxtargets = NULL;
+}
+
+/** Return the maximum number of targets permitted for a command */
+int max_targets_for_command(char *cmd)
+{
+	MaxTarget *m = findmaxtarget(cmd);
+	if (m)
+		return m->limit;
+	return 1; /* default to 1 */
+}
+
+void set_isupport_targmax(void)
+{
+	char buf[512], tbuf[64];
+	MaxTarget *m;
+
+	*buf = '\0';
+	for (m = maxtargets; m; m = m->next)
+	{
+		if (m->limit == MAXTARGETS_MAX)
+			snprintf(tbuf, sizeof(tbuf), "%s:", m->cmd);
+		else
+			snprintf(tbuf, sizeof(tbuf), "%s:%d", m->cmd, m->limit);
+
+		if (*buf)
+			strlcat(buf, ",", sizeof(buf));
+		strlcat(buf, tbuf, sizeof(buf));
+	}
+	ISupportSet(NULL, "TARGMAX", buf);
+}
+
+/** Called between config test and config run */
+void set_targmax_defaults(void)
+{
+	/* Free existing... */
+	freemaxtargets();
+
+	/* Set the defaults */
+	setmaxtargets("PRIVMSG", 4);
+	setmaxtargets("NOTICE", 1);
+	setmaxtargets("NAMES", 1); // >1 is not supported
+	setmaxtargets("WHOIS", 1);
+	setmaxtargets("WHOWAS", 1); // >1 is not supported
+	setmaxtargets("KICK", 4);
+	setmaxtargets("LIST", MAXTARGETS_MAX);
+	setmaxtargets("JOIN", MAXTARGETS_MAX);
+	setmaxtargets("PART", MAXTARGETS_MAX);
+	setmaxtargets("SAJOIN", MAXTARGETS_MAX);
+	setmaxtargets("SAPART", MAXTARGETS_MAX);
+	setmaxtargets("KILL", MAXTARGETS_MAX);
+	setmaxtargets("DCCALLOW", MAXTARGETS_MAX);
+	/* The following 3 are space-separated (and actually the previous
+	 * mentioned DCCALLOW is both space-and-comma separated).
+	 * It seems most IRCd's don't list space-separated targets list
+	 * in TARGMAX... On the other hand, why not? It says nowhere in
+	 * the TARGMAX specification that it's only for comma-separated
+	 * commands. So let's be nice and consistent and inform the
+	 * clients about the limits for such commands as well:
+	 */
+	setmaxtargets("USERHOST", MAXTARGETS_MAX); // not configurable
+	setmaxtargets("USERIP", MAXTARGETS_MAX); // not configurable
+	setmaxtargets("ISON", MAXTARGETS_MAX); // not configurable
+	setmaxtargets("WATCH", MAXTARGETS_MAX); // not configurable
+}
+
+/** Is the user handshake finished and can register_user() be called?
+ * This checks things like: do we have a NICK, USER, nospoof,
+ * and any other things modules may add:
+ * eg: the cap module checks if client capability negotiation
+ * is in progress
+ */
+int is_handshake_finished(Client *client)
+{
+	Hook *h;
+	int n;
+
+	for (h = Hooks[HOOKTYPE_IS_HANDSHAKE_FINISHED]; h; h = h->next)
+	{
+		n = (*(h->func.intfunc))(client);
+		if (n == 0)
+			return 0; /* We can stop already */
+	}
+
+	/* I figured these can be here, in the core: */
+	if (client->user && *client->user->username && client->name[0] && IsNotSpoof(client))
+		return 1;
+
+	return 0;
+}
+
+/** Should we show connection info to the user?
+ * This depends on the set::show-connect-info setting but also
+ * on various other properties, such as serversonly ports,
+ * websocket, etc.
+ * If someone needs it, then we can also call a hook here. Just tell us.
+ */
+int should_show_connect_info(Client *client)
+{
+	if (SHOWCONNECTINFO &&
+	    !client->serv &&
+	    !IsServersOnlyListener(client->local->listener) &&
+	    !client->local->listener->websocket_options)
+	{
+		return 1;
+	}
+	return 0;
+}
+
+/* (helper function for uid_get) */
+static char uid_int_to_char(int v)
+{
+	if (v < 10)
+		return '0'+v;
+	else
+		return 'A'+v-10;
+}
+
+/** Acquire a new unique UID */
+const char *uid_get(void)
+{
+	Client *acptr;
+	static char uid[IDLEN];
+	static int uidcounter = 0;
+
+	uidcounter++;
+	if (uidcounter == 36*36)
+		uidcounter = 0;
+
+	do
+	{
+		snprintf(uid, sizeof(uid), "%s%c%c%c%c%c%c",
+			me.id,
+			uid_int_to_char(getrandom8() % 36),
+			uid_int_to_char(getrandom8() % 36),
+			uid_int_to_char(getrandom8() % 36),
+			uid_int_to_char(getrandom8() % 36),
+			uid_int_to_char(uidcounter / 36),
+			uid_int_to_char(uidcounter % 36));
+		acptr = find_client(uid, NULL);
+	} while (acptr);
+
+	return uid;
+}
+
+/** Get cloaked host for user */
+char *getcloak(Client *client)
+{
+	if (!*client->user->cloakedhost)
+	{
+		/* need to calculate (first-time) */
+		make_cloakedhost(client, client->user->realhost, client->user->cloakedhost, sizeof(client->user->cloakedhost));
+	}
+
+	return client->user->cloakedhost;
+}
+
+/** Calculate the cloaked host for a client.
+ * @param client	The client
+ * @param curr		The real host or real IP
+ * @param buf		Buffer to store the new cloaked host in
+ * @param buflen	Length of the buffer (should be HOSTLEN+1)
+ */
+void make_cloakedhost(Client *client, char *curr, char *buf, size_t buflen)
+{
+	char host[256], *mask, *p, *q;
+
+	/* Convert host to lowercase and cut off at 255 bytes just to be sure */
+	for (p = curr, q = host; *p && (q < host+sizeof(host)-1); p++, q++)
+		*q =  tolower(*p);
+	*q = '\0';
+
+	/* Call the cloaking layer */
+	if (RCallbacks[CALLBACKTYPE_CLOAK_EX] != NULL)
+		mask = RCallbacks[CALLBACKTYPE_CLOAK_EX]->func.pcharfunc(client, host);
+	else if (RCallbacks[CALLBACKTYPE_CLOAK] != NULL)
+		mask = RCallbacks[CALLBACKTYPE_CLOAK]->func.pcharfunc(host);
+	else
+		mask = curr;
+
+	strlcpy(buf, mask, buflen);
+}
+
+/** Called after a user is logged in (or out) of a services account */
+void user_account_login(MessageTag *recv_mtags, Client *client)
+{
+	RunHook2(HOOKTYPE_ACCOUNT_LOGIN, client, recv_mtags);
+}
diff --git a/src/utf8.c b/src/utf8.c
new file mode 100644
index 0000000..701479b
--- /dev/null
+++ b/src/utf8.c
@@ -0,0 +1,223 @@
+#include "unrealircd.h"
+
+/**************** UTF8 HELPER FUNCTIONS START HERE *****************/
+
+/* Operations on UTF-8 strings.
+ * This part is taken from "glib" with the following copyright:
+ * Copyright (C) 1999 Tom Tromey
+ * Copyright (C) 2000 Red Hat, Inc.
+ * Taken from the master snapshot on Oct 23, 2018, glib/gutf8.c.
+ * The library uses LGPL 2.1. From what I understand this allows me to
+ * use this code in a GPLv2-compatible way which fits the rest of
+ * the UnrealIRCd project.
+ *
+ * Code stripped and converted heavily to fit in UnrealIRCd by
+ * Bram Matthys ("Syzop") in 2019. Thanks to i <info@servx.org>
+ * for all the directions and help with regards to UTF8 handling.
+ *
+ * Note that with UnrealIRCd, a char is always unsigned char,
+ * which allows us to cut some corners and make more readable
+ * code without 100 casts.
+ */
+
+#define VALIDATE_BYTE(mask, expect) \
+  do {                              \
+    if ((*p & (mask)) != (expect))  \
+      goto error;                   \
+  } while(0)
+
+/* see IETF RFC 3629 Section 4 */
+
+static const char *fast_validate(const char *str)
+{
+	const char *p;
+
+	for (p = str; *p; p++)
+	{
+		if (*p >= 128)
+		{
+			const char *last;
+
+			last = p;
+			if (*p < 0xe0) /* 110xxxxx */
+			{
+				// ehm.. did you forget a ++p ? ;) or whatever
+				if (*p < 0xc2)
+				{
+					goto error;
+				}
+			}
+			else
+			{
+				if (*p < 0xf0) /* 1110xxxx */
+				{
+					switch (*p++ & 0x0f)
+					{
+						case 0:
+							VALIDATE_BYTE(0xe0, 0xa0); /* 0xa0 ... 0xbf */
+							break;
+						case 0x0d:
+							VALIDATE_BYTE(0xe0, 0x80); /* 0x80 ... 0x9f */
+							break;
+						default:
+							VALIDATE_BYTE(0xc0, 0x80); /* 10xxxxxx */
+					}
+				}
+				else if (*p < 0xf5) /* 11110xxx excluding out-of-range */
+				{
+					switch (*p++ & 0x07)
+					{
+						case 0:
+							VALIDATE_BYTE(0xc0, 0x80); /* 10xxxxxx */
+							if ((*p & 0x30) == 0)
+								goto error;
+							break;
+						case 4:
+							VALIDATE_BYTE(0xf0, 0x80); /* 0x80 ... 0x8f */
+							break;
+						default:
+							VALIDATE_BYTE(0xc0, 0x80); /* 10xxxxxx */
+					}
+					p++;
+					VALIDATE_BYTE(0xc0, 0x80); /* 10xxxxxx */
+				}
+				else
+				{
+					goto error;
+				}
+			}
+
+			p++;
+			VALIDATE_BYTE(0xc0, 0x80); /* 10xxxxxx */
+
+			continue;
+
+error:
+			return last;
+		}
+	}
+
+	return p;
+}
+
+/** Check if a string is valid UTF8.
+ * @param str   The string to validate
+ * @param end   Pointer to char *, as explained in notes below.
+ * @returns 1 if the string is valid UTF8, 0 if not.
+ * @note  The variable *end will be set to the first invalid UTF8 sequence.
+ *        If no invalid UTF8 sequence is encountered then it points to the NUL byte.
+ */
+int unrl_utf8_validate(const char *str, const char **end)
+{
+	const char *p;
+
+	p = fast_validate(str);
+
+	if (end)
+		*end = p;
+
+	if (*p != '\0')
+		return 0;
+	else
+		return 1;
+}
+
+/** Go backwards in a string until we are at the end of an UTF8 sequence.
+ * Or more accurately: skip sequences that are part of an UTF8 sequence.
+ * @param begin   The string to check
+ * @param p       Where to start backtracking
+ * @returns Byte that is not in the middle of an UTF8 sequence,
+ *          or NULL if we reached the beginning and that isn't valid either.
+ */
+char *unrl_utf8_find_prev_char (const char *begin, const char *p)
+{
+	for (--p; p >= begin; --p)
+	{
+		if ((*p & 0xc0) != 0x80)
+			return (char *)p;
+	}
+	return NULL;
+}
+
+/** Return a valid UTF8 string based on the input.
+ * @param str The input string, with a maximum of 1024 bytes.
+ * @retval Returns a valid UTF8 string (which may be sanitized
+ *         or simply the original string if it was OK already)
+ */
+char *unrl_utf8_make_valid(const char *str)
+{
+	static char string[4096]; /* crazy, but lazy, max amplification is x3, so x4 is safe. */
+	const char *remainder, *invalid;
+	int remaining_bytes, valid_bytes, len;
+	int replaced = 0; /**< UTF8 string needed replacement (was invalid) */
+
+	if (!str)
+		return NULL;
+
+	len = strlen(str);
+
+	if (len >= 1024)
+		abort(); /* better safe than sorry */
+
+	*string = '\0';
+	remainder = str;
+	remaining_bytes = len;
+
+	while (remaining_bytes != 0)
+	{
+		if (unrl_utf8_validate(remainder, &invalid))
+			break;
+		replaced = 1;
+		valid_bytes = invalid - remainder;
+
+		strlncat(string, remainder, sizeof(string), valid_bytes); /*g_string_append_len(string, remainder, valid_bytes);*/
+		strlcat(string, "\357\277\275", sizeof(string));
+
+		remaining_bytes -= valid_bytes + 1;
+		remainder = invalid + 1;
+	}
+
+	if (!replaced)
+		return (char *)str; /* return original string (no changes needed) */
+
+	/* If output size is too much for an IRC message then cut the string at
+	 * the appropriate place (as in: not to cause invalid UTF8 due to
+	 * cutting half-way a byte sequence).
+	 */
+	if (strlen(string) >= 510)
+	{
+		char *cut_at = unrl_utf8_find_prev_char(string, string+509);
+		if (cut_at)
+			*cut_at = '\0';
+	}
+
+	if (!unrl_utf8_validate(string, NULL))
+		abort(); /* this should never happen, it means our conversion resulted in an invalid UTF8 string */
+
+	return string;
+}
+
+/**************** END OF UTF8 HELPER FUNCTIONS *****************/
+
+/** This is just for internal testing */
+void utf8_test(void)
+{
+	char buf[1024];
+	char *res;
+	int cnt = 0;
+	char *heapbuf; /* for strict OOB testing with ASan */
+
+	while ((fgets(buf, sizeof(buf), stdin)))
+	{
+		stripcrlf(buf);
+		heapbuf = strdup(buf);
+		res = unrl_utf8_make_valid(heapbuf);
+		if (heapbuf == res)
+		{
+			printf("    %s\n", res);
+		} else {
+			printf("[!] %s\n", res);
+		}
+		free(heapbuf);
+	}
+}
diff --git a/src/version.c.SH b/src/version.c.SH
new file mode 100644
index 0000000..19cc542
--- /dev/null
+++ b/src/version.c.SH
@@ -0,0 +1,275 @@
+# $Id$
+
+echo "Extracting src/version.c..."
+
+#id=`grep '$Id: Changes,v' ../Changes`
+#id=`echo $id |sed 's/.* Changes\,v \(.*\) .* Exp .*/\1/'`
+id="5.0.3.1"
+echo "$id"
+
+if test -r version.c
+then
+   generation=`sed -n 's/^char \*generation = \"\(.*\)\";/\1/p' < version.c`
+   if test ! "$generation" ; then generation=0; fi
+else
+   generation=0
+fi
+
+generation=`expr $generation + 1`
+export LANG=C
+export LC_TIME=C
+export LC_ALL=C
+creation=`date | \
+awk '{if (NF == 6) \
+         { print $1 " "  $2 " " $3 " "  $6 " at " $4 " " $5 } \
+else \
+         { print $1 " "  $2 " " $3 " " $7 " at " $4 " " $5 " " $6 }}'`
+
+cat >version.c <<!SUB!THIS!
+/*
+ *   IRC - Internet Relay Chat, ircd/version.c
+ *   Copyright (C) 1990 Chelsea Ashley Dyerman
+ *
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 
+ *   $Id$
+ */
+
+/*
+ * This file is generated by version.c.SH. Any changes made will go away.
+ */
+
+#include "struct.h"
+#include "version.h"
+#include "license.h"
+
+char *generation = "$generation";
+char *creation = "$creation";
+#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
+char *version = IRCDTOTALVERSION;
+char *buildid = "$id";
+/* moved to s_serv.c */
+char *infotext[] = 
+{ 0 };
+
+char *unrealcredits[] =
+{
+	"==================[ " IRCDTOTALVERSION " Credits ]===================",
+	"The people on this list are people who have helped us with the",
+	"development of UnrealIRCd and who have made remarkable",
+	"contributions to the project.",
+	" ",
+	"==========================[ Donations ]==========================",
+	"BlueFlame^, [Real] - ChatFIRST.com, Jameno123 - ByteHosting,",
+	"Internet Services, Interlink Access Corp, Jan Knutar, ThePlayer,",
+	"Headband, noriko, powerstorm.net, RedMaxima, IronHelix, xnet.org,",
+	"Pierce - irc.AAcNet.org, Franky75 - Betas-Online.com, irc.vco.se,",
+	"Beldock - irc.coldfront.net, Kusau - chat.tochat.org, Japsclan,",
+	"WolfLord - UplinkCorp, Isaiah - irc.frogstar.us, Kedrin Milborn,",
+	"Dionisios Koutsikos, Tank - irc.scifi-fans.net, irc.P2Pchat.net,",
+	"Leo Zhadanovsky - irc.leozh.net, Lyote - ZodiaCIrC/DecayOnline,",
+	"Jesse Lanning - Secure Technology Networks, HERZ - insiderZ.DE,",
+	"James Yerge - Kronical Internet Solutions, djw - irc.perldev.org,",
+	"MichaelJE2 - irc.xcelor8.com, AfterShock - irc.liquidvoltage.net,",
+	"recycled-irc - www.recycled-irc.org, Alpha - irc.FireWirez.net,",
+	"FrostByghte - irc.coldfront.net, SdgNem - irc.RealmOfGaming.net,",
+	"MagicalTux - irc.FF.st, irc.P2Pchat.net, Ganja51 - irc.lcirc.net,",
+	"^White_Magic^ - irc.chatuniverse.net, Nick - irc.plasmachat.net,",
+	"Matridom - www.WinDrivers.com, anaconda - irc.lightmoon.org,", 
+	"mnslinky - http://www.secure-computing.net, Justin Furnas,",
+	"Andy Hansis - irc.technerd.net, Crimson - www.n00bstories.com",
+	"Devin Reams, Cleggo - irc.ugcentral.net, Tillo - irc.OSirc.net,",
+	"Matthew Burdine - irc.owns.us, Philip Veale - flame.tiefighter.org,",
+	"Latinus - irc.lokanova.com, Vincent Guesnard - irc.rs2i.net,",
+	"Windfyre IRC Network - irc.windfyre.net, SetNine - www.setnine.com,",
+	"|S| - irc.chatuniverse.net, CommTech Inc. - www.commtechusa.com,",
+	"CatNet IRC - irc.catslair.org, IcE-IRC - irc.ice-irc.de,",
+	"Kevin Devaux, Jackal - www.fyrebird.net, Lax - insiderZ.DE,",
+	"The_devil - chat.snyggast.se, Deltaanime Network - deltaanime.net,",
+	"CatNet IRC network - irc.catslair.org, A-Buz.com - a-buz.com,",
+	"LimonCenter Networks - www.limoncenter.com, Jean-Pierre Fournier,",
+	"AloneInTheDark - irc.sleepwalkers.org, El_barto - irc.ircdit.net,",
+	"Pyrexnetworks - www.pyrexnetworks.com, zunnie - www.MP-Gaming.NET,",
+	"All My Data - www.amdwebhost.com, Wulfie - irc.soundsnwaves.net,",
+	"eCoupons.com - www.ecoupons.com, MauritZ - irc.MindForge.org,",
+	"Voodoohosting - www.voodoohosting.com,",
+	"RealityBytez IRC Network - irc.realitybytez.net,",
+	"LFS - www.linuxfromscratch.org, The_devil - chat.snyggast.se,",
+	"Stephen - dirac.betas-online.com, NationWars - www.nationwars.com,",
+	"SurrealChat.net - www.surrealchat.net, NamesDir - www.namesdir.com,",
+	"Muisje - www.elitez0r.com, Jaya Sri - www.krisna.cc,",
+	"DiabloClone.Org - irc.diabloclone.org, RisingNet - www.RisingNet.net,",
+	"DCloneIRC.net - irc.dcloneirc.net, L.E.-Nation - irc.le-nation.de,",
+	"RomeoIRC - irc.romeoirc.net, Comparison Shopping - www.order.com,",
+	"Atak Trucking - www.AtakTrucking.com, www.Gamehostingprovider.com,",
+	"Xzibition.com - irc.xzibition.com, www.TheBookmarkShop.com,",
+	"Compare Prices - www.PriceV.com, Joe Gronlund - www.joegronlund.com,",
+	"Exoware - www.exoware.net, Bitmaster - irc.synIRC.net,",
+	"Angel IRC - irc.angelirc.net, Pixel - http://indavoid.net,",
+	"Grandview Landscape and Masonry - www.grandviewoutdoor.com,",
+	"Saibot Technologies - http://saibottechnologies.com/,",
+	"IRC-IRC.de Community - irc.irc-irc.de,",
+	"Mike Meisner - www.hottubcoverdepot.com, CubaChat - irc.cubachat.org,",
+	"BluePromoCode - www.bluepromocode.com, DontPayFull - www.dontpayfull.com",
+	"Anikwa - ukblabberbox.co.uk, xShellz - www.xshellz.com, wico,",
+	"Magnolia Road Internet Cooperative, FrostWire - www.frostwire.com,",
+	"Bundeld Inc. - couponlawn.com, Chameleon John - www.chameleonjohn.com,",
+	"Ecigsopedia.com - www.ecigsopedia.com/halo-cigs-coupon,",
+	"Hello Voucher Card - www.hellovouchercard.co.uk, Knoji - knoji.com,",
+	"EveryCloud - www.everycloudtech.com, CouponRaven - couponraven.com,",
+	"Dealspotr - dealspotr.com, GuitarFella.com, Coupofy - Coupofy.com,",
+	"Underfloor Heating Systems - www.underfloorheatingsystems.co.uk,",
+	"Project Free TV - newprojectfreetv.com, companyaccountscheck.com,",
+	"Coyote Traffic - www.coyotetraffic.com, www.emailextractor14lite.com,",
+	"bet365 Bonus Code - williamspromocodes.co.uk/bet365-bonus-code-sports/",
+	" ",
+	"==========================[ Supporters ]==========================",
+	"Our support staff: Cronus, Jobe, SpaceDog, Stealth",
+	" ",
+	"Thanks to former supporters and anyone who has helped without",
+	"officially joining the staff.",
+	" ",
+	"===========================[ Coders ]=============================",
+	"Syzop <syzop@unrealircd.org> - Head Coder / Project leader",
+	"Gottem <gottem@unrealircd.org> - Coder",
+	"i <i@unrealircd.org> - Coder",
+	" ",
+	"For a full list of coders & contributors, see /INFO (/QUOTE INFO)",
+	" ",
+	"==================================================================",
+	"Finally, we would like to thank everyone else who has helped",
+	"UnrealIRCd in any way: reporting bugs, testing releases, helping",
+	"others, recommending UnrealIRCd to friends, or simply just by",
+	"running UnrealIRCd to ensure that we are and will continue to be",
+	"the most used IRC daemon in the world.",
+	"==================================================================",
+	0
+}; 
+
+
+char unreallogo[] = 
+{
+32,95,32,32,32,95,32,32,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,95,32,95,95,95,
+95,95,95,95,95,95,95,95,32,32,95,
+95,95,95,95,32,32,32,32,32,95,32,
+10,124,32,124,32,124,32,124,32,32,32,
+32,32,32,32,32,32,32,32,32,32,32,
+32,32,32,32,32,32,124,32,124,95,32,
+32,32,95,124,32,95,95,95,32,92,47,
+32,32,95,95,32,92,32,32,32,124,32,
+124,10,124,32,124,32,124,32,124,95,32,
+95,95,32,32,95,32,95,95,32,95,95,
+95,32,32,95,95,32,95,124,32,124,32,
+124,32,124,32,124,32,124,95,47,32,47,
+124,32,47,32,32,92,47,32,95,95,124,
+32,124,10,124,32,124,32,124,32,124,32,
+39,95,32,92,124,32,39,95,95,47,32,
+95,32,92,47,32,95,96,32,124,32,124,
+32,124,32,124,32,124,32,32,32,32,47,
+32,124,32,124,32,32,32,32,47,32,95,
+96,32,124,10,124,32,124,95,124,32,124,
+32,124,32,124,32,124,32,124,32,124,32,
+32,95,95,47,32,40,95,124,32,124,32,
+124,95,124,32,124,95,124,32,124,92,32,
+92,32,124,32,92,95,95,47,92,32,40,
+95,124,32,124,10,32,92,95,95,95,47,
+124,95,124,32,124,95,124,95,124,32,32,
+92,95,95,95,124,92,95,95,44,95,124,
+95,124,92,95,95,95,47,92,95,124,32,
+92,95,124,32,92,95,95,95,95,47,92,
+95,95,44,95,124,10,0,85,110,114,
+101,97,108,73,82,67,100,0};
+
+char *dalinfotext[] =
+    {
+        "$package --",
+        "Based on the original code written by Jarkko Oikarinen",
+        "Copyright 1988, 1989, 1990, 1991 University of Oulu, Computing Center",
+        "",
+        "This program is free software; you can redistribute it and/or",
+        "modify it under the terms of the GNU General Public License as",
+        "published by the Free Software Foundation; either version 1, or",
+        "(at your option) any later version.",
+	"- Any name/comment should never be changed except by the one who made it -",
+	"",
+	"UnrealIRCd contains code developed by:",
+	"Potvin       Chris Wolkowski          potvin@acestar.org",
+	"RogerY       Roger Y.                 rogery@austnet.org",
+	"GZ                                    gz@starchat.net",
+	"binary                                ",
+	"Dianora      Diane Bruce",
+	"lucas", 
+	"Roar Thronaas <roart@nvg.ntnu.no> added IPv6 support.",
+	"",
+	"",
+	"The following people have helped in making the DALnet ircd",
+        "that is based on irc2.8.21.mu3.2 :",
+        "",
+        "Russell      Russell Miller           russell@dal.net",
+        "Donwulff     Jukka Santala            donwulff@dal.net",
+        "Aetobatus    Michael Sawyer           aetobatus@dal.net",
+        "Dalvenjah    Sven Nielsen             dalvenjah@dal.net",
+        "Skandranon   Michael Graff            explorer@flame.org",
+        "Barubary     -                        barubary@dal.net",
+        "white_dragon Chip Norkus              wd@dal.net",
+        "DuffJ        Dafydd James             duffj@dal.net",
+        "taz          David Kopstain           taz@dal.net",
+        "NikB         Nik Bougalis             nikb@dal.net",
+        "Rakarra      -                        rakarra@dal.net",
+        "DarkRot      Lucas Madar              darkrot@dal.net",
+        "Studded      -                        studded@dal.net",
+        "JoelKatz     David Schwartz           joelkatz@dal.net",
+        "",
+        "This product includes software developed by Colin Plumb.",
+        "",
+        "The following persons have made many changes and enhancements to the",
+        "code and still know how IRC really works if you have questions about it:",
+        "",
+        "Run          Carlo Kid                carlo@runaway.xs4all.nl",
+        "Avalon       Darren Reed              avalon@coombs.anu.edu.au",
+        "msa          Markku Savela            Markku.Savela@vtt.fi",
+        "Wumpus       Greg Lindahl             gl8f@virginia.edu",
+        "WiZ          Jarkko Oikarinen         jto@tolsun.oulu.fi",
+        "Argv         Armin Gruner Armin.Gruner@Informatik.TU-Muenchen.de",
+        "",
+        "Thanks to the following people for help with preparing 2.8",
+        "",
+        "phone        Matthew Green            phone@coombs.anu.edu.au",
+        "Sodapop      Chuck Kane               ckane@ece.uiuc.edu",
+        "Skygod       Matt Lyle                matt@oc.com",
+        "Vesa         Vesa Ruokonen            ruokonen@lut.fi",
+        "Nap          Nicolas PIOCH pioch@poly.polytechnique.fr",
+        "",
+        "Those who helped in prior versions and continue to be helpful:",
+        "",
+        "Stellan Klebom      Dan Goodwin         Mike Bolotski",
+        "Ian Frechette       Markku Jarvinen     Kimmo Suominen",
+        "Jeff Trim           Vijay Subramaniam   Karl Kleinpaste",
+        "Bill Wisner         Tom Davis           Hugo Calendar",
+        "Tom Hopkins         Stephen van den Berg",
+        "Bo Adler            Michael Sandrof     Jon Solomon",
+        "Jan Peterson        Helen Rose          Paul Graham",
+        "",
+        "Thanks also goes to those persons not mentioned here who have added",
+        "their advice, opinions, and code to IRC.",
+        "Thanks also to those who provide the kind sys admins who let me and",
+        "others continue to develop IRC.",
+        "",
+
+        0
+    };
+!SUB!THIS!
diff --git a/src/whowas.c b/src/whowas.c
new file mode 100644
index 0000000..d9f9ed0
--- /dev/null
+++ b/src/whowas.c
@@ -0,0 +1,186 @@
+/************************************************************************
+*   IRC - Internet Relay Chat, src/whowas.c
+*   Copyright (C) 1990 Markku Savela
+*
+*   This program is free software; you can redistribute it and/or modify
+*   it under the terms of the GNU General Public License as published by
+*   the Free Software Foundation; either version 1, or (at your option)
+*   any later version.
+*
+*   This program is distributed in the hope that it will be useful,
+*   but WITHOUT ANY WARRANTY; without even the implied warranty of
+*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*   GNU General Public License for more details.
+*
+*   You should have received a copy of the GNU General Public License
+*   along with this program; if not, write to the Free Software
+*   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "unrealircd.h"
+
+// FIXME: move this to cmd_whowas,
+// Consider making add_history an efunc? Or via a hook?
+// Some users may not want to load cmd_whowas at all.
+
+/* internally defined function */
+static void add_whowas_to_clist(aWhowas **, aWhowas *);
+static void del_whowas_from_clist(aWhowas **, aWhowas *);
+static void add_whowas_to_list(aWhowas **, aWhowas *);
+static void del_whowas_from_list(aWhowas **, aWhowas *);
+
+aWhowas MODVAR WHOWAS[NICKNAMEHISTORYLENGTH];
+aWhowas MODVAR *WHOWASHASH[WHOWAS_HASH_TABLE_SIZE];
+
+MODVAR int whowas_next = 0;
+
+void add_history(Client *client, int online)
+{
+	aWhowas *new;
+
+	new = &WHOWAS[whowas_next];
+
+	if (new->hashv != -1)
+	{
+		safe_free(new->name);
+		safe_free(new->hostname);
+		safe_free(new->virthost);
+		safe_free(new->realname);
+		safe_free(new->username);
+		new->servername = NULL;
+
+		if (new->online)
+			del_whowas_from_clist(&(new->online->user->whowas), new);
+		del_whowas_from_list(&WHOWASHASH[new->hashv], new);
+	}
+	new->hashv = hash_whowas_name(client->name);
+	new->logoff = TStime();
+	new->umodes = client->umodes;
+	safe_strdup(new->name, client->name);
+	safe_strdup(new->username, client->user->username);
+	safe_strdup(new->hostname, client->user->realhost);
+	if (client->user->virthost)
+		safe_strdup(new->virthost, client->user->virthost);
+	else
+		safe_strdup(new->virthost, "");
+	new->servername = client->user->server;
+	safe_strdup(new->realname, client->info);
+
+	/* Its not string copied, a pointer to the scache hash is copied
+	   -Dianora
+	 */
+	/*  strlcpy(new->servername, client->user->server,HOSTLEN); */
+	new->servername = client->user->server;
+
+	if (online)
+	{
+		new->online = client;
+		add_whowas_to_clist(&(client->user->whowas), new);
+	}
+	else
+		new->online = NULL;
+	add_whowas_to_list(&WHOWASHASH[new->hashv], new);
+	whowas_next++;
+	if (whowas_next == NICKNAMEHISTORYLENGTH)
+		whowas_next = 0;
+}
+
+void off_history(Client *client)
+{
+	aWhowas *temp, *next;
+
+	for (temp = client->user->whowas; temp; temp = next)
+	{
+		next = temp->cnext;
+		temp->online = NULL;
+		del_whowas_from_clist(&(client->user->whowas), temp);
+	}
+}
+
+Client *get_history(char *nick, time_t timelimit)
+{
+	aWhowas *temp;
+	int  blah;
+
+	timelimit = TStime() - timelimit;
+	blah = hash_whowas_name(nick);
+	temp = WHOWASHASH[blah];
+	for (; temp; temp = temp->next)
+	{
+		if (mycmp(nick, temp->name))
+			continue;
+		if (temp->logoff < timelimit)
+			continue;
+		return temp->online;
+	}
+	return NULL;
+}
+
+void count_whowas_memory(int *wwu, u_long *wwum)
+{
+	aWhowas *tmp;
+	int  i;
+	int  u = 0;
+	u_long um = 0;
+	/* count the number of used whowas structs in 'u' */
+	/* count up the memory used of whowas structs in um */
+
+	for (i = 0, tmp = &WHOWAS[0]; i < NICKNAMEHISTORYLENGTH; i++, tmp++)
+		if (tmp->hashv != -1)
+		{
+			u++;
+			um += sizeof(aWhowas);
+		}
+	*wwu = u;
+	*wwum = um;
+	return;
+}
+
+void initwhowas()
+{
+	int  i;
+
+	for (i = 0; i < NICKNAMEHISTORYLENGTH; i++)
+	{
+		memset(&WHOWAS[i], 0, sizeof(aWhowas));
+		WHOWAS[i].hashv = -1;
+	}
+	for (i = 0; i < WHOWAS_HASH_TABLE_SIZE; i++)
+		WHOWASHASH[i] = NULL;
+}
+
+static void add_whowas_to_clist(aWhowas ** bucket, aWhowas * whowas)
+{
+	whowas->cprev = NULL;
+	if ((whowas->cnext = *bucket) != NULL)
+		whowas->cnext->cprev = whowas;
+	*bucket = whowas;
+}
+
+static void del_whowas_from_clist(aWhowas ** bucket, aWhowas * whowas)
+{
+	if (whowas->cprev)
+		whowas->cprev->cnext = whowas->cnext;
+	else
+		*bucket = whowas->cnext;
+	if (whowas->cnext)
+		whowas->cnext->cprev = whowas->cprev;
+}
+
+static void add_whowas_to_list(aWhowas ** bucket, aWhowas * whowas)
+{
+	whowas->prev = NULL;
+	if ((whowas->next = *bucket) != NULL)
+		whowas->next->prev = whowas;
+	*bucket = whowas;
+}
+
+static void del_whowas_from_list(aWhowas ** bucket, aWhowas * whowas)
+{
+	if (whowas->prev)
+		whowas->prev->next = whowas->next;
+	else
+		*bucket = whowas->next;
+	if (whowas->next)
+		whowas->next->prev = whowas->prev;
+}
diff --git a/src/windows/Icon1.ico b/src/windows/Icon1.ico
new file mode 100644
index 0000000..230fca0
Binary files /dev/null and b/src/windows/Icon1.ico differ
diff --git a/src/windows/UnrealIRCd.exe.manifest b/src/windows/UnrealIRCd.exe.manifest
new file mode 100644
index 0000000..37a8716
--- /dev/null
+++ b/src/windows/UnrealIRCd.exe.manifest
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    processorArchitecture="amd64"
+    name="UnrealIRCd.UnrealIRCd.5"
+    version="5.0.3.1"
+    type="win32"
+/>
+<description>Internet Relay Chat Daemon</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="amd64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/src/windows/bar.bmp b/src/windows/bar.bmp
new file mode 100644
index 0000000..e23f8b6
Binary files /dev/null and b/src/windows/bar.bmp differ
diff --git a/src/windows/compilerhelp.c b/src/windows/compilerhelp.c
new file mode 100644
index 0000000..aab1a9d
--- /dev/null
+++ b/src/windows/compilerhelp.c
@@ -0,0 +1,55 @@
+/*
+ *
+ * A helper program for the compilation process
+ *
+ */
+
+/* x,y,z,w 
+ * | | | `-- private build
+ * | | `---- release build
+ * | `------ minor version
+ * `-------- major version
+ */
+
+#include <stdio.h>
+
+void main(int argc,char *argv[])
+{
+	FILE *openme;
+	char inbuf[512];
+	int i,pb=0,rb=0,mi=0,ma=0;
+
+	if (argc == 1)
+		exit(-1);
+
+	if ((openme = fopen(argv[1],"r+"))==NULL)
+	{
+		printf("error\n");
+		exit(-1);
+	}
+
+	fscanf(openme,"%s %s %d\n",inbuf,inbuf,&pb);		/*Read Buffer*/
+	fscanf(openme,"%s %s %d\n",inbuf,inbuf,&rb);
+	fscanf(openme,"%s %s %d\n",inbuf,inbuf,&mi);
+	fscanf(openme,"%s %s %d\n",inbuf,inbuf,&ma);
+
+	pb++;
+	if (argc > 2)
+	if (atoi(argv[2])==0)  /*Public Build*/
+		rb++;
+
+	printf("new version = %d,%d,%d,%d",ma,mi,rb,pb);
+
+	rewind(openme);
+
+	fprintf(openme,"#define pb %d\n",pb);		/*Write Buffer*/
+	fprintf(openme,"#define rb %d\n",rb);
+	fprintf(openme,"#define mi %d\n",mi);
+	fprintf(openme,"#define ma %d\n",ma);
+
+	fprintf(openme,"#define vFILEVERSION ma,mi,rb,pb\n#define vPRODUCTVERSION ma,mi,0,0\n#define vDISPFILEVERSION \"%d,%d,%d,%d\\0\"\n#define vSUBBUILD \"%d\\0\"\n",ma,mi,rb,pb,pb);
+
+	fclose(openme);
+
+
+}
diff --git a/src/windows/config.c b/src/windows/config.c
new file mode 100644
index 0000000..2b41cc3
--- /dev/null
+++ b/src/windows/config.c
@@ -0,0 +1,56 @@
+
+#include <stdio.h>
+#include <string.h>
+int main() {
+	FILE *fd = fopen("Changes", "r");
+	FILE *fd2;
+	char buf[1024];
+	int i = 0, space = 0, j = 0;
+	char releaseid[512];
+	int generation = 0;
+
+	*releaseid = '\0';
+
+	i = 0;
+	fd = fopen("src/version.c", "r");
+	if (!fd)
+		generation = 1;
+	else {
+		while (fgets(buf, 1023, fd)) {
+			if (!strstr(buf, "char *generation"))
+				continue;
+			while (!isdigit(buf[i]))
+					i++;
+			j = i;
+			while (isdigit(buf[j])) 
+				j++;
+			buf[j] = 0;
+			generation = (atoi(&buf[i])+1);
+		}
+	}
+	fd = fopen("src/version.c.sh", "r");
+	if (!fd)
+		return 0;
+	fd2 = fopen("src/version.c", "w");
+	if (!fd2)
+		return 0;
+	while (fgets(buf, 1023, fd)) {
+		if (!strncmp("cat >version.c <<!SUB!THIS!",buf,27)) {
+			while (fgets(buf, 1023, fd)) {
+				if (!strncmp("!SUB!THIS!",buf,10))
+					break;
+				if (!strncmp("char *creation = \"$creation\";",buf,29)) 
+					fprintf(fd2,"char *creation = __TIMESTAMP__;\n");
+				else if (!strncmp("char *generation = \"$generation\";",buf,33))
+					fprintf(fd2,"char *generation = \"%d\";\n",generation);
+				else if (!strncmp("char *buildid = \"$id\";",buf,22))
+					fprintf(fd2,"char *buildid = \"%s\";\n",releaseid);
+				else
+					fprintf(fd2,"%s", buf);
+			}
+		}
+	}
+
+
+}
+	
\ No newline at end of file
diff --git a/src/windows/def-clean.c b/src/windows/def-clean.c
new file mode 100644
index 0000000..e262a1c
--- /dev/null
+++ b/src/windows/def-clean.c
@@ -0,0 +1,39 @@
+/* A small utility to clean a def file */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+int main(int argc, char *argv[]) {
+	FILE *fd, *fdout;
+	char buf[1024];
+
+	if (argc < 3)
+		exit(1);
+
+	if (!(fd = fopen(argv[1], "r")))
+		exit(2);
+	
+	if (!(fdout = fopen(argv[2], "w")))
+		exit(3);
+
+	while (fgets(buf, 1023, fd))
+	{
+		if (*buf == '\t') 
+		{
+			char *symbol = strtok(buf, " ");
+
+			if (!strncmp(symbol, "\t_real@", 7))
+				continue;
+			if (!strncmp(symbol, "\t_xmm@", 6))
+				continue;
+
+			fprintf(fdout, "%s\r\n", symbol);	
+		
+		}
+		else
+			fprintf(fdout, "%s", buf);
+
+	}
+	return 0;
+}
diff --git a/src/windows/editor.c b/src/windows/editor.c
new file mode 100644
index 0000000..9aa5e24
--- /dev/null
+++ b/src/windows/editor.c
@@ -0,0 +1,769 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/editor.c
+ *   Copyright (C) 2004 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+#include <windowsx.h>
+#include <commctrl.h>
+#include <richedit.h>
+#include <commdlg.h>
+#include <stdlib.h>
+#include "resource.h"
+#include "win.h"
+
+LRESULT CALLBACK GotoDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK ColorDLG(HWND, UINT, WPARAM, LPARAM);
+
+HWND hFind;
+
+/* Draws the statusbar for the editor
+ * Parameters:
+ *  hInstance  - The instance to create the statusbar in
+ *  hwndParent - The parent of the statusbar
+ *  iId        - The message value used to send messages to the parent
+ * Returns:
+ *  The handle to the statusbar
+ */
+HWND DrawStatusbar(HINSTANCE hInstance, HWND hwndParent, UINT iId)
+{
+	HWND hStatus, hTip;
+	TOOLINFO ti;
+	RECT clrect;
+	hStatus = CreateStatusWindow(WS_CHILD|WS_VISIBLE|SBT_TOOLTIPS, NULL, hwndParent, iId);
+	hTip = CreateWindowEx(WS_EX_TOPMOST, TOOLTIPS_CLASS, NULL,
+ 		WS_POPUP|TTS_NOPREFIX|TTS_ALWAYSTIP, 0, 0, 0, 0, hwndParent, NULL, hInstance, NULL);
+	GetClientRect(hStatus, &clrect);
+	ti.cbSize = sizeof(TOOLINFO);
+	ti.uFlags = TTF_SUBCLASS;
+	ti.hwnd = hStatus;
+	ti.uId = 1;
+	ti.hinst = hInstance;
+	ti.rect = clrect;
+	ti.lpszText = "Go To";
+	SendMessage(hTip, TTM_ADDTOOL, 0, (LPARAM)&ti);
+	return hStatus;
+}
+
+/* Draws the toolbar for the editor
+ * Parameters:
+ *  hInstance  - The instance to create the toolbar in
+ *  hwndParent - The parent of the toolbar
+ * Returns:
+ *  The handle to the toolbar
+ */
+HWND DrawToolbar(HINSTANCE hInstance, HWND hwndParent) 
+{
+	HWND hTool;
+	TBADDBITMAP tbBit;
+	int newidx;
+	TBBUTTON tbButtons[10] = {
+		{ STD_FILENEW, IDM_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ STD_FILESAVE, IDM_SAVE, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ 0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0}, 0L, 0},
+		{ STD_CUT, IDM_CUT, 0, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ STD_COPY, IDM_COPY, 0, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ STD_PASTE, IDM_PASTE, 0, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ 0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0}, 0L, 0},
+		{ STD_UNDO, IDM_UNDO, 0, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ STD_REDOW, IDM_REDO, 0, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ 0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0}, 0L, 0}
+	};
+		
+	TBBUTTON tbAddButtons[7] = {
+		{ 0, IDC_BOLD, TBSTATE_ENABLED, TBSTYLE_CHECK, {0}, 0L, 0},
+		{ 1, IDC_UNDERLINE, TBSTATE_ENABLED, TBSTYLE_CHECK, {0}, 0L, 0},
+		{ 2, IDC_COLOR, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ 3, IDC_BGCOLOR, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ 0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, {0}, 0L, 0},
+		{ 4, IDC_GOTO, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0},
+		{ STD_FIND, IDC_FIND, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0L, 0}
+	};
+	hTool = CreateToolbarEx(hwndParent, WS_VISIBLE|WS_CHILD|TBSTYLE_FLAT|TBSTYLE_TOOLTIPS, 
+				IDC_TOOLBAR, 0, HINST_COMMCTRL, IDB_STD_SMALL_COLOR,
+				tbButtons, 10, 0, 0, 100, 30, sizeof(TBBUTTON));
+	tbBit.hInst = hInstance;
+	tbBit.nID = IDB_BITMAP1;
+	newidx = SendMessage(hTool, TB_ADDBITMAP, (WPARAM)5, (LPARAM)&tbBit);
+	tbAddButtons[0].iBitmap += newidx;
+	tbAddButtons[1].iBitmap += newidx;
+	tbAddButtons[2].iBitmap += newidx;
+	tbAddButtons[3].iBitmap += newidx;
+	tbAddButtons[5].iBitmap += newidx;
+	SendMessage(hTool, TB_ADDBUTTONS, (WPARAM)7, (LPARAM)&tbAddButtons);
+	return hTool;
+}
+
+/* Dialog procedure for the color selection dialog
+ * Parameters:
+ *  hDlg    - The dialog handle
+ *  message - The message received
+ *  wParam  - The first message parameter
+ *  lParam  - The second message parameter
+ * Returns:
+ *  TRUE if the message was processed, FALSE otherwise
+ */
+LRESULT CALLBACK ColorDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) {
+	static HBRUSH hBrushWhite, hBrushBlack, hBrushDarkBlue, hBrushDarkGreen, hBrushRed,
+		hBrushDarkRed, hBrushPurple, hBrushOrange, hBrushYellow, hBrushGreen, hBrushVDarkGreen,
+		hBrushLightBlue, hBrushBlue, hBrushPink, hBrushDarkGray, hBrushGray;
+	static UINT ResultMsg = 0;
+
+	switch (message) 
+	{
+		case WM_INITDIALOG:
+			hBrushWhite = CreateSolidBrush(RGB(255,255,255));
+			hBrushBlack = CreateSolidBrush(RGB(0,0,0));
+			hBrushDarkBlue = CreateSolidBrush(RGB(0,0,127));
+			hBrushDarkGreen = CreateSolidBrush(RGB(0,147,0));
+			hBrushRed = CreateSolidBrush(RGB(255,0,0));
+			hBrushDarkRed = CreateSolidBrush(RGB(127,0,0));
+			hBrushPurple = CreateSolidBrush(RGB(156,0,156));
+			hBrushOrange = CreateSolidBrush(RGB(252,127,0));
+			hBrushYellow = CreateSolidBrush(RGB(255,255,0));
+			hBrushGreen = CreateSolidBrush(RGB(0,252,0));
+			hBrushVDarkGreen = CreateSolidBrush(RGB(0,147,147));
+			hBrushLightBlue = CreateSolidBrush(RGB(0,255,255));
+			hBrushBlue = CreateSolidBrush(RGB(0,0,252));
+			hBrushPink = CreateSolidBrush(RGB(255,0,255));
+			hBrushDarkGray = CreateSolidBrush(RGB(127,127,127));
+			hBrushGray = CreateSolidBrush(RGB(210,210,210));
+			ResultMsg = (UINT)lParam;
+			SetFocus(NULL);
+			return TRUE;
+		case WM_DRAWITEM: 
+		{
+			LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
+			if (wParam == IDC_WHITE) 
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushWhite);
+			if (wParam == IDC_BLACK)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushBlack);
+			if (wParam == IDC_DARKBLUE) 
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushDarkBlue);
+			if (wParam == IDC_DARKGREEN) 
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushDarkGreen);
+			if (wParam == IDC_RED)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushRed);
+			if (wParam == IDC_DARKRED)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushDarkRed);
+			if (wParam == IDC_PURPLE)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushPurple);
+			if (wParam == IDC_ORANGE)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushOrange);
+			if (wParam == IDC_YELLOW)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushYellow);
+			if (wParam == IDC_GREEN)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushGreen);
+			if (wParam == IDC_VDARKGREEN)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushVDarkGreen);
+			if (wParam == IDC_LIGHTBLUE)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushLightBlue);
+			if (wParam == IDC_BLUE)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushBlue);
+			if (wParam == IDC_PINK)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushPink);
+			if (wParam == IDC_DARKGRAY)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushDarkGray);
+			if (wParam == IDC_GRAY)
+				FillRect(lpdis->hDC, &lpdis->rcItem, hBrushGray);
+			DrawEdge(lpdis->hDC, &lpdis->rcItem, EDGE_SUNKEN, BF_RECT);
+			return TRUE;
+		}
+		case WM_COMMAND: 
+		{
+			COLORREF clrref;
+			if (LOWORD(wParam) == IDC_WHITE) 
+				clrref = RGB(255,255,255);
+			else if (LOWORD(wParam) == IDC_BLACK)
+				clrref = RGB(0,0,0);
+			else if (LOWORD(wParam) == IDC_DARKBLUE)
+				clrref = RGB(0,0,127);
+			else if (LOWORD(wParam) == IDC_DARKGREEN)
+				clrref = RGB(0,147,0);
+			else if (LOWORD(wParam) == IDC_RED)
+				clrref = RGB(255,0,0);
+			else if (LOWORD(wParam) == IDC_DARKRED)
+				clrref = RGB(127,0,0);
+			else if (LOWORD(wParam) == IDC_PURPLE)
+				clrref = RGB(156,0,156);
+			else if (LOWORD(wParam) == IDC_ORANGE)
+				clrref = RGB(252,127,0);
+			else if (LOWORD(wParam) == IDC_YELLOW)
+				clrref = RGB(255,255,0);
+			else if (LOWORD(wParam) == IDC_GREEN)
+				clrref = RGB(0,252,0);
+			else if (LOWORD(wParam) == IDC_VDARKGREEN)
+				clrref = RGB(0,147,147);
+			else if (LOWORD(wParam) == IDC_LIGHTBLUE)
+				clrref = RGB(0,255,255);
+			else if (LOWORD(wParam) == IDC_BLUE)
+				clrref = RGB(0,0,252);
+			else if (LOWORD(wParam) == IDC_PINK)
+				clrref = RGB(255,0,255);
+			else if (LOWORD(wParam) == IDC_DARKGRAY)
+				clrref = RGB(127,127,127);
+			else if (LOWORD(wParam) == IDC_GRAY)
+				clrref = RGB(210,210,210);
+			SendMessage(GetParent(hDlg), ResultMsg, (WPARAM)clrref, (LPARAM)hDlg);
+			break;
+		}
+		case WM_CLOSE:
+			EndDialog(hDlg, TRUE);
+		case WM_DESTROY:
+			DeleteObject(hBrushWhite);
+			DeleteObject(hBrushBlack);
+			DeleteObject(hBrushDarkBlue);
+			DeleteObject(hBrushDarkGreen);
+			DeleteObject(hBrushRed);
+			DeleteObject(hBrushDarkRed);
+			DeleteObject(hBrushPurple);
+			DeleteObject(hBrushOrange);
+			DeleteObject(hBrushYellow);
+			DeleteObject(hBrushGreen);
+			DeleteObject(hBrushVDarkGreen);
+			DeleteObject(hBrushLightBlue);
+			DeleteObject(hBrushBlue);
+			DeleteObject(hBrushPink);
+			DeleteObject(hBrushDarkGray);
+			DeleteObject(hBrushGray);
+			break;
+	}
+
+	return FALSE;
+}
+
+/* Dialog procedure for the goto dialog
+ * Parameters:
+ *  hDlg    - The dialog handle
+ *  message - The message received
+ *  wParam  - The first message parameter
+ *  lParam  - The second message parameter
+ * Returns:
+ *  TRUE if the message was processed, FALSE otherwise
+ */
+LRESULT CALLBACK GotoDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	if (message == WM_COMMAND) 
+	{
+		if (LOWORD(wParam) == IDCANCEL)
+			EndDialog(hDlg, TRUE);
+		else if (LOWORD(wParam) == IDOK) 
+		{
+			HWND hWnd = GetDlgItem(GetParent(hDlg),IDC_TEXT);
+			int line = GetDlgItemInt(hDlg, IDC_GOTO, NULL, FALSE);
+			int pos = SendMessage(hWnd, EM_LINEINDEX, (WPARAM)--line, 0);
+			SendMessage(hWnd, EM_SETSEL, (WPARAM)pos, (LPARAM)pos);
+			SendMessage(hWnd, EM_SCROLLCARET, 0, 0);
+			EndDialog(hDlg, TRUE);
+		}
+	}
+	return FALSE;
+}
+
+LRESULT CALLBACK FromFileDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	HWND hWnd;
+	static FINDREPLACE find;
+	static char findbuf[256];
+	static unsigned char *file;
+	static HWND hTool, hClip, hStatus;
+	static RECT rOld;
+	CHARFORMAT2 chars;
+
+	if (message == WM_FINDMSGSTRING)
+	{
+		FINDREPLACE *fr = (FINDREPLACE *)lParam;
+
+		if (fr->Flags & FR_FINDNEXT)
+		{
+			HWND hRich = GetDlgItem(hDlg, IDC_TEXT);
+			DWORD flags=0;
+			FINDTEXTEX ft;
+			CHARRANGE chrg;
+
+			if (fr->Flags & FR_DOWN)
+				flags |= FR_DOWN;
+			if (fr->Flags & FR_MATCHCASE)
+				flags |= FR_MATCHCASE;
+			if (fr->Flags & FR_WHOLEWORD)
+				flags |= FR_WHOLEWORD;
+			ft.lpstrText = fr->lpstrFindWhat;
+			SendMessage(hRich, EM_EXGETSEL, 0, (LPARAM)&chrg);
+			if (flags & FR_DOWN)
+			{
+				ft.chrg.cpMin = chrg.cpMax;
+				ft.chrg.cpMax = -1;
+			}
+			else
+			{
+				ft.chrg.cpMin = chrg.cpMin;
+				ft.chrg.cpMax = -1;
+			}
+			if (SendMessage(hRich, EM_FINDTEXTEX, flags, (LPARAM)&ft) == -1)
+				MessageBox(NULL, "UnrealIRCd has finished searching the document",
+					"Find", MB_ICONINFORMATION|MB_OK);
+			else
+			{
+				SendMessage(hRich, EM_EXSETSEL, 0, (LPARAM)&(ft.chrgText));
+				SendMessage(hRich, EM_SCROLLCARET, 0, 0);
+				SetFocus(hRich);
+			}
+		}
+		return TRUE;
+	}
+	switch (message) 
+	{
+		case WM_INITDIALOG: 
+		{
+			int fd,len;
+			char *buffer, *string;
+			EDITSTREAM edit;
+			StreamIO *stream = safe_alloc(sizeof(StreamIO));
+			unsigned char szText[256];
+			struct stat sb;
+			HWND hWnd = GetDlgItem(hDlg, IDC_TEXT), hTip;
+			file = (unsigned char *)lParam;
+			if (file)
+				wsprintf(szText, "UnrealIRCd Editor - %s", file);
+			else 
+				strcpy(szText, "UnrealIRCd Editor - New File");
+			SetWindowText(hDlg, szText);
+			lpfnOldWndProc = (FARPROC)SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)RESubClassFunc);
+			hTool = DrawToolbar(hInst, hDlg);
+			hStatus = DrawStatusbar(hInst, hDlg, IDC_STATUS);
+			SendMessage(hWnd, EM_SETEVENTMASK, 0, (LPARAM)ENM_SELCHANGE);
+			chars.cbSize = sizeof(CHARFORMAT2);
+			chars.dwMask = CFM_FACE;
+			strcpy(chars.szFaceName,"Fixedsys");
+			SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_ALL, (LPARAM)&chars);
+			if ((fd = open(file, _O_RDONLY|_O_BINARY)) != -1) 
+			{
+				fstat(fd,&sb);
+				/* Only allocate the amount we need */
+				buffer = safe_alloc(sb.st_size+1);
+				len = read(fd, buffer, sb.st_size);
+				buffer[len] = 0;
+				len = CountRTFSize(buffer)+1;
+				string = safe_alloc(len);
+				IRCToRTF(buffer,string);
+				RTFBuf = string;
+				len--;
+				stream->size = &len;
+				stream->buffer = &RTFBuf;
+				edit.dwCookie = (DWORD_PTR)stream;
+				edit.pfnCallback = SplitIt;
+				SendMessage(hWnd, EM_EXLIMITTEXT, 0, (LPARAM)0x7FFFFFFF);
+				SendMessage(hWnd, EM_STREAMIN, (WPARAM)SF_RTF|SFF_PLAINRTF, (LPARAM)&edit);
+				SendMessage(hWnd, EM_SETMODIFY, (WPARAM)FALSE, 0);
+				SendMessage(hWnd, EM_EMPTYUNDOBUFFER, 0, 0);
+				close(fd);
+				RTFBuf = NULL;
+				safe_free(buffer);
+				safe_free(string);
+				safe_free(stream);
+				hClip = SetClipboardViewer(hDlg);
+				if (SendMessage(hWnd, EM_CANPASTE, 0, 0)) 
+					SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_PASTE, (LPARAM)MAKELONG(TRUE,0));
+				else
+					SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_PASTE, (LPARAM)MAKELONG(FALSE,0));
+				SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_UNDO, (LPARAM)MAKELONG(FALSE,0));
+				wsprintf(szText, "Line: 1");
+				SetWindowText(hStatus, szText);
+			}
+			return TRUE;
+		}
+		case WM_WINDOWPOSCHANGING:
+		{
+			GetClientRect(hDlg, &rOld);
+			return FALSE;
+		}
+		case WM_SIZE:
+		{
+			DWORD new_width, new_height;
+			HWND hRich;
+			RECT rOldRich;
+			DWORD old_width, old_height;
+			DWORD old_rich_width, old_rich_height;
+			if (hDlg == hFind)
+				return FALSE;
+			new_width =  LOWORD(lParam);
+			new_height = HIWORD(lParam);
+			hRich  = GetDlgItem(hDlg, IDC_TEXT);
+			SendMessage(hStatus, WM_SIZE, 0, 0);
+			SendMessage(hTool, TB_AUTOSIZE, 0, 0);
+			old_width = rOld.right-rOld.left;
+			old_height = rOld.bottom-rOld.top;
+			new_width = new_width - old_width;
+			new_height = new_height - old_height;
+			GetWindowRect(hRich, &rOldRich);
+			old_rich_width = rOldRich.right-rOldRich.left;
+			old_rich_height = rOldRich.bottom-rOldRich.top;
+			SetWindowPos(hRich, NULL, 0, 0, old_rich_width+new_width, 
+				old_rich_height+new_height,
+				SWP_NOMOVE|SWP_NOREPOSITION|SWP_NOZORDER);
+			memset(&rOld, 0, sizeof(rOld));
+			return TRUE;
+		} 
+
+		case WM_NOTIFY:
+			switch (((NMHDR *)lParam)->code) 
+			{
+				case EN_SELCHANGE: 
+				{
+					HWND hWnd = GetDlgItem(hDlg, IDC_TEXT);
+					DWORD start, end, currline;
+					static DWORD prevline = 0;
+					unsigned char buffer[512];
+					chars.cbSize = sizeof(CHARFORMAT2);
+					SendMessage(hWnd, EM_GETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+					if (chars.dwMask & CFM_BOLD && chars.dwEffects & CFE_BOLD)
+						SendMessage(hTool, TB_CHECKBUTTON, (WPARAM)IDC_BOLD, (LPARAM)MAKELONG(TRUE,0));
+					else
+						SendMessage(hTool, TB_CHECKBUTTON, (WPARAM)IDC_BOLD, (LPARAM)MAKELONG(FALSE,0));
+					if (chars.dwMask & CFM_UNDERLINE && chars.dwEffects & CFE_UNDERLINE)
+						SendMessage(hTool, TB_CHECKBUTTON, (WPARAM)IDC_UNDERLINE, (LPARAM)MAKELONG(TRUE,0));
+					else
+						SendMessage(hTool, TB_CHECKBUTTON, (WPARAM)IDC_UNDERLINE, (LPARAM)MAKELONG(FALSE,0));
+					SendMessage(hWnd, EM_GETSEL,(WPARAM)&start, (LPARAM)&end);
+					if (start == end) 
+					{
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_COPY, (LPARAM)MAKELONG(FALSE,0));
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_CUT, (LPARAM)MAKELONG(FALSE,0));
+					}
+					else 
+					{
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_COPY, (LPARAM)MAKELONG(TRUE,0));
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_CUT, (LPARAM)MAKELONG(TRUE,0));
+					}
+					if (SendMessage(hWnd, EM_CANUNDO, 0, 0)) 
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_UNDO, (LPARAM)MAKELONG(TRUE,0));
+					else
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_UNDO, (LPARAM)MAKELONG(FALSE,0));
+					if (SendMessage(hWnd, EM_CANREDO, 0, 0)) 
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_REDO, (LPARAM)MAKELONG(TRUE,0));
+					else
+						SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_REDO, (LPARAM)MAKELONG(FALSE,0));
+					currline = SendMessage(hWnd, EM_LINEFROMCHAR, (WPARAM)-1, 0);
+					currline++;
+					if (currline != prevline) 
+					{
+						wsprintf(buffer, "Line: %d", currline);
+						SetWindowText(hStatus, buffer);
+						prevline = currline;
+					}
+				return TRUE;
+			}
+			case TTN_GETDISPINFO: 
+			{
+				LPTOOLTIPTEXT lpttt = (LPTOOLTIPTEXT) lParam;
+				lpttt->hinst = NULL;
+				switch (lpttt->hdr.idFrom) 
+				{
+					case IDM_NEW:
+						strcpy(lpttt->szText, "New");
+						break;
+					case IDM_SAVE:
+						strcpy(lpttt->szText, "Save");
+						break;
+					case IDM_CUT:
+						strcpy(lpttt->szText, "Cut");
+						break;
+					case IDM_COPY:
+						strcpy(lpttt->szText, "Copy");
+						break;
+					case IDM_PASTE:
+						strcpy(lpttt->szText, "Paste");
+						break;
+					case IDM_UNDO:
+						strcpy(lpttt->szText, "Undo");
+						break;
+					case IDM_REDO:
+						strcpy(lpttt->szText, "Redo");
+						break;
+					case IDC_BOLD:
+						strcpy(lpttt->szText, "Bold");
+						break;
+					case IDC_UNDERLINE:
+						strcpy(lpttt->szText, "Underline");
+						break;
+					case IDC_COLOR:
+						strcpy(lpttt->szText, "Text Color");
+						break;
+					case IDC_BGCOLOR:
+						strcpy(lpttt->szText, "Background Color");
+						break;
+					case IDC_GOTO:
+						strcpy(lpttt->szText, "Goto");
+						break;
+					case IDC_FIND:
+						strcpy(lpttt->szText, "Find");
+						break;
+				}
+				return TRUE;
+			}
+			case NM_DBLCLK:
+				DialogBox(hInst, "GOTO", hDlg, (DLGPROC)GotoDLG);
+				return (TRUE);
+		}
+				
+				return (TRUE);
+		case WM_COMMAND:
+			if (LOWORD(wParam) == IDC_BOLD) 
+			{
+				hWnd = GetDlgItem(hDlg, IDC_TEXT);
+				if (SendMessage(hTool, TB_ISBUTTONCHECKED, (WPARAM)IDC_BOLD, (LPARAM)0) != 0) 
+				{
+					chars.cbSize = sizeof(CHARFORMAT2);
+					chars.dwMask = CFM_BOLD;
+					chars.dwEffects = CFE_BOLD;
+					SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+					SendMessage(hWnd, EM_HIDESELECTION, 0, 0);
+					SetFocus(hWnd);
+				}
+				else 
+				{
+					chars.cbSize = sizeof(CHARFORMAT2);
+					chars.dwMask = CFM_BOLD;
+					chars.dwEffects = 0;
+					SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+					SendMessage(hWnd, EM_HIDESELECTION, 0, 0);
+					SetFocus(hWnd);
+				}
+				return TRUE;
+			}
+			else if (LOWORD(wParam) == IDC_UNDERLINE) 
+			{
+				hWnd = GetDlgItem(hDlg, IDC_TEXT);
+				if (SendMessage(hTool, TB_ISBUTTONCHECKED, (WPARAM)IDC_UNDERLINE, (LPARAM)0) != 0) 
+				{
+					chars.cbSize = sizeof(CHARFORMAT2);
+					chars.dwMask = CFM_UNDERLINETYPE;
+					chars.bUnderlineType = CFU_UNDERLINE;
+					SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+					SendMessage(hWnd, EM_HIDESELECTION, 0, 0);
+					SetFocus(hWnd);
+				}
+				else 
+				{
+					chars.cbSize = sizeof(CHARFORMAT2);
+					chars.dwMask = CFM_UNDERLINETYPE;
+					chars.bUnderlineType = CFU_UNDERLINENONE;
+					SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+					SendMessage(hWnd, EM_HIDESELECTION, 0, 0);
+					SetFocus(hWnd);
+				}
+				return TRUE;
+			}
+			if (LOWORD(wParam) == IDC_COLOR) 
+			{
+				DialogBoxParam(hInst, "Color", hDlg, (DLGPROC)ColorDLG, (LPARAM)WM_USER+10);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDC_BGCOLOR)
+			{
+				DialogBoxParam(hInst, "Color", hDlg, (DLGPROC)ColorDLG, (LPARAM)WM_USER+11);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDC_GOTO)
+			{
+				DialogBox(hInst, "GOTO", hDlg, (DLGPROC)GotoDLG);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDC_FIND)
+			{
+				static FINDREPLACE fr;
+				memset(&fr, 0, sizeof(fr));
+				fr.lStructSize = sizeof(FINDREPLACE);
+				fr.hwndOwner = hDlg;
+				fr.lpstrFindWhat = findbuf;
+				fr.wFindWhatLen = 255;
+				hFind = FindText(&fr);
+				return 0;
+			}
+				
+			hWnd = GetDlgItem(hDlg, IDC_TEXT);
+			if (LOWORD(wParam) == IDM_COPY) 
+			{
+				SendMessage(hWnd, WM_COPY, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_SELECTALL) 
+			{
+				SendMessage(hWnd, EM_SETSEL, 0, -1);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_PASTE) 
+			{
+				SendMessage(hWnd, WM_PASTE, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_CUT) 
+			{
+				SendMessage(hWnd, WM_CUT, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_UNDO) 
+			{
+				SendMessage(hWnd, EM_UNDO, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_REDO) 
+			{
+				SendMessage(hWnd, EM_REDO, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_DELETE) 
+			{
+				SendMessage(hWnd, WM_CLEAR, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_SAVE) 
+			{
+				int fd;
+				EDITSTREAM edit;
+				OPENFILENAME lpopen;
+				if (!file) 
+				{
+					unsigned char path[MAX_PATH];
+					path[0] = '\0';
+					memset(&lpopen, 0, sizeof(lpopen));
+					lpopen.lStructSize = sizeof(OPENFILENAME);
+					lpopen.hwndOwner = hDlg;
+					lpopen.lpstrFilter = NULL;
+					lpopen.lpstrCustomFilter = NULL;
+					lpopen.nFilterIndex = 0;
+					lpopen.lpstrFile = path;
+					lpopen.nMaxFile = MAX_PATH;
+					lpopen.lpstrFileTitle = NULL;
+					lpopen.lpstrInitialDir = CONFDIR;
+					lpopen.lpstrTitle = NULL;
+					lpopen.Flags = (OFN_ENABLESIZING|OFN_NONETWORKBUTTON|
+							OFN_OVERWRITEPROMPT);
+					if (GetSaveFileName(&lpopen))
+						file = path;
+					else
+						break;
+				}
+				fd = open(file, _O_TRUNC|_O_CREAT|_O_WRONLY|_O_BINARY,_S_IWRITE);
+				edit.dwCookie = 0;
+				edit.pfnCallback = BufferIt;
+				SendMessage(GetDlgItem(hDlg, IDC_TEXT), EM_STREAMOUT, (WPARAM)SF_RTF|SFF_PLAINRTF, (LPARAM)&edit);
+				RTFToIRC(fd, RTFBuf, strlen(RTFBuf));
+				safe_free(RTFBuf);
+				RTFBuf = NULL;
+				SendMessage(GetDlgItem(hDlg, IDC_TEXT), EM_SETMODIFY, (WPARAM)FALSE, 0);
+	
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_NEW) 
+			{
+				unsigned char text[1024];
+				BOOL newfile = FALSE;
+				int ans;
+				if (SendMessage(GetDlgItem(hDlg, IDC_TEXT), EM_GETMODIFY, 0, 0) != 0) 
+				{
+					sprintf(text, "The text in the %s file has changed.\r\n\r\nDo you want to save the changes?", file ? file : "new");
+					ans = MessageBox(hDlg, text, "UnrealIRCd", MB_YESNOCANCEL|MB_ICONWARNING);
+					if (ans == IDNO)
+						newfile = TRUE;
+					if (ans == IDCANCEL)
+						return TRUE;
+					if (ans == IDYES) 
+					{
+						SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(IDM_SAVE,0), 0);
+						newfile = TRUE;
+					}
+				}
+				else
+					newfile = TRUE;
+				if (newfile == TRUE) 
+				{
+					unsigned char szText[256];
+					file = NULL;
+					strcpy(szText, "UnrealIRCd Editor - New File");
+					SetWindowText(hDlg, szText);
+					SetWindowText(GetDlgItem(hDlg, IDC_TEXT), NULL);
+				}
+				break;
+			}
+			break;
+		case WM_USER+10: 
+		{
+			HWND hWnd = GetDlgItem(hDlg, IDC_TEXT);
+			EndDialog((HWND)lParam, TRUE);
+			chars.cbSize = sizeof(CHARFORMAT2);
+			chars.dwMask = CFM_COLOR;
+			chars.crTextColor = (COLORREF)wParam;
+			SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+			SendMessage(hWnd, EM_HIDESELECTION, 0, 0);
+			SetFocus(hWnd);
+			break;
+		}
+		case WM_USER+11: 
+		{
+			HWND hWnd = GetDlgItem(hDlg, IDC_TEXT);
+			EndDialog((HWND)lParam, TRUE);
+			chars.cbSize = sizeof(CHARFORMAT2);
+			chars.dwMask = CFM_BACKCOLOR;
+			chars.crBackColor = (COLORREF)wParam;
+			SendMessage(hWnd, EM_SETCHARFORMAT, (WPARAM)SCF_SELECTION, (LPARAM)&chars);
+			SendMessage(hWnd, EM_HIDESELECTION, 0, 0);
+			SetFocus(hWnd);
+			break;
+		}
+		case WM_CHANGECBCHAIN:
+			if ((HWND)wParam == hClip)
+				hClip = (HWND)lParam;
+			else
+				SendMessage(hClip, WM_CHANGECBCHAIN, wParam, lParam);
+			break;
+		case WM_DRAWCLIPBOARD:
+			if (SendMessage(GetDlgItem(hDlg, IDC_TEXT), EM_CANPASTE, 0, 0)) 
+				SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_PASTE, (LPARAM)MAKELONG(TRUE,0));
+			else
+				SendMessage(hTool, TB_ENABLEBUTTON, (WPARAM)IDM_PASTE, (LPARAM)MAKELONG(FALSE,0));
+			SendMessage(hClip, WM_DRAWCLIPBOARD, wParam, lParam);
+			break;
+		case WM_CLOSE: 
+		{
+			unsigned char text[256];
+			int ans;
+			if (SendMessage(GetDlgItem(hDlg, IDC_TEXT), EM_GETMODIFY, 0, 0) != 0) 
+			{
+				sprintf(text, "The text in the %s file has changed.\r\n\r\nDo you want to save the changes?", file ? file : "new");
+				ans = MessageBox(hDlg, text, "UnrealIRCd", MB_YESNOCANCEL|MB_ICONWARNING);
+				if (ans == IDNO)
+					EndDialog(hDlg, TRUE);
+				if (ans == IDCANCEL)
+					return TRUE;
+				if (ans == IDYES) 
+				{
+					SendMessage(hDlg, WM_COMMAND, MAKEWPARAM(IDM_SAVE,0), 0);
+					EndDialog(hDlg, TRUE);
+				}
+			}
+			else
+				EndDialog(hDlg, TRUE);
+			break;
+		}
+		case WM_DESTROY:
+			ChangeClipboardChain(hDlg, hClip);
+			break;
+	}
+
+	return FALSE;
+}
diff --git a/src/windows/gpl.rtf b/src/windows/gpl.rtf
new file mode 100644
index 0000000..553333e
--- /dev/null
+++ b/src/windows/gpl.rtf
@@ -0,0 +1,97 @@
+{\rtf1\ansi\ansicpg1250\deff0\deflang1033\deflangfe1060{\fonttbl{\f0\fswiss\fprq2\fcharset0 Verdana;}{\f1\fmodern\fprq1\fcharset0 Lucida Console;}}
+{\colortbl ;\red0\green0\blue0;}
+\viewkind4\uc1\pard\nowidctlpar\sb100\sa100\qc\lang1060\kerning36\b\f0\fs28 GNU General Public License
+\par \kerning0\b0\fs16 Version 2, June 1991
+\par \pard\nowidctlpar\f1\fs14 
+\par Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+\par 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+\par 
+\par Everyone is permitted to copy and distribute verbatim copies
+\par of this license document, but changing it is not allowed.
+\par 
+\par \pard\keepn\nowidctlpar\sb100\sa100\qc\cf1\b\f0\fs20 Preamble\cf0\fs24 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b0\fs16 The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. 
+\par When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. 
+\par To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. 
+\par For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. 
+\par We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. 
+\par Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. 
+\par Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. 
+\par The precise terms and conditions for copying, distribution and modification follow. 
+\par \pard\keepn\nowidctlpar\sb100\sa100\qc\cf1\b\fs20 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+\par \pard\nowidctlpar\fi142\sb100\sa100\cf0\fs16 0.\b0  This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". 
+\par \pard\nowidctlpar\sb100\sa100 Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b 1.\b0  You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. 
+\par \pard\nowidctlpar\sb100\sa100 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b 2.\b0  You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+\par \pard\nowidctlpar\li284\sb100\sa100\b a)\b0  You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+\par \b b)\b0  You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+\par \b c)\b0  If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
+\par \pard\nowidctlpar\sb100\sa100 These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+\par Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. 
+\par In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b 3.\b0  You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: \v <!-- we use this doubled UL to get the sub-sections indented, --><!-- while making the bullets as unobvious as possible. -->\v0 
+\par \pard\nowidctlpar\li284\sb100\sa100\b a)\b0  Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+\par \b b)\b0  Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+\par \b c)\b0  Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+\par \pard\nowidctlpar\sb100\sa100 The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+\par If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b 4.\b0  You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+\par \b 5.\b0  You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 
+\par \b 6.\b0  Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 
+\par \b 7.\b0  If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. 
+\par \pard\nowidctlpar\sb100\sa100 If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. 
+\par It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+\par This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b 8.\b0  If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+\par \b 9.\b0  The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+\par \pard\nowidctlpar\sb100\sa100 Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 
+\par \pard\nowidctlpar\fi142\sb100\sa100\b 10.\b0  If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+\par \pard\nowidctlpar\sb100\sa100\qc\cf1\fs20 NO WARRANTY
+\par \pard\nowidctlpar\fi142\sb100\sa100\cf0\b\fs16 11.\b0  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+\par \b 12.\b0  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+\par \pard\keepn\nowidctlpar\sb100\sa100\qc\cf1\b END OF TERMS AND CONDITIONS
+\par \fs20 How to Apply These Terms to Your New Programs
+\par \pard\nowidctlpar\fi142\sb100\sa100\cf0\b0\fs16 If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. 
+\par To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. 
+\par \pard\nowidctlpar\li284\f1\fs14 
+\par \i one line to give the program's name and an idea of what it does.\i0 
+\par Copyright (C) \i yyyy\i0   \i name of author\i0 
+\par 
+\par This program is free software; you can redistribute it and/or
+\par modify it under the terms of the GNU General Public License
+\par as published by the Free Software Foundation; either version 2
+\par of the License, or (at your option) any later version.
+\par 
+\par This program is distributed in the hope that it will be useful,
+\par but WITHOUT ANY WARRANTY; without even the implied warranty of
+\par MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\par GNU General Public License for more details.
+\par 
+\par You should have received a copy of the GNU General Public License
+\par along with this program; if not, write to the Free Software
+\par Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+\par 
+\par \pard\nowidctlpar\sb100\sa100\f0\fs16 Also add information on how to contact you by electronic and paper mail. 
+\par If the program is interactive, make it output a short notice like this when it starts in an interactive mode: 
+\par \pard\nowidctlpar\li284\f1\fs14 
+\par Gnomovision version 69, Copyright (C) \i year\i0  \i name of author\i0 
+\par Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+\par type `show w'.  This is free software, and you are welcome
+\par to redistribute it under certain conditions; type `show c' 
+\par for details.
+\par 
+\par \pard\nowidctlpar\sb100\sa100\f0\fs16 The hypothetical commands \f1\fs14 `show w'\f0\fs16  and \f1\fs14 `show c'\f0\fs16  should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than \f1\fs14 `show w'\f0\fs16  and \f1\fs14 `show c'\f0\fs16 ; they could even be mouse-clicks or menu items--whatever suits your program. 
+\par You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: 
+\par \pard\nowidctlpar\li284\f1\fs14 
+\par Yoyodyne, Inc., hereby disclaims all copyright
+\par interest in the program `Gnomovision'
+\par (which makes passes at compilers) written 
+\par by James Hacker.
+\par 
+\par \i signature of Ty Coon\i0 , 1 April 1989
+\par Ty Coon, President of Vice
+\par 
+\par \pard\nowidctlpar\sb100\sa100\f0\fs16 This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. 
+\par }
+
\ No newline at end of file
diff --git a/src/windows/gplplusssl.rtf b/src/windows/gplplusssl.rtf
new file mode 100755
index 0000000..c160712
--- /dev/null
+++ b/src/windows/gplplusssl.rtf
@@ -0,0 +1,196 @@
+{\rtf1\ansi\ansicpg1252\uc1 \deff0\deflang1030\deflangfe1030{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f28\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Verdana;}
+{\f29\fmodern\fcharset0\fprq1{\*\panose 020b0609040504020204}Lucida Console;}{\f30\froman\fcharset238\fprq2 Times New Roman CE;}{\f31\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f33\froman\fcharset161\fprq2 Times New Roman Greek;}
+{\f34\froman\fcharset162\fprq2 Times New Roman Tur;}{\f35\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f36\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f37\froman\fcharset186\fprq2 Times New Roman Baltic;}
+{\f254\fswiss\fcharset238\fprq2 Verdana CE;}{\f255\fswiss\fcharset204\fprq2 Verdana Cyr;}{\f257\fswiss\fcharset161\fprq2 Verdana Greek;}{\f258\fswiss\fcharset162\fprq2 Verdana Tur;}{\f261\fswiss\fcharset186\fprq2 Verdana Baltic;}
+{\f262\fmodern\fcharset238\fprq1 Lucida Console CE;}{\f263\fmodern\fcharset204\fprq1 Lucida Console Cyr;}{\f265\fmodern\fcharset161\fprq1 Lucida Console Greek;}{\f266\fmodern\fcharset162\fprq1 Lucida Console Tur;}}{\colortbl;\red0\green0\blue0;
+\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;
+\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1030\langfe1030\cgrid\langnp1030\langfenp1030 \snext0 Normal;}{
+\s1\qc \li0\ri0\sb100\sa100\keepn\nowidctlpar\faauto\outlinelevel0\rin0\lin0\itap0 \b\f28\fs16\lang1060\langfe1030\cgrid\langnp1060\langfenp1030 \sbasedon0 \snext0 heading 1;}{\*\cs10 \additive Default Paragraph Font;}{\*\cs15 \additive \ul\cf2 
+\sbasedon10 Hyperlink;}}{\info{\author Carsten V. Munk}{\operator Carsten V. Munk}{\creatim\yr2002\mo8\dy24\hr14\min55}{\revtim\yr2002\mo8\dy24\hr15\min10}{\version3}{\edmins15}{\nofpages5}{\nofwords2726}{\nofchars15541}{\*\company IRCsystems}
+{\nofcharsws19085}{\vern8249}}\widowctrl\ftnbj\aenddoc\hyphhotz425\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\horzdoc\dghspace120\dgvspace120\dghorigin1701\dgvorigin1984\dghshow0\dgvshow3
+\jcompress\viewkind4\viewscale100\nolnhtadjtbl \fet0\sectd \linex0\headery708\footery708\colsx708\sectdefaultcl {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl3
+\pndec\pnstart1\pnindent720\pnhang{\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang{\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}
+{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang{\pntxtb (}{\pntxta )}}\pard\plain 
+\qc \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 \fs24\lang1030\langfe1030\cgrid\langnp1030\langfenp1030 {\b\f28\fs28\lang1060\langfe1030\kerning36\langnp1060 GNU General Public License
+\par }{\f28\fs16\lang1060\langfe1030\langnp1060 Version 2, June 1991
+\par }\pard \ql \li0\ri0\nowidctlpar\faauto\rin0\lin0\itap0 {\f29\fs14\lang1060\langfe1030\langnp1060 
+\par Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+\par 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+\par 
+\par Everyone is permitted to copy and distribute verbatim copies
+\par of this license document, but changing it is not allowed.
+\par 
+\par }\pard \qc \li0\ri0\sb100\sa100\keepn\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs20\cf1\lang1060\langfe1030\langnp1060 Preamble}{\b\f28\lang1060\langfe1030\langnp1060 
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make s
+ure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the G
+NU Library General Public License instead.) You can apply it to your programs, too. 
+\par When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies
+ of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. 
+\par To protect your r
+ights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. 
+\par For exam
+ple, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know
+ their rights. 
+\par We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. 
+\par Also, for each author's protection and ours, we want to make 
+certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by other
+s will not reflect on the original authors' reputations. 
+\par Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making th
+e program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. 
+\par The precise terms and conditions for copying, distribution and modification follow. 
+\par }\pard \qc \li0\ri0\sb100\sa100\keepn\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs20\cf1\lang1060\langfe1030\langnp1060 TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 0.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to an
+y such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into a
+nother language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 Activities other than copying, distribution and modification are not covered by this License; they are outside its s
+cope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what t
+he Program does. 
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 1.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty
+; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 
+
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 2.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: 
+
+\par }\pard \ql \li284\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin284\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 a)}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 b)}{\f28\fs16\lang1060\langfe1030\langnp1060  You must cause any work that you distribute or pub
+lish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 c)}{\f28\fs16\lang1060\langfe1030\langnp1060  If the modified program normally reads commands interactively when 
+run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warran
+t
+y) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Progr
+am is not required to print an announcement.) 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, t
+hen this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the ter
+ms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. 
+\par Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. 
+\par In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 3.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: }{\v\f28\fs16\lang1060\langfe1030\langnp1060 
+<!-- we use this doubled UL to get the sub-sections indented, --><!-- while making the bullets as unobvious as possible. -->}{\f28\fs16\lang1060\langfe1030\langnp1060 
+\par }\pard \ql \li284\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin284\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 a)}{\f28\fs16\lang1060\langfe1030\langnp1060  Accompany it with the complete corresponding machine-readabl
+e source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 b)}{\f28\fs16\lang1060\langfe1030\langnp1060  Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no mo
+re than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 c)}{\f28\fs16\lang1060\langfe1030\langnp1060  Ac
+company it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offe
+r, in accord with Subsection b above.) 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated i
+nterface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary for
+m) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. 
+\par If distribution of executable or object code is made by offering access to copy from a
+ designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 4.}{\f28\fs16\lang1060\langfe1030\langnp1060  You may not copy, modif
+y, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, partie
+s who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 5.}{\f28\fs16\lang1060\langfe1030\langnp1060  You are not required to accept this License, since you have not signed it. However, nothing els
+e grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicat
+e your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 6.}{\f28\fs16\lang1060\langfe1030\langnp1060  Each time you redistribute the Program (or any work based on the Program), the recipient automatically 
+receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible fo
+r enforcing compliance by third parties to this License. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 7.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreeme
+nt or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, 
+t
+hen as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could sa
+tisfy both it and this License would be to refrain entirely from distribution of the Program. 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. 
+\par It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting 
+the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of t
+hat system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. 
+\par This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 8.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geogra
+phical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 9.}{\f28\fs16\lang1060\langfe1030\langnp1060  The Free Softwar
+e Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 Each version is given a
+ distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by th
+e Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 10.}{\f28\fs16\lang1060\langfe1030\langnp1060  If you wish to incorporate parts of the Program into other free programs whose dist
+ribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by t
+he two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. 
+\par }\pard \qc \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs20\cf1\lang1060\langfe1030\langnp1060 NO WARRANTY
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\lang1060\langfe1030\langnp1060 11.}{\f28\fs16\lang1060\langfe1030\langnp1060 
+ BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EX
+TENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTI
+ES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 
+\par }{\b\f28\fs16\lang1060\langfe1030\langnp1060 12.}{\f28\fs16\lang1060\langfe1030\langnp1060  IN NO EV
+ENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONS
+E
+QUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS
+), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
+\par }\pard \qc \li0\ri0\sb100\sa100\keepn\nowidctlpar\faauto\rin0\lin0\itap0 {\b\f28\fs16\cf1\lang1060\langfe1030\langnp1060 END OF TERMS AND CONDITIONS
+\par }{\b\f28\fs20\cf1\lang1060\langfe1030\langnp1060 How to Apply These Terms to Your New Programs
+\par }\pard \ql \fi142\li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 If you develop a new program, and you want it to be of the greatest possible use to the pub
+lic, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. 
+\par To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effecti
+vely convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. 
+\par }\pard \ql \li284\ri0\nowidctlpar\faauto\rin0\lin284\itap0 {\f29\fs14\lang1060\langfe1030\langnp1060 
+\par }{\i\f29\fs14\lang1060\langfe1030\langnp1060 one line to give the program's name and an idea of what it does.}{\f29\fs14\lang1060\langfe1030\langnp1060 
+\par Copyright (C) }{\i\f29\fs14\lang1060\langfe1030\langnp1060 yyyy}{\f29\fs14\lang1060\langfe1030\langnp1060   }{\i\f29\fs14\lang1060\langfe1030\langnp1060 name of author}{\f29\fs14\lang1060\langfe1030\langnp1060 
+\par 
+\par This program is free software; you can redistribute it and/or
+\par modify it under the terms of the GNU General Public License
+\par as published by the Free Software Foundation; either version 2
+\par of the License, or (at your option) any later version.
+\par 
+\par This program is distributed in the hope that it will be useful,
+\par but WITHOUT ANY WARRANTY; without even the implied warranty of
+\par MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+\par GNU General Public License for more details.
+\par 
+\par You should have received a copy of the GNU General Public License
+\par along with this program; if not, write to the Free Software
+\par Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+\par 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 Also add information on how to contact you by electronic and paper mail. 
+\par If the program is interactive, make it output a short notice like this when it starts in an interactive mode: 
+\par }\pard \ql \li284\ri0\nowidctlpar\faauto\rin0\lin284\itap0 {\f29\fs14\lang1060\langfe1030\langnp1060 
+\par Gnomovision version 69, Copyright (C) }{\i\f29\fs14\lang1060\langfe1030\langnp1060 year}{\f29\fs14\lang1060\langfe1030\langnp1060  }{\i\f29\fs14\lang1060\langfe1030\langnp1060 name of author}{\f29\fs14\lang1060\langfe1030\langnp1060 
+\par Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+\par type `show w'.  This is free software, and you are welcome
+\par to redistribute it under certain conditions; type `show c' 
+\par for details.
+\par 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 The hypothetical commands }{\f29\fs14\lang1060\langfe1030\langnp1060 `show w'}{\f28\fs16\lang1060\langfe1030\langnp1060  and }{
+\f29\fs14\lang1060\langfe1030\langnp1060 `show c'}{\f28\fs16\lang1060\langfe1030\langnp1060  should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than }{
+\f29\fs14\lang1060\langfe1030\langnp1060 `show w'}{\f28\fs16\lang1060\langfe1030\langnp1060  and }{\f29\fs14\lang1060\langfe1030\langnp1060 `show c'}{\f28\fs16\lang1060\langfe1030\langnp1060 
+; they could even be mouse-clicks or menu items--whatever suits your program. 
+\par You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: 
+\par }\pard \ql \li284\ri0\nowidctlpar\faauto\rin0\lin284\itap0 {\f29\fs14\lang1060\langfe1030\langnp1060 
+\par Yoyodyne, Inc., hereby disclaims all copyright
+\par interest in the program `Gnomovision'
+\par (which makes passes at compilers) written 
+\par by James Hacker.
+\par 
+\par }{\i\f29\fs14\lang1060\langfe1030\langnp1060 signature of Ty Coon}{\f29\fs14\lang1060\langfe1030\langnp1060 , 1 April 1989
+\par Ty Coon, President of Vice
+\par 
+\par }\pard \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 {\f28\fs16\lang1060\langfe1030\langnp1060 This Gen
+eral Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do,
+ use the GNU Library General Public License instead of this License. 
+\par 
+\par }\pard\plain \s1\qc \li0\ri0\sb100\sa100\keepn\nowidctlpar\faauto\outlinelevel0\rin0\lin0\itap0 \b\f28\fs16\lang1060\langfe1030\cgrid\langnp1060\langfenp1030 {ADDITIONAL INFORMATION WITH REGARDS TO SSL-ENABLED UNREALIRCD
+\par }\pard\plain \ql \li0\ri0\sb100\sa100\nowidctlpar\faauto\rin0\lin0\itap0 \fs24\lang1030\langfe1030\cgrid\langnp1030\langfenp1030 {\f28\fs16\lang1060\langfe1030\langnp1060 
+This software package uses strong cryptography, so even if it is created, maintained and distributed from liberal countries in Europe (w
+here it is legal to do this), it falls under certain export/import and/or use restrictions in some other parts of the world. 
+\par PLEASE REMEMBER THAT EXPORT/IMPORT AND/OR USE OF STRONG CRYPTOGRAPHY SOFTWARE, PROVIDING CRYPTOGRAPHY HOOKS OR EVEN JUST COMMUNICA
+TING TECHNICAL DETAILS ABOUT CRYPTOGRAPHY SOFTWARE IS ILLEGAL IN SOME PARTS OF THE WORLD. SO, WHEN YOU IMPORT THIS PACKAGE TO YOUR COUNTRY, RE-DISTRIBUTE IT FROM THERE OR EVEN JUST EMAIL TECHNICAL SUGGESTIONS OR EVEN SOURCE PATCHES TO THE AUTHOR OR OTHER 
+PEOPLE YOU ARE STRONGLY ADVISED TO PAY CLOSE ATTENTION TO ANY EXPORT/IMPORT AND/OR USE LAWS WHICH APPLY TO YOU. THE AUTHORS OF OPENSSL, LIBRESSL OR UNREALIRCD ARE NOT LIABLE FOR ANY VIOLATIONS YOU MAKE HERE. SO BE CAREFUL, IT IS YOUR RESPONSIBILITY.
+\par CREDIT INFORMATION:
+\par This product includes cryptographic software written by Eric A. Young (eay@cryptsoft.com). This product includes software written by Tim J. Hudson (}{\field{\*\fldinst {\f28\fs16\lang1060\langfe1030\langnp1060  HYPERLINK "mailto:tjh@cryptsoft.com" }{
+\f28\fs16\lang1060\langfe1030\langnp1060 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000170000001200000074006a00680040006300720079007000740073006f00660074002e0063006f006d000000e0c9ea79f9bace118c8200aa004ba90b320000006d00610069006c0074006f003a0074006a00680040006300720079007000740073006f00660074002e00
+63006f006d000000}}}{\fldrslt {\cs15\f28\fs16\ul\cf2\lang1060\langfe1030\langnp1060 tjh@cryptsoft.com}}}{\f28\fs16\lang1060\langfe1030\langnp1060 ). This product uses the LibreSSL (https://www.libressl.org) or OpenSSL library (https://www.openssl.org).
+\par 
+\par }}
\ No newline at end of file
diff --git a/src/windows/gui.c b/src/windows/gui.c
new file mode 100644
index 0000000..0aaa6f4
--- /dev/null
+++ b/src/windows/gui.c
@@ -0,0 +1,1122 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/gui.c
+ *   Copyright (C) 2000-2004 David Flynn (DrBin) & Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#define WIN32_VERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5
+
+#include "unrealircd.h"
+#include <windowsx.h>
+#include <commctrl.h>
+#include <commdlg.h>
+#include <richedit.h>
+#include <Strsafe.h>
+#include "resource.h"
+#include "win.h"
+
+#define TOOLBAR_START 82
+#define TOOLBAR_STOP (TOOLBAR_START+20)
+
+__inline void ShowDialog(HWND *handle, HINSTANCE inst, char *template, HWND parent, 
+			 DLGPROC proc)
+{
+	if (!IsWindow(*handle)) 
+	{
+		*handle = CreateDialog(inst, template, parent, (DLGPROC)proc); 
+		ShowWindow(*handle, SW_SHOW);
+	}
+	else
+		SetForegroundWindow(*handle);
+}
+
+/* Comments:
+ * 
+ * DrBin did a great job with the original GUI, but he has been gone a long time.
+ * In his absense, it was decided it would be best to continue windows development.
+ * The new code is based on his so it will be pretty much similar in features, my
+ * main goal is to make it more stable. A lot of what I know about GUI coding 
+ * I learned from DrBin so thanks to him for teaching me :) -- codemastr
+ */
+
+LRESULT CALLBACK MainDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK LicenseDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK InfoDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK CreditsDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK HelpDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK StatusDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK ConfigErrorDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK FromVarDLG(HWND, UINT, WPARAM, LPARAM, unsigned char *, unsigned char **);
+LRESULT CALLBACK FromFileReadDLG(HWND, UINT, WPARAM, LPARAM);
+LRESULT CALLBACK FromFileDLG(HWND, UINT, WPARAM, LPARAM);
+
+HBRUSH MainDlgBackground;
+
+extern void SocketLoop(void *dummy);
+HINSTANCE hInst;
+NOTIFYICONDATA SysTray;
+HTREEITEM AddItemToTree(HWND, LPSTR, int, short);
+void win_map(Client *, HWND, short);
+extern Link *Servers;
+unsigned char *errors = NULL;
+extern VOID WINAPI ServiceMain(DWORD dwArgc, LPTSTR *lpszArgv);
+void CleanUp(void)
+{
+	Shell_NotifyIcon(NIM_DELETE ,&SysTray);
+}
+HWND hStatusWnd;
+HWND hwIRCDWnd=NULL;
+HWND hwTreeView;
+HWND hWndMod;
+UINT WM_TASKBARCREATED, WM_FINDMSGSTRING;
+FARPROC lpfnOldWndProc;
+HMENU hContext;
+char OSName[OSVER_SIZE];
+#ifdef USE_LIBCURL
+extern char *find_loaded_remote_include(char *url);
+#endif 
+
+void TaskBarCreated() 
+{
+	HICON hIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(ICO_MAIN), IMAGE_ICON,16, 16, 0);
+	SysTray.cbSize = sizeof(NOTIFYICONDATA);
+	SysTray.hIcon = hIcon;
+	SysTray.hWnd = hwIRCDWnd;
+	SysTray.uCallbackMessage = WM_USER;
+	SysTray.uFlags = NIF_ICON|NIF_TIP|NIF_MESSAGE;
+	SysTray.uID = 0;
+	strcpy(SysTray.szTip, WIN32_VERSION);
+	Shell_NotifyIcon(NIM_ADD ,&SysTray);
+}
+
+LRESULT LinkSubClassFunc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam) 
+{
+	static HCURSOR hCursor;
+	if (!hCursor)
+		hCursor = LoadCursor(hInst, MAKEINTRESOURCE(CUR_HAND));
+	if (Message == WM_MOUSEMOVE || Message == WM_LBUTTONDOWN)
+		SetCursor(hCursor);
+
+	return CallWindowProc((WNDPROC)lpfnOldWndProc, hWnd, Message, wParam, lParam);
+}
+
+
+
+LRESULT RESubClassFunc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam) 
+{
+	POINT p;
+	RECT r;
+	DWORD start, end;
+	unsigned char string[500];
+
+	if (Message == WM_GETDLGCODE)
+		return DLGC_WANTALLKEYS;
+
+	
+	if (Message == WM_CONTEXTMENU) 
+	{
+		p.x = GET_X_LPARAM(lParam);
+		p.y = GET_Y_LPARAM(lParam);
+		if (GET_X_LPARAM(lParam) == -1 && GET_Y_LPARAM(lParam) == -1) 
+		{
+			GetClientRect(hWnd, &r);
+			p.x = (int)((r.left + r.right)/2);
+			p.y = (int)((r.top + r.bottom)/2);
+			ClientToScreen(hWnd,&p);
+		}
+		if (!SendMessage(hWnd, EM_CANUNDO, 0, 0)) 
+			EnableMenuItem(hContext, IDM_UNDO, MF_BYCOMMAND|MF_GRAYED);
+		else
+			EnableMenuItem(hContext, IDM_UNDO, MF_BYCOMMAND|MF_ENABLED);
+		if (!SendMessage(hWnd, EM_CANPASTE, 0, 0)) 
+			EnableMenuItem(hContext, IDM_PASTE, MF_BYCOMMAND|MF_GRAYED);
+		else
+			EnableMenuItem(hContext, IDM_PASTE, MF_BYCOMMAND|MF_ENABLED);
+		if (GetWindowLong(hWnd, GWL_STYLE) & ES_READONLY) 
+		{
+			EnableMenuItem(hContext, IDM_CUT, MF_BYCOMMAND|MF_GRAYED);
+			EnableMenuItem(hContext, IDM_DELETE, MF_BYCOMMAND|MF_GRAYED);
+		}
+		else 
+		{
+			EnableMenuItem(hContext, IDM_CUT, MF_BYCOMMAND|MF_ENABLED);
+			EnableMenuItem(hContext, IDM_DELETE, MF_BYCOMMAND|MF_ENABLED);
+		}
+		SendMessage(hWnd, EM_GETSEL, (WPARAM)&start, (LPARAM)&end);
+		if (start == end) 
+			EnableMenuItem(hContext, IDM_COPY, MF_BYCOMMAND|MF_GRAYED);
+		else
+			EnableMenuItem(hContext, IDM_COPY, MF_BYCOMMAND|MF_ENABLED);
+		TrackPopupMenu(hContext,TPM_LEFTALIGN|TPM_RIGHTBUTTON,p.x,p.y,0,GetParent(hWnd),NULL);
+		return 0;
+	}
+
+	return CallWindowProc((WNDPROC)lpfnOldWndProc, hWnd, Message, wParam, lParam);
+}
+
+int CloseUnreal(HWND hWnd)
+{
+	if (MessageBox(hWnd, "Close UnrealIRCd?", "Are you sure?", MB_YESNO|MB_ICONQUESTION) == IDNO)
+		 return 0;
+	else 
+	{
+		DestroyWindow(hWnd);
+		TerminateProcess(GetCurrentProcess(), 0);
+		exit(0); /* in case previous fails (possible?) */
+	}
+}
+
+int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+	MSG msg;
+	unsigned char *s;
+	HWND hWnd;
+	WSADATA WSAData;
+	HICON hIcon;
+	SC_HANDLE hService, hSCManager;
+	SERVICE_TABLE_ENTRY DispatchTable[] = 
+	{
+		{ "UnrealIRCd", ServiceMain },
+		{ 0, 0 }
+	};
+	DWORD need;
+	
+	/* Go one level up, since we are currently in the bin\ subdir
+	 * and we want to be in (f.e.) "C:\Program Files\UnrealIRCd 5"
+	 */
+	chdir("..");
+
+	GetOSName(OSName);
+
+	/* Check if we are running as a service... */
+	hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
+	if ((hService = OpenService(hSCManager, "UnrealIRCd", SC_MANAGER_CONNECT)))
+	{
+		int save_err = 0;
+		StartServiceCtrlDispatcher(DispatchTable);
+		if (GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT)
+		{
+			SERVICE_STATUS status;
+			/* Restart handling, it's ugly but it's as
+			 * pretty as it is gonna get :)
+			 */
+			if (__argc == 2 && !strcmp(__argv[1], "restartsvc"))
+			{
+				QueryServiceStatus(hService, &status);
+				if (status.dwCurrentState != SERVICE_STOPPED)
+				{
+					ControlService(hService,
+						SERVICE_CONTROL_STOP, &status);
+					while (status.dwCurrentState == SERVICE_STOP_PENDING)
+					{
+						QueryServiceStatus(hService, &status);
+						if (status.dwCurrentState != SERVICE_STOPPED)
+							Sleep(1000);
+					}
+				}
+			}
+			if (!StartService(hService, 0, NULL))
+				save_err = GetLastError();
+		}
+
+		CloseServiceHandle(hService);
+		CloseServiceHandle(hSCManager);
+		if (save_err != ERROR_SERVICE_DISABLED)
+			exit(0);
+	} else {
+		CloseServiceHandle(hSCManager);
+	}
+	InitCommonControls();
+	WM_TASKBARCREATED = RegisterWindowMessage("TaskbarCreated");
+	WM_FINDMSGSTRING = RegisterWindowMessage(FINDMSGSTRING);
+	atexit(CleanUp);
+	if(!LoadLibrary("riched20.dll"))
+		LoadLibrary("riched32.dll");
+	InitDebug();
+
+	if (WSAStartup(MAKEWORD(1, 1), &WSAData) != 0)
+	{
+		MessageBox(NULL, "Unable to initialize WinSock", "UnrealIRCD Initalization Error", MB_OK);
+		return FALSE;
+	}
+	hInst = hInstance; 
+
+	MainDlgBackground = CreateSolidBrush(RGB(75, 134, 238)); /* Background of main dialog */
+
+	hWnd = CreateDialog(hInstance, "UnrealIRCd", 0, (DLGPROC)MainDLG); 
+	hwIRCDWnd = hWnd;
+	
+	TaskBarCreated();
+
+	if (InitUnrealIRCd(__argc, __argv) != 1)
+	{
+		MessageBox(NULL, "UnrealIRCd has failed to initialize in InitUnrealIRCd()", "UnrealIRCD Initalization Error" ,MB_OK);
+		return FALSE;
+	}
+	ShowWindow(hWnd, SW_SHOW);
+	_beginthread(SocketLoop, 0, NULL);
+	while (GetMessage(&msg, NULL, 0, 0))
+	{
+		if (!IsWindow(hStatusWnd) || !IsDialogMessage(hStatusWnd, &msg)) 
+		{
+			TranslateMessage(&msg);
+			DispatchMessage(&msg);
+		}
+	}
+	return FALSE;
+
+}
+
+LRESULT CALLBACK MainDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
+{
+	static HCURSOR hCursor;
+	static HMENU hRehash, hAbout, hConfig, hTray, hLogs;
+
+	unsigned char *argv[3];
+	Client *pClient;
+	unsigned char *msg;
+	POINT p;
+
+	if (message == WM_TASKBARCREATED)
+	{
+		TaskBarCreated();
+		return TRUE;
+	}
+	
+	switch (message)
+	{
+		case WM_INITDIALOG: 
+		{
+			ShowWindow(hDlg, SW_HIDE);
+			hCursor = LoadCursor(hInst, MAKEINTRESOURCE(CUR_HAND));
+			hContext = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(MENU_CONTEXT)),0);
+			/* Rehash popup menu */
+			hRehash = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(MENU_REHASH)),0);
+			/* About popup menu */
+			hAbout = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(MENU_ABOUT)),0);
+			/* Systray popup menu set the items to point to the other menus*/
+			hTray = GetSubMenu(LoadMenu(hInst, MAKEINTRESOURCE(MENU_SYSTRAY)),0);
+			ModifyMenu(hTray, IDM_REHASH, MF_BYCOMMAND|MF_POPUP|MF_STRING, HandleToUlong(hRehash), "&Rehash");
+			ModifyMenu(hTray, IDM_ABOUT, MF_BYCOMMAND|MF_POPUP|MF_STRING, HandleToUlong(hAbout), "&About");
+			
+			SetWindowText(hDlg, WIN32_VERSION);
+			SendMessage(hDlg, WM_SETICON, (WPARAM)ICON_SMALL, 
+				(LPARAM)(HICON)LoadImage(hInst, MAKEINTRESOURCE(ICO_MAIN), IMAGE_ICON,16, 16, 0));
+			SendMessage(hDlg, WM_SETICON, (WPARAM)ICON_BIG, 
+				(LPARAM)(HICON)LoadImage(hInst, MAKEINTRESOURCE(ICO_MAIN), IMAGE_ICON,32, 32, 0));
+			return TRUE;
+		}
+		case WM_CTLCOLORDLG:
+			return (LONG)HandleToLong(MainDlgBackground);
+		case WM_SIZE: 
+		{
+			if (wParam & SIZE_MINIMIZED)
+				ShowWindow(hDlg,SW_HIDE);
+			return 0;
+		}
+		case WM_CLOSE: 
+			return CloseUnreal(hDlg);
+		case WM_USER: 
+		{
+			switch(LOWORD(lParam)) 
+			{
+				case WM_LBUTTONDBLCLK:
+					ShowWindow(hDlg, SW_SHOW);
+					ShowWindow(hDlg,SW_RESTORE);
+					SetForegroundWindow(hDlg);
+				case WM_RBUTTONDOWN:
+					SetForegroundWindow(hDlg);
+					break;
+				case WM_RBUTTONUP: 
+				{
+					unsigned long i = 60000;
+					MENUITEMINFO mii;
+					GetCursorPos(&p);
+					DestroyMenu(hConfig);
+					hConfig = CreatePopupMenu();
+					DestroyMenu(hLogs);
+					hLogs = CreatePopupMenu();
+					AppendMenu(hConfig, MF_STRING, IDM_CONF, CPATH);
+					if (conf_log) 
+					{
+						ConfigItem_log *logs;
+						AppendMenu(hConfig, MF_POPUP|MF_STRING, HandleToUlong(hLogs), "Logs");
+						for (logs = conf_log; logs; logs = logs->next)
+						{
+							AppendMenu(hLogs, MF_STRING, i++, logs->file);
+						}
+					}
+					AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+					if (conf_include) 
+					{
+						ConfigItem_include *inc;
+						for (inc = conf_include; inc; inc = inc->next)
+						{
+							if (inc->flag.type & INCLUDE_NOTLOADED)
+								continue;
+#ifdef USE_LIBCURL
+							if (inc->flag.type & INCLUDE_REMOTE)
+								AppendMenu(hConfig, MF_STRING, i++, inc->url);
+							else
+#endif
+							AppendMenu(hConfig, MF_STRING, i++, inc->file);
+						}
+						AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+					}
+					if (conf_files)
+					{
+						AppendMenu(hConfig, MF_STRING, IDM_MOTD, conf_files->motd_file);
+						AppendMenu(hConfig, MF_STRING, IDM_SMOTD, conf_files->smotd_file);
+						AppendMenu(hConfig, MF_STRING, IDM_OPERMOTD, conf_files->opermotd_file);
+						AppendMenu(hConfig, MF_STRING, IDM_BOTMOTD, conf_files->botmotd_file);
+						AppendMenu(hConfig, MF_STRING, IDM_RULES, conf_files->rules_file);
+					}
+						
+					if (conf_tld) 
+					{
+						ConfigItem_tld *tlds;
+						AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+						for (tlds = conf_tld; tlds; tlds = tlds->next)
+						{
+							if (!tlds->flag.motdptr)
+								AppendMenu(hConfig, MF_STRING, i++, tlds->motd_file);
+							if (!tlds->flag.ruleclient)
+								AppendMenu(hConfig, MF_STRING, i++, tlds->rules_file);
+							if (tlds->smotd_file)
+								AppendMenu(hConfig, MF_STRING, i++, tlds->smotd_file);
+						}
+					}
+					AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+					AppendMenu(hConfig, MF_STRING, IDM_NEW, "New File");
+					mii.cbSize = sizeof(MENUITEMINFO);
+					mii.fMask = MIIM_SUBMENU;
+					mii.hSubMenu = hConfig;
+					SetMenuItemInfo(hTray, IDM_CONFIG, MF_BYCOMMAND, &mii);
+					TrackPopupMenu(hTray, TPM_LEFTALIGN|TPM_LEFTBUTTON,p.x,p.y,0,hDlg,NULL);
+					/* Kludge for a win bug */
+					SendMessage(hDlg, WM_NULL, 0, 0);
+					break;
+				}
+			}
+			return 0;
+		}
+		case WM_DESTROY:
+			return 0;
+		case WM_MOUSEMOVE: 
+		{
+			POINT p;
+			p.x = LOWORD(lParam);
+			p.y = HIWORD(lParam);
+			if ((p.x >= 93) && (p.x <= 150) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+				SetCursor(hCursor);
+			else if ((p.x >= 160) && (p.x <= 208) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+				SetCursor(hCursor);
+			else if ((p.x >= 219) && (p.x <= 267) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+				SetCursor(hCursor);
+			else if ((p.x >= 279) && (p.x <= 325) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+				SetCursor(hCursor);
+			else if ((p.x >= 336) && (p.x <= 411) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+				SetCursor(hCursor);
+			return 0;
+		}
+		case WM_LBUTTONDOWN: 
+		{
+			POINT p;
+			p.x = LOWORD(lParam);
+			p.y = HIWORD(lParam);
+			if ((p.x >= 93) && (p.x <= 150) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP))
+			{
+				ClientToScreen(hDlg,&p);
+				TrackPopupMenu(hRehash,TPM_LEFTALIGN|TPM_LEFTBUTTON,p.x,p.y,0,hDlg,NULL);
+				return 0;
+			}
+			else if ((p.x >= 160) && (p.x <= 208) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP))
+			{
+				ShowDialog(&hStatusWnd, hInst, "Status", hDlg, StatusDLG);
+				return 0;
+			}
+			else if ((p.x >= 219) && (p.x <= 267) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP))
+			{
+				unsigned long i = 60000;
+				ClientToScreen(hDlg,&p);
+				DestroyMenu(hConfig);
+				hConfig = CreatePopupMenu();
+				DestroyMenu(hLogs);
+				hLogs = CreatePopupMenu();
+
+				AppendMenu(hConfig, MF_STRING, IDM_CONF, CPATH);
+				if (conf_log) 
+				{
+					ConfigItem_log *logs;
+					AppendMenu(hConfig, MF_POPUP|MF_STRING, HandleToUlong(hLogs), "Logs");
+					for (logs = conf_log; logs; logs = logs->next)
+					{
+						AppendMenu(hLogs, MF_STRING, i++, logs->file);
+					}
+				}
+				AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+
+				if (conf_include) 
+				{
+					ConfigItem_include *inc;
+					for (inc = conf_include; inc; inc = inc->next)
+					{
+#ifdef USE_LIBCURL
+						if (inc->flag.type & INCLUDE_REMOTE)
+							AppendMenu(hConfig, MF_STRING, i++, inc->url);
+						else
+#endif
+						AppendMenu(hConfig, MF_STRING, i++, inc->file);
+					}
+					AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+				}
+
+				if (conf_files)
+				{
+					AppendMenu(hConfig, MF_STRING, IDM_MOTD, conf_files->motd_file);
+					AppendMenu(hConfig, MF_STRING, IDM_SMOTD, conf_files->smotd_file);
+					AppendMenu(hConfig, MF_STRING, IDM_OPERMOTD, conf_files->opermotd_file);
+					AppendMenu(hConfig, MF_STRING, IDM_BOTMOTD, conf_files->botmotd_file);
+					AppendMenu(hConfig, MF_STRING, IDM_RULES, conf_files->rules_file);
+				}
+				
+				if (conf_tld) 
+				{
+					ConfigItem_tld *tlds;
+					AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+					for (tlds = conf_tld; tlds; tlds = tlds->next)
+					{
+						if (!tlds->flag.motdptr)
+							AppendMenu(hConfig, MF_STRING, i++, tlds->motd_file);
+						if (!tlds->flag.ruleclient)
+							AppendMenu(hConfig, MF_STRING, i++, tlds->rules_file);
+						if (tlds->smotd_file)
+							AppendMenu(hConfig, MF_STRING, i++, tlds->smotd_file);
+					}
+				}
+				AppendMenu(hConfig, MF_SEPARATOR, 0, NULL);
+				AppendMenu(hConfig, MF_STRING, IDM_NEW, "New File");
+				TrackPopupMenu(hConfig,TPM_LEFTALIGN|TPM_LEFTBUTTON,p.x,p.y,0,hDlg,NULL);
+
+				return 0;
+			}
+			else if ((p.x >= 279) && (p.x <= 325) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+			{
+				ClientToScreen(hDlg,&p);
+				TrackPopupMenu(hAbout,TPM_LEFTALIGN|TPM_LEFTBUTTON,p.x,p.y,0,hDlg,NULL);
+				return 0;
+			}
+			else if ((p.x >= 336) && (p.x <= 411) && (p.y >= TOOLBAR_START) && (p.y <= TOOLBAR_STOP)) 
+				return CloseUnreal(hDlg);
+		}
+		case WM_COMMAND: 
+		{
+			if (LOWORD(wParam) >= 60000 && HIWORD(wParam) == 0 && !lParam) 
+			{
+				unsigned char path[MAX_PATH];
+				if (GetMenuString(hLogs, LOWORD(wParam), path, MAX_PATH, MF_BYCOMMAND))
+					DialogBoxParam(hInst, "FromVar", hDlg, (DLGPROC)FromFileReadDLG, (LPARAM)path);
+				
+				else 
+				{
+					GetMenuString(hConfig,LOWORD(wParam), path, MAX_PATH, MF_BYCOMMAND);
+#ifdef USE_LIBCURL
+					if (url_is_valid(path))
+					{
+						char *file = find_loaded_remote_include(path);
+						DialogBoxParam(hInst, "FromVar", hDlg, (DLGPROC)FromFileReadDLG, (LPARAM)file);
+					}
+					else
+#endif
+						DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG, (LPARAM)path);
+				}
+				return FALSE;
+			}
+
+			if (!loop.ircd_booted)
+			{
+				MessageBox(NULL, "UnrealIRCd not booted due to configuration errors. "
+				                 "Check other window for error details. Then close that window, "
+				                 "fix the errors and start UnrealIRCd again.",
+				                 "UnrealIRCd not started",
+				                 MB_OK);
+				return FALSE;
+			}
+			switch(LOWORD(wParam)) 
+			{
+				case IDM_STATUS:
+					ShowDialog(&hStatusWnd, hInst, "Status", hDlg,StatusDLG);
+					break;
+				case IDM_SHUTDOWN:
+					return CloseUnreal(hDlg);
+				case IDM_RHALL:
+					MessageBox(NULL, "Rehashing all files", "Rehashing", MB_OK);
+					sendto_realops("Rehashing all files via the console");
+					rehash(&me,0);
+					reread_motdsandrules();
+					break;
+				case IDM_RHCONF:
+					MessageBox(NULL, "Rehashing the Config file", "Rehashing", MB_OK);
+					sendto_realops("Rehashing the Config file via the console");
+					rehash(&me,0);
+					break;
+				case IDM_RHMOTD: 
+				{
+					MessageBox(NULL, "Rehashing all MOTD and Rules files", "Rehashing", MB_OK);
+					rehash_motdrules();
+					sendto_realops("Rehashing all MOTD and Rules files via the console");
+					break;
+				}
+				case IDM_RHOMOTD:
+					MessageBox(NULL, "Rehashing the OperMOTD", "Rehashing", MB_OK);
+					read_motd(conf_files->opermotd_file, &opermotd);
+					sendto_realops("Rehashing the OperMOTD via the console");
+					break;
+				case IDM_RHBMOTD:
+					MessageBox(NULL, "Rehashing the BotMOTD", "Rehashing", MB_OK);
+					read_motd(conf_files->botmotd_file, &botmotd);
+					sendto_realops("Rehashing the BotMOTD via the console");
+					break;
+				case IDM_LICENSE: 
+					DialogBox(hInst, "FromVar", hDlg, (DLGPROC)LicenseDLG);
+					break;
+				case IDM_INFO:
+					DialogBox(hInst, "FromVar", hDlg, (DLGPROC)InfoDLG);
+					break;
+				case IDM_CREDITS:
+					DialogBox(hInst, "FromVar", hDlg, (DLGPROC)CreditsDLG);
+					break;
+				case IDM_HELP:
+					DialogBox(hInst, "Help", hDlg, (DLGPROC)HelpDLG);
+					break;
+				case IDM_CONF:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG, 
+						(LPARAM)CPATH);
+					break;
+				case IDM_MOTD:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG, 
+						(LPARAM)conf_files->motd_file);
+					break;
+				case IDM_SMOTD:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG, 
+						(LPARAM)conf_files->smotd_file);
+					break;
+				case IDM_OPERMOTD:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG,
+						(LPARAM)conf_files->opermotd_file);
+					break;
+				case IDM_BOTMOTD:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG,
+						(LPARAM)conf_files->botmotd_file);
+					break;
+				case IDM_RULES:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG,
+						(LPARAM)conf_files->rules_file);
+					break;
+				case IDM_NEW:
+					DialogBoxParam(hInst, "FromFile", hDlg, (DLGPROC)FromFileDLG, (LPARAM)NULL);
+					break;
+			}
+		}
+	}
+	return FALSE;
+}
+
+LRESULT CALLBACK LicenseDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	return FromVarDLG(hDlg, message, wParam, lParam, "UnrealIRCd License", gnulicense);
+}
+
+LRESULT CALLBACK InfoDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	return FromVarDLG(hDlg, message, wParam, lParam, "UnrealIRCd Team", unrealinfo);
+}
+
+LRESULT CALLBACK CreditsDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	return FromVarDLG(hDlg, message, wParam, lParam, "UnrealIRCd Credits", unrealcredits);
+}
+
+LRESULT CALLBACK FromVarDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam,
+                            unsigned char *title, unsigned char **s) 
+{
+	HWND hWnd;
+	switch (message) 
+	{
+		case WM_INITDIALOG: 
+		{
+#if 0
+			unsigned char	String[16384];
+			int size;
+			unsigned char *RTFString;
+			StreamIO *stream = safe_alloc(sizeof(StreamIO));
+			EDITSTREAM edit;
+			SetWindowText(hDlg, title);
+			memset(String, 0, sizeof(String));
+			lpfnOldWndProc = (FARPROC)SetWindowLongPtr(GetDlgItem(hDlg, IDC_TEXT), GWLP_WNDPROC, (LONG_PTR)RESubClassFunc);
+			while (*s) 
+			{
+				strcat(String, *s++);
+				if (*s)
+					strcat(String, "\r\n");
+			}
+			size = CountRTFSize(String)+1;
+			RTFString = safe_alloc(size);
+			IRCToRTF(String,RTFString);
+			RTFBuf = RTFString;
+			size--;
+			stream->size = &size;
+			stream->buffer = &RTFBuf;
+			edit.dwCookie = HandleToUlong(stream);
+			edit.pfnCallback = SplitIt;
+			SendMessage(GetDlgItem(hDlg, IDC_TEXT), EM_STREAMIN, (WPARAM)SF_RTF|SFF_PLAINRTF, (LPARAM)&edit);
+			safe_free(RTFString);
+			safe_free(stream);
+			return TRUE;
+#else
+			return FALSE;
+#endif
+		}
+
+		case WM_COMMAND: 
+		{
+			hWnd = GetDlgItem(hDlg, IDC_TEXT);
+			if (LOWORD(wParam) == IDOK)
+				return EndDialog(hDlg, TRUE);
+			if (LOWORD(wParam) == IDM_COPY) 
+			{
+				SendMessage(hWnd, WM_COPY, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_SELECTALL) 
+			{
+				SendMessage(hWnd, EM_SETSEL, 0, -1);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_PASTE) 
+			{
+				SendMessage(hWnd, WM_PASTE, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_CUT) 
+			{
+				SendMessage(hWnd, WM_CUT, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_UNDO) 
+			{
+				SendMessage(hWnd, EM_UNDO, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_DELETE) 
+			{
+				SendMessage(hWnd, WM_CLEAR, 0, 0);
+				return 0;
+			}
+			break;
+		}
+		case WM_CLOSE:
+			EndDialog(hDlg, TRUE);
+			break;
+		case WM_DESTROY:
+			break;
+	}
+	return (FALSE);
+}
+
+LRESULT CALLBACK FromFileReadDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	HWND hWnd;
+	switch (message) 
+	{
+		case WM_INITDIALOG: 
+		{
+			int fd,len;
+			unsigned char *buffer = '\0', *string = '\0';
+			EDITSTREAM edit;
+			StreamIO *stream = safe_alloc(sizeof(StreamIO));
+			unsigned char szText[256];
+			struct stat sb;
+			HWND hWnd = GetDlgItem(hDlg, IDC_TEXT), hTip;
+			StringCbPrintf(szText, sizeof(szText), "UnrealIRCd Viewer - %s", (unsigned char *)lParam);
+			SetWindowText(hDlg, szText);
+			lpfnOldWndProc = (FARPROC)SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)RESubClassFunc);
+			if ((fd = open((unsigned char *)lParam, _O_RDONLY|_O_BINARY)) != -1) 
+			{
+				fstat(fd,&sb);
+				/* Only allocate the amount we need */
+				buffer = safe_alloc(sb.st_size+1);
+				buffer[0] = 0;
+				len = read(fd, buffer, sb.st_size); 
+				buffer[len] = 0;
+				len = CountRTFSize(buffer)+1;
+				string = safe_alloc(len);
+				IRCToRTF(buffer,string);
+				RTFBuf = string;
+				len--;
+				stream->size = &len;
+				stream->buffer = &RTFBuf;
+				edit.dwCookie = (DWORD_PTR)stream;
+				edit.pfnCallback = SplitIt;
+				SendMessage(hWnd, EM_EXLIMITTEXT, 0, (LPARAM)0x7FFFFFFF);
+				SendMessage(hWnd, EM_STREAMIN, (WPARAM)SF_RTF|SFF_PLAINRTF, (LPARAM)&edit);
+				close(fd);
+				RTFBuf = NULL;
+				safe_free(buffer);
+				safe_free(string);
+				safe_free(stream);
+			}
+			return TRUE;
+		}
+		case WM_COMMAND: 
+		{
+			hWnd = GetDlgItem(hDlg, IDC_TEXT);
+			if (LOWORD(wParam) == IDOK)
+				return EndDialog(hDlg, TRUE);
+			if (LOWORD(wParam) == IDM_COPY) 
+			{
+				SendMessage(hWnd, WM_COPY, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_SELECTALL) 
+			{
+				SendMessage(hWnd, EM_SETSEL, 0, -1);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_PASTE) 
+			{
+				SendMessage(hWnd, WM_PASTE, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_CUT) 
+			{
+				SendMessage(hWnd, WM_CUT, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_UNDO) 
+			{
+				SendMessage(hWnd, EM_UNDO, 0, 0);
+				return 0;
+			}
+			if (LOWORD(wParam) == IDM_DELETE) 
+			{
+				SendMessage(hWnd, WM_CLEAR, 0, 0);
+				return 0;
+			}
+			break;
+		}
+		case WM_CLOSE:
+			EndDialog(hDlg, TRUE);
+			break;
+		case WM_DESTROY:
+			break;
+	}
+	return FALSE;
+}
+
+LRESULT CALLBACK HelpDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	static HFONT hFont;
+	static HCURSOR hCursor;
+	switch (message) 
+	{
+		case WM_INITDIALOG:
+			hCursor = LoadCursor(hInst, MAKEINTRESOURCE(CUR_HAND));
+			hFont = CreateFont(8,0,0,0,0,0,1,0,ANSI_CHARSET,0,0,PROOF_QUALITY,0,"MS Sans Serif");
+			SendMessage(GetDlgItem(hDlg, IDC_EMAIL), WM_SETFONT, (WPARAM)hFont,TRUE);
+			SendMessage(GetDlgItem(hDlg, IDC_URL), WM_SETFONT, (WPARAM)hFont,TRUE);
+			lpfnOldWndProc = (FARPROC)SetWindowLongPtr(GetDlgItem(hDlg, IDC_EMAIL), GWLP_WNDPROC, (LONG_PTR)LinkSubClassFunc);
+			SetWindowLongPtr(GetDlgItem(hDlg, IDC_URL), GWLP_WNDPROC, (LONG_PTR)LinkSubClassFunc);
+			return TRUE;
+
+		case WM_DRAWITEM: 
+		{
+			LPDRAWITEMSTRUCT lpdis = (LPDRAWITEMSTRUCT)lParam;
+			unsigned char text[500];
+			COLORREF oldtext;
+			RECT focus;
+			GetWindowText(lpdis->hwndItem, text, 500);
+			if (wParam == IDC_URL || IDC_EMAIL) 
+			{
+				FillRect(lpdis->hDC, &lpdis->rcItem, GetSysColorBrush(COLOR_3DFACE));
+				oldtext = SetTextColor(lpdis->hDC, RGB(0,0,255));
+				DrawText(lpdis->hDC, text, strlen(text), &lpdis->rcItem, DT_CENTER|DT_VCENTER);
+				SetTextColor(lpdis->hDC, oldtext);
+				if (lpdis->itemState & ODS_FOCUS) 
+				{
+					CopyRect(&focus, &lpdis->rcItem);
+					focus.left += 2;
+					focus.right -= 2;
+					focus.top += 1;
+					focus.bottom -= 1;
+					DrawFocusRect(lpdis->hDC, &focus);
+				}
+				return TRUE;
+			}
+		}	
+		case WM_COMMAND:
+			if (LOWORD(wParam) == IDOK)
+				EndDialog(hDlg, TRUE);
+			if (HIWORD(wParam) == BN_DBLCLK) 
+			{
+				if (LOWORD(wParam) == IDC_URL) 
+					ShellExecute(NULL, "open", "https://www.unrealircd.org", NULL, NULL, 
+						SW_MAXIMIZE);
+				else if (LOWORD(wParam) == IDC_EMAIL)
+					ShellExecute(NULL, "open", "mailto:unreal-users@lists.sourceforge.net", NULL, NULL, 
+						SW_MAXIMIZE);
+				EndDialog(hDlg, TRUE);
+				return 0;
+			}
+			break;
+		case WM_CLOSE:
+			EndDialog(hDlg, TRUE);
+			break;
+		case WM_DESTROY:
+			DeleteObject(hFont);
+			break;
+
+	}
+	return FALSE;
+}
+
+
+
+
+
+
+
+
+LRESULT CALLBACK StatusDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	switch (message) 
+	{
+		case WM_INITDIALOG: 
+		{
+			hwTreeView = GetDlgItem(hDlg, IDC_TREE);
+			win_map(&me, hwTreeView, 0);
+			SetDlgItemInt(hDlg, IDC_CLIENTS, irccounts.clients, FALSE);
+			SetDlgItemInt(hDlg, IDC_SERVERS, irccounts.servers, FALSE);
+			SetDlgItemInt(hDlg, IDC_INVISO, irccounts.invisible, FALSE);
+			SetDlgItemInt(hDlg, IDC_UNKNOWN, irccounts.unknown, FALSE);
+			SetDlgItemInt(hDlg, IDC_OPERS, irccounts.operators, FALSE);
+			SetDlgItemInt(hDlg, IDC_CHANNELS, irccounts.channels, FALSE);
+			if (irccounts.clients > irccounts.global_max)
+				irccounts.global_max = irccounts.clients;
+			if (irccounts.me_clients > irccounts.me_max)
+					irccounts.me_max = irccounts.me_clients;
+			SetDlgItemInt(hDlg, IDC_MAXCLIENTS, irccounts.global_max, FALSE);
+			SetDlgItemInt(hDlg, IDC_LCLIENTS, irccounts.me_clients, FALSE);
+			SetDlgItemInt(hDlg, IDC_LSERVERS, irccounts.me_servers, FALSE);
+			SetDlgItemInt(hDlg, IDC_LMAXCLIENTS, irccounts.me_max, FALSE);
+			SetTimer(hDlg, 1, 5000, NULL);
+			return TRUE;
+		}
+		case WM_CLOSE:
+			DestroyWindow(hDlg);
+			return TRUE;
+		case WM_TIMER:
+			TreeView_DeleteAllItems(hwTreeView);
+			win_map(&me, hwTreeView, 1);
+			SetDlgItemInt(hDlg, IDC_CLIENTS, irccounts.clients, FALSE);
+			SetDlgItemInt(hDlg, IDC_SERVERS, irccounts.servers, FALSE);
+			SetDlgItemInt(hDlg, IDC_INVISO, irccounts.invisible, FALSE);
+			SetDlgItemInt(hDlg, IDC_INVISO, irccounts.invisible, FALSE);
+			SetDlgItemInt(hDlg, IDC_UNKNOWN, irccounts.unknown, FALSE);
+			SetDlgItemInt(hDlg, IDC_OPERS, irccounts.operators, FALSE);
+			SetDlgItemInt(hDlg, IDC_CHANNELS, irccounts.channels, FALSE);
+			if (irccounts.clients > irccounts.global_max)
+				irccounts.global_max = irccounts.clients;
+			if (irccounts.me_clients > irccounts.me_max)
+					irccounts.me_max = irccounts.me_clients;
+			SetDlgItemInt(hDlg, IDC_MAXCLIENTS, irccounts.global_max, FALSE);
+			SetDlgItemInt(hDlg, IDC_LCLIENTS, irccounts.me_clients, FALSE);
+			SetDlgItemInt(hDlg, IDC_LSERVERS, irccounts.me_servers, FALSE);
+			SetDlgItemInt(hDlg, IDC_LMAXCLIENTS, irccounts.me_max, FALSE);
+			SetTimer(hDlg, 1, 5000, NULL);
+			return TRUE;
+		case WM_COMMAND:
+			if (LOWORD(wParam) == IDOK) 
+			{
+				DestroyWindow(hDlg);
+				return TRUE;
+			}
+			break;
+
+	}
+	return FALSE;
+}
+
+/* This was made by DrBin but I cleaned it up a bunch to make it work better */
+
+HTREEITEM AddItemToTree(HWND hWnd, LPSTR lpszItem, int nLevel, short remap)
+{
+	TVITEM tvi; 
+	TVINSERTSTRUCT tvins; 
+	static HTREEITEM hPrev = (HTREEITEM)TVI_FIRST; 
+	static HTREEITEM hPrevLev[10] = { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL };
+	HTREEITEM hti; 
+
+	if (remap) 
+	{
+		hPrev = (HTREEITEM)TVI_FIRST;
+		memset(hPrevLev, 0, sizeof(HTREEITEM)*10);
+	}
+		
+	tvi.mask = TVIF_TEXT|TVIF_PARAM; 
+	tvi.pszText = lpszItem; 
+	tvi.cchTextMax = lstrlen(lpszItem); 
+	tvi.lParam = (LPARAM)nLevel; 
+	tvins.item = tvi; 
+	tvins.hInsertAfter = hPrev; 
+	if (nLevel == 1) 
+		tvins.hParent = TVI_ROOT; 
+	else 
+		tvins.hParent = hPrevLev[nLevel-1];
+	hPrev = (HTREEITEM)SendMessage(hWnd, TVM_INSERTITEM, 0, (LPARAM)(LPTVINSERTSTRUCT) &tvins); 
+	hPrevLev[nLevel] = hPrev;
+	TreeView_EnsureVisible(hWnd,hPrev);
+	if (nLevel > 1) 
+	{ 
+		hti = TreeView_GetParent(hWnd, hPrev); 
+		tvi.mask = TVIF_IMAGE|TVIF_SELECTEDIMAGE; 
+		tvi.hItem = hti; 
+		TreeView_SetItem(hWnd, &tvi); 
+	} 
+	return hPrev; 
+}
+
+/*
+ * Now used to create list of servers for server list tree view -- David Flynn
+ * Recoded by codemastr to be faster.
+ * I removed the Potvin credit because it no longer uses any original code and I don't
+ * even think Potvin actually made the original code
+ */
+void win_map(Client *server, HWND hwTreeView, short remap)
+{
+/*
+	Client *acptr;
+	Link *lp;
+
+	AddItemToTree(hwTreeView,server->name,server->hopcount+1, remap);
+
+	for (lp = Servers; lp; lp = lp->next)
+        {
+                acptr = lp->value.client;
+                if (acptr->srvptr != server)
+                        continue;
+                win_map(acptr, hwTreeView, 0);
+        }
+FIXME
+*/
+}
+
+/* ugly stuff, but hey it works -- codemastr */
+void win_log(FORMAT_STRING(const char *format), ...)
+{
+	va_list ap;
+	unsigned char buf[2048];
+	FILE *fd;
+
+	va_start(ap, format);
+
+	ircvsnprintf(buf, sizeof(buf), format, ap);
+
+	if (!IsService) 
+	{
+		strcat(buf, "\r\n");
+		if (errors) 
+		{
+			char *tbuf = safe_alloc(strlen(errors) + strlen(buf) + 1);
+			strcpy(tbuf, errors);
+			strcat(tbuf, buf);
+			errors = tbuf;
+		}
+		else 
+		{
+			safe_strdup(errors, buf);
+		}
+	}
+	else 
+	{
+		FILE *fd = fopen("logs\\service.log", "a");
+		if (fd)
+		{
+			char timebuf[256];
+			snprintf(timebuf, sizeof(timebuf), "[%s]", myctime(time(NULL)));
+			fprintf(fd, "%s - %s\n", timebuf, buf);
+			fclose(fd);
+		}
+#ifdef _DEBUG
+		else
+		{
+			OutputDebugString(buf);
+		}
+#endif
+	}
+	va_end(ap);
+}
+
+void win_error() 
+{
+	if (errors && !IsService)
+		DialogBox(hInst, "ConfigError", hwIRCDWnd, (DLGPROC)ConfigErrorDLG);
+	if (need_34_upgrade)
+	{
+		need_34_upgrade = 0; /* anti-recursion. yes, is needed. */
+		if (MessageBox(NULL, 
+		               "Shall I try to upgrade your configuration files to UnrealIRCd 4 format?",
+		               "3.2.x configuration detected",
+		               MB_YESNO|MB_ICONQUESTION) == IDNO)
+		{
+			 return;
+		}
+		else 
+		{
+			update_conf();
+			MessageBox(NULL,
+			           "Configuration file(s) upgraded! In next screen you can see what I did (just for reference). "
+			           "After that, simply try to start UnrealIRCd again and see if it loads.",
+			           "Configuration upgrade",
+			           MB_OK);
+			DialogBox(hInst, "ConfigError", hwIRCDWnd, (DLGPROC)ConfigErrorDLG);
+		}
+	}
+}
+
+LRESULT CALLBACK ConfigErrorDLG(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) 
+{
+	switch (message) 
+	{
+		case WM_INITDIALOG:
+			MessageBeep(MB_ICONEXCLAMATION);
+			SetDlgItemText(hDlg, IDC_CONFIGERROR, errors);
+			safe_free(errors);
+			errors = NULL;
+			return (TRUE);
+		case WM_COMMAND:
+			if (LOWORD(wParam) == IDOK)
+				EndDialog(hDlg, TRUE);
+			break;
+		case WM_CLOSE:
+			EndDialog(hDlg, TRUE);
+			break;
+		case WM_DESTROY:
+			break;
+
+		}
+	return (FALSE);
+}
diff --git a/src/windows/hand.CUR b/src/windows/hand.CUR
new file mode 100644
index 0000000..614403a
Binary files /dev/null and b/src/windows/hand.CUR differ
diff --git a/src/windows/makecert.bat b/src/windows/makecert.bat
new file mode 100755
index 0000000..5726262
--- /dev/null
+++ b/src/windows/makecert.bat
@@ -0,0 +1,6 @@
+@title Certificate Generation
+SET OPENSSL_CONF=tls.cnf
+openssl ecparam -out ../conf/tls/server.key.pem -name secp384r1 -genkey
+openssl req -new -config tls.cnf -out ../conf/tls/server.req.pem -key ../conf/tls/server.key.pem -nodes
+openssl req -x509 -config tls.cnf -days 3650 -sha256 -in ../conf/tls/server.req.pem -key ../conf/tls/server.key.pem -out ../conf/tls/server.cert.pem
+
diff --git a/src/windows/resource.h b/src/windows/resource.h
new file mode 100644
index 0000000..da92043
--- /dev/null
+++ b/src/windows/resource.h
@@ -0,0 +1,108 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Developer Studio generated include file.
+// Used by Win32GUI.rc
+//
+#define VER_UNREAL                      1
+#define MANIFEST_RESOURCE_ID            2
+#define ICO_MAIN                        129
+#define BMP_LOGO                        130
+#define BMP_BAR                         133
+#define CUR_HAND                        136
+#define MENU_ABOUT                      137
+#define MENU_CONFIG                     141
+#define MENU_REHASH                     144
+#define MENU_SYSTRAY                    145
+#define MENU_CONTEXT                    146
+#define IDB_BITMAP1                     150
+#define IDC_BAR                         1103
+#define IDC_TOOLBAR                     1104
+#define IDC_STATUS                      1105
+#define IDC_TEXT                        1107
+#define IDC_EMAIL                       1108
+#define IDC_URL                         1109
+#define IDC_TREE                        1111
+#define IDC_CHANNELS                    1112
+#define IDC_CLIENTS                     1113
+#define IDC_SERVERS                     1114
+#define IDC_INVISO                      1115
+#define IDC_OPERS                       1116
+#define IDC_UNKNOWN                     1117
+#define IDC_MAXCLIENTS                  1118
+#define IDC_LCLIENTS                    1122
+#define IDC_LSERVERS                    1123
+#define IDC_LMAXCLIENTS                 1124
+#define IDC_UPTIME                      1125
+#define IDC_CONFIGERROR                 1126
+#define IDC_BOLD                        1130
+#define IDC_UNDERLINE                   1131
+#define IDC_FIND                        1132
+#define IDFIND                          1133
+#define IDC_FINDTEXT                    1135
+#define IDC_GOTO                        1135
+#define IDC_MATCHWHOLE                  1137
+#define IDC_MATCHCASE                   1138
+#define IDC_DIRUP                       1139
+#define IDC_DIRDOWN                     1140
+#define IDC_COLOR                       1141
+#define IDC_BGCOLOR			1142
+#define IDC_WHITE                       1163
+#define IDC_BLACK                       1164
+#define IDC_DARKBLUE                    1165
+#define IDC_DARKGREEN                   1166
+#define IDC_PASS                        1166
+#define IDC_RED                         1167
+#define IDC_DARKRED                     1168
+#define IDC_PURPLE                      1169
+#define IDC_ORANGE                      1170
+#define IDC_YELLOW                      1171
+#define IDC_GREEN                       1172
+#define IDC_VDARKGREEN                  1173
+#define IDC_LIGHTBLUE                   1174
+#define IDC_BLUE                        1175
+#define IDC_PINK                        1176
+#define IDC_DARKGRAY                    1177
+#define IDC_GRAY                        1178
+#define IDM_INFO                        40026
+#define IDM_CREDITS                     40027
+#define IDM_DAL                         40028
+#define IDM_LICENSE                     40029
+#define IDM_HELP                        40030
+#define IDM_SAVE                        40031
+#define IDM_REDO                        40032
+#define IDM_SMOTD			40036
+#define IDM_CONF                        40037
+#define IDM_MOTD                        40038
+#define IDM_BOTMOTD                     40039
+#define IDM_OPERMOTD                    40040
+#define IDM_RULES                       40041
+#define IDM_RHALL                       40042
+#define IDM_RHCONF                      40044
+#define IDM_RHMOTD                      40045
+#define IDM_RHOMOTD                     40046
+#define IDM_RHBMOTD                     40047
+#define IDM_RHRULES                     40048
+#define IDM_REHASH                      40049
+#define IDM_STATUS                      40050
+#define IDM_CONFIG                      40051
+#define IDM_ABOUT                       40052
+#define IDM_SHUTDOWN                    40053
+#define IDM_UNDO                        40054
+#define IDM_CUT                         40055
+#define IDM_COPY                        40056
+#define IDM_PASTE                       40057
+#define IDM_DELETE                      40058
+#define IDM_SELECTALL                   40059
+#define IDM_NEW                         40060
+#define IDC_STATIC                      -1
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NO_MFC                     1
+#define _APS_NEXT_RESOURCE_VALUE        152
+#define _APS_NEXT_COMMAND_VALUE         40061
+#define _APS_NEXT_CONTROL_VALUE         1167
+#define _APS_NEXT_SYMED_VALUE           104
+#endif
+#endif
diff --git a/src/windows/rtf.c b/src/windows/rtf.c
new file mode 100644
index 0000000..0ec9564
--- /dev/null
+++ b/src/windows/rtf.c
@@ -0,0 +1,878 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/rtf.c
+ *   Copyright (C) 2004 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+#include "win.h"
+
+unsigned char *RTFBuf;
+
+#define MIRC_COLORS "{\\colortbl;\\red255\\green255\\blue255;\\red0\\green0\\blue127;\\red0\\green147\\blue0;\\red255\\green0\\blue0;\\red127\\green0\\blue0;\\red156\\green0\\blue156;\\red252\\green127\\blue0;\\red255\\green255\\blue0;\\red0\\green252\\blue0;\\red0\\green147\\blue147;\\red0\\green255\\blue255;\\red0\\green0\\blue252;\\red255\\green0\\blue255;\\red127\\green127\\blue127;\\red210\\green210\\blue210;\\red0\\green0\\blue0;}"
+
+/* Splits the file up for the EM_STREAMIN message
+ * Parameters:
+ *  dwCookie - The file information to split
+ *  pbBuff   - The output buffer
+ *  cb       - The size of pbBuff
+ *  pcb      - The total bytes written to bpBuff
+ * Returns:
+ *  Returns 0 to indicate success
+ */
+DWORD CALLBACK SplitIt(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
+{
+	StreamIO *stream = (StreamIO*)dwCookie;
+	if (*stream->size == 0)
+	{
+		pcb = 0;
+		*stream->buffer = 0;
+	}
+	else if (cb <= *stream->size) 
+	{
+		memcpy(pbBuff, *stream->buffer, cb);
+		*stream->buffer += cb;
+		*stream->size -= cb;
+		*pcb = cb;
+
+	}
+	else 
+	{
+		memcpy(pbBuff, *stream->buffer, *stream->size);
+		*pcb = *stream->size;
+		*stream->size = 0;
+	}
+	return 0;
+}
+
+/* Reassembles the RTF buffer from EM_STREAMOUT
+ * Parameters:
+ *  dwCookie - Unused
+ *  pbBuff   - The input buffer
+ *  cb       - The length of the input buffer
+ *  pcb      - The total bytes read from pbBuff
+ * Returns:
+ *  0 to indicate success
+ * Side Effects:
+ *  RTFBuf contains the assembled RTF buffer
+ */
+DWORD CALLBACK BufferIt(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb)
+{
+	unsigned char *buf2;
+	static long size = 0;
+	if (!RTFBuf)
+		size = 0;
+
+	buf2 = safe_alloc(size+cb+1);
+
+	if (RTFBuf)
+		memcpy(buf2,RTFBuf,size);
+
+	memcpy(buf2+size,pbBuff,cb);
+
+	size += cb;
+	safe_free(RTFBuf);
+
+	RTFBuf = buf2;
+
+	pcb = &cb;
+	return 0;
+}
+
+/* Pushes a color onto the stack
+ * Parameters:
+ *  color - The color to add to the stack
+ *  stack - The stack to add the color to
+ */
+void ColorPush(unsigned char *color, IRCColor **stack)
+{
+	IRCColor *t = safe_alloc(sizeof(IRCColor));
+	safe_strdup(t->color, color);
+	t->next = *stack;
+	(*stack) = t;
+}
+
+/* Pops a color off of the stack
+ * Parameters:
+ *  stack - The stack to pop from
+ */
+void ColorPop(IRCColor **stack)
+{
+	IRCColor *p = *stack;
+	if (!(*stack))
+		return;
+	safe_free(p->color);
+	
+	*stack = p->next;
+	safe_free(p);
+}
+
+/* Completely empties the color stack
+ * Parameters:
+ *  stack - The stack to empty
+ */
+void ColorEmpty(IRCColor **stack)
+{
+	IRCColor *t, *next;
+	for (t = *stack; t; t = next)
+	{
+		next = t->next;
+		safe_free(t->color);
+		safe_free(t);
+	}
+}
+
+#define iseol(x) ((x) == '\r' || (x) == '\n')
+
+/* Converts a string in RTF format to IRC codes
+ * Parameters:
+ *  fd     - The file descriptor to write to
+ *  pbBuff - The buffer containing the RTF text
+ *  cb     - The length of the RTF text
+ */
+DWORD CALLBACK RTFToIRC(int fd, unsigned char *pbBuff, long cb) 
+{
+	unsigned char *buffer = safe_alloc(cb*2+2);
+	int colors[17], bold = 0, uline = 0, incolor = 0, inbg = 0;
+	int lastwascf = 0, lastwascf0 = 0;
+	int i = 0;
+
+	IRCColor *TextColors = NULL;
+	IRCColor *BgColors = NULL;
+	
+	memset(buffer, 0, cb);
+
+	for (; *pbBuff; pbBuff++)
+	{
+		if (iseol(*pbBuff) || *pbBuff == '{' || *pbBuff == '}')
+			continue;
+		else if (*pbBuff == '\\')
+		{
+			/* RTF control sequence */
+			pbBuff++;
+			if (*pbBuff == '\\' || *pbBuff == '{' || *pbBuff == '}')
+				buffer[i++] = *pbBuff;
+			else if (*pbBuff == '\'')
+			{
+				/* Extended ASCII character */
+				unsigned char ltr, ultr[3];
+				ultr[0] = *(++pbBuff);
+				ultr[1] = *(++pbBuff);
+				ultr[2] = 0;
+				ltr = strtoul(ultr,NULL,16);
+				buffer[i++] = ltr;
+			}
+			else
+			{
+				int j;
+				char cmd[128];
+				/* Capture the control sequence */
+				for (j = 0; *pbBuff && *pbBuff != '\\' && !isspace(*pbBuff) &&
+					!iseol(*pbBuff); pbBuff++)
+				{
+					cmd[j++] = *pbBuff;
+				}
+				if (*pbBuff != ' ')
+					pbBuff--;
+				cmd[j] = 0;
+				if (!strcmp(cmd, "fonttbl{"))
+				{
+					/* Eat the parameter */
+					while (*pbBuff && *pbBuff != '}')
+						pbBuff++;
+					lastwascf = lastwascf0 = 0;
+				}
+				if (!strcmp(cmd, "colortbl"))
+				{
+					char color[128];
+					int k = 0, m = 1;
+					/* Capture the color table */
+					while (*pbBuff && !isalnum(*pbBuff))
+						pbBuff++;
+					for (; *pbBuff && *pbBuff != '}'; pbBuff++)
+					{
+						if (*pbBuff == ';')
+						{
+							color[k]=0;
+							if (!strcmp(color, "\\red255\\green255\\blue255"))
+								colors[m++] = 0;
+							else if (!strcmp(color, "\\red0\\green0\\blue0"))
+								colors[m++] = 1;
+							else if (!strcmp(color, "\\red0\\green0\\blue127"))
+								colors[m++] = 2;
+							else if (!strcmp(color, "\\red0\\green147\\blue0"))
+								colors[m++] = 3;
+							else if (!strcmp(color, "\\red255\\green0\\blue0"))
+								colors[m++] = 4;
+							else if (!strcmp(color, "\\red127\\green0\\blue0"))
+								colors[m++] = 5;
+							else if (!strcmp(color, "\\red156\\green0\\blue156"))
+								colors[m++] = 6;
+							else if (!strcmp(color, "\\red252\\green127\\blue0"))
+								colors[m++] = 7;
+							else if (!strcmp(color, "\\red255\\green255\\blue0"))
+								colors[m++] = 8;
+							else if (!strcmp(color, "\\red0\\green252\\blue0"))
+								colors[m++] = 9;
+							else if (!strcmp(color, "\\red0\\green147\\blue147"))
+								colors[m++] = 10;
+							else if (!strcmp(color, "\\red0\\green255\\blue255"))
+								colors[m++] = 11;
+							else if (!strcmp(color, "\\red0\\green0\\blue252"))
+								colors[m++] = 12;
+							else if (!strcmp(color, "\\red255\\green0\\blue255"))
+								colors[m++] = 13;
+							else if (!strcmp(color, "\\red127\\green127\\blue127"))
+								colors[m++] = 14;
+							else if (!strcmp(color, "\\red210\\green210\\blue210")) 
+								colors[m++] = 15;
+							k=0;
+						}
+						else
+							color[k++] = *pbBuff;
+					}
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strcmp(cmd, "tab"))
+				{
+					buffer[i++] = '\t';
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strcmp(cmd, "par"))
+				{
+					if (bold || uline || incolor || inbg)
+						buffer[i++] = '\17';
+					buffer[i++] = '\r';
+					buffer[i++] = '\n';
+					if (!*(pbBuff+3) || *(pbBuff+3) != '}')
+					{
+						if (bold)
+							buffer[i++] = '\2';
+						if (uline)
+							buffer[i++] = '\37';
+						if (incolor)
+						{
+							buffer[i++] = '\3';
+							strcat(buffer, TextColors->color);
+							i += strlen(TextColors->color);
+							if (inbg)
+							{
+								buffer[i++] = ',';
+								strcat(buffer, BgColors->color);
+								i += strlen(BgColors->color);
+							}
+						}
+						else if (inbg) 
+						{
+							buffer[i++] = '\3';
+							buffer[i++] = '0';
+							buffer[i++] = '1';
+							buffer[i++] = ',';
+							strcat(buffer, BgColors->color);
+							i += strlen(BgColors->color);
+						}
+					}
+				}
+				else if (!strcmp(cmd, "b"))
+				{
+					bold = 1;
+					buffer[i++] = '\2';
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strcmp(cmd, "b0"))
+				{
+					bold = 0;
+					buffer[i++] = '\2';
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strcmp(cmd, "ul"))
+				{
+					uline = 1;
+					buffer[i++] = '\37';
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strcmp(cmd, "ulnone"))
+				{
+					uline = 0;
+					buffer[i++] = '\37';
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strcmp(cmd, "cf0"))
+				{
+					lastwascf0 = 1;
+					lastwascf = 0;
+				}
+				else if (!strcmp(cmd, "highlight0"))
+				{
+					inbg = 0;
+					ColorPop(&BgColors);
+					buffer[i++] = '\3';
+					if (lastwascf0)
+					{
+						incolor = 0;
+						ColorPop(&TextColors);
+						lastwascf0 = 0;
+					}
+					else if (incolor)
+					{
+						strcat(buffer, TextColors->color);
+						i += strlen(TextColors->color);
+						buffer[i++] = ',';
+						buffer[i++] = '0';
+						buffer[i++] = '0';
+					}
+					lastwascf = lastwascf0 = 0;
+				}
+				else if (!strncmp(cmd, "cf", 2))
+				{
+					unsigned char number[3];
+					int num;
+					incolor = 1;
+					strcpy(number, &cmd[2]);
+					num = atoi(number);
+					buffer[i++] = '\3';
+					if (colors[num] < 10)
+						sprintf(number, "0%d", colors[num]);
+					else
+						sprintf(number, "%d", colors[num]);
+					ColorPush(number, &TextColors);
+					strcat(buffer,number);
+					i += strlen(number);
+					lastwascf = 1;
+					lastwascf0 = 0;
+				}
+				else if (!strncmp(cmd, "highlight", 9))
+				{
+					int num;
+					unsigned char number[3];
+					inbg = 1;
+					num = atoi(&cmd[9]);
+					if (colors[num] < 10)
+						sprintf(number, "0%d", colors[num]);
+					else
+						sprintf(number, "%d", colors[num]);
+					if (incolor && !lastwascf)
+					{
+						buffer[i++] = '\3';
+						strcat(buffer, TextColors->color);
+						i += strlen(TextColors->color);
+					}
+					else if (!incolor)
+					{
+						buffer[i++] = '\3';
+						buffer[i++] = '0';
+						buffer[i++] = '1';
+					}
+					buffer[i++] = ',';
+					strcat(buffer, number);
+					i += strlen(number);
+					ColorPush(number, &BgColors);
+					lastwascf = lastwascf0 = 0;
+				}
+				else
+					lastwascf = lastwascf0 = 0;
+
+				if (lastwascf0 && incolor)
+				{
+					incolor = 0;
+					ColorPop(&TextColors);
+					buffer[i++] = '\3';
+				}
+			}
+		}
+		else
+		{
+			lastwascf = lastwascf0 = 0;
+			buffer[i++] = *pbBuff;
+		}
+				
+	}
+	write(fd, buffer, i);
+	close(fd);
+	ColorEmpty(&TextColors);
+	ColorEmpty(&BgColors);
+	return 0;
+}
+
+/* Determines the size of the buffer needed to convert IRC codes to RTF
+ * Parameters:
+ *  buffer - The input buffer with IRC codes
+ * Returns:
+ *  The lenght of the buffer needed to store the RTF translation
+ */
+int CountRTFSize(unsigned char *buffer) {
+	int size = 0;
+	char bold = 0, uline = 0, incolor = 0, inbg = 0, reverse = 0;
+	char *buf = buffer;
+
+	for (; *buf; buf++) 
+	{
+		if (*buf == '{' || *buf == '}' || *buf == '\\')
+			size++;
+		else if (*buf == '\r')
+		{
+			if (*(buf+1) && *(buf+1) == '\n')
+			{
+				buf++;
+				if (bold)
+					size += 3;
+				if (uline)
+					size += 7;
+				if (incolor && !reverse)
+					size += 4;
+				if (inbg && !reverse)
+					size += 11;
+				if (reverse)
+					size += 15;
+				if (bold || uline || incolor || inbg || reverse)
+					size++;
+				bold = uline = incolor = inbg = reverse = 0;
+				size +=6;
+				continue;
+			}
+		}
+		else if (*buf == '\n')
+		{
+			if (bold)
+				size += 3;
+			if (uline)
+				size += 7;
+			if (incolor && !reverse)
+				size += 4;
+			if (inbg && !reverse)
+				size += 11;
+			if (reverse)
+				size += 15;
+			if (bold || uline || incolor || inbg || reverse)
+				size++;
+			bold = uline = incolor = inbg = reverse = 0;
+			size +=6;
+			continue;	
+		}
+		else if (*buf == '\2')
+		{
+			if (bold)
+				size += 4;
+			else
+				size += 3;
+			bold = !bold;
+			continue;
+		}
+		else if (*buf == '\3' && reverse)
+		{
+			if (*(buf+1) && isdigit(*(buf+1)))
+			{
+				++buf;
+				if (*(buf+1) && isdigit(*(buf+1)))
+					++buf;
+				if (*(buf+1) && *(buf+1) == ',')
+				{
+					if (*(buf+2) && isdigit(*(buf+2)))
+					{
+						buf+=2;
+						if (*(buf+1) && isdigit(*(buf+1)))
+							++buf;
+					}
+				}
+			}
+			continue;
+		}
+		else if (*buf == '\3' && !reverse)
+		{
+			size += 3;
+			if (*(buf+1) && !isdigit(*(buf+1)))
+			{
+				incolor = 0;
+				size++;
+				if (inbg)
+				{
+					inbg = 0;
+					size += 11;
+				}
+			}
+			else if (*(buf+1))
+			{
+				unsigned char color[3];
+				int number;
+				color[0] = *(++buf);
+				color[1] = 0;
+				if (*(buf+1) && isdigit(*(buf+1)))
+					color[1] = *(++buf);
+				color[2] = 0;
+				number = atoi(color);
+				if (number == 99 || number == 1) 
+					size += 2;
+				else if (number == 0) 
+					size++;
+				else  {
+					number %= 16;
+					_itoa(number, color, 10);
+					size += strlen(color);
+				}
+				color[2] = 0;
+				number = atoi(color);
+				if (*(buf+1) && *(buf+1) == ',')
+				{
+					if (*(buf+2) && isdigit(*(buf+2)))
+					{
+						size += 10;
+						buf++;
+						color[0] = *(++buf);
+						color[1] = 0;
+						if (*(buf+1) && isdigit(*(buf+1)))
+							color[1] = *(++buf);
+						color[2] = 0;
+						number = atoi(color);
+						if (number == 1)
+							size += 2;
+						else if (number == 0 || number == 99)
+							size++;
+						else
+						{
+							number %= 16;
+							_itoa(number, color, 10);
+							size += strlen(color);
+						}
+						inbg = 1;
+					}
+				}
+				incolor = 1;
+			}
+			size++;
+			continue;
+		}
+		else if (*buf == '\17')
+		{
+			if (bold)
+				size += 3;
+			if (uline)
+				size += 7;
+			if (incolor && !reverse)
+				size += 4;
+			if (inbg && !reverse)
+				size += 11;
+			if (reverse)
+				size += 15;
+			if (bold || uline || incolor || inbg || reverse)
+				size++;
+			bold = uline = incolor = inbg = reverse = 0;
+			continue;
+		}
+		else if (*buf == '\26')
+		{
+			if (reverse)
+				size += 16;
+			else
+				size += 17;
+			reverse = !reverse;
+			continue;
+		}
+		else if (*buf == '\37')
+		{
+			if (uline)
+				size += 8;
+			else
+				size += 4;
+			uline = !uline;
+			continue;
+		}
+		size++;
+	}			
+	size += strlen("{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fmodern\\fprq1\\"
+		"fcharset0 Fixedsys;}}\r\n"
+		MIRC_COLORS
+		"\\viewkind4\\uc1\\pard\\lang1033\\f0\\fs20")+1;
+	return (size);
+}
+
+/* Converts a string containing IRC codes to RTF
+ * Parameters:
+ *  buffer - The input buffer containing IRC codes
+ *  string - The output buffer in RTF
+ */
+void IRCToRTF(unsigned char *buffer, unsigned char *string) 
+{
+	unsigned char *tmp;
+	int i = 0;
+	short bold = 0, uline = 0, incolor = 0, inbg = 0, reverse = 0;
+	sprintf(string, "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl{\\f0\\fmodern\\fprq1\\"
+		"fcharset0 Fixedsys;}}\r\n"
+		MIRC_COLORS
+		"\\viewkind4\\uc1\\pard\\lang1033\\f0\\fs20");
+	i = strlen(string);
+	for (tmp = buffer; *tmp; tmp++)
+	{
+		if (*tmp == '{')
+		{
+			strcat(string, "\\{");
+			i+=2;
+			continue;
+		}
+		else if (*tmp == '}')
+		{
+			strcat(string, "\\}");
+			i+=2;
+			continue;
+		}
+		else if (*tmp == '\\')
+		{
+			strcat(string, "\\\\");
+			i+=2;
+			continue;
+		}
+		else if (*tmp == '\r')
+		{
+			if (*(tmp+1) && *(tmp+1) == '\n')
+			{
+				tmp++;
+				if (bold)
+				{
+					strcat(string, "\\b0 ");
+					i+=3;
+				}
+				if (uline)
+				{
+					strcat(string, "\\ulnone");
+					i+=7;
+				}
+				if (incolor && !reverse)
+				{
+					strcat(string, "\\cf0");
+					i+=4;
+				}
+				if (inbg && !reverse)
+				{
+					strcat(string, "\\highlight0");
+					i +=11;
+				}
+				if (reverse) {
+					strcat(string, "\\cf0\\highlight0");
+					i += 15;
+				}
+				if (bold || uline || incolor || inbg || reverse)
+					string[i++] = ' ';
+				bold = uline = incolor = inbg = reverse = 0;
+				strcat(string, "\\par\r\n");
+				i +=6;
+			}
+			else
+				string[i++]='\r';
+			continue;
+		}
+		else if (*tmp == '\n')
+		{
+			if (bold)
+			{
+				strcat(string, "\\b0 ");
+				i+=3;
+			}
+			if (uline)
+			{
+				strcat(string, "\\ulnone");
+				i+=7;
+			}
+			if (incolor && !reverse)
+			{
+				strcat(string, "\\cf0");
+				i+=4;
+			}
+			if (inbg && !reverse)
+			{
+				strcat(string, "\\highlight0");
+				i +=11;
+			}
+			if (reverse) {
+				strcat(string, "\\cf0\\highlight0");
+				i += 15;
+			}
+			if (bold || uline || incolor || inbg || reverse)
+				string[i++] = ' ';
+			bold = uline = incolor = inbg = reverse = 0;
+			strcat(string, "\\par\r\n");
+			i +=6;
+			continue;
+		}
+		else if (*tmp == '\2')
+		{
+			if (bold)
+			{
+				strcat(string, "\\b0 ");
+				i+=4;
+			}
+			else
+			{
+				strcat(string, "\\b ");
+				i+=3;
+			}
+			bold = !bold;
+			continue;
+		}
+		else if (*tmp == '\3' && reverse)
+		{
+			if (*(tmp+1) && isdigit(*(tmp+1)))
+			{
+				++tmp;
+				if (*(tmp+1) && isdigit(*(tmp+1)))
+					++tmp;
+				if (*(tmp+1) && *(tmp+1) == ',')
+				{
+					if (*(tmp+2) && isdigit(*(tmp+2)))
+					{
+						tmp+=2;
+						if (*(tmp+1) && isdigit(*(tmp+1)))
+							++tmp;
+					}
+				}
+			}
+			continue;
+		}
+		else if (*tmp == '\3' && !reverse)
+		{
+			strcat(string, "\\cf");
+			i += 3;
+			if (*(tmp+1) && !isdigit(*(tmp+1)))
+			{
+				incolor = 0;
+				string[i++] = '0';
+				if (inbg)
+				{
+					inbg = 0;
+					strcat(string, "\\highlight0");
+					i += 11;
+				}
+			}
+			else if (*(tmp+1))
+			{
+				unsigned char color[3];
+				int number;
+				color[0] = *(++tmp);
+				color[1] = 0;
+				if (*(tmp+1) && isdigit(*(tmp+1)))
+					color[1] = *(++tmp);
+				color[2] = 0;
+				number = atoi(color);
+				if (number == 99 || number == 1)
+				{
+					strcat(string, "16"); 
+					i += 2;
+				}
+				else if (number == 0) 
+				{
+					strcat(string, "1");
+					i++;
+				}
+				else
+				{
+					number %= 16;
+					_itoa(number, color, 10);
+					strcat(string, color);
+					i += strlen(color);
+				}
+				if (*(tmp+1) && *(tmp+1) == ',')
+				{
+					if (*(tmp+2) && isdigit(*(tmp+2)))
+					{
+						strcat(string, "\\highlight");
+						i += 10;
+						tmp++;
+						color[0] = *(++tmp);
+						color[1] = 0;
+						if (*(tmp+1) && isdigit(*(tmp+1)))
+							color[1] = *(++tmp);
+						color[2] = 0;
+						number = atoi(color);
+						if (number == 1)
+						{
+							strcat(string, "16");
+							i += 2;
+						}
+						else if (number == 0 || number == 99)
+							string[i++] = '1';
+						else
+						{
+							number %= 16;
+							_itoa(number, color, 10);
+							strcat(string,color);
+							i += strlen(color);
+						}
+						inbg = 1;
+					}
+				}
+				incolor=1;
+			}
+			string[i++] = ' ';
+			continue;
+		}
+		else if (*tmp == '\17') {
+			if (uline) {
+				strcat(string, "\\ulnone");
+				i += 7;
+			}
+			if (bold) {
+				strcat(string, "\\b0");
+				i += 3;
+			}
+			if (incolor && !reverse) {
+				strcat(string, "\\cf0");
+				i += 4;
+			}
+			if (inbg && !reverse)
+			{
+				strcat(string, "\\highlight0");
+				i += 11;
+			}
+			if (reverse) {
+				strcat(string, "\\cf0\\highlight0");
+				i += 15;
+			}
+			if (uline || bold || incolor || inbg || reverse)
+				string[i++] = ' ';
+			uline = bold = incolor = inbg = reverse = 0;
+			continue;
+		}
+		else if (*tmp == '\26')
+		{
+			if (reverse)
+			{
+				strcat(string, "\\cf0\\highlight0 ");
+				i += 16;
+			}
+			else
+			{
+				strcat(string, "\\cf1\\highlight16 ");
+				i += 17;
+			}
+			reverse = !reverse;
+			continue;
+		}
+
+		else if (*tmp == '\37') {
+			if (uline) {
+				strcat(string, "\\ulnone ");
+				i += 8;
+			}
+			else {
+				strcat(string, "\\ul ");
+				i += 4;
+			}
+			uline = !uline;
+			continue;
+		}
+		string[i++] = *tmp;
+	}
+	strcat(string, "}");
+	return;
+}
diff --git a/src/windows/service.c b/src/windows/service.c
new file mode 100644
index 0000000..dc76411
--- /dev/null
+++ b/src/windows/service.c
@@ -0,0 +1,148 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/service.c
+ *   Copyright (C) 2002-2004 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+SERVICE_STATUS IRCDStatus; 
+SERVICE_STATUS_HANDLE IRCDStatusHandle;
+
+/* Signal to rehash */
+#define IRCD_SERVICE_CONTROL_REHASH 128
+
+MODVAR BOOL IsService = FALSE;
+
+#define WIN32_VERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5
+
+/* Places the service in the STOPPED state
+ * Parameters:
+ *  code - The error code (or 0)
+ */
+void SetServiceStop(int code)
+{
+	IRCDStatus.dwCurrentState = SERVICE_STOPPED;
+	IRCDStatus.dwCheckPoint = 0;
+	IRCDStatus.dwWaitHint = 0;
+	IRCDStatus.dwWin32ExitCode = code;
+	IRCDStatus.dwServiceSpecificExitCode = code;
+	SetServiceStatus(IRCDStatusHandle, &IRCDStatus);
+}	
+
+/* Handles the service messages
+ * Parameters:
+ *  opcode - The message to process
+ */
+VOID WINAPI IRCDCtrlHandler(DWORD opcode) 
+{
+	DWORD status;
+	int i;
+	Client *acptr;
+
+	/* Stopping */
+	if (opcode == SERVICE_CONTROL_STOP) 
+	{
+		IRCDStatus.dwCurrentState = SERVICE_STOP_PENDING;
+		SetServiceStatus(IRCDStatusHandle, &IRCDStatus);
+
+/*		for (i = 0; i <= LastSlot; i++) 
+		{
+			if (!(acptr = local[i]))
+				continue;
+			if (IsUser(acptr))
+				sendnotice(acptr, "Server Terminating.");
+			else if (IsServer(acptr))
+				sendto_one(acptr, NULL, ":%s ERROR :Terminated", me.name);
+		} */
+		unload_all_modules();
+/*		for (i = LastSlot; i >= 0; i--)
+			if ((acptr = local[i]) && DBufLength(&acptr->local->sendQ) > 0)
+				(void)send_queued(acptr); */
+		SetServiceStop(0);
+	}
+	/* Rehash */
+	else if (opcode == IRCD_SERVICE_CONTROL_REHASH) 
+	{
+		rehash(&me,0);
+		reread_motdsandrules();
+	}
+
+	SetServiceStatus(IRCDStatusHandle, &IRCDStatus);
+} 
+
+/* Entry point function
+ * Parameters:
+ *  dwArgc   - Argument count
+ *  lpszArgv - Arguments
+ */
+VOID WINAPI ServiceMain(DWORD dwArgc, LPTSTR *lpszArgv) 
+{
+	WSADATA WSAData;
+	DWORD error = 0;
+	char path[MAX_PATH], *folder;
+
+	IsService = TRUE;
+
+	/* Initialize the service structure */
+	IRCDStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
+	IRCDStatus.dwCurrentState = SERVICE_START_PENDING;
+	IRCDStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP|SERVICE_ACCEPT_SHUTDOWN;
+	IRCDStatus.dwWin32ExitCode = NO_ERROR;
+	IRCDStatus.dwServiceSpecificExitCode = 0;
+	IRCDStatus.dwCheckPoint = 0;
+	IRCDStatus.dwWaitHint = 0;
+ 
+	GetModuleFileName(NULL,path,MAX_PATH);
+	folder = strrchr(path, '\\');
+	*folder = 0;
+	chdir(path);
+
+	/* Go one level up, since we are currently in the bin\ subdir
+	 * and we want to be in (f.e.) "C:\Program Files\UnrealIRCd 5"
+	 */
+	chdir("..");
+
+	/* Register the service controller */
+	IRCDStatusHandle = RegisterServiceCtrlHandler("UnrealIRCd", IRCDCtrlHandler); 
+ 
+	GetOSName(OSName);
+
+	InitDebug();
+
+	/* Initialize Winsocks */
+	if ((error = WSAStartup(MAKEWORD(1, 1), &WSAData)) != 0) 
+	{
+		SetServiceStop(error);
+		return;
+	}
+
+	/* Initialize the IRCd */
+	if ((error = InitUnrealIRCd(dwArgc, lpszArgv)) != 1) 
+	{
+		SetServiceStop(error);
+		return;
+	}
+	
+	/* Go into the running state */
+	IRCDStatus.dwCurrentState = SERVICE_RUNNING;
+	IRCDStatus.dwCheckPoint = 0;
+	IRCDStatus.dwWaitHint = 0;  
+	SetServiceStatus(IRCDStatusHandle, &IRCDStatus);
+
+	SocketLoop(0);
+	return;
+}
diff --git a/src/windows/toolbar.bmp b/src/windows/toolbar.bmp
new file mode 100644
index 0000000..aa29ec6
Binary files /dev/null and b/src/windows/toolbar.bmp differ
diff --git a/src/windows/unreal.bmp b/src/windows/unreal.bmp
new file mode 100644
index 0000000..288f78b
Binary files /dev/null and b/src/windows/unreal.bmp differ
diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss
new file mode 100644
index 0000000..2fc4b82
--- /dev/null
+++ b/src/windows/unrealinst.iss
@@ -0,0 +1,193 @@
+; UnrealIRCd Windows Installation Script
+; Requires Inno Setup 4.1.6 or later
+
+; Uncomment the line below to package with libcurl support
+#define USE_CURL
+
+[Setup]
+AppName=UnrealIRCd 5
+AppVerName=UnrealIRCd 5.0.3.1
+AppPublisher=UnrealIRCd Team
+AppPublisherURL=https://www.unrealircd.org
+AppSupportURL=https://www.unrealircd.org
+AppUpdatesURL=https://www.unrealircd.org
+AppMutex=UnrealMutex,Global\UnrealMutex
+DefaultDirName={pf}\UnrealIRCd 5
+DefaultGroupName=UnrealIRCd 5
+AllowNoIcons=yes
+LicenseFile=src\windows\gplplusssl.rtf
+Compression=lzma
+SolidCompression=true
+MinVersion=6.1
+OutputDir=.
+SourceDir=../../
+UninstallDisplayIcon={app}\bin\UnrealIRCd.exe
+UninstallFilesDir={app}\bin\uninstaller
+DisableWelcomePage=no
+ArchitecturesInstallIn64BitMode=x64
+ArchitecturesAllowed=x64
+
+; !!! Make sure to update SSL/TLS validation (WizardForm.TasksList.Checked[9]) if tasks are added/removed !!!
+[Tasks]
+Name: "desktopicon"; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:"
+Name: "quicklaunchicon"; Description: "Create a &Quick Launch icon"; GroupDescription: "Additional icons:"; Flags: unchecked
+Name: "installservice"; Description: "Install as a &service (not for beginners)"; GroupDescription: "Service support:"; Flags: unchecked; MinVersion: 0,4.0
+Name: "installservice/startboot"; Description: "S&tart UnrealIRCd when Windows starts"; GroupDescription: "Service support:"; MinVersion: 0,4.0; Flags: exclusive unchecked
+Name: "installservice/startdemand"; Description: "Start UnrealIRCd on &request"; GroupDescription: "Service support:"; MinVersion: 0,4.0; Flags: exclusive unchecked
+Name: "installservice/crashrestart"; Description: "Restart UnrealIRCd if it &crashes"; GroupDescription: "Service support:"; Flags: unchecked; MinVersion: 0,5.0;
+Name: "makecert"; Description: "&Create certificate"; GroupDescription: "SSL/TLS options:";
+Name: "fixperm"; Description: "Make UnrealIRCd folder writable by current user";
+
+[Files]
+Source: "UnrealIRCd.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "UnrealIRCd.pdb"; DestDir: "{app}\bin"; Flags: ignoreversion
+
+Source: "doc\conf\*.default.conf"; DestDir: "{app}\conf"; Flags: ignoreversion
+Source: "doc\conf\*.optional.conf"; DestDir: "{app}\conf"; Flags: ignoreversion
+Source: "doc\conf\spamfilter.conf"; DestDir: "{app}\conf"; Flags: onlyifdoesntexist
+Source: "doc\conf\badwords.conf"; DestDir: "{app}\conf"; Flags: onlyifdoesntexist
+Source: "doc\conf\dccallow.conf"; DestDir: "{app}\conf"; Flags: onlyifdoesntexist
+Source: "doc\conf\aliases\*.conf"; DestDir: "{app}\conf\aliases"; Flags: ignoreversion
+Source: "doc\conf\help\*.conf"; DestDir: "{app}\conf\help"; Flags: ignoreversion
+Source: "doc\conf\examples\*.conf"; DestDir: "{app}\conf\examples"; Flags: ignoreversion
+
+Source: "doc\Donation"; DestDir: "{app}\doc"; DestName: "Donation.txt"; Flags: ignoreversion
+Source: "LICENSE"; DestDir: "{app}\doc"; DestName: "LICENSE.txt"; Flags: ignoreversion
+
+Source: "doc\*.*"; DestDir: "{app}\doc"; Flags: ignoreversion
+Source: "doc\technical\*.*"; DestDir: "{app}\doc\technical"; Flags: ignoreversion
+Source: "doc\conf\aliases\*"; DestDir: "{app}\conf\aliases"; Flags: ignoreversion
+
+Source: "unrealsvc.exe"; DestDir: "{app}\bin"; Flags: ignoreversion; MinVersion: 0,4.0
+
+Source: "src\windows\makecert.bat"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "extras\tls.cnf"; DestDir: "{app}\bin"; Flags: ignoreversion
+
+Source: "src\modules\*.dll"; DestDir: "{app}\modules"; Flags: ignoreversion
+Source: "src\modules\chanmodes\*.dll"; DestDir: "{app}\modules\chanmodes"; Flags: ignoreversion
+Source: "src\modules\usermodes\*.dll"; DestDir: "{app}\modules\usermodes"; Flags: ignoreversion
+Source: "src\modules\snomasks\*.dll"; DestDir: "{app}\modules\snomasks"; Flags: ignoreversion
+Source: "src\modules\extbans\*.dll"; DestDir: "{app}\modules\extbans"; Flags: ignoreversion
+
+Source: "c:\dev\unrealircd-5-libs\pcre2\bin\pcre*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-5-libs\argon2\vs2015\build\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-5-libs\c-ares\msvc\cares\dll-release\cares.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-5-libs\libressl\bin\openssl.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-5-libs\libressl\bin\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-5-libs\setacl.exe"; DestDir: "{app}\tmp"; Flags: ignoreversion
+
+#ifdef USE_CURL
+Source: "c:\dev\unrealircd-5-libs\curl\builds\libcurl-vc-x64-release-dll-ssl-dll-cares-dll-ipv6-obj-lib\libcurl.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "doc\conf\tls\curl-ca-bundle.crt"; DestDir: "{app}\conf\tls"; Flags: ignoreversion
+#endif
+
+[Dirs]
+Name: "{app}\tmp"
+Name: "{app}\bin"
+Name: "{app}\cache"
+Name: "{app}\logs"
+Name: "{app}\conf"
+Name: "{app}\conf\tls"
+Name: "{app}\data"
+Name: "{app}\modules\third"
+
+[Code]
+var
+	uninstaller: String;
+	ErrorCode: Integer;
+
+//*********************************************************************************
+// This is where all starts.
+//*********************************************************************************
+function InitializeSetup(): Boolean;
+var
+	major: Cardinal;
+begin
+	Result := true;
+
+	if Not RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64', 'Major', major) then
+	begin
+		MsgBox('UnrealIRCd requires the Microsoft Visual C++ Redistributable for Visual Studio 2019 to be installed.' #13 +
+		       'After you click OK you will be taken to a download page from Microsoft:' #13 +
+		       '1) Scroll down to the section "Visual Studio 2015, 2017 and 2019"' #13 +
+		       '2) Click on the x64 "vc_redist.x64.exe" to download the 64 bit installer' #13 +
+		       '3) Run the installer.' #13 + #13 +
+		       'If you are already absolutely sure that you have this package installed then you can skip this step.', mbInformation, MB_OK);
+		ShellExec('open', 'https://support.microsoft.com/help/2977003/the-latest-supported-visual-c-downloads', '', '', SW_SHOWNORMAL,ewNoWait,ErrorCode);
+		MsgBox('Your browser was launched. After you have installed the Microsoft Visual C++ Redistributable for Visual Studio 2019 (vc_redist.x64.exe), click OK below to continue the UnrealIRCd installer', mbInformation, MB_OK);
+	end;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+
+var
+	hWnd: Integer;
+	ResultCode: Integer;
+	ResultXP: boolean;
+	Result2003: boolean;
+	Res: Integer;
+	s: String;
+	d: String;
+begin
+if CurStep = ssPostInstall then
+	begin
+		d := ExpandConstant('{app}');
+		if IsTaskSelected('fixperm') then
+		begin
+			// This fixes the permissions in the UnrealIRCd folder by granting full access to the user
+			// running the install.
+			s := '-on "'+d+'" -ot file -actn ace -ace "n:'+GetUserNameString()+';p:full;m:set"';
+			Exec(d+'\tmp\setacl.exe', s, d, SW_HIDE, ewWaitUntilTerminated, Res);
+		end
+		else
+		begin
+			MsgBox('You have chosen to not have the installer automatically set write access. Please ensure that the user running the IRCd can write to '+d+', otherwise the IRCd will fail to load.',mbConfirmation, MB_OK);
+		end;
+		if IsTaskSelected('installservice') then
+		begin
+			// Similar to above, but this adds full access to NetworkService,
+			// otherwise it cannot copy modules, cannot write to logs, etc etc.
+			s := '-on "'+d+'" -ot file -actn ace -ace "n:NetworkService;p:full;m:set"';
+			Exec(d+'\tmp\setacl.exe', s, d, SW_HIDE, ewWaitUntilTerminated, Res);
+		end;
+	end;
+end;
+
+//*********************************************************************************
+// Checks if SSL/TLS cert file exists
+//*********************************************************************************
+
+procedure CurPageChanged(CurPage: Integer);
+begin
+	if (CurPage = wpSelectTasks) then
+	begin
+		if FileExists(ExpandConstant('{app}\conf\tls\server.cert.pem')) then
+		begin
+			WizardForm.TasksList.Checked[9]:=false;
+		end
+		else
+		begin
+			WizardForm.TasksList.Checked[9]:=true;
+		end;
+	end;
+end;
+
+[Icons]
+Name: "{group}\UnrealIRCd"; Filename: "{app}\bin\UnrealIRCd.exe"; WorkingDir: "{app}\bin"
+Name: "{group}\Uninstall UnrealIRCd"; Filename: "{uninstallexe}"; WorkingDir: "{app}\bin"
+Name: "{group}\Make Certificate"; Filename: "{app}\bin\makecert.bat"; WorkingDir: "{app}\bin"
+Name: "{group}\Documentation"; Filename: "https://www.unrealircd.org/docs/"; WorkingDir: "{app}\bin"
+Name: "{userdesktop}\UnrealIRCd"; Filename: "{app}\bin\UnrealIRCd.exe"; WorkingDir: "{app}\bin"; Tasks: desktopicon
+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\UnrealIRCd"; Filename: "{app}\bin\UnrealIRCd.exe"; WorkingDir: "{app}\bin"; Tasks: quicklaunchicon
+
+[Run]
+Filename: "https://www.unrealircd.org/docs/"; Description: "View documentation"; Parameters: ""; Flags: postinstall skipifsilent shellexec runmaximized
+Filename: "https://www.unrealircd.org/docs/Installing_%28Windows%29"; Description: "View installation instructions"; Parameters: ""; Flags: postinstall skipifsilent shellexec runmaximized
+Filename: "{app}\bin\unrealsvc.exe"; Parameters: "install"; Flags: runminimized nowait; Tasks: installservice
+Filename: "{app}\bin\unrealsvc.exe"; Parameters: "config startup manual"; Flags: runminimized nowait; Tasks: installservice/startdemand
+Filename: "{app}\bin\unrealsvc.exe"; Parameters: "config startup auto"; Flags: runminimized nowait; Tasks: installservice/startboot
+Filename: "{app}\bin\unrealsvc.exe"; Parameters: "config crashrestart 2"; Flags: runminimized nowait; Tasks: installservice/crashrestart
+Filename: "{app}\bin\makecert.bat"; Tasks: makecert; Flags: postinstall;
+
+[UninstallRun]
+Filename: "{app}\bin\unrealsvc.exe"; Parameters: "uninstall"; Flags: runminimized; RunOnceID: "DelService"; Tasks: installservice
diff --git a/src/windows/unrealsvc.c b/src/windows/unrealsvc.c
new file mode 100644
index 0000000..22fb2d2
--- /dev/null
+++ b/src/windows/unrealsvc.c
@@ -0,0 +1,212 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/unreal.c
+ *   Copyright (C) 2002 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+
+typedef BOOL (*UCHANGESERVICECONFIG2)(SC_HANDLE, DWORD, LPVOID);
+HMODULE hAdvapi;
+UCHANGESERVICECONFIG2 uChangeServiceConfig2;
+
+#define IRCD_SERVICE_CONTROL_REHASH 128
+void show_usage() {
+	fprintf(stderr, "unreal start|stop|rehash|restart|install|uninstall|config <option> <value>");
+	fprintf(stderr, "\nValid config options:\nstartup auto|manual\n");
+	fprintf(stderr, "crashrestart delay\n");
+}
+
+char *show_error(DWORD code) {
+	static char buf[1024];
+	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, code, 0, buf, 1024, NULL);
+	return buf;
+}
+
+SC_HANDLE unreal_open_service_manager(void)
+{
+	SC_HANDLE hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+	if (!hSCManager)
+	{
+		printf("Failed to connect to service manager: %s", show_error(GetLastError()));
+		printf("Note that elevated administrator permissions are necessary to execute this command.\n");
+		exit(1);
+	}
+	return hSCManager;
+}
+int main(int argc, char *argv[]) {
+	char *bslash;
+
+	if (argc < 2) {
+		show_usage();
+		return -1;
+	}
+	hAdvapi = LoadLibrary("advapi32.dll");
+	uChangeServiceConfig2 = (UCHANGESERVICECONFIG2)GetProcAddress(hAdvapi, "ChangeServiceConfig2A");
+
+	if (!strcasecmp(argv[1], "install"))
+	{
+		SC_HANDLE hService, hSCManager;
+		char path[MAX_PATH+1];
+		char binpath[MAX_PATH+1];
+		hSCManager = unreal_open_service_manager();
+
+		GetModuleFileName(NULL,path,MAX_PATH);
+		if ((bslash = strrchr(path, '\\')))
+			*bslash = 0;
+		
+		strcpy(binpath,path);
+		strcat(binpath, "\\UnrealIRCd.exe");
+		hService = CreateService(hSCManager, "UnrealIRCd", "UnrealIRCd",
+				 SERVICE_CHANGE_CONFIG, SERVICE_WIN32_OWN_PROCESS,
+				 SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, binpath,
+				 NULL, NULL, NULL, TEXT("NT AUTHORITY\\NetworkService"), "");
+		if (hService) 
+		{
+			SERVICE_DESCRIPTION info;
+			printf("UnrealIRCd NT Service successfully installed\n");
+			info.lpDescription = "Internet Relay Chat Server. Allows users to chat with eachother via an IRC client.";
+			uChangeServiceConfig2(hService, SERVICE_CONFIG_DESCRIPTION, &info);
+			CloseServiceHandle(hService);
+			printf("\n[!!!] IMPORTANT: By default the network service user cannot write to the \n"
+			       "UnrealIRCd 5 folder and this will make UnrealIRCd fail to boot without\n"
+				   "writing any meaningful error to the log files.\n"
+				   "You have two options:\n"
+				   "1) Manually grant FULL permissions to NT AUTHORITY\\NetworkService\n"
+				   "   for the UnrealIRCd 5 folder, all its subfolders and files.\n"
+				   "OR, easier and recommended:\n"
+				   "2) just re-run the UnrealIRCd installer and select 'Install as a service',\n"
+				   "   which sets all the necessary permissions automatically.\n");
+		} else {
+			printf("Failed to install UnrealIRCd NT Service - %s", show_error(GetLastError()));
+		}
+		CloseServiceHandle(hSCManager);
+		return 0;
+	}
+	else if (!strcasecmp(argv[1], "uninstall"))
+	{
+		SC_HANDLE hSCManager = unreal_open_service_manager();
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", DELETE); 
+		if (DeleteService(hService)) 
+			printf("UnrealIRCd NT Service successfully uninstalled\n");
+		else
+			printf("Failed to uninstall UnrealIRCd NT Service - %s\n", show_error(GetLastError()));
+		CloseServiceHandle(hService);
+		CloseServiceHandle(hSCManager);
+		return 0;
+	}
+	else if (!strcasecmp(argv[1], "start"))
+	{
+		SC_HANDLE hSCManager = unreal_open_service_manager();
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", SERVICE_START); 
+		if (StartService(hService, 0, NULL))
+			printf("UnrealIRCd NT Service successfully started");
+		else
+			printf("Failed to start UnrealIRCd NT Service - %s", show_error(GetLastError()));
+		CloseServiceHandle(hService);
+		CloseServiceHandle(hSCManager);
+		return 0;
+	}
+	else if (!strcasecmp(argv[1], "stop"))
+	{
+		SERVICE_STATUS status;
+		SC_HANDLE hSCManager = unreal_open_service_manager();
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", SERVICE_STOP); 
+		ControlService(hService, SERVICE_CONTROL_STOP, &status);
+		printf("UnrealIRCd NT Service successfully stopped");
+		CloseServiceHandle(hService);
+		CloseServiceHandle(hSCManager);
+		return 0;
+	}
+	else if (!strcasecmp(argv[1], "restart"))
+	{
+		SERVICE_STATUS status;
+		SC_HANDLE hSCManager = unreal_open_service_manager();
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", SERVICE_STOP|SERVICE_START); 
+		ControlService(hService, SERVICE_CONTROL_STOP, &status);
+		if (StartService(hService, 0, NULL)) 
+			printf("UnrealIRCd NT Service successfully restarted");
+		CloseServiceHandle(hService);
+		CloseServiceHandle(hSCManager);
+		return 0;
+	}
+	else if (!strcasecmp(argv[1], "rehash"))
+	{
+		SERVICE_STATUS status;
+		SC_HANDLE hSCManager = unreal_open_service_manager();
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", SERVICE_USER_DEFINED_CONTROL); 
+		ControlService(hService, IRCD_SERVICE_CONTROL_REHASH, &status);
+		printf("UnrealIRCd NT Service successfully rehashed");
+	}
+	else if (!strcasecmp(argv[1], "config"))
+	{
+		SERVICE_STATUS status;
+		SC_HANDLE hSCManager = unreal_open_service_manager();
+		SC_HANDLE hService = OpenService(hSCManager, "UnrealIRCd", SERVICE_CHANGE_CONFIG|SERVICE_START);
+		if (argc < 3) {
+			show_usage();
+			return -1;
+		}
+		if (!strcasecmp(argv[2], "startup")) {
+			if (ChangeServiceConfig(hService, SERVICE_NO_CHANGE,
+					    !strcasecmp(argv[3], "auto") ? SERVICE_AUTO_START
+						: SERVICE_DEMAND_START, SERVICE_NO_CHANGE,
+					    NULL, NULL, NULL, NULL, NULL, NULL, NULL)) 
+				printf("UnrealIRCd NT Service configuration changed");
+			else
+				printf("UnrealIRCd NT Service configuration change failed - %s", show_error(GetLastError()));	
+		}
+		else if (!strcasecmp(argv[2], "crashrestart")) {
+			SERVICE_FAILURE_ACTIONS hFailActions;
+			SC_ACTION hAction;
+			memset(&hFailActions, 0, sizeof(hFailActions));
+			if (argc >= 4) {
+				hFailActions.dwResetPeriod = 30;
+				hFailActions.cActions = 1;
+				hAction.Type = SC_ACTION_RESTART;
+				hAction.Delay = atoi(argv[3])*60000;
+				hFailActions.lpsaActions = &hAction;
+				if (uChangeServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS, 	
+						     &hFailActions))
+					printf("UnrealIRCd NT Service configuration changed");
+				else
+					printf("UnrealIRCd NT Service configuration change failed - %s", show_error(GetLastError()));	
+			}
+			else {
+				hFailActions.dwResetPeriod = 0;
+				hFailActions.cActions = 0;
+				hAction.Type = SC_ACTION_NONE;
+				hFailActions.lpsaActions = &hAction;
+				if (uChangeServiceConfig2(hService, SERVICE_CONFIG_FAILURE_ACTIONS,
+						     &hFailActions)) 
+					printf("UnrealIRCd NT Service configuration changed");
+				else
+					printf("UnrealIRCd NT Service configuration change failed - %s", show_error(GetLastError()));	
+
+				
+			}
+		}
+		else {
+			show_usage();
+			return -1;
+		}	
+	}
+	else {
+		show_usage();
+		return -1;
+	}
+}
+
diff --git a/src/windows/unrealsvc.rc b/src/windows/unrealsvc.rc
new file mode 100644
index 0000000..66826c5
--- /dev/null
+++ b/src/windows/unrealsvc.rc
@@ -0,0 +1,99 @@
+//Microsoft Developer Studio generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
+#include "winver.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+
+#ifndef _MAC
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VER_UNREAL VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x10004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "\0"
+            VALUE "CompanyName", "none\0"
+            VALUE "FileDescription", "\0"
+            VALUE "FileVersion", "1.0\0"
+            VALUE "InternalName", "UnrealIRCd Service Utility\0"
+            VALUE "LegalCopyright", "\0"
+            VALUE "LegalTrademarks", "\0"
+            VALUE "OriginalFilename", "\0"
+            VALUE "PrivateBuild", "\0"
+            VALUE "ProductName", "UnrealIRCd Service Utility\0"
+            VALUE "ProductVersion", "1.0\0"
+            VALUE "SpecialBuild", "\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // !_MAC
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ICO_MAIN                ICON    DISCARDABLE     "icon1.ico"
+
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/src/windows/win.c b/src/windows/win.c
new file mode 100644
index 0000000..5047bb7
--- /dev/null
+++ b/src/windows/win.c
@@ -0,0 +1,341 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/win.c
+ *   Copyright (C) 2004 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <windows.h>
+#include <tchar.h>
+#include <strsafe.h>
+
+#include "win.h"
+
+#pragma comment(lib, "User32.lib")
+
+// Newer product types than what is currently defined in
+//   Visual Studio 2005
+#ifndef PRODUCT_ULTIMATE
+#define PRODUCT_ULTIMATE                        0x00000001
+#endif
+#ifndef PRODUCT_HOME_BASIC
+#define PRODUCT_HOME_BASIC                      0x00000002
+#endif
+#ifndef PRODUCT_HOME_PREMIUM
+#define PRODUCT_HOME_PREMIUM                    0x00000003
+#endif
+#ifndef PRODUCT_ENTERPRISE
+#define PRODUCT_ENTERPRISE                      0x00000004
+#endif
+#ifndef PRODUCT_HOME_BASIC_N
+#define PRODUCT_HOME_BASIC_N                    0x00000005
+#endif
+#ifndef PRODUCT_BUSINESS
+#define PRODUCT_BUSINESS                        0x00000006
+#endif
+#ifndef PRODUCT_STANDARD_SERVER
+#define PRODUCT_STANDARD_SERVER                 0x00000007
+#endif
+#ifndef PRODUCT_DATACENTER_SERVER
+#define PRODUCT_DATACENTER_SERVER               0x00000008
+#endif
+#ifndef PRODUCT_SMALLBUSINESS_SERVER
+#define PRODUCT_SMALLBUSINESS_SERVER            0x00000009
+#endif
+#ifndef PRODUCT_ENTERPRISE_SERVER
+#define PRODUCT_ENTERPRISE_SERVER               0x0000000A
+#endif
+#ifndef PRODUCT_STARTER
+#define PRODUCT_STARTER                         0x0000000B
+#endif
+#ifndef PRODUCT_DATACENTER_SERVER_CORE
+#define PRODUCT_DATACENTER_SERVER_CORE          0x0000000C
+#endif
+#ifndef PRODUCT_STANDARD_SERVER_CORE
+#define PRODUCT_STANDARD_SERVER_CORE            0x0000000D
+#endif
+#ifndef PRODUCT_ENTERPRISE_SERVER_CORE
+#define PRODUCT_ENTERPRISE_SERVER_CORE          0x0000000E
+#endif
+#ifndef PRODUCT_ENTERPRISE_SERVER_IA64
+#define PRODUCT_ENTERPRISE_SERVER_IA64          0x0000000F
+#endif
+#ifndef PRODUCT_BUSINESS_N
+#define PRODUCT_BUSINESS_N                      0x00000010
+#endif
+#ifndef PRODUCT_WEB_SERVER
+#define PRODUCT_WEB_SERVER                      0x00000011
+#endif
+#ifndef PRODUCT_CLUSTER_SERVER
+#define PRODUCT_CLUSTER_SERVER                  0x00000012
+#endif
+#ifndef PRODUCT_HOME_SERVER
+#define PRODUCT_HOME_SERVER                     0x00000013
+#endif
+#ifndef PRODUCT_STORAGE_EXPRESS_SERVER
+#define PRODUCT_STORAGE_EXPRESS_SERVER          0x00000014
+#endif
+#ifndef PRODUCT_STORAGE_STANDARD_SERVER
+#define PRODUCT_STORAGE_STANDARD_SERVER         0x00000015
+#endif
+#ifndef PRODUCT_STORAGE_WORKGROUP_SERVER
+#define PRODUCT_STORAGE_WORKGROUP_SERVER        0x00000016
+#endif
+#ifndef PRODUCT_STORAGE_ENTERPRISE_SERVER
+#define PRODUCT_STORAGE_ENTERPRISE_SERVER       0x00000017
+#endif
+#ifndef PRODUCT_SERVER_FOR_SMALLBUSINESS
+#define PRODUCT_SERVER_FOR_SMALLBUSINESS        0x00000018
+#endif
+#ifndef PRODUCT_SMALLBUSINESS_SERVER_PREMIUM
+#define PRODUCT_SMALLBUSINESS_SERVER_PREMIUM    0x00000019
+#endif
+
+// Newer system metrics values
+#ifndef SM_SERVERR2
+#define SM_SERVERR2 89   
+#endif
+
+#ifndef VER_SUITE_WH_SERVER
+#define VER_SUITE_WH_SERVER                     0x00008000
+#endif
+
+#ifndef VER_SUITE_STORAGE_SERVER
+#define VER_SUITE_STORAGE_SERVER                0x00002000
+#endif
+
+#ifndef VER_SUITE_COMPUTE_SERVER
+#define VER_SUITE_COMPUTE_SERVER                0x00004000
+#endif
+
+typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
+typedef BOOL (WINAPI *PGPI)(DWORD, DWORD, DWORD, DWORD, PDWORD);
+
+
+
+/* Retrieves the OS name as a string
+ * Parameters:
+ * pszOS  - The buffer to write the OS name to (size at least OSVER_SIZE)
+ */
+int GetOSName(char *pszOS)
+{
+   OSVERSIONINFOEX osvi;
+   SYSTEM_INFO si;
+   PGNSI pGNSI;
+   PGPI pGPI;
+   BOOL bOsVersionInfoEx;
+   DWORD dwType;
+
+   ZeroMemory(&si, sizeof(SYSTEM_INFO));
+   ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
+
+   osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
+
+   if( !(bOsVersionInfoEx = GetVersionEx ((OSVERSIONINFO *) &osvi)) )
+      return -1;
+
+   // Call GetNativeSystemInfo if supported or GetSystemInfo otherwise.
+
+   pGNSI = (PGNSI) GetProcAddress(
+      GetModuleHandle(TEXT("kernel32.dll")), 
+      "GetNativeSystemInfo");
+   if(NULL != pGNSI)
+      pGNSI(&si);
+   else GetSystemInfo(&si);
+
+   if ( VER_PLATFORM_WIN32_NT==osvi.dwPlatformId && 
+        osvi.dwMajorVersion > 4 )
+   {
+      StringCchCopy(pszOS, OSVER_SIZE, TEXT("Microsoft "));
+
+      // Test for the specific product.
+
+      if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 1 )
+      {
+         if( osvi.wProductType == VER_NT_WORKSTATION )
+             StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows 7 "));
+         else StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows Server 2008 R2 " ));
+      }
+      
+      if ( osvi.dwMajorVersion == 6 && osvi.dwMinorVersion == 0 )
+      {
+         if( osvi.wProductType == VER_NT_WORKSTATION )
+             StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows Vista "));
+         else StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows Server 2008 " ));
+
+         pGPI = (PGPI) GetProcAddress(
+            GetModuleHandle(TEXT("kernel32.dll")), 
+            "GetProductInfo");
+
+         pGPI( 6, 0, 0, 0, &dwType);
+
+         switch( dwType )
+         {
+            case PRODUCT_ULTIMATE:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Ultimate Edition" ));
+               break;
+            case PRODUCT_HOME_PREMIUM:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Home Premium Edition" ));
+               break;
+            case PRODUCT_HOME_BASIC:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Home Basic Edition" ));
+               break;
+            case PRODUCT_ENTERPRISE:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Enterprise Edition" ));
+               break;
+            case PRODUCT_BUSINESS:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Business Edition" ));
+               break;
+            case PRODUCT_STARTER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Starter Edition" ));
+               break;
+            case PRODUCT_CLUSTER_SERVER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Cluster Server Edition" ));
+               break;
+            case PRODUCT_DATACENTER_SERVER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Datacenter Edition" ));
+               break;
+            case PRODUCT_DATACENTER_SERVER_CORE:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Datacenter Edition (core installation)" ));
+               break;
+            case PRODUCT_ENTERPRISE_SERVER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Enterprise Edition" ));
+               break;
+            case PRODUCT_ENTERPRISE_SERVER_CORE:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Enterprise Edition (core installation)" ));
+               break;
+            case PRODUCT_ENTERPRISE_SERVER_IA64:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Enterprise Edition for Itanium-based Systems" ));
+               break;
+            case PRODUCT_SMALLBUSINESS_SERVER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Small Business Server" ));
+               break;
+            case PRODUCT_SMALLBUSINESS_SERVER_PREMIUM:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Small Business Server Premium Edition" ));
+               break;
+            case PRODUCT_STANDARD_SERVER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Standard Edition" ));
+               break;
+            case PRODUCT_STANDARD_SERVER_CORE:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Standard Edition (core installation)" ));
+               break;
+            case PRODUCT_WEB_SERVER:
+               StringCchCat(pszOS, OSVER_SIZE, TEXT("Web Server Edition" ));
+               break;
+         }
+         if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64 )
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( ", 64-bit" ));
+         else if (si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_INTEL )
+            StringCchCat(pszOS, OSVER_SIZE, TEXT(", 32-bit"));
+      }
+
+      if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 2 )
+      {
+         if( GetSystemMetrics(SM_SERVERR2) )
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( "Windows Server 2003 R2, "));
+         else if ( osvi.wSuiteMask==VER_SUITE_STORAGE_SERVER )
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( "Windows Storage Server 2003"));
+         else if ( osvi.wSuiteMask==VER_SUITE_WH_SERVER )
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( "Windows Home Server"));
+         else if( osvi.wProductType == VER_NT_WORKSTATION &&
+                  si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64)
+         {
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( "Windows XP Professional x64 Edition"));
+         }
+         else StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows Server 2003, "));
+
+         // Test for the server type.
+         if ( osvi.wProductType != VER_NT_WORKSTATION )
+         {
+            if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_IA64 )
+            {
+                if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Datacenter Edition for Itanium-based Systems" ));
+                else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Enterprise Edition for Itanium-based Systems" ));
+            }
+
+            else if ( si.wProcessorArchitecture==PROCESSOR_ARCHITECTURE_AMD64 )
+            {
+                if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Datacenter x64 Edition" ));
+                else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Enterprise x64 Edition" ));
+                else StringCchCat(pszOS, OSVER_SIZE, TEXT( "Standard x64 Edition" ));
+            }
+
+            else
+            {
+                if ( osvi.wSuiteMask & VER_SUITE_COMPUTE_SERVER )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Compute Cluster Edition" ));
+                else if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Datacenter Edition" ));
+                else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Enterprise Edition" ));
+                else if ( osvi.wSuiteMask & VER_SUITE_BLADE )
+                   StringCchCat(pszOS, OSVER_SIZE, TEXT( "Web Edition" ));
+                else StringCchCat(pszOS, OSVER_SIZE, TEXT( "Standard Edition" ));
+            }
+         }
+      }
+
+      if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 1 )
+      {
+         StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows XP "));
+         if( osvi.wSuiteMask & VER_SUITE_PERSONAL )
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( "Home Edition" ));
+         else StringCchCat(pszOS, OSVER_SIZE, TEXT( "Professional" ));
+      }
+
+      if ( osvi.dwMajorVersion == 5 && osvi.dwMinorVersion == 0 )
+      {
+         StringCchCat(pszOS, OSVER_SIZE, TEXT("Windows 2000 "));
+
+         if ( osvi.wProductType == VER_NT_WORKSTATION )
+         {
+            StringCchCat(pszOS, OSVER_SIZE, TEXT( "Professional" ));
+         }
+         else 
+         {
+            if( osvi.wSuiteMask & VER_SUITE_DATACENTER )
+              StringCchCat(pszOS, OSVER_SIZE, TEXT( "Datacenter Server" ));
+            else if( osvi.wSuiteMask & VER_SUITE_ENTERPRISE )
+               StringCchCat(pszOS, OSVER_SIZE, TEXT( "Advanced Server" ));
+            else StringCchCat(pszOS, OSVER_SIZE, TEXT( "Server" ));
+         }
+      }
+
+       // Include service pack (if any) and build number.
+
+      if( _tcslen(osvi.szCSDVersion) > 0 )
+      {
+          StringCchCat(pszOS, OSVER_SIZE, TEXT(" ") );
+          StringCchCat(pszOS, OSVER_SIZE, osvi.szCSDVersion);
+      }
+
+      {
+          TCHAR buf[80];
+
+          StringCchPrintf( buf, 80, TEXT(" (build %d)"), osvi.dwBuildNumber);
+          StringCchCat(pszOS, OSVER_SIZE, buf);
+      }
+
+      return 0; 
+   }
+   else
+   {  
+      return -1;
+   }
+}
diff --git a/src/windows/win.h b/src/windows/win.h
new file mode 100644
index 0000000..33ec79d
--- /dev/null
+++ b/src/windows/win.h
@@ -0,0 +1,43 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, win32/win32.h
+ *   Copyright (C) 2004 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <windows.h>
+
+typedef struct {
+	int *size;
+	unsigned char **buffer;
+} StreamIO;
+
+typedef struct IRCColor {
+	struct IRCColor *next;
+	unsigned char *color;
+} IRCColor;
+
+extern UINT WM_FINDMSGSTRING;
+extern unsigned char *RTFBuf;
+extern HINSTANCE hInst;
+
+extern FARPROC lpfnOldWndProc;
+extern LRESULT RESubClassFunc(HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam);
+extern DWORD CALLBACK SplitIt(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb);
+extern DWORD CALLBACK BufferIt(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG cb, LONG *pcb);
+extern DWORD CALLBACK RTFToIRC(int fd, unsigned char *pbBuff, long cb);
+
+#define OSVER_SIZE 256
+
diff --git a/src/windows/windebug.c b/src/windows/windebug.c
new file mode 100644
index 0000000..9c93f40
--- /dev/null
+++ b/src/windows/windebug.c
@@ -0,0 +1,370 @@
+/************************************************************************
+ *   IRC - Internet Relay Chat, windows/windebug.c
+ *   Copyright (C) 2002-2004 Dominick Meglio (codemastr)
+ *   
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 1, or (at your option)
+ *   any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include "unrealircd.h"
+#include <dbghelp.h>
+
+#ifndef IRCDTOTALVERSION
+#define IRCDTOTALVERSION BASE_VERSION "-" PATCH1 PATCH2 PATCH3 PATCH4 PATCH5 PATCH6 PATCH7 PATCH8 PATCH9
+#endif
+
+extern OSVERSIONINFO VerInfo;
+extern char OSName[256];
+extern char backupbuf[8192];
+extern char *buildid;
+extern char *extraflags;
+
+/* crappy, but safe :p */
+typedef BOOL (WINAPI *MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
+										CONST PMINIDUMP_EXCEPTION_INFORMATION ExceptionParam,
+										CONST PMINIDUMP_USER_STREAM_INFORMATION UserStreamParam,
+										CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam
+										);
+
+
+/* Runs a stack trace 
+ * Parameters:
+ *  e - The exception information
+ * Returns:
+ *  The stack trace with function and line number information
+ */
+__inline char *StackTrace(EXCEPTION_POINTERS *e) 
+{
+	static char buffer[5000];
+	char curmodule[256];
+	DWORD symOptions;
+	DWORD64 dwDisp;
+	DWORD dwDisp32;
+	int frame;
+	HANDLE hProcess = GetCurrentProcess();
+	IMAGEHLP_SYMBOL64 *pSym = safe_alloc(sizeof(IMAGEHLP_SYMBOL64)+500);
+	IMAGEHLP_LINE64 pLine;
+	IMAGEHLP_MODULE64 pMod;
+	STACKFRAME64 Stack;
+	CONTEXT context;
+
+	memcpy(&context, e->ContextRecord, sizeof(CONTEXT));
+
+	/* Load the stack information */
+	memset(&Stack, 0, sizeof(Stack));
+	Stack.AddrPC.Offset = e->ContextRecord->Rip;
+	Stack.AddrPC.Mode = AddrModeFlat;
+	Stack.AddrFrame.Offset = e->ContextRecord->Rbp;
+	Stack.AddrFrame.Mode = AddrModeFlat;
+	Stack.AddrStack.Offset = e->ContextRecord->Rsp;
+	Stack.AddrStack.Mode = AddrModeFlat;
+	hProcess = GetCurrentProcess();
+
+	/* Initialize symbol retrieval system */
+	SymInitialize(hProcess, NULL, TRUE);
+	SymSetOptions(SYMOPT_LOAD_LINES|SYMOPT_UNDNAME);
+	pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
+	pSym->MaxNameLength = 500;
+
+	/* Retrieve the first module name */
+	memset(&pMod, 0, sizeof(pMod));
+	pMod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
+	SymGetModuleInfo64(hProcess, Stack.AddrPC.Offset, &pMod);
+	strcpy(curmodule, pMod.ModuleName);
+	sprintf(buffer, "\tModule: %s\n", pMod.ModuleName);
+
+	/* Walk through the stack */
+	for (frame = 0; ; frame++) 
+	{
+		char buf[500];
+		if (!StackWalk64(IMAGE_FILE_MACHINE_AMD64, GetCurrentProcess(), GetCurrentThread(),
+			&Stack, &context, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL))
+			break;
+
+		memset(&pMod, 0, sizeof(pMod));
+		pMod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
+		SymGetModuleInfo64(hProcess, Stack.AddrPC.Offset, &pMod);
+		if (strcmp(curmodule, pMod.ModuleName)) 
+		{
+			strcpy(curmodule, pMod.ModuleName);
+			sprintf(buf, "\tModule: %s\n", pMod.ModuleName);
+			strcat(buffer, buf);
+		}
+
+		memset(&pLine, 0, sizeof(pLine));
+		pLine.SizeOfStruct = sizeof(IMAGEHLP_LINE64);
+		SymGetLineFromAddr64(hProcess, Stack.AddrPC.Offset, &dwDisp32, &pLine);
+		SymGetSymFromAddr64(hProcess, Stack.AddrPC.Offset, &dwDisp, pSym);
+		sprintf(buf, "\t\t#%d %s:%d: %s\n", frame, pLine.FileName, pLine.LineNumber, 
+		        pSym->Name);
+		strcat(buffer, buf);
+	}
+	strcat(buffer, "End of Stack trace\n");
+	return buffer;
+
+}
+
+/* Retrieves the values of several registers
+ * Parameters:
+ *  context - The CPU context
+ * Returns:
+ *  The values of the registers as a string.
+ */
+__inline char *GetRegisters(CONTEXT *context) 
+{
+	static char buffer[1024];
+
+	sprintf(buffer,
+		"\tRAX=%p"
+		"\tRBX=%p"
+		"\tRCX=%p"
+		"\tRDX=%p\n"
+		"\tRSI=%p"
+		"\tRDI=%p"
+		"\tRBP=%p"
+		"\tRSP=%p\n"
+		"\tR8=%p"
+		"\tR9=%p"
+		"\tR10=%p"
+		"\tR11=%p\n"
+		"\tR12=%p"
+		"\tR13=%p"
+		"\tR14=%p"
+		"\tR15=%p\n"
+		"\tRIP=%p\n",
+		(void *)context->Rax,
+		(void *)context->Rbx,
+		(void *)context->Rcx,
+		(void *)context->Rdx,
+		(void *)context->Rsi,
+		(void *)context->Rdi,
+		(void *)context->Rbp,
+		(void *)context->Rsp,
+		(void *)context->R8,
+		(void *)context->R9,
+		(void *)context->R10,
+		(void *)context->R11,
+		(void *)context->R12,
+		(void *)context->R13,
+		(void *)context->R14,
+		(void *)context->R15,
+		(void *)context->Rip);
+
+	return buffer;
+}
+
+/* Convert the exception code to a human readable string
+ * Parameters:
+ *  code - The exception code to convert
+ * Returns:
+ *  The exception code represented as a string
+ */
+__inline char *GetException(DWORD code) 
+{
+	switch (code) 
+	{
+		case EXCEPTION_ACCESS_VIOLATION:
+			return "Access Violation";
+		case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:
+			return "Array Bounds Exceeded";
+		case EXCEPTION_BREAKPOINT:
+			return "Breakpoint";
+		case EXCEPTION_DATATYPE_MISALIGNMENT:
+			return "Datatype Misalignment";
+		case EXCEPTION_FLT_DENORMAL_OPERAND:
+			return "Floating Point Denormal Operand";
+		case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+			return "Floating Point Division By Zero";
+		case EXCEPTION_FLT_INEXACT_RESULT:
+			return "Floating Point Inexact Result";
+		case EXCEPTION_FLT_INVALID_OPERATION:
+			return "Floating Point Invalid Operation";
+		case EXCEPTION_FLT_OVERFLOW:
+			return "Floating Point Overflow";
+		case EXCEPTION_FLT_STACK_CHECK:
+			return "Floating Point Stack Overflow";
+		case EXCEPTION_FLT_UNDERFLOW:
+			return "Floating Point Underflow";
+		case EXCEPTION_ILLEGAL_INSTRUCTION:
+			return "Illegal Instruction";
+		case EXCEPTION_IN_PAGE_ERROR:
+			return "In Page Error";
+		case EXCEPTION_INT_DIVIDE_BY_ZERO:
+			return "Integer Division By Zero";
+		case EXCEPTION_INT_OVERFLOW:
+			return "Integer Overflow";
+		case EXCEPTION_INVALID_DISPOSITION:
+			return "Invalid Disposition";
+		case EXCEPTION_NONCONTINUABLE_EXCEPTION:
+			return "Noncontinuable Exception";
+		case EXCEPTION_PRIV_INSTRUCTION:
+			return "Unallowed Instruction";
+		case EXCEPTION_SINGLE_STEP:
+			return "Single Step";
+		case EXCEPTION_STACK_OVERFLOW:
+			return "Stack Overflow";
+		default:
+			return "Unknown Exception";
+	}
+}
+
+void StartCrashReporter(void)
+{
+	char fname[MAX_PATH], fnamewarg[MAX_PATH+32];
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	
+	memset(&pi, 0, sizeof(pi));
+	memset(&si, 0, sizeof(si));
+	
+	GetModuleFileName(GetModuleHandle(NULL), fname, MAX_PATH);
+	
+	snprintf(fnamewarg, sizeof(fnamewarg), "\"%s\" %s", fname, "-R");
+	CreateProcess(fname, fnamewarg, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+}
+
+void StartUnrealAgain(void)
+{
+	char fname[MAX_PATH], fnamewarg[MAX_PATH+32];
+	PROCESS_INFORMATION pi;
+	STARTUPINFO si;
+	
+	memset(&pi, 0, sizeof(pi));
+	memset(&si, 0, sizeof(si));
+	
+	GetModuleFileName(GetModuleHandle(NULL), fname, MAX_PATH);
+	
+	snprintf(fnamewarg, sizeof(fnamewarg), "\"%s\"", fname);
+	CreateProcess(fname, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+}
+
+/* Callback for the exception handler
+ * Parameters:
+ *  e - The exception information
+ * Returns:
+ *  EXCEPTION_EXECUTE_HANDLER to terminate the process
+ * Side Effects:
+ *  unrealircd.PID.core is created
+ *  If not running in service mode, a message box is displayed, 
+ *   else output is written to service.log
+ */
+LONG __stdcall ExceptionFilter(EXCEPTION_POINTERS *e) 
+{
+	MEMORYSTATUSEX memStats;
+	char file[512], text[1024], minidumpf[512];
+	FILE *fd;
+	time_t timet = time(NULL);
+#ifndef NOMINIDUMP
+	HANDLE hDump;
+	HMODULE hDll = NULL;
+#endif
+
+	sprintf(file, "unrealircd.%d.core", getpid());
+	fd = fopen(file, "w");
+	GlobalMemoryStatusEx(&memStats);
+	fprintf(fd, "Generated at %s\nOS: %s\n%s[%s%s%s] (%s) on %s\n"
+		    "-----------------\nMemory Information:\n"
+		    "\tPhysical: (Available:%lluMB/Total:%lluMB)\n"
+		    "\tVirtual: (Available:%lluMB/Total:%lluMB)\n"
+		    "-----------------\nException:\n\t%s\n-----------------\n"
+		    "Backup Buffer:\n\t%s\n-----------------\nRegisters:\n"
+		    "%s-----------------\nStack Trace:\n%s",
+		     asctime(gmtime(&timet)), OSName,
+			 IRCDTOTALVERSION,
+		     serveropts, extraflags ? extraflags : "", tainted ? "3" : "",
+		     buildid, me.name, memStats.ullAvailPhys/1048576, memStats.ullTotalPhys/1048576,
+		     memStats.ullAvailVirtual/1048576, memStats.ullTotalVirtual/1048576,
+		     GetException(e->ExceptionRecord->ExceptionCode), backupbuf,
+		     GetRegisters(e->ContextRecord), StackTrace(e));
+
+	sprintf(text, "UnrealIRCd has encountered a fatal error. Debugging information has been dumped to %s.", file);
+	fclose(fd);
+
+#ifndef NOMINIDUMP
+	hDll = LoadLibrary("DBGHELP.DLL");
+	if (hDll)
+	{
+		MINIDUMPWRITEDUMP pDump = (MINIDUMPWRITEDUMP)GetProcAddress(hDll, "MiniDumpWriteDump");
+		if (pDump)
+		{
+			MINIDUMP_EXCEPTION_INFORMATION ExInfo;
+			sprintf(minidumpf, "unrealircd.%d.mdmp", getpid());
+			hDump = CreateFile(minidumpf, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+			if (hDump != INVALID_HANDLE_VALUE)
+			{
+				ExInfo.ThreadId = GetCurrentThreadId();
+				ExInfo.ExceptionPointers = e;
+				ExInfo.ClientPointers = 0;
+
+				if (pDump(GetCurrentProcess(), GetCurrentProcessId(), hDump, MiniDumpWithIndirectlyReferencedMemory, &ExInfo, NULL, NULL))
+				{
+					sprintf(text, "UnrealIRCd has encountered a fatal error. Debugging information has been dumped to %s and %s.", file, minidumpf);
+				}
+				CloseHandle(hDump);
+			}
+			sprintf(minidumpf, "unrealircd.%d.full.mdmp", getpid());
+			hDump = CreateFile(minidumpf, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+			if (hDump != INVALID_HANDLE_VALUE)
+			{
+				ExInfo.ThreadId = GetCurrentThreadId();
+				ExInfo.ExceptionPointers = e;
+				ExInfo.ClientPointers = 0;
+
+				pDump(GetCurrentProcess(), GetCurrentProcessId(), hDump, MiniDumpWithPrivateReadWriteMemory, &ExInfo, NULL, NULL);
+				CloseHandle(hDump);
+			}
+		}
+	}
+#endif
+	
+	if (!IsService)
+	{
+		MessageBox(NULL, text, "Fatal Error", MB_OK);
+		StartCrashReporter();
+	}
+	else 
+	{
+		FILE *fd = fopen("logs\\service.log", "a");
+
+		if (fd)
+		{
+			fprintf(fd, "UnrealIRCd has encountered a fatal error. Debugging information "
+					"has been dumped to unrealircd.%d.core, please file a bug and upload "
+					"this file to https://bugs.unrealircd.org/.", getpid());
+			fclose(fd);
+		}
+	}
+	CleanUp();
+	return EXCEPTION_EXECUTE_HANDLER;
+}
+
+void GotSigAbort(int signal)
+{
+	/* I just want to call ExceptionFilter() but it requires an argument which we don't have...
+	 * So just crash, which is rather silly but produces at least a crash report.
+	 * Feel free to improve this!
+	 */
+	char *crash = NULL;
+	*crash = 'X';
+}
+
+/* Initializes the exception handler */
+void InitDebug(void) 
+{
+	SetUnhandledExceptionFilter(&ExceptionFilter);
+	_set_abort_behavior(0, _WRITE_ABORT_MSG | _CALL_REPORTFAULT);
+	signal(SIGABRT, GotSigAbort);
+}
+
+
diff --git a/src/windows/wingui.rc b/src/windows/wingui.rc
new file mode 100644
index 0000000..ec3c091
--- /dev/null
+++ b/src/windows/wingui.rc
@@ -0,0 +1,415 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#define APSTUDIO_HIDDEN_SYMBOLS
+#include "windows.h"
+#undef APSTUDIO_HIDDEN_SYMBOLS
+#include "resource.h"
+#include "winver.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+UNREALIRCD DIALOGEX 0, 0, 345, 95
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_NOFAILCREATE | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
+FONT 8, "MS Sans Serif", 0, 0, 0x0
+BEGIN
+    CONTROL         130,IDC_STATIC,"Static",SS_BITMAP | SS_NOTIFY | SS_REALSIZEIMAGE,0,0,339,92
+    CONTROL         133,IDC_BAR,"Static",SS_BITMAP | SS_REALSIZEIMAGE,0,51,339,15
+END
+
+FROMVAR DIALOG 0, 0, 418, 183
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "UnrealIRCd License"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,184,162,50,14
+    CONTROL         "",IDC_TEXT,"RichEdit20A",ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,8,7,402,149
+END
+
+HELP DIALOG 0, 0, 318, 94
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Where to get help"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,134,73,50,14
+    LTEXT           "Where to get help:",IDC_STATIC,14,11,60,8
+    LTEXT           "Point your IRC client to irc.unrealircd.org and join #unreal-support",IDC_STATIC,14,20,234,9
+    LTEXT           "Email us at",IDC_STATIC,14,30,37,8
+    CONTROL         "info@unrealircd.org",IDC_EMAIL,"Button",BS_OWNERDRAW,51,30,110,8
+    LTEXT           "Or visit us on the web at",IDC_STATIC,14,40,78,8
+    CONTROL         "https://www.unrealircd.org",IDC_URL,"Button",BS_OWNERDRAW,93,40,86,8
+    LTEXT           "Thank you for choosing UnrealIRCd :)",IDC_STATIC,98,55,121,9
+END
+
+FROMFILE DIALOG 0, 0, 418, 224
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "UnrealIRCd Configuration File"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "",IDC_TEXT,"RichEdit20A",ES_MULTILINE | ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP,0,17,418,194
+END
+
+STATUS DIALOGEX 0, 0, 318, 169
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "UnrealIRCd Status"
+FONT 8, "MS Sans Serif", 0, 0, 0x1
+BEGIN
+    CONTROL         "Tree1",IDC_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_DISABLEDRAGDROP | WS_BORDER | WS_TABSTOP,13,16,100,125
+    GROUPBOX        "Servers",IDC_STATIC,7,7,112,138
+    GROUPBOX        "Global Statistics",IDC_STATIC,122,7,189,78
+    LTEXT           "Clients:",IDC_STATIC,127,18,26,9
+    LTEXT           "",IDC_CLIENTS,170,18,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Servers:",IDC_STATIC,221,18,27,8
+    LTEXT           "",IDC_SERVERS,261,18,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Channels:",IDC_STATIC,127,34,32,8
+    LTEXT           "",IDC_CHANNELS,170,33,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Invisible:",IDC_STATIC,221,34,28,8
+    LTEXT           "",IDC_INVISO,261,33,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Operators:",IDC_STATIC,127,51,34,8
+    LTEXT           "",IDC_OPERS,170,51,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Unknown:",IDC_STATIC,221,51,34,8
+    LTEXT           "",IDC_UNKNOWN,261,51,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Max Clients:",IDC_STATIC,127,69,39,8
+    LTEXT           "",IDC_MAXCLIENTS,170,69,41,9,SS_SUNKEN,WS_EX_RIGHT
+    GROUPBOX        "Local Statistics",IDC_STATIC,122,90,189,55
+    PUSHBUTTON      "OK",IDOK,134,148,50,14
+    LTEXT           "Clients:",IDC_STATIC,127,100,24,8
+    LTEXT           "",IDC_LCLIENTS,170,100,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Servers:",IDC_STATIC,221,100,27,8
+    LTEXT           "",IDC_LSERVERS,261,100,41,9,SS_SUNKEN,WS_EX_RIGHT
+    LTEXT           "Max Clients:",IDC_STATIC,127,118,39,8
+    LTEXT           "",IDC_LMAXCLIENTS,170,118,41,9,SS_SUNKEN,WS_EX_RIGHT
+END
+
+CONFIGERROR DIALOG 0, 0, 331, 178
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION
+CAPTION "Configuration Error"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,134,157,50,14
+    EDITTEXT        IDC_CONFIGERROR,7,7,317,142,ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | WS_VSCROLL
+END
+
+GOTO DIALOG 0, 0, 124, 52
+STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Goto"
+FONT 8, "MS Sans Serif"
+BEGIN
+    LTEXT           "Line Number:",IDC_STATIC,9,12,43,8
+    EDITTEXT        IDC_GOTO,56,9,48,14,ES_AUTOHSCROLL | ES_NUMBER
+    PUSHBUTTON      "Cancel",IDCANCEL,66,31,50,14
+    DEFPUSHBUTTON   "Go To",IDOK,8,31,50,14
+END
+
+COLOR DIALOG 0, 0, 156, 37
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Color Selection"
+FONT 8, "MS Sans Serif"
+BEGIN
+    CONTROL         "",IDC_WHITE,"Button",BS_OWNERDRAW | WS_TABSTOP,4,3,13,12
+    CONTROL         "",IDC_BLACK,"Button",BS_OWNERDRAW | WS_TABSTOP,23,3,13,12
+    CONTROL         "",IDC_DARKBLUE,"Button",BS_OWNERDRAW | WS_TABSTOP,42,3,13,12
+    CONTROL         "",IDC_DARKGREEN,"Button",BS_OWNERDRAW | WS_TABSTOP,61,3,13,12
+    CONTROL         "",IDC_RED,"Button",BS_OWNERDRAW | WS_TABSTOP,80,3,13,12
+    CONTROL         "",IDC_DARKRED,"Button",BS_OWNERDRAW | WS_TABSTOP,99,3,13,12
+    CONTROL         "",IDC_PURPLE,"Button",BS_OWNERDRAW | WS_TABSTOP,118,3,13,12
+    CONTROL         "",IDC_ORANGE,"Button",BS_OWNERDRAW | WS_TABSTOP,137,3,13,12
+    CONTROL         "",IDC_YELLOW,"Button",BS_OWNERDRAW | WS_TABSTOP,4,21,13,12
+    CONTROL         "",IDC_GREEN,"Button",BS_OWNERDRAW | WS_TABSTOP,23,21,13,12
+    CONTROL         "",IDC_VDARKGREEN,"Button",BS_OWNERDRAW | WS_TABSTOP,42,21,13,12
+    CONTROL         "",IDC_LIGHTBLUE,"Button",BS_OWNERDRAW | WS_TABSTOP,61,21,13,12
+    CONTROL         "",IDC_BLUE,"Button",BS_OWNERDRAW | WS_TABSTOP,80,21,13,12
+    CONTROL         "",IDC_PINK,"Button",BS_OWNERDRAW | WS_TABSTOP,99,21,13,12
+    CONTROL         "",IDC_DARKGRAY,"Button",BS_OWNERDRAW | WS_TABSTOP,118,21,13,12
+    CONTROL         "",IDC_GRAY,"Button",BS_OWNERDRAW | WS_TABSTOP,137,21,13,12
+END
+
+SSLPASS DIALOG 0, 0, 174, 57
+STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "SSL Private Key Password"
+FONT 8, "MS Sans Serif"
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,33,35,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,89,35,50,14
+    EDITTEXT        IDC_PASS,11,12,152,14,ES_PASSWORD | ES_AUTOHSCROLL
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// RT_MANIFEST
+//
+
+1                       RT_MANIFEST             "UnrealIRCd.exe.manifest"
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""windows.h""\r\n"
+    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
+    "#include ""resource.h""\r\n"
+    "#include ""winver.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    "UNREALIRCD", DIALOG
+    BEGIN
+        RIGHTMARGIN, 319
+        BOTTOMMARGIN, 94
+    END
+
+    "FROMVAR", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 411
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 176
+    END
+
+    "HELP", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 311
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 87
+    END
+
+    "FROMFILE", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 411
+        TOPMARGIN, 2
+        BOTTOMMARGIN, 189
+    END
+
+    "STATUS", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 311
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 162
+    END
+
+    "CONFIGERROR", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 324
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 171
+    END
+
+    "GOTO", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 117
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 45
+    END
+
+    "COLOR", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 149
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 30
+    END
+
+    "SSLPASS", DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 167
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 50
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VER_UNREAL VERSIONINFO
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x10004L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "CompanyName", "none"
+            VALUE "FileVersion", "3.2"
+            VALUE "InternalName", "UnrealIRCd"
+            VALUE "ProductName", "UnrealIRCd"
+            VALUE "ProductVersion", "1.0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+ICO_MAIN                ICON                    "icon1.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Bitmap
+//
+
+BMP_LOGO                BITMAP                  "unreal.bmp"
+BMP_BAR                 BITMAP                  "bar.bmp"
+IDB_BITMAP1             BITMAP                  "toolbar.bmp"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Cursor
+//
+
+CUR_HAND                CURSOR                  "hand.CUR"
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Menu
+//
+
+MENU_ABOUT MENU
+BEGIN
+    POPUP "About"
+    BEGIN
+        MENUITEM "UnrealIRCd &Team",            IDM_INFO
+        MENUITEM "Additional &Credits",         IDM_CREDITS
+        MENUITEM "&License",                    IDM_LICENSE
+        MENUITEM "&Help",                       IDM_HELP
+    END
+END
+
+MENU_CONFIG MENU
+BEGIN
+    POPUP "Config"
+    BEGIN
+        MENUITEM "ircd.&conf",                  IDM_CONF
+        MENUITEM SEPARATOR
+    END
+END
+
+MENU_REHASH MENU
+BEGIN
+    POPUP "Rehash"
+    BEGIN
+        MENUITEM "&All Files",                  IDM_RHALL
+        MENUITEM SEPARATOR
+        MENUITEM "&Config file",                IDM_RHCONF
+        MENUITEM "&All MOTD and Rules",         IDM_RHMOTD
+        MENUITEM "&OperMOTD",                   IDM_RHOMOTD
+        MENUITEM "&BotMOTD",                    IDM_RHBMOTD
+    END
+END
+
+MENU_SYSTRAY MENU
+BEGIN
+    POPUP "Systray"
+    BEGIN
+        MENUITEM "&Rehash",                     IDM_REHASH
+        MENUITEM "&Status",                     IDM_STATUS
+        MENUITEM "&Config",                     IDM_CONFIG
+        MENUITEM "&About",                      IDM_ABOUT
+        MENUITEM "S&hutdown",                   IDM_SHUTDOWN
+    END
+END
+
+MENU_CONTEXT MENU
+BEGIN
+    POPUP "Context"
+    BEGIN
+        MENUITEM "&Undo",                       IDM_UNDO
+        MENUITEM SEPARATOR
+        MENUITEM "Cu&t",                        IDM_CUT
+        MENUITEM "&Copy",                       IDM_COPY
+        MENUITEM "&Paste",                      IDM_PASTE
+        MENUITEM "&Delete",                     IDM_DELETE
+        MENUITEM SEPARATOR
+        MENUITEM "&Select All",                 IDM_SELECTALL
+    END
+END
+
+#endif    // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/unrealircd.in b/unrealircd.in
new file mode 100644
index 0000000..31430b8
--- /dev/null
+++ b/unrealircd.in
@@ -0,0 +1,315 @@
+#!/bin/sh
+
+PID_FILE="@PIDFILE@"
+PID_BACKUP="@PIDFILE@.bak"
+if [ ! -f @BINDIR@/unrealircd ]; then
+	echo "ERROR: Could not find the IRCd binary (@BINDIR@/unrealircd)"
+	echo "This could mean two things:"
+	echo "1) You forgot to run 'make install' after running 'make'"
+	echo "2) You answered a ./Config question incorrectly"
+	exit
+fi
+if [ "$1" = "start" ] ; then
+	echo "Starting UnrealIRCd"
+	if [ -r $PID_FILE ] ; then
+		mv -f $PID_FILE $PID_BACKUP
+	fi
+	# When built with --with-asan, ASan does not dump core by default because
+	# older gcc/clang might dump a 16TB core file. We explicitly enable it here.
+	export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:log_path=@TMPDIR@/unrealircd_asan:detect_leaks=0"
+
+	# Check if ~/Unrealxxx/unrealircd.conf exists but the file
+	# ~/unrealircd/conf/unrealircd.conf does not.
+	# If so, then assume a user-build and give the user a nice hint...
+	if [ ! -f @CONFDIR@/unrealircd.conf -a -f @BUILDDIR@/unrealircd.conf ]; then
+		echo ""
+		echo "There is no unrealircd.conf in @CONFDIR@"
+		echo "However I did find an unrealircd.conf in @BUILDDIR@"
+		echo "With UnrealIRCd 4 you should no longer run the IRCd from @BUILDDIR@."
+		echo "You should 'cd @SCRIPTDIR@' and work from there."
+		echo "See https://www.unrealircd.org/docs/UnrealIRCd_files_and_directories"
+		exit 1
+	fi
+	if [ ! -f @CONFDIR@/unrealircd.conf ]; then
+		echo ""
+		echo "The configuration file does not exist (@CONFDIR@/unrealircd.conf)."
+		echo "* Create one by following:"
+		echo "  https://www.unrealircd.org/docs/Installing_from_source#Creating_a_configuration_file"
+		echo "* Or if you are upgrading from version 3.2.x then read:"
+		echo "  https://www.unrealircd.org/docs/Upgrading_from_3.2.x and"
+		echo "  https://www.unrealircd.org/docs/UnrealIRCd_files_and_directories"
+		exit 1
+	fi
+	@BINDIR@/unrealircd
+	if [ $? -ne 0 ] ; then
+		echo "====================================================="
+		echo "UnrealIRCd failed to start. Check above for possible errors."
+		echo "If you don't understand the problem, then have a look at our:"
+		echo "* FAQ (Frequently Asked Questions): https://www.unrealircd.org/docs/FAQ"
+		echo "* Documentation: https://www.unrealircd.org/docs/"
+		echo "====================================================="
+		if [ -r $PID_BACKUP ] ; then
+			mv -f $PID_BACKUP $PID_FILE
+		fi
+		exit 1
+	fi
+	# Now check if we need to create a crash report.
+	@BINDIR@/unrealircd -R
+elif [ "$1" = "stop" ] ; then
+	echo "Stopping UnrealIRCd"
+	if [ ! -r $PID_FILE ] ; then
+		echo "ERROR: UnrealIRCd is not running"
+		exit 1
+	fi
+	kill -15 `cat $PID_FILE`
+	if [ "$?" != 0 ]; then
+		echo "ERROR: UnrealIRCd is not running"
+		exit 1
+	fi
+	sleep 1
+	if [ -r $PID_FILE ] ; then
+		kill -9 `cat $PID_FILE` 1>/dev/null 2>&1
+	fi
+elif [ "$1" = "rehash" ] ; then
+	echo "Rehashing UnrealIRCd"
+	if [ ! -r $PID_FILE ] ; then
+		echo "ERROR: UnrealIRCd is not running"
+		exit 1
+	fi
+	kill -1 `cat $PID_FILE`
+	if [ "$?" != 0 ]; then
+		echo "ERROR: UnrealIRCd is not running"
+		exit 1
+	fi
+elif [ "$1" = "restart" ] ; then
+	echo "Restarting UnrealIRCd"
+	if [ ! -r $PID_FILE ] ; then
+		echo "WARNING: UnrealIRCd was not running"
+	else
+		kill -15 `cat $PID_FILE`
+		if [ "$?" != 0 ]; then
+			echo "WARNING: UnrealIRCd was not running"
+		else
+			sleep 1
+			kill -9 `cat $PID_FILE` 1>/dev/null 2>&1
+		fi
+	fi
+	$0 start
+elif [ "$1" = "croncheck" ] ; then
+	if [ -r $PID_FILE ] ; then
+		kill -CHLD `cat $PID_FILE` 1>/dev/null 2>&1
+		if [ "$?" = 0 ]; then
+			# IRCd is running, bail out silently.
+			exit 0
+		fi
+	fi
+	# PID file not found or found but stale
+	echo "UnrealIRCd is not running. Starting now..."
+	$0 start
+elif [ "$1" = "configtest" ] ; then
+	@BINDIR@/unrealircd -c
+elif [ "$1" = "module" ] ; then
+	shift
+	@BINDIR@/unrealircd -m $*
+elif [ "$1" = "reloadtls" ] ; then
+	echo "Reloading SSL/TLS certificates"
+	if [ ! -r $PID_FILE ] ; then
+		echo "ERROR: UnrealIRCd is not running"
+		exit 1
+	fi
+	kill -USR1 `cat $PID_FILE`
+	if [ "$?" != 0 ]; then
+		echo "ERROR: UnrealIRCd is not running"
+		exit 1
+	fi
+elif [ "$1" = "mkpasswd" ] ; then
+	@BINDIR@/unrealircd -P $2 $3
+elif [ "$1" = "version" ] ; then
+	@BINDIR@/unrealircd -v
+elif [ "$1" = "gencloak" ] ; then
+	@BINDIR@/unrealircd -k
+elif [ "$1" = "upgrade-conf" ] ; then
+	@BINDIR@/unrealircd -U
+elif [ "$1" = "backtrace" ] ; then
+	cd @TMPDIR@
+
+	modpath="@MODULESDIR@"
+
+	# Find the corefile
+	echo "Core files available:"
+	n="0"
+	for i in `echo *core*`
+	do
+		ls -l $i
+		n=`expr $n + 1`
+	done
+
+	if [ "$n" -gt 1 ]; then
+		echo "Type the name of the core file you want to research:"
+		read corefile
+	elif [ "$i" = "*core*" -o "$n" -eq 0 ]; then
+		echo 'No core files found... Nothing to do'
+		echo ''
+		echo 'If you are sure UnrealIRCd crashed, then verify that unreal'
+		echo 'has permission to dump core (type "ulimit -c unlimited" and see'
+		echo 'if you get permission denied errors). Also verify that you did'
+		echo 'not run out of quota.'
+		echo 'If all that is ok, then it might be that UnrealIRCd did not crash but'
+		echo 'got killed by the OS (eg: cpu/mem resource limits), the syadmin,'
+		echo 'or an automated process.'
+		exit 1
+	else
+		corefile="$i"
+	fi
+
+	if [ ! -f "$corefile" ]; then
+		echo "Core file '$corefile' not found"
+	fi
+	if [ ! -s "$corefile" ]; then
+		echo 'Seems the corefile is 0 bytes'
+		echo 'This usually means you need to relax the core file resource limit'
+		echo '(type "ulimit -c unlimited"), or you might have ran out of quota.'
+		exit 1
+	fi
+
+	# This is needed for the script below and is probably also helpful for the
+	# bug report since you usually want to paste this to the development team.
+	export LANG=C
+	export LC_ALL=C
+
+	# The tmp/*.so files are often already deleted. Here we have some
+	# (ugly) scripting to recreate the tmp/*.so links to the modules *.so files...
+	echo 'info sharedlibrary'|gdb @BINDIR@/unrealircd $corefile 2>/dev/null|\
+	grep No|grep tmp/|awk '{ print $2 }'|\
+	awk -F '.' "{ system(\"[ -f $modpath/\" \$2 \"/\" \$3 \".so ] && ln -s $modpath/\" \$2 \"/\" \$3 \".so \" \$0 \" || ln -s $modpath/\" \$2 \".so \" \$0) }"
+	
+	echo ""
+	echo "=================== START HERE ======================"
+	echo "BACKTRACE:"
+
+cat >@TMPDIR@/gdb.commands << __EOF__
+bt
+echo \n
+frame
+echo \n
+x/s backupbuf
+echo \n
+bt 3 full
+quit
+__EOF__
+
+	gdb -batch -x @TMPDIR@/gdb.commands @BINDIR@/unrealircd $corefile
+	rm -f @TMPDIR@/gdb.commands
+	echo "GCC: `gcc -v 2>&1|tail -n 1`"
+	echo "UNAME: `uname -a`"
+	echo "UNREAL: `$0 version`"
+	echo "CORE: `ls -al $corefile`"
+	echo "===================  STOP HERE ======================"
+	echo ""
+	echo "Copy the parts between the START HERE and STOP HERE marker"
+	echo "and report it on https://bugs.unrealircd.org/"
+	echo ""
+	echo 'But before you do, note the following:'
+	echo '1. We do not support modifications of any unrealircd code'
+	echo '   (except for config.h changes).'
+	echo '2. If you are using 3rd party modules we might request you'
+	echo '   to run without them and verify you still crash. This is'
+	echo '   to eleminate any loss of time due to bugs made by others'
+	echo '3. Always use the latest UnrealIRCd version, we fix (crash)bugs'
+	echo '   all the time so your bug might as well be fixed already.'
+	echo ""
+	echo "Thanks!"
+elif [ "$1" = "spki" -o "$1" = "spkifp" ] ; then
+	CERT="@CONFDIR@/tls/server.cert.pem"
+	if [ "$2" != "" ]; then
+		CERT="$2"
+	fi
+	if [ ! -f "$CERT" ]; then
+		echo "Could not open certificate: $CERT"
+		exit 1
+	fi
+	openssl x509 -noout -in "$CERT" -pubkey | openssl asn1parse -noout -inform pem -out @TMPDIR@/tmp.public.key
+	HASH="`openssl dgst -sha256 -binary @TMPDIR@/tmp.public.key | openssl enc -base64`"
+	rm -f @TMPDIR@/tmp.public.key
+	if [ "$HASH" = "" ]; then
+		echo "Sorry, something went wrong when generating the SPKI fingerprint."
+		echo "Is the 'openssl' tool properly installed?"
+		exit 1
+	fi
+	echo "The SPKI fingerprint for certificate $CERT is:"
+	echo "$HASH"
+	echo ""
+	echo "You normally add this password on the other side of the link as:"
+	echo "password \"$HASH\" { spkifp; };"
+	echo ""
+elif [ "$1" = "hot-patch" -o "$1" = "cold-patch" ] ; then
+	if [ ! -d "@BUILDDIR@" ]; then
+		echo "UnrealIRCd source not found. Sorry, it is not possible to patch."
+		exit 1
+	fi
+	if [ "$2" = "" ]; then
+		echo "Argument required: ./unrealircd <hot-patch|cold-patch> <name-of-patch>"
+		exit 1
+	fi
+	if ! wget --help 1>/dev/null 2>&1; then
+		echo "The tool 'wget' is missing, which is used by this script."
+		echo "On Linux consider running 'apt install wget' or a similar command."
+		exit 1
+	fi
+	cd "@BUILDDIR@" || exit 1
+
+	# Weird way to get version, but ok.
+	UNREALVER="`./configure --version|head -n1|awk '{ print $3 }'`"
+	wget -O patch "https://www.unrealircd.org/patch?type=$1&patch=$2&version=$UNREALVER" || exit 1
+
+	# A patch file of 0 bytes means the patch is not needed
+	if [ -f patch -a ! -s patch ]; then
+		echo "This UnrealIRCd version does not require that patch"
+	fi
+
+	if patch --dry-run -p1 -R <patch 1>/dev/null 2>&1; then
+		echo "Patch already applied. Nothing to do."
+		exit 1
+	fi
+
+	if ! patch -p1 <patch; then
+		echo "Patch failed to apply"
+		exit 1
+	fi
+
+	echo "Patch applied successfully. Now recompiling..."
+	make || gmake || exit 1
+	make install || gmake install || exit 1
+
+	cd -
+	if [ "$1" = "hot-patch" ]; then
+		echo "Patch applied successfully and installed. Rehashing your IRCd..."
+		./unrealircd rehash
+		echo "Done! All should be good now."
+	else
+		echo "Patch applied successfully. You must now restart your IRC server."
+	fi
+elif [ "$1" = "genlinkblock" ] ; then
+	@BINDIR@/unrealircd -L
+else
+	if [ "$1" = "" ]; then
+		echo "This script expects a parameter. Use:"
+	else
+		echo "Unrecognized parameter '$1'. Use:"
+	fi
+	echo "unrealircd configtest    Test the configuration file"
+	echo "unrealircd start         Start the IRC Server"
+	echo "unrealircd stop          Stop (kill) the IRC Server"
+	echo "unrealircd rehash        Reload the configuration file"
+	echo "unrealircd reloadtls     Reload the SSL/TLS certificate and settings"
+	echo "unrealircd restart       Restart the IRC Server (stop+start)"
+	echo "unrealircd mkpasswd      Hash a password"
+	echo "unrealircd version       Display the UnrealIRCd version"
+	echo "unrealircd module        Install and uninstall 3rd party modules"
+	echo "unrealircd croncheck     For use in crontab: this checks if the server"
+	echo "                         is running. If not, the server is started."
+	echo "unrealircd gencloak      Display 3 random cloak keys"
+	echo "unrealircd spkifp        Display SPKI Fingerprint"
+	echo "unrealircd upgrade-conf  Upgrade the configuration file from UnrealIRCd"
+	echo "                         3.2.x/4.x to 5.x format"
+fi