From 7201bb21a434670abbe361feebba3175b89955ca Mon Sep 17 00:00:00 2001
From: jilles <devnull@localhost>
Date: Wed, 28 Mar 2007 07:21:37 -0700
Subject: [PATCH] [svn] Merge old trunk r2212: Another handling of SJOINs
 without nicks: Propagate them if the channel is +P or the channel already
 existed, otherwise remove the channel again and do not propagate the SJOIN.

---
 ChangeLog              | 10 ++++++++++
 include/serno.h        |  2 +-
 modules/core/m_sjoin.c |  9 ++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d02b7ce..83e36fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+jilles      2007/03/28 13:49:57 UTC	(20070328-3287)
+  Log:
+  Remove channels entirely from /whois on services.
+  This cannot be overridden with operspy.
+  
+
+  Changes:	Modified:
+  +20 -17	trunk/modules/m_whois.c (File Modified) 
+
+
 jilles      2007/03/28 13:11:30 UTC	(20070328-3283)
   Log:
   Fix /who on channels with ** in their name.
diff --git a/include/serno.h b/include/serno.h
index 31e4cd5..93edded 100644
--- a/include/serno.h
+++ b/include/serno.h
@@ -1 +1 @@
-#define SERNO "20070328-3283"
+#define SERNO "20070328-3287"
diff --git a/modules/core/m_sjoin.c b/modules/core/m_sjoin.c
index 3682f22..00b420e 100644
--- a/modules/core/m_sjoin.c
+++ b/modules/core/m_sjoin.c
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
  *
- *  $Id: m_sjoin.c 3131 2007-01-21 15:36:31Z jilles $
+ *  $Id: m_sjoin.c 3289 2007-03-28 14:21:37Z jilles $
  */
 
 #include "stdinc.h"
@@ -50,7 +50,7 @@ struct Message sjoin_msgtab = {
 
 mapi_clist_av1 sjoin_clist[] = { &sjoin_msgtab, NULL };
 
-DECLARE_MODULE_AV1(sjoin, NULL, NULL, sjoin_clist, NULL, NULL, "$Revision: 3131 $");
+DECLARE_MODULE_AV1(sjoin, NULL, NULL, sjoin_clist, NULL, NULL, "$Revision: 3289 $");
 
 /*
  * ms_sjoin
@@ -556,10 +556,9 @@ ms_sjoin(struct Client *client_p, struct Client *source_p, int parc, const char
 				     CheckEmpty(para[2]), CheckEmpty(para[3]));
 	}
 
-	if(!joins && !(chptr->mode.mode & MODE_PERMANENT))
+	if(!joins && !(chptr->mode.mode & MODE_PERMANENT) && isnew)
 	{
-		if(isnew)
-			destroy_channel(chptr);
+		destroy_channel(chptr);
 
 		return 0;
 	}