X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_create.c;h=df2085e1415e3a61fff32391a3bc8cdf9916c45b;hb=refs%2Fheads%2Fupstream;hp=e27e56649fda939dd8fa0333a8b3d2ee49fa43f1;hpb=411df45b6a2410b07e62affaaa3e07a4e9d45e2d;p=ircu2.10.12-pk.git

diff --git a/ircd/m_create.c b/ircd/m_create.c
index e27e566..df2085e 100644
--- a/ircd/m_create.c
+++ b/ircd/m_create.c
@@ -160,7 +160,7 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     {
       /* Is the remote server confused? */
       if (find_member_link(chptr, sptr)) {
-        protocol_violation(sptr, "%s tried to CREATE a channel already joined", cli_name(sptr));
+        protocol_violation(sptr, "%s tried to CREATE a channel already joined (%s)", cli_name(sptr), chptr->chname);
         continue;
       }
 
@@ -172,7 +172,7 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 	      the fact that it was a zannel. The influence of this on a network
 	      that is completely 2.10.12.03 or higher is neglectable: Normally
 	      a server only sends a CREATE after first sending a DESTRUCT. Thus,
-	      by receiving a CREATE for a zannel one of two things happened:
+	      by receiving a CREATE for a zannel one of three things happened:
 	      1. The DESTRUCT was sent during a net.break; this could mean that
 	         our zannel is at the verge of expiring too, it should have been
 		 destructed. It is correct to copy the newer TS now, all modes
@@ -185,28 +185,45 @@ int ms_create(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 		 already left within the time span of a message propagation.
 		 The channel will therefore be less than 48 hours old and no
 		 'protection' is necessary.
+              3. The source server sent the CREATE while linking,
+                 before it got the BURST for our zannel.  If this
+                 happens, we should reset the channel back to the old
+                 timestamp.  This can be distinguished from case #1 by
+                 checking IsBurstOrBurstAck(cli_user(sptr)->server).
 	    */
 	   !(chptr->users == 0 && !chptr->mode.apass[0]))) {
-	modebuf_init(&mbuf, sptr, cptr, chptr,
-		     (MODEBUF_DEST_SERVER |  /* Send mode to server */
-		      MODEBUF_DEST_HACK2  |  /* Send a HACK(2) message */
-		      MODEBUF_DEST_BOUNCE)); /* And bounce the mode */
-
-	modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr, MAXOPLEVEL + 1);
-
-	modebuf_flush(&mbuf);
-
-	badop = 1;
+        if (!IsBurstOrBurstAck(cli_user(sptr)->server)) {
+          modebuf_init(&mbuf, sptr, cptr, chptr,
+                       (MODEBUF_DEST_SERVER |  /* Send mode to server */
+                        MODEBUF_DEST_HACK2  |  /* Send a HACK(2) message */
+                        MODEBUF_DEST_BOUNCE)); /* And bounce the mode */
+
+          modebuf_mode_client(&mbuf, MODE_ADD | MODE_CHANOP, sptr, MAXOPLEVEL + 1);
+
+          modebuf_flush(&mbuf);
+
+          badop = 1;
+        } else if (chanTS > chptr->creationtime + 4) {
+          /* If their handling of the BURST will lead to deopping the
+           * user, have the user join without getting ops (if the
+           * server's handling of the BURST keeps their ops, the channel
+           * will use our timestamp).
+           */
+          badop = 1;
+        }
+
+        if (badop)
+          joinbuf_join(&join, chptr, 0);
       }
     }
     else /* Channel doesn't exist: create it */
       chptr = get_channel(sptr, name, CGT_CREATE);
 
-    if (!badop) /* Set/correct TS */
+    if (!badop) {
+      /* Set (or correct) our copy of the TS */
       chptr->creationtime = chanTS;
-
-    joinbuf_join(badop ? &join : &create, chptr,
-		 (badop ? 0 : CHFL_CHANOP));
+      joinbuf_join(&create, chptr, CHFL_CHANOP);
+    }
   }
 
   joinbuf_flush(&join); /* flush out the joins and creates */