[SCM] Samba Shared Repository - branch v3-5-stable updated
Karolin Seeger
kseeger at samba.org
Wed Dec 23 02:07:09 MST 2009
The branch, v3-5-stable has been updated
via 621ad11... WHATSNEW: Update changes.
via 4b640f3... s3: Restore correct timeouts for SMB requests (cherry picked from commit cb65611eda879b0de4a16c38e9246e7493106df0)
via 0788f4a... s3: Remove a pointless else branch (cherry picked from commit 04ac3a0fc5ef8161e17173dc102ce0c349228616)
via 97a4faa... s3: Move smb_splice_chain to smbd/process.c, its only user (cherry picked from commit 096e85ca884a454c66085f811ec40915b1e75fd9)
via df62336... Fix bug reported in mangle_hash code (no bugid yet).
via de30b11... s3:winbind: Add a lower-cost alternative to wbinfo -t: wbinfo --ping-dc
via f442a17... s3:winbindd: Fix a brown paper bag bug in wbinfo -t ... (cherry picked from commit e0762d68292440068fe21c0d0cd559bf3df13b09)
via a481318... Rename reply_doserror() -> reply_force_doserror().
via 7e01df2... Remove all calls to reply_doserror - turn them into correct reply_nterror calls. Next rename reply_doserror -> reply_force_doserror and plumb in when NT_STATUS_DOS is used. Jeremy. (cherry picked from commit 642101ac237364fd9be209bf56d3224736626446) (cherry picked from commit 12f3f55b352900799b5e649fa2986f82fbb36fb7)
via 3b2f727... Rename 282 -> ERReasnotsupported. Jeremy. (cherry picked from commit 714c60e62756169ab9fd4ead442f123c075b3edb) (cherry picked from commit 7552609bf4e5eac012b0eda923ae4934a928fcc9)
via 9d33557... s3-docs: mention long and undocumented option names in rpcclient manpage.
via 7b48e0c... s3-docs: mention long and undocumented option names in smbcacls manpage.
via fd1ce3f... s3-docs: mention long and undocumented option names in smbclient manpage.
via b39aae3... s3-docs: mention -O, --stdout in smbget manpage.
via eb28c0e... s3-docs: mention long option names in smbtree manpage.
via cd48152... s3-docs: mention long and undocumented option names in pdbedit manpage.
via 164c80d... s3-docs: mention all long option names in samba.entities file.
via 89de357... s3-docs: not working for SuSE anymore...
via 3019bda... s3: Shrink winbindd_proto.h a bit (cherry picked from commit 45eb2372ce7e69428d53ef58b3a216a5bfadbd0c)
via 83b5120... s3: Fix some nonempty blank lines (cherry picked from commit 9a4bba3fd7045268de444105b95b702e57df39e9)
via 7262a3f... s3: Remove unused get_sam_group_entries (cherry picked from commit 8787863172d26ee6f4f59b4b099491cd9898d475)
via 006237c... s3: Remove unused winbindd_dual_getsidaliases (cherry picked from commit 7c309bcba0034a4e6b165ce9d542cb020e2c0e02)
via 5cfb76f... s3: Remove an unused struct definition (cherry picked from commit 013fada66aa9df4cc505f7ed6a2033969b46282a)
via 3839372... s3: Remove unused winbindd_dual_getuserdomgroups (cherry picked from commit fe02517e8a622e5b2f9d55f1a18392e91d776a45)
via e4fe6cc... s3: Remove unused winbindd_dual_getdcname (cherry picked from commit 2c6905d0bcf0b60ec9bb98c84ac778dfe8b4ea86)
via 6d6b24c... s3: Remove unused winbindd_dual_lookupname (cherry picked from commit 79ff1876b989ba0eb9de2e348b87a8721b61c7b6)
via 30125e9... s3: Remove unused winbindd_dual_lookupsid (cherry picked from commit a17b245a9c6d9f2f954db5b3ff31295917e0f862)
via b8b1839... s3: Remove unused winbindd_dual_userinfo (cherry picked from commit 55478de7b54cc940324fd76ea2ec05025dbeeccd)
via 984e5f8... s3: Remove some unused dual functions (cherry picked from commit 92b8aa1fd6676fde028c8770fb943a3e36f90329)
via ec9e1c8... s3: Remove unused do_async (cherry picked from commit a575b4434056a46bb936ec395d3c615098b548f9)
via 01d794d... s3: Remove unused winbindd_gid2sid_async (cherry picked from commit 83dac5e827eb5002e581f50662b23b3167a03bd0)
via eb94375... s3: Remove unused winbindd_uid2sid_async (cherry picked from commit 0e547f5ff62828887cd3796e1dd3d52db9282be3)
via bbee759... s3: Remove unused winbindd_sid2gid_async (cherry picked from commit 9cd4a58f2c8efd019d95f0cffbcbc51aaec89bf4)
via 5299428... s3: Remove unused winbindd_sid2uid_async (cherry picked from commit 810f4f5e19534ac6cb3b37ab456804a27c24fdb0)
via e0c5e6b... s3: Remove unused do_async_domain (cherry picked from commit 21a6a950ed182e14095f2d48dfd9c4bb17ed95b3)
via 9396deb... s3: Remove unused query_user_async (cherry picked from commit 8a51dc029bfd06ecac09b3e9abed35513b4db386)
via c96a2f9... s3: Remove unused winbindd_getsidaliases_async (cherry picked from commit ebecce92ab90b9e9acf7dbfd200d4e5a9330cf35)
via 37eda9e... s3: Remove unused winbindd_lookupname_async (cherry picked from commit 038c85202463d79d8c9b01d283706bd9dbc0b057)
via 6214202... s3: Remove unused winbindd_lookupsid_async (cherry picked from commit 9c3c632464115bb21db068f586eee578979a1343)
via 30f6bdd... s3:winbind: use wb_fill_pwent in wb_getpwsid (cherry picked from commit 1a786b31b672cd2e6486433d273e5475d6243f42)
via ffd8603... s3:winbind: Move fillup_pw_field() as static to wb_fill_pwent.c (cherry picked from commit a30f489fa5aae359c3775869e3a26386ef306739)
from 61ba90a... WHATSNEW: Update changes since 3.5.0pre2.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-stable
- Log -----------------------------------------------------------------
commit 621ad11f84f8786e3de902b4b29b082a43e37124
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Dec 23 10:05:52 2009 +0100
WHATSNEW: Update changes.
Karolin
(cherry picked from commit 53e4814eb5ea5014e3f3c43a5313d89209d54625)
commit 4b640f3054efc9976b0c18f86583a8e53d9e9e7e
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 22 16:06:17 2009 +0100
s3: Restore correct timeouts for SMB requests
(cherry picked from commit cb65611eda879b0de4a16c38e9246e7493106df0)
commit 0788f4a6f3eea5ecb3589dc03b531f02be243f4f
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 22 14:07:52 2009 +0100
s3: Remove a pointless else branch
(cherry picked from commit 04ac3a0fc5ef8161e17173dc102ce0c349228616)
commit 97a4faaa177f17783eb23316563fc3a0f55fd575
Author: Volker Lendecke <vl at samba.org>
Date: Tue Dec 22 13:53:13 2009 +0100
s3: Move smb_splice_chain to smbd/process.c, its only user
(cherry picked from commit 096e85ca884a454c66085f811ec40915b1e75fd9)
commit df62336d27448bf20f51f79dc6f3438b411c8f39
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 21 17:46:32 2009 -0800
Fix bug reported in mangle_hash code (no bugid yet).
Don't change the contents of a const string via a pointer
alias (or if you do, change it back.....).
Jeremy.
(cherry picked from commit 100168dfec533a7afd8f2dd246f1b66b11ad7162)
(cherry picked from commit 4f442702065e1e5fd5bd3766fbd9bd4d11210511)
commit de30b11724a78b39ad974b84a6f6b1eb952de79b
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 21:50:43 2009 +0100
s3:winbind: Add a lower-cost alternative to wbinfo -t: wbinfo --ping-dc
This just does a NULL RPC call through an existing NETLOGON connection. If
someone knows an operation that "just works" and does not return NOT_SUPPORTED,
please tell me :-)
(cherry picked from commit 6a2c2a762f288e394520f7752661ec67704db56f)
commit f442a17d1fe21badfca5605d87fa88c9cbb0904e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 22:34:55 2009 +0100
s3:winbindd: Fix a brown paper bag bug in wbinfo -t ...
(cherry picked from commit e0762d68292440068fe21c0d0cd559bf3df13b09)
commit a481318da68e6c8b4622fb164803fa652c27147f
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 21 11:16:38 2009 -0800
Rename reply_doserror() -> reply_force_doserror().
Rewrite all calls to reply_nterror(NT_STATUS_DOS()) to
reply_force_doserror() and update the comment in smbd/error.c
Jeremy.
(cherry picked from commit 74deee3cc9bea2d1bd0c8a7374f8b1dbbbc4b499)
(cherry picked from commit a5519c958d4090830fdddd18ec34d7e78f96fe7f)
commit 7e01df2ecc1a115be4ed538ea7e4916b8dbaff05
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 21 11:05:25 2009 -0800
Remove all calls to reply_doserror - turn them into
correct reply_nterror calls. Next rename reply_doserror ->
reply_force_doserror and plumb in when NT_STATUS_DOS is
used.
Jeremy.
(cherry picked from commit 642101ac237364fd9be209bf56d3224736626446)
(cherry picked from commit 12f3f55b352900799b5e649fa2986f82fbb36fb7)
commit 3b2f727c13fa1174ddfa0a710c73a9efba79416d
Author: Jeremy Allison <jra at samba.org>
Date: Mon Dec 21 11:05:11 2009 -0800
Rename 282 -> ERReasnotsupported.
Jeremy.
(cherry picked from commit 714c60e62756169ab9fd4ead442f123c075b3edb)
(cherry picked from commit 7552609bf4e5eac012b0eda923ae4934a928fcc9)
commit 9d335577670af19fd34a28902064e8869810d077
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 17:30:07 2009 +0100
s3-docs: mention long and undocumented option names in rpcclient manpage.
Guenther
(cherry picked from commit 9a7bed7ae6ec46a848a87b9e9b41e686fffeb26b)
(cherry picked from commit 660f84818fe4b8b5886a65a6b3725ed552ce497c)
commit 7b48e0c90f1bd905ae86d995dd6fdd94fc1b3664
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 17:18:53 2009 +0100
s3-docs: mention long and undocumented option names in smbcacls manpage.
Guenther
(cherry picked from commit 308e1b51874bc7b3fd7a44bec1367f75b8c975f0)
(cherry picked from commit 8bd0abc3a3096120b8736230073d887cb2e899d4)
commit fd1ce3ff9d40fecb5641e303e65070503a42bb90
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 16:24:31 2009 +0100
s3-docs: mention long and undocumented option names in smbclient manpage.
Guenther
(cherry picked from commit 71a5aef4e1e054359f419c5540694d3d8d8ededf)
(cherry picked from commit 54955d812191e380a222eb26efedfe92e5161e8c)
commit b39aae3f073c4b2626795127e282fdcc0687d08a
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 16:07:42 2009 +0100
s3-docs: mention -O, --stdout in smbget manpage.
Guenther
(cherry picked from commit 6ffa5df69afbbce4bcf3c26c6068bcd927826ddd)
(cherry picked from commit ee0dc311047a310cf779478ae88cf6de95c838a1)
commit eb28c0e0ccadf791837302a99e40e26f5ce73bb0
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 16:04:49 2009 +0100
s3-docs: mention long option names in smbtree manpage.
Guenther
(cherry picked from commit f8686728147eaf60d09c00d98d65902eb7e77902)
(cherry picked from commit 07eac7e5977def5f8cb5b275f0fd9fef899b8fa9)
commit cd4815201d96198d13624ad6f8ae615d789a9b8f
Author: Günther Deschner <gd at samba.org>
Date: Thu Dec 17 15:51:36 2009 +0100
s3-docs: mention long and undocumented option names in pdbedit manpage.
Guenther
(cherry picked from commit 722a330013280758c2184c0239810229b38c42f0)
(cherry picked from commit 7eb666d530ed106811b023ebfc2005c663065413)
commit 164c80d89ff0597ea02de81b2671c8768f8f79d0
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 16:04:06 2009 +0100
s3-docs: mention all long option names in samba.entities file.
Guenther
(cherry picked from commit 0d412789b8035dfeb28989ba82d677d2ae9b7bd0)
(cherry picked from commit b49799825e1b0533aee9214f07207ac072515b89)
commit 89de357565aa6b12efca1928e7757ef48b7ca050
Author: Günther Deschner <gd at samba.org>
Date: Mon Dec 21 15:41:13 2009 +0100
s3-docs: not working for SuSE anymore...
Guenther
(cherry picked from commit d9ca1488a4a0e562ad13207c4b54d029c55be293)
(cherry picked from commit 9bfc55ebef9b49da377b26a1280c824a8b301a70)
commit 3019bda4a93439eb3c901798825a98b38817536d
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 15:27:39 2009 +0100
s3: Shrink winbindd_proto.h a bit
(cherry picked from commit 45eb2372ce7e69428d53ef58b3a216a5bfadbd0c)
commit 83b5120a875d5e4bf0f4afd4c17f65540a9ea493
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 15:11:55 2009 +0100
s3: Fix some nonempty blank lines
(cherry picked from commit 9a4bba3fd7045268de444105b95b702e57df39e9)
commit 7262a3f97d5861b77afe6515c8aeab7cef4088ca
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 15:02:56 2009 +0100
s3: Remove unused get_sam_group_entries
(cherry picked from commit 8787863172d26ee6f4f59b4b099491cd9898d475)
commit 006237c3638a2f54dd501f40df5d5aa841013753
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 15:01:44 2009 +0100
s3: Remove unused winbindd_dual_getsidaliases
(cherry picked from commit 7c309bcba0034a4e6b165ce9d542cb020e2c0e02)
commit 5cfb76fc8fb666e475701e9b8e567955b11acfe6
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:59:11 2009 +0100
s3: Remove an unused struct definition
(cherry picked from commit 013fada66aa9df4cc505f7ed6a2033969b46282a)
commit 3839372deef54ae0ba5e5a698f928a6c5f1a96a4
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:58:21 2009 +0100
s3: Remove unused winbindd_dual_getuserdomgroups
(cherry picked from commit fe02517e8a622e5b2f9d55f1a18392e91d776a45)
commit e4fe6ccabab0f5dc5ab9ac4dc87745928489de27
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:57:03 2009 +0100
s3: Remove unused winbindd_dual_getdcname
(cherry picked from commit 2c6905d0bcf0b60ec9bb98c84ac778dfe8b4ea86)
commit 6d6b24ccc9758091c6021b4a7c7b31283767e5dc
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:55:02 2009 +0100
s3: Remove unused winbindd_dual_lookupname
(cherry picked from commit 79ff1876b989ba0eb9de2e348b87a8721b61c7b6)
commit 30125e971be2e3435793fa38dc46ab7ba4599544
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:54:15 2009 +0100
s3: Remove unused winbindd_dual_lookupsid
(cherry picked from commit a17b245a9c6d9f2f954db5b3ff31295917e0f862)
commit b8b1839846296eb2dba80ef645867e1b936f197d
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:49:48 2009 +0100
s3: Remove unused winbindd_dual_userinfo
(cherry picked from commit 55478de7b54cc940324fd76ea2ec05025dbeeccd)
commit 984e5f8a3ac94610a4f90c05b7d28c50017e3d63
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:47:57 2009 +0100
s3: Remove some unused dual functions
(cherry picked from commit 92b8aa1fd6676fde028c8770fb943a3e36f90329)
commit ec9e1c8f94db37ddb84fd27fea20cb80d4491234
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:42:18 2009 +0100
s3: Remove unused do_async
(cherry picked from commit a575b4434056a46bb936ec395d3c615098b548f9)
commit 01d794dfefc1e2c5763c8e20c7acbd7c54d592ab
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:40:09 2009 +0100
s3: Remove unused winbindd_gid2sid_async
(cherry picked from commit 83dac5e827eb5002e581f50662b23b3167a03bd0)
commit eb94375a25a4d5238cf5e9861246b44afb4c1a4e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:39:36 2009 +0100
s3: Remove unused winbindd_uid2sid_async
(cherry picked from commit 0e547f5ff62828887cd3796e1dd3d52db9282be3)
commit bbee7596c673e95ff0784d6267655abee65b0106
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:38:31 2009 +0100
s3: Remove unused winbindd_sid2gid_async
(cherry picked from commit 9cd4a58f2c8efd019d95f0cffbcbc51aaec89bf4)
commit 5299428550c011115a966a3403baeca0a12cf33e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:37:54 2009 +0100
s3: Remove unused winbindd_sid2uid_async
(cherry picked from commit 810f4f5e19534ac6cb3b37ab456804a27c24fdb0)
commit e0c5e6b71cef22a09f0c06dc33704c85d39c598a
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:36:24 2009 +0100
s3: Remove unused do_async_domain
(cherry picked from commit 21a6a950ed182e14095f2d48dfd9c4bb17ed95b3)
commit 9396deb0351875e406f818d251d6e7766c3cfa0e
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:34:15 2009 +0100
s3: Remove unused query_user_async
(cherry picked from commit 8a51dc029bfd06ecac09b3e9abed35513b4db386)
commit c96a2f980443dd45eb4b36a39bb40f8c028d2689
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:33:26 2009 +0100
s3: Remove unused winbindd_getsidaliases_async
(cherry picked from commit ebecce92ab90b9e9acf7dbfd200d4e5a9330cf35)
commit 37eda9ecd97afb58438ba1888e138b134f8ddb31
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:32:34 2009 +0100
s3: Remove unused winbindd_lookupname_async
(cherry picked from commit 038c85202463d79d8c9b01d283706bd9dbc0b057)
commit 62142024f60c7e7a9e6d390e5192a7444eb8ee9c
Author: Volker Lendecke <vl at samba.org>
Date: Mon Dec 21 14:31:31 2009 +0100
s3: Remove unused winbindd_lookupsid_async
(cherry picked from commit 9c3c632464115bb21db068f586eee578979a1343)
commit 30f6bdde1109b9a21042b0dfec9c6346d7dcf2b7
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 3 17:10:53 2009 +0200
s3:winbind: use wb_fill_pwent in wb_getpwsid
(cherry picked from commit 1a786b31b672cd2e6486433d273e5475d6243f42)
commit ffd8603ff50654338725dfb88e5d2ce8f867a203
Author: Volker Lendecke <vl at samba.org>
Date: Sat Oct 17 17:00:13 2009 +0200
s3:winbind: Move fillup_pw_field() as static to wb_fill_pwent.c
(cherry picked from commit a30f489fa5aae359c3775869e3a26386ef306739)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 2 +
docs-xml/build/DTD/samba.entities | 20 +-
docs-xml/manpages-3/pdbedit.8.xml | 168 +++++--
docs-xml/manpages-3/rpcclient.1.xml | 11 +-
docs-xml/manpages-3/smbcacls.1.xml | 28 +-
docs-xml/manpages-3/smbclient.1.xml | 28 +-
docs-xml/manpages-3/smbget.1.xml | 8 +-
docs-xml/manpages-3/smbtree.1.xml | 6 +-
nsswitch/libwbclient/wbc_pam.c | 45 ++
nsswitch/libwbclient/wbclient.h | 14 +
nsswitch/wbinfo.c | 34 ++
nsswitch/winbind_struct_protocol.h | 4 +-
source3/Makefile.in | 2 +-
source3/include/async_smb.h | 5 -
source3/include/proto.h | 2 +-
source3/include/smb_macros.h | 2 +-
source3/librpc/gen_ndr/cli_wbint.c | 130 +++++
source3/librpc/gen_ndr/cli_wbint.h | 8 +
source3/librpc/gen_ndr/ndr_wbint.c | 51 ++-
source3/librpc/gen_ndr/ndr_wbint.h | 11 +-
source3/librpc/gen_ndr/srv_wbint.c | 80 +++
source3/librpc/gen_ndr/srv_wbint.h | 2 +
source3/librpc/gen_ndr/wbint.h | 8 +
source3/librpc/idl/wbint.idl | 3 +
source3/libsmb/async_smb.c | 187 +-------
source3/libsmb/errormap.c | 6 +-
source3/smbd/error.c | 20 +-
source3/smbd/mangle_hash.c | 9 +
source3/smbd/message.c | 8 +-
source3/smbd/nttrans.c | 84 ++--
source3/smbd/pipes.c | 14 +-
source3/smbd/process.c | 186 +++++++-
source3/smbd/reply.c | 101 ++--
source3/smbd/trans2.c | 34 +-
source3/winbindd/wb_fill_pwent.c | 47 ++
source3/winbindd/wb_getpwsid.c | 89 +---
source3/winbindd/winbindd.c | 2 +
source3/winbindd/winbindd_async.c | 549 --------------------
source3/winbindd/winbindd_ccache_access.c | 8 +-
source3/winbindd/winbindd_check_machine_acct.c | 2 +-
source3/winbindd/winbindd_domain.c | 28 -
source3/winbindd/winbindd_dual_srv.c | 48 ++
source3/winbindd/winbindd_group.c | 284 ----------
source3/winbindd/winbindd_idmap.c | 321 ------------
source3/winbindd/winbindd_misc.c | 92 +---
...ndd_check_machine_acct.c => winbindd_ping_dc.c} | 37 +-
source3/winbindd/winbindd_proto.h | 154 +------
source3/winbindd/winbindd_user.c | 112 ----
48 files changed, 1041 insertions(+), 2053 deletions(-)
copy source3/winbindd/{winbindd_check_machine_acct.c => winbindd_ping_dc.c} (64%)
delete mode 100644 source3/winbindd/winbindd_user.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 84d4680..f2e9964 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -122,6 +122,8 @@ o Jonas Gorski <jonas.gorski+samba at gmail.com>
o Volker Lendecke <vl at samba.org>
* Fix _samr_GetAliasMembership for results with 0 rids.
* Fix an error case in cli_negprot.
+ * Add a lower-cost alternative to wbinfo -t: wbinfo --ping-dc.
+ * Restore correct timeouts for SMB requests.
o Kamen Mazdrashki <kamen.mazdrashki at postpath.com>
diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index 2e924d4..4ad65ca 100644
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -50,8 +50,8 @@
<!ENTITY person.gd '
<firstname>Guenther</firstname><surname>Deschner</surname>
<affiliation>
- <orgname>SuSE</orgname>
- <address><email>gd at suse.de</email></address>
+ <orgname>Samba Team</orgname>
+ <address><email>gd at samba.org</email></address>
</affiliation>'>
<!ENTITY author.gd '<author>&person.gd;</author>'>
@@ -214,7 +214,7 @@ in the &smb.conf; file.</para>
<!ENTITY stdarg.configfile '
<varlistentry>
-<term>-s <configuration file></term>
+<term>-s|--configfile <configuration file></term>
<listitem><para>The file specified contains the
configuration details required by the server. The
information in this file includes server-specific
@@ -227,7 +227,7 @@ compile time.</para></listitem>
<!ENTITY stdarg.version '
<varlistentry>
-<term>-V</term>
+<term>-V|--version</term>
<listitem><para>Prints the program version number.
</para></listitem>
</varlistentry>'>
@@ -249,7 +249,7 @@ log.smbd, etc...). The log file is never removed by the client.
<!ENTITY stdarg.resolve.order '
<varlistentry>
-<term>-R <name resolve order></term>
+<term>-R|--name-resolve <name resolve order></term>
<listitem><para>This option is used to determine what naming
services and in what order to resolve
host names to IP addresses. The option takes a space-separated
@@ -307,7 +307,7 @@ resolution methods will be attempted in this order. </para></listitem>
<!ENTITY stdarg.netbios.name '
<varlistentry>
-<term>-n <primary NetBIOS name></term>
+<term>-n|--netbiosname <primary NetBIOS name></term>
<listitem><para>This option allows you to override
the NetBIOS name that Samba uses for itself. This is identical
to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file.
@@ -318,7 +318,7 @@ line setting will take precedence over settings in
<!ENTITY stdarg.scope '
<varlistentry>
-<term>-i <scope></term>
+<term>-i|--scope <scope></term>
<listitem><para>This specifies a NetBIOS scope that
<command>nmblookup</command> will use to communicate with when
generating NetBIOS names. For details on the use of NetBIOS
@@ -340,7 +340,7 @@ SAM (as opposed to the Domain SAM). </para></listitem>
<!ENTITY stdarg.socket.options '
<varlistentry>
-<term>-O socket options</term>
+<term>-O|--socket-options socket options</term>
<listitem><para>TCP socket options to set on the client
socket. See the socket options parameter in
the &smb.conf; manual page for the list of valid
@@ -357,7 +357,7 @@ options. </para></listitem>
<!ENTITY stdarg.nopass '
<varlistentry>
-<term>-N</term>
+<term>-N|--no-pass</term>
<listitem><para>If specified, this parameter suppresses the normal
password prompt from the client to the user. This is useful when
accessing a service that does not require a password. </para>
@@ -420,7 +420,7 @@ access from unwanted users. </para></listitem>
<!ENTITY stdarg.kerberos '
<varlistentry>
-<term>-k</term>
+<term>-k|--kerberos</term>
<listitem><para>
Try to authenticate with kerberos. Only useful in
an Active Directory environment.
diff --git a/docs-xml/manpages-3/pdbedit.8.xml b/docs-xml/manpages-3/pdbedit.8.xml
index 15be78a..dbce28f 100644
--- a/docs-xml/manpages-3/pdbedit.8.xml
+++ b/docs-xml/manpages-3/pdbedit.8.xml
@@ -19,30 +19,40 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>pdbedit</command>
- <arg choice="opt">-L</arg>
- <arg choice="opt">-v</arg>
- <arg choice="opt">-w</arg>
- <arg choice="opt">-u username</arg>
- <arg choice="opt">-f fullname</arg>
- <arg choice="opt">-h homedir</arg>
- <arg choice="opt">-D drive</arg>
- <arg choice="opt">-S script</arg>
- <arg choice="opt">-p profile</arg>
- <arg choice="opt">-a</arg>
- <arg choice="opt">-t, --password-from-stdin</arg>
- <arg choice="opt">-m</arg>
- <arg choice="opt">-r</arg>
- <arg choice="opt">-x</arg>
- <arg choice="opt">-i passdb-backend</arg>
- <arg choice="opt">-e passdb-backend</arg>
+ <arg choice="opt">-a</arg>
<arg choice="opt">-b passdb-backend</arg>
- <arg choice="opt">-g</arg>
+ <arg choice="opt">-c account-control</arg>
+ <arg choice="opt">-C value</arg>
<arg choice="opt">-d debuglevel</arg>
- <arg choice="opt">-s configfile</arg>
+ <arg choice="opt">-D drive</arg>
+ <arg choice="opt">-e passdb-backend</arg>
+ <arg choice="opt">-f fullname</arg>
+ <arg choice="opt">--force-initialized-passwords</arg>
+ <arg choice="opt">-g</arg>
+ <arg choice="opt">-G SID|RID</arg>
+ <arg choice="opt">-h homedir</arg>
+ <arg choice="opt">-i passdb-backend</arg>
+ <arg choice="opt">-I domain</arg>
+ <arg choice="opt">-L </arg>
+ <arg choice="opt">-m</arg>
+ <arg choice="opt">-N description</arg>
<arg choice="opt">-P account-policy</arg>
- <arg choice="opt">-C value</arg>
- <arg choice="opt">-c account-control</arg>
+ <arg choice="opt">-p profile</arg>
+ <arg choice="opt">--policies-reset</arg>
+ <arg choice="opt">-r</arg>
+ <arg choice="opt">-s configfile</arg>
+ <arg choice="opt">-S script</arg>
+ <arg choice="opt">-t</arg>
+ <arg choice="opt">--time-format</arg>
+ <arg choice="opt">-u username</arg>
+ <arg choice="opt">-U SID|RID</arg>
+ <arg choice="opt">-v</arg>
+ <arg choice="opt">-V</arg>
+ <arg choice="opt">-w</arg>
+ <arg choice="opt">-x</arg>
<arg choice="opt">-y</arg>
+ <arg choice="opt">-z</arg>
+ <arg choice="opt">-Z</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -69,7 +79,7 @@
<title>OPTIONS</title>
<variablelist>
<varlistentry>
- <term>-L</term>
+ <term>-L|--list</term>
<listitem><para>This option lists all the user accounts
present in the users database.
This option prints a list of user/uid pairs separated by
@@ -85,7 +95,7 @@ samba:45:Test User
<varlistentry>
- <term>-v</term>
+ <term>-v|--verbose</term>
<listitem><para>This option enables the verbose listing format.
It causes pdbedit to list the users in the database, printing
out the account fields in a descriptive format.</para>
@@ -117,7 +127,7 @@ Profile Path: \\BERSERKER\profile
<varlistentry>
- <term>-w</term>
+ <term>-w|--smbpasswd-style</term>
<listitem><para>This option sets the "smbpasswd" listing format.
It will make pdbedit list the users in the database, printing
out the account fields in a format compatible with the
@@ -139,7 +149,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
- <term>-u username</term>
+ <term>-u|--user username</term>
<listitem><para>This option specifies the username to be
used for the operation requested (listing, adding, removing).
It is <emphasis>required</emphasis> in add, remove and modify
@@ -149,7 +159,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-f fullname</term>
+ <term>-f|--fullname fullname</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the user's full
name. </para>
@@ -159,7 +169,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-h homedir</term>
+ <term>-h|--homedir homedir</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the user's home
directory network path.</para>
@@ -170,7 +180,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-D drive</term>
+ <term>-D|--drive drive</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the windows drive
letter to be used to map the home directory.</para>
@@ -182,7 +192,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
- <term>-S script</term>
+ <term>-S|--script script</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the user's logon
script path.</para>
@@ -194,7 +204,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
<varlistentry>
- <term>-p profile</term>
+ <term>-p|--profile profile</term>
<listitem><para>This option can be used while adding or
modifing a user account. It will specify the user's profile
directory.</para>
@@ -205,7 +215,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-G SID|rid</term>
+ <term>-G|'--group SID' SID|rid</term>
<listitem><para>
This option can be used while adding or modifying a user account. It
will specify the users' new primary group SID (Security Identifier) or
@@ -216,18 +226,21 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-U SID|rid</term>
+ <term>-U|'--user SID' SID|rid</term>
<listitem><para>
This option can be used while adding or modifying a user account. It
will specify the users' new SID (Security Identifier) or
rid. </para>
<para>Example: <command>-U S-1-5-21-2447931902-1787058256-3961074038-5004</command></para>
+ <para>Example: <command>'--user SID' S-1-5-21-2447931902-1787058256-3961074038-5004</command></para>
+ <para>Example: <command>-U 5004</command></para>
+ <para>Example: <command>'--user SID' 5004</command></para>
</listitem>
</varlistentry>
<varlistentry>
- <term>-c account-control</term>
+ <term>-c|--account-control account-control</term>
<listitem><para>This option can be used while adding or modifying a user
account. It will specify the users' account control property. Possible flags are listed below.
</para>
@@ -263,7 +276,7 @@ samba:45:0F2B255F7B67A7A9AAD3B435B51404EE:
</varlistentry>
<varlistentry>
- <term>-a</term>
+ <term>-a|--create</term>
<listitem><para>This option is used to add a user into the
database. This command needs a user name specified with
the -u switch. When adding a new user, pdbedit will also
@@ -289,7 +302,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-t, --password-from-stdin</term>
+ <term>-t|--password-from-stdin</term>
<listitem><para>This option causes pdbedit to read the password
from standard input, rather than from /dev/tty (like the
<command>passwd(1)</command> program does). The password has
@@ -298,7 +311,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-r</term>
+ <term>-r|--modify</term>
<listitem><para>This option is used to modify an existing user
in the database. This command needs a user name specified with the -u
switch. Other options can be specified to modify the properties of
@@ -308,7 +321,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-m</term>
+ <term>-m|--machine</term>
<listitem><para>This option may only be used in conjunction
with the <parameter>-a</parameter> option. It will make
pdbedit to add a machine trust account instead of a user
@@ -321,7 +334,7 @@ retype new password
<varlistentry>
- <term>-x</term>
+ <term>-x|--delete</term>
<listitem><para>This option causes pdbedit to delete an account
from the database. It needs a username specified with the
-u switch.</para>
@@ -332,7 +345,7 @@ retype new password
<varlistentry>
- <term>-i passdb-backend</term>
+ <term>-i|--import passdb-backend</term>
<listitem><para>Use a different passdb backend to retrieve users
than the one specified in smb.conf. Can be used to import data into
your local user database.</para>
@@ -346,7 +359,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-e passdb-backend</term>
+ <term>-e|--export passdb-backend</term>
<listitem><para>Exports all currently available users to the
specified password database backend.</para>
@@ -358,7 +371,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-g</term>
+ <term>-g|--group</term>
<listitem><para>If you specify <parameter>-g</parameter>,
then <parameter>-i in-backend -e out-backend</parameter>
applies to the group mapping instead of the user database.</para>
@@ -370,7 +383,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-b passdb-backend</term>
+ <term>-b|--backend passdb-backend</term>
<listitem><para>Use a different default passdb backend. </para>
<para>Example: <command>pdbedit -b xml:/root/pdb-backup.xml -l</command></para>
@@ -378,7 +391,7 @@ retype new password
</varlistentry>
<varlistentry>
- <term>-P account-policy</term>
+ <term>-P|--account-policy account-policy</term>
<listitem><para>Display an account policy</para>
<para>Valid policies are: minimum password age, reset count minutes, disconnect time,
user must logon to change password, password history, lockout duration, min password length,
@@ -394,7 +407,7 @@ account policy value for bad lockout attempt is 0
<varlistentry>
- <term>-C account-policy-value</term>
+ <term>-C|--value account-policy-value</term>
<listitem><para>Sets an account policy to a specified value.
This option may only be used in conjunction
with the <parameter>-P</parameter> option.
@@ -409,7 +422,7 @@ account policy value for bad lockout attempt is now 3
</varlistentry>
<varlistentry>
- <term>-y</term>
+ <term>-y|--policies</term>
<listitem><para>If you specify <parameter>-y</parameter>,
then <parameter>-i in-backend -e out-backend</parameter>
applies to the account policies instead of the user database.</para>
@@ -422,6 +435,73 @@ account policy value for bad lockout attempt is now 3
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>--force-initialized-passwords</term>
+ <listitem><para>This option forces all users to change their
+ password upon next login.
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-N|--account-desc description</term>
+ <listitem><para>This option can be used while adding or
+ modifing a user account. It will specify the user's description
+ field.</para>
+
+ <para>Example: <command>-N "test description"</command>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-Z|--logon-hours-reset</term>
+ <listitem><para>This option can be used while adding or
+ modifing a user account. It will reset the user's allowed logon
+ hours. A user may login at any time afterwards.</para>
+
+ <para>Example: <command>-Z</command>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-z|--bad-password-count-reset</term>
+ <listitem><para>This option can be used while adding or
+ modifing a user account. It will reset the stored bad login
+ counter from a specified user.</para>
+
+ <para>Example: <command>-z</command>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--policies-reset</term>
+ <listitem><para>This option can be used to reset the general
+ password policies stored for a domain to their
+ default values.</para>
+ <para>Example: <command>--policies-reset</command>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-I|--domain</term>
+ <listitem><para>This option can be used while adding or
+ modifing a user account. It will specify the user's domain field.</para>
+
+ <para>Example: <command>-I "MYDOMAIN"</command>
+ </para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--time-format</term>
+ <listitem><para>This option is currently not being used.</para>
+ </listitem>
+ </varlistentry>
+
&stdarg.help;
&stdarg.server.debug;
&popt.common.samba;
diff --git a/docs-xml/manpages-3/rpcclient.1.xml b/docs-xml/manpages-3/rpcclient.1.xml
index 79bb928..1f6187a 100644
--- a/docs-xml/manpages-3/rpcclient.1.xml
+++ b/docs-xml/manpages-3/rpcclient.1.xml
@@ -29,7 +29,6 @@
<arg choice="opt">-s <smb config file></arg>
<arg choice="opt">-U username[%password]</arg>
<arg choice="opt">-W workgroup</arg>
- <arg choice="opt">-N</arg>
<arg choice="opt">-I destinationIP</arg>
<arg choice="req">server</arg>
</cmdsynopsis>
@@ -70,7 +69,7 @@
<varlistentry>
- <term>-I IP-address</term>
+ <term>-I|--dest-ip IP-address</term>
<listitem><para><replaceable>IP address</replaceable> is the address of the server to connect to.
It should be specified in standard "a.b.c.d" notation. </para>
@@ -87,6 +86,14 @@
above. </para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>-p|--port port</term>
+ <listitem><para>This number is the TCP port number that will be used
+ when making connections to the server. The standard (well-known)
+ TCP port number for an SMB/CIFS server is 139, which is the
+ default. </para></listitem>
+ </varlistentry>
+
&stdarg.server.debug;
&popt.common.samba;
&popt.common.credentials;
diff --git a/docs-xml/manpages-3/smbcacls.1.xml b/docs-xml/manpages-3/smbcacls.1.xml
index b7d0a54..16915bb 100644
--- a/docs-xml/manpages-3/smbcacls.1.xml
--
Samba Shared Repository
More information about the samba-cvs
mailing list