[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Jan 6 22:06:03 MST 2014
The branch, master has been updated
via 0dc30b9 samba_upgradedns: message the user if they need to change smb.conf
via 472b299 doc: Modify build doc concerning missing headers
via 88eede6 waf: fix a typo in an ADS error message
via 8d6bc99 waf: Require --without-ads-support to build without ADS support
via eef44dc waf: Require ldap support to be specifically disabled
via 2be17b7 waf: Require ACL support to be specifically disabled
from 6ab9164 s3:rpc_client: send a dcerpc_sec_verification_trailer if needed
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0dc30b9fe8243e9596e4016a20e1f7f19223ed1a
Author: Ricky Nance <ricky.nance at gmail.com>
Date: Tue Dec 31 10:58:16 2013 -0600
samba_upgradedns: message the user if they need to change smb.conf
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Kai Blin <kai at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Jan 7 06:05:15 CET 2014 on sn-devel-104
commit 472b2990914120118cf126a7a40f568897ef5522
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Dec 16 16:17:22 2013 +1300
doc: Modify build doc concerning missing headers
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 88eede6b072d7bec45bed70f7a7483bd5de76501
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Dec 16 15:25:58 2013 +1300
waf: fix a typo in an ADS error message
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 8d6bc9987c22248453c0acd25616eda35d6d99db
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Dec 16 14:59:35 2013 +1300
waf: Require --without-ads-support to build without ADS support
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit eef44dc2d56bedcb3b85e3bf24aff00bad4c79a7
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Dec 16 13:31:31 2013 +1300
waf: Require ldap support to be specifically disabled
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
commit 2be17b799140ca5f1b5ebbccf72a6fda561ceef6
Author: Garming Sam <garming at catalyst.net.nz>
Date: Mon Dec 16 12:45:45 2013 +1300
waf: Require ACL support to be specifically disabled
Signed-off-by: Garming Sam <garming at catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
-----------------------------------------------------------------------
Summary of changes:
BUILD_SYSTEMS.txt | 19 ++++++-----------
source3/wscript | 33 +++++++++++++++++++++++++++----
source4/scripting/bin/samba_upgradedns | 16 +++++++++++++++
3 files changed, 51 insertions(+), 17 deletions(-)
Changeset truncated at 500 lines:
diff --git a/BUILD_SYSTEMS.txt b/BUILD_SYSTEMS.txt
index 96d1e35..f1d1ce3 100644
--- a/BUILD_SYSTEMS.txt
+++ b/BUILD_SYSTEMS.txt
@@ -66,20 +66,15 @@ Optional Libraries
------------------
To assist users and distributors to build Samba with the full feature
-set, we hope to in the future the build system will abort if our
-dependent libraries and their header files are not found on the target
-system. This will mean for example, that xattr, acl and ldap headers
-must be installed for the default build to complete. The configure
-system will check for these headers, and the error message will
-indicate:
- - the required header and library
- - the option (such as --without-acl-support) that can be specified to
- skip this requirement, and
- - the feature (ACL support optional for file servers, mandatory for AD
- Domain Controller) being skipped.
+set, the build system will abort if our dependent libraries and their
+header files are not found on the target system. This will mean for
+example, that xattr, acl and ldap headers must be installed for the
+default build to complete. The configure system will check for these
+headers, and the error message will indicate the option (such as
+--without-acl-support) that can be specified to skip this requirement.
This will assist users and in particular distributors in building fully
functional packages, while allowing those on systems truly without these
facilities to continue to build Samba after careful consideration.
-Sadly this feature is still pending implementation.
+This feature is not currently supported for xattr.
diff --git a/source3/wscript b/source3/wscript
index f87a0a8..501707b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -23,7 +23,7 @@ def set_options(opt):
action="store", dest='shared_modules', default=None)
opt.SAMBA3_ADD_OPTION('winbind')
- opt.SAMBA3_ADD_OPTION('ads', default=None) # None means autodetection
+ opt.SAMBA3_ADD_OPTION('ads')
opt.SAMBA3_ADD_OPTION('ldap')
opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
opt.SAMBA3_ADD_OPTION('iprint', with_name="enable", without_name="disable")
@@ -428,7 +428,12 @@ utimensat vsyslog _write __write __xstat
conf.DEFINE('HAVE_TRU64_ACLS',1)
default_static_modules.extend(TO_LIST('vfs_tru64acl'))
elif (host_os.rfind('darwin') > -1):
- Logs.warn('ACLs on Dwarwin currently not supported')
+ Logs.warn('ACLs on Darwin currently not supported')
+ conf.fatal("ACL support not available on Darwin/MacOS. "
+ "Use --without-acl-support for building without "
+ "ACL support. "
+ "ACL support is required to change permissions "
+ "from Windows clients.")
else:
conf.CHECK_FUNCS_IN('acl_get_file', 'acl')
if conf.CHECK_CODE('''
@@ -449,7 +454,13 @@ return acl_get_perm_np(permset_d, perm);
headers='sys/types.h sys/acl.h', link=True,
msg="Checking whether acl_get_perm_np() is available")
default_static_modules.extend(TO_LIST('vfs_posixacl'))
-
+ else:
+ conf.fatal("ACL support not found. Try installing libacl1-dev "
+ "or libacl-devel. "
+ "Otherwise, use --without-acl-support to build "
+ "without ACL support. "
+ "ACL support is required to change permissions from "
+ "Windows clients.")
if conf.CHECK_FUNCS('dirfd'):
conf.DEFINE('HAVE_DIRFD_DECL', 1)
@@ -648,6 +659,15 @@ msg.msg_acctrightslen = sizeof(fd);
if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
+ else:
+ conf.fatal("LDAP support not found. "
+ "Try installing libldap2-dev or openldap-devel. "
+ "Otherwise, use --without-ldap to build without "
+ "LDAP support. "
+ "LDAP support is required for the LDAP passdb backend, "
+ "LDAP idmap backends and ADS. "
+ "ADS support improves communication with "
+ "Active Directory domain controllers.")
else:
conf.SET_TARGET_TYPE('ldap', 'EMPTY')
conf.SET_TARGET_TYPE('lber', 'EMPTY')
@@ -746,9 +766,12 @@ msg.msg_acctrightslen = sizeof(fd);
if not use_ads_krb5:
Logs.warn("Active Directory support not available: krb5 libs don't have all required features")
if not use_ads_ldap:
- Logs.warn("Active Directory support not available: LDAP support ist not available.")
+ Logs.warn("Active Directory support not available: LDAP support is not available.")
if Options.options.with_ads:
- conf.fatal("Active Directory support not found. Use --without-ads for building without Active Directory support.")
+ conf.fatal("Active Directory support not found. Use --without-ads "
+ "for building without Active Directory support. "
+ "ADS support improves communication with "
+ "Active Directory domain controllers.")
else:
# this is the auto-mode case
Logs.warn("Building without Active Directory support.")
diff --git a/source4/scripting/bin/samba_upgradedns b/source4/scripting/bin/samba_upgradedns
index d2c96cc..c4f2144 100755
--- a/source4/scripting/bin/samba_upgradedns
+++ b/source4/scripting/bin/samba_upgradedns
@@ -500,3 +500,19 @@ if __name__ == '__main__':
logger.info("Failed to delete %s from sam.ldb" % dn)
logger.info("Finished upgrading DNS")
+
+ services = lp.get("server services")
+ for service in services:
+ if service == "dns":
+ if opts.dns_backend.startswith("BIND"):
+ logger.info("You have switched to using %s as your dns backend,"
+ " but still have the internal dns starting. Please"
+ " make sure you add '-dns' to your server services"
+ " line in your smb.conf." % opts.dns_backend)
+ break
+ else:
+ if opts.dns_backend == "SAMBA_INTERNAL":
+ logger.info("You have switched to using %s as your dns backend,"
+ " but you still have samba starting looking for a"
+ " BIND backend. Please remove the -dns from your"
+ " server services line." % opts.dns_backend)
--
Samba Shared Repository
More information about the samba-cvs
mailing list