Changeset 988 for vendor/current/docs/manpages/net.8

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/docs/manpages/net.8 (modified) (22 diffs)

vendor/current/docs/manpages/net.8

@@ -2 +2 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
-.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 09/18/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 05/02/2016
 .\"    Manual: System Administration tools
-.\"    Source: Samba 3.6
+.\"    Source: Samba 4.4
 .\"  Language: English
 .\"
-.TH "NET" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "05/02/2016" "Samba 4\&.4" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
@@ -32 +32 @@
 .SH "SYNOPSIS"
 .HP \w'\ 'u
-net {<ads|rap|rpc>} [\-h] [\-w\ workgroup] [\-W\ myworkgroup] [\-U\ user] [\-I\ ip\-address] [\-p\ port] [\-n\ myname] [\-s\ conffile] [\-S\ server] [\-l] [\-P] [\-d\ debuglevel] [\-V] [\-\-request\-timeout\ seconds]
+net {<ads|rap|rpc>} [\-h|\-\-help] [\-w|\-\-workgroup\ workgroup] [\-W|\-\-myworkgroup\ myworkgroup] [\-U|\-\-user\ user] [\-I|\-\-ipaddress\ ip\-address] [\-p|\-\-port\ port] [\-n\ myname] [\-s\ conffile] [\-S|\-\-server\ server] [\-l|\-\-long] [\-v|\-\-verbose] [\-f|\-\-force] [\-P|\-\-machine\-pass] [\-d\ debuglevel] [\-V] [\-\-request\-timeout\ seconds] [\-t|\-\-timeout\ seconds] [\-i|\-\-stdin] [\-\-tallocreport]
 .SH "DESCRIPTION"
 .PP
@@ -42 +42 @@
 .SH "OPTIONS"
 .PP
-\-h|\-\-help
-.RS 4
-Print a summary of command line options\&.
-.RE
-.PP
-\-k|\-\-kerberos
-.RS 4
-Try to authenticate with kerberos\&. Only useful in an Active Directory environment\&.
-.RE
-.PP
-\-w target\-workgroup
+\-w|\-\-workgroup target\-workgroup
 .RS 4
 Sets target workgroup or domain\&. You have to specify either this option or the IP address or the name of a server\&.
 .RE
 .PP
-\-W workgroup
+\-W|\-\-myworkgroup workgroup
 .RS 4
 Sets client workgroup or domain
 .RE
 .PP
-\-U user
+\-U|\-\-user user
 .RS 4
 User name to use
 .RE
 .PP
-\-I ip\-address
+\-I|\-\-ipaddress ip\-address
 .RS 4
 IP address of target server to use\&. You have to specify either this option or a target workgroup or a target server\&.
 .RE
 .PP
-\-p port
+\-p|\-\-port port
 .RS 4
 Port on the target server to connect to (usually 139 or 445)\&. Defaults to trying 445 first, then 139\&.
 .RE
 .PP
-\-n|\-\-netbiosname <primary NetBIOS name>
-.RS 4
-This option allows you to override the NetBIOS name that Samba uses for itself\&. This is identical to setting the
-\m[blue]\fBnetbios name\fR\m[]
-parameter in the
-smb\&.conf
-file\&. However, a command line setting will take precedence over settings in
-smb\&.conf\&.
-.RE
-.PP
-\-s|\-\-configfile <configuration file>
-.RS 4
-The file specified contains the configuration details required by the server\&. The information in this file includes server\-specific information such as what printcap file to use, as well as descriptions of all the services that the server is to provide\&. See
-smb\&.conf
-for more information\&. The default configuration file name is determined at compile time\&.
-.RE
-.PP
-\-S server
+\-S|\-\-server server
 .RS 4
 Name of target server\&. You should specify either this option or a target workgroup or a target IP address\&.
 .RE
 .PP
-\-l
+\-l|\-\-long
 .RS 4
 When listing data, give more information on each item\&.
 .RE
 .PP
