Merge remote-tracking branch 'upstream/insp3' into insp3

.mailmap

@@ -45,6 +45,7 @@ satmd <[email protected]>                       satmd <[email protected]
 Thomas Stagner <[email protected]>      aquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>
 Uli Schlachter <[email protected]>        psychon <psychon@e03df62e-2008-0410-955e-edbf42e46eb7>
 Val Lorentz <[email protected]>        Valentin Lorentz <[email protected]>
+Val Lorentz <[email protected]>        Val Lorentz <[email protected]>
 
 # The identities of the following people could not be verified. If you have an
 # email address for them please contact Sadie.

make/template/deploy-ssl.sh

@@ -0,0 +1,34 @@
+%mode 0750
+#!/bin/sh
+set -e
+
+# IMPORTANT: This script is an example post-deploy hook for use with CertBot,
+# Dehydrated, or a similar SSL (TLS) renewal tool. You will need to customise
+# it for your setup before you use it
+
+# The location your renewal tool places your certificates.
+CERT_DIR="/etc/letsencrypt/live/irc.example.com"
+
+# The location of the InspIRCd config directory.
+INSPIRCD_CONFIG_DIR="@CONFIG_DIR@"
+
+# The location of the InspIRCd pid file.
+INSPIRCD_PID_FILE="@RUNTIME_DIR@/inspircd.pid"
+
+# The user:group that InspIRCd runs as.
+INSPIRCD_OWNER="@USER@:@GROUP@"
+
+if [ -e ${CERT_DIR} -a -e ${INSPIRCD_CONFIG_DIR} ]
+then
+    cp "${CERT_DIR}/fullchain.pem" "${INSPIRCD_CONFIG_DIR}/cert.pem"
+    cp "${CERT_DIR}/privkey.pem" "${INSPIRCD_CONFIG_DIR}/key.pem"
+    chown ${INSPIRCD_OWNER} "${INSPIRCD_CONFIG_DIR}/cert.pem" "${INSPIRCD_CONFIG_DIR}/key.pem"
+
+    if [ -r ${INSPIRCD_PID_FILE} ]
+    then
+        kill -USR1 $(cat ${INSPIRCD_PID_FILE})
+    elif [ -d /lib/systemd ] && systemctl --quiet is-active inspircd
+    then
+        systemctl kill --signal USR1 inspircd
+    fi
+fi

make/template/main.mk

@@ -234,6 +234,7 @@ install: target
 	@-$(INSTALL) -d $(INSTFLAGS) -m $(INSTMODE_DIR) $(SCRPATH)
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) "$(BUILDPATH)/modules/"*.so $(MODPATH)
+	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/deploy-ssl.sh $(SCRPATH) 2>/dev/null
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_BIN) @CONFIGURE_DIRECTORY@/inspircd $(SCRPATH) 2>/dev/null
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/apparmor $(SCRPATH) 2>/dev/null
 	-$(INSTALL) $(INSTFLAGS) -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/logrotate $(SCRPATH) 2>/dev/null

src/modules/m_spanningtree/fjoin.cpp

@@ -128,6 +128,9 @@ CmdResult CommandFJoin::Handle(User* srcuser, Params& params)
 
 	if (!chan)
 	{
+		if (channel[0] != '#')
+			throw ProtocolException("Malformed channel name in FJOIN '" + channel + '"');
+
 		chan = new Channel(channel, TS);
 	}
 	else