[SCM] Samba Shared Repository - branch v4-1-test updated
Karolin Seeger
kseeger at samba.org
Fri Nov 22 05:45:07 MST 2013
The branch, v4-1-test has been updated
via e99d701 spoolss: accept XPS_PASS datatype used by Windows 8
via e668a11 docs: remove duplicate "used" from smb.conf manpage.
via a68ab7b docs: remove duplicate "line" from smb.conf manpage.
via e28f390 docs: remove duplicate "must" from smb.conf manpage.
via 576e5af docs: remove duplicate "on" from smb.conf manpage.
via 7d1b124 docs: remove duplicate "or" from smb.conf manpage.
via d17b1c1 docs: remove duplicate "not" from smb.conf manpage.
via 5965734 docs: remove duplicate "to" from smb.conf manpage.
via 75186f4 docs: remove duplicate "the" from smb.conf manpage.
via 8a93864 docs: remove duplicate "a" from vfs_cacheprime manpage.
via 2dbe943 docs: document remaining undocumented options in net manpage.
via cfc9d1e docs: add net registry import specific options in net manpage.
via c6d953e docs: add net rpc registry check specific options in net manpage.
via aaee748 docs: add net groupmap set specific options in net manpage.
via 1176b53 docs: add net rpc share migrate specific options in net manpage.
via de44156 docs: add net idmap specific options in net manpage.
via b14e1bc docs: add net rpc vampire specific options in net manpage.
via d24edcd docs: mention more options in net manpage.
via 5def0e7 docs: use popt.autohelp entity in samba.8 manpage.
via 9358b50 docs: use popt.autohelp entity in smbd manpage.
via 943d390 docs: use popt.autohelp entity in winbindd manpage.
via 8d7651b docs: use popt.autohelp entity in nmbd manpage.
via 4013bbf docs: fix ntlm_auth manpage.
via 8e29981 docs: fix smbcontrol manpage.
via 0b313d5 docs: use &popt.autohelp entity in pdbedit manpage.
via 1d10487 docs: fix testparm manpage.
via 72ca1f4 docs: use popt.autohelp entity in dbwrap-tools manpage.
via dc0cf1b docs: document all long option names in nmblookup manpage.
via 6dca50e docs: remove unsupported -h option and use popt.autohelp entity in rpcclient manpage.
via 58390e2 docs: mention --sddl and --domain-sid in smbcacls manpage.
via 167d949 docs: mention --query-security-info|--set-security-info in smbcacls manpage.
via 90bc0ff docs: remove duplicate -e option from smbcacls manpage.
via a98a3a4 docs: use popt.autohelp entity in smbcacls manpage.
via 05538b2 docs: remove unsupported -h option from smbcacls manpage.
via 6659b3a docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
via 000e7e6 docs: better document -e|--encrypt option globally.
via 2f20e1f docs: mention -B|--browse to smbclient manpage.
via d0813f4 docs: mention more long option names in smbcquotas manpage.
via 153739e docs: mention --update and --encrypt in smbget manpage.
via f6a0f1d docs: use popt.autohelp in smbtree manpage.
via 84bf0c0 docs: use popt.samba.common entity in profiles manpage.
via 2461695 docs: mention --change-sid|--new-sid in profiles manpage.
via 62c7754 docs: add new popt.autohelp entity.
via c5b9170 docs: remove more duplicate options from samba-regedit manpage.
via 10010b2 docs: add missing &popt.common.connection entity to smbcacls manpage.
via 40c6634 docs: add missing &popt.common.samba entity to smbcontrol manpage.
via 3f8f99a docs: remove now duplicate mention for 4 credential options in samba-regedit manpage.
via a93845f docs: bring samba entity popt.common.credentials in line with popt_common_credentials.
via bfd76d2 docs: mention -p in dbwrap-tool manpage.
via fca415d docs: mention -V|--viewsddl in sharesec manpage.
via 84c8fd7 docs: mention -S|--setsddl in sharesec manpage.
via 72e8aca docs: mention -R|--profile-rates in smbstatus manpage.
via 0f94260 docs: mention --numeric in smbstatus manpage.
via e791b70 docs: mention many more options in smbd options.
via 4982ce1 docs: remove unsupported options from smbd manpage.
via 967851a docs: mention --port in nmbd manpage.
via def1dd1 docs: mention --no-process-group in nmbd manpage.
via 290e5b6 docs: mention --log-stdout in nmbd manpage.
via 0791928 docs: mention --interactive in nmbd manpage.
via dfb6c60 docs: mention --hosts in nmbd manpage.
via bcffd67 docs: mention --foreground in nmbd manpage.
via 9c850a7 docs: mention --daemon in nmbd manpage.
via 34a2a3d docs: remove unsupported options from nmbd manpage.
via 015156b docs: mention --sids-to-unix-ids in wbinfo manpage.
via 225a315 docs: mention --sequence in wbinfo manpage.
via 20cfa16 docs: mention --set-gid-mapping/--set-uid-mapping in wbinfo manpage.
via 6bacf83 docs: mention --remove-gid-mapping/--remove-uid-mapping in wbinfo manpage.
via 4e09571 docs: mention --pam-logon in wbinfo manpage.
via 7f9119f docs: mention --lookup-sids in wbinfo manpage.
via 887c7d4 docs: mention logoff options in wbinfo manpage.
via 23cb76b docs: mention --krb5ccname option in wbinfo manpage.
via bddf55d docs: mention --dc-info in wbinfo manpage.
via 2b6bea4 docs: mention --no-process-group in winbindd manpage.
via df6929d docs: mention more options in winbindd manpage.
via 27e44c9 docs: remove duplicate word "the" from net manpage.
via 64aee7a docs: remove duplicate word "trust" from net manpage.
via 1770078 docs: remove duplicate mention of "smbta-util" in smbta-util manpage.
via 1539a74 docs: remove duplicate mention of "ntdbtool" in ntdbtool manpage.
via bdcc343 docs: remove duplicate mention of "smbtorture" in smbtorture manpage.
via 31b80a0 docs: remove duplicate word "the" in winbindd manpage.
via cfa4c5d docs: remove duplicate arguments listing in regdiff manpage.
via 0bd714a docs: remove duplicate word "name" in nmblookup4 manpage.
via 4d34c92 docs: remove duplicate word "name" in nmblookup manpage.
via 117497c docs: remove duplicate word "the" in idmap_ad manpage.
via 097f3c1 Fix typos in man-pages
via 7b13739 s3-libnetjoin: Fix Bug #10262: use upper-case realm when composing default upn.
via 8c73aae s3-client: smbclient shows no error if deleting a directory with del failed
via b0ce9bc s3-lib: smbclient shows no error if deleting a directory with del failed
via 845055c s3-smbd: smbclient shows no error if deleting a directory with del failed
via 3c83eaa smbd: Fix a talloc hierarchy problem in msg_channel
from c61910b VERSION: Bump version number up to 4.1.3...
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-test
- Log -----------------------------------------------------------------
commit e99d701806156b2343d3a96a6a320a625e8e8ec0
Author: Arvid Requate <requate at univention.de>
Date: Thu Nov 21 12:35:20 2013 +0100
spoolss: accept XPS_PASS datatype used by Windows 8
The new v4 driver model used in Windows 8 declares print jobs
intended to bypass the XPS processing layer by setting datatype to
"XPS_PASS" instead of "RAW".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10267
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit b2815b4c8c3e436a79fb7f07be285a417fd6e8cb)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger at samba.org>
Autobuild-Date(v4-1-test): Fri Nov 22 13:44:05 CET 2013 on sn-devel-104
commit e668a11789c7f535eb8def15798bc6cb484f96b2
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:36:53 2013 +0100
docs: remove duplicate "used" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Nov 19 14:40:40 CET 2013 on sn-devel-104
(cherry picked from commit c0bdd8011cc14a03bbddb7ad894219c649a609d9)
The last 84 patches fx bug #10281 - Fix a lot of documentation issues in the
manpages.
commit a68ab7ba849e1e55875633329f0b398d52b4aa06
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:34:54 2013 +0100
docs: remove duplicate "line" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 344c59f99996d4e6a23c2cc914377536ea7e9eee)
commit e28f3902aabc99a969f1100ed1836aa4aed8efe4
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:34:33 2013 +0100
docs: remove duplicate "must" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 8d1ff1d73f43d0fd4c2290496389c006afb2de93)
commit 576e5af2f2ea0f68ac552a6328ab21119856b1f8
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:34:05 2013 +0100
docs: remove duplicate "on" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 0cf92d476feabb870f67061d38d1027ebc59a852)
commit 7d1b124f61a0a2b3f549a99d06889a56758b358e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:33:33 2013 +0100
docs: remove duplicate "or" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 59a240513c7d48afb337b102466c539af3f880f3)
commit d17b1c14ecbb2e3925b538419541f8b9477538b8
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:20:12 2013 +0100
docs: remove duplicate "not" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit ced12107e0af429af088cd63b86c8b8b21e83a1a)
commit 5965734482e8f57e8ceabcbb84f79ade6d2dadc9
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:18:57 2013 +0100
docs: remove duplicate "to" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 25577278211f82a353477c48ea1381cdd16b3b63)
commit 75186f4e3d6cf819f819f799802f1fb39c02a63e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:17:19 2013 +0100
docs: remove duplicate "the" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit b55b56351d71bb4a4517d857959c7c9d9d2b768c)
commit 8a938640825ace33b50c71061aa4905489948df2
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 19 12:14:45 2013 +0100
docs: remove duplicate "a" from vfs_cacheprime manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7a587e715ae413ce0f44be4c6f63a9e30fe697e5)
commit 2dbe943d0ef9b98bac60a0bdd2049fa77dd5920c
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 17:26:28 2013 +0100
docs: document remaining undocumented options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue Nov 19 12:05:56 CET 2013 on sn-devel-104
(cherry picked from commit 19d1a7abcf5ceaf2577952b90ca77eb776bc95d2)
commit cfc9d1e58f36ee1ee330f393dedbfe56da0ce991
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 17:15:57 2013 +0100
docs: add net registry import specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 49ab592097a235d31355bf4e58d2957ee56c5a3c)
commit c6d953e98cd46c4be409419912c58b28d9b237e9
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 17:11:31 2013 +0100
docs: add net rpc registry check specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 57269672d1b52c5a1318619f5b6ccdfb757c161f)
commit aaee748820c31ab0eddea1ff30cac9a6c92a0e2d
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:28:10 2013 +0100
docs: add net groupmap set specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit cb90d1eb8f1ea0fd23f7af4aa1a21447d4772a1e)
commit 1176b53dc9604ce9cfd957a49d0563a00bc30e6c
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:22:52 2013 +0100
docs: add net rpc share migrate specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit e73493c64af9f76fa41b56c154ea973619e97cb0)
commit de4415640545852c0bf9d141abd8e265ccce6720
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:17:32 2013 +0100
docs: add net idmap specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit f1e03c2bc1bb34d1918b232035c25cc9e0e6811d)
commit b14e1bc3e510a044555be71cc35d3b5563edd848
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:08:19 2013 +0100
docs: add net rpc vampire specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7c8dcc5e0f61577becf1954b6abfb72e4689eab2)
commit d24edcd2758a88e13e6182dd7c1110cfde7ef406
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 16:00:39 2013 +0100
docs: mention more options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 0b24a4236c2b865a0cf318fcabb3ce64b93d9409)
commit 5def0e7aa902b15cf325172c12f162104a10ffad
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:53:49 2013 +0100
docs: use popt.autohelp entity in samba.8 manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 0815f114fbe99144061dc1c8c326fb0ee71f4a76)
commit 9358b504accf186719efa4f206186a6cd3f1ad2c
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:53:29 2013 +0100
docs: use popt.autohelp entity in smbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit b649d631793bdd83ff1f3935a45f1617c1a4c3e8)
commit 943d3908f7742e5f1b5f92bb41a97d540da76d0f
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:53:08 2013 +0100
docs: use popt.autohelp entity in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 25eace39266edcac85c7d65a68dfbb632453b6f6)
commit 8d7651b789663a36ce81eca3f9750d2b7aae0ca1
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 15:52:35 2013 +0100
docs: use popt.autohelp entity in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit b04375e725edfd419fa65c96d524b9fb351d5efc)
commit 4013bbf5589b48f90da5e2199bffaa2b1b1dcb1d
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 14:45:51 2013 +0100
docs: fix ntlm_auth manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 177c2c9c0ffe1ee434afc9d22d4bba12ae55d312)
commit 8e29981b4e71412894c012e198aae76d72e07ad5
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 13:52:59 2013 +0100
docs: fix smbcontrol manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 91d25302b92e01fdba3fa4bc22fea9a8381ae19e)
commit 0b313d51fef2de0356bf9beba177746cea0b26a4
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 13:46:06 2013 +0100
docs: use &popt.autohelp entity in pdbedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit a0d8cb8f536620a6dbf1fab0093c715c9efaba65)
commit 1d10487b74ad95a830319ada45f6ffe8bc6147d5
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 13:45:38 2013 +0100
docs: fix testparm manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 0674ef7c5b3551564894ee7b8810ee3c18857922)
commit 72ca1f48c87413f7b16d044429be150f20c6754a
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:55:02 2013 +0100
docs: use popt.autohelp entity in dbwrap-tools manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit f9cdbfb27325d4e84d866fdee2a7bc729c25e24e)
commit dc0cf1b0a06583fc25786910a85f3130a4e30fb2
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:51:42 2013 +0100
docs: document all long option names in nmblookup manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit db62a5841a4892dc2d45ff027cac346c0e67c5aa)
commit 6dca50e71b45ed39782f5f39f99ec2722664c5ba
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:39:00 2013 +0100
docs: remove unsupported -h option and use popt.autohelp entity in rpcclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit fb051ee29a55c6d72739bc895f05add50f2054d5)
commit 58390e2b8c6e502ac73db82d76ad4204c7eb7ac0
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:35:16 2013 +0100
docs: mention --sddl and --domain-sid in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 94b26e6d7b22396ad220ddd1ed359376fc151458)
commit 167d9494ba6323d1fa4975f3a10412524f4410c8
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:25:12 2013 +0100
docs: mention --query-security-info|--set-security-info in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit c7a4feaaf1236dce8de546b5019058efba047e31)
commit 90bc0ffcfec4d272f441639b65a46a97f4657969
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:21:24 2013 +0100
docs: remove duplicate -e option from smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 019deb1e1acedb6ec522baad85592c17f2f78268)
commit a98a3a4050028007e0912104dc440462ded3c598
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:18:34 2013 +0100
docs: use popt.autohelp entity in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 559073e711cad5f895707385cc355440e21513d5)
commit 05538b2dad6ed6fec5e04151288ba0cfac559aea
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:17:36 2013 +0100
docs: remove unsupported -h option from smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 26da51a94ea329aa78e2d69fc8190954e61e0b26)
commit 6659b3ab9f84ff06ddcd5ffbb785589f9df2e5d2
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:16:00 2013 +0100
docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit a2899b157f6096fd48e0c9a16a8cb7c848736ea4)
commit 000e7e6ea88574d7f0a088208042ad3655fcae6f
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:12:23 2013 +0100
docs: better document -e|--encrypt option globally.
This is taken from smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 5cab201a16663e9d91e4501124d6aeeaaa71e189)
commit 2f20e1fc5433601c883da1b0a8cdf40a43c79a82
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 12:10:29 2013 +0100
docs: mention -B|--browse to smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 0a7eff9cd77516368a1b1b7578bed64c3768b0da)
commit d0813f4c16ea6ac3bf9cd120efba56cf8ba862ae
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:59:54 2013 +0100
docs: mention more long option names in smbcquotas manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 51fa7800d3b9f84b962d396270391a8cfd4d5a84)
commit 153739ebe8ec8edea2d5617d1eb0df899b556221
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:51:55 2013 +0100
docs: mention --update and --encrypt in smbget manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit def43ad250168790fe3db868c0f688ff04f0fefa)
commit f6a0f1dbfb2ed6c35847cdc861bdc641db029b7c
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:44:28 2013 +0100
docs: use popt.autohelp in smbtree manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 1e4fb44c97eddb28aad903ddbfe0f05229f5802e)
commit 84bf0c09dc09aef4be98cb9893ca4b35b7564750
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:41:00 2013 +0100
docs: use popt.samba.common entity in profiles manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit ca6776d341a5e98b30a9c544c91e89ad062291b3)
commit 2461695296b0da7de12cd7f230f887000d65e2df
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 18 11:40:35 2013 +0100
docs: mention --change-sid|--new-sid in profiles manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit c71fd4a9f49bf5cf2cef7874789e95b0603bbaa4)
commit 62c775473f0424076f6592c25628d750c59b2d24
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:57:52 2013 +0100
docs: add new popt.autohelp entity.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit deacd68cce662d0780eaa255fd51fc4f5f5ee629)
commit c5b91709ef2451786265f80a5ff09248e07bde38
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:40:36 2013 +0100
docs: remove more duplicate options from samba-regedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 743e9a847e1014e2722c650f94d99fa277d7fa9a)
commit 10010b2274f0ed24a334c645bb08ae2652f19265
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:08:10 2013 +0100
docs: add missing &popt.common.connection entity to smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 23516cfbdde6d38fc710fd3a47fdc155e657dc47)
commit 40c6634d3614e25daba582515b27004b60d450ad
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:07:41 2013 +0100
docs: add missing &popt.common.samba entity to smbcontrol manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 8a4d846f1dca6ecbc7d9411f3e26d79a8622e5c4)
commit 3f8f99aa31d7aaecc03b3e0472c09fdab716c73d
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 16:06:36 2013 +0100
docs: remove now duplicate mention for 4 credential options in samba-regedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7173604e9e20ee4826622f8f1dd3e3194ee3588f)
commit a93845fa90e91b9ce1475f3b64780acdcb46fdc9
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 15:15:41 2013 +0100
docs: bring samba entity popt.common.credentials in line with popt_common_credentials.
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 <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 22fcc536a568283b0d2c8b1772399fef7bc63406)
commit bfd76d2a1e371cef3f558a8407aab1e1414b5362
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 13:03:20 2013 +0100
docs: mention -p in dbwrap-tool manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit ffe94e363375aa47cd72d715309f6568067482fe)
commit fca415d536a685869c81668ef35661d7b0f9e803
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:59:49 2013 +0100
docs: mention -V|--viewsddl in sharesec manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit d692389ea57724bd71caadb62e0231993188d34f)
commit 84c8fd73d7689053df0c5a18f2ae09c8f74fbc3e
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:57:06 2013 +0100
docs: mention -S|--setsddl in sharesec manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 9dcbc77f5a79d148a7346c361ad2790ab8a40555)
commit 72e8acaa0ebc2266271237b675cb09660e16c127
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:11:21 2013 +0100
docs: mention -R|--profile-rates in smbstatus manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 5f606e7e9ccd11949ae78a0a44f47be578116f89)
commit 0f942602dbcf40632cf4b84d00a8ae995bee0aaa
Author: Günther Deschner <gd at samba.org>
Date: Fri Nov 15 12:07:48 2013 +0100
docs: mention --numeric in smbstatus manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7c473ac293a44896181d9d2619b922815433c77d)
commit e791b70b67082da0df901909453f045e754c249d
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:49:58 2013 +0100
docs: mention many more options in smbd options.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit ad46b6689d999651732894968e5e49d045591203)
commit 4982ce1cfaaba38f15ddf0904aa87c68f83275d9
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:37:05 2013 +0100
docs: remove unsupported options from smbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 792ff0029c790fe8b225134b19d320e8392c5895)
commit 967851af8d294aef50e2c96a6e5562fca277616a
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:31:50 2013 +0100
docs: mention --port in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit d6a07717a7f2febdd4591fc0c3c1fe8b719963e9)
commit def1dd1b075bb7607b95f59669d895db2cc3f695
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:31:10 2013 +0100
docs: mention --no-process-group in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 548d9daeffc83191ea1e6ea51ce63aacffe98c41)
commit 290e5b6e384788c5fad87e085ec77132d49dbe51
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:29:37 2013 +0100
docs: mention --log-stdout in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit a624426d86cf2da69ba2e03506b5f252d32adb11)
commit 079192868505418521519315d1591f4919bc3d77
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:28:15 2013 +0100
docs: mention --interactive in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit ea99d8a256df7faaedc5b8903fe183f4dcbde296)
commit dfb6c60fa21c96b9f46b8f50be634dbbb19d8085
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:27:28 2013 +0100
docs: mention --hosts in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit fd8d8b95f8b5b21b4e46836dc6becef480737dc2)
commit bcffd67841fd3277b5cc919ce519c9e4cd185266
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:25:52 2013 +0100
docs: mention --foreground in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 28758deda94f28bd0bd188f8277807b8d2ccf829)
commit 9c850a7cbe536f63cc5b9a43d142b67109aa1536
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:25:04 2013 +0100
docs: mention --daemon in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 77eae60bd9a6b7e1d5248b5b0984d38a54de9c3e)
commit 34a2a3dcd411db72364757e5e44e715cc9c7138e
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:23:23 2013 +0100
docs: remove unsupported options from nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit dac78176f3e28a1cbc513bb77a3454570f7de4e1)
commit 015156b6841366655ed3f691cc29aa3239fffa4a
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:18:40 2013 +0100
docs: mention --sids-to-unix-ids in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit c55315a3a26ced194e553b5aa8e97f3a41a308ca)
commit 225a3150ba8ec4a8dc0bdff55b65a173a6ac642f
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 17:13:38 2013 +0100
docs: mention --sequence in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 87e6b5b7fb22c8cf26ae00a315b3e73987f49d55)
commit 20cfa16e6b0bc18ad695884a7e0093d9206f5a73
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:42:56 2013 +0100
docs: mention --set-gid-mapping/--set-uid-mapping in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 80ab6eaa973df8874567306d1488a813801ab39c)
commit 6bacf833098e85ba4999dd3b24605f109316c4fd
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:40:56 2013 +0100
docs: mention --remove-gid-mapping/--remove-uid-mapping in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 27d49babb19759e0d3ef93a2290c049e1ba6aaa3)
commit 4e095710b99be98a04c981637dd6c06538b66c2e
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:36:21 2013 +0100
docs: mention --pam-logon in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7d41f1c4d30eef9fa20a7741be1cb50e566b40cb)
commit 7f9119f60c38e3a125c9406b444c5c5c013112be
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:33:19 2013 +0100
docs: mention --lookup-sids in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7c4c66853f4f0fa426d11d01bc4732186501d6ec)
commit 887c7d4c716c2b07dec5848646cf8e1afc0b108a
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:29:10 2013 +0100
docs: mention logoff options in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit fa47e425132f6022cd41118e2c6ac34181adc4a6)
commit 23cb76b09b3900fb4042a684272cb4faef35119d
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:23:20 2013 +0100
docs: mention --krb5ccname option in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 824c468261a3d61732fea88a5d6cfb9aa5c7ed94)
commit bddf55d3a1a9c1221865e43b46362396cbbe571e
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 16:23:03 2013 +0100
docs: mention --dc-info in wbinfo manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 4f790b10d5a6737f1b5978fca27d78a0b27aa75d)
commit 2b6bea44c204fe909423863f22696eb61d102b4f
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 14 15:19:59 2013 +0100
docs: mention --no-process-group in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit b5fa1139a4e9ef7bd79ace6efe7bf06af595daa4)
commit df6929d4fd8df0175ce20a7b280000377607f542
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 15 15:11:33 2013 +0200
docs: mention more options in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 05db55af943e50bd8f7b29f8210f32350239ea59)
commit 27e44c944d13bd48459fb2ccccd864c9adbbe06f
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 18:03:14 2013 +0200
docs: remove duplicate word "the" from net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 93f32c777c1a36d9d4dc91b6aa1e9e14ee13fb91)
commit 64aee7a51a41067c723b879fd864b80daca4a861
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 18:02:47 2013 +0200
docs: remove duplicate word "trust" from net manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit a2a7991624fa273b01898a26c86f951b928525e6)
commit 17700784c9b2bca2981bffc804e1412c70130c24
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 18:00:02 2013 +0200
docs: remove duplicate mention of "smbta-util" in smbta-util manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 56cff0b3f40b98c0d00323eb94a2204af6c48fed)
commit 1539a74e368cb1181a8e349c435ef39a8d957f78
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:59:22 2013 +0200
docs: remove duplicate mention of "ntdbtool" in ntdbtool manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit e003650f5cf0b9581da00ad39b0784aab074119b)
commit bdcc343246115b2f3f6f99f72c383f6fd59e154e
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:58:45 2013 +0200
docs: remove duplicate mention of "smbtorture" in smbtorture manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 6a0b75f901052234f35d4ba596754e7714af7e87)
commit 31b80a092b9d0c1706627c823c41d6afb7a577b1
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:55:03 2013 +0200
docs: remove duplicate word "the" in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit d33ca796071a2a6f8bf65d6eed2fe159a75de8c5)
commit cfa4c5de47c58603bdf462fad485a5a50539b509
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:50:28 2013 +0200
docs: remove duplicate arguments listing in regdiff manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit e320d57ed6a4d732980656eb01a5f777357f9715)
commit 0bd714a07ec6e97bb53f4bea86824da3b3b43830
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:45:21 2013 +0200
docs: remove duplicate word "name" in nmblookup4 manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 4112eb0529780113716c6032561504196be8235f)
commit 4d34c921fa349325ff59e3472171b131c6b4286e
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:44:12 2013 +0200
docs: remove duplicate word "name" in nmblookup manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit f17f61a4c0d5c13a273eae0b72521e464b1d3d8f)
commit 117497ccca1e0456941dbdbc85b9c6854de1f374
Author: Günther Deschner <gd at samba.org>
Date: Mon Oct 14 17:42:06 2013 +0200
docs: remove duplicate word "the" in idmap_ad manpage.
Guenther
Signed-off-by: Günther Deschner <gd at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 16a873bf7c5c3d236e4bc107953dc6f3159764a2)
commit 097f3c11b78d53cacccf70d241d9c9d76824700f
Author: Michele Baldessari <michele at acksyn.org>
Date: Tue Jul 9 23:23:33 2013 +0200
Fix typos in man-pages
Fix some typos in the man-pages.
Signed-off-by: Michele Baldessari <michele at acksyn.org>
Reviewed-by: Simo Sorce <idra at samba.org>
Autobuild-User(master): Simo Sorce <idra at samba.org>
Autobuild-Date(master): Wed Jul 10 16:45:07 CEST 2013 on sn-devel-104
commit 7b13739adcbd7807219258190cccdab3f7076d71
Author: Günther Deschner <gd at samba.org>
Date: Wed Nov 6 18:21:32 2013 +0100
s3-libnetjoin: Fix Bug #10262: use upper-case realm when composing default upn.
In case we are about to generate a keytab during the join make sure the default
upn we create is usable with kinit -k.
Guenther
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10262
Signed-off-by: Günther Deschner <gd at samba.org>
commit 8c73aaec879ab2b7104575fdb1a3623d9a38141b
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 12 15:55:51 2013 -0800
s3-client: smbclient shows no error if deleting a directory with del failed
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10260
In SMB1 the server filters by attribute requested, in SMB2 there is
no attribute sent. Emulate this on the client to provide the same
ABI to callers.
In SMB1 the server returns NT_STATUS_NO_SUCH_FILE if FindFirst
finds no files. Emulate this on the client.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Thu Nov 14 21:23:07 CET 2013 on sn-devel-104
(cherry picked from commit 4ee4a7e96e71cee27c30d23610a7f83d968a8ba0)
commit b0ce9bc6899220d921a7f520e4f92e99a7945fa8
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 12 15:32:42 2013 -0800
s3-lib: smbclient shows no error if deleting a directory with del failed
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10260
Move dir_check_ftype() to util.c
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit fc611dd6e849537aa4817504275cdbf48f6f1e79)
commit 845055c0019c6ac841effb3310e5886847e09810
Author: Jeremy Allison <jra at samba.org>
Date: Tue Nov 12 15:17:26 2013 -0800
s3-smbd: smbclient shows no error if deleting a directory with del failed
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10260
Remove unneeded conn argument to dir_check_ftype().
Move to correct uint32_t types.
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
(cherry picked from commit 7d8e22c7c1cf0041fa638f3bb345e00fc339486b)
commit 3c83eaadb6b8c121fbb604ca45b1d5dd0bc3f51e
Author: Volker Lendecke <vl at samba.org>
Date: Thu Nov 14 21:30:49 2013 +0100
smbd: Fix a talloc hierarchy problem in msg_channel
When tearing down a watch_send with an open tevent_immediate, we
talloc_free the msg_channel while the tevent_immediate still references
it. Don't make the tevent_immediate outlive the msg_channel.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10250
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Jeremy Allison <jra at samba.org>
Autobuild-Date(master): Wed Nov 20 00:13:51 CET 2013 on sn-devel-104
(cherry picked from commit 2d91577f984bc83c2c87141cfdda87d068060b32)
-----------------------------------------------------------------------
Summary of changes:
docs-xml/build/DTD/samba.entities | 64 +++++-
docs-xml/manpages/dbwrap_tool.1.xml | 8 +-
docs-xml/manpages/idmap_ad.8.xml | 2 +-
docs-xml/manpages/idmap_autorid.8.xml | 2 +-
docs-xml/manpages/net.8.xml | 280 ++++++++++++++++++--
docs-xml/manpages/nmbd.8.xml | 36 ++--
docs-xml/manpages/nmblookup.1.xml | 43 ++--
docs-xml/manpages/ntlm_auth.1.xml | 42 +++-
docs-xml/manpages/pdbedit.8.xml | 4 +-
docs-xml/manpages/profiles.1.xml | 10 +-
docs-xml/manpages/rpcclient.1.xml | 3 +-
docs-xml/manpages/samba-regedit.8.xml | 27 +--
docs-xml/manpages/samba.7.xml | 2 +-
docs-xml/manpages/samba.8.xml | 2 +-
docs-xml/manpages/sharesec.1.xml | 18 ++-
docs-xml/manpages/smbcacls.1.xml | 46 +++-
docs-xml/manpages/smbclient.1.xml | 20 +-
docs-xml/manpages/smbcontrol.1.xml | 14 +-
docs-xml/manpages/smbcquotas.1.xml | 32 ++-
docs-xml/manpages/smbd.8.xml | 33 ++-
docs-xml/manpages/smbget.1.xml | 9 +
docs-xml/manpages/smbpasswd.5.xml | 2 +-
docs-xml/manpages/smbstatus.1.xml | 20 ++-
docs-xml/manpages/smbta-util.8.xml | 4 -
docs-xml/manpages/smbtree.1.xml | 2 +-
docs-xml/manpages/testparm.1.xml | 38 ++-
docs-xml/manpages/vfs_cacheprime.8.xml | 2 +-
docs-xml/manpages/vfs_smb_traffic_analyzer.8.xml | 2 +-
docs-xml/manpages/wbinfo.1.xml | 97 +++++++
docs-xml/manpages/winbindd.8.xml | 31 ++-
docs-xml/smbdotconf/filename/manglingmethod.xml | 2 +-
.../smbdotconf/misc/directorynamecachesize.xml | 2 +-
.../smbdotconf/misc/fakedirectorycreatetimes.xml | 2 +-
docs-xml/smbdotconf/misc/rpcserver.xml | 2 +-
.../smbdotconf/protocol/aclallowexecutealways.xml | 2 +-
docs-xml/smbdotconf/protocol/ntaclsupport.xml | 2 +-
docs-xml/smbdotconf/security/aclgroupcontrol.xml | 2 +-
docs-xml/smbdotconf/security/smbencrypt.xml | 2 +-
docs-xml/smbdotconf/security/usernamemapscript.xml | 2 +-
docs-xml/smbdotconf/winbind/idmapconfig.xml | 2 +-
lib/ntdb/man/ntdbtool.8.xml | 4 -
libcli/nbt/man/nmblookup4.1.xml | 2 +-
source3/include/proto.h | 1 +
source3/lib/msg_channel.c | 2 +-
source3/lib/util.c | 42 +++
source3/libnet/libnet_join.c | 17 ++-
source3/libsmb/cli_smb2_fnum.c | 29 ++-
source3/libsmb/cli_smb2_fnum.h | 1 +
source3/libsmb/clilist.c | 2 +-
source3/rpc_server/spoolss/srv_spoolss_nt.c | 8 +-
source3/smbd/dir.c | 28 +--
source3/smbd/proto.h | 1 -
source3/smbd/reply.c | 2 +-
source4/lib/registry/man/regdiff.1.xml | 3 -
source4/torture/man/smbtorture.1.xml | 4 -
55 files changed, 788 insertions(+), 273 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index c9c6744..1e852ec 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -464,13 +464,44 @@ Try to use the credentials cached by winbind.
</varlistentry>
'>
+<!ENTITY stdarg.signing '
+<varlistentry>
+<term>-S|--signing on|off|required</term>
+<listitem><para>Set the client signing state.
+</para></listitem>
+</varlistentry>
+'>
-<!ENTITY stdarg.help '
+<!ENTITY stdarg.machinepass '
<varlistentry>
-<term>-?|--help</term>
-<listitem><para>Print a summary of command line options.
+<term>-P|--machine-pass</term>
+<listitem><para>Use stored machine account password.
</para></listitem>
-</varlistentry>'>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.encrypt '
+<varlistentry>
+<term>-e|--encrypt</term>
+<listitem><para>
+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.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.pwnthash '
+<varlistentry>
+<term>--pw-nt-hash</term>
+<listitem><para>The supplied password is the NT hash.
+</para></listitem>
+</varlistentry>
+'>
<!ENTITY popt.common.credentials '
&stdarg.nopass;
@@ -478,6 +509,31 @@ Try to use the credentials cached by winbind.
&stdarg.useccache;
&stdarg.authfile;
&stdarg.username;
+&stdarg.signing;
+&stdarg.machinepass;
+&stdarg.encrypt;
+&stdarg.pwnthash;
+'>
+
+<!ENTITY stdarg.help '
+<varlistentry>
+<term>-?|--help</term>
+<listitem><para>Print a summary of command line options.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY stdarg.usage '
+<varlistentry>
+<term>--usage</term>
+<listitem><para>Display brief usage message.
+</para></listitem>
+</varlistentry>
+'>
+
+<!ENTITY popt.autohelp '
+&stdarg.help;
+&stdarg.usage;
'>
<!-- Entities for the various programs -->
diff --git a/docs-xml/manpages/dbwrap_tool.1.xml b/docs-xml/manpages/dbwrap_tool.1.xml
index e2b2cee..074d819 100644
--- a/docs-xml/manpages/dbwrap_tool.1.xml
+++ b/docs-xml/manpages/dbwrap_tool.1.xml
@@ -19,7 +19,7 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>dbwrap_tool</command>
- <arg choice="opt">--persistent</arg>
+ <arg choice="opt">-p|--persistent</arg>
<arg choice="opt">-d <debug level></arg>
<arg choice="opt">-s <config file></arg>
<arg choice="opt">-l <log file base></arg>
@@ -49,7 +49,7 @@
<listitem><para>fetch: fetch a record</para></listitem>
<listitem><para>store: create or modify a record</para></listitem>
<listitem><para>delete: remove a record</para></listitem>
- <listitem><para>exists: test for existance of a record</para></listitem>
+ <listitem><para>exists: test for existence of a record</para></listitem>
<listitem><para>erase: remove all records</para></listitem>
<listitem><para>listkeys: list all available records</para></listitem>
<listitem><para>listwatchers: list processes, which are waiting for changes in a record</para></listitem>
@@ -70,14 +70,14 @@
<variablelist>
<varlistentry>
- <term>--persistent</term>
+ <term>-p|--persistent</term>
<listitem><para>Open the database as a persistent database.
If this option is not specified, the database is opened as
non-persistent.
</para></listitem>
</varlistentry>
&popt.common.samba.client;
- &stdarg.help;
+ &popt.autohelp;
</variablelist>
</refsect1>
diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index 0e33b77..87be2de 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
@@ -31,7 +31,7 @@
<para>
Currently, the <parameter>ad</parameter> 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
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 @@
<title>EXAMPLES</title>
<para>
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.
</para>
diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index dd5b3ab..5417054 100644
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -22,20 +22,25 @@
<cmdsynopsis>
<command>net</command>
<arg choice="req"><ads|rap|rpc></arg>
- <arg choice="opt">-h</arg>
- <arg choice="opt">-w workgroup</arg>
- <arg choice="opt">-W myworkgroup</arg>
- <arg choice="opt">-U user</arg>
- <arg choice="opt">-I ip-address</arg>
- <arg choice="opt">-p port</arg>
+ <arg choice="opt">-h|--help</arg>
+ <arg choice="opt">-w|--workgroup workgroup</arg>
+ <arg choice="opt">-W|--myworkgroup myworkgroup</arg>
+ <arg choice="opt">-U|--user user</arg>
+ <arg choice="opt">-I|--ipaddress ip-address</arg>
+ <arg choice="opt">-p|--port port</arg>
<arg choice="opt">-n myname</arg>
<arg choice="opt">-s conffile</arg>
- <arg choice="opt">-S server</arg>
- <arg choice="opt">-l</arg>
- <arg choice="opt">-P</arg>
+ <arg choice="opt">-S|--server server</arg>
+ <arg choice="opt">-l|--long</arg>
+ <arg choice="opt">-v|--verbose</arg>
+ <arg choice="opt">-f|--force</arg>
+ <arg choice="opt">-P|--machine-pass</arg>
<arg choice="opt">-d debuglevel</arg>
<arg choice="opt">-V</arg>
<arg choice="opt">--request-timeout seconds</arg>
+ <arg choice="opt">-t|--timeout seconds</arg>
+ <arg choice="opt">-i|--stdin</arg>
+ <arg choice="opt">--tallocreport</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -64,7 +69,7 @@
&stdarg.kerberos;
<varlistentry>
- <term>-w target-workgroup</term>
+ <term>-w|--workgroup target-workgroup</term>
<listitem><para>
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 @@
</varlistentry>
<varlistentry>
- <term>-W workgroup</term>
+ <term>-W|--myworkgroup workgroup</term>
<listitem><para>
Sets client workgroup or domain
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-U user</term>
+ <term>-U|--user user</term>
<listitem><para>
User name to use
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-I ip-address</term>
+ <term>-I|--ipaddress ip-address</term>
<listitem><para>
IP address of target server to use. You have to
specify either this option or a target workgroup or
@@ -95,7 +100,7 @@
</varlistentry>
<varlistentry>
- <term>-p port</term>
+ <term>-p|--port port</term>
<listitem><para>
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;
<varlistentry>
- <term>-S server</term>
+ <term>-S|--server server</term>
<listitem><para>
Name of target server. You should specify either
this option or a target workgroup or a target IP address.
@@ -114,14 +119,28 @@
</varlistentry>
<varlistentry>
- <term>-l</term>
+ <term>-l|--long</term>
<listitem><para>
When listing data, give more information on each item.
</para></listitem>
</varlistentry>
<varlistentry>
- <term>-P</term>
+ <term>-v|--verbose</term>
+ <listitem><para>
+ When listing data, give more verbose information on each item.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-f|--force</term>
+ <listitem><para>
+ Enforcing a net command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-P|--machine-pass</term>
<listitem><para>
Make queries to the external server using the machine account of the local server.
</para></listitem>
@@ -135,7 +154,226 @@
</para></listitem>
</varlistentry>
- &stdarg.server.debug;
+ <varlistentry>
+ <term>-t|--timeout 30</term>
+ <listitem><para>
+ Set timeout for client operations to 30 seconds.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--use-ccache</term>
+ <listitem><para>
+ Try to use the credentials cached by winbind.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-i|--stdin</term>
+ <listitem><para>
+ Take input for net commands from standard input.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--tallocreport</term>
+ <listitem><para>
+ Generate a talloc report while processing a net
+ command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-T|--test</term>
+ <listitem><para>Only test command sequence, dry-run.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-F|--flags FLAGS</term>
+ <listitem><para>Pass down integer flags to a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-C|--comment COMMENT</term>
+ <listitem><para>Pass down a comment string to a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-n|--myname MYNAME</term>
+ <listitem><para>Use MYNAME as a requester name for a net subcommand.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-c|--container CONTAINER</term>
+ <listitem><para>Use a specific AD container for net ads operations.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-M|--maxusers MAXUSERS</term>
+ <listitem><para>Fill in the maxusers field in net rpc share operations.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-r|--reboot</term>
+ <listitem><para>Reboot a remote machine after a command has been successfully executed (e.g. in remote join operations).
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net rpc vampire -->
+
+ <varlistentry>
+ <term>--force-full-repl</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ enforces a full re-creation of the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--single-obj-repl</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ allows to replicate just a single object to the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--clean-old-entries</term>
+ <listitem><para>
+ When calling "net rpc vampire keytab" this option
+ allows to cleanup old entries from the generated keytab file.
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net idmap -->
+
+ <varlistentry>
+ <term>--db</term>
+ <listitem><para>Define dbfile for "net idmap" commands.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--lock</term>
+ <listitem><para>Activates locking of the dbfile for "net idmap check" command.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-a|--auto</term>
+ <listitem><para>Activates noninteractive mode in "net idmap check".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--repair</term>
+ <listitem><para>Activates repair mode in "net idmap check".
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net rpc share migrate -->
+
+ <varlistentry>
+ <term>--acls</term>
+ <listitem><para>Includes ACLs to be copied in "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--attrs</term>
+ <listitem><para>Includes file attributes to be copied in "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--timestamps</term>
+ <listitem><para>Includes timestamps to be copied in "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-X|--exclude DIRECTORY</term>
+ <listitem><para>Allows to exclude directories when copying with "net rpc share migrate".
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--destination SERVERNAME</term>
+ <listitem><para>Defines the target servername of migration process (defaults to localhost).
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net groupmap set -->
+
+ <varlistentry>
+ <term>-L|--local</term>
+ <listitem><para>Sets the type of group mapping to local
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-D|--domain</term>
+ <listitem><para>Sets the type of group mapping to domain
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-N|--ntname NTNAME</term>
+ <listitem><para>Sets the ntname of a group mapping
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-R|--rid RID</term>
+ <listitem><para>Sets the rid of a group mapping
+ (used in "net groupmap set").
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net registry check -->
+
+ <varlistentry>
+ <term>--reg-version REG_VERSION</term>
+ <listitem><para>Assume database version {n|1,2,3}
+ (used in "net registry check").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-o|--output FILENAME</term>
+ <listitem><para>Output database file
+ (used in "net registry check").
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--wipe</term>
+ <listitem><para>Createa a new database from scratch
+ (used in "net registry check").
+ </para></listitem>
+ </varlistentry>
+
+ <!-- Options for net registry import -->
+
+ <varlistentry>
+ <term>--precheck PRECHECK_DB_FILENAME</term>
+ <listitem><para>Defines filename for database prechecking
+ (used in "net registry import").
+ </para></listitem>
+ </varlistentry>
+
+ &stdarg.encrypt;
+ &popt.common.samba.client;
+
</variablelist>
</refsect1>
--
Samba Shared Repository
More information about the samba-cvs
mailing list