X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fchannels.cpp;h=883ae3954a121e32691fe52199151c8820923a21;hb=ebdaf368e137fc933e648ee88a08a4f83e796f87;hp=f1dba53155eaf0c5238f403a303f9ac25897904f;hpb=f89e68d78684dab66f9c99aaf8bd8a37ec62bfce;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/channels.cpp b/src/channels.cpp
index f1dba5315..883ae3954 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -449,7 +449,7 @@ bool Channel::CheckBan(User* user, const std::string& mask)
 		return (result == MOD_RES_DENY);
 
 	// extbans were handled above, if this is one it obviously didn't match
-	if (mask[1] == ':')
+	if ((mask.length() <= 2) || (mask[1] == ':'))
 		return false;
 
 	std::string::size_type at = mask.find('@');
@@ -1013,7 +1013,8 @@ Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
 		if ((check_expired) && (inv->expiry != 0) && (inv->expiry <= ServerInstance->Time()))
 		{
 			/* Expired invite, remove it. */
-			ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find ecountered expired entry: %p timed out at %lu", (void*) inv, inv->expiry);
+			std::string expiration = ServerInstance->TimeString(inv->expiry);
+			ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find ecountered expired entry: %p expired %s", (void*) inv, expiration.c_str());
 			i = locallist.erase(i);
 			inv->cull();
 			delete inv;