Make SCAN UMODES GLOBAL NO-LIST MASK <mask> no longer an operspy command.

This agrees with allowing MODE <nick> as non-operspy.

diff --git a/doc/sgml/oper-guide/commands.sgml b/doc/sgml/oper-guide/commands.sgml
index 4b615d129f5af5dae7174eec7cd35aa25a669da2..6654cd23a1306cba76ddc222b7c79e723fb2f935 100644 (file)
--- a/doc/sgml/oper-guide/commands.sgml
+++ b/doc/sgml/oper-guide/commands.sgml
@@ -809,7 +809,7 @@
          is hidden (auth{} spoof).
        </para>
        <para>
          is hidden (auth{} spoof).
        </para>
        <para>

-         Network searches where a listing is given or the mask option is used
+         Network searches where a listing is given

          are operspy commands.
         </para>
       </sect2>
          are operspy commands.
         </para>
       </sect2>

diff --git a/help/opers/scan b/help/opers/scan
index bca25248b82d9225db18575962152d41561b1c35..5b0f764fd2040d3d275bdf6a8d9fd5f3a45cfbf6 100644 (file)
--- a/help/opers/scan
+++ b/help/opers/scan
@@ -12,5 +12,5 @@ nick!user@host mask to be selected. Only the displayed host
 is considered, not the IP address or real host behind
 dynamic spoofs.
 
 is considered, not the IP address or real host behind
 dynamic spoofs.
 

-Network searches where a listing is given or the MASK option
-is used are operspy commands.
+Network searches where a listing is given are operspy
+commands.

diff --git a/modules/m_scan.c b/modules/m_scan.c
index 23a64b35291c50a5f885c6aabb43d9157dc580c7..f0ce7d870543c7fdbbabd85ff0744c9a647a14b7 100644 (file)
--- a/modules/m_scan.c
+++ b/modules/m_scan.c
@@ -172,7 +172,7 @@ scan_umodes(struct Client *client_p, struct Client *source_p, int parc,
                                mask = parv[++i];
                }
        }
                                mask = parv[++i];
                }
        }

-       if (target_list == &global_client_list && (list_users || mask))
+       if (target_list == &global_client_list && list_users)

        {
                if (IsOperSpy(source_p))
                {
        {
                if (IsOperSpy(source_p))
                {