X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/f3d2fceb65693bd952ac4a9cae11d1831565098d..341504a70230b034cb36b0d24c5824be29e6b496:/doc/sgml/oper-guide/commands.sgml

diff --git a/doc/sgml/oper-guide/commands.sgml b/doc/sgml/oper-guide/commands.sgml
index b18807b..eabf734 100644
--- a/doc/sgml/oper-guide/commands.sgml
+++ b/doc/sgml/oper-guide/commands.sgml
@@ -42,8 +42,6 @@
 	    <arg>DNS</arg>
 	    <arg>MOTD</arg>
 	    <arg>OMOTD</arg>
-	    <arg>GLINES</arg>
-	    <arg>PGLINES</arg>
 	    <arg>TKLINES</arg>
 	    <arg>TDLINES</arg>
 	    <arg>TXLINES</arg>
@@ -83,18 +81,6 @@
 	      <para>Reload the operator MOTD file</para>
 	    </listitem>
 	  </varlistentry>
-	  <varlistentry>
-	    <term>GLINES</term>
-	    <listitem>
-	      <para>Clears G:lines.</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>PGLINES</term>
-	    <listitem>
-	      <para>Clears pending G:lines.</para>
-	    </listitem>
-	  </varlistentry>
 	  <varlistentry>
 	    <term>TKLINES</term>
 	    <listitem>
@@ -412,6 +398,7 @@
 	  <command>DLINE</command>
 	  <arg><replaceable>length</replaceable></arg>
 	  <arg choice=plain><replaceable>a</replaceable>.<replaceable>b</replaceable>.<replaceable>c</replaceable>.<replaceable>d</replaceable></arg>
+	  <arg>ON <replaceable>servername</replaceable></arg>
 	  <arg>:<replaceable>reason</replaceable></arg>
 	</cmdsynopsis>
 	<para>
@@ -438,7 +425,10 @@
 	  connections.
 	</para>
 	<para>
-	  D:lines cannot be set remotely on other servers.
+	  If the ON part is specified, the D:line is set on servers matching
+	  the given mask (provided a matching shared{} block exists there,
+	  which is not the case by default).
+	  Otherwise, the D:Line will be set on the local server only.
 	</para>
 	<para>
 	  Only exempt{} blocks exempt from D:lines.
@@ -451,52 +441,13 @@
 	<cmdsynopsis>
 	  <command>UNDLINE</command>
 	  <arg choice=plain><replaceable>a.b.c.d</replaceable></arg>
+	  <arg>ON <replaceable>servername</replaceable></arg>
 	</cmdsynopsis>
 	<para>
 	  Will attempt to remove a D:line from <filename>dline.conf</filename>, and will flush
 	  a temporary D:line.
 	</para>
       </sect2>
-      <sect2>
-	<title>GLINE</title>
-	<cmdsynopsis>
-	  <command>GLINE</command>
-	  <group>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>host</replaceable></arg>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>a</replaceable>.<replaceable>b</replaceable>.<replaceable>c</replaceable>.<replaceable>d</replaceable></arg>
-	  </group>
-	  <arg choice=plain>:<replaceable>reason</replaceable></arg>
-	</cmdsynopsis>
-	<para>
-	  Attempts to add a network-wide ban for the given mask.
-	  It takes three different opers on three different servers
-	  requesting the same G:line to have it triggered for a configured
-	  time.
-	</para>
-	<para>
-	  Once triggered, a G:line is similar to a temporary K:line on
-	  each server. No further propagation or on-disk storage is done.
-	</para>
-	<note><para>
-	  This command can be enabled or disabled in the configuration file.
-	  If it is disabled, no oper on the server can issue a G:line and no
-	  G:lined user is banned, but G:lines are still propagated to other
-	  servers which may have G:lines enabled.
-	</para></note>
-      </sect2>
-      <sect2>
-	<title>UNGLINE</title>
-	<cmdsynopsis>
-	  <command>UNGLINE</command>
-	  <group>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>host</replaceable></arg>
-	    <arg choice=plain><replaceable>user</replaceable>@<replaceable>a</replaceable>.<replaceable>b</replaceable>.<replaceable>c</replaceable>.<replaceable>d</replaceable></arg>
-	  </group>
-	</cmdsynopsis>
-	<para>
-	  Removes the given G:line on this server.
-	</para>
-      </sect2>
       <sect2>
 	<title>TESTGECOS</title>
 	<cmdsynopsis>
@@ -518,7 +469,7 @@
 	  </group>
 	</cmdsynopsis>
 	<para>
