Enable SVSHOLD for Insp1.1/1.2, remove UseSVSHOLD. Enforcer support may go away, as it is hacky, and no longer used with any of the ircds.

git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1739 5417fbe8-f217-4b02-8779-1006273d7864

5 files changed, 7 insertions, 15 deletions

diff --git a/src/config.c b/src/config.c
index 7f741d60e..0cac86802 100644
--- a/src/config.c
+++ b/src/config.c
@@ -102,7 +102,6 @@ bool UseStrictPrivMsg;
 bool DumpCore;
 bool LogUsers;
 int NickRegDelay;
-int UseSVSHOLD;
 int NewsCount;
 
 bool UseMail;
@@ -1391,13 +1390,10 @@ Directive directives[] = {
 	{"RemoteServer3", {{PARAM_STRING, 0, &RemoteServer3},
 					   {PARAM_PORT, 0, &RemotePort3},
 					   {PARAM_STRING, 0, &RemotePassword3}}},
-	{"UseSVSHOLD", {{PARAM_SET, PARAM_RELOAD, &UseSVSHOLD}}},
+	{"RestrictOperNicks", {{PARAM_SET, PARAM_RELOAD, &RestrictOperNicks}}},
+	{"AnonymousGlobal", {{PARAM_SET, PARAM_RELOAD, &AnonymousGlobal}}},
 	{"UseTS6", {{PARAM_SET, 0, &UseTS6}}},
-<<<<<<< HEAD:src/config.c
-	{"UnRestrictSAdmin", {{PARAM_SET, PARAM_RELOAD, &UnRestrictSAdmin}}},
-=======
 	{"UlineServers", {{PARAM_STRING, PARAM_RELOAD, &UlineServers}}},
->>>>>>> Remove UnRestrictSAdmin.:src/config.c
 };
 
 /*************************************************************************/
diff --git a/src/messages.c b/src/messages.c
index 1e4e8acf4..ece0a3cd4 100644
--- a/src/messages.c
+++ b/src/messages.c
@@ -318,7 +318,7 @@ int m_whois(const char *source, const char *who)
 			ircdproto->SendNumeric(ServerName, 317, source, "%s %ld %ld :seconds idle, signon time", bi->nick, time(NULL) - bi->lastmsg, start_time);
 			ircdproto->SendNumeric(ServerName, 318, source, "%s :End of /WHOIS list.", who);
 			return MOD_CONT;
-		} else if (!(ircd->svshold && UseSVSHOLD) && (na = findnick(who))
+		} else if (!ircd->svshold && (na = findnick(who))
 				   && (na->status & NS_KILL_HELD)) {
 			/* We have a nick enforcer client here that we need to respond to.
 			 * We can't just say it doesn't exist here, even tho it does for
diff --git a/src/nickserv.c b/src/nickserv.c
index 4bfbe9527..b2c95d469 100644
--- a/src/nickserv.c
+++ b/src/nickserv.c
@@ -840,7 +840,7 @@ void cancel_user(User * u)
 	if (na) {
 		if (na->status & NS_GUESTED) {
 			if (ircd->svshold) {
-				if (UseSVSHOLD) {
+				if (ircd->svshold) {
 					ircdproto->SendSVSHold(na->nick);
 				} else {
 					if (ircd->svsnick) {
@@ -1395,11 +1395,7 @@ void release(NickAlias * na, int from_timeout)
 	if (!from_timeout)
 		del_ns_timeout(na, TO_RELEASE);
 	if (ircd->svshold) {
-		if (UseSVSHOLD) {
-			ircdproto->SendSVSHoldDel(na->nick);
-		} else {
-			ircdproto->SendQuit(na->nick, NULL);
-		}
+		ircdproto->SendSVSHoldDel(na->nick);
 	} else {
 		ircdproto->SendQuit(na->nick, NULL);
 	}
diff --git a/src/protocol/inspircd11.c b/src/protocol/inspircd11.c
index d20801548..f66ef2f2b 100644
--- a/src/protocol/inspircd11.c
+++ b/src/protocol/inspircd11.c
@@ -109,7 +109,7 @@ IRCDVar myIrcd[] = {
 	 1,						 /* Chan Reg			 */
 	 CMODE_r,				   /* Channel Mode		 */
 	 1,						 /* vidents			  */
-	 0,						 /* svshold			  */
+	 1,						 /* svshold			  */
 	 0,						 /* time stamp on mode   */
 	 0,						 /* NICKIP			   */
 	 1,						 /* O:LINE			   */
diff --git a/src/protocol/inspircd12.cpp b/src/protocol/inspircd12.cpp
index 975c52bf5..4d5a314e0 100644
--- a/src/protocol/inspircd12.cpp
+++ b/src/protocol/inspircd12.cpp
@@ -109,7 +109,7 @@ IRCDVar myIrcd[] = {
 	 1,						 /* Chan Reg			 */
 	 CMODE_r,				   /* Channel Mode		 */
 	 1,						 /* vidents			  */
-	 0,						 /* svshold			  */
+	 1,						 /* svshold			  */
 	 0,						 /* time stamp on mode   */
 	 0,						 /* NICKIP			   */
 	 1,						 /* O:LINE			   */