[quake3-commits] r1559 - trunk/code/server

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2009-05-28 03:52:09 -0400 (Thu, 28 May 2009)
New Revision: 1559

Modified:
   trunk/code/server/sv_ccmds.c
Log:
This could never have worked in the first place. Duh.


Modified: trunk/code/server/sv_ccmds.c
===================================================================
--- trunk/code/server/sv_ccmds.c	2009-05-25 15:14:53 UTC (rev 1558)
+++ trunk/code/server/sv_ccmds.c	2009-05-28 07:52:09 UTC (rev 1559)
@@ -714,6 +714,7 @@
 static void SV_AddBanToList(qboolean isexception)
 {
 	char *banstring;
+	char addy2[NET_ADDRSTRMAXLEN];
 	netadr_t ip;
 	int index, argc, mask;
 	serverBan_t *curban;
@@ -799,9 +800,11 @@
 		{
 			if((curban->isexception || !isexception) && NET_CompareBaseAdrMask(curban->ip, ip, curban->subnet))
 			{
+				Q_strncpyz(addy2, NET_AdrToString(ip), sizeof(addy2));
+				
 				Com_Printf("Error: %s %s/%d supersedes %s %s/%d\n", curban->isexception ? "Exception" : "Ban",
 					   NET_AdrToString(curban->ip), curban->subnet,
-					   isexception ? "exception" : "ban", NET_AdrToString(ip), mask);
+					   isexception ? "exception" : "ban", addy2, mask);
 				return;
 			}
 		}
@@ -809,9 +812,11 @@
 		{
 			if(!curban->isexception && isexception && NET_CompareBaseAdrMask(curban->ip, ip, mask))
 			{
+				Q_strncpyz(addy2, NET_AdrToString(curban->ip), sizeof(addy2));
+			
 				Com_Printf("Error: %s %s/%d supersedes already existing %s %s/%d\n", isexception ? "Exception" : "Ban",
 					   NET_AdrToString(ip), mask,
-					   curban->isexception ? "exception" : "ban", NET_AdrToString(curban->ip), curban->subnet);
+					   curban->isexception ? "exception" : "ban", addy2, curban->subnet);
 				return;
 			}
 		}