-\-P
+\-v|\-\-verbose
+.RS 4
+When listing data, give more verbose information on each item\&.
+.RE
+.PP
+\-f|\-\-force
+.RS 4
+Enforcing a net command\&.
+.RE
+.PP
+\-P|\-\-machine\-pass
 .RS 4
 Make queries to the external server using the machine account of the local server\&.
@@ -114 +97 @@
 .RE
 .PP
-\-d|\-\-debuglevel=level
-.RS 4
-\fIlevel\fR
-is an integer from 0 to 10\&. The default value if this parameter is not specified is 0\&.
-.sp
-The higher this value, the more detail will be logged to the log files about the activities of the server\&. At level 0, only critical errors and serious warnings will be logged\&. Level 1 is a reasonable level for day\-to\-day running \- it generates a small amount of information about operations carried out\&.
-.sp
-Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
-.sp
-Note that specifying this parameter here will override the
-\m[blue]\fBlog level\fR\m[]
-parameter in the
-smb\&.conf
-file\&.
+\-t|\-\-timeout 30
+.RS 4
+Set timeout for client operations to 30 seconds\&.
+.RE
+.PP
+\-\-use\-ccache
+.RS 4
+Try to use the credentials cached by winbind\&.
+.RE
+.PP
+\-i|\-\-stdin
+.RS 4
+Take input for net commands from standard input\&.
+.RE
+.PP
+\-\-tallocreport
+.RS 4
+Generate a talloc report while processing a net command\&.
+.RE
+.PP
+\-T|\-\-test
+.RS 4
+Only test command sequence, dry\-run\&.
+.RE
+.PP
+\-F|\-\-flags FLAGS
+.RS 4
+Pass down integer flags to a net subcommand\&.
+.RE
+.PP
+\-C|\-\-comment COMMENT
+.RS 4
+Pass down a comment string to a net subcommand\&.
+.RE
+.PP
+\-n|\-\-myname MYNAME
+.RS 4
+Use MYNAME as a requester name for a net subcommand\&.
+.RE
+.PP
+\-c|\-\-container CONTAINER
+.RS 4
+Use a specific AD container for net ads operations\&.
+.RE
+.PP
+\-M|\-\-maxusers MAXUSERS
+.RS 4
+Fill in the maxusers field in net rpc share operations\&.
+.RE
+.PP
+\-r|\-\-reboot
+.RS 4
+Reboot a remote machine after a command has been successfully executed (e\&.g\&. in remote join operations)\&.
+.RE
+.PP
+\-\-force\-full\-repl
+.RS 4
+When calling "net rpc vampire keytab" this option enforces a full re\-creation of the generated keytab file\&.
+.RE
+.PP
+\-\-single\-obj\-repl
+.RS 4
+When calling "net rpc vampire keytab" this option allows one to replicate just a single object to the generated keytab file\&.
+.RE
+.PP
+\-\-clean\-old\-entries
+.RS 4
+When calling "net rpc vampire keytab" this option allows one to cleanup old entries from the generated keytab file\&.
+.RE
+.PP
+\-\-db
+.RS 4
+Define dbfile for "net idmap" commands\&.
+.RE
+.PP
+\-\-lock
+.RS 4
+Activates locking of the dbfile for "net idmap check" command\&.
+.RE
+.PP
+\-a|\-\-auto
+.RS 4
+Activates noninteractive mode in "net idmap check"\&.
+.RE
+.PP
+\-\-repair
+.RS 4
+Activates repair mode in "net idmap check"\&.
+.RE
+.PP
+\-\-acls
+.RS 4
+Includes ACLs to be copied in "net rpc share migrate"\&.
+.RE
+.PP
+\-\-attrs
+.RS 4
+Includes file attributes to be copied in "net rpc share migrate"\&.
+.RE
+.PP
+\-\-timestamps
+.RS 4
+Includes timestamps to be copied in "net rpc share migrate"\&.
+.RE
+.PP
+\-X|\-\-exclude DIRECTORY
+.RS 4
+Allows one to exclude directories when copying with "net rpc share migrate"\&.
+.RE
+.PP
+\-\-destination SERVERNAME
+.RS 4
+Defines the target servername of migration process (defaults to localhost)\&.
+.RE
+.PP
+\-L|\-\-local
+.RS 4
+Sets the type of group mapping to local (used in "net groupmap set")\&.
+.RE
+.PP
+\-D|\-\-domain
+.RS 4
+Sets the type of group mapping to domain (used in "net groupmap set")\&.
+.RE
+.PP
+\-N|\-\-ntname NTNAME
+.RS 4
+Sets the ntname of a group mapping (used in "net groupmap set")\&.
+.RE
+.PP
+\-R|\-\-rid RID
+.RS 4
+Sets the rid of a group mapping (used in "net groupmap set")\&.
+.RE
+.PP
+\-\-reg\-version REG_VERSION
+.RS 4
+Assume database version {n|1,2,3} (used in "net registry check")\&.
+.RE
+.PP
+\-o|\-\-output FILENAME
+.RS 4
+Output database file (used in "net registry check")\&.
+.RE
+.PP
+\-\-wipe
+.RS 4
+Create a new database from scratch (used in "net registry check")\&.
+.RE
+.PP
+\-\-precheck PRECHECK_DB_FILENAME
+.RS 4
+Defines filename for database prechecking (used in "net registry import")\&.
+.RE
+.PP
+\-\-no\-dns\-updates
+.RS 4
+Do not perform DNS updates as part of "net ads join"\&.
 .RE
 .SH "COMMANDS"
