Merge branch '2.0' into 2.1.

data/operserv.example.conf

@@ -548,7 +548,7 @@ module
 	 *
 	 * This directive is required if os_session is loaded.
 	 */
-	defaultsessionlimit = 3
+	defaultsessionlimit = 5
 
 	/*
 	 * The maximum session limit that may be set for a host in an exception.

language/update.sh

@@ -4,13 +4,14 @@ rm -f anope.pot
 touch anope.pot
 
 cd ..
-FILES=`find ./ -name *.cpp -o -name *.h -o -name *.conf | grep -v /modules/third/`
+FILES=`find ./ -name *.cpp -o -name *.h -o -name *.conf | grep -v /docs/	 | grep -v /modules/third/`
 xgettext -E -C -s -d Anope -j -o language/anope.pot --from-code=utf-8 --keyword --keyword=_ $FILES
 cd -
 
 for f in *.po
 do
-	msgmerge -v -s -U $f `echo $f | cut -d'.' -f1`.pot
+	echo "Merging $f"
+	msgmerge --no-location --no-wrap --sort-output --update --verbose $f `echo $f | cut -d'.' -f1`.pot
 done
 
 rm -f *~

modules/protocol/unrealircd.cpp

@@ -407,6 +407,11 @@ class UnrealIRCdProto : public IRCDProto
 		{
 			distmask = uid.substr(0, p);
 		}
+
+		if (!na->GetVhostIdent().empty())
+			UplinkSocket::Message(Me) << "CHGIDENT " << uid << " " << na->GetVhostIdent();
+		if (!na->GetVhostHost().empty())
+			UplinkSocket::Message(Me) << "CHGHOST " << uid << " " << na->GetVhostHost();
 		UplinkSocket::Message(Me) << "SVSLOGIN " << distmask << " " << uid << " " << na->nc->display;
 	}
 

src/config.cpp

@@ -942,5 +942,10 @@ void Conf::LoadConf(File &file)
 	if (!itemname.empty() || !wordbuffer.empty())
 		throw ConfigException("Unexpected garbage at end of file: " + file.GetName());
 	if (!block_stack.empty())
-		throw ConfigException("Unterminated block at end of file: " + file.GetName() + ". Block was opened on line " + stringify(block_stack.top()->linenum));
+	{
+		if (block_stack.top())
+			throw ConfigException("Unterminated block at end of file: " + file.GetName() + ". Block was opened on line " + stringify(block_stack.top()->linenum));
+		else
+			throw ConfigException("Unterminated commented block at end of file: " + file.GetName());
+	}
 }