Merge in patch from nenolod to make channelmode +z not count ulined clients when determining if all users on a channel are ssl before setting the mode. Thanks nenolod.

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9936 e03df62e-2008-0410-955e-edbf42e46eb7

1 files changed, 1 insertions, 1 deletions

diff --git a/src/modules/m_sslmodes.cpp b/src/modules/m_sslmodes.cpp
index f720e6147..bc50ff510 100644
--- a/src/modules/m_sslmodes.cpp
+++ b/src/modules/m_sslmodes.cpp
@@ -35,7 +35,7 @@ class SSLMode : public ModeHandler
 					CUList* userlist = channel->GetUsers();
 					for(CUList::iterator i = userlist->begin(); i != userlist->end(); i++)
 					{
-						if(!i->first->GetExt("ssl", dummy))
+						if(!i->first->GetExt("ssl", dummy) && !ServerInstance->ULine(i->first->server))
 						{
 							source->WriteNumeric(490, "%s %s :all members of the channel must be connected via SSL", source->nick.c_str(), channel->name.c_str());
 							return MODEACTION_DENY;