summaryrefslogtreecommitdiff
path: root/docs-xml/manpages
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-02-28 22:59:48 +1100
committerJeremy Allison <jra@samba.org>2013-03-06 14:46:43 -0800
commitc66632046d62786dd19c8978847bfc6470da4e89 (patch)
treeff68c27b439f2d761a000bbc11d0e887c0dda584 /docs-xml/manpages
parent166288b162e7b658b48bc908c71f635928edc5b5 (diff)
downloadsamba-c66632046d62786dd19c8978847bfc6470da4e89.tar.gz
samba-c66632046d62786dd19c8978847bfc6470da4e89.tar.bz2
samba-c66632046d62786dd19c8978847bfc6470da4e89.zip
net ads join: Add support for specifying the machine account password
This allows a predictable password to be specified, just like --machinepass does on samba-tool domain join. Andrew Bartlett Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'docs-xml/manpages')
-rw-r--r--docs-xml/manpages/net.8.xml7
1 files changed, 6 insertions, 1 deletions
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index 01044e1045..0cdadea9e2 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -194,7 +194,8 @@ the remote server using <command>/bin/date</command>. </para>
</refsect2>
<refsect2>
-<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN] [createcomputer=OU] [options]</title>
+<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN]
+[createcomputer=OU] [machinepass=PASS] [options]</title>
<para>
Join a domain. If the account already exists on the server, and
@@ -220,6 +221,10 @@ a '/'. Please note that '\' is used for escape by both the shell
and ldap, so it may need to be doubled or quadrupled to pass through,
and it is not used as a delimiter.
</para>
+<para>
+[PASS] (ADS only) Set a specific password on the computer account
+being created by the join.
+</para>
</refsect2>
<refsect2>