-	  Looks up the given hostmask or IP address and reports back on any auth{} blocks, D:, G:, or K: lines found.
+	  Looks up the given hostmask or IP address and reports back on any auth{} blocks, D: or K: lines found.
 	  If <replaceable>nick</replaceable> is given, also searches for
 	  nick resvs.
 	</para>
@@ -680,6 +631,27 @@
 	  no target is specified.
 	</para>
       </sect2>
+      <sect2>
+	<title>PRIVS</title>
+	<cmdsynopsis>
+	  <command>PRIVS</command>
+	  <arg><replaceable>nick</replaceable></arg>
+	</cmdsynopsis>
+	<para>
+	  Displays effective operator privileges for
+	  the specified nick, or for yourself if no nick is
+	  given. This includes all privileges from the operator
+	  block, the name of the operator block and those
+	  privileges from the auth block that have an effect
+	  after the initial connection.
+	</para>
+	<para>
+	  The exact output depends on the server the nick is on,
+	  see the matching version of this document.
+	  If the remote server does not support this extension, you will not
+	  receive a reply.
+	</para>
+      </sect2>
       <sect2>
         <title>MASKTRACE</title>
         <cmdsynopsis>
@@ -898,18 +870,6 @@
 	      <para>Show file descriptors</para>
 	    </listitem>
 	  </varlistentry>
-	  <varlistentry>
-	    <term>g</term>
-	    <listitem>
-	      <para>Show pending glines</para>
-	    </listitem>
-	  </varlistentry>
-	  <varlistentry>
-	    <term>G</term>
-	    <listitem>
-	      <para>Show active glines</para>
-	    </listitem>
-	  </varlistentry>
 	  <varlistentry>
 	    <term>h</term>
 	    <listitem>
@@ -925,13 +885,13 @@
 	  <varlistentry>
 	    <term>k</term>
 	    <listitem>
-	      <para>Show temporary K:lines, or matched temporary K:lines</para>
+	      <para>Show temporary K:lines, or matched K:lines</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>K</term>
 	    <listitem>
-	      <para>Show permanent K:lines, or matched permanent K:lines</para>
+	      <para>Show permanent K:lines, or matched K:lines</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -940,8 +900,9 @@
 	      <para>
 		Show hostname and link information about the given nick.
 		With a server name, show information about opers and servers
-		on that server; opers also get information about all local users
-		if they query their own server.
+		on that server; opers get information about all local
+		connections if they query their own server.
+		No hostname is shown for server connections.
 	      </para>
 	    </listitem>
 	  </varlistentry>
@@ -960,7 +921,7 @@
 	  <varlistentry>
 	    <term>n</term>
 	    <listitem>
-	      <para>Show blacklist blocks (DNS blacklists) with hit counts.</para>
+	      <para>Show blacklist blocks (DNS blacklists) with hit counts since last rehash and (parenthesized) reference counts. The reference count shows how many clients are waiting on a lookup of this blacklist or have been found and are waiting on registration to complete.</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -978,19 +939,19 @@
 	  <varlistentry>
 	    <term>P</term>
 	    <listitem>
-	      <para>Show listen blocks</para>
+	      <para>Show listen blocks (ports)</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>q</term>
 	    <listitem>
-	      <para>Show temporarily resv'ed nicks and channels</para>
+	      <para>Show temporarily resv'ed nicks and channels with hit counts</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>Q</term>
 	    <listitem>
-	      <para>Show permanently resv'ed nicks and channels</para>
+	      <para>Show permanently resv'ed nicks and channels with hit counts since last rehash bans</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -1002,7 +963,7 @@
 	  <varlistentry>
 	    <term>t</term>
 	    <listitem>
-	      <para>Show generic server statistics</para>
+	      <para>Show generic server statistics about local connections</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -1026,13 +987,13 @@
 	  <varlistentry>
 	    <term>x</term>
 	    <listitem>
-	      <para>Show temporary X:lines</para>
+	      <para>Show temporary X:lines with hit counts</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
 	    <term>X</term>
 	    <listitem>
-	      <para>Show permanent X:lines</para>
+	      <para>Show permanent X:lines with hit counts since last rehash bans</para>
 	    </listitem>
 	  </varlistentry>
 	  <varlistentry>
@@ -1056,7 +1017,7 @@
 	  <varlistentry>
 	    <term>?</term>
 	    <listitem>
-	      <para>Show connected servers and sendq information about them</para>
+	      <para>Show connected servers and link information about them</para>
 	    </listitem>
 	  </varlistentry>
 	</variablelist>