@@ -142 +269 @@
 Without any options, the
 NET TIME
-command displays the time on the remote server\&.
+command displays the time on the remote server\&. The remote server must be specified with the \-S option\&.
 .SS "TIME SYSTEM"
 .PP
 Displays the time on the remote server in a format ready for
-/bin/date\&.
+/bin/date\&. The remote server must be specified with the \-S option\&.
 .SS "TIME SET"
 .PP
 Tries to set the date and time of the local server to that on the remote server using
-/bin/date\&.
+/bin/date\&. The remote server must be specified with the \-S option\&.
 .SS "TIME ZONE"
 .PP
-Displays the timezone in hours from GMT on the remote computer\&.
-.SS "[RPC|ADS] JOIN [TYPE] [\-U username[%password]] [createupn=UPN] [createcomputer=OU] [options]"
+Displays the timezone in hours from GMT on the remote server\&. The remote server must be specified with the \-S option\&.
+.SS "[RPC|ADS] JOIN [TYPE] [\-\-no\-dns\-updates] [\-U username[%password]] [createupn=UPN] [createcomputer=OU] [machinepass=PASS] [osName=string osVer=string] [options]"
 .PP
 Join a domain\&. If the account already exists on the server, and [TYPE] is MEMBER, the machine will attempt to join automatically\&. (Assuming that the machine has been created in server manager) Otherwise, a password will be prompted for, and a new account may be created\&.
