BUILD : 1.7.19 (1249) BUGS : 726 NOTES : Fixed some jupe stuff: when juping a currently non-existing server, it was still squitted and the globaloncycleup message was sent to newly juped servers

git-svn-id: svn://svn.anope.org/anope/trunk@1249 31f1291d-b8d6-0310-a050-a5561fc1590b


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

Changes

@@ -1,5 +1,7 @@
 Anope Version  S V N
 --------------------
+06/15 F Non-existing servers being SQUIT'd when they were juped.          [#726]
+06/15 F Back online notice being sent to juped servers.                   [#726]
 
 Anope Version 1.7.19
 --------------------

src/protocol/bahamut.c

@@ -266,7 +266,7 @@ unsigned long umodes[128] = {
     UMODE_y,                    /* y */
     0,                          /* z */
     0, 0, 0,                    /* { | } */
-    0, 0                        /* ~ ‚ */
+    0, 0                        /* ~ � */
 };
 
 char myCsmodes[128] = {
@@ -1504,7 +1504,8 @@ void bahamut_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    bahamut_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        bahamut_cmd_squit(jserver, rbuf);
     bahamut_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/charybdis.c

@@ -1818,7 +1818,8 @@ void charybdis_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    charybdis_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        charybdis_cmd_squit(jserver, rbuf);
     charybdis_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/dreamforge.c

@@ -1215,7 +1215,8 @@ void dreamforge_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    dreamforge_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        dreamforge_cmd_squit(jserver, rbuf);
     dreamforge_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/hybrid.c

@@ -1394,7 +1394,8 @@ void hybrid_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    hybrid_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        hybrid_cmd_squit(jserver, rbuf);
     hybrid_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/inspircd10.c

@@ -1554,7 +1554,8 @@ void inspircd_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    inspircd_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        inspircd_cmd_squit(jserver, rbuf);
     inspircd_cmd_server(jserver, 1, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/inspircd11.c

@@ -1646,7 +1646,8 @@ void inspircd_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    inspircd_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        inspircd_cmd_squit(jserver, rbuf);
     inspircd_cmd_server(jserver, 1, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/plexus2.c

@@ -1707,7 +1707,8 @@ plexus_cmd_jupe (char *jserver, char *who, char *reason)
   snprintf (rbuf, sizeof (rbuf), "Juped by %s%s%s", who,
 	    reason ? ": " : "", reason ? reason : "");
 
-  plexus_cmd_squit (jserver, rbuf);
+  if (findserver(servlist, jserver))
+    plexus_cmd_squit (jserver, rbuf);
   plexus_cmd_server (jserver, 2, rbuf);
   new_server (me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/plexus3.c

@@ -1684,7 +1684,8 @@ plexus_cmd_jupe (char *jserver, char *who, char *reason)
   snprintf (rbuf, sizeof (rbuf), "(H) Juped by %s%s%s", who,
 	    reason ? ": " : "", reason ? reason : "");
 
-  plexus_cmd_squit (jserver, rbuf);
+  if (findserver(servlist, jserver))
+    plexus_cmd_squit (jserver, rbuf);
   plexus_cmd_server (jserver, 2, rbuf);
   new_server (me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/ptlink.c

@@ -1574,7 +1574,8 @@ void ptlink_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    ptlink_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        ptlink_cmd_squit(jserver, rbuf);
     ptlink_cmd_server(jserver, 1, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/rageircd.c

@@ -1507,7 +1507,8 @@ void rageircd_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    rageircd_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        rageircd_cmd_squit(jserver, rbuf);
     rageircd_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/ratbox.c

@@ -1725,7 +1725,8 @@ void ratbox_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    ratbox_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        ratbox_cmd_squit(jserver, rbuf);
     ratbox_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/shadowircd.c

@@ -1679,7 +1679,8 @@ void shadowircd_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    shadowircd_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        shadowircd_cmd_squit(jserver, rbuf);
     shadowircd_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/solidircd.c

@@ -1540,7 +1540,8 @@ void solidircd_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    solidircd_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        solidircd_cmd_squit(jserver, rbuf);
     solidircd_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/ultimate2.c

@@ -1565,7 +1565,8 @@ void ultimate2_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    ultimate2_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        ultimate2_cmd_squit(jserver, rbuf);
     ultimate2_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/ultimate3.c

@@ -1648,7 +1648,8 @@ void ultimate3_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    ultimate3_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        ultimate3_cmd_squit(jserver, rbuf);
     ultimate3_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/unreal31.c

@@ -1416,7 +1416,8 @@ void unreal_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    unreal_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        unreal_cmd_squit(jserver, rbuf);
     unreal_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/unreal32.c

@@ -1800,7 +1800,8 @@ void unreal_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    unreal_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        unreal_cmd_squit(jserver, rbuf);
     unreal_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/protocol/viagra.c

@@ -1547,7 +1547,8 @@ void viagra_cmd_jupe(char *jserver, char *who, char *reason)
     snprintf(rbuf, sizeof(rbuf), "Juped by %s%s%s", who,
              reason ? ": " : "", reason ? reason : "");
 
-    viagra_cmd_squit(jserver, rbuf);
+    if (findserver(servlist, jserver))
+        viagra_cmd_squit(jserver, rbuf);
     viagra_cmd_server(jserver, 2, rbuf);
     new_server(me_server, jserver, rbuf, SERVER_JUPED, NULL);
 }

src/servers.c

@@ -158,11 +158,9 @@ Server *new_server(Server * uplink, const char *name, const char *desc,
     if ((uplink == me_server) && !(flags & SERVER_JUPED))
         serv_uplink = serv;
 
-    /* Write the StartGlobal */
-    if (GlobalOnCycle) {
-        if (GlobalOnCycleUP)
-            notice_server(s_GlobalNoticer, serv, "%s", GlobalOnCycleUP);
-    }
+    /* Write the StartGlobal (to non-juped servers) */
+    if (GlobalOnCycle && GlobalOnCycleUP && !(flags & SERVER_JUPED))
+        notice_server(s_GlobalNoticer, serv, "%s", GlobalOnCycleUP);
 
     return serv;
 }

version.log

@@ -9,10 +9,14 @@ VERSION_MAJOR="1"
 VERSION_MINOR="7"
 VERSION_PATCH="19"
 VERSION_EXTRA="-svn"
-VERSION_BUILD="1248"
+VERSION_BUILD="1249"
 
 # $Log$
 #
+# BUILD : 1.7.19 (1249)
+# BUGS  : 726
+# NOTES : Fixed some jupe stuff: when juping a currently non-existing server, it was still squitted and the globaloncycleup message was sent to newly juped servers
+#
 # BUILD : 1.7.19 (1248)
 # BUGS  : 
 # NOTES : Development Framework