[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Jan 21 16:05:02 UTC 2020
The branch, master has been updated
via 71b57a0ac3d WHATSNEW: Start release notes for Samba 4.13.0pre1.
via 423ca5e3529 VERSION: Bump version up to 4.13.0pre1...
via 773c5de6750 VERSION: Disable GIT_SNAPSHOT for the 4.12.0rc1 release...
via e1e55a47419 WHATSNEW: Add release note for Samba 4.12.0rc1.
via cf9850b4e06 samba-tool group addmembers: avoid python traceback on member add failure
via 2697415239d selftest: add test for samba-tool groupmember --member-base-dn option
via 8c5a266ef3f selftest: add tests for samba-tool group addmembers --object-types option
via 347c65434ec selftest: add test for new samba-tool group addmembers --member-dn option
via 557fa1d44b6 samba-tool group addmembers: add --member-base-dn option for group member search
via 5b129bf12ba samba-tool group {add,remove}members: allow to use --member-dn in combination with listofmembers
via 47f9ee91ed9 samba-tool group removemembers: adapt functionality to addmembers command
via aedcf6a5274 samba-tool group addmembers: add --member-dn option
via f2e2579926e samba-tool group addmembers: add new option --object-types
via a4d77bfd90d python/samdb: validation of group member types for group member filter
via f9bf6b7856e python/samdb: add type "all" to search for all common types of group members
via c4e899d6b4b python/samdb: adapt search filter for group object type
via 45abb4fd4f4 python/samdb: adapt search filter for user object type
via 2baa301237f python/samdb: add 'computer' to the default group member types for group member filters
via 2abebee1405 python/samdb: fetch specific error if there are more than one search results
via e3099ac4072 python/samdb: add more object types for adding/remove group members
via 662b7458aed python/samdb: add option to specify types of group members
via b081bd977c8 samba-tool tests: add test-case for 'ou list --base-dn'
via 2186c5a6a4c samba-tool: add -b/--base-dn option to OUs list command
via 918d91bb843 samba-tool tests: add test-case for 'user list --base-dn'
via d4de2e3192e samba-tool: add -b/--base-dn option to users list command
via 55be0f1d2f7 samba-tool tests: add test-case for 'contact list --base-dn'
via 8a45adb2b19 samba-tool: add -b/--base-dn option to contacts list command
via 88f0a1390b8 samba-tool tests: add test-case for 'computer list --base-dn'
via b292a266a8d samba-tool: add -b/--base-dn option to computer list command
via bced03b0d1a samba-tool tests: add test-case for 'group list --base-dn'
via 8f68236dc4e samba-tool: add -b/--base-dn option to groups list command
via b545ab1a85d samba-tool tests: add test-case for 'user getgrouops --full-dn'
via 41262d1d66c samba-tool: add --full-dn option for user getgroups command
via d2d345103b2 samba-tool tests: add test-case for 'group listmembers --full-dn'
via bb66b322546 samba-tool: add --full-dn option to group listmembers command
via 08207f77f13 samba-tool tests: add test case for 'user list --full-dn'
via 31060963956 samba-tool: add --full-dn option to user list command
via 2e767e81be4 samba-tool tests: add test case for 'computer list --full-dn'
via 29326e32645 samba-tool: add --full-dn option to computer list command
via e64f7de31fd samba-tool tests: Add test-case for 'group list --full-dn'
via 51d4c82f3c5 samba-tool: add --full-dn option to group list command
via b813ef6ae7a Revert "vfs_glusterfs: Return fake fd from pipe() during open"
via cc4a55d290c vfs_glusterfs: add .fcntl_fn hook
via b56c56eecdf vfs_ceph: add .fcntl_fn hook
via 0a77890bbc9 testenv: No "mktemp" for in_screen
via 823e4de3094 testenv: Simplify "in_screen"
via 1ca1c601989 testenv: Properly kill daemons
via 4f1e4f9ce3f testenv: Be more careful deleting environment tmpfiles
from 85478847a1f WHATSNEW: Add CTDB changes for 4.12
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 71b57a0ac3d1ac5be98347dc109d7ebd14d39e88
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 21 14:51:34 2020 +0100
WHATSNEW: Start release notes for Samba 4.13.0pre1.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Jan 21 16:04:29 UTC 2020 on sn-devel-184
commit 423ca5e3529f137cec3d367ef004eee2d4d18e4b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 21 14:23:45 2020 +0100
VERSION: Bump version up to 4.13.0pre1...
and re-enable GIT_SNAPSHOT.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 773c5de675049bd6943e0464d7cabcea54d94e47
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 21 14:21:50 2020 +0100
VERSION: Disable GIT_SNAPSHOT for the 4.12.0rc1 release...
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit e1e55a4741932dda4c4b39e664f7a9dd525e6517
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Jan 21 14:20:22 2020 +0100
WHATSNEW: Add release note for Samba 4.12.0rc1.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit cf9850b4e0641845ce8942bdb536531204788adf
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Jan 21 13:56:29 2020 +0100
samba-tool group addmembers: avoid python traceback on member add failure
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2697415239dca1ac54eb056b7c80cdf81c79bea9
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 30 16:14:52 2019 +0100
selftest: add test for samba-tool groupmember --member-base-dn option
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8c5a266ef3f616ab79100dc78caf463d0b734900
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Dec 18 15:09:16 2019 +0100
selftest: add tests for samba-tool group addmembers --object-types option
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 347c65434ec5cd9134c6d5f0779cc4bb20f4542b
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Dec 18 10:43:22 2019 +0100
selftest: add test for new samba-tool group addmembers --member-dn option
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 557fa1d44b687a552f7a1413306c229449f5eddd
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 30 14:54:32 2019 +0100
samba-tool group addmembers: add --member-base-dn option for group member search
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5b129bf12ba138ffd097443fee52709c7f82cf46
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Dec 18 13:35:16 2019 +0100
samba-tool group {add,remove}members: allow to use --member-dn in combination with listofmembers
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 47f9ee91ed9d5bdaea82413f36d17bc72498a79a
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Dec 17 16:27:32 2019 +0100
samba-tool group removemembers: adapt functionality to addmembers command
Adds --member-dn and --object-types options.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit aedcf6a52748d0858aab7d1b3e0253592e963706
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Dec 17 16:26:23 2019 +0100
samba-tool group addmembers: add --member-dn option
The --member-dn option allows to specify an object by it's DN.
This is required to select a specific object if there are more than one
with the same name. Multiple contacts can exist with the same name in
different OUs.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f2e2579926e0bfcd8b150c33cd4784391426c5e6
Author: Björn Baumbach <bb at sernet.de>
Date: Fri Aug 9 17:07:07 2019 +0200
samba-tool group addmembers: add new option --object-types
With this option the admin can specify the object types of the group
members which will be added to the group. The search filter for the objects
will be created according to the types.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a4d77bfd90d09b37b89f99042d9e0e3d5b102677
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 30 13:57:26 2019 +0100
python/samdb: validation of group member types for group member filter
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit f9bf6b7856ee573d4f9f1bd0748ac46d24798d5c
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 30 13:57:11 2019 +0100
python/samdb: add type "all" to search for all common types of group members
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit c4e899d6b4bcc5d42c73810e0c7fe8b67db2b094
Author: Björn Baumbach <bb at sernet.de>
Date: Fri Aug 9 16:45:51 2019 +0200
python/samdb: adapt search filter for group object type
Use a group search filter which is similar to the filter which is used
by the basic MS Windows group membership management.
The filter excludes the group type GROUP_TYPE_BUILTIN_LOCAL_GROUP.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 45abb4fd4f42db5e71a6e226f1ed5486f3c257db
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 30 16:27:59 2019 +0100
python/samdb: adapt search filter for user object type
Use a user search filter which is similar to the filter which is used
by the basic MS Windows group membership management.
The filter filters for objects with the sAMAccountType ATYPE_NORMAL_ACCOUNT.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2baa301237f4a2446667db39369848402af5f9bf
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Dec 30 16:24:23 2019 +0100
python/samdb: add 'computer' to the default group member types for group member filters
Add the 'computer' type to the default member types, so that the next
commit does not change the default behavior.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2abebee1405d2c7606e3980cfc07fec101c24297
Author: Björn Baumbach <bb at sernet.de>
Date: Wed Dec 18 17:15:13 2019 +0100
python/samdb: fetch specific error if there are more than one search results
There can be more than one contact with the same name.
Signed-off-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e3099ac4072668b208529f1c253c308bb82dac5b
Author: Björn Baumbach <bb at sernet.de>
Date: Fri Aug 9 16:26:58 2019 +0200
python/samdb: add more object types for adding/remove group members
The filters are based on the MS Windows filter, which are used by the
basic group member management dialog.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 662b7458aed8daf70980f558f9713920c3e56da4
Author: Björn Baumbach <bb at sernet.de>
Date: Fri Aug 9 16:19:52 2019 +0200
python/samdb: add option to specify types of group members
The option can be used to specify the type of the object which have to
be added to (or removed) from a group. The search filter for the objects
will be created according to the types.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b081bd977c827fdf20193b5b2b535734fec4a8de
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 12:21:29 2019 +0200
samba-tool tests: add test-case for 'ou list --base-dn'
Check if the ou list --base-dn / -b command uses a specific base dn.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2186c5a6a4c6de16a0371289832ca99bbc5bc3c2
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 26 10:25:18 2019 +0200
samba-tool: add -b/--base-dn option to OUs list command
With this option it's e.g. possible to list the OUs which are
located under a different specific place in the AD.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 918d91bb8432ffc0788409ef94fa8b1365be8500
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 28 11:06:13 2019 +0200
samba-tool tests: add test-case for 'user list --base-dn'
Check if the user list --base-dn / -b command uses a specific base dn.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d4de2e3192ed9a1e93bc67f3e110dedde339ed98
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 26 09:47:41 2019 +0200
samba-tool: add -b/--base-dn option to users list command
With this option it's e.g. possible to list the users of a
specify OU or users which are located under a different specific
place in the AD.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 55be0f1d2f766618a59b6c4f0d95518adda1103e
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 12:23:08 2019 +0200
samba-tool tests: add test-case for 'contact list --base-dn'
Check if the contact list --base-dn / -b command uses a specific base dn.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8a45adb2b19279d01b33d0f7c15f1cd1c5f9e863
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 26 09:33:24 2019 +0200
samba-tool: add -b/--base-dn option to contacts list command
With this option it's e.g. possible to list the contacts of a
specify OU or contacts which are located under a different specific
place in the AD.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 88f0a1390b854f4ea1f6e29914e3bac85457c745
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 13:08:34 2019 +0200
samba-tool tests: add test-case for 'computer list --base-dn'
Check if the computer list --base-dn / -b command uses a specific base dn.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b292a266a8db3e5fbe67cd14c0167869efba2705
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 26 08:46:24 2019 +0200
samba-tool: add -b/--base-dn option to computer list command
With this option it's e.g. possible to list the computers of a
specify OU or computers which are located under a different specific
place in the AD.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit bced03b0d1af2055a7b32b5658a746d6a0505ede
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 12:00:15 2019 +0200
samba-tool tests: add test-case for 'group list --base-dn'
Check if the group list --base-dn / -b command uses a specific base dn.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 8f68236dc4ed281098d534981521d22a250e4001
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 12 20:46:47 2019 +0200
samba-tool: add -b/--base-dn option to groups list command
With this option it's e.g. possible to list the groups of a
specify OU or groups which are located under a different specific
place in the AD.
Signed-off-by: Jule Anger <ja at sernet.de>
Pair-programmed-with: Björn Baumbach <bb at samba.org>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b545ab1a85d56f169eecfa5d8735fdc5dd5a83f4
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Jan 21 12:53:15 2020 +0100
samba-tool tests: add test-case for 'user getgrouops --full-dn'
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 41262d1d66c18e3ea2f2f3c009a88ef830d25aa4
Author: Björn Baumbach <bb at sernet.de>
Date: Tue Jan 21 11:39:30 2020 +0100
samba-tool: add --full-dn option for user getgroups command
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit d2d345103b20b0bb72073b785b7b4cc4552c8335
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 12:19:29 2019 +0200
samba-tool tests: add test-case for 'group listmembers --full-dn'
Check if the group listmembers --full-dn command displays DN instead of the sAMAccountName.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit bb66b3225463c940141da2c9ae23dbe6d85b3151
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 22 15:39:37 2019 +0200
samba-tool: add --full-dn option to group listmembers command
With this option the command lists the groupmembers distinguished names
instead of the sAMAccountName.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 08207f77f13e82cbe1c5a1f82f45680cadfd65d9
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 28 10:40:39 2019 +0200
samba-tool tests: add test case for 'user list --full-dn'
Check if the --full-dn option displays DN instead of the sAMAccountName.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 31060963956ba6feb81d45c3afe140a0a4c3d235
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 22 09:30:21 2019 +0200
samba-tool: add --full-dn option to user list command
With this option the command lists the users distringuished names
instead of the sAMAccountNames.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 2e767e81be409f827e2e6ca1dde7b6ebf1354428
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 13:05:03 2019 +0200
samba-tool tests: add test case for 'computer list --full-dn'
Check if the --full-dn option displays DN instead of the sAMAccountName.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 29326e32645cd34b442c8048a768a7d37553b43a
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 22 09:12:31 2019 +0200
samba-tool: add --full-dn option to computer list command
With this option the command lists the computers distringuished names
instead of the sAMAccountNames.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit e64f7de31fddbd702b19ec495f34faad01b217f9
Author: Jule Anger <ja at sernet.de>
Date: Tue Aug 27 11:49:12 2019 +0200
samba-tool tests: Add test-case for 'group list --full-dn'
Check if the --full-dn option displays DN instead of the sAMAccountName.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 51d4c82f3c5bed8a412ccf747e0617e14ca35671
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Aug 12 20:43:48 2019 +0200
samba-tool: add --full-dn option to group list command
With this option the command lists the groups distringuished names
instead of the sAMAccountNames.
Signed-off-by: Björn Baumbach <bb at sernet.de>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b813ef6ae7a8349f961f9f133de8f52d1127d90b
Author: David Disseldorp <ddiss at samba.org>
Date: Tue Jan 21 11:32:50 2020 +0100
Revert "vfs_glusterfs: Return fake fd from pipe() during open"
This reverts commit c9adf47ac5a5aa0dd12572c34b08cc51f15b2e97.
The fake fd is no longer necessary, as vfs_glusterfs now provides a
fcntl_fn hook.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14241
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit cc4a55d290c2d34d9dcaccef74385c9251d13e15
Author: David Disseldorp <ddiss at samba.org>
Date: Tue Jan 21 01:14:38 2020 +0100
vfs_glusterfs: add .fcntl_fn hook
This hook is currently called via vfs_set_blocking(), so can safely be
ignored.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14241
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit b56c56eecdfe63c23204fbc3a72ebde9ac01a708
Author: David Disseldorp <ddiss at samba.org>
Date: Tue Jan 21 01:12:42 2020 +0100
vfs_ceph: add .fcntl_fn hook
This hook is currently called via vfs_set_blocking(), so can safely be
ignored.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14241
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Guenther Deschner <gd at samba.org>
commit 0a77890bbc938a75ad2255ac36861262f0c3fd1a
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 20 21:28:18 2020 +0100
testenv: No "mktemp" for in_screen
We don't use this
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 823e4de3094d10e39efd236e66f3e60fa31a9620
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 16 15:08:25 2018 +0200
testenv: Simplify "in_screen"
We don't need "seq", bash can do that itself, and we assume bash here
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 1ca1c601989f282e379c163847c99a0c21007df1
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 20 21:22:39 2020 +0100
testenv: Properly kill daemons
Without this, all the daemons were kept around
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4f1e4f9ce3ff21ca542b87ab1a99c34729370701
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jan 20 21:19:40 2020 +0100
testenv: Be more careful deleting environment tmpfiles
If there is more than one server we will have for example nt4_dc.smbd,
nt4_dc.nmbd and nt4_dc.winbind as daemon environments, together with
the commandline environment "nt4_dc" coming last. Before this patch we
would have deleted all previous tmpfiles in the commandline environment.
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 129 +-----------------------
python/samba/netcmd/computer.py | 27 +++++-
python/samba/netcmd/contact.py | 11 ++-
python/samba/netcmd/group.py | 156 ++++++++++++++++++++++++++----
python/samba/netcmd/ou.py | 19 +++-
python/samba/netcmd/user.py | 46 ++++++++-
python/samba/samdb.py | 113 +++++++++++++++++-----
python/samba/tests/samba_tool/computer.py | 39 ++++++++
python/samba/tests/samba_tool/contact.py | 19 ++++
python/samba/tests/samba_tool/group.py | 66 +++++++++++++
python/samba/tests/samba_tool/ou.py | 19 ++++
python/samba/tests/samba_tool/user.py | 46 +++++++++
selftest/in_screen | 33 +++----
source3/modules/vfs_ceph.c | 29 ++++++
source3/modules/vfs_glusterfs.c | 43 +++++---
source4/setup/tests/blackbox_group.sh | 130 ++++++++++++++++++++++++-
17 files changed, 716 insertions(+), 211 deletions(-)
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 3f4e84bf0f4..9e1f19bc640 100644
--- a/VERSION
+++ b/VERSION
@@ -24,7 +24,7 @@
# -> "3.0.0" #
########################################################
SAMBA_VERSION_MAJOR=4
-SAMBA_VERSION_MINOR=12
+SAMBA_VERSION_MINOR=13
SAMBA_VERSION_RELEASE=0
########################################################
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 18c787d3cba..93341756593 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,12 +1,12 @@
Release Announcements
=====================
-This is the first preview release of Samba 4.12. This is *not*
+This is the first preview release of Samba 4.13. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
-Samba 4.12 will be the next version of the Samba suite.
+Samba 4.13 will be the next version of the Samba suite.
UPGRADING
@@ -16,130 +16,10 @@ UPGRADING
NEW FEATURES/CHANGES
====================
-Python 3.5 Required
--------------------
-
-Samba's minimum runtime requirement for python was raised to Python
-3.4 with samba 4.11. Samba 4.12 raises this minimum version to Python
-3.5 both to access new features and because this is the oldest version
-we test with in our CI infrastructure.
-
-(Build time support for the file server with Python 2.6 has not
-changed)
-
-Removing in-tree cryptography: GnuTLS 3.4.7 required
-----------------------------------------------------
-
-Samba is making efforts to remove in-tree cryptographic functionality,
-and to instead rely on externally maintained libraries. To this end,
-Samba has chosen GnuTLS as our standard cryptographic provider.
-
-Samba now requires GnuTLS 3.4.7 to be installed (including development
-headers at build time) for all configurations, not just the Samba AD
-DC.
-
-Thanks to this work Samba no longer ships an in-tree DES
-implementation and on GnuTLS 3.6.5 or later Samba will include no
-in-tree cryptography other than the MD4 hash and that
-implemented in our copy of Heimdal.
-
-Using GnuTLS for SMB3 encryption you will notice huge performance and copy
-speed improvements. Tests with the CIFS Kernel client from Linux Kernel 5.3
-show a 3x speed improvement for writing and a 2.5x speed improvement for reads!
-
-NOTE WELL: The use of GnuTLS means that Samba will honour the
-system-wide 'FIPS mode' (a reference to the US FIPS-140 cryptographic
-standard) and so will not operate in many still common situations if
-this system-wide parameter is in effect, as many of our protocols rely
-on outdated cryptography.
-
-A future Samba version will mitigate this to some extent where good
-cryptography effectively wraps bad cryptography, but for now that above
-applies.
-
-
-"net ads kerberos pac save" and "net eventlog export"
------------------------------------------------------
-
-The "net ads kerberos pac save" and "net eventlog export" tools will
-no longer silently overwrite an existing file during data export. If
-the filename given exits, an error will be shown.
-
-VFS
-===
-
-SMB_VFS_NTIMES
---------------
-
-Samba now uses a sentinel value based on utimensat(2) UTIME_OMIT to denote
-to-be-ignored timestamp variables passed to the SMB_VFS_NTIMES() VFS function.
-
-VFS modules can check whether any of the time values inside a struct
-smb_file_time is to be ignored by calling is_omit_timespec() on the value.
REMOVED FEATURES
================
-The smb.conf parameter "write cache size" has been removed.
-
-Since the in-memory write caching code was written, our write path has
-changed significantly. In particular we have gained very flexible
-support for async I/O, with the new linux io_uring interface in
-development. The old write cache concept which cached data in main
-memory followed by a blocking pwrite no longer gives any improvement
-on modern systems, and may make performance worse on memory-contrained
-systems, so this functionality should not be enabled in core smbd
-code.
-
-In addition, it complicated the write code, which is a performance
-critical code path.
-
-If required for specialist purposes, it can be recreated as a VFS
-module.
-
-BIND9_FLATFILE deprecated
--------------------------
-
-The BIND9_FLATFILE DNS backend is deprecated in this release and will
-be removed in the future. This was only practically useful on a single
-domain controller or under expert care and supervision.
-
-This release removes the "rndc command" smb.conf parameter, which
-supported this configuration by writing out a list of DCs permitted to
-make changes to the DNS Zone and nudging the 'named' server if a new
-DC was added to the domain. Administrators using BIND9_FLATFILE will
-need to maintain this manually from now on.
-
-
-Retiring DES encryption types in Kerberos.
-------------------------------------------
-With this release, support for DES encryption types has been removed from
-Samba, and setting DES_ONLY flag for an account will cause Kerberos
-authentication to fail for that account (see RFC-6649).
-
-Samba-DC: DES keys no longer saved in DB.
------------------------------------------
-When a new password is set for an account, Samba DC will store random keys
-in DB instead of DES keys derived from the password. If the account is being
-migrated to Windbows or to an older version of Samba in order to use DES keys,
-the password must be reset to make it work.
-
-Heimdal-DC: removal of weak-crypto.
------------------------------------
-Following removal of DES encryption types from Samba, the embedded Heimdal
-build has been updated to not compile weak crypto code (HEIM_WEAK_CRYPTO).
-
-CTDB changes
-------------
-
-* The ctdb_mutex_fcntl_helper periodically re-checks the lock file
-
- The re-check period is specified using a 2nd argument to this
- helper. The default re-check period is 5s.
-
- If the file no longer exists or the inode number changes then the
- helper exits. This triggers an election.
-
smb.conf changes
================
@@ -147,14 +27,11 @@ smb.conf changes
Parameter Name Description Default
-------------- ----------- -------
- nfs4:acedup Changed default merge
- rndc command Removed
- write cache size Removed
KNOWN ISSUES
============
-https://wiki.samba.org/index.php/Release_Planning_for_Samba_4.12#Release_blocking_bugs
+https://wiki.samba.org/index.php/Release_Planning_for_Samba_4.13#Release_blocking_bugs
#######################################
diff --git a/python/samba/netcmd/computer.py b/python/samba/netcmd/computer.py
index 11b2938464a..d48a3e732fd 100644
--- a/python/samba/netcmd/computer.py
+++ b/python/samba/netcmd/computer.py
@@ -527,6 +527,13 @@ class cmd_computer_list(Command):
takes_options = [
Option("-H", "--URL", help="LDB URL for database or target server",
type=str, metavar="URL", dest="H"),
+ Option("-b", "--base-dn",
+ help="Specify base DN to use",
+ type=str),
+ Option("--full-dn", dest="full_dn",
+ default=False,
+ action="store_true",
+ help="Display DN instead of the sAMAccountName.")
]
takes_optiongroups = {
@@ -535,7 +542,13 @@ class cmd_computer_list(Command):
"versionopts": options.VersionOptions,
}
- def run(self, sambaopts=None, credopts=None, versionopts=None, H=None):
+ def run(self,
+ sambaopts=None,
+ credopts=None,
+ versionopts=None,
+ H=None,
+ base_dn=None,
+ full_dn=False):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
@@ -544,14 +557,22 @@ class cmd_computer_list(Command):
filter = "(sAMAccountType=%u)" % (dsdb.ATYPE_WORKSTATION_TRUST)
- domain_dn = samdb.domain_dn()
- res = samdb.search(domain_dn, scope=ldb.SCOPE_SUBTREE,
+ search_dn = samdb.domain_dn()
+ if base_dn:
+ search_dn = samdb.normalize_dn_in_domain(base_dn)
+
+ res = samdb.search(search_dn,
+ scope=ldb.SCOPE_SUBTREE,
expression=filter,
attrs=["samaccountname"])
if (len(res) == 0):
return
for msg in res:
+ if full_dn:
+ self.outf.write("%s\n" % msg.get("dn"))
+ continue
+
self.outf.write("%s\n" % msg.get("samaccountname", idx=0))
diff --git a/python/samba/netcmd/contact.py b/python/samba/netcmd/contact.py
index b35f3f16a88..73b7d141af6 100644
--- a/python/samba/netcmd/contact.py
+++ b/python/samba/netcmd/contact.py
@@ -254,6 +254,9 @@ class cmd_list(Command):
type=str,
metavar="URL",
dest="H"),
+ Option("-b", "--base-dn",
+ help="Specify base DN to use.",
+ type=str),
Option("--full-dn",
dest="full_dn",
default=False,
@@ -272,6 +275,7 @@ class cmd_list(Command):
credopts=None,
versionopts=None,
H=None,
+ base_dn=None,
full_dn=False):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
@@ -281,8 +285,11 @@ class cmd_list(Command):
credentials=creds,
lp=lp)
- domain_dn = samdb.domain_dn()
- res = samdb.search(domain_dn,
+ search_dn = samdb.domain_dn()
+ if base_dn:
+ search_dn = samdb.normalize_dn_in_domain(base_dn)
+
+ res = samdb.search(search_dn,
scope=ldb.SCOPE_SUBTREE,
expression="(objectClass=contact)",
attrs=["name"])
diff --git a/python/samba/netcmd/group.py b/python/samba/netcmd/group.py
index 95843eecea4..6e5ed1def28 100644
--- a/python/samba/netcmd/group.py
+++ b/python/samba/netcmd/group.py
@@ -218,7 +218,7 @@ sudo samba-tool group addmembers supergroup User2
Example2 shows how to add a single user account, User2, to the supergroup AD group. It uses the sudo command to run as root when issuing the command.
"""
- synopsis = "%prog <groupname> <listofmembers> [options]"
+ synopsis = "%prog <groupname> (<listofmembers>]|--member-dn=<member-dn>) [options]"
takes_optiongroups = {
"sambaopts": options.SambaOptions,
@@ -229,26 +229,68 @@ Example2 shows how to add a single user account, User2, to the supergroup AD gro
takes_options = [
Option("-H", "--URL", help="LDB URL for database or target server", type=str,
metavar="URL", dest="H"),
+ Option("--member-dn",
+ help=("DN of the new group member to be added.\n"
+ "The --object-types option will be ignored."),
+ type=str,
+ action="append"),
+ Option("--object-types",
+ help=("Comma separated list of object types.\n"
+ "The types are used to filter the search for the "
+ "specified members.\n"
+ "Valid values are: user, group, computer, serviceaccount, "
+ "contact and all.\n"
+ "Default: user,group,computer"),
+ default="user,group,computer",
+ type=str),
+ Option("--member-base-dn",
+ help=("Base DN for group member search.\n"
+ "Default is the domain DN."),
+ type=str),
]
- takes_args = ["groupname", "listofmembers"]
+ takes_args = ["groupname", "listofmembers?"]
- def run(self, groupname, listofmembers, credopts=None, sambaopts=None,
- versionopts=None, H=None):
+ def run(self,
+ groupname,
+ listofmembers=None,
+ credopts=None,
+ sambaopts=None,
+ versionopts=None,
+ H=None,
+ member_base_dn=None,
+ member_dn=None,
+ object_types="user,group,computer"):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
+ if member_dn is None and listofmembers is None:
+ self.usage()
+ raise CommandError(
+ 'Either listofmembers or --member-dn must be specified.')
+
try:
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
- groupmembers = listofmembers.split(',')
+ groupmembers = []
+ if member_dn is not None:
+ groupmembers += member_dn
+ if listofmembers is not None:
+ groupmembers += listofmembers.split(',')
+ group_member_types = object_types.split(',')
+
+ if member_base_dn is not None:
+ member_base_dn = samdb.normalize_dn_in_domain(member_base_dn)
+
samdb.add_remove_group_members(groupname, groupmembers,
- add_members_operation=True)
+ add_members_operation=True,
+ member_types=group_member_types,
+ member_base_dn=member_base_dn)
except Exception as e:
# FIXME: catch more specific exception
- raise CommandError('Failed to add members "%s" to group "%s"' % (
- listofmembers, groupname), e)
+ raise CommandError('Failed to add members %r to group "%s" - %s' % (
+ groupmembers, groupname, e))
self.outf.write("Added members to group %s\n" % groupname)
@@ -270,7 +312,7 @@ sudo samba-tool group removemembers supergroup User1
Example2 shows how to remove a single user account, User2, from the supergroup AD group. It uses the sudo command to run as root when issuing the command.
"""
- synopsis = "%prog <groupname> <listofmembers> [options]"
+ synopsis = "%prog <groupname> (<listofmembers>]|--member-dn=<member-dn>) [options]"
takes_optiongroups = {
"sambaopts": options.SambaOptions,
@@ -281,24 +323,68 @@ Example2 shows how to remove a single user account, User2, from the supergroup A
takes_options = [
Option("-H", "--URL", help="LDB URL for database or target server", type=str,
metavar="URL", dest="H"),
+ Option("--member-dn",
+ help=("DN of the group member to be removed.\n"
+ "The --object-types option will be ignored."),
+ type=str,
+ action="append"),
+ Option("--object-types",
+ help=("Comma separated list of object types.\n"
+ "The types are used to filter the search for the "
+ "specified members.\n"
+ "Valid values are: user, group, computer, serviceaccount, "
+ "contact and all.\n"
+ "Default: user,group,computer"),
+ default="user,group,computer",
+ type=str),
+ Option("--member-base-dn",
+ help=("Base DN for group member search.\n"
+ "Default is the domain DN."),
+ type=str),
]
- takes_args = ["groupname", "listofmembers"]
+ takes_args = ["groupname", "listofmembers?"]
- def run(self, groupname, listofmembers, credopts=None, sambaopts=None,
- versionopts=None, H=None):
+ def run(self,
+ groupname,
+ listofmembers=None,
+ credopts=None,
+ sambaopts=None,
+ versionopts=None,
+ H=None,
+ member_base_dn=None,
+ member_dn=None,
+ object_types="user,group,computer"):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
+ if member_dn is None and listofmembers is None:
+ self.usage()
+ raise CommandError(
+ 'Either listofmembers or --member-dn must be specified.')
+
try:
samdb = SamDB(url=H, session_info=system_session(),
credentials=creds, lp=lp)
- samdb.add_remove_group_members(groupname, listofmembers.split(","),
- add_members_operation=False)
+ groupmembers = []
+ if member_dn is not None:
+ groupmembers += member_dn
+ if listofmembers is not None:
+ groupmembers += listofmembers.split(',')
+ group_member_types = object_types.split(',')
+
+ if member_base_dn is not None:
+ member_base_dn = samdb.normalize_dn_in_domain(member_base_dn)
+
+ samdb.add_remove_group_members(groupname,
+ groupmembers,
+ add_members_operation=False,
+ member_types=group_member_types,
+ member_base_dn=member_base_dn)
except Exception as e:
# FIXME: Catch more specific exception
- raise CommandError('Failed to remove members "%s" from group "%s"' % (listofmembers, groupname), e)
+ raise CommandError('Failed to remove members %r from group "%s"' % (listofmembers, groupname), e)
self.outf.write("Removed members from group %s\n" % groupname)
@@ -313,7 +399,13 @@ class cmd_group_list(Command):
Option("-v", "--verbose",
help="Verbose output, showing group type and group scope.",
action="store_true"),
-
+ Option("-b", "--base-dn",
+ help="Specify base DN to use.",
+ type=str),
+ Option("--full-dn", dest="full_dn",
+ default=False,
+ action='store_true',
+ help="Display DN instead of the sAMAccountName."),
]
takes_optiongroups = {
@@ -322,8 +414,14 @@ class cmd_group_list(Command):
"versionopts": options.VersionOptions,
}
- def run(self, sambaopts=None, credopts=None, versionopts=None, H=None,
- verbose=False):
+ def run(self,
+ sambaopts=None,
+ credopts=None,
+ versionopts=None,
+ H=None,
+ verbose=False,
+ base_dn=None,
+ full_dn=False):
lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
@@ -334,6 +432,8 @@ class cmd_group_list(Command):
if verbose:
attrs += ["grouptype", "member"]
domain_dn = samdb.domain_dn()
+ if base_dn:
+ domain_dn = samdb.normalize_dn_in_domain(base_dn)
res = samdb.search(domain_dn, scope=ldb.SCOPE_SUBTREE,
expression=("(objectClass=group)"),
attrs=attrs)
@@ -367,6 +467,10 @@ class cmd_group_list(Command):
self.outf.write(" %6u\n" % num_members)
else:
for msg in res:
+ if full_dn:
+ self.outf.write("%s\n" % msg.get("dn"))
+ continue
+
self.outf.write("%s\n" % msg.get("samaccountname", idx=0))
@@ -384,6 +488,10 @@ samba-tool group listmembers \"Domain Users\" -H ldap://samba.samdom.example.com
takes_options = [
--
Samba Shared Repository
More information about the samba-cvs
mailing list