[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu May 24 03:52:02 MDT 2012
The branch, master has been updated
via e33bf32 selftest: Run only the samba3 tests on builds without the AD DC
via 9633ec0 WHATSNEW: Move to document changes for beta1
via abb2c7f s4-provision: Make s3fs the default way to install a new Samba4 DC
via 22cd4bc s4-selftest: Always delete the user at the end of test_passwords.sh
from f52afa9 dlz_bind9: Make the talloc destructor static and return 0.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e33bf32ba3538032f95afbcd4b7e11c6ec6cb226
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 24 16:53:34 2012 +1000
selftest: Run only the samba3 tests on builds without the AD DC
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Thu May 24 11:51:40 CEST 2012 on sn-devel-104
commit 9633ec0c8605d6cfa43cc4a688f2ce9195f99bf1
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 24 16:30:00 2012 +1000
WHATSNEW: Move to document changes for beta1
This is not the beta1 release, but this is the preperation for such a release.
Andrew Bartlett
commit abb2c7fef466f973a871661a3a96c75f8c3afc0d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 24 14:56:27 2012 +1000
s4-provision: Make s3fs the default way to install a new Samba4 DC
With s3fs now well settled into master, we now throw the swtich and make
it the default.
There is still much to do, but we need to be using s3fs by default to
find out exactly what that is.
Andrew Bartlett
commit 22cd4bcc9e8367c6871512f4c96033c7836e2c41
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu May 24 13:37:09 2012 +1000
s4-selftest: Always delete the user at the end of test_passwords.sh
If this test is run in the "dc" environment (rather than "dc:local") is would not delete the
test user.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 108 ++++++++++++++++------------------
selftest/target/Samba4.pm | 1 +
selftest/wscript | 7 ++-
source4/setup/provision | 4 +-
testprogs/blackbox/test_passwords.sh | 2 +-
5 files changed, 61 insertions(+), 61 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 8798a87..41e6055 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,4 @@
-What's new in Samba 4 alpha20
+What's new in Samba 4 beta1
=============================
Samba 4.0 will be the next version of the Samba suite and incorporates
@@ -7,48 +7,36 @@ stable 3.x series. The primary additional features over Samba 3.6 are
support for the Active Directory logon protocols used by Windows 2000
and above.
-SECURITY RELEASE
-================
-
-This is a security release in order to address CVE-2012-2111
-(Incorrect permission checks when granting/removing privileges can
-compromise file server security).
-
-o CVE-2012-2111:
- Samba 3.4.x to 3.6.4 are affected by a
- vulnerability that allows arbitrary users
- to modify privileges on a file server.
-
-This is in regards to the smbd file server, which is shipped in Samba
-4.0 alpha. The AD DC is not directly impacted, as the LSA
-implementation differs.
WARNINGS
========
-Samba4 alpha20 is not a final Samba release, however we are now making
+Samba4 beta1 is not a final Samba release, however we are now making
good progress towards a Samba 4.0 release, of which this is a preview.
-Be aware the this release contains both the technology of Samba 3.6
-(that you can reasonably expect to upgrade existing Samba 3.x releases
-to) and the AD domain controller work previously known as 'samba4'.
-
-While binaries for the stable file server are provided in this
-release, for a stable, supported file server, Samba3 domain or AD
-domain member installation, please run a Samba 3.x release, as we are
-still bedding down the new single build system.
+Be aware the this release contains the best of all of Samba's
+technology parts, both a file server (that you can reasonably expect
+to upgrade existing Samba 3.x releases to) and the AD domain
+controller work previously known as 'samba4'.
Samba4 is subjected to an awesome battery of tests on an automated
basis, we have found Samba 4.0 to be very stable in it's behavior.
However, we still recommend against upgrading production servers from
Samba 3.x release to Samba 4.0 alpha at this stage.
+In particular note that the new default configuration 's3fs' may have
+different stability characteristics compared with our previous default
+file server. We are making this release so that we can find and fix
+any of these issues that arise in the real world. AD DC installations
+can provision with --use-ntvfs to obtain the previous default file
+server.
+
If you are upgrading, or looking to develop, test or deploy Samba 4.0
alpha releases, you should backup all configuration and data.
NEW FEATURES
============
-Samba 4.0 alpha supports the server-side of the Active Directory logon
+Samba 4.0 beta supports the server-side of the Active Directory logon
environment used by Windows 2000 and later, so we can do full domain
join and domain logon operations with these clients.
@@ -58,60 +46,71 @@ Samba3-like logon services provided over CIFS. We correctly generate
the infamous Kerberos PAC, and include it with the Kerberos tickets we
issue.
-Samba 4.0 alpha ships with two distinct file servers. The file server
-from the Samba 3.x series is 'smbd', and works with the binaries users
-would expect from that series (nmbd, winbindd, smbpasswd).
+Samba 4.0 alpha ships with two distinct file servers. We now use the
+file server from the Samba 3.x series 'smbd' for all file serving by
+default. For pure file server work, the binaries users would expect
+from that series (nmbd, winbindd, smbpasswd) continue to be available.
+
+Samba 4.0 also ships with the 'NTVFS' file server. This file server
+is what was used in all previous alpha releases of Samba 4.0, and is
+tuned to match the requirements of an AD domain controller. We
+continue to support this, not only to provide continuity to
+installations that have deployed it as part of an AD DC, but also as a
+running example of the NT-FSA architecture we expect to move smbd to in
+the longer term.
-Samba 4.0 also ships with a new file server, which is tuned to match
-the requirements of an AD domain controller. Users should not use the
-file server in the 'samba' binary for non-DC related tasks.
+As mentioned above, this change to the default file server may cause
+instability, as we learn about the real-world interactions between
+these two key components.
A new scripting interface has been added to Samba 4, allowing Python
programs to interface to Samba's internals, and many tools and
-internal workings of the DC code is now implemented in python.
+internal workings of the DC code is now implemented in python.
+
-CHANGES SINCE alpha19
+CHANGES SINCE alpha20
=====================
For a list of changes since alpha 19, please see the git log.
$ git clone git://git.samba.org/samba.git
$ cd samba.git
-$ git log samba-4.0.0alpha19..samba-4.0.0alpha20
+$ git log samba-4.0.0alpha20..samba-4.0.0beta1
Some major user-visible changes include:
-Improvements to the 'samba-tool domain samba3upgrade' and
-samba_upgradedns tools
+For installations that do not need an AD Domain controller, we can now
+build using MIT Kerberos from the local system. This is important for
+some distributors. This is enabled with the new --with-system-mitkrb5
+configure option. A synonym is the new --without-ad-dc option.
-Stability improvements in the Samba4 winbind implementation (that
-used in the AD DC mode).
+The 's3fs' effort has moved to a new stage, with this now being the
+default mode of operation for new provisions.
-The BIND 9 DLZ plugin is now compatible with both BIND 9.8, and BIND 9.9.
-
-dbcheck and runtime protection for the fSMORoleOwner attribute. This
-allows us to recover from a situation where the fSMORoleOwner is
-deleted.
-
-Support for storing the posixAccount and other auxiliary objectClass
-values (the values are not used by Samba as an AD DC at this stage,
-but may be used by clients).
+The BIND 9 DLZ plugin has had some stability improvements under BIND reloads.
+The 'samba-tool domain samba3upgrade' tool will now generally import
+all group members, and correctly imports domain password policies.
Some major but less visible changes include:
Continued early implementation work on the SMB 2.2 protocol client and server as
the team improves and develops support these new protocols.
-Initial work to build Samba using MIT kerberos in the top level waf
-build system. This is not complete at this time, but good progress is
-being made.
-
KNOWN ISSUES
============
+- We are making this beta release to gain real-world use of the 's3fs'
+ file server combination we will use for the Samba 4.0 release.
+ Users should expect some rough edges: in particular, there are
+ warnings about invalid parameters from the two respective parameter
+ parsing engines.
+
+- There have been improvements to FreeBSD support, but more work is
+ still required to finish this effort
+
- upgradeprovision should not be run when upgrading to this release
from a recent release. No important database format changes have
been made since alpha16.
@@ -120,16 +119,11 @@ KNOWN ISSUES
headers at compile time) is known to cause errors when dealing with
non-ASCII characters.
-- In some situations, group members may not be upgraded by the
- samba-tool domain samba3upgrade tool
-
- Domain member support in the 'samba' binary is in it's infancy, and
is not comparable to the support found in winbindd. As such, do not
use the 'samba' binary (provided for the AD server) on a member
server.
-- There is no printing support in the 'samba' binary (use smbd instead)
-
- There is no NetBIOS browsing support (network neighbourhood) in the
'samba' binary (use nmbd and smbd instead)
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 1e53c21..4622f8e 100644
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -535,6 +535,7 @@ sub provision_raw_prepare($$$$$$$$$)
push (@provision_options, "--server-role=\"$ctx->{server_role}\"");
push (@provision_options, "--function-level=\"$ctx->{functional_level}\"");
push (@provision_options, "--dns-backend=BIND9_DLZ");
+ push (@provision_options, "--use-ntvfs");
@{$ctx->{provision_options}} = @provision_options;
diff --git a/selftest/wscript b/selftest/wscript
index ab08c62..182f8f9 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -180,8 +180,13 @@ def cmd_testonly(opt):
env.TESTLISTS = ('--testlist="${PYTHON} ${srcdir}/source3/selftest/tests.py|" ' +
'--testlist="${PYTHON} ${srcdir}/source4/selftest/tests.py|"')
+ if CONFIG_SET(opt, 'AD_DC_BUILD_IS_ENABLED'):
+ env.SELFTEST_TARGET="samba"
+ else:
+ env.SELFTEST_TARGET="samba3"
+
# We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).
- env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=samba --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}'
+ env.CORE_COMMAND = '${PERL} ${srcdir}/selftest/selftest.pl --target=${SELFTEST_TARGET} --prefix=${SELFTEST_PREFIX} --srcdir=${srcdir} --exclude=${srcdir}/selftest/skip ${TESTLISTS} ${OPTIONS} ${TESTS}'
if Options.options.LIST:
cmd = '${CORE_COMMAND} --list'
else:
diff --git a/source4/setup/provision b/source4/setup/provision
index a9d71cd..32edff3 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -125,7 +125,7 @@ parser.add_option("--ol-mmr-urls", type="string", metavar="LDAPSERVER",
parser.add_option("--slapd-path", type="string", metavar="SLAPD-PATH",
help="Path to slapd for LDAP backend [e.g.:'/usr/local/libexec/slapd']. Required for Setup with LDAP-Backend. OpenLDAP Version >= 2.4.17 should be used.")
parser.add_option("--use-xattrs", type="choice", choices=["yes", "no", "auto"], help="Define if we should use the native fs capabilities or a tdb file for storing attributes likes ntacl, auto tries to make an inteligent guess based on the user rights and system capabilities", default="auto")
-parser.add_option("--use-s3fs", action="store_true", help="Use s3fs for the fileserver (default = no)")
+parser.add_option("--use-ntvfs", action="store_true", help="Use NTVFS for the fileserver (default = no)")
opts = parser.parse_args()[0]
@@ -260,7 +260,7 @@ try:
backend_type=opts.ldap_backend_type,
ldapadminpass=opts.ldapadminpass, ol_mmr_urls=opts.ol_mmr_urls,
slapd_path=opts.slapd_path,
- useeadb=eadb, next_rid=opts.next_rid, lp=lp, use_ntvfs=(not opts.use_s3fs))
+ useeadb=eadb, next_rid=opts.next_rid, lp=lp, use_ntvfs=(opts.use_ntvfs))
except ProvisioningError, e:
print str(e)
sys.exit(1)
diff --git a/testprogs/blackbox/test_passwords.sh b/testprogs/blackbox/test_passwords.sh
index c83b46b..fe8386d 100755
--- a/testprogs/blackbox/test_passwords.sh
+++ b/testprogs/blackbox/test_passwords.sh
@@ -227,7 +227,7 @@ testit_expect_failure "try to change password too quickly (command should not su
testit "reset password policies" $VALGRIND $samba_tool domain passwordsettings $CONFIG set --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default || failed=`expr $failed + 1`
-testit "del user" $VALGRIND $samba_tool user delete nettestuser -U"$USERNAME%$PASSWORD" -k no $@ || failed=`expr $failed + 1`
+testit "del user" $VALGRIND $samba_tool user delete nettestuser -U"$USERNAME%$PASSWORD" $CONFIG -k no $@ || failed=`expr $failed + 1`
rm -f tmpccfile tmppassfile tmpuserpassfile tmpuserccache tmpkpasswdscript tmpsmbpasswdscript
exit $failed
--
Samba Shared Repository
More information about the samba-cvs
mailing list