The branch, v3-3-test has been updated
via 8c5771422bf25dba0638c3419ac14f0841b94293 (commit)
via e19dddb2b438b75dcd995aaa763fcbe55d7de5cc (commit)
from e5f0f6b7fb428e4cc8e5e782a0038a847d74edcc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 8c5771422bf25dba0638c3419ac14f0841b94293
Author: Karolin Seeger <[email protected]>
Date: Wed May 6 16:06:59 2009 +0200
s3/docs: Remove unnecessary .sp.
Karolin
(cherry picked from commit 4a4dc776b2f0ca813abcf4f47f0d5721f75f3e6a)
(cherry picked from commit 6a617a9677da9df8f70cf2039245cfb5ce3d94c3)
commit e19dddb2b438b75dcd995aaa763fcbe55d7de5cc
Author: Günther Deschner <[email protected]>
Date: Wed May 6 15:43:23 2009 +0200
s3-docs: Fix Bug #6331. Document "net dom join/net dom unjoin".
Guenther
(cherry picked from commit e398f1e91575909d2a90fab1e6f00804815a0b2f)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/net.8.xml | 82 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 82 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/net.8.xml b/docs-xml/manpages-3/net.8.xml
index 78f798c..9206cb8 100644
--- a/docs-xml/manpages-3/net.8.xml
+++ b/docs-xml/manpages-3/net.8.xml
@@ -1582,6 +1582,88 @@ Delete the list of includes from the provided section
(global or share).
</refsect2>
<refsect2>
+<title>DOM</title>
+
+<para>Starting with version 3.2.0 Samba has support for remote join and unjoin
APIs, both client and server-side. Windows supports remote join capabilities
since Windows 2000.
+</para>
+<para>In order for Samba to be joined or unjoined remotely an account must be
used that is either member of the Domain Admins group, a member of the local
Administrators group or a user that is granted the SeMachineAccountPrivilege
privilege.
+</para>
+
+<para>The client side support for remote join is implemented in the net dom
commands which are:
+<simplelist>
+<member>net dom join - Join a remote computer into a domain.</member>
+<member>net dom unjoin - Unjoin a remote computer from a domain.</member>
+</simplelist>
+</para>
+
+<refsect3>
+<title>DOM JOIN <replaceable>domain=DOMAIN</replaceable>
<replaceable>ou=OU</replaceable> <replaceable>account=ACCOUNT</replaceable>
<replaceable>password=PASSWORD</replaceable>
<replaceable>reboot</replaceable></title>
+
+<para>
+Joins a computer into a domain. This command supports the following additional
parameters:
+</para>
+
+<itemizedlist>
+
+<listitem><para><replaceable>DOMAIN</replaceable> can be a NetBIOS domain name
(also known as short domain name) or a DNS domain name for Active Directory
Domains. As in Windows, it is also possible to control which Domain Controller
to use. This can be achieved by appending the DC name using the \ separator
character. Example: MYDOM\MYDC. The <replaceable>DOMAIN</replaceable> parameter
cannot be NULL.</para></listitem>
+
+<listitem><para><replaceable>OU</replaceable> can be set to a RFC 1779 LDAP
DN, like <emphasis>ou=mymachines,cn=Users,dc=example,dc=com</emphasis> in order
to create the machine account in a non-default LDAP containter. This optional
parameter is only supported when joining Active Directory
Domains.</para></listitem>
+
+<listitem><para><replaceable>ACCOUNT</replaceable> defines a domain account
that will be used to join the machine to the domain. This domain account needs
to have sufficient privileges to join machines.</para></listitem>
+
+<listitem><para><replaceable>PASSWORD</replaceable> defines the password for
the domain account defined with
<replaceable>ACCOUNT</replaceable>.</para></listitem>
+
+<listitem><para><replaceable>REBOOT</replaceable> is an optional parameter
that can be set to reboot the remote machine after successful join to the
domain.</para></listitem>
+
+</itemizedlist>
+
+<para>
+Note that you also need to use standard net paramters to connect and
authenticate to the remote machine that you want to join. These additional
parameters include: -S computer and -U user.
+</para>
+<para>
+ Example:
+ net dom join -S xp -U XP\\administrator%secret domain=MYDOM
account=MYDOM\\administrator password=topsecret reboot.
+</para>
+<para>
+This example would connect to a computer named XP as the local administrator
using password secret, and join the computer into a domain called MYDOM using
the MYDOM domain administrator account and password topsecret. After successful
join, the computer would reboot.
+</para>
+
+</refsect3>
+
+<refsect3>
+<title>DOM UNJOIN <replaceable>account=ACCOUNT</replaceable>
<replaceable>password=PASSWORD</replaceable>
<replaceable>reboot</replaceable></title>
+
+<para>
+Unjoins a computer from a domain. This command supports the following
additional parameters:
+</para>
+
+<itemizedlist>
+
+<listitem><para><replaceable>ACCOUNT</replaceable> defines a domain account
that will be used to unjoin the machine from the domain. This domain account
needs to have sufficient privileges to unjoin machines.</para></listitem>
+
+<listitem><para><replaceable>PASSWORD</replaceable> defines the password for
the domain account defined with
<replaceable>ACCOUNT</replaceable>.</para></listitem>
+
+<listitem><para><replaceable>REBOOT</replaceable> is an optional parameter
that can be set to reboot the remote machine after successful unjoin from the
domain.</para></listitem>
+
+</itemizedlist>
+
+<para>
+Note that you also need to use standard net paramters to connect and
authenticate to the remote machine that you want to unjoin. These additional
parameters include: -S computer and -U user.
+</para>
+<para>
+ Example:
+ net dom unjoin -S xp -U XP\\administrator%secret
account=MYDOM\\administrator password=topsecret reboot.
+</para>
+<para>
+This example would connect to a computer named XP as the local administrator
using password secret, and unjoin the computer from the domain using the MYDOM
domain administrator account and password topsecret. After successful unjoin,
the computer would reboot.
+</para>
+
+</refsect3>
+
+</refsect2>
+
+<refsect2>
+>>>>>>> 80d32b8... s3-docs: Fix Bug #6331. Document "net dom join/net dom
unjoin".:docs-xml/manpages-3/net.8.xml
<title>HELP [COMMAND]</title>
<para>Gives usage information for the specified command.</para>
--
Samba Shared Repository
