--- Unreal3.2/src/modules/m_list.c	Fri Jun 16 18:29:16 2006
+++ Unreal3.2/src/modules/m_list.c	Sat Jun 17 15:19:18 2006
@@ -269,7 +269,11 @@
 			  else	/* Just a normal channel */
 			  {
 				  chptr = find_channel(name, NullChn);
+#ifdef SHOW_SECRET
 				  if (chptr && (ShowChannel(sptr, chptr) || IsAnOper(sptr))) {
+#else
+				  if (chptr && (ShowChannel(sptr, chptr) || IsNetAdmin(sptr))) {
+#endif
 #ifdef LIST_SHOW_MODES
 					modebuf[0] = '[';
 					channel_modes(sptr, &modebuf[1], parabuf, chptr);
@@ -364,7 +368,11 @@
 			{
 				if (SecretChannel(chptr)
 				    && !IsMember(cptr, chptr)
+#ifdef SHOW_SECRET
 				    && !IsAnOper(cptr))
+#else
+				    && !IsNetAdmin(cptr))
+#endif
 					continue;
 
 				/* Much more readable like this -- codemastr */
@@ -405,7 +413,11 @@
 				else
 					strlcat(modebuf, "]", sizeof modebuf);
 #endif
+#ifdef SHOW_SECRET
 				if (!IsAnOper(cptr))
+#else
+				if (!IsNetAdmin(cptr))
+#endif
 					sendto_one(cptr,
 					    rpl_str(RPL_LIST), me.name,
 					    cptr->name,
--- Unreal3.2/src/modules/m_names.c	Fri Jun 16 18:29:16 2006
+++ Unreal3.2/src/modules/m_names.c	Sat Jun 17 15:21:53 2006
@@ -126,7 +126,11 @@
 
 	chptr = find_channel(para, (aChannel *)NULL);
 
+#ifdef SHOW_SECRET
 	if (!chptr || (!ShowChannel(sptr, chptr) && !IsAnOper(sptr)))
+#else
+	if (!chptr || (!ShowChannel(sptr, chptr) && !IsNetAdmin(sptr)))
+#endif
 	{
 		sendto_one(sptr, rpl_str(RPL_ENDOFNAMES), me.name,
 		    parv[0], para);
--- Unreal3.2/src/modules/m_topic.c	Fri Jun 16 18:29:17 2006
+++ Unreal3.2/src/modules/m_topic.c	Sat Jun 17 15:33:56 2006
@@ -146,7 +146,11 @@
 		if (parc > 2 || SecretChannel(chptr))
 		{
 			if (!ismember && !IsServer(sptr)
+#ifdef SHOW_SECRET
 			    && !IsOper(sptr) && !IsULine(sptr))
+#else
+			    && !IsNetAdmin(sptr) && !IsULine(sptr))
+#endif
 			{
 				sendto_one(sptr, err_str(ERR_NOTONCHANNEL),
 				    me.name, parv[0], name);
--- Unreal3.2/src/modules/m_who.c	Fri Jun 16 18:29:17 2006
+++ Unreal3.2/src/modules/m_who.c	Sat Jun 17 15:24:38 2006
@@ -796,7 +796,11 @@
 			cansee = 0;
 		if (!cansee)
 		{
+#ifdef SHOW_SECRET
 			if (IsAnOper(sptr))
+#else
+			if (IsNetAdmin(sptr))
+#endif
 				*flg |= FVC_HIDDEN;
 			else
 				continue;
--- Unreal3.2/src/modules/m_whois.c	Fri Jun 16 18:29:17 2006
+++ Unreal3.2/src/modules/m_whois.c	Sat Jun 17 15:29:46 2006
@@ -210,7 +210,7 @@
 				if (ShowChannel(sptr, chptr))
 					showchannel = 1;
 #ifndef SHOW_SECRET
-				if (IsAnOper(sptr) && !SecretChannel(chptr))
+				if (IsNetAdmin(sptr))
 #else
 				if (IsAnOper(sptr))
 #endif
--- Unreal3.2/src/modules/webtv.c	Fri Jun 16 18:29:17 2006
+++ Unreal3.2/src/modules/webtv.c	Sat Jun 17 15:32:40 2006
@@ -214,7 +214,11 @@
 				if (!invis && HiddenChannel(chptr) &&
 				    !SecretChannel(chptr))
 					showperson = 1;
+#ifdef SHOW_SECRET
 				else if (IsAnOper(sptr) && SecretChannel(chptr)) {
+#else
+				else if (IsNetAdmin(sptr) && SecretChannel(chptr)) {
+#endif
 					showperson = 1;
 					showsecret = 1;
 				}
@@ -267,7 +271,7 @@
 				if (ShowChannel(sptr, chptr))
 					showchannel = 1;
 #ifndef SHOW_SECRET
-				if (IsAnOper(sptr) && !SecretChannel(chptr))
+				if (IsNetAdmin(sptr))
 #else
 				if (IsAnOper(sptr))
 #endif