r15908: Mention ncalrpc in smbtorture help output

Update smbtorture manpage with binding string format explanation
(This used to be commit 37f6dc130e697c840676c96aadc295bcde6a0bca)

2 files changed, 92 insertions, 2 deletions

diff --git a/source4/torture/man/smbtorture.1.xml b/source4/torture/man/smbtorture.1.xml
index 194c0d3fb9..18c1743566 100644
--- a/source4/torture/man/smbtorture.1.xml
+++ b/source4/torture/man/smbtorture.1.xml
@@ -40,7 +40,10 @@
 		<arg choice="opt">-s seed</arg>
 		<arg choice="opt">-f max_failures</arg>
 		<arg choice="opt">-X</arg>
-		TEST1 TEST2 ...
+		<arg choice="req">BINDING-STRING|UNC</arg>
+		<arg choice="req">TEST1</arg>
+		<arg choice="opt">TEST2</arg>
+		<arg choice="opt">...</arg>
 	</cmdsynopsis>
 	
 </refsynopsisdiv>
@@ -62,6 +65,90 @@
 	<para>If no arguments are specified at all, all available options 
 		and tests are listed.</para>
 
+	<refsect2>
+		<title>Binding string format</title>
+
+		<para>The binding string format is:</para>
+
+		<para>TRANSPORT:host[flags]</para>
+
+		<para>Where TRANSPORT is either ncacn_np for SMB, ncacn_ip_tcp for RPC/TCP or ncalrpc for local connections.
+		</para>
+
+		<para>
+		'host' is an IP or hostname or netbios name. If the binding string 
+		identifies the server side of an endpoint, 'host' may be an empty");
+	  	string.
+		</para>
+
+		<para>
+		'flags' can include a SMB pipe name if using the ncacn_np transport or
+		a TCP port number if using the ncacn_ip_tcp transport, otherwise they
+		will be auto-determined.
+		</para>
+
+		<para>
+		other recognised flags are:
+		</para>
+
+	  <variablelist>
+		  <varlistentry><term>sign</term>
+			  <listitem><para>enable ntlmssp signing</para></listitem>
+		  </varlistentry>
+
+		  <varlistentry><term>seal</term>
+			  <listitem><para>enable ntlmssp sealing</para></listitem>
+		  </varlistentry>
+
+		  <varlistentry><term>connect</term>
+			  <listitem><para>enable rpc connect level auth (auth, but no sign or seal)</para></listitem>
+		  </varlistentry>
+
+		  <varlistentry><term>validate</term>
+			  <listitem><para>enable the NDR validator</para></listitem>
+		  </varlistentry>
+
+		  <varlistentry><term>print</term>
+			  <listitem><para>enable debugging of the packets</para></listitem>
+		  </varlistentry>
+
+		  <varlistentry><term>bigendian</term>
+			  <listitem><para>use bigendian RPC</para></listitem>
+		  </varlistentry>
+
+		  <varlistentry><term>padcheck</term>
+			  <listitem><para>check reply data for non-zero pad bytes</para></listitem>
+		  </varlistentry>
+	  </variablelist>
+
+	  <para>For example, these all connect to the samr pipe:</para>
+
+	  <itemizedlist>
+	    <listitem><para>ncacn_np:myserver</para></listitem>
+	    <listitem><para>ncacn_np:myserver[samr]</para></listitem>
+	    <listitem><para>ncacn_np:myserver[\\pipe\\samr]</para></listitem>
+	    <listitem><para>ncacn_np:myserver[/pipe/samr]</para></listitem>
+	    <listitem><para>ncacn_np:myserver[samr,sign,print]</para></listitem>
+	    <listitem><para>ncacn_np:myserver[\\pipe\\samr,sign,seal,bigendian]</para></listitem>
+	    <listitem><para>ncacn_np:myserver[/pipe/samr,seal,validate]</para></listitem>
+	    <listitem><para>ncacn_np:</para></listitem>
+	    <listitem><para>ncacn_np:[/pipe/samr]</para></listitem>
+	    <listitem><para>ncacn_ip_tcp:myserver</para></listitem>
+	    <listitem><para>ncacn_ip_tcp:myserver[1024]</para></listitem>
+	    <listitem><para>ncacn_ip_tcp:myserver[1024,sign,seal]</para></listitem>
+	    <listitem><para>ncalrpc:</para></listitem>
+	  </itemizedlist>
+
+	</refsect2>
+
+	<refsect2>
+		<title>UNC Format</title>
+
+		<para>The UNC format is:</para>
+
+		<para>//server/share</para>
+	</refsect2>
+
 </refsect1>
 
 
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index 3ac7e2a762..08aa1e4931 100644
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -142,7 +142,8 @@ static void usage(poptContext pc)
 
 	printf("  TRANSPORT:host[flags]\n\n");
 
-	printf("  where TRANSPORT is either ncacn_np for SMB or ncacn_ip_tcp for RPC/TCP\n\n");
+	printf("  where TRANSPORT is either ncacn_np for SMB, ncacn_ip_tcp for RPC/TCP\n");
+	printf("  or ncalrpc for local connections.\n\n");
 
 	printf("  'host' is an IP or hostname or netbios name. If the binding string\n");
 	printf("  identifies the server side of an endpoint, 'host' may be an empty\n");
@@ -178,6 +179,8 @@ static void usage(poptContext pc)
 	printf("    ncacn_ip_tcp:myserver[1024]\n");
 	printf("    ncacn_ip_tcp:myserver[1024,sign,seal]\n\n");
 
+	printf("    ncalrpc:\n\n");
+
 	printf("The UNC format is:\n\n");
 
 	printf("  //server/share\n\n");