From f5baa63cce34aece6ec204f6f9ddcfe776a7d5e1 Mon Sep 17 00:00:00 2001
From: codemastr <devnull@localhost>
Date: Sat, 8 Mar 2003 17:41:04 +0000
Subject: [PATCH] Fixed a /list bug with +s channels and opers

---
 Changes       | 2 ++
 src/channel.c | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Changes b/Changes
index c06012db7..2608d625c 100644
--- a/Changes
+++ b/Changes
@@ -1962,3 +1962,5 @@ seen. gmtime warning still there
 - Fixed a buffer overflow that could be used against setuid setups, 
   found by rave@dtors.net, reported by kokanin
 - Disabled CMDLINE_CONFIG(-f) by default
+- Fixed a bug in /list where opers could not see +s channels when doing /list #channel. 
+  Reported by _SciFi_ (#0000762)
diff --git a/src/channel.c b/src/channel.c
index 00d319603..be39f5f4b 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -4223,7 +4223,7 @@ CMD_FUNC(m_list)
 			  else	/* Just a normal channel */
 			  {
 				  chptr = find_channel(name, NullChn);
-				  if (chptr && ShowChannel(sptr, chptr)) {
+				  if (chptr && (ShowChannel(sptr, chptr) || IsAnOper(sptr))) {
 #ifdef LIST_SHOW_MODES
 					modebuf[0] = '[';
 					channel_modes(sptr, &modebuf[1], parabuf, chptr);
@@ -4235,12 +4235,9 @@ CMD_FUNC(m_list)
 					  sendto_one(sptr,
 					      rpl_str(RPL_LIST),
 					      me.name, parv[0],
-					      ShowChannel(sptr,
-					      chptr) ? name : "*",
-					      chptr->users,
+					      name, chptr->users,
 #ifdef LIST_SHOW_MODES
-					      ShowChannel(sptr, chptr) ?
-					      modebuf : "",
+					      modebuf,
 #endif
 					      (chptr->topic ? chptr->topic :
 					      ""));