diff --git a/samba-4.1.2-doc.patch b/samba-4.1.2-doc.patch new file mode 100644 index 0000000..93aa45c --- /dev/null +++ b/samba-4.1.2-doc.patch @@ -0,0 +1,4246 @@ +From 1573638212a9733a44939a4d38a226f38dca36f1 Mon Sep 17 00:00:00 2001 +From: Michele Baldessari +Date: Tue, 9 Jul 2013 23:23:33 +0200 +Subject: [PATCH] Fix typos in man-pages + +Fix some typos in the man-pages. + +Signed-off-by: Michele Baldessari +Reviewed-by: Simo Sorce + +Autobuild-User(master): Simo Sorce +Autobuild-Date(master): Wed Jul 10 16:45:07 CEST 2013 on sn-devel-104 +--- + docs-xml/manpages/dbwrap_tool.1.xml | 2 +- + docs-xml/manpages/idmap_autorid.8.xml | 2 +- + docs-xml/manpages/net.8.xml | 2 +- + docs-xml/manpages/pdbedit.8.xml | 2 +- + docs-xml/manpages/samba.7.xml | 2 +- + docs-xml/manpages/smbclient.1.xml | 2 +- + docs-xml/manpages/smbpasswd.5.xml | 2 +- + docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml +index e2b2cee..a1a2f97 100644 +--- a/docs-xml/manpages/dbwrap_tool.1.xml ++++ b/docs-xml/manpages/dbwrap_tool.1.xml +@@ -49,7 +49,7 @@ + fetch: fetch a record + store: create or modify a record + delete: remove a record +- exists: test for existance of a record ++ exists: test for existence of a record + erase: remove all records + listkeys: list all available records + listwatchers: list processes, which are waiting for changes in a record +diff --git a/docs-xml/manpages/idmap_autorid.8.xml b/docs-xml/manpages/idmap_autorid.8.xml +index c35f903..7446d53 100644 +--- a/docs-xml/manpages/idmap_autorid.8.xml ++++ b/docs-xml/manpages/idmap_autorid.8.xml +@@ -109,7 +109,7 @@ + EXAMPLES + + This example shows you the minimal configuration that will +- work for the principial domain and 19 trusted domains / range ++ work for the principal domain and 19 trusted domains / range + extensions. + + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index dd5b3ab..0df2e07 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -1671,7 +1671,7 @@ shares created by other users. + + 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 possiblity to configure a remote Samba server ++conf" commands. There is also the possibility to configure a remote Samba server + by enabling the RPC conf mode and specifying the the address of the remote server. + + +diff --git a/docs-xml/manpages/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml +index 4bb3751..c5d6b23 100644 +--- a/docs-xml/manpages/pdbedit.8.xml ++++ b/docs-xml/manpages/pdbedit.8.xml +@@ -289,7 +289,7 @@ retype new password + + + +- pdbedit does not call the unix password syncronisation ++ pdbedit does not call the unix password synchronization + script if + has been set. It only updates the data in the Samba + user database. +diff --git a/docs-xml/manpages/samba.7.xml b/docs-xml/manpages/samba.7.xml +index 9299660..cedb4e4 100644 +--- a/docs-xml/manpages/samba.7.xml ++++ b/docs-xml/manpages/samba.7.xml +@@ -91,7 +91,7 @@ + 8 + The samba-tool + is the main Samba Administration tool regarding +- Acitive Directory services. ++ Active Directory services. + + + +diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml +index 328fd50..b222c56 100644 +--- a/docs-xml/manpages/smbclient.1.xml ++++ b/docs-xml/manpages/smbclient.1.xml +@@ -564,7 +564,7 @@ + sent to the server on directory listings and file opens. If + the "backup intent" flag is true, the server will try and + bypass some file system checks if the user has been granted +- SE_BACKUP or SE_RESTORE privilages. This state is useful when ++ SE_BACKUP or SE_RESTORE privileges. This state is useful when + performing a backup or restore operation. + + +diff --git a/docs-xml/manpages/smbpasswd.5.xml b/docs-xml/manpages/smbpasswd.5.xml +index fc512b8..986dedb 100644 +--- a/docs-xml/manpages/smbpasswd.5.xml ++++ b/docs-xml/manpages/smbpasswd.5.xml +@@ -39,7 +39,7 @@ + The format of the smbpasswd file used by Samba 2.2 + is very similar to the familiar Unix passwd(5) + file. It is an ASCII file containing one line for each user. Each field +- ithin each line is separated from the next by a colon. Any entry ++ within each line is separated from the next by a colon. Any entry + beginning with '#' is ignored. The smbpasswd file contains the + following information for each user: + +diff --git a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml +index 0daafc6..38644e7 100644 +--- a/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml ++++ b/docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml +@@ -139,7 +139,7 @@ + The module now can identify itself against the receiver with a sub-release number, where + the receiver may run with a different sub-release number than the module. However, as + long as both run on the V2.x protocol, the receiver will not crash, even if the module +- uses features only implemented in the newer subrelease. Ultimatively, if the module uses ++ uses features only implemented in the newer subrelease. Ultimately, if the module uses + a new feature from a newer subrelease, and the receiver runs an older protocol, it is just + ignoring the functionality. Of course it is best to have both the receiver and the module + running the same subrelease of the protocol. +-- +1.8.3.1 + +From 16a873bf7c5c3d236e4bc107953dc6f3159764a2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:42:06 +0200 +Subject: [PATCH 01/83] docs: remove duplicate word "the" in idmap_ad manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/idmap_ad.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml +index 2ae490b..56378c1 100644 +--- a/docs-xml/manpages/idmap_ad.8.xml ++++ b/docs-xml/manpages/idmap_ad.8.xml +@@ -31,7 +31,7 @@ + + + Currently, the ad backend +- does not work as the the default idmap backend, but one has ++ does not work as the default idmap backend, but one has + to configure it separately for each domain for which one wants + to use it, using disjoint ranges. One usually needs to configure + a writeable default idmap range, using for example the +-- +1.8.3.1 + + +From f17f61a4c0d5c13a273eae0b72521e464b1d3d8f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:44:12 +0200 +Subject: [PATCH 02/83] docs: remove duplicate word "name" in nmblookup + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmblookup.1.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml +index bb4bd96..12c707f 100644 +--- a/docs-xml/manpages/nmblookup.1.xml ++++ b/docs-xml/manpages/nmblookup.1.xml +@@ -57,7 +57,7 @@ + + -M + Searches for a master browser by looking +- up the NetBIOS name name with a ++ up the NetBIOS name with a + type of 0x1d. If + name is "-" then it does a lookup on the special name + __MSBROWSE__. Please note that in order to +-- +1.8.3.1 + + +From 4112eb0529780113716c6032561504196be8235f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:45:21 +0200 +Subject: [PATCH 03/83] docs: remove duplicate word "name" in nmblookup4 + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + libcli/nbt/man/nmblookup4.1.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libcli/nbt/man/nmblookup4.1.xml b/libcli/nbt/man/nmblookup4.1.xml +index 198afec..b6fe48c 100644 +--- a/libcli/nbt/man/nmblookup4.1.xml ++++ b/libcli/nbt/man/nmblookup4.1.xml +@@ -57,7 +57,7 @@ + + -M + Searches for a master browser by looking +- up the NetBIOS name name with a ++ up the NetBIOS name with a + type of 0x1d. If + name is "-" then it does a lookup on the special name + __MSBROWSE__. Please note that in order to +-- +1.8.3.1 + + +From e320d57ed6a4d732980656eb01a5f777357f9715 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:50:28 +0200 +Subject: [PATCH 04/83] docs: remove duplicate arguments listing in regdiff + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + source4/lib/registry/man/regdiff.1.xml | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/source4/lib/registry/man/regdiff.1.xml b/source4/lib/registry/man/regdiff.1.xml +index 3fe965c..23aae34 100644 +--- a/source4/lib/registry/man/regdiff.1.xml ++++ b/source4/lib/registry/man/regdiff.1.xml +@@ -21,11 +21,8 @@ + regdiff + --help + --backend=BACKEND +- --backend=BACKEND +- --credentials=CREDENTIALS + --credentials=CREDENTIALS + location +- location + + + +-- +1.8.3.1 + + +From d33ca796071a2a6f8bf65d6eed2fe159a75de8c5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:55:03 +0200 +Subject: [PATCH 05/83] docs: remove duplicate word "the" in winbindd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/winbindd.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml +index 5100493..1cb49ca 100644 +--- a/docs-xml/manpages/winbindd.8.xml ++++ b/docs-xml/manpages/winbindd.8.xml +@@ -364,7 +364,7 @@ auth required /lib/security/pam_unix.so \ + be the same. The user and group ids will only be valid for the local + machine, unless a shared is configured. + +- If the the Windows NT SID to UNIX user and group id mapping ++ If the Windows NT SID to UNIX user and group id mapping + file is damaged or destroyed then the mappings will be lost. + + +-- +1.8.3.1 + + +From 6a0b75f901052234f35d4ba596754e7714af7e87 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:58:45 +0200 +Subject: [PATCH 06/83] docs: remove duplicate mention of "smbtorture" in + smbtorture manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + source4/torture/man/smbtorture.1.xml | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/source4/torture/man/smbtorture.1.xml b/source4/torture/man/smbtorture.1.xml +index 9b70b9b..09e19ed 100644 +--- a/source4/torture/man/smbtorture.1.xml ++++ b/source4/torture/man/smbtorture.1.xml +@@ -19,10 +19,6 @@ + + + smbtorture +- +- +- +- smbtorture + //server/share + -d debuglevel + -U user%pass +-- +1.8.3.1 + + +From e003650f5cf0b9581da00ad39b0784aab074119b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 17:59:22 +0200 +Subject: [PATCH 07/83] docs: remove duplicate mention of "ntdbtool" in + ntdbtool manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + lib/ntdb/man/ntdbtool.8.xml | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/lib/ntdb/man/ntdbtool.8.xml b/lib/ntdb/man/ntdbtool.8.xml +index a23a48e..7e6530c 100644 +--- a/lib/ntdb/man/ntdbtool.8.xml ++++ b/lib/ntdb/man/ntdbtool.8.xml +@@ -20,10 +20,6 @@ + + + ntdbtool +- +- +- +- ntdbtool + + NTDBFILE + +-- +1.8.3.1 + + +From 56cff0b3f40b98c0d00323eb94a2204af6c48fed Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 18:00:02 +0200 +Subject: [PATCH 08/83] docs: remove duplicate mention of "smbta-util" in + smbta-util manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbta-util.8.xml | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/docs-xml/manpages/smbta-util.8.xml b/docs-xml/manpages/smbta-util.8.xml +index ef38926..3925e87 100644 +--- a/docs-xml/manpages/smbta-util.8.xml ++++ b/docs-xml/manpages/smbta-util.8.xml +@@ -20,10 +20,6 @@ + + + smbta-util +- +- +- +- smbta-util + + COMMANDS + +-- +1.8.3.1 + + +From a2a7991624fa273b01898a26c86f951b928525e6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 18:02:47 +0200 +Subject: [PATCH 09/83] docs: remove duplicate word "trust" from net manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index 2f04deb..aad5fb5 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -877,7 +877,7 @@ net rpc trust create \ + + RPC TRUST DELETE + +-Delete a trust trust object by calling lsaDeleteTrustedDomain. ++Delete a trust object by calling lsaDeleteTrustedDomain. + The can be done on a single server or on two servers at once. + + Options: +-- +1.8.3.1 + + +From 93f32c777c1a36d9d4dc91b6aa1e9e14ee13fb91 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 14 Oct 2013 18:03:14 +0200 +Subject: [PATCH 10/83] docs: remove duplicate word "the" from net manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index aad5fb5..5fa042e 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -1737,7 +1737,7 @@ shares created by other users. + 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 the address of the remote server. ++by enabling the RPC conf mode and specifying the address of the remote server. + + + +-- +1.8.3.1 + + +From 05db55af943e50bd8f7b29f8210f32350239ea59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 15 Oct 2013 15:11:33 +0200 +Subject: [PATCH 11/83] docs: mention more options in winbindd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/winbindd.8.xml | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml +index 1cb49ca..f6aad3f 100644 +--- a/docs-xml/manpages/winbindd.8.xml ++++ b/docs-xml/manpages/winbindd.8.xml +@@ -20,13 +20,13 @@ + + + winbindd +- -D +- -F +- -S +- -i ++ -D|--daemon ++ -F|--foreground ++ -S|--stdout ++ -i|--interactive + -d <debug level> + -s <smb config file> +- -n ++ -n|--no-caching + + + +@@ -135,7 +135,7 @@ hosts: files wins + + + +- -D ++ -D|--daemon + If specified, this parameter causes + the server to operate as a daemon. That is, it detaches + itself and runs in the background on the appropriate port. +@@ -145,7 +145,7 @@ hosts: files wins + + + +- -F ++ -F|--foreground + If specified, this parameter causes + the main winbindd process to not daemonize, + i.e. double-fork and disassociate with the terminal. +@@ -160,7 +160,7 @@ hosts: files wins + + + +- -S ++ -S|--stdout + If specified, this parameter causes + winbindd to log to standard output rather + than a file. +@@ -171,7 +171,7 @@ hosts: files wins + &stdarg.help; + + +- -i ++ -i|--interactive + Tells winbindd to not + become a daemon and detach from the current terminal. This + option is used by developers when interactive debugging +@@ -182,7 +182,7 @@ hosts: files wins + + + +- -n ++ -n|--no-caching + Disable some caching. This means winbindd will + often have to wait for a response from the domain controller + before it can respond to a client and this thus makes things +-- +1.8.3.1 + + +From b5fa1139a4e9ef7bd79ace6efe7bf06af595daa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 15:19:59 +0100 +Subject: [PATCH 12/83] docs: mention --no-process-group in winbindd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/winbindd.8.xml | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml +index f6aad3f..fd644c3 100644 +--- a/docs-xml/manpages/winbindd.8.xml ++++ b/docs-xml/manpages/winbindd.8.xml +@@ -27,6 +27,7 @@ + -d <debug level> + -s <smb config file> + -n|--no-caching ++ --no-process-group + + + +@@ -194,6 +195,12 @@ hosts: files wins + + + ++ ++ --no-process-group ++ Do not create a new process group for winbindd. ++ ++ ++ + + + +-- +1.8.3.1 + + +From 4f790b10d5a6737f1b5978fca27d78a0b27aa75d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:23:03 +0100 +Subject: [PATCH 13/83] docs: mention --dc-info in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index f970a5e..2df86ca 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -27,6 +27,7 @@ + --ccache-save + --change-user-password + -D domain ++ --dc-info domain + --domain domain + --dsgetdcname domain + -g +@@ -142,6 +143,12 @@ + + + ++ --dc-info domain ++ Displays information about the current domain controller for a domain. ++ ++ ++ ++ + --domain name + This parameter sets the domain on which any specified + operations will performed. If special domain name '.' is used to represent +-- +1.8.3.1 + + +From 824c468261a3d61732fea88a5d6cfb9aa5c7ed94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:23:20 +0100 +Subject: [PATCH 14/83] docs: mention --krb5ccname option in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index 2df86ca..4de3c81 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -40,6 +40,7 @@ + -i user + -I ip + -K user%password ++ --krb5ccname cctype + --lanman + -m + -n name +@@ -246,6 +247,13 @@ + + + ++ --krb5ccname KRB5CCNAME ++ Allows to request a sepcific kerberos credential ++ cache type used for authentication. ++ ++ ++ ++ + --lanman + Use lanman cryptography for user authentication. + +-- +1.8.3.1 + + +From fa47e425132f6022cd41118e2c6ac34181adc4a6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:29:10 +0100 +Subject: [PATCH 15/83] docs: mention logoff options in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index 4de3c81..cb1812f 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -42,6 +42,9 @@ + -K user%password + --krb5ccname cctype + --lanman ++ --logoff ++ --logoff-uid uid ++ --logoff-user username + -m + -n name + -N netbios-name +@@ -260,6 +263,24 @@ + + + ++ --logoff ++ Logoff a user. ++ ++ ++ ++ ++ --logoff-uid UID ++ Define user uid used during logoff request. ++ ++ ++ ++ ++ --logoff-user USERNAME ++ Define username used during logoff request. ++ ++ ++ ++ + -m|--trusted-domains + Produce a list of domains trusted by the + Windows NT server winbindd +-- +1.8.3.1 + + +From 7c4c66853f4f0fa426d11d01bc4732186501d6ec Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:33:19 +0100 +Subject: [PATCH 16/83] docs: mention --lookup-sids in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index cb1812f..a3d4d5f 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -45,6 +45,7 @@ + --logoff + --logoff-uid uid + --logoff-user username ++ --lookup-sids + -m + -n name + -N netbios-name +@@ -281,6 +282,13 @@ + + + ++ --lookup-sids SID1,SID2... ++ Looks up SIDs. SIDs must be specified as ASCII strings in the traditional Microsoft ++ format. For example, S-1-5-21-1455342024-3071081365-2475485837-500. ++ ++ ++ ++ + -m|--trusted-domains + Produce a list of domains trusted by the + Windows NT server winbindd +-- +1.8.3.1 + + +From 7d41f1c4d30eef9fa20a7741be1cb50e566b40cb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:36:21 +0100 +Subject: [PATCH 17/83] docs: mention --pam-logon in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index a3d4d5f..a091e94 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -54,6 +54,7 @@ + --own-domain + -p + -P|--ping-dc ++ --pam-logon user%password + -r user + -R|--lookup-rids + -s sid +@@ -343,6 +344,13 @@ + + + ++ --pam-logon username%password ++ Attempt to authenticate a user in the same way ++ pam_winbind would do. ++ ++ ++ ++ + -p|--ping + Check whether winbindd + 8 is still alive. +-- +1.8.3.1 + + +From 27d49babb19759e0d3ef93a2290c049e1ba6aaa3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:40:56 +0100 +Subject: [PATCH 18/83] docs: mention --remove-gid-mapping/--remove-uid-mapping + in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index a091e94..31362ac 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -57,6 +57,8 @@ + --pam-logon user%password + -r user + -R|--lookup-rids ++ --remove-gid-mapping gid,sid ++ --remove-uid-mapping uid,sid + -s sid + --separator + --set-auth-user user%password +@@ -383,6 +385,18 @@ + + + ++ --remove-gid-mapping GID,SID ++ Removes an existing GID to SID mapping from the database. ++ ++ ++ ++ ++ --remove-uid-mapping UID,SID ++ Removes an existing UID to SID mapping from the database. ++ ++ ++ ++ + -s|--sid-to-name sid + Use -s to resolve + a SID to a name. This is the inverse of the -n +-- +1.8.3.1 + + +From 80ab6eaa973df8874567306d1488a813801ab39c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 16:42:56 +0100 +Subject: [PATCH 19/83] docs: mention --set-gid-mapping/--set-uid-mapping in + wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index 31362ac..3dbcfc1 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -62,6 +62,8 @@ + -s sid + --separator + --set-auth-user user%password ++ --set-gid-mapping gid,sid ++ --set-uid-mapping uid,sid + -S sid + --sid-aliases sid + --sid-to-fullname sid +@@ -423,6 +425,18 @@ + + + ++ --set-gid-mapping GID,SID ++ Create a GID to SID mapping in the database. ++ ++ ++ ++ ++ --set-uid-mapping UID,SID ++ Create a UID to SID mapping in the database. ++ ++ ++ ++ + -S|--sid-to-uid sid + Convert a SID to a UNIX user id. If the SID + does not correspond to a UNIX user mapped by +-- +1.8.3.1 + + +From 87e6b5b7fb22c8cf26ae00a315b3e73987f49d55 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:13:38 +0100 +Subject: [PATCH 20/83] docs: mention --sequence in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index 3dbcfc1..1a871c2 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -61,6 +61,7 @@ + --remove-uid-mapping uid,sid + -s sid + --separator ++ --sequence + --set-auth-user user%password + --set-gid-mapping gid,sid + --set-uid-mapping uid,sid +@@ -414,6 +415,13 @@ + + + ++ --sequence ++ This command has been deprecated. Please use ++ the --online-status option instead. ++ ++ ++ ++ + --set-auth-user username%password + Store username and password used by + winbindd8 +-- +1.8.3.1 + + +From c55315a3a26ced194e553b5aa8e97f3a41a308ca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:18:40 +0100 +Subject: [PATCH 21/83] docs: mention --sids-to-unix-ids in wbinfo manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/wbinfo.1.xml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/docs-xml/manpages/wbinfo.1.xml b/docs-xml/manpages/wbinfo.1.xml +index 1a871c2..9907dc6 100644 +--- a/docs-xml/manpages/wbinfo.1.xml ++++ b/docs-xml/manpages/wbinfo.1.xml +@@ -68,6 +68,7 @@ + -S sid + --sid-aliases sid + --sid-to-fullname sid ++ --sids-to-unix-ids sidlist + -t + -u + --uid-info uid +@@ -466,6 +467,14 @@ + + + ++ --sids-to-unix-ids sid1,sid2,sid3... ++ Resolve SIDs to Unix IDs. ++ SIDs must be specified as ASCII strings ++ in the traditional Microsoft format. For example, ++ S-1-5-21-1455342024-3071081365-2475485837-500. ++ ++ ++ + -t|--check-secret + Verify that the workstation trust account + created when the Samba server is added to the Windows NT +-- +1.8.3.1 + + +From dac78176f3e28a1cbc513bb77a3454570f7de4e1 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:23:23 +0100 +Subject: [PATCH 22/83] docs: remove unsupported options from nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index f1ab3e3..7aabfa6 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -23,10 +23,7 @@ + -D + -F + -S +- -a + -i +- -o +- -h + -V + -d <debug level> + -H <lmhosts file> +-- +1.8.3.1 + + +From 77eae60bd9a6b7e1d5248b5b0984d38a54de9c3e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:25:04 +0100 +Subject: [PATCH 23/83] docs: mention --daemon in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index 7aabfa6..cc5f83d 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -20,7 +20,7 @@ + + + nmbd +- -D ++ -D|--daemon + -F + -S + -i +@@ -78,7 +78,7 @@ + + + +- -D ++ -D|--daemon + If specified, this parameter causes + nmbd to operate as a daemon. That is, + it detaches itself and runs in the background, fielding +-- +1.8.3.1 + + +From 28758deda94f28bd0bd188f8277807b8d2ccf829 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:25:52 +0100 +Subject: [PATCH 24/83] docs: mention --foreground in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index cc5f83d..9f607ab 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -21,7 +21,7 @@ + + nmbd + -D|--daemon +- -F ++ -F|--foreground + -S + -i + -V +@@ -90,7 +90,7 @@ + + + +- -F ++ -F|--foreground + If specified, this parameter causes + the main nmbd process to not daemonize, + i.e. double-fork and disassociate with the terminal. +-- +1.8.3.1 + + +From fd8d8b95f8b5b21b4e46836dc6becef480737dc2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:27:28 +0100 +Subject: [PATCH 25/83] docs: mention --hosts in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index 9f607ab..283ebc2 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -26,7 +26,7 @@ + -i + -V + -d <debug level> +- -H <lmhosts file> ++ -H|--hosts <lmhosts file> + -l <log directory> + -p <port number> + -s <configuration file> +@@ -125,7 +125,7 @@ + &stdarg.help; + + +- -H <filename> ++ -H|--hosts <filename> + NetBIOS lmhosts file. The lmhosts + file is a list of NetBIOS names to IP addresses that + is loaded by the nmbd server and used via the name +-- +1.8.3.1 + + +From ea99d8a256df7faaedc5b8903fe183f4dcbde296 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:28:15 +0100 +Subject: [PATCH 26/83] docs: mention --interactive in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index 283ebc2..62f3380 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -23,7 +23,7 @@ + -D|--daemon + -F|--foreground + -S +- -i ++ -i|--interactive + -V + -d <debug level> + -H|--hosts <lmhosts file> +@@ -112,7 +112,7 @@ + + + +- -i ++ -i|--interactive + If this parameter is specified it causes the + server to run "interactively", not as a daemon, even if the + server is executed on the command line of a shell. Setting this +-- +1.8.3.1 + + +From a624426d86cf2da69ba2e03506b5f252d32adb11 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:29:37 +0100 +Subject: [PATCH 27/83] docs: mention --log-stdout in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index 62f3380..715796d 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -22,7 +22,7 @@ + nmbd + -D|--daemon + -F|--foreground +- -S ++ -S|--log-stdout + -i|--interactive + -V + -d <debug level> +@@ -105,7 +105,7 @@ + + + +- -S ++ -S|--log-stdout + If specified, this parameter causes + nmbd to log to standard output rather + than a file. +-- +1.8.3.1 + + +From 548d9daeffc83191ea1e6ea51ce63aacffe98c41 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:31:10 +0100 +Subject: [PATCH 28/83] docs: mention --no-process-group in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index 715796d..8540a09 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -30,6 +30,7 @@ + -l <log directory> + -p <port number> + -s <configuration file> ++ --no-process-group + + + +@@ -157,6 +158,12 @@ + won't need help! + + ++ ++ --no-process-group ++ Do not create a new process group for nmbd. ++ ++ ++ + + + +-- +1.8.3.1 + + +From d6a07717a7f2febdd4591fc0c3c1fe8b719963e9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:31:50 +0100 +Subject: [PATCH 29/83] docs: mention --port in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index 8540a09..b7ead70 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -28,7 +28,7 @@ + -d <debug level> + -H|--hosts <lmhosts file> + -l <log directory> +- -p <port number> ++ -p|--port <port number> + -s <configuration file> + --no-process-group + +@@ -150,7 +150,7 @@ + &popt.common.samba; + + +- -p <UDP port number> ++ -p|--port <UDP port number> + UDP port number is a positive integer value. + This option changes the default UDP port number (normally 137) + that nmbd responds to name queries on. Don't +-- +1.8.3.1 + + +From 792ff0029c790fe8b225134b19d320e8392c5895 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:37:05 +0100 +Subject: [PATCH 30/83] docs: remove unsupported options from smbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbd.8.xml | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml +index 0d0c387..cc6e400 100644 +--- a/docs-xml/manpages/smbd.8.xml ++++ b/docs-xml/manpages/smbd.8.xml +@@ -23,14 +23,12 @@ + -F + -S + -i +- -h + -V + -b + -d <debug level> + -l <log directory> + -p <port number(s)> + -P <profiling level> +- -O <socket option> + -s <configuration file> + + +-- +1.8.3.1 + + +From ad46b6689d999651732894968e5e49d045591203 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Thu, 14 Nov 2013 17:49:58 +0100 +Subject: [PATCH 31/83] docs: mention many more options in smbd options. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbd.8.xml | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml +index cc6e400..d73f1db 100644 +--- a/docs-xml/manpages/smbd.8.xml ++++ b/docs-xml/manpages/smbd.8.xml +@@ -19,17 +19,18 @@ + + + smbd +- -D +- -F +- -S +- -i ++ -D|--daemon ++ -F|--foreground ++ -S|--log-stdout ++ -i|--interactive + -V +- -b ++ -b|--build-options + -d <debug level> +- -l <log directory> ++ -l|--log-basename <log directory> + -p <port number(s)> + -P <profiling level> + -s <configuration file> ++ --no-process-group + + + +@@ -79,7 +80,7 @@ + + + +- -D ++ -D|--daemon + If specified, this parameter causes + the server to operate as a daemon. That is, it detaches + itself and runs in the background, fielding requests +@@ -92,7 +93,7 @@ + + + +- -F ++ -F|--foreground + If specified, this parameter causes + the main smbd process to not daemonize, + i.e. double-fork and disassociate with the terminal. +@@ -107,14 +108,14 @@ + + + +- -S ++ -S|--log-stdout + If specified, this parameter causes + smbd to log to standard output rather + than a file. + + + +- -i ++ -i|--interactive + If this parameter is specified it causes the + server to run "interactively", not as a daemon, even if the + server is executed on the command line of a shell. Setting this +@@ -130,7 +131,13 @@ + &stdarg.help; + + +- -b ++ --no-process-group ++ Do not create a new process group for smbd. ++ ++ ++ ++ ++ -b|--build-options + Prints information about how + Samba was built. + +-- +1.8.3.1 + + +From 7c473ac293a44896181d9d2619b922815433c77d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 12:07:48 +0100 +Subject: [PATCH 32/83] docs: mention --numeric in smbstatus manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbstatus.1.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/docs-xml/manpages/smbstatus.1.xml b/docs-xml/manpages/smbstatus.1.xml +index b0d07d2..126d0b2 100644 +--- a/docs-xml/manpages/smbstatus.1.xml ++++ b/docs-xml/manpages/smbstatus.1.xml +@@ -31,6 +31,7 @@ + -f + -s <configuration file> + -u <username> ++ -n|--numeric + + + +@@ -121,6 +122,13 @@ + + + ++ ++ -n|--numeric ++ causes smbstatus to display numeric UIDs and GIDs instead of ++ resolving them to names. ++ ++ ++ + + + +-- +1.8.3.1 + + +From 5f606e7e9ccd11949ae78a0a44f47be578116f89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 12:11:21 +0100 +Subject: [PATCH 33/83] docs: mention -R|--profile-rates in smbstatus manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbstatus.1.xml | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/smbstatus.1.xml b/docs-xml/manpages/smbstatus.1.xml +index 126d0b2..d4213b6 100644 +--- a/docs-xml/manpages/smbstatus.1.xml ++++ b/docs-xml/manpages/smbstatus.1.xml +@@ -32,6 +32,7 @@ + -s <configuration file> + -u <username> + -n|--numeric ++ -R|--profile-rates + + + +@@ -51,12 +52,19 @@ + + + -P|--profile +- If samba has been compiled with the +- profiling option, print only the contents of the profiling ++ If samba has been compiled with the ++ profiling option, print only the contents of the profiling + shared memory area. + + + ++ -R|--profile-rates ++ If samba has been compiled with the ++ profiling option, print the contents of the profiling ++ shared memory area and the call rates. ++ ++ ++ + -b|--brief + gives brief output. + +-- +1.8.3.1 + + +From 9dcbc77f5a79d148a7346c361ad2790ab8a40555 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 12:57:06 +0100 +Subject: [PATCH 34/83] docs: mention -S|--setsddl in sharesec manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/sharesec.1.xml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/docs-xml/manpages/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml +index e83e6b3..8f29cba 100644 +--- a/docs-xml/manpages/sharesec.1.xml ++++ b/docs-xml/manpages/sharesec.1.xml +@@ -35,6 +35,7 @@ + -V, --version + -?, --help + --usage ++ -S, --setsddl=STRING + + + +@@ -113,6 +114,13 @@ + + + ++ ++ -S|--setsddl=STRING ++ ++ Set security descriptor by providing ACL in SDDL format. ++ ++ ++ + &stdarg.help; + &stdarg.server.debug; + &popt.common.samba; +-- +1.8.3.1 + + +From d692389ea57724bd71caadb62e0231993188d34f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 12:59:49 +0100 +Subject: [PATCH 35/83] docs: mention -V|--viewsddl in sharesec manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/sharesec.1.xml | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/sharesec.1.xml b/docs-xml/manpages/sharesec.1.xml +index 8f29cba..f73fba2 100644 +--- a/docs-xml/manpages/sharesec.1.xml ++++ b/docs-xml/manpages/sharesec.1.xml +@@ -32,10 +32,11 @@ + -d, --debuglevel=DEBUGLEVEL + -s, --configfile=CONFIGFILE + -l, --log-basename=LOGFILEBASE +- -V, --version ++ --version + -?, --help + --usage + -S, --setsddl=STRING ++ -V, --viewsddl + + + +@@ -121,6 +122,13 @@ + + + ++ ++ -V|--viewsddl ++ ++ List a share acl in SDDL format. ++ ++ ++ + &stdarg.help; + &stdarg.server.debug; + &popt.common.samba; +-- +1.8.3.1 + + +From ffe94e363375aa47cd72d715309f6568067482fe Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 13:03:20 +0100 +Subject: [PATCH 36/83] docs: mention -p in dbwrap-tool manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/dbwrap_tool.1.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml +index 07d42be..b8280ac 100644 +--- a/docs-xml/manpages/dbwrap_tool.1.xml ++++ b/docs-xml/manpages/dbwrap_tool.1.xml +@@ -19,7 +19,7 @@ + + + dbwrap_tool +- --persistent ++ -p|--persistent + -d <debug level> + -s <config file> + -l <log file base> +@@ -70,7 +70,7 @@ + + + +- --persistent ++ -p|--persistent + Open the database as a persistent database. + If this option is not specified, the database is opened as + non-persistent. +-- +1.8.3.1 + + +From 22fcc536a568283b0d2c8b1772399fef7bc63406 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 15:15:41 +0100 +Subject: [PATCH 37/83] docs: bring samba entity popt.common.credentials in + line with popt_common_credentials. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This adds documentation of the following parameters to all manpages of binaries that +actually use popt_common_credentials: + +-S|--signing +-e|--encrypt +-P|--machinepass +--pw-nt-hash + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/build/DTD/samba.entities | 35 +++++++++++++++++++++++++++++++++++ + 1 file changed, 35 insertions(+) + +diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities +index c9c6744..8ddae70 100644 +--- a/docs-xml/build/DTD/samba.entities ++++ b/docs-xml/build/DTD/samba.entities +@@ -464,6 +464,37 @@ Try to use the credentials cached by winbind. + + '> + ++ ++-S|--signing on|off|required ++Set the client signing state. ++ ++ ++'> ++ ++ ++-P|--machine-pass ++Use stored machine account password. ++ ++ ++'> ++ ++ ++-e|--encrypt ++Encrypt SMB transport (UNIX extended servers only). ++ ++ ++'> ++ ++ ++--pw-nt-hash ++The supplied password is the NT hash. ++ ++ ++'> + + +@@ -478,6 +509,10 @@ Try to use the credentials cached by winbind. + &stdarg.useccache; + &stdarg.authfile; + &stdarg.username; ++&stdarg.signing; ++&stdarg.machinepass; ++&stdarg.encrypt; ++&stdarg.pwnthash; + '> + + +-- +1.8.3.1 + + +From 7173604e9e20ee4826622f8f1dd3e3194ee3588f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 16:06:36 +0100 +Subject: [PATCH 38/83] docs: remove now duplicate mention for 4 credential + options in samba-regedit manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/samba-regedit.8.xml | 18 ------------------ + 1 file changed, 18 deletions(-) + +diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml +index e7ec761..c40b2ec 100644 +--- a/docs-xml/manpages/samba-regedit.8.xml ++++ b/docs-xml/manpages/samba-regedit.8.xml +@@ -70,25 +70,7 @@ + Set smb.conf option from command line. + + &popt.common.connection; +- +- -S|--signing +- Set the client signing state. +- +- +- -P|--machine-pass +- Use stored machine account password. +- + &popt.common.credentials; +- +- -e|--encrypt +- Encrypt SMB transport (UNIX extended servers only). +- +- +- +- --pw-nt-hash +- The supplied password is the NT hash. +- +- + + + +-- +1.8.3.1 + + +From 8a4d846f1dca6ecbc7d9411f3e26d79a8622e5c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 16:07:41 +0100 +Subject: [PATCH 39/83] docs: add missing &popt.common.samba entity to + smbcontrol manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcontrol.1.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml +index e2c7939..be8dd0f 100644 +--- a/docs-xml/manpages/smbcontrol.1.xml ++++ b/docs-xml/manpages/smbcontrol.1.xml +@@ -51,6 +51,7 @@ + + &stdarg.help; + &stdarg.configfile; ++ &popt.common.samba; + + -i + Run interactively. Individual commands +-- +1.8.3.1 + + +From 23516cfbdde6d38fc710fd3a47fdc155e657dc47 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 16:08:10 +0100 +Subject: [PATCH 40/83] docs: add missing &popt.common.connection entity to + smbcacls manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcacls.1.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml +index 7770fa2..e504dd7 100644 +--- a/docs-xml/manpages/smbcacls.1.xml ++++ b/docs-xml/manpages/smbcacls.1.xml +@@ -178,6 +178,7 @@ + &stdarg.server.debug; + &popt.common.samba; + &popt.common.credentials; ++ &popt.common.connection; + + + +-- +1.8.3.1 + + +From 743e9a847e1014e2722c650f94d99fa277d7fa9a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 16:40:36 +0100 +Subject: [PATCH 41/83] docs: remove more duplicate options from samba-regedit + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/samba-regedit.8.xml | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) + +diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml +index c40b2ec..acf8c53 100644 +--- a/docs-xml/manpages/samba-regedit.8.xml ++++ b/docs-xml/manpages/samba-regedit.8.xml +@@ -56,19 +56,12 @@ + OPTIONS + + &stdarg.help; ++ &stdarg.client.debug; + + --usage + Display brief usage message. + +- +- -d|--debuglevel=<debuglevel> +- Set debug level. +- + &popt.common.samba; +- +- --option=<parameter>=<value> +- Set smb.conf option from command line. +- + &popt.common.connection; + &popt.common.credentials; + +-- +1.8.3.1 + + +From deacd68cce662d0780eaa255fd51fc4f5f5ee629 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Fri, 15 Nov 2013 16:57:52 +0100 +Subject: [PATCH 42/83] docs: add new popt.autohelp entity. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/build/DTD/samba.entities | 28 +++++++++++++++++++++------- + 1 file changed, 21 insertions(+), 7 deletions(-) + +diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities +index 8ddae70..cb683d1 100644 +--- a/docs-xml/build/DTD/samba.entities ++++ b/docs-xml/build/DTD/samba.entities +@@ -496,13 +496,6 @@ Try to use the credentials cached by winbind. + + '> + +- +--?|--help +-Print a summary of command line options. +- +-'> +- + + ++ ++-?|--help ++Print a summary of command line options. ++ ++ ++'> ++ ++ ++--usage ++Display brief usage message. ++ ++ ++'> ++ ++ ++ + + OpenLDAP'> + smbd'> +-- +1.8.3.1 + + +From c71fd4a9f49bf5cf2cef7874789e95b0603bbaa4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 11:40:35 +0100 +Subject: [PATCH 43/83] docs: mention --change-sid|--new-sid in profiles + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/profiles.1.xml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/profiles.1.xml b/docs-xml/manpages/profiles.1.xml +index 311c8ff..83358a8 100644 +--- a/docs-xml/manpages/profiles.1.xml ++++ b/docs-xml/manpages/profiles.1.xml +@@ -21,8 +21,8 @@ + + profiles + -v +- -c SID +- -n SID ++ -c|--change-sid SID ++ -n|--new-sid SID + file + + +@@ -58,6 +58,7 @@ + + + -c SID1 -n SID2 ++ --change-sid SID1 --new-sid SID2 + Change all occurrences of SID1 in file by SID2. + + +-- +1.8.3.1 + + +From ca6776d341a5e98b30a9c544c91e89ad062291b3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 11:41:00 +0100 +Subject: [PATCH 44/83] docs: use popt.samba.common entity in profiles manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/profiles.1.xml | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/profiles.1.xml b/docs-xml/manpages/profiles.1.xml +index 83358a8..c448eb5 100644 +--- a/docs-xml/manpages/profiles.1.xml ++++ b/docs-xml/manpages/profiles.1.xml +@@ -63,8 +63,9 @@ + + + +- &stdarg.help; +- ++ &popt.common.samba.client; ++ &popt.autohelp; ++ + + + +-- +1.8.3.1 + + +From 1e4fb44c97eddb28aad903ddbfe0f05229f5802e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 11:44:28 +0100 +Subject: [PATCH 45/83] docs: use popt.autohelp in smbtree manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbtree.1.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/smbtree.1.xml b/docs-xml/manpages/smbtree.1.xml +index b99c4b1..5e9b639 100644 +--- a/docs-xml/manpages/smbtree.1.xml ++++ b/docs-xml/manpages/smbtree.1.xml +@@ -70,7 +70,7 @@ + &stdarg.server.debug; + &popt.common.samba; + &popt.common.credentials; +- &stdarg.help; ++ &popt.autohelp; + + + +-- +1.8.3.1 + + +From def43ad250168790fe3db868c0f688ff04f0fefa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 11:51:55 +0100 +Subject: [PATCH 46/83] docs: mention --update and --encrypt in smbget manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbget.1.xml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/docs-xml/manpages/smbget.1.xml b/docs-xml/manpages/smbget.1.xml +index b805b4c..a277712 100644 +--- a/docs-xml/manpages/smbget.1.xml ++++ b/docs-xml/manpages/smbget.1.xml +@@ -35,6 +35,7 @@ + -v, --verbose + -b, --blocksize + -O, --stdout ++ -U, --update + -?, --help + --usage + smb://host/share/path/to/file +@@ -150,6 +151,14 @@ + --usage + Display brief usage message + ++ ++ ++ -U, --update ++ Download only when remote file is newer than local file or local file is missing. ++ ++ ++ &stdarg.encrypt; ++ + + + +-- +1.8.3.1 + + +From 51fa7800d3b9f84b962d396270391a8cfd4d5a84 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 11:59:54 +0100 +Subject: [PATCH 47/83] docs: mention more long option names in smbcquotas + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcquotas.1.xml | 32 +++++++++++++++++--------------- + 1 file changed, 17 insertions(+), 15 deletions(-) + +diff --git a/docs-xml/manpages/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml +index 23328b4..8c76939 100644 +--- a/docs-xml/manpages/smbcquotas.1.xml ++++ b/docs-xml/manpages/smbcquotas.1.xml +@@ -20,13 +20,13 @@ + + smbcquotas + //server/share +- -u user +- -L +- -F +- -S QUOTA_SET_COMMAND +- -n +- -t +- -v ++ -u|--user user ++ -L|--list ++ -F|--fs ++ -S|--set QUOTA_SET_COMMAND ++ -n|--numeric ++ -t|--test-args ++ -v|--verbose + + -d debuglevel + -s configfile +@@ -60,7 +60,7 @@ + + + +- -u user ++ -u|--user user + Specifies the user of whom the quotas are get or set. + By default the current user's username will be used. + +@@ -68,51 +68,53 @@ + + + +- -L ++ -L|--list + Lists all quota records of the share. + + + + + +- -F ++ -F|--fs + Show the share quota status and default limits. + + + + + +- -S QUOTA_SET_COMMAND ++ -S|--set QUOTA_SET_COMMAND + This command sets/modifies quotas for a user or on the share, + depending on the QUOTA_SET_COMMAND parameter which is described later. + + + + +- -n ++ -n|--numeric + This option displays all QUOTA information in numeric + format. The default is to convert SIDs to names and QUOTA limits + to a readable string format. + + + +- -t ++ -t|--test-args + + Don't actually do anything, only validate the correctness of the arguments. + + + + +- -v ++ -v|--verbose + + Be verbose. + + + +- &stdarg.help; ++ + &stdarg.server.debug; + &popt.common.samba; + &popt.common.credentials; ++ &popt.autohelp; ++ + + + +-- +1.8.3.1 + + +From 0a7eff9cd77516368a1b1b7578bed64c3768b0da Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:10:29 +0100 +Subject: [PATCH 48/83] docs: mention -B|--browse to smbclient manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbclient.1.xml | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml +index b9e55e9..d5a7068 100644 +--- a/docs-xml/manpages/smbclient.1.xml ++++ b/docs-xml/manpages/smbclient.1.xml +@@ -343,7 +343,13 @@ + cannot be negotiated. + + +- ++ ++ ++ -B|--browse ++ Browse SMB servers using DNS. ++ ++ ++ + &stdarg.client.debug; + &popt.common.samba; + &popt.common.credentials; +-- +1.8.3.1 + + +From 5cab201a16663e9d91e4501124d6aeeaaa71e189 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:12:23 +0100 +Subject: [PATCH 49/83] docs: better document -e|--encrypt option globally. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This is taken from smbclient manpage. + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/build/DTD/samba.entities | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities +index cb683d1..1e852ec 100644 +--- a/docs-xml/build/DTD/samba.entities ++++ b/docs-xml/build/DTD/samba.entities +@@ -483,7 +483,14 @@ Try to use the credentials cached by winbind. + + -e|--encrypt +-Encrypt SMB transport (UNIX extended servers only). ++ ++This command line parameter requires the remote ++server support the UNIX extensions or that the SMB3 protocol has been selected. ++Requests that the connection be encrypted. Negotiates SMB encryption using either ++SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for ++the encryption negotiation (either kerberos or NTLMv1/v2 if given ++domain/username/password triple. Fails the connection if encryption ++cannot be negotiated. + + + '> +-- +1.8.3.1 + + +From a2899b157f6096fd48e0c9a16a8cb7c848736ea4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:16:00 +0100 +Subject: [PATCH 50/83] docs: use popt.autohelp and remove duplicate -e option + from smbclient manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbclient.1.xml | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) + +diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml +index d5a7068..b4f7896 100644 +--- a/docs-xml/manpages/smbclient.1.xml ++++ b/docs-xml/manpages/smbclient.1.xml +@@ -276,8 +276,6 @@ + + + +- &stdarg.help; +- + + -I|--ip-address IP-address + IP address is the address of the server to connect to. +@@ -332,19 +330,6 @@ + + + +- -e|--encrypt +- +- This command line parameter requires the remote +- server support the UNIX extensions or that the SMB3 protocol has been selected. +- Requests that the connection be encrypted. Negotiates SMB encryption using either +- SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for +- the encryption negotiation (either kerberos or NTLMv1/v2 if given +- domain/username/password triple. Fails the connection if encryption +- cannot be negotiated. +- +- +- +- + -B|--browse + Browse SMB servers using DNS. + +@@ -354,6 +339,7 @@ + &popt.common.samba; + &popt.common.credentials; + &popt.common.connection; ++ &popt.autohelp; + + + -t|--timeout <timeout-seconds> +-- +1.8.3.1 + + +From 26da51a94ea329aa78e2d69fc8190954e61e0b26 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:17:36 +0100 +Subject: [PATCH 51/83] docs: remove unsupported -h option from smbcacls + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcacls.1.xml | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml +index e504dd7..71e3f50 100644 +--- a/docs-xml/manpages/smbcacls.1.xml ++++ b/docs-xml/manpages/smbcacls.1.xml +@@ -31,7 +31,6 @@ + --numeric + -t + -U username +- -h + -d + -e + -m|--max-protocol LEVEL +-- +1.8.3.1 + + +From 559073e711cad5f895707385cc355440e21513d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:18:34 +0100 +Subject: [PATCH 52/83] docs: use popt.autohelp entity in smbcacls manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcacls.1.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml +index 71e3f50..3c00363 100644 +--- a/docs-xml/manpages/smbcacls.1.xml ++++ b/docs-xml/manpages/smbcacls.1.xml +@@ -173,11 +173,11 @@ + + + +- &stdarg.help; + &stdarg.server.debug; + &popt.common.samba; + &popt.common.credentials; + &popt.common.connection; ++ &popt.autohelp; + + + +-- +1.8.3.1 + + +From 019deb1e1acedb6ec522baad85592c17f2f78268 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:21:24 +0100 +Subject: [PATCH 53/83] docs: remove duplicate -e option from smbcacls manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcacls.1.xml | 12 ------------ + 1 file changed, 12 deletions(-) + +diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml +index 3c00363..0b8fe94 100644 +--- a/docs-xml/manpages/smbcacls.1.xml ++++ b/docs-xml/manpages/smbcacls.1.xml +@@ -141,18 +141,6 @@ + + + +- -e +- This command line parameter requires the remote +- server support the UNIX extensions or that the SMB3 protocol has been selected. +- Requests that the connection be encrypted. Negotiates SMB encryption using either +- SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for +- the encryption negotiation (either kerberos or NTLMv1/v2 if given +- domain/username/password triple. Fails the connection if encryption +- cannot be negotiated. +- +- +- +- + -m|--max-protocol PROTOCOL_NAME + This allows the user to select the + highest SMB protocol level that smbcacls will use to +-- +1.8.3.1 + + +From c7a4feaaf1236dce8de546b5019058efba047e31 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:25:12 +0100 +Subject: [PATCH 54/83] docs: mention --query-security-info|--set-security-info + in smbcacls manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcacls.1.xml | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml +index 0b8fe94..33b8dbd 100644 +--- a/docs-xml/manpages/smbcacls.1.xml ++++ b/docs-xml/manpages/smbcacls.1.xml +@@ -34,6 +34,8 @@ + -d + -e + -m|--max-protocol LEVEL ++ --query-security-info FLAGS ++ --set-security-info FLAGS + + + +@@ -160,7 +162,19 @@ + the arguments. + + +- ++ ++ ++ --query-security-info FLAGS ++ The security-info flags for queries. ++ ++ ++ ++ ++ --set-security-info FLAGS ++ The security-info flags for queries. ++ ++ ++ + &stdarg.server.debug; + &popt.common.samba; + &popt.common.credentials; +-- +1.8.3.1 + + +From 94b26e6d7b22396ad220ddd1ed359376fc151458 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:35:16 +0100 +Subject: [PATCH 55/83] docs: mention --sddl and --domain-sid in smbcacls + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcacls.1.xml | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml +index 33b8dbd..1f7aaf2 100644 +--- a/docs-xml/manpages/smbcacls.1.xml ++++ b/docs-xml/manpages/smbcacls.1.xml +@@ -36,6 +36,8 @@ + -m|--max-protocol LEVEL + --query-security-info FLAGS + --set-security-info FLAGS ++ --sddl ++ --domain-sid SID + + + +@@ -175,6 +177,18 @@ + + + ++ ++ --sddl ++ Output and input acls in sddl format. ++ ++ ++ ++ ++ --domain-sid SID ++ SID used for sddl processing. ++ ++ ++ + &stdarg.server.debug; + &popt.common.samba; + &popt.common.credentials; +-- +1.8.3.1 + + +From fb051ee29a55c6d72739bc895f05add50f2054d5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:39:00 +0100 +Subject: [PATCH 56/83] docs: remove unsupported -h option and use + popt.autohelp entity in rpcclient manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/rpcclient.1.xml | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml +index 7193a90..76bcbc2 100644 +--- a/docs-xml/manpages/rpcclient.1.xml ++++ b/docs-xml/manpages/rpcclient.1.xml +@@ -23,7 +23,6 @@ + -A authfile + -c <command string> + -d debuglevel +- -h + -l logdir + -N + -s <smb config file> +@@ -98,7 +97,7 @@ + &popt.common.samba; + &popt.common.credentials; + &popt.common.connection; +- &stdarg.help; ++ &popt.autohelp; + + + +-- +1.8.3.1 + + +From db62a5841a4892dc2d45ff027cac346c0e67c5aa Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:51:42 +0100 +Subject: [PATCH 57/83] docs: document all long option names in nmblookup + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmblookup.1.xml | 41 +++++++++++++++++++-------------------- + 1 file changed, 20 insertions(+), 21 deletions(-) + +diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml +index 12c707f..b110b28 100644 +--- a/docs-xml/manpages/nmblookup.1.xml ++++ b/docs-xml/manpages/nmblookup.1.xml +@@ -20,19 +20,18 @@ + + + nmblookup +- -M +- -R +- -S +- -r +- -A +- -h +- -B <broadcast address> +- -U <unicast address> ++ -M|--master-browser ++ -R|--recursion ++ -S|--status ++ -r|--root-port ++ -A|--lookup-by-ip ++ -B|--broadcast <broadcast address> ++ -U|--unicast <unicast address> + -d <debug level> + -s <smb config file> + -i <NetBIOS scope> +- -T +- -f ++ -T|--translate ++ -f|--flags + name + + +@@ -55,8 +54,8 @@ + + + +- -M +- Searches for a master browser by looking ++ -M|--master-browser ++ Searches for a master browser by looking + up the NetBIOS name with a + type of 0x1d. If + name is "-" then it does a lookup on the special name +@@ -67,7 +66,7 @@ + + + +- -R ++ -R|--recursion + Set the recursion desired bit in the packet + to do a recursive lookup. This is used when sending a name + query to a machine running a WINS server and the user wishes +@@ -78,7 +77,7 @@ + + + +- -S ++ -S|--status + Once the name query has returned an IP + address then do a node status query as well. A node status + query returns the NetBIOS names registered by a host. +@@ -87,7 +86,7 @@ + + + +- -r ++ -r|--root-port + Try and bind to UDP port 137 to send and receive UDP + datagrams. The reason for this option is a bug in Windows 95 + where it ignores the source port of the requesting packet +@@ -100,7 +99,7 @@ + + + +- -A ++ -A|--lookup-by-ip + Interpret name as + an IP Address and do a node status query on this address. + +@@ -109,10 +108,10 @@ + + + &popt.common.connection; +- &stdarg.help; ++ &popt.autohelp; + + +- -B <broadcast address> ++ -B|--broadcast <broadcast address> + Send the query to the given broadcast address. Without + this option the default behavior of nmblookup is to send the + query to the broadcast address of the network interfaces as +@@ -126,7 +125,7 @@ + + + +- -U <unicast address> ++ -U|--unicast <unicast address> + Do a unicast query to the specified address or + host unicast address. This option + (along with the -R option) is needed to +@@ -137,7 +136,7 @@ + &popt.common.samba; + + +- -T ++ -T|--translate + This causes any IP addresses found in the + lookup to be looked up via a reverse DNS lookup into a + DNS name, and printed out before each +@@ -148,7 +147,7 @@ + + + +- -f ++ -f|--flags + + Show which flags apply to the name that has been looked up. Possible + answers are zero or more of: Response, Authoritative, +-- +1.8.3.1 + + +From f9cdbfb27325d4e84d866fdee2a7bc729c25e24e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 12:55:02 +0100 +Subject: [PATCH 58/83] docs: use popt.autohelp entity in dbwrap-tools manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/dbwrap_tool.1.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml +index b8280ac..8e979f6 100644 +--- a/docs-xml/manpages/dbwrap_tool.1.xml ++++ b/docs-xml/manpages/dbwrap_tool.1.xml +@@ -77,7 +77,7 @@ + + + &popt.common.samba.client; +- &stdarg.help; ++ &popt.autohelp; + + + +-- +1.8.3.1 + + +From 0674ef7c5b3551564894ee7b8810ee3c18857922 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 13:45:38 +0100 +Subject: [PATCH 59/83] docs: fix testparm manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/testparm.1.xml | 38 +++++++++++++++++++++++--------------- + 1 file changed, 23 insertions(+), 15 deletions(-) + +diff --git a/docs-xml/manpages/testparm.1.xml b/docs-xml/manpages/testparm.1.xml +index b258c20..ce69dc7 100644 +--- a/docs-xml/manpages/testparm.1.xml ++++ b/docs-xml/manpages/testparm.1.xml +@@ -20,10 +20,9 @@ + + + testparm +- -s +- -h +- -v +- -t <encoding> ++ -s|--suppress-prompt ++ --help ++ -v|--verbose + config filename + hostname hostIP + +@@ -63,17 +62,19 @@ + + + +- -s ++ -s|--suppress-prompt + Without this option, testparm + will prompt for a carriage return after printing the service + names and before dumping the service definitions. + + +- &stdarg.help; + &stdarg.version; +- ++ &stdarg.option; ++ &popt.autohelp; ++ &stdarg.client.debug; ++ + +- -v ++ -v|--verbose + If this option is specified, testparm + will also output all options that were not used in + smb.conf5 +@@ -81,13 +82,6 @@ + + + +- -t encoding +- +- Output data in specified encoding. +- +- +- +- + --parameter-name parametername + + Dumps the named parameter. If no section-name is set the view +@@ -107,6 +101,20 @@ + + + ++ --show-all-parameters ++ ++ Show the parameters, type, possible values. ++ ++ ++ ++ ++ -l|--skip-logic-checks ++ ++ Skip the global checks. ++ ++ ++ ++ + configfilename + This is the name of the configuration file + to check. If this parameter is not present then the +-- +1.8.3.1 + + +From a0d8cb8f536620a6dbf1fab0093c715c9efaba65 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 13:46:06 +0100 +Subject: [PATCH 60/83] docs: use &popt.autohelp entity in pdbedit manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/pdbedit.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/pdbedit.8.xml b/docs-xml/manpages/pdbedit.8.xml +index 5bb12c4..c59a1cf6 100644 +--- a/docs-xml/manpages/pdbedit.8.xml ++++ b/docs-xml/manpages/pdbedit.8.xml +@@ -503,7 +503,7 @@ account policy value for bad lockout attempt is now 3 + + + +- &stdarg.help; ++ &popt.autohelp; + &stdarg.server.debug; + &popt.common.samba; + +-- +1.8.3.1 + + +From 91d25302b92e01fdba3fa4bc22fea9a8381ae19e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 13:52:59 +0100 +Subject: [PATCH 61/83] docs: fix smbcontrol manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbcontrol.1.xml | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) + +diff --git a/docs-xml/manpages/smbcontrol.1.xml b/docs-xml/manpages/smbcontrol.1.xml +index be8dd0f..234e02d 100644 +--- a/docs-xml/manpages/smbcontrol.1.xml ++++ b/docs-xml/manpages/smbcontrol.1.xml +@@ -19,8 +19,8 @@ + + + smbcontrol +- -i + -s ++ -t|--timeout + + + +@@ -49,15 +49,14 @@ + OPTIONS + + +- &stdarg.help; ++ &popt.autohelp; + &stdarg.configfile; +- &popt.common.samba; ++ &popt.common.samba.client; + +- -i +- Run interactively. Individual commands +- of the form destination message-type parameters can be entered +- on STDIN. An empty command line or a "q" will quit the +- program. ++ -t|--timeout ++ ++ Set timeout to seconds. ++ + + + +-- +1.8.3.1 + + +From 177c2c9c0ffe1ee434afc9d22d4bba12ae55d312 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 14:45:51 +0100 +Subject: [PATCH 62/83] docs: fix ntlm_auth manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/ntlm_auth.1.xml | 42 ++++++++++++++++++++++++++++++++------- + 1 file changed, 35 insertions(+), 7 deletions(-) + +diff --git a/docs-xml/manpages/ntlm_auth.1.xml b/docs-xml/manpages/ntlm_auth.1.xml +index 4ada951..4ce57a2 100644 +--- a/docs-xml/manpages/ntlm_auth.1.xml ++++ b/docs-xml/manpages/ntlm_auth.1.xml +@@ -19,9 +19,6 @@ + + + ntlm_auth +- -d debuglevel +- -l logdir +- -s <smb config file> + + + +@@ -363,10 +360,41 @@ + + + +- &stdarg.server.debug; +- &popt.common.samba; +- &stdarg.help; +- ++ ++ --pam-winbind-conf=FILENAME ++ Define the path to the pam_winbind.conf file. ++ ++ ++ ++ --target-hostname=HOSTNAME ++ Define the target hostname. ++ ++ ++ ++ --target-service=SERVICE ++ Define the target service. ++ ++ ++ ++ --use-cached-creds ++ Whether to use credentials cached by winbindd. ++ ++ ++ ++ --configfile=<configuration file> ++ 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. ++ ++ ++ &stdarg.version; ++ &popt.autohelp; ++ + + + +-- +1.8.3.1 + + +From b04375e725edfd419fa65c96d524b9fb351d5efc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 15:52:35 +0100 +Subject: [PATCH 63/83] docs: use popt.autohelp entity in nmbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/nmbd.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/nmbd.8.xml b/docs-xml/manpages/nmbd.8.xml +index b7ead70..d83fb8f 100644 +--- a/docs-xml/manpages/nmbd.8.xml ++++ b/docs-xml/manpages/nmbd.8.xml +@@ -123,7 +123,7 @@ + given. + + +- &stdarg.help; ++ &popt.autohelp; + + + -H|--hosts <filename> +-- +1.8.3.1 + + +From 25eace39266edcac85c7d65a68dfbb632453b6f6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 15:53:08 +0100 +Subject: [PATCH 64/83] docs: use popt.autohelp entity in winbindd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/winbindd.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/winbindd.8.xml b/docs-xml/manpages/winbindd.8.xml +index fd644c3..c16c998 100644 +--- a/docs-xml/manpages/winbindd.8.xml ++++ b/docs-xml/manpages/winbindd.8.xml +@@ -169,7 +169,7 @@ hosts: files wins + + &stdarg.server.debug; + &popt.common.samba; +- &stdarg.help; ++ &popt.autohelp; + + + -i|--interactive +-- +1.8.3.1 + + +From b649d631793bdd83ff1f3935a45f1617c1a4c3e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 15:53:29 +0100 +Subject: [PATCH 65/83] docs: use popt.autohelp entity in smbd manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/smbd.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/smbd.8.xml b/docs-xml/manpages/smbd.8.xml +index d73f1db..00e65b3 100644 +--- a/docs-xml/manpages/smbd.8.xml ++++ b/docs-xml/manpages/smbd.8.xml +@@ -128,7 +128,7 @@ + + &stdarg.server.debug; + &popt.common.samba; +- &stdarg.help; ++ &popt.autohelp; + + + --no-process-group +-- +1.8.3.1 + + +From 0815f114fbe99144061dc1c8c326fb0ee71f4a76 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 15:53:49 +0100 +Subject: [PATCH 66/83] docs: use popt.autohelp entity in samba.8 manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/samba.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/samba.8.xml b/docs-xml/manpages/samba.8.xml +index 2b53944..da426bb 100644 +--- a/docs-xml/manpages/samba.8.xml ++++ b/docs-xml/manpages/samba.8.xml +@@ -148,7 +148,7 @@ + + + &popt.common.samba.server; +- &stdarg.help; ++ &popt.autohelp; + + + +-- +1.8.3.1 + + +From 0b24a4236c2b865a0cf318fcabb3ce64b93d9409 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 16:00:39 +0100 +Subject: [PATCH 67/83] docs: mention more options in net manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 86 +++++++++++++++++++++++++++++++++++---------- + 1 file changed, 68 insertions(+), 18 deletions(-) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index 5fa042e..ccc993b 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -22,20 +22,25 @@ + + net + <ads|rap|rpc> +- -h +- -w workgroup +- -W myworkgroup +- -U user +- -I ip-address +- -p port ++ -h|--help ++ -w|--workgroup workgroup ++ -W|--myworkgroup myworkgroup ++ -U|--user user ++ -I|--ipaddress ip-address ++ -p|--port port + -n myname + -s conffile +- -S server +- -l +- -P ++ -S|--server server ++ -l|--long ++ -v|--verbose ++ -f|--force ++ -P|--machine-pass + -d debuglevel + -V + --request-timeout seconds ++ -t|--timeout seconds ++ -i|--stdin ++ --tallocreport + + + +@@ -64,7 +69,7 @@ + &stdarg.kerberos; + + +- -w target-workgroup ++ -w|--workgroup target-workgroup + + Sets target workgroup or domain. You have to specify + either this option or the IP address or the name of a server. +@@ -72,21 +77,21 @@ + + + +- -W workgroup ++ -W|--myworkgroup workgroup + + Sets client workgroup or domain + + + + +- -U user ++ -U|--user user + + User name to use + + + + +- -I ip-address ++ -I|--ipaddress ip-address + + IP address of target server to use. You have to + specify either this option or a target workgroup or +@@ -95,7 +100,7 @@ + + + +- -p port ++ -p|--port port + + Port on the target server to connect to (usually 139 or 445). + Defaults to trying 445 first, then 139. +@@ -106,7 +111,7 @@ + &stdarg.configfile; + + +- -S server ++ -S|--server server + + Name of target server. You should specify either + this option or a target workgroup or a target IP address. +@@ -114,14 +119,28 @@ + + + +- -l ++ -l|--long + + When listing data, give more information on each item. + + + + +- -P ++ -v|--verbose ++ ++ When listing data, give more verbose information on each item. ++ ++ ++ ++ ++ -f|--force ++ ++ Enforcing a net command. ++ ++ ++ ++ ++ -P|--machine-pass + + Make queries to the external server using the machine account of the local server. + +@@ -135,7 +154,38 @@ + + + +- &stdarg.server.debug; ++ ++ -t|--timeout 30 ++ ++ Set timeout for client operations to 30 seconds. ++ ++ ++ ++ ++ --use-ccache ++ ++ Try to use the credentials cached by winbind. ++ ++ ++ ++ ++ -i|--stdin ++ ++ Take input for net commands from standard input. ++ ++ ++ ++ ++ --tallocreport ++ ++ Generate a talloc report while processing a net ++ command. ++ ++ ++ ++ &stdarg.encrypt; ++ &popt.common.samba.client; ++ + + + +-- +1.8.3.1 + + +From 7c8dcc5e0f61577becf1954b6abfb72e4689eab2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 16:08:19 +0100 +Subject: [PATCH 68/83] docs: add net rpc vampire specific options in net + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index ccc993b..c9802f8 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -183,6 +183,32 @@ + + + ++ ++ ++ ++ --force-full-repl ++ ++ When calling "net rpc vampire keytab" this option ++ enforces a full re-creation of the generated keytab file. ++ ++ ++ ++ ++ --single-obj-repl ++ ++ When calling "net rpc vampire keytab" this option ++ allows to replicate just a single object to the generated keytab file. ++ ++ ++ ++ ++ --clean-old-entries ++ ++ When calling "net rpc vampire keytab" this option ++ allows to cleanup old entries from the generated keytab file. ++ ++ ++ + &stdarg.encrypt; + &popt.common.samba.client; + +-- +1.8.3.1 + + +From f1e03c2bc1bb34d1918b232035c25cc9e0e6811d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 16:17:32 +0100 +Subject: [PATCH 69/83] docs: add net idmap specific options in net manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index c9802f8..5cc623f9 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -209,6 +209,32 @@ + + + ++ ++ ++ ++ --db ++ Define dbfile for "net idmap" commands. ++ ++ ++ ++ ++ --lock ++ Activates locking of the dbfile for "net idmap check" command. ++ ++ ++ ++ ++ -a|--auto ++ Activates noninteractive mode in "net idmap check". ++ ++ ++ ++ ++ --repair ++ Activates repair mode in "net idmap check". ++ ++ ++ + &stdarg.encrypt; + &popt.common.samba.client; + +-- +1.8.3.1 + + +From e73493c64af9f76fa41b56c154ea973619e97cb0 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 16:22:52 +0100 +Subject: [PATCH 70/83] docs: add net rpc share migrate specific options in net + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 32 ++++++++++++++++++++++++++++++++ + 1 file changed, 32 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index 5cc623f9..6fba00b 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -235,6 +235,38 @@ + + + ++ ++ ++ ++ --acls ++ Includes ACLs to be copied in "net rpc share migrate". ++ ++ ++ ++ ++ --attrs ++ Includes file attributes to be copied in "net rpc share migrate". ++ ++ ++ ++ ++ --timestamps ++ Includes timestamps to be copied in "net rpc share migrate". ++ ++ ++ ++ ++ -X|--exclude DIRECTORY ++ Allows to exclude directories when copying with "net rpc share migrate". ++ ++ ++ ++ ++ --destination SERVERNAME ++ Defines the target servername of migration process (defaults to localhost). ++ ++ ++ + &stdarg.encrypt; + &popt.common.samba.client; + +-- +1.8.3.1 + + +From cb90d1eb8f1ea0fd23f7af4aa1a21447d4772a1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 16:28:10 +0100 +Subject: [PATCH 71/83] docs: add net groupmap set specific options in net + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index 6fba00b..fd13f43 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -267,6 +267,36 @@ + + + ++ ++ ++ ++ -L|--local ++ Sets the type of group mapping to local ++ (used in "net groupmap set"). ++ ++ ++ ++ ++ -D|--domain ++ Sets the type of group mapping to domain ++ (used in "net groupmap set"). ++ ++ ++ ++ ++ -N|--ntname NTNAME ++ Sets the ntname of a group mapping ++ (used in "net groupmap set"). ++ ++ ++ ++ ++ -R|--rid RID ++ Sets the rid of a group mapping ++ (used in "net groupmap set"). ++ ++ ++ + &stdarg.encrypt; + &popt.common.samba.client; + +-- +1.8.3.1 + + +From 57269672d1b52c5a1318619f5b6ccdfb757c161f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 17:11:31 +0100 +Subject: [PATCH 72/83] docs: add net rpc registry check specific options in + net manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index fd13f43..4d43625 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -297,6 +297,29 @@ + + + ++ ++ ++ ++ --reg-version REG_VERSION ++ Assume database version {n|1,2,3} ++ (used in "net registry check"). ++ ++ ++ ++ ++ -o|--output FILENAME ++ Output database file ++ (used in "net registry check"). ++ ++ ++ ++ ++ --wipe ++ Createa a new database from scratch ++ (used in "net registry check"). ++ ++ ++ + &stdarg.encrypt; + &popt.common.samba.client; + +-- +1.8.3.1 + + +From 49ab592097a235d31355bf4e58d2957ee56c5a3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 17:15:57 +0100 +Subject: [PATCH 73/83] docs: add net registry import specific options in net + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/net.8.xml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index 4d43625..ce976b4 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -320,6 +320,15 @@ + + + ++ ++ ++ ++ --precheck PRECHECK_DB_FILENAME ++ Defines filename for database prechecking ++ (used in "net registry import"). ++ ++ ++ + &stdarg.encrypt; + &popt.common.samba.client; + +-- +1.8.3.1 + + +From 19d1a7abcf5ceaf2577952b90ca77eb776bc95d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Mon, 18 Nov 2013 17:26:28 +0100 +Subject: [PATCH 74/83] docs: document remaining undocumented options in net + manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider + +Autobuild-User(master): Andreas Schneider +Autobuild-Date(master): Tue Nov 19 12:05:56 CET 2013 on sn-devel-104 +--- + docs-xml/manpages/net.8.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml +index ce976b4..49cab42 100644 +--- a/docs-xml/manpages/net.8.xml ++++ b/docs-xml/manpages/net.8.xml +@@ -183,6 +183,48 @@ + + + ++ ++ -T|--test ++ Only test command sequence, dry-run. ++ ++ ++ ++ ++ -F|--flags FLAGS ++ Pass down integer flags to a net subcommand. ++ ++ ++ ++ ++ -C|--comment COMMENT ++ Pass down a comment string to a net subcommand. ++ ++ ++ ++ ++ -n|--myname MYNAME ++ Use MYNAME as a requester name for a net subcommand. ++ ++ ++ ++ ++ -c|--container CONTAINER ++ Use a specific AD container for net ads operations. ++ ++ ++ ++ ++ -M|--maxusers MAXUSERS ++ Fill in the maxusers field in net rpc share operations. ++ ++ ++ ++ ++ -r|--reboot ++ Reboot a remote machine after a command has been successfully executed (e.g. in remote join operations). ++ ++ ++ + + + +-- +1.8.3.1 + + +From 7a587e715ae413ce0f44be4c6f63a9e30fe697e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:14:45 +0100 +Subject: [PATCH 75/83] docs: remove duplicate "a" from vfs_cacheprime manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/manpages/vfs_cacheprime.8.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/manpages/vfs_cacheprime.8.xml b/docs-xml/manpages/vfs_cacheprime.8.xml +index b490ba6..b92a6c1 100644 +--- a/docs-xml/manpages/vfs_cacheprime.8.xml ++++ b/docs-xml/manpages/vfs_cacheprime.8.xml +@@ -84,7 +84,7 @@ + + + CAVEATS +- cacheprime is not a a substitute for ++ cacheprime is not a substitute for + a general-purpose readahead mechanism. It is intended for use + only in very specific environments where disk operations must + be aligned and sized to known values (as much as that is possible). +-- +1.8.3.1 + + +From b55b56351d71bb4a4517d857959c7c9d9d2b768c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:17:19 +0100 +Subject: [PATCH 76/83] docs: remove duplicate "the" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/misc/directorynamecachesize.xml | 2 +- + docs-xml/smbdotconf/protocol/ntaclsupport.xml | 2 +- + docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/docs-xml/smbdotconf/misc/directorynamecachesize.xml b/docs-xml/smbdotconf/misc/directorynamecachesize.xml +index 1064b7e..d02c4f5 100644 +--- a/docs-xml/smbdotconf/misc/directorynamecachesize.xml ++++ b/docs-xml/smbdotconf/misc/directorynamecachesize.xml +@@ -5,7 +5,7 @@ + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> + + +- This parameter specifies the the size of the directory name cache. ++ This parameter specifies the size of the directory name cache. + It will be needed to turn this off for *BSD systems. + + +diff --git a/docs-xml/smbdotconf/protocol/ntaclsupport.xml b/docs-xml/smbdotconf/protocol/ntaclsupport.xml +index 1e9cedf..451d5d8 100644 +--- a/docs-xml/smbdotconf/protocol/ntaclsupport.xml ++++ b/docs-xml/smbdotconf/protocol/ntaclsupport.xml +@@ -7,7 +7,7 @@ + This boolean parameter controls whether smbd + 8 will attempt to map + UNIX permissions into Windows NT access control lists. The UNIX +- permissions considered are the the traditional UNIX owner and ++ permissions considered are the traditional UNIX owner and + group permissions, as well as POSIX ACLs set on any files or + directories. This parameter was formally a global parameter in + releases prior to 2.2.2. +diff --git a/docs-xml/smbdotconf/winbind/idmapconfig.xml b/docs-xml/smbdotconf/winbind/idmapconfig.xml +index 5d3605a..30925a2 100644 +--- a/docs-xml/smbdotconf/winbind/idmapconfig.xml ++++ b/docs-xml/smbdotconf/winbind/idmapconfig.xml +@@ -17,7 +17,7 @@ + + + The idmap configuration is hence divided into groups, one group +- for each domain to be configured, and one group with the the ++ for each domain to be configured, and one group with the + asterisk instead of a proper domain name, which specifies the + default configuration that is used to catch all domains that do + not have an explicit idmap configuration of their own. +-- +1.8.3.1 + + +From 25577278211f82a353477c48ea1381cdd16b3b63 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:18:57 +0100 +Subject: [PATCH 77/83] docs: remove duplicate "to" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/misc/rpcserver.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/misc/rpcserver.xml b/docs-xml/smbdotconf/misc/rpcserver.xml +index 4372eea..9a22939 100644 +--- a/docs-xml/smbdotconf/misc/rpcserver.xml ++++ b/docs-xml/smbdotconf/misc/rpcserver.xml +@@ -59,7 +59,7 @@ + Currently in Samba3 we support three daemons, spoolssd, epmd and + lsasd. These daemons can be enabled using the + rpc_daemon option. For spoolssd you have +- to to enable the daemon and proxy the named pipe with: ++ to enable the daemon and proxy the named pipe with: + + + +-- +1.8.3.1 + + +From ced12107e0af429af088cd63b86c8b8b21e83a1a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:20:12 +0100 +Subject: [PATCH 78/83] docs: remove duplicate "not" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/protocol/aclallowexecutealways.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml +index 49d2c48..0c9588e 100644 +--- a/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml ++++ b/docs-xml/smbdotconf/protocol/aclallowexecutealways.xml +@@ -17,7 +17,7 @@ + If this parameter is set to "True", Samba does not check execute permissions on + "open for execution", thus re-establishing the behaviour of Samba 3.6. + This can be useful to smoothen upgrades from older Samba versions to 4.0 and newer. +- This setting is not not meant to be used as a permanent setting, but as a temporary relief: ++ This setting is not meant to be used as a permanent setting, but as a temporary relief: + It is recommended to fix the permissions in the ACLs and reset this parameter to the + default after a certain transition period. + +-- +1.8.3.1 + + +From 59a240513c7d48afb337b102466c539af3f880f3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:33:33 +0100 +Subject: [PATCH 79/83] docs: remove duplicate "or" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml +index 974b6f0..54e7b87 100644 +--- a/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml ++++ b/docs-xml/smbdotconf/misc/fakedirectorycreatetimes.xml +@@ -20,7 +20,7 @@ + timestamp than the object files it contains. + + However, Unix time semantics mean that the create time +- reported by Samba will be updated whenever a file is created or ++ reported by Samba will be updated whenever a file is created + or deleted in the directory. NMAKE finds all object files in + the object directory. The timestamp of the last one built is then + compared to the timestamp of the object directory. If the +-- +1.8.3.1 + + +From 0cf92d476feabb870f67061d38d1027ebc59a852 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:34:05 +0100 +Subject: [PATCH 80/83] docs: remove duplicate "on" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/security/aclgroupcontrol.xml b/docs-xml/smbdotconf/security/aclgroupcontrol.xml +index e62216a..279a57b 100644 +--- a/docs-xml/smbdotconf/security/aclgroupcontrol.xml ++++ b/docs-xml/smbdotconf/security/aclgroupcontrol.xml +@@ -24,7 +24,7 @@ + + + This parameter is best used with the option and also +- on on a share containing directories with the UNIX setgid bit set ++ on a share containing directories with the UNIX setgid bit set + on them, which causes new files and directories created within it to inherit the group + ownership from the containing directory. + +-- +1.8.3.1 + + +From 8d1ff1d73f43d0fd4c2290496389c006afb2de93 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:34:33 +0100 +Subject: [PATCH 81/83] docs: remove duplicate "must" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/security/smbencrypt.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/security/smbencrypt.xml b/docs-xml/smbdotconf/security/smbencrypt.xml +index d556166..51079ae 100644 +--- a/docs-xml/smbdotconf/security/smbencrypt.xml ++++ b/docs-xml/smbdotconf/security/smbencrypt.xml +@@ -21,7 +21,7 @@ + and disabled. This may be set on a per-share + basis, but clients may chose to encrypt the entire session, not + just traffic to a specific share. If this is set to mandatory +- then all traffic to a share must must ++ then all traffic to a share must + be encrypted once the connection has been made to the share. + The server would return "access denied" to all non-encrypted + requests on such a share. Selecting encrypted traffic reduces +-- +1.8.3.1 + + +From 344c59f99996d4e6a23c2cc914377536ea7e9eee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:34:54 +0100 +Subject: [PATCH 82/83] docs: remove duplicate "line" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider +--- + docs-xml/smbdotconf/security/usernamemapscript.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/security/usernamemapscript.xml b/docs-xml/smbdotconf/security/usernamemapscript.xml +index 6df134c..9e2e1a5 100644 +--- a/docs-xml/smbdotconf/security/usernamemapscript.xml ++++ b/docs-xml/smbdotconf/security/usernamemapscript.xml +@@ -8,7 +8,7 @@ + parameter. This parameter + specifies and external program or script that must accept a single + command line option (the username transmitted in the authentication +- request) and return a line line on standard output (the name to which ++ request) and return a line on standard output (the name to which + the account should mapped). In this way, it is possible to store + username map tables in an LDAP or NIS directory services. + +-- +1.8.3.1 + + +From c0bdd8011cc14a03bbddb7ad894219c649a609d9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?G=C3=BCnther=20Deschner?= +Date: Tue, 19 Nov 2013 12:36:53 +0100 +Subject: [PATCH 83/83] docs: remove duplicate "used" from smb.conf manpage. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Guenther + +Signed-off-by: Günther Deschner +Reviewed-by: Andreas Schneider + +Autobuild-User(master): Andreas Schneider +Autobuild-Date(master): Tue Nov 19 14:40:40 CET 2013 on sn-devel-104 +--- + docs-xml/smbdotconf/filename/manglingmethod.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs-xml/smbdotconf/filename/manglingmethod.xml b/docs-xml/smbdotconf/filename/manglingmethod.xml +index f6e2eda..347dc56 100644 +--- a/docs-xml/smbdotconf/filename/manglingmethod.xml ++++ b/docs-xml/smbdotconf/filename/manglingmethod.xml +@@ -6,7 +6,7 @@ + + controls the algorithm used for the generating + the mangled names. Can take two different values, "hash" and +- "hash2". "hash" is the algorithm that was used ++ "hash2". "hash" is the algorithm that was + used in Samba for many years and was the default in Samba 2.2.x "hash2" is + now the default and is newer and considered a better algorithm (generates less collisions) in + the names. Many Win32 applications store the mangled names and so +-- +1.8.3.1 + diff --git a/samba.spec b/samba.spec index 1f09c03..58da8fd 100644 --- a/samba.spec +++ b/samba.spec @@ -1,7 +1,7 @@ # Set --with testsuite or %bcond_without to run the Samba torture testsuite. %bcond_with testsuite -%define main_release 2 +%define main_release 3 %define samba_version 4.1.1 %define talloc_version 2.0.8 @@ -88,6 +88,7 @@ Source201: README.downgrade Patch0: samba-4.1.1-Fix-memset-in-ntdb.patch Patch1: samba-4.1.0-upn.patch Patch2: samba-4.1.2-fix_strict_aliasing.patch +Patch3: samba-4.1.2-doc.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -493,6 +494,7 @@ module necessary to communicate to the Winbind Daemon %patch0 -p1 -b .samba-4.1.1-Fix-memset-in-ntdb.patch %patch1 -p1 -b .samba-4.1.0-upn.patch %patch2 -p1 -b .samba-4.1.2-fix_strict_aliasing.patch +%patch3 -p1 -b .samba-4.1.2-doc.patch %build %global _talloc_lib ,talloc,pytalloc,pytalloc-util @@ -1544,6 +1546,9 @@ rm -rf %{buildroot} %{_mandir}/man8/pam_winbind.8* %changelog +* Mon Nov 18 2013 - Guenther Deschner - 4.1.1-3 +- resolves: #948509 - Fix manpage correctness. + * Fri Nov 15 2013 - Andreas Schneider - 4.1.1-2 - related: #884169 - Fix strict aliasing warnings.