Author: Alex Badea <vampire@p16.pub.ro>

[ircu2.10.12-pk.git] / ircd / m_who.c

diff --git a/ircd/m_who.c b/ircd/m_who.c
index 271946b748279209f256abed6d9e1d6188cabf26..cb8bf65e2680623580b3417b669d4b52af18a74f 100644 (file)
--- a/ircd/m_who.c
+++ b/ircd/m_who.c
@@ -204,10 +204,7 @@ int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
           continue;
         case 's':
         case 'S':
-#ifdef HEAD_IN_SAND_WHO_SERVERNAME
-          if (IsAnOper(sptr))
-#endif
-            matchsel |= WHO_FIELD_SER;
+          matchsel |= WHO_FIELD_SER;
           continue;
         case 'r':
         case 'R':
@@ -253,10 +250,7 @@ int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
             break;
           case 's':
           case 'S':
-#ifdef HEAD_IN_SAND_WHO_SERVERNAME
-            if (IsAnOper(sptr))
-#endif
-              fields |= WHO_FIELD_SER;
+            fields |= WHO_FIELD_SER;
             break;
           case 't':
           case 'T':
@@ -279,6 +273,11 @@ int m_who(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (!fields)
     counter = 7;
 
+#ifdef HEAD_IN_SAND_WHO_SERVERNAME
+  if (!IsAnOper(sptr))
+    matchsel &= ~WHO_FIELD_SER;
+#endif
+
   if (qrt && (fields & WHO_FIELD_QTY))
   {
     p = qrt;