Refresh patch

[irc/quakenet/snircd-patchqueue.git] / remoteglinejupe.patch

diff --git a/remoteglinejupe.patch b/remoteglinejupe.patch
index 101692c83dff823174ffa413d31b267696c8349b..6994214acb582408932a9b79f4834bee2f7a2ff7 100644 (file)
--- a/remoteglinejupe.patch
+++ b/remoteglinejupe.patch
@@ -3,15 +3,15 @@ never gets a reply in case of succes
 
 this patch sends a copy of the snomask message shown to local opers to the remote source oper
 
-diff -r 8b3f6f6bcfd6 ircd/gline.c
---- a/ircd/gline.c     Fri Jan 30 17:04:05 2009 +0100
-+++ b/ircd/gline.c     Fri Jan 30 18:11:37 2009 +0100
-@@ -584,6 +584,18 @@
+diff -r 032bd91a5810 ircd/gline.c
+--- a/ircd/gline.c
++++ b/ircd/gline.c
+@@ -595,6 +595,18 @@
            flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : host,
-           expire + TSoffset, reason);
+           expire, reason);
  
 +  /* local gline set by remote user, inform oper of success */
-+  if ((flags & GLINE_LOCAL) && IsUser(sptr) && !MyUser(sptr))
++  if ((flags & GLINE_LOCAL) && IsUser(sptr) && !MyConnect(sptr))
 +    sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s adding local %s for %s%s%s%s%s, expiring at %Tu: %s",
 +                       sptr, cli_name(sptr),
 +                     (flags & GLINE_BADCHAN) ? "BADCHAN" : "GLINE",
@@ -25,30 +25,12 @@ diff -r 8b3f6f6bcfd6 ircd/gline.c
    /* make the gline */
    agline = make_gline(nick, user, host, reason, expire, lastmod, lifetime, flags);
  
-@@ -728,6 +740,17 @@
-           gline->gl_host ? gline->gl_host : "",
-           gline->gl_expire + TSoffset, gline->gl_reason);
- 
-+  /* local gline removed by remote user, inform oper of success */
-+  if ((flags & GLINE_LOCAL) && IsUser(sptr) && !MyUser(sptr))
-+    sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s %s %s for %s%s%s%s%s, expiring at %Tu: %s",
-+                       sptr, cli_name(sptr),
-+                     msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
-+                       GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : gline->gl_nick,
-+                       GlineIsBadChan(gline)|GlineIsRealName(gline) ? "" : "!",
-+                     gline->gl_user, gline->gl_host ? "@" : "",
-+                       gline->gl_host ? gline->gl_host : "",
-+                     gline->gl_expire + TSoffset, gline->gl_reason);
-+
-   if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
-     gline_propagate(cptr, sptr, gline);
- 
-@@ -972,6 +995,16 @@
+@@ -937,6 +949,16 @@
            gline->gl_host ? "@" : "", gline->gl_host ? gline->gl_host : "",
            buf);
  
 +  /* local change by remote user, inform oper of success */
-+  if ((action == GLINE_LOCAL_ACTIVATE || action == GLINE_LOCAL_DEACTIVATE) && IsUser(sptr) && !MyUser(sptr))
++  if ((action == GLINE_LOCAL_ACTIVATE || action == GLINE_LOCAL_DEACTIVATE) && IsUser(sptr) && !MyConnect(sptr))
 +    sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s modifying global %s for %s%s%s%s%s:%s",
 +                     sptr, cli_name(sptr),
 +                     GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
@@ -60,12 +42,12 @@ diff -r 8b3f6f6bcfd6 ircd/gline.c
    /* We'll be simple for this release, but we can update this to change
     * the propagation syntax on future updates
     */
-@@ -1020,6 +1053,16 @@
+@@ -984,6 +1006,16 @@
              gline->gl_user,
            gline->gl_host ? "@" : "", gline->gl_host ? gline->gl_host : "");
  
 +  /* local change by remote user, inform oper of success */
-+  if (IsUser(sptr) && !MyUser(sptr))
++  if (IsUser(sptr) && !MyConnect(sptr))
 +    sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s removing local %s for %s%s%s%s%s",
 +                     sptr, cli_name(sptr),
 +                     GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
@@ -77,9 +59,9 @@ diff -r 8b3f6f6bcfd6 ircd/gline.c
    gline_free(gline); /* get rid of the G-line */
  
    return 0; /* convenience return */
-diff -r 8b3f6f6bcfd6 ircd/jupe.c
---- a/ircd/jupe.c      Fri Jan 30 17:04:05 2009 +0100
-+++ b/ircd/jupe.c      Fri Jan 30 18:11:37 2009 +0100
+diff -r 032bd91a5810 ircd/jupe.c
+--- a/ircd/jupe.c
++++ b/ircd/jupe.c
 @@ -166,6 +166,20 @@
            flags & JUPE_LOCAL ? "local " : "", server, expire + TSoffset,
            reason);
@@ -88,7 +70,7 @@ diff -r 8b3f6f6bcfd6 ircd/jupe.c
 +  if (flags & JUPE_LOCAL) {
 +
 +    /* set by remote oper - inform them about the success */
-+    if (IsUser(sptr) && !MyUser(sptr))
++    if (IsUser(sptr) && !MyConnect(sptr))
 +      sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :%s adding local JUPE for %s, expiring at %Tu: %s",
 +        sptr, cli_name(sptr), server, expire + TSoffset, reason);
 +
@@ -109,7 +91,7 @@ diff -r 8b3f6f6bcfd6 ircd/jupe.c
 +  if (flags & JUPE_LOCAL) {
 +
 +    /* done by remote oper - inform them about the success */
-+    if (IsUser(sptr) && !MyUser(sptr))
++    if (IsUser(sptr) && !MyConnect(sptr))
 +      sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :% %s JUPE for %s, expiring at %Tu: %s",
 +        sptr, cli_name(sptr), JupeIsLocal(jupe) ? "removing local" : "locally deactivating",
 +        jupe->ju_server, jupe->ju_expire + TSoffset, jupe->ju_reason);