@@ -163 +290 @@
 .PP
 [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 \*(Aq/\*(Aq\&. Please note that \*(Aq\e\*(Aq 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\&.
+.PP
+[PASS] (ADS only) Set a specific password on the computer account being created by the join\&.
+.PP
+[osName=string osVer=String] (ADS only) Set the operatingSystem and operatingSystemVersion attribute during the join\&. Both parameters must be specified for either to take effect\&.
 .SS "[RPC] OLDJOIN [options]"
 .PP
@@ -249 +380 @@
 .PP
 Validate whether the specified user can log in to the remote server\&. If the password is not specified on the commandline, it will be prompted\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-Currently NOT implemented\&.
-.sp .5v
-.RE
 .SS "RAP GROUPMEMBER"
 .SS "RAP GROUPMEMBER LIST GROUP"
@@ -280 +395 @@
 \fIcommand\fR
 on the remote server\&. Only works with OS/2 servers\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-Currently NOT implemented\&.
-.sp .5v
-.RE
 .SS "RAP SERVICE"
 .SS "RAP SERVICE START NAME [arguments...]"
 .PP
 Start the specified service on the remote server\&. Not implemented yet\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-Currently NOT implemented\&.
-.sp .5v
-.RE
 .SS "RAP SERVICE STOP"
 .PP
 Stop the specified service on the remote server\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-Currently NOT implemented\&.
-.sp .5v
-.RE
 .SS "RAP PASSWORD \fIUSER\fR \fIOLDPASS\fR \fINEWPASS\fR"
 .PP
@@ -508 +575 @@
 .SS "GROUPMAP MODIFY"
 .PP
-Update en existing group entry\&.
-.PP
-
-.sp
+Update an existing group entry\&.
+.PP
 .if n \{\
 .RS 4
@@ -565 +630 @@
 .PP
 List all interdomain trust relationships\&.
-.SS "RPC TRUSTDOM LIST"
-.PP
-List all interdomain trust relationships\&.
 .SS "RPC TRUST"
 .SS "RPC TRUST CREATE"
 .PP
-Create a trust trust object by calling lsaCreateTrustedDomainEx2\&. The can be done on a single server or on two servers at once with the possibility to use a random trust password\&.
+Create a trust object by calling lsaCreateTrustedDomainEx2\&. The can be done on a single server or on two servers at once with the possibility to use a random trust password\&.
 .PP
 \fBOptions:\fR
@@ -644 +706 @@
 .SS "RPC TRUST DELETE"
 .PP
-Delete a trust trust object by calling lsaDeleteTrustedDomain\&. The can be done on a single server or on two servers at once\&.
+Delete a trust object by calling lsaDeleteTrustedDomain\&. The can be done on a single server or on two servers at once\&.
 .PP
 \fBOptions:\fR
@@ -735 +797 @@
 .SS "RPC VAMPIRE"
 .PP
-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\&.
+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\&. This vampire command cannot be used against an Active Directory, only against an NT4 Domain Controller\&.
 .SS "RPC VAMPIRE KEYTAB"
 .PP
@@ -781 +843 @@
 .PP
 Print out workgroup name for specified kerberos realm\&.
+.SS "ADS ENCTYPES"
+.PP
+List, modify or delete the value of the "msDS\-SupportedEncryptionTypes" attribute of an account in AD\&.
+.PP
+This attribute allows one to control which Kerberos encryption types are used for the generation of initial and service tickets\&. The value consists of an integer bitmask with the following values:
+.PP
+0x00000001 DES\-CBC\-CRC
+.PP
+0x00000002 DES\-CBC\-MD5
+.PP
+0x00000004 RC4\-HMAC
+.PP
+0x00000008 AES128\-CTS\-HMAC\-SHA1\-96
+.PP
+0x00000010 AES256\-CTS\-HMAC\-SHA1\-96
+.SS "ADS ENCTYPES LIST \fI<ACCOUNTNAME>\fR"
+.PP
+List the value of the "msDS\-SupportedEncryptionTypes" attribute of a given account\&.
+.PP
+Example:
+\fBnet ads enctypes list Computername\fR
+.SS "ADS ENCTYPES SET \fI<ACCOUNTNAME>\fR \fI[enctypes]\fR"
+.PP
+Set the value of the "msDS\-SupportedEncryptionTypes" attribute of the LDAP object of ACCOUNTNAME to a given value\&. If the value is omitted, the value is set to 31 which enables all the currently supported encryption types\&.
+.PP
+Example:
+\fBnet ads enctypes set Computername 24\fR
+.SS "ADS ENCTYPES DELETE \fI<ACCOUNTNAME>\fR"
+.PP
+Deletes the "msDS\-SupportedEncryptionTypes" attribute of the LDAP object of ACCOUNTNAME\&.
+.PP
+Example:
+\fBnet ads enctypes set Computername 24\fR
 .SS "SAM CREATEBUILTINGROUP <NAME>"
 .PP
@@ -874 +969 @@
 .PP
 Restore the mappings from the specified file or stdin\&.
-.SS "IDMAP SECRET <DOMAIN> <secret>"
+.SS "IDMAP SET SECRET <DOMAIN> <secret>"
 .PP
 Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
-.SS "IDMAP DELETE [\-f] [\-\-db=<DB>] <ID>"
+.SS "IDMAP SET RANGE <RANGE> <SID> [index] [\-\-db=<DB>]"
+.PP
+Store a domain\-range mapping for a given domain (and index) in autorid database\&.
+.SS "IDMAP SET CONFIG <config> [\-\-db=<DB>]"
+.PP
+Update CONFIG entry in autorid database\&.
+.SS "IDMAP GET RANGE <SID> [index] [\-\-db=<DB>]"
+.PP
+Get the range for a given domain and index from autorid database\&.
+.SS "IDMAP GET RANGES [<SID>] [\-\-db=<DB>]"
+.PP
+Get ranges for all domains or for one identified by given SID\&.
+.SS "IDMAP GET CONFIG [\-\-db=<DB>]"
+.PP
+Get CONFIG entry from autorid database\&.
+.SS "IDMAP DELETE MAPPING [\-f] [\-\-db=<DB>] <ID>"
 .PP
 Delete a mapping sid <\-> gid or sid <\-> uid from the IDMAP database\&. The mapping is given by <ID> which may either be a sid: S\-x\-\&.\&.\&., a gid: "GID number" or a uid: "UID number"\&. Use \-f to delete an invalid partial mapping <ID> \-> xx
@@ -884 +994 @@
 \fBsmbcontrol\fR(1)
 manpage for details\&.
+.SS "IDMAP DELETE RANGE [\-f] [\-\-db=<TDB>] <RANGE>|(<SID> [<INDEX>])"
+.PP
+Delete a domain range mapping identified by \*(AqRANGE\*(Aq or "domain SID and INDEX" from autorid database\&. Use \-f to delete invalid mappings\&.
+.SS "IDMAP DELETE RANGES [\-f] [\-\-db=<TDB>] <SID>"
+.PP
+Delete all domain range mappings for a domain identified by SID\&. Use \-f to delete invalid mappings\&.
 .SS "IDMAP CHECK [\-v] [\-r] [\-a] [\-T] [\-f] [\-l] [\-\-db=<DB>]"
 .PP
@@ -1001 +1117 @@
 .PP
 net usershare list on its own list out the names of the user defined shares that were created by the current user, or restricts the list to share names that match the given wildcard pattern (\*(Aq*\*(Aq matches one or more characters, \*(Aq?\*(Aq matches only one character)\&. If the \*(Aq\-l\*(Aq or \*(Aq\-\-long\*(Aq option is also given, it includes the names of user defined shares created by other users\&.
-.SS "CONF"
-.PP
-Starting with version 3\&.2\&.0, a Samba server can be configured by data stored in registry\&. This configuration data can be edited with the new "net conf" commands\&.
+.SS "[RPC] CONF"
+.PP
+Starting with version 3\&.2\&.0, a Samba server can be configured by data stored in registry\&. This configuration data can be edited with the new "net conf" commands\&. There is also the possibility to configure a remote Samba server by enabling the RPC conf mode and specifying the address of the remote server\&.
 .PP
 The deployment of this configuration data can be activated in two levels from the
@@ -1021 +1137 @@
 The conf commands are:
 .RS 4
-net conf list \- Dump the complete configuration in smb\&.conf like
+net [rpc] conf list \- Dump the complete configuration in smb\&.conf like
 format\&.
 .RE
 .RS 4
-net conf import \- Import configuration from file in smb\&.conf
+net [rpc] conf import \- Import configuration from file in smb\&.conf
 format\&.
 .RE
 .RS 4
-net conf listshares \- List the registry shares\&.
-.RE
-.RS 4
-net conf drop \- Delete the complete configuration from
+net [rpc] conf listshares \- List the registry shares\&.
+.RE
+.RS 4
+net [rpc] conf drop \- Delete the complete configuration from
 registry\&.
 .RE
 .RS 4
-net conf showshare \- Show the definition of a registry share\&.
-.RE
-.RS 4
-net conf addshare \- Create a new registry share\&.
-.RE
-.RS 4
-net conf delshare \- Delete a registry share\&.
-.RE
-.RS 4
-net conf setparm \- Store a parameter\&.
-.RE
-.RS 4
-net conf getparm \- Retrieve the value of a parameter\&.
-.RE
-.RS 4
-net conf delparm \- Delete a parameter\&.
-.RE
-.RS 4
-net conf getincludes \- Show the includes of a share definition\&.
-.RE
-.RS 4
-net conf setincludes \- Set includes for a share\&.
-.RE
-.RS 4
-net conf delincludes \- Delete includes from a share definition\&.
-.RE
-.SS "CONF LIST"
+net [rpc] conf showshare \- Show the definition of a registry share\&.
+.RE
+.RS 4
+net [rpc] conf addshare \- Create a new registry share\&.
+.RE
+.RS 4
+net [rpc] conf delshare \- Delete a registry share\&.
+.RE
+.RS 4
+net [rpc] conf setparm \- Store a parameter\&.
+.RE
+.RS 4
+net [rpc] conf getparm \- Retrieve the value of a parameter\&.
+.RE
+.RS 4
+net [rpc] conf delparm \- Delete a parameter\&.
+.RE
+.RS 4
+net [rpc] conf getincludes \- Show the includes of a share definition\&.
+.RE
+.RS 4
+net [rpc] conf setincludes \- Set includes for a share\&.
+.RE
+.RS 4
+net [rpc] conf delincludes \- Delete includes from a share definition\&.
+.RE
+.SS "[RPC] CONF LIST"
 .PP
 Print the configuration data stored in the registry in a smb\&.conf\-like format to standard output\&.
-.SS "CONF IMPORT [--test|-T] filename [section]"
+.SS "[RPC] CONF IMPORT [--test|-T] filename [section]"
 .PP
 This command imports configuration from a file in smb\&.conf format\&. If a section encountered in the input file is present in registry, its contents is replaced\&. Sections of registry configuration that have no counterpart in the input file are not affected\&. If you want to delete these, you will have to use the "net conf drop" or "net conf delshare" commands\&. Optionally, a section may be specified to restrict the effect of the import command to that specific section\&. A test mode is enabled by specifying the parameter "\-T" on the commandline\&. In test mode, no changes are made to the registry, and the resulting configuration is printed to standard output instead\&.
-.SS "CONF LISTSHARES"
+.SS "[RPC] CONF LISTSHARES"
 .PP
 List the names of the shares defined in registry\&.
-.SS "CONF DROP"
+.SS "[RPC] CONF DROP"
 .PP
 Delete the complete configuration data from registry\&.
-.SS "CONF SHOWSHARE sharename"
+.SS "[RPC] CONF SHOWSHARE sharename"
 .PP
 Show the definition of the share or section specified\&. It is valid to specify "global" as sharename to retrieve the global configuration options from registry\&.
-.SS "CONF ADDSHARE sharename path [writeable={y|N} [guest_ok={y|N} [comment]]] "
+.SS "[RPC] CONF ADDSHARE sharename path [writeable={y|N} [guest_ok={y|N} [comment]]] "
 .PP
 Create a new share definition in registry\&. The sharename and path have to be given\&. The share name may
 \fInot\fR
 be "global"\&. Optionally, values for the very common options "writeable", "guest ok" and a "comment" may be specified\&. The same result may be obtained by a sequence of "net conf setparm" commands\&.
-.SS "CONF DELSHARE sharename"
+.SS "[RPC] CONF DELSHARE sharename"
 .PP
 Delete a share definition from registry\&.
-.SS "CONF SETPARM section parameter value"
+.SS "[RPC] CONF SETPARM section parameter value"
 .PP
 Store a parameter in registry\&. The section may be global or a sharename\&. The section is created if it does not exist yet\&.
-.SS "CONF GETPARM section parameter"
+.SS "[RPC] CONF GETPARM section parameter"
 .PP
 Show a parameter stored in registry\&.
-.SS "CONF DELPARM section parameter"
+.SS "[RPC] CONF DELPARM section parameter"
 .PP
 Delete a parameter stored in registry\&.
-.SS "CONF GETINCLUDES section"
+.SS "[RPC] CONF GETINCLUDES section"
 .PP
 Get the list of includes for the provided section (global or share)\&.
@@ -1101 +1217 @@
 .PP
 Further note that currently, only files can be included from registry configuration\&. In the future, there will be the ability to include configuration data from other registry keys\&.
-.SS "CONF SETINCLUDES section [filename]+"
+.SS "[RPC] CONF SETINCLUDES section [filename]+"
 .PP
 Set the list of includes for the provided section (global or share) to the given list of one or more filenames\&. The filenames may contain the usual smb\&.conf macros like %I\&.
-.SS "CONF DELINCLUDES section"
+.SS "[RPC] CONF DELINCLUDES section"
 .PP
 Delete the list of includes from the provided section (global or share)\&.
@@ -1160 +1276 @@
 .RS 4
 net registry convert     \- Convert a registration entries (\&.reg) file\&.
+.RE
+.RS 4
+net registry check       \- Check and repair a registry database\&.
 .RE
 .SS "REGISTRY ENUMERATE key "
@@ -1209 +1328 @@
 or
 \fIdword\fR\&. In case of
-\fImulti_sz\fR
-\fIvalue\fR
+\fImulti_sz\fR\fIvalue\fR
 may be given multiple times\&.
 .SS "REGISTRY INCREMENT key name [inc]"
@@ -1244 +1362 @@
 from a Security Descriptor Definition Language (SDDL) string
 \fIsd\fR\&.
-.SS "REGISTRY IMPORT file[opt]"
+.SS "REGISTRY IMPORT file [--precheck <check-file>] [opt]"
 .PP
 Import a registration entries (\&.reg)
 \fIfile\fR\&.
+.PP
+The following options are available:
+.PP
+\-\-precheck \fIcheck\-file\fR
+.RS 4
+This is a mechanism to check the existence or non\-existence of certain keys or values specified in a precheck file before applying the import file\&. The import file will only be applied if the precheck succeeds\&.
+.sp
+The check\-file follows the normal registry file syntax with the following semantics:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+<value name>=<value> checks whether the value exists and has the given value\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+<value name>=\- checks whether the value does not exist\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+[key] checks whether the key exists\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+[\-key] checks whether the key does not exist\&.
+.RE
+.sp
+.RE
+.RE
 .SS "REGISTRY EXPORT keyfile[opt]"
 .PP
@@ -1258 +1431 @@
 Convert a registration entries (\&.reg) file
 \fIin\fR\&.
+.SS "REGISTRY CHECK [-ravTl] [-o <ODB>] [--wipe] [<DB>]"
+.PP
+Check and repair the registry database\&. If no option is given a read only check of the database is done\&. Among others an interactive or automatic repair mode may be chosen with one of the following options
+.PP
+\-r|\-\-repair
+.RS 4
+Interactive repair mode, ask a lot of questions\&.
+.RE
+.PP
+\-a|\-\-auto
+.RS 4
+Noninteractive repair mode, use default answers\&.
+.RE
+.PP
+\-v|\-\-verbose
+.RS 4
+Produce more output\&.
+.RE
+.PP
+\-T|\-\-test
+.RS 4
+Dry run, show what changes would be made but don\*(Aqt touch anything\&.
+.RE
+.PP
+\-l|\-\-lock
+.RS 4
+Lock the database while doing the check\&.
+.RE
+.PP
+\-\-reg\-version={1,2,3}
+.RS 4
+Specify the format of the registry database\&. If not given it defaults to the value of the binary or, if an registry\&.tdb is explizitly stated at the commandline, to the value found in the INFO/version record\&.
+.RE
+.PP
+[\-\-db] <DB>
+.RS 4
+Check the specified database\&.
+.RE
+.PP
+\-o|\-\-output <ODB>
+.RS 4
+Create a new registry database <ODB> instead of modifying the input\&. If <ODB> is already existing \-\-wipe may be used to overwrite it\&.
+.RE
+.PP
+\-\-wipe
+.RS 4
+Replace the registry database instead of modifying the input or overwrite an existing output database\&.
+.RE
+.PP
+.RS 4
+.RE
 .SS "EVENTLOG"
 .PP