From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 2 Oct 2010 19:18:11 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~309
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=b14c545d2699e29ef2b6261c6215ff6cff8afb8f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into divVerent/crypto2

Conflicts:
	qcsrc/server/ipban.qc
---

b14c545d2699e29ef2b6261c6215ff6cff8afb8f
diff --cc qcsrc/server/ipban.qc
index 9dd3cb51a,ad09772a5..1240aea6e
--- a/qcsrc/server/ipban.qc
+++ b/qcsrc/server/ipban.qc
@@@ -353,9 -353,11 +359,11 @@@ float Ban_GetClientIP(entity client
  	if(i3 < 0)
  		return FALSE;
  	i4 = strstrofs(s, ".", i3 + 1);
+ 	if(i4 < 0)
+ 		i4 = strstrofs(s, ":", i3 + 1);
  	if(i4 >= 0)
- 		return FALSE;
+ 		s = substring(s, 0, i4);
 -	
 +
  	ban_ip1 = substring(s, 0, i1);
  	ban_ip2 = substring(s, 0, i2);
  	ban_ip3 = substring(s, 0, i3);