Patch to allow jupe on all bar uplink and self. Thanks Adam. (Bug #1076)

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

16 files changed, 33 insertions, 1 deletions

diff --git a/include/services.h b/include/services.h
index 11a909c40..79ff66635 100644
--- a/include/services.h
+++ b/include/services.h
@@ -851,6 +851,7 @@ struct server_ {
 
 #define SERVER_ISME  0x0001
 #define SERVER_JUPED 0x0002
+#define SERVER_ISUPLINK	0x0004
 
 /*************************************************************************/
 
diff --git a/lang/cat.l b/lang/cat.l
index 3d948e758..ec1076698 100644
--- a/lang/cat.l
+++ b/lang/cat.l
@@ -2953,6 +2953,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Please use a valid server name when juping
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/de.l b/lang/de.l
index df61390a8..994c522f3 100644
--- a/lang/de.l
+++ b/lang/de.l
@@ -2919,6 +2919,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Benutze bitte einen gültigen hostnamen, wenn du jupiterst
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/en_us.l b/lang/en_us.l
index ed942d942..1b42e39db 100644
--- a/lang/en_us.l
+++ b/lang/en_us.l
@@ -2865,6 +2865,8 @@ OPER_JUPE_SYNTAX
 	JUPE servername [reason]
 OPER_JUPE_HOST_ERROR
 	Please use a valid server name when juping
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/es.l b/lang/es.l
index 737ac9fee..13f415686 100644
--- a/lang/es.l
+++ b/lang/es.l
@@ -2926,6 +2926,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Por favor usa un nombre de servidor valido cuando use JUPE
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/fr.l b/lang/fr.l
index ea16bded1..92a8693a7 100644
--- a/lang/fr.l
+++ b/lang/fr.l
@@ -2976,6 +2976,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Veuillez indiquer un nom de serveur valide pour JUPE.
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/gr.l b/lang/gr.l
index 9ea99dca4..16a0851b9 100644
--- a/lang/gr.l
+++ b/lang/gr.l
@@ -2956,6 +2956,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Please use a valid server name when juping
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/hun.l b/lang/hun.l
index e437f49a6..4025ee3fa 100644
--- a/lang/hun.l
+++ b/lang/hun.l
@@ -2915,6 +2915,8 @@ OPER_JUPE_SYNTAX
 	JUPE szervernév [leírás]
 OPER_JUPE_HOST_ERROR
 	Kérlek használj érvényes szerver nevet amikor jupolsz!
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 
 # RAW válaszok
 OPER_RAW_SYNTAX
diff --git a/lang/it.l b/lang/it.l
index 25b86ab41..a76051ab4 100644
--- a/lang/it.l
+++ b/lang/it.l
@@ -2879,6 +2879,8 @@ OPER_JUPE_SYNTAX
 	JUPE nomeserver [motivo]
 OPER_JUPE_HOST_ERROR
 	Prego utilizzare un nome server valido per jupe
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/nl.l b/lang/nl.l
index aae966ebe..d12b6c78a 100644
--- a/lang/nl.l
+++ b/lang/nl.l
@@ -2925,6 +2925,8 @@ OPER_JUPE_SYNTAX
 	JUPE servername [reden]
 OPER_JUPE_HOST_ERROR
 	Gebruik een geldige servernaam bij het jupen
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/pl.l b/lang/pl.l
index 218e5c1c1..db53c9b79 100644
--- a/lang/pl.l
+++ b/lang/pl.l
@@ -3868,6 +3868,8 @@ OPER_JUPE_SYNTAX
 
 OPER_JUPE_HOST_ERROR
 	Proszê u¿yæ prawid³owej nazwy serwera.
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/pt.l b/lang/pt.l
index 44bd465a2..74008ba2b 100644
--- a/lang/pt.l
+++ b/lang/pt.l
@@ -2891,6 +2891,8 @@ OPER_JUPE_SYNTAX
 	JUPE servidor [motivo]
 OPER_JUPE_HOST_ERROR
 	Por favor, use um nome de servidor válido quando estiver "jupando".
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/ru.l b/lang/ru.l
index 0d679c9b8..700fb37ed 100644
--- a/lang/ru.l
+++ b/lang/ru.l
@@ -2862,6 +2862,8 @@ OPER_JUPE_SYNTAX
 	JUPE èìÿ_ñåðâåðà [ïðè÷èíà]
 OPER_JUPE_HOST_ERROR
 	 êà÷åñòâå îñíîâíîãî ïàðàìåòðà âû äîëæíû óêàçàòü ðåàëüíîå èìÿ ñåðåâåðà 
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/lang/tr.l b/lang/tr.l
index 3673af1e9..7a1d2f3b0 100644
--- a/lang/tr.l
+++ b/lang/tr.l
@@ -2950,6 +2950,8 @@ OPER_JUPE_SYNTAX
 # RAW responses
 OPER_JUPE_HOST_ERROR
 	Please use a valid server name when juping
+OPER_JUPE_INVALID_SERVER
+	You can not jupe your services server or your uplink server.
 	
 # RAW responses
 OPER_RAW_SYNTAX
diff --git a/src/core/os_jupe.c b/src/core/os_jupe.c
index f25977f5e..2b6146d64 100644
--- a/src/core/os_jupe.c
+++ b/src/core/os_jupe.c
@@ -74,8 +74,11 @@ int do_jupe(User * u)
     if (!jserver) {
         syntax_error(s_OperServ, u, "JUPE", OPER_JUPE_SYNTAX);
     } else {
+		Server *server = findserver(servlist, jserver);
         if (!isValidHost(jserver, 3)) {
             notice_lang(s_OperServ, u, OPER_JUPE_HOST_ERROR);
+		} else if (server && ((server->flags & SERVER_ISME) || (server->flags & SERVER_ISUPLINK))) {
+			notice_lang(s_OperServ, u, OPER_JUPE_INVALID_SERVER);
         } else {
             anope_cmd_jupe(jserver, u->nick, reason);
 
diff --git a/src/servers.c b/src/servers.c
index 08391e823..8aa5b2a12 100644
--- a/src/servers.c
+++ b/src/servers.c
@@ -155,8 +155,10 @@ Server *new_server(Server * uplink, const char *name, const char *desc,
         uplink->links = serv;
     }
     /* Check if this is our uplink server */
-    if ((uplink == me_server) && !(flags & SERVER_JUPED))
+	if ((uplink == me_server) && !(flags & SERVER_JUPED)) {
         serv_uplink = serv;
+		serv->flags |= SERVER_ISUPLINK;
+	}
 
     /* Write the StartGlobal (to non-juped servers) */
     if (GlobalOnCycle && GlobalOnCycleUP && !(flags & SERVER_JUPED))