diff options
Diffstat (limited to 'docs-xml')
| -rw-r--r-- | docs-xml/manpages-3/net.8.xml | 13 | ||||
| -rw-r--r-- | docs-xml/manpages-3/smbcontrol.1.xml | 17 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/logon/initlogondelay.xml | 15 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/logon/initlogondelayedhosts.xml | 21 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/winbind/idmapcachetime.xml | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml | 15 |
6 files changed, 78 insertions, 5 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 diff --git a/docs-xml/smbdotconf/logon/initlogondelay.xml b/docs-xml/smbdotconf/logon/initlogondelay.xml new file mode 100644 index 0000000000..de8b19ecf5 --- /dev/null +++ b/docs-xml/smbdotconf/logon/initlogondelay.xml @@ -0,0 +1,15 @@ +<samba:parameter name="init logon delay" + context="G" + type="integer" + advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para> + This parameter specifies a delay in milliseconds for the hosts configured + for delayed initial samlogon with + <smbconfoption name="init logon delayed hosts"/>. + </para> +</description> + +<value type="default">100</value> +</samba:parameter> diff --git a/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml new file mode 100644 index 0000000000..2756a63ef9 --- /dev/null +++ b/docs-xml/smbdotconf/logon/initlogondelayedhosts.xml @@ -0,0 +1,21 @@ +<samba:parameter name="init logon delayed hosts" + context="G" + type="list" + advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para> + This parameter takes a list of host names, addresses or networks for + which the initial samlogon reply should be delayed (so other DCs get + preferred by XP workstations if there are any). + </para> + + <para> + The length of the delay can be specified with the + <smbconfoption name="init logon delay"/> parameter. + </para> +</description> + +<value type="default"></value> +<value type="example">150.203.5. myhost.mynet.de</value> +</samba:parameter> diff --git a/docs-xml/smbdotconf/winbind/idmapcachetime.xml b/docs-xml/smbdotconf/winbind/idmapcachetime.xml index 1636cdfa58..ba526100fc 100644 --- a/docs-xml/smbdotconf/winbind/idmapcachetime.xml +++ b/docs-xml/smbdotconf/winbind/idmapcachetime.xml @@ -9,5 +9,5 @@ </para> </description> -<value type="default">900</value> +<value type="default">604800 (one week)</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml new file mode 100644 index 0000000000..2da263e5ce --- /dev/null +++ b/docs-xml/smbdotconf/winbind/winbindreconnectdelay.xml @@ -0,0 +1,15 @@ +<samba:parameter name="winbind reconnect delay" + context="G" + type="integer" + advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para>This parameter specifies the number of + seconds the <citerefentry><refentrytitle>winbindd</refentrytitle> + <manvolnum>8</manvolnum></citerefentry> daemon will wait between + attempts to contact a Domain controller for a domain that is + determined to be down or not contactable.</para> +</description> + +<value type="default">30</value> +</samba:parameter> |