[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Tue Oct 13 07:39:03 UTC 2015
The branch, master has been updated
via 65e4829 Fixes for server role parameter in smb.conf manpage
via 9610805 build:wafsamba: Enable feature-compatible declaration for Waf 1.8
from e73ccc0 Rely on /dev/urandom
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 65e4829e880f5c4cd548791d462352e39968be1c
Author: Marc Muehlfeld <mmuehlfeld at samba.org>
Date: Mon Oct 12 22:49:10 2015 +0200
Fixes for server role parameter in smb.conf manpage
The manpage says that the value for an AD DC is "ACTIVE DIRECTORY
DOMAIN CONTROLLER", not "DOMAIN CONTROLLER", like mentioned in
the example.
Additinally the correct value for BDC is "CLASSIC BACKUP DOMAIN CONTROLLER"
Signed-off-by: Marc Muehlfeld <mmuehlfeld at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Tue Oct 13 09:38:01 CEST 2015 on sn-devel-104
commit 96108058d0d89593ac9f59433213ed2f66663186
Author: Thomas Nagy <tnagy at waf.io>
Date: Sat Oct 3 22:29:15 2015 +0200
build:wafsamba: Enable feature-compatible declaration for Waf 1.8
In Waf 1.8 the declaration is features='c', not features='cc'. These changes
prepare the replacement of Waf 1.5 by Waf 1.8 for Samba.
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/gccdeps.py | 2 +-
buildtools/wafsamba/samba_autoconf.py | 2 +-
buildtools/wafsamba/samba_conftests.py | 10 +++++-----
buildtools/wafsamba/samba_optimisation.py | 6 +++---
buildtools/wafsamba/samba_utils.py | 2 +-
buildtools/wafsamba/wafsamba.py | 6 +++---
buildtools/wafsamba/wscript | 2 +-
docs-xml/smbdotconf/security/serverrole.xml | 4 ++--
source4/heimdal_build/wscript_build | 10 +++++-----
9 files changed, 22 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/gccdeps.py b/buildtools/wafsamba/gccdeps.py
index 2da42e6..47505f0 100644
--- a/buildtools/wafsamba/gccdeps.py
+++ b/buildtools/wafsamba/gccdeps.py
@@ -14,7 +14,7 @@ lock = threading.Lock()
preprocessor_flag = '-MD'
- at feature('cc')
+ at feature('c', 'cc')
@before('apply_core')
def add_mmd_cc(self):
if self.env.get_flat('CCFLAGS').find(preprocessor_flag) < 0:
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index ef34b00..d7273f9 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -569,7 +569,7 @@ int foo()
(ccflags, ldflags, cpppath) = library_flags(conf, lib)
if shlib:
- res = conf.check(features='cc cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper())
+ res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper())
else:
res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper())
diff --git a/buildtools/wafsamba/samba_conftests.py b/buildtools/wafsamba/samba_conftests.py
index fe8c30b..9c0b651 100644
--- a/buildtools/wafsamba/samba_conftests.py
+++ b/buildtools/wafsamba/samba_conftests.py
@@ -197,7 +197,7 @@ int foo(int v) {
return v * 2;
}
'''
- return conf.check(features='cc cshlib',vnum="1",fragment=snip,msg=msg)
+ return conf.check(features='c cshlib',vnum="1",fragment=snip,msg=msg)
@conf
def CHECK_NEED_LC(conf, msg):
@@ -227,7 +227,7 @@ def CHECK_NEED_LC(conf, msg):
bld.rescan(bld.srcnode)
- bld(features='cc cshlib',
+ bld(features='c cshlib',
source='liblctest/liblc1.c',
ldflags=conf.env['EXTRA_LDFLAGS'],
target='liblc',
@@ -262,7 +262,7 @@ int foo(int v) {
ldb_module = PyImport_ImportModule("ldb");
return v * 2;
}'''
- return conf.check(features='cc cshlib',uselib='PYEMBED',fragment=snip,msg=msg)
+ return conf.check(features='c cshlib',uselib='PYEMBED',fragment=snip,msg=msg)
# this one is quite complex, and should probably be broken up
# into several parts. I'd quite like to create a set of CHECK_COMPOUND()
@@ -306,13 +306,13 @@ def CHECK_LIBRARY_SUPPORT(conf, rpath=False, version_script=False, msg=None):
ldflags.append("-Wl,--version-script=%s/vscript" % bld.path.abspath())
Utils.writef(os.path.join(dir,'vscript'), 'TEST_1.0A2 { global: *; };\n')
- bld(features='cc cshlib',
+ bld(features='c cshlib',
source='libdir/lib1.c',
target='libdir/lib1',
ldflags=ldflags,
name='lib1')
- o = bld(features='cc cprogram',
+ o = bld(features='c cprogram',
source='main.c',
target='prog1',
uselib_local='lib1')
diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py
index 43b12a2..9d4fad1 100644
--- a/buildtools/wafsamba/samba_optimisation.py
+++ b/buildtools/wafsamba/samba_optimisation.py
@@ -11,7 +11,7 @@ import Build, Utils, Node
from TaskGen import feature, after, before
import preproc
- at feature('cc', 'cxx')
+ at feature('c', 'cc', 'cxx')
@after('apply_type_vars', 'apply_lib_vars', 'apply_core')
def apply_incpaths(self):
lst = []
@@ -59,7 +59,7 @@ def apply_incpaths(self):
if node:
self.env.append_value('INC_PATHS', node)
- at feature('cc')
+ at feature('c', 'cc')
@after('apply_incpaths')
def apply_obj_vars_cc(self):
"""after apply_incpaths for INC_PATHS"""
@@ -187,7 +187,7 @@ def shared_ancestors(self):
return ret
TaskGen.task_gen.shared_ancestors = shared_ancestors
- at feature('cc', 'cxx')
+ at feature('c', 'cc', 'cxx')
@after('apply_link', 'init_cc', 'init_cxx', 'apply_core')
def apply_lib_vars(self):
"""after apply_link because of 'link_task'
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 9bbe6ac..e6e7901 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -164,7 +164,7 @@ def ADD_COMMAND(opt, name, function):
Options.Handler.ADD_COMMAND = ADD_COMMAND
- at feature('cc', 'cshlib', 'cprogram')
+ at feature('c', 'cc', 'cshlib', 'cprogram')
@before('apply_core','exec_rule')
def process_depends_on(self):
'''The new depends_on attribute for build rules
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 078e411..ef9d430 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -243,7 +243,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if bld.env['ENABLE_RELRO'] is True:
ldflags.extend(TO_LIST('-Wl,-z,relro,-z,now'))
- features = 'cc cshlib symlink_lib install_lib'
+ features = 'c cshlib symlink_lib install_lib'
if pyext:
features += ' pyext'
if pyembed:
@@ -354,7 +354,7 @@ def SAMBA_BINARY(bld, binname, source,
if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
return
- features = 'cc cprogram symlink_bin install_bin'
+ features = 'c cprogram symlink_bin install_bin'
if pyembed:
features += ' pyembed'
@@ -578,7 +578,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source,
bld.SET_BUILD_GROUP(group)
- features = 'cc'
+ features = 'c'
if pyext:
features += ' pyext'
if pyembed:
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 422b742..aca444b 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -241,7 +241,7 @@ def configure(conf):
cc.run = Task.compile_fun_noshell('cc', '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT[0].abspath(env)}')[0]
try:
try:
- conf.check(features='cc testd', fragment='int main() {return 0;}\n', ccflags=['-MD'], mandatory=True, msg='Check for -MD')
+ conf.check(features='c testd', fragment='int main() {return 0;}\n', ccflags=['-MD'], mandatory=True, msg='Check for -MD')
except:
pass
else:
diff --git a/docs-xml/smbdotconf/security/serverrole.xml b/docs-xml/smbdotconf/security/serverrole.xml
index ce3ef13..b46f04b 100644
--- a/docs-xml/smbdotconf/security/serverrole.xml
+++ b/docs-xml/smbdotconf/security/serverrole.xml
@@ -61,7 +61,7 @@
only one PDC per NetBIOS scope (typcially a broadcast network or
clients served by a single WINS server).</para>
- <para><anchor id="BDC"/><emphasis>SERVER ROLE = NETBIOS BACKUP DOMAIN CONTROLLER</emphasis></para>
+ <para><anchor id="BDC"/><emphasis>SERVER ROLE = CLASSIC BACKUP DOMAIN CONTROLLER</emphasis></para>
<para>This mode of operation runs a classic Samba backup domain
controller, providing domain logon services to Windows and Samba
@@ -85,5 +85,5 @@
<related>encrypt passwords</related>
<value type="default">AUTO</value>
-<value type="example">DOMAIN CONTROLLER</value>
+<value type="example">ACTIVE DIRECTORY DOMAIN CONTROLLER</value>
</samba:parameter>
diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build
index 4f1d895..c733b8f 100644
--- a/source4/heimdal_build/wscript_build
+++ b/source4/heimdal_build/wscript_build
@@ -69,7 +69,7 @@ def HEIMDAL_ASN1(name, source,
t = bld(rule=asn1_rule,
ext_out = '.x',
- before = 'cc',
+ before = 'c',
update_outputs = True,
shell = True,
source = source,
@@ -123,7 +123,7 @@ def HEIMDAL_ASN1(name, source,
includes = to_list(includes)
includes.append(os.path.dirname(out_files[0]))
- t = bld(features = 'cc',
+ t = bld(features = 'c',
source = cfile,
target = name,
samba_cflags = CURRENT_CFLAGS(bld, name, ''),
@@ -241,7 +241,7 @@ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
bundled_name = libname
version = "%s_%s" % (Utils.g_module.APPNAME, Utils.g_module.VERSION)
- features = 'cc cshlib symlink_lib install_lib'
+ features = 'c cshlib symlink_lib install_lib'
bld.set_group('main')
t = bld(
@@ -277,7 +277,7 @@ def HEIMDAL_SUBSYSTEM(modname, source,
bld.set_group(group)
return bld(
- features = 'cc',
+ features = 'c',
source = source,
target = modname,
samba_cflags = CURRENT_CFLAGS(bld, modname, cflags, allow_warnings=True),
@@ -306,7 +306,7 @@ def HEIMDAL_BINARY(binname, source,
if not SET_TARGET_TYPE(bld, binname, 'BINARY'):
return
- features = 'cc cprogram symlink_bin install_bin'
+ features = 'c cprogram symlink_bin install_bin'
obj_target = binname + '.objlist'
--
Samba Shared Repository
More information about the samba-cvs
mailing list