[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Apr 11 02:42:02 MDT 2013
The branch, master has been updated
via f775613 scripting-provision: Do not enforce domain != realm if we are joining an existing domain
via 7955bf4 build: Raise minimum python version to 2.5.0 for samba build
from afd291b Avoid leaking temp file if an exception is raised
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f7756137e8f8a7591c9d95482ca1fca3f6484a51
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Apr 5 12:01:17 2013 +1100
scripting-provision: Do not enforce domain != realm if we are joining an existing domain
This will allow us users to join existing oddly named domains without
objection from provision.
Andrew Bartlett
Reviewed-by: Matthieu Patou <mat at matws.net>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Apr 11 10:41:02 CEST 2013 on sn-devel-104
commit 7955bf473f63e31566e29299b03d44d9b450d1ae
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Apr 8 17:25:27 2013 +1000
build: Raise minimum python version to 2.5.0 for samba build
RHEL5 has a python26 package for a modern python, and was the main reason we
kept python 2.5 support.
However, this support never actually worked for AD DC installations,
as samba-tool uses a feature only in 2.5 and above. Very few folks
noticed and those were on RHEL5, and moving to 2.5 allows us to remove
some other workarounds.
Andrew Bartlett
Reviewed-by: Matthieu Patou <mat at matws.net>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_python.py | 4 ++--
m4/check_python.m4 | 6 +++---
python/samba/provision/__init__.py | 9 +++++----
wscript | 2 +-
4 files changed, 11 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index 847b431..aee9547 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -7,13 +7,13 @@ from samba_autoconf import *
from Configure import conf
@conf
-def SAMBA_CHECK_PYTHON(conf, mandatory=True):
+def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,4,2)):
# enable tool to build python extensions
conf.find_program('python', var='PYTHON', mandatory=mandatory)
conf.check_tool('python')
path_python = conf.find_program('python')
conf.env.PYTHON_SPECIFIED = (conf.env.PYTHON != path_python)
- conf.check_python_version((2,4,2))
+ conf.check_python_version(version)
@conf
def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 9d0524a..66dadbd 100644
--- a/m4/check_python.m4
+++ b/m4/check_python.m4
@@ -43,7 +43,7 @@ dnl $PYTHON_LDFLAGS
AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
[
if test -z "$PYTHON_VER"; then
- AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python2.4 python])
+ AC_PATH_PROGS([PYTHON], [python2.6 python2.5 python])
else
AC_PATH_PROG([PYTHON],[python[$PYTHON_VER]])
fi
@@ -91,9 +91,9 @@ AC_DEFUN([AC_SAMBA_PYTHON_DEVEL],
sysconfig.get_config_var('LIBPL'))"`
TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
- if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 4))"`
+ if `$PYTHON -c "import sys; sys.exit(sys.version_info.__getslice__(0, 2) >= (2, 5))"`
then
- AC_MSG_WARN([Python ($PYTHON) is too old. At least version 2.4 is required])
+ AC_MSG_WARN([Python ($PYTHON) is too old. At least version 2.5 is required])
working_python=no
fi
fi
diff --git a/python/samba/provision/__init__.py b/python/samba/provision/__init__.py
index 252cfd9..a84b92f 100644
--- a/python/samba/provision/__init__.py
+++ b/python/samba/provision/__init__.py
@@ -561,7 +561,8 @@ def determine_netbios_name(hostname):
def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
serverrole=None, rootdn=None, domaindn=None, configdn=None,
- schemadn=None, serverdn=None, sitename=None):
+ schemadn=None, serverdn=None, sitename=None,
+ domain_names_forced=False):
"""Guess configuration settings to use."""
if hostname is None:
@@ -624,8 +625,8 @@ def guess_names(lp=None, hostname=None, domain=None, dnsdomain=None,
if hostname.upper() == realm:
raise ProvisioningError("guess_names: Realm '%s' must not be equal to hostname '%s'!" % (realm, hostname))
if netbiosname.upper() == realm:
- raise ProvisioningError("guess_names: Realm '%s' must not be equal to netbios hostname '%s'!" % (realm, netbiosname))
- if domain == realm:
+ raise ProvisioningError("guess_names: Realm '%s' must not be equal to NetBIOS hostname '%s'!" % (realm, netbiosname))
+ if domain == realm and not domain_names_forced:
raise ProvisioningError("guess_names: Realm '%s' must not be equal to short domain name '%s'!" % (realm, domain))
if rootdn is None:
@@ -1984,7 +1985,7 @@ def provision(logger, session_info, credentials, smbconf=None,
names = guess_names(lp=lp, hostname=hostname, domain=domain,
dnsdomain=realm, serverrole=serverrole, domaindn=domaindn,
configdn=configdn, schemadn=schemadn, serverdn=serverdn,
- sitename=sitename, rootdn=rootdn)
+ sitename=sitename, rootdn=rootdn, domain_names_forced=(samdb_fill == FILL_DRS))
paths = provision_paths_from_lp(lp, names.dnsdomain)
paths.bind_gid = bind_gid
diff --git a/wscript b/wscript
index 1ef55ab..4944a72 100644
--- a/wscript
+++ b/wscript
@@ -85,7 +85,7 @@ def configure(conf):
conf.find_program('perl', var='PERL', mandatory=True)
conf.find_program('xsltproc', var='XSLTPROC')
- conf.SAMBA_CHECK_PYTHON(mandatory=True)
+ conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0))
conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True)
if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']:
--
Samba Shared Repository
More information about the samba-cvs
mailing list