Index: CvsManager.cpp
===================================================================
RCS file: /scotty/cvsmanager/CvsManager.cpp,v
retrieving revision 1.55
diff -c -r1.55 CvsManager.cpp
*** CvsManager.cpp	19 Dec 2010 21:52:32 -0000	1.55
--- CvsManager.cpp	28 Mar 2011 08:57:11 -0000
***************
*** 695,701 ****
  	const char *szNode;
  	time_t global_session_time_t;
  	const char *global_session_time;
! 	int server_count;
  	License_t license;
  #ifdef HAVE_UNISON
  	CSocketIO unison_sock;
--- 695,701 ----
  	const char *szNode;
  	time_t global_session_time_t;
  	const char *global_session_time;
! 	int server_count=10;
  	License_t license;
  #ifdef HAVE_UNISON
  	CSocketIO unison_sock;
***************
*** 850,855 ****
--- 850,857 ----
  
  	if(CGlobalSettings::GetGlobalValue("Server",NULL,"StartServers",server_count))
  		server_count=10;
+ 	if(server_count>50)
+ 		server_count=10;
  
  	// invalid values will cause us headaches...
  	if (server_count<=0)
***************
*** 912,919 ****
  #endif
  
  	// Since 2.5.03 doesn't have user accounting, we do it by server currently
! 	if(license.maxUsers && server_count>license.maxUsers)
! 		server_count=license.maxUsers;
  
  	szNode = NULL;
  	if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","BindAddress",szTmp,sizeof(szTmp)))
--- 914,922 ----
  #endif
  
  	// Since 2.5.03 doesn't have user accounting, we do it by server currently
! 	//  ... doesnt make much sense...
! 	//if(license.maxUsers && server_count>license.maxUsers)
! 	//	server_count=license.maxUsers;
  
  	szNode = NULL;
  	if(CGlobalSettings::GetGlobalValue("cvsnt","PServer","BindAddress",szTmp,sizeof(szTmp)))