[SCM] Samba Shared Repository - branch master updated
Douglas Bagnall
dbagnall at samba.org
Thu Oct 1 02:45:22 UTC 2020
The branch, master has been updated
via ab0e5e3c431 samba-tool tests: rename 'contact create' to 'contact add'
via 3b7cf5f5dd9 doc: rename 'contact create' to 'contact add'
via f38336ac0eb samba-tool contact: rename 'contact create' to 'contact add'
via 6686235819b samba-tool tests: rename 'group create' to 'group add'
via ee1c8126fc0 doc: add 'group create' as synonym for 'group add'
via 90988ff69f8 samba-tool group: add 'group create' as synonym for 'group add'
via 1f61ef204d9 samba-tool tests: rename 'computer create' to 'computer add'
via 5f657d55f87 doc: rename 'computer create' to 'computer add'
via 1703ca11361 samba-tool computer: rename 'computer create' to 'computer add'
via 051364487ca samba-tool tests: rename 'user create' to 'user add'
via d93a7e21204 doc: rename 'user create' to 'user add'
via 95ba8a3f8cc samba-tool user: rename 'user create' to 'user add'
via 6315deaa671 samba-tool tests: rename 'ou create' to 'ou add'
via 3b8ed676cc8 doc: rename 'ou create' to 'ou add'
via 419e75cc387 samba-tool ou: rename 'ou create' to 'ou add'
via b83b4c92df5 samba-tool tests: add test-cases for 'contact rename'
via 66b6d90c610 doc: add samba-tool contact rename command to samba-tool man page
via bf04cb3b7a9 samba-tool contact: add new contact 'rename' command
via ac283a96e77 samba-tool tests: add test-cases for 'group rename'
via 3ff79e81fb8 doc: add samba-tool group rename command to samba-tool man page
via 4b06ff7ffce samba-tool group: add new group 'rename' command
via ea8b3f928ec samba-tool tests: add test-cases for 'user rename'
via 06997d1558b doc: add samba-tool user rename command to samba-tool man page
via 891af240542 samba-tool user: add new user 'rename' command
via efa9889acb2 testsuite: add test suite for samba-tool contact commands
via 899e66d47ff samdb: add fullname_from_names() method
via a22a80ed6e8 samdb: add prepare_attr_replace() method
via 88663eb949a autobuild: Merge no-modules test with the library --disable-python build
via 584f5106cda autobuild: Remove more "make install" steps
via e5b236d4176 .gitlab-ci.yml: Remove echo of (incorrect due previous commit) command
via 5419774b23e autobuild: Remove the os.getpid() from the autobuild directory
via 21197bb57d3 selftest: Move some more tests from the samba-o3 job
via 5edc004f95c .gitlab-ci.yml: Set interuptable: true
via 40511af091b build: Remove Python2 handling in SAMBA_CHECK_PYTHON_HEADERS()
via 3e488255074 build: Remove Python2 support from the build
via 8557a52937e autobuild.py: Combine samba-static and samba-nopython
from a9186829eb2 s3: smbd: Remove unused check_path_syntax_wcard().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ab0e5e3c43165747d436269d5706e3736589c395
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 27 09:20:11 2020 +0200
samba-tool tests: rename 'contact create' to 'contact add'
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Reviewed-by: Gary Lockyer <gary at catalyst.net.nz>
Autobuild-User(master): Douglas Bagnall <dbagnall at samba.org>
Autobuild-Date(master): Thu Oct 1 02:44:09 UTC 2020 on sn-devel-184
commit 3b7cf5f5dd99f55404848d2eb6c4b2ecb02607e7
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:10:11 2020 +0200
doc: rename 'contact create' to 'contact add'
And add 'contact create' as synonym for 'contact add'.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit f38336ac0ebc3246464c0f975b430c7b73cf329d
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:07:40 2020 +0200
samba-tool contact: rename 'contact create' to 'contact add'
Keep 'contact create' for compatibility reasons.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 6686235819bc68fa47dcce0138b76263fc3ff9e5
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 27 09:27:12 2020 +0200
samba-tool tests: rename 'group create' to 'group add'
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit ee1c8126fc07127737c5b337a12e6970d3a22e66
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:11:16 2020 +0200
doc: add 'group create' as synonym for 'group add'
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 90988ff69f85454307fb83564e5136bf1d33c3a6
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:07:16 2020 +0200
samba-tool group: add 'group create' as synonym for 'group add'
Add 'group create' command for a symmetric set of
samba-tool subcommands
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 1f61ef204d9ddfc09296dbf075b5d65006b98ae5
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 27 09:29:51 2020 +0200
samba-tool tests: rename 'computer create' to 'computer add'
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 5f657d55f870ec30ec5586447b3d660dabd663c9
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:08:58 2020 +0200
doc: rename 'computer create' to 'computer add'
And add 'computer create' as synonym for 'computer add'.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 1703ca113619d08ea1f364ab79fd297cd5cf0232
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:06:47 2020 +0200
samba-tool computer: rename 'computer create' to 'computer add'
Keep 'computer create' for compatibility reasons.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 051364487cab82864fe05b46101cbe54769a3a1d
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 27 09:19:37 2020 +0200
samba-tool tests: rename 'user create' to 'user add'
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit d93a7e21204fb4d9f1be36c3a524d8eb687a2634
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:13:12 2020 +0200
doc: rename 'user create' to 'user add'
And add 'user create' as synonym for 'user add'.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 95ba8a3f8cc320f84c9e63140dc2d799ef0c2060
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:03:58 2020 +0200
samba-tool user: rename 'user create' to 'user add'
Keep 'user create' for compatibility reasons.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 6315deaa671561684eac792b2956a78fb0690625
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 27 09:25:44 2020 +0200
samba-tool tests: rename 'ou create' to 'ou add'
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 3b8ed676cc836da2b5cc477e0849526ff211ec96
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:12:02 2020 +0200
doc: rename 'ou create' to 'ou add'
And add 'ou create' as synonym for 'ou add'.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 419e75cc38706102cc3d52779962e002c3439aee
Author: Jule Anger <ja at sernet.de>
Date: Wed Aug 26 15:08:21 2020 +0200
samba-tool ou: rename 'ou create' to 'ou add'
Keep 'ou create' for compatibility reasons.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit b83b4c92df5e779b68214820d1ab0940acd83f41
Author: Jule Anger <ja at sernet.de>
Date: Fri Aug 14 12:26:11 2020 +0200
samba-tool tests: add test-cases for 'contact rename'
Tests the following options:
--surname
--given-name
--initials
--force-new-cn
--reset-cn
--display-name
--mail-address
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 66b6d90c6105dcd27fb5722fbce40e02fa12941d
Author: Jule Anger <ja at sernet.de>
Date: Fri Aug 14 12:25:45 2020 +0200
doc: add samba-tool contact rename command to samba-tool man page
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit bf04cb3b7a9182b07e8eee7c0626cb0c2cf0b7e6
Author: Jule Anger <ja at sernet.de>
Date: Fri Aug 14 12:25:10 2020 +0200
samba-tool contact: add new contact 'rename' command
Usage: samba-tool contact rename <contactname> [options]
Rename a contact and related attributes.
This command allows to set the contact's name related attributes.
Use an empty attribute value to remove the specified attribute.
The contactname specified on the command is the CN.
Example1:
samba-tool contact rename "John Doe" --surname=Bloggs \\
--force-new-cn=John
Example1 shows how to change the surname ('sn' attribute) of a contact
'John Doe' to 'Bloggs' and change the CN to 'John' on the local server.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit ac283a96e774b67cf6da05e8bcc9247444be851b
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 6 15:41:11 2020 +0200
samba-tool tests: add test-cases for 'group rename'
Tests the following options:
--samaccountname
--force-new-cn
--reset-cn
--mail-address
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 3ff79e81fb83cf466063ed3e8ac986a58430dafe
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 6 15:40:43 2020 +0200
doc: add samba-tool group rename command to samba-tool man page
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 4b06ff7ffcec32d8382a807c0c538fbca17721ae
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 6 15:39:54 2020 +0200
samba-tool group: add new group 'rename' command
Usage: samba-tool group rename <groupname> [options]
Rename a group and related attributes.
This command allows to set the group's name related attributes.
Use an empty attribute value to remove the specified attribute.
The groupname specified on the command is the sAMAccountName.
Example1:
samba-tool group rename employees --samaccountname=staff
Example1 shows how to change the sAMAaccountName of a group 'employees' to
'staff' on the local server.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit ea8b3f928ec9283723db4ade5d8dcb07a58c46a0
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 6 15:26:13 2020 +0200
samba-tool tests: add test-cases for 'user rename'
Tests the following options:
--surname
--given-name
--initials
--force-new-cn
--reset-cn
--display-name
--mail-address
--samaccountname
--upn
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 06997d1558bced6b2baf71048739f5a97c99ef2e
Author: Jule Anger <ja at sernet.de>
Date: Thu Aug 6 15:25:13 2020 +0200
doc: add samba-tool user rename command to samba-tool man page
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 891af2405421778dc49e24256cd258819758f48c
Author: Björn Baumbach <bb at sernet.de>
Date: Mon Jun 15 20:12:02 2020 +0200
samba-tool user: add new user 'rename' command
Usage: samba-tool user rename <username> [options]
Rename a user and related attributes.
This command allows to set the user's name related attributes. The user's
CN will be renamed automatically.
The user's new CN will be made up by combining the given-name, initials
and surname. A dot ('.') will be appended to the initials automatically.
Use the --force-new-cn option to specify the new CN manually.
The username specified on the command is the sAMAccountName.
Example1:
samba-tool user rename johndoe --surname='Bloggs'
Example1 shows how to change the surname of a user 'johndoe' to 'Bloggs' on
the local server. The user's CN will be renamed automatically, based on
the given name, initials and surname.
Pair-Programmed-With: Jule Anger <ja at sernet.de>
Signed-off-by: Björn Baumbach <bb at sernet.de>
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit efa9889acb23e2962ab28f74db9ba4424ea046e9
Author: Jule Anger <ja at sernet.de>
Date: Fri Aug 21 08:43:17 2020 +0200
testsuite: add test suite for samba-tool contact commands
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 899e66d47ff08a299cb12b33b987e7f98692a3b8
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 24 16:39:01 2020 +0200
samdb: add fullname_from_names() method
Add a method to construct the fullname, using the given name, the initials
and the surname.
If one of this values is empty, try to use the old one, given by an
attributs set.
If the combination is empty, the method will return the fallback-default
parameter.
Use this method to construct the CN or the displayName of users or
contacts.
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit a22a80ed6e8494b3edb717c3b288c7adde5092ee
Author: Jule Anger <ja at sernet.de>
Date: Mon Aug 24 16:34:35 2020 +0200
samdb: add prepare_attr_replace() method
Add a method to prepare a given Message to replace the given attribute.
If the given new value is None or the old value and the new value are
the same, do nothing.
If the new value is empty, prepare to replace the given attribute with
[].
Else prepare to replace the given attribute with the new value.
Use this for samdb.modify(msg).
Signed-off-by: Jule Anger <ja at sernet.de>
Reviewed-by: Björn Baumbach <bb at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 88663eb949a4cd097d3cdadd960251542ccb6064
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 13:36:22 2020 +1200
autobuild: Merge no-modules test with the library --disable-python build
This avoids another full compile cycle.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 584f5106cdaec3b117f3874054e094b0f00bebb6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 13:00:14 2020 +1200
autobuild: Remove more "make install" steps
Running a "make install" involves a full re-link which takes quite some time
we really only need to test this in a couple of basic combinations, so remove
from a few more targets.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit e5b236d41767c066a1380c398cbca7bb1f1ef2ba
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 12:40:09 2020 +1200
.gitlab-ci.yml: Remove echo of (incorrect due previous commit) command
The command is now echoed by the gitlab interface now anyway,
so avoid having to keep these in sync.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 5419774b23ef231216fd9c37c63ff83620c9faf3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 11:22:10 2020 +1200
autobuild: Remove the os.getpid() from the autobuild directory
This might help our CI runners get a ccache hit by keeping the path constant.
Otherwise, we only get a good ccache hit rate if the docker container gives
us the same pid each time.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 21197bb57d36771f772cb28221edf4b12b5f7b33
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 11:05:19 2020 +1200
selftest: Move some more tests from the samba-o3 job
These tests do not need to be repeated over and over on multiple
distributions. This just wastes CI resources.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 5edc004f95cfcf314dcd935cdf7d4141844f664a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 10:47:25 2020 +1200
.gitlab-ci.yml: Set interuptable: true
This should reduce some CI costs, avoiding spending CPU time on jobs that are
already out of date because a new branch has been pushed.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 40511af091b6b3f138af930affab67865e33f81d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 11:05:58 2020 +1200
build: Remove Python2 handling in SAMBA_CHECK_PYTHON_HEADERS()
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 3e488255074da8dd3284bd9c8255fd1eff5133a9
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 10:40:59 2020 +1200
build: Remove Python2 support from the build
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14488
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 8557a52937e3a3319fa4bd9b18af792cee9ec528
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Sep 11 10:35:58 2020 +1200
autobuild.py: Combine samba-static and samba-nopython
We expect these will complete in under an hour and reduce the number of
parallel jobs. Hopefully there will be some ccache hits between these
as well.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
.gitlab-ci.yml | 35 ++--
WHATSNEW.txt | 11 ++
buildtools/wafsamba/samba_python.py | 10 +-
docs-xml/manpages/samba-tool.8.xml | 243 +++++++++++++++++++++++++--
python/samba/netcmd/computer.py | 27 +--
python/samba/netcmd/contact.py | 199 ++++++++++++++++++++--
python/samba/netcmd/group.py | 162 +++++++++++++++++-
python/samba/netcmd/ou.py | 17 +-
python/samba/netcmd/user.py | 269 ++++++++++++++++++++++++++----
python/samba/samdb.py | 79 ++++++---
python/samba/tests/samba_tool/computer.py | 16 +-
python/samba/tests/samba_tool/contact.py | 136 ++++++++++++++-
python/samba/tests/samba_tool/group.py | 81 ++++++++-
python/samba/tests/samba_tool/ou.py | 18 +-
python/samba/tests/samba_tool/user.py | 248 ++++++++++++++++++++++++++-
script/autobuild.py | 93 ++++-------
selftest/slow-none | 10 ++
source4/selftest/tests.py | 1 +
18 files changed, 1439 insertions(+), 216 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c9bc00c4ddf..7555582e005 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,6 +52,10 @@ include:
- 'bootstrap/.gitlab-ci.yml'
.shared_template:
+ # All Samba jobs are interruptible, this avoids burning CPU when a
+ # newer branch is pushed.
+ interruptible: true
+
variables:
AUTOBUILD_JOB_NAME: $CI_JOB_NAME
image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-${SAMBA_CI_CONTAINER_IMAGE}:${SAMBA_CI_CONTAINER_TAG}
@@ -108,8 +112,7 @@ include:
script:
# gitlab predefines CI_JOB_NAME for each job. The gitlab job usually matches the
# autobuild name, which means we can define a default template that runs most autobuild jobs
- - echo "Running cmd script/autobuild.py $AUTOBUILD_JOB_NAME $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
- - script/autobuild.py $AUTOBUILD_JOB_NAME $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py $AUTOBUILD_JOB_NAME $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase
# Ensure when adding a new job below that you also add it to
# the dependencies for 'pages' below for the code coverage page
@@ -118,14 +121,14 @@ include:
others:
extends: .shared_template
script:
- - script/autobuild.py ldb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py pidl $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py replace $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py talloc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py samba-xc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
- - script/autobuild.py docs-xml $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
+ - script/autobuild.py ldb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/ldb
+ - script/autobuild.py pidl $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/pidl
+ - script/autobuild.py replace $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/replace
+ - script/autobuild.py talloc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/talloc
+ - script/autobuild.py tdb $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/tdb
+ - script/autobuild.py tevent $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/tevent
+ - script/autobuild.py samba-xc $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/samba-xc
+ - script/autobuild.py docs-xml $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --full-testbase /tmp/samba-testbase/docs-xml
samba:
extends: .shared_template
@@ -133,10 +136,7 @@ samba:
samba-mitkrb5:
extends: .shared_template
-samba-nopython:
- extends: .shared_template
-
-samba-nopython-py2:
+samba-minimal-smbd:
extends: .shared_template
samba-admem:
@@ -160,9 +160,6 @@ samba-ad-dc-6:
samba-libs:
extends: .shared_template
-samba-static:
- extends: .shared_template
-
samba-fuzz:
extends: .shared_template
image: ${SAMBA_CI_CONTAINER_REGISTRY}/samba-ci-ubuntu1604:${SAMBA_CI_CONTAINER_TAG}
@@ -228,8 +225,6 @@ pages:
- others
- samba
- samba-mitkrb5
- - samba-nopython
- - samba-nopython-py2
- samba-admem
- samba-ad-dc-2
- samba-ad-dc-3
@@ -237,7 +232,7 @@ pages:
- samba-ad-dc-5
- samba-ad-dc-6
- samba-libs
- - samba-static
+ - samba-minimal-smbd
- samba-fuzz
# - ctdb # TODO
- samba-ctdb
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 3927c0645f1..983dc4761fc 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -55,6 +55,17 @@ CTDB CHANGES
scripts and can be checked by users with "ctdb pnn" and "ctdb
recmaster".
+Python 3.6 or later required
+----------------------------
+
+Samba's minimum runtime requirement for python was raised to Python
+3.6 with samba 4.13. Samba 4.14 raises this minimum version to Python
+3.6 also to build Samba. It is no longer possible to build Samba
+(even just the file server) with Python versions 2.6 and 2.7.
+
+As Python 2.7 has been End Of Life upstream since April 2020, Samba
+is dropping ALL Python 2.x support in this release.
+
NT4-like 'classic' Samba domain controllers
-------------------------------------------
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index d71ce47a831..002357bb556 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -7,9 +7,6 @@ from waflib.Configure import conf
@conf
def SAMBA_CHECK_PYTHON(conf, version=(3,6,0)):
- if conf.env.disable_python:
- version=(2,6,0)
-
if conf.env.enable_fuzzing:
version=(3,5,0)
@@ -61,11 +58,8 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf):
def _check_python_headers(conf):
conf.check_python_headers()
- if conf.env['PYTHON_VERSION'] > '3':
- abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
- conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
- else:
- conf.env['PYTHON_SO_ABI_FLAG'] = ''
+ abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
+ conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
conf.env['PYTHON_LIBNAME_SO_ABI_FLAG'] = (
conf.env['PYTHON_SO_ABI_FLAG'].replace('_', '-'))
diff --git a/docs-xml/manpages/samba-tool.8.xml b/docs-xml/manpages/samba-tool.8.xml
index ef55d72e714..ccaaa8b432a 100644
--- a/docs-xml/manpages/samba-tool.8.xml
+++ b/docs-xml/manpages/samba-tool.8.xml
@@ -116,8 +116,8 @@
</refsect2>
<refsect3>
- <title>computer create <replaceable>computername</replaceable> [options]</title>
- <para>Create a new computer in the Active Directory Domain.</para>
+ <title>computer add <replaceable>computername</replaceable> [options]</title>
+ <para>Add a new computer to the Active Directory Domain.</para>
<para>The new computer name specified on the command is the
sAMAccountName, with or without the trailing dollar sign.</para>
@@ -162,6 +162,14 @@
</variablelist>
</refsect3>
+<refsect3>
+ <title>computer create <replaceable>computername</replaceable> [options]</title>
+ <para>Add a new computer. This is a synonym for the
+ <command>samba-tool computer add</command> command and is available
+ for compatibility reasons only. Please use
+ <command>samba-tool computer add</command> instead.</para>
+</refsect3>
+
<refsect3>
<title>computer delete <replaceable>computername</replaceable> [options]</title>
<para>Delete an existing computer account.</para>
@@ -223,8 +231,8 @@
</refsect2>
<refsect3>
- <title>contact create [<replaceable>contactname</replaceable>] [options]</title>
- <para>Create a new contact in the Active Directory Domain.</para>
+ <title>contact add [<replaceable>contactname</replaceable>] [options]</title>
+ <para>Add a new contact to the Active Directory Domain.</para>
<para>The name of the new contact can be specified by the first
argument 'contactname' or the --given-name, --initial and --surname
arguments. If no 'contactname' is given, contact's name will be made
@@ -337,6 +345,14 @@
</variablelist>
</refsect3>
+<refsect3>
+ <title>contact create [<replaceable>contactname</replaceable>] [options]</title>
+ <para>Add a new contact. This is a synonym for the
+ <command>samba-tool contact add</command> command and is available
+ for compatibility reasons only. Please use
+ <command>samba-tool contact add</command> instead.</para>
+</refsect3>
+
<refsect3>
<title>contact delete <replaceable>contactname</replaceable> [options]</title>
<para>Delete an existing contact.</para>
@@ -403,6 +419,73 @@
</variablelist>
</refsect3>
+<refsect3>
+ <title>contact rename <replaceable>contactname</replaceable> [options]</title>
+ <para>Rename a contact and related attributes.</para>
+ <para>This command allows to set the contact's name related attributes. The contact's
+ CN will be renamed automatically.
+ The contact's new CN will be made up by combining the given-name, initials
+ and surname. A dot ('.') will be appended to the initials automatically,
+ if required.
+ Use the --force-new-cn option to specify the new CN manually and --reset-cn
+ to reset this change.</para>
+ <para>Use an empty attribute value to remove the specified attribute.</para>
+ <para>The contact name specified on the command is the CN.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>--surname=SURNAME</term>
+ <listitem><para>
+ New surname.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--given-name=GIVEN_NAME</term>
+ <listitem><para>
+ New given name.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--initials=INITIALS</term>
+ <listitem><para>
+ New initials.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--force-new-cn=NEW_CN</term>
+ <listitem><para>
+ Specify a new CN (RDN) instead of using a combination
+ of the given name, initials and surname.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--reset-cn</term>
+ <listitem><para>
+ Set the CN to the default combination of given name,
+ initials and surname.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--display-name=DISPLAY_NAME</term>
+ <listitem><para>
+ New display name.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--mail-address=MAIL_ADDRESS</term>
+ <listitem><para>
+ New email address.
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect3>
+
<refsect2>
<title>dbcheck</title>
<para>Check the local AD database for errors.</para>
@@ -811,6 +894,14 @@
<para>Create a new AD group.</para>
</refsect3>
+<refsect3>
+ <title>group create <replaceable>groupname</replaceable> [options]</title>
+ <para>Add a new AD group. This is a synonym for the
+ <command>samba-tool group add</command> command and is available
+ for compatibility reasons only. Please use
+ <command>samba-tool group add</command> instead.</para>
+</refsect3>
+
<refsect3>
<title>group addmembers <replaceable>groupname</replaceable> <replaceable>members</replaceable> [options]</title>
<para>Add members to an AD group.</para>
@@ -872,6 +963,48 @@
<para>Show statistics for overall groups and group memberships.</para>
</refsect3>
+<refsect3>
+ <title>group rename <replaceable>groupname</replaceable> [options]</title>
+ <para>Rename a group and related attributes.</para>
+ <para>This command allows to set the group's name related attributes. The
+ group's CN will be renamed automatically.
+ The group's CN will be the sAMAccountName.
+ Use the --force-new-cn option to specify the new CN manually and the
+ --reset-cn to reset this change.</para>
+ <para>Use an empty attribute value to remove the specified attribute.</para>
+ <para>The groupname specified on the command is the sAMAccountName.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>--force-new-cn=NEW_CN</term>
+ <listitem><para>
+ Specify a new CN (RDN) instead of using the sAMAccountName.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--reset-cn</term>
+ <listitem><para>
+ Set the CN to the sAMAccountName.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--mail-address=MAIL_ADDRESS</term>
+ <listitem><para>
+ New mail address
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--samaccountname=SAMACCOUNTNAME</term>
+ <listitem><para>
+ New account name (sAMAccountName/logon name)
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect3>
+
<refsect2>
<title>ldapcmp <replaceable>URL1</replaceable> <replaceable>URL2</replaceable> <replaceable>domain|configuration|schema|dnsdomain|dnsforest</replaceable> [options] </title>
<para>Compare two LDAP databases.</para>
@@ -979,8 +1112,8 @@
</refsect2>
<refsect3>
- <title>ou create <replaceable>ou_dn</replaceable> [options]</title>
- <para>Create an organizational unit.</para>
+ <title>ou add <replaceable>ou_dn</replaceable> [options]</title>
+ <para>Add a new organizational unit.</para>
<para>The name of the organizational unit can be specified as a full DN
or without the domainDN component.</para>
@@ -994,6 +1127,14 @@
</variablelist>
</refsect3>
+<refsect3>
+ <title>ou create <replaceable>ou_dn</replaceable> [options]</title>
+ <para>Add a new organizational unit. This is a synonym for the
+ <command>samba-tool ou add</command> command and is available
+ for compatibility reasons only. Please use
+ <command>samba-tool ou add</command> instead.</para>
+</refsect3>
+
<refsect3>
<title>ou delete <replaceable>ou_dn</replaceable> [options]</title>
<para>Delete an organizational unit.</para>
@@ -1147,14 +1288,15 @@
<refsect3>
<title>user add <replaceable>username</replaceable> [<replaceable>password</replaceable>]</title>
- <para>Create a new user. Please note that this subcommand is deprecated
- and available for compatibility reasons only. Please use
- <command>samba-tool user create</command> instead.</para>
+ <para>Add a new user to the Active Directory Domain.</para>
</refsect3>
<refsect3>
<title>user create <replaceable>username</replaceable> [<replaceable>password</replaceable>]</title>
- <para>Create a new user in the Active Directory Domain.</para>
+ <para>Add a new user. This is a synonym for the
+ <command>samba-tool user add</command> command and is available
+ for compatibility reasons only. Please use
+ <command>samba-tool user add</command> instead.</para>
</refsect3>
<refsect3>
@@ -1232,6 +1374,87 @@
authentication).</para>
</refsect3>
+<refsect3>
+ <title>user rename <replaceable>username</replaceable> [options]</title>
+ <para>Rename a user and related attributes.</para>
+ <para>This command allows to set the user's name related attributes. The user's
+ CN will be renamed automatically.
+ The user's new CN will be made up by combining the given-name, initials
+ and surname. A dot ('.') will be appended to the initials automatically,
+ if required.
+ Use the --force-new-cn option to specify the new CN manually and --reset-cn
+ to reset this change.</para>
+ <para>Use an empty attribute value to remove the specified attribute.</para>
+ <para>The username specified on the command is the sAMAccountName.</para>
+
+ <variablelist>
+ <varlistentry>
+ <term>--surname=SURNAME</term>
+ <listitem><para>
+ New surname
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--given-name=GIVEN_NAME</term>
+ <listitem><para>
+ New given name
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--initials=INITIALS</term>
+ <listitem><para>
+ New initials
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--force-new-cn=NEW_CN</term>
+ <listitem><para>
+ Specify a new CN (RDN) instead of using a combination
+ of the given name, initials and surname.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--reset-cn</term>
+ <listitem><para>
+ Set the CN to the default combination of given name,
+ initials and surname.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--display-name=DISPLAY_NAME</term>
+ <listitem><para>
+ New display name
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--mail-address=MAIL_ADDRESS</term>
+ <listitem><para>
+ New email address
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--samaccountname=SAMACCOUNTNAME</term>
+ <listitem><para>
+ New account name (sAMAccountName/logon name)
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--upn=UPN</term>
+ <listitem><para>
+ New user principal name
+ </para></listitem>
+ </varlistentry>
+ </variablelist>
+</refsect3>
+
<refsect3>
<title>user setexpiry <replaceable>username</replaceable> [options]</title>
<para>Set the expiration of a user account.</para>
diff --git a/python/samba/netcmd/computer.py b/python/samba/netcmd/computer.py
index 5d1662b3508..86c7b824d82 100644
--- a/python/samba/netcmd/computer.py
+++ b/python/samba/netcmd/computer.py
@@ -173,36 +173,36 @@ def add_dns_records(
)
-class cmd_computer_create(Command):
- """Create a new computer.
+class cmd_computer_add(Command):
+ """Add a new computer.
-This command creates a new computer account in the Active Directory domain.
+This command adds a new computer account to the Active Directory domain.
The computername specified on the command is the sAMaccountName without the
trailing $ (dollar sign).
-User accounts may represent physical entities, such as workstations. Computer
+Computer accounts may represent physical entities, such as workstations. Computer
accounts are also referred to as security principals and are assigned a
security identifier (SID).
Example1:
-samba-tool computer create Computer1 -H ldap://samba.samdom.example.com \\
+samba-tool computer add Computer1 -H ldap://samba.samdom.example.com \\
-Uadministrator%passw1rd
-Example1 shows how to create a new computer in the domain against a remote LDAP
+Example1 shows how to add a new computer to the domain against a remote LDAP
server. The -H parameter is used to specify the remote target server. The -U
option is used to pass the userid and password authorized to issue the command
remotely.
--
Samba Shared Repository
More information about the samba-cvs
mailing list