diff options
| author | Jim McDonough <jmcd@samba.org> | 2006-12-12 16:52:26 +0000 |
|---|---|---|
| committer | Gerald W. Carter <jerry@samba.org> | 2008-04-23 08:47:23 -0500 |
| commit | 39aa6381e11f5b3c68a9dd0c14c76e8eecd157d6 (patch) | |
| tree | 09ae192b0e0087167d3856610359c705d776e422 | |
| parent | 623f1dfada3601293733774a5f342af2379d51c9 (diff) | |
| download | samba-39aa6381e11f5b3c68a9dd0c14c76e8eecd157d6.tar.gz samba-39aa6381e11f5b3c68a9dd0c14c76e8eecd157d6.tar.bz2 samba-39aa6381e11f5b3c68a9dd0c14c76e8eecd157d6.zip | |
Add ads-only options for net ads join
(This used to be commit 761b27140ff691415fdb256240f2bd5a7e113650)
| -rw-r--r-- | docs/manpages-3/net.8.xml | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/docs/manpages-3/net.8.xml b/docs/manpages-3/net.8.xml index 39641c2f46..cd0278178e 100644 --- a/docs/manpages-3/net.8.xml +++ b/docs/manpages-3/net.8.xml @@ -181,7 +181,7 @@ the remote server using <command>/bin/date</command>. </para> </refsect2> <refsect2> -<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [options]</title> +<title>[RPC|ADS] JOIN [TYPE] [-U username[%password]] [createupn=UPN] [createcomputer=OU] [options]</title> <para> Join a domain. If the account already exists on the server, and @@ -194,6 +194,19 @@ be created.</para> [TYPE] may be PDC, BDC or MEMBER to specify the type of server joining the domain. </para> + +<para> +[UPN] (ADS only) set the principalname attribute during the join. The default +format is host/netbiosname@REALM. +</para> + +<para> +[OU] (ADS only) Precreate the computer account in a specific OU. The +OU string reads from top to bottom without RDNs, and is delimited by +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> </refsect2> <refsect2> |