diff options
Diffstat (limited to 'docs-xml/manpages-3')
| -rw-r--r-- | docs-xml/manpages-3/ldbrename.1.xml | 3 | ||||
| -rw-r--r-- | docs-xml/manpages-3/net.8.xml | 14 | ||||
| -rw-r--r-- | docs-xml/manpages-3/wbinfo.1.xml | 13 |
3 files changed, 26 insertions, 4 deletions
diff --git a/docs-xml/manpages-3/ldbrename.1.xml b/docs-xml/manpages-3/ldbrename.1.xml index 391ec84ccc..6a134f4268 100644 --- a/docs-xml/manpages-3/ldbrename.1.xml +++ b/docs-xml/manpages-3/ldbrename.1.xml @@ -5,6 +5,9 @@ <refmeta> <refentrytitle>ldbrename</refentrytitle> <manvolnum>1</manvolnum> + <refmiscinfo class="source">Samba</refmiscinfo> + <refmiscinfo class="manual">User Commands</refmiscinfo> + <refmiscinfo class="version">3.6</refmiscinfo> </refmeta> diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml index 82fd7a57af..8ab33d58b0 100644 --- a/docs-xml/manpages-3/net.8.xml +++ b/docs-xml/manpages-3/net.8.xml @@ -748,6 +748,9 @@ such as domain name, domain sid and number of users and groups. <para>Add a interdomain trust account for <replaceable>DOMAIN</replaceable>. This is in fact a Samba account named <replaceable>DOMAIN$</replaceable> with the account flag <constant>'I'</constant> (interdomain trust account). +This is required for incoming trusts to work. It makes Samba be a +trusted domain of the foreign (trusting) domain. +Users of the Samba domain will be made available in the foreign domain. If the command is used against localhost it has the same effect as <command>smbpasswd -a -i DOMAIN</command>. Please note that both commands expect a appropriate UNIX account. @@ -769,8 +772,13 @@ it has the same effect as <command>smbpasswd -x DOMAIN$</command>. <title>RPC TRUSTDOM ESTABLISH <replaceable>DOMAIN</replaceable></title> <para> -Establish a trust relationship to a trusting domain. +Establish a trust relationship to a trusted domain. Interdomain account must already be created on the remote PDC. +This is required for outgoing trusts to work. It makes Samba be a +trusting domain of a foreign (trusted) domain. +Users of the foreign domain will be made available in our domain. +You'll need winbind and a working idmap config to make them +appear in your system. </para> </refsect3> @@ -784,7 +792,7 @@ Interdomain account must already be created on the remote PDC. <refsect3> <title>RPC TRUSTDOM LIST</title> -<para>List all current interdomain trust relationships.</para> +<para>List all interdomain trust relationships.</para> </refsect3> @@ -835,7 +843,7 @@ Force shutting down all applications. Timeout before system will be shut down. An interactive user of the system can use this time to cancel the shutdown. </para></listitem> -</varlistentry>'> +</varlistentry> <varlistentry> <term>-C message</term> diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml index 7803d1064f..d6628e7da9 100644 --- a/docs-xml/manpages-3/wbinfo.1.xml +++ b/docs-xml/manpages-3/wbinfo.1.xml @@ -23,6 +23,7 @@ <arg choice="opt">--all-domains</arg> <arg choice="opt">--allocate-gid</arg> <arg choice="opt">--allocate-uid</arg> + <arg choice="opt">-c</arg> <arg choice="opt">-D domain</arg> <arg choice="opt">--domain domain</arg> <arg choice="opt">-g</arg> @@ -111,6 +112,14 @@ </varlistentry> <varlistentry> + <term>-c|--change-secret</term> + <listitem><para>Change the trust account password. May be used + in conjunction with <option>domain</option> in order to change + interdomain trust account passwords. + </para></listitem> + </varlistentry> + + <varlistentry> <term>--domain <replaceable>name</replaceable></term> <listitem><para>This parameter sets the domain on which any specified operations will performed. If special domain name '.' is used to represent @@ -283,7 +292,9 @@ <term>-t|--check-secret</term> <listitem><para>Verify that the workstation trust account created when the Samba server is added to the Windows NT - domain is working. </para></listitem> + domain is working. May be used in conjunction with + <option>domain</option> in order to verify interdomain + trust accounts.</para></listitem> </varlistentry> <varlistentry> |