Update of /cvsroot/netrek/server/Vanilla
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20227

Modified Files:
	NEWS ChangeLog 
Log Message:
vote to ban

Index: NEWS
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/NEWS,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- NEWS	23 Apr 2006 13:30:38 -0000	1.16
+++ NEWS	24 Apr 2006 12:35:17 -0000	1.17
@@ -1,3 +1,4 @@
+- add vote to temporarily ban a player [Cameron]
 - change to conquest sequence to add a parade [Cameron]
 - fix unrealistic robot boredom timer [Cameron]
 - add galaxy configuration tool, setplanet [Cameron]

Index: ChangeLog
===================================================================
RCS file: /cvsroot/netrek/server/Vanilla/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ChangeLog	24 Apr 2006 10:12:17 -0000	1.32
+++ ChangeLog	24 Apr 2006 12:35:17 -0000	1.33
@@ -1,3 +1,20 @@
+Mon Apr 24 22:30:47 2006  James Cameron  <quozl at us.netrek.org>
+
+	* ntserv/ntscmds.c: add a vote to temporarily ban, which requires
+	100 non-banned logins before the temporary ban expires.  If the
+	banned IP address tries in the meanwhile, the countdown is
+	manipulated upwards.
+
+	* include/config.h.in: add a vote to temporarily ban, and disable
+	VICIOUS_EJECT now that a ban vote is available.
+
+	* include/struct.h: add a structure for temporary bans, which
+	expire according to the number of login attempts that are not
+	banned.
+
+	* ntserv/main.c (main): split permanent bans from temporary bans,
+	rename the functions, and give different responses in messages.
+	
 Mon Apr 24 19:59:29 2006  James Cameron  <quozl at us.netrek.org>
 
 	* ntserv/conquer.c: move conquest animation sequence to separate