summaryrefslogtreecommitdiff
path: root/docs-xml/manpages-3
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-08-26 18:56:49 -0400
committerSimo Sorce <idra@samba.org>2008-08-26 18:56:49 -0400
commita1de4e988d7780f687bb7ed2288faf3dfbb9da71 (patch)
treeabc569f52f33efdf48135faf7f0c790601eef229 /docs-xml/manpages-3
parent5e7655fa27f7b2c9c54edfc25f86974dbdb23ea4 (diff)
parent95cc5ee395ab9d7f6f79d341ad20bc486c292a8d (diff)
downloadsamba-a1de4e988d7780f687bb7ed2288faf3dfbb9da71.tar.gz
samba-a1de4e988d7780f687bb7ed2288faf3dfbb9da71.tar.bz2
samba-a1de4e988d7780f687bb7ed2288faf3dfbb9da71.zip
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit e038f1cf9fb305fc1e7a4189208e451d30aaa1f0)
Diffstat (limited to 'docs-xml/manpages-3')
-rw-r--r--docs-xml/manpages-3/net.8.xml13
-rw-r--r--docs-xml/manpages-3/smbcontrol.1.xml17
2 files changed, 26 insertions, 4 deletions
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index cdf0fbbf60..31fe69d8d3 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -850,7 +850,20 @@ to run this against the PDC, from a Samba machine joined as a BDC. </para>
<para>Export users, aliases and groups from remote server to
local server. You need to run this against the PDC, from a Samba machine joined as a BDC.
</para>
+</refsect2>
+
+<refsect2>
+<title>RPC VAMPIRE KEYTAB</title>
+<para>Dump remote SAM database to local Kerberos keytab file.
+</para>
+</refsect2>
+
+<refsect2>
+<title>RPC VAMPIRE LDIF</title>
+
+<para>Dump remote SAM database to local LDIF file or standard output.
+</para>
</refsect2>
<refsect2>
diff --git a/docs-xml/manpages-3/smbcontrol.1.xml b/docs-xml/manpages-3/smbcontrol.1.xml
index d7c7751cbe..f8c31bb1b9 100644
--- a/docs-xml/manpages-3/smbcontrol.1.xml
+++ b/docs-xml/manpages-3/smbcontrol.1.xml
@@ -58,23 +58,32 @@
on STDIN. An empty command line or a "q" will quit the
program.</para></listitem>
</varlistentry>
-
+
<varlistentry>
<term>destination</term>
<listitem><para>One of <parameter>nmbd</parameter>, <parameter>smbd</parameter> or a process ID.</para>
+ <para>The <parameter>all</parameter> destination causes the
+ message to "broadcast" to all running daemons including nmbd and
+ winbind. This is a change for Samba 3.3, prior to this the
+ paramter smbd used to do this.</para>
+
<para>The <parameter>smbd</parameter> destination causes the
- message to "broadcast" to all smbd daemons.</para>
+ message to be sent to the smbd daemon specified in the
+ <filename>smbd.pid</filename> file.</para>
<para>The <parameter>nmbd</parameter> destination causes the
message to be sent to the nmbd daemon specified in the
<filename>nmbd.pid</filename> file.</para>
+ <para>The <parameter>winbindd</parameter> destination causes the
+ message to be sent to the winbind daemon specified in the
+ <filename>winbindd.pid</filename> file.</para>
+
<para>If a single process ID is given, the message is sent
to only that process.</para></listitem>
</varlistentry>
-
-
+
<varlistentry>
<term>message-type</term>
<listitem><para>Type of message to send. See