7 files changed, 8 insertions, 15 deletions
diff --git a/src/protocol/charybdis.c b/src/protocol/charybdis.c
index d559e0941..317753945 100644
--- a/src/protocol/charybdis.c
+++ b/src/protocol/charybdis.c
@@ -907,16 +907,9 @@ void charybdis_cmd_unsqline(char *user)
 void charybdis_cmd_join(char *user, char *channel, time_t chantime)
 {
     Uid *ud;
-    time_t tstosend;
-
-    /* Working around anope's TS brokenness, also making sure
-     * to *never* send an SJOIN with TS zero -- jilles */
-    if (chantime == 0 || chantime == time(NULL))
-        tstosend = 0x7FFFFFFF;
-    else
-        tstosend = chantime;
+
     ud = find_uid(user);
-    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) tstosend,
+    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime,
              channel, (UseTS6 ? (ud ? ud->uid : user) : user));
 }
 
diff --git a/src/protocol/hybrid.c b/src/protocol/hybrid.c
index 1f23a918c..0ceceb017 100644
--- a/src/protocol/hybrid.c
+++ b/src/protocol/hybrid.c
@@ -714,7 +714,7 @@ void hybrid_cmd_unsqline(char *user)
 
 void hybrid_cmd_join(char *user, char *channel, time_t chantime)
 {
-    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) time(NULL), channel,
+    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime, channel,
              user);
 }
 
diff --git a/src/protocol/plexus2.c b/src/protocol/plexus2.c
index 91d33c78d..4b6e19f37 100644
--- a/src/protocol/plexus2.c
+++ b/src/protocol/plexus2.c
@@ -866,7 +866,7 @@ plexus_cmd_unsqline (char *user)
 void
 plexus_cmd_join (char *user, char *channel, time_t chantime)
 {
-  send_cmd (ServerName, "SJOIN %ld %s + :%s", (long int) time (NULL), channel,
+  send_cmd (ServerName, "SJOIN %ld %s + :%s", (long int) chantime, channel,
 	    user);
 }
 
diff --git a/src/protocol/plexus3.c b/src/protocol/plexus3.c
index aa5a42c99..c2ac6a934 100644
--- a/src/protocol/plexus3.c
+++ b/src/protocol/plexus3.c
@@ -843,7 +843,7 @@ plexus_cmd_unsqline (char *user)
 void
 plexus_cmd_join (char *user, char *channel, time_t chantime)
 {
-  send_cmd (ServerName, "SJOIN %ld %s + :%s", (long int) time (NULL), channel,
+  send_cmd (ServerName, "SJOIN %ld %s + :%s", (long int) chantime, channel,
 	    user);
 }
 
diff --git a/src/protocol/ptlink.c b/src/protocol/ptlink.c
index 81b085fad..cdab41385 100644
--- a/src/protocol/ptlink.c
+++ b/src/protocol/ptlink.c
@@ -723,7 +723,7 @@ void ptlink_cmd_unsqline(char *user)
 
 void ptlink_cmd_join(char *user, char *channel, time_t chantime)
 {
-    send_cmd(ServerName, "SJOIN %ld %s + :%s", (long int) time(NULL),
+    send_cmd(ServerName, "SJOIN %ld %s + :%s", (long int) chantime,
              channel, user);
 }
 
diff --git a/src/protocol/ratbox.c b/src/protocol/ratbox.c
index 4f6e6267d..bd42a56c3 100644
--- a/src/protocol/ratbox.c
+++ b/src/protocol/ratbox.c
@@ -854,7 +854,7 @@ void ratbox_cmd_join(char *user, char *channel, time_t chantime)
     Uid *ud;
 
     ud = find_uid(user);
-    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) time(NULL),
+    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime,
              channel, (UseTS6 ? (ud ? ud->uid : user) : user));
 }
 
diff --git a/src/protocol/shadowircd.c b/src/protocol/shadowircd.c
index 54757c98b..fe887db7f 100644
--- a/src/protocol/shadowircd.c
+++ b/src/protocol/shadowircd.c
@@ -888,7 +888,7 @@ void shadowircd_cmd_join(char *user, char *channel, time_t chantime)
     Uid *ud;
 
     ud = find_uid(user);
-    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) time(NULL),
+    send_cmd(NULL, "SJOIN %ld %s + :%s", (long int) chantime,
              channel, (ud ? ud->uid : user));
 }