[SCM] Samba Shared Repository - branch v4-0-stable updated -
release-4-0-0alpha6
Jelmer Vernooij
jelmer at samba.org
Mon Jan 19 22:46:57 GMT 2009
The branch, v4-0-stable has been updated
via 0118b2301b29af0f22845c7e3ebb5df74ba13aeb (commit)
via b876478219b4935013a798962b95596cc45d7c9b (commit)
via 2254efbf5d34cffbb8b21e8ef3cec06786081a06 (commit)
via 288ce60748576a64efd5d3a3897fae1110379565 (commit)
via c570d6396f238cbe39af3a5de98157a2c608ec9b (commit)
from 4feafd7c7be947bb38856dee79f057b2671151f3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-stable
- Log -----------------------------------------------------------------
commit 0118b2301b29af0f22845c7e3ebb5df74ba13aeb
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 19 22:52:26 2009 +0100
Don't use TMPDIR as variable, it's already used for other purposes.
Don't include GIT revision in release version strings.
commit b876478219b4935013a798962b95596cc45d7c9b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 19 21:14:37 2009 +0100
Make sure server_role gets initialized in backend provisioning code -
fixes test.
commit 2254efbf5d34cffbb8b21e8ef3cec06786081a06
Merge: c570d6396f238cbe39af3a5de98157a2c608ec9b 288ce60748576a64efd5d3a3897fae1110379565
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 19 20:17:23 2009 +0100
Merge branch 'v4-0-stable'
commit 288ce60748576a64efd5d3a3897fae1110379565
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 19 19:24:54 2009 +0100
Add some more entries to WHATSNEW, by no means complete.
commit c570d6396f238cbe39af3a5de98157a2c608ec9b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Jan 19 18:15:45 2009 +0100
Remove mention of external heimdal - its not yet supported.
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW4.txt | 13 ++++++++++---
source4/script/mkrelease.sh | 13 ++++++++-----
source4/scripting/python/samba/provision.py | 18 +++++++++++++++++-
source4/setup/provision | 2 +-
source4/setup/provision-backend | 2 +-
5 files changed, 37 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW4.txt b/WHATSNEW4.txt
index ee08378..03cd72c 100644
--- a/WHATSNEW4.txt
+++ b/WHATSNEW4.txt
@@ -112,9 +112,6 @@ continued to evolve, but you may particularly notice these areas
A simple script for setting the expiration of a user was added.
- It is now possible to use the system-installed Heimdal using the
- experimental --enable-external-heimdal option to configure.
-
The LDB library is now completely asynchronous internally.
Various unknowns and correctness issues in the drsblobs and drsuapi RPC
@@ -132,6 +129,16 @@ continued to evolve, but you may particularly notice these areas
Auxiliary classes in LDAP schema conversion are now collapsed.
+ Several tests have been added to the SMB testsuite.
+
+ Object GUIDs in DCE/RPC connections are now dealt with properly.
+
+ The correctness of the LSA and NETLOGON implementations has been
+ improved.
+
+ Multi Master Replication configuration can now be generated
+ for OpenLDAP.
+
These are just some of the highlights of the work done in the past few
months. More details can be found in our GIT history.
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 94bd9d2..303dfe6 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -6,12 +6,14 @@ if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
exit 1
fi
-TMPDIR=`mktemp -d samba-XXXXX`
-(git archive --format=tar HEAD | (cd $TMPDIR/ && tar xf -))
+OUTDIR=`mktemp -d samba-XXXXX`
+(git archive --format=tar HEAD | (cd $OUTDIR/ && tar xf -))
+
+echo SAMBA_VERSION_IS_GIT_SNAPSHOT=no >> $OUTDIR/source4/VERSION
#Prepare the tarball for a Samba4 release, with some generated files,
#but without Samba3 stuff (to avoid confusion)
-( cd $TMPDIR/ || exit 1
+( cd $OUTDIR/ || exit 1
rm -rf README Manifest Read-Manifest-Now Roadmap source3 packaging docs-xml examples swat WHATSNEW.txt MAINTAINERS || exit 1
cd source4 || exit 1
./autogen.sh || exit 1
@@ -19,14 +21,15 @@ TMPDIR=`mktemp -d samba-XXXXX`
make dist || exit 1
) || exit 1
-VERSION_FILE=$TMPDIR/source4/version.h
+VERSION_FILE=$OUTDIR/source4/version.h
if [ ! -f $VERSION_FILE ]; then
echo "Cannot find version.h at $VERSION_FILE"
exit 1;
fi
VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $VERSION_FILE`
-mv $TMPDIR samba-$VERSION || exit 1
+echo "Version: $VERSION"
+mv $OUTDIR samba-$VERSION || exit 1
tar -cf samba-$VERSION.tar samba-$VERSION || (rm -rf samba-$VERSION; exit 1)
rm -rf samba-$VERSION || exit 1
echo "Now run: "
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 2da54ef..91cc074 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -1195,6 +1195,9 @@ def provision_backend(setup_dir=None, message=None,
lp = param.LoadParm()
lp.load(smbconf)
+ if serverrole is None:
+ serverrole = lp.get("server role")
+
names = guess_names(lp=lp, hostname=hostname, domain=domain,
dnsdomain=realm, serverrole=serverrole,
rootdn=rootdn, domaindn=domaindn, configdn=configdn,
@@ -1405,7 +1408,20 @@ def provision_backend(setup_dir=None, message=None,
message("LDAP admin password: %s" % adminpass)
message(slapdcommand)
- message("Run provision with: --ldap-backend=ldapi --ldap-backend-type=" + ldap_backend_type + " --password=" + adminpass + " " + ldapuser + "--realm=" + names.dnsdomain + " --domain=" + names.domain + " --server-role='" + serverrole + "'")
+ assert isinstance(ldap_backend_type, str)
+ assert isinstance(ldapuser, str)
+ assert isinstance(adminpass, str)
+ assert isinstance(names.dnsdomain, str)
+ assert isinstance(names.domain, str)
+ assert isinstance(serverrole, str)
+ args = ["--ldap-backend=ldapi",
+ "--ldap-backend-type=" + ldap_backend_type,
+ "--password=" + adminpass,
+ ldapuser,
+ "--realm=" + names.dnsdomain,
+ "--domain=" + names.domain,
+ "--server-role='" + serverrole + "'"]
+ message("Run provision with: " + " ".join(args))
def create_phpldapadmin_config(path, setup_path, ldapi_uri):
"""Create a PHP LDAP admin configuration file.
diff --git a/source4/setup/provision b/source4/setup/provision
index 55535cf..d097eb9 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -160,7 +160,7 @@ if opts.server_role == "dc":
elif opts.server_role == "member":
server_role = "member server"
else:
- server_role = opts.server_role
+ server_role = opts.server_role
creds = credopts.get_credentials(lp)
diff --git a/source4/setup/provision-backend b/source4/setup/provision-backend
index aad7de4..756870d 100755
--- a/source4/setup/provision-backend
+++ b/source4/setup/provision-backend
@@ -90,7 +90,7 @@ if opts.server_role == "dc":
elif opts.server_role == "member":
server_role = "member server"
else:
- server_role = opts.server_role
+ server_role = opts.server_role
setup_dir = opts.setupdir
if setup_dir is None:
--
Samba Shared Repository
More information about the samba-cvs
mailing list