[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Tue Jun 26 00:04:06 UTC 2018
The branch, master has been updated
via f33749f autobuild: Build samba-fileserver --without-json-audit
via 6b9a9a4 dsdb: Ensure a build --without-json-audit --without-ad-dc compiles
via b650ea5 lib/audit_logging: Only build audit_logging_test for --enable-selftest on the AD DC
via a2783fe lib/audit_logging: Require jansson JSON library for building the AD DC
via 5bb60e2 build: Move --without-json-audit and json lib detection to lib/audit_logging
from b282bcb dsdb: Log the transaction duraton.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f33749fc84dacb164d1ac43f6bfcae7afcca34b3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 22 05:32:29 2018 +1200
autobuild: Build samba-fileserver --without-json-audit
This build target is already --without-ad-dc and is the one we need to ensure is
compatible with a host without the Jansson JSON library.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Tue Jun 26 02:03:30 CEST 2018 on sn-devel-144
commit 6b9a9a4d08f32ed12655aa930a2a9457d9ece3c3
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 22 05:18:52 2018 +1200
dsdb: Ensure a build --without-json-audit --without-ad-dc compiles
We still build some of the ldb_modules even when we are not a DC, so we must
split up the DSDB_MODULE_HELPERS.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit b650ea5398bbe11dcf7b75d4bfd04649fb6dae7c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 22 05:39:08 2018 +1200
lib/audit_logging: Only build audit_logging_test for --enable-selftest on the AD DC
This allows a --without-ad-dc --enable-selftest build to compile, still testing some
fileserver-only features.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit a2783fe1a3a93c6e3d106b2ab23c8c9acd3d382b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 22 04:50:09 2018 +1200
lib/audit_logging: Require jansson JSON library for building the AD DC
This combination is untested and it is reasonable to require this
broadly available library for the AD DC build.
Doing so keeps the combinational complexity down and ensures we test
what we ship. (It was failing to compile).
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 5bb60e2dd714862c3cda69a42f0f58fa4e7d816d
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Jun 22 04:47:10 2018 +1200
build: Move --without-json-audit and json lib detection to lib/audit_logging
This is the common location of the audit logging code now
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
{auth => lib/audit_logging}/wscript | 15 +++---
lib/audit_logging/wscript_build | 2 +-
script/autobuild.py | 2 +-
source4/dsdb/samdb/ldb_modules/audit_log.c | 1 +
source4/dsdb/samdb/ldb_modules/audit_util.c | 1 +
source4/dsdb/samdb/ldb_modules/group_audit.c | 1 +
source4/dsdb/samdb/ldb_modules/wscript_build | 46 +-----------------
.../dsdb/samdb/ldb_modules/wscript_build_server | 55 +++++++++++++++++++++-
wscript | 5 +-
9 files changed, 70 insertions(+), 58 deletions(-)
rename {auth => lib/audit_logging}/wscript (66%)
Changeset truncated at 500 lines:
diff --git a/auth/wscript b/lib/audit_logging/wscript
similarity index 66%
rename from auth/wscript
rename to lib/audit_logging/wscript
index 7b2c65e..d40fc6f 100644
--- a/auth/wscript
+++ b/lib/audit_logging/wscript
@@ -21,15 +21,16 @@ def configure(conf):
if not conf.CONFIG_GET('HAVE_JSON_OBJECT'):
if Options.options.with_json_audit != False:
- conf.fatal("JSON support not found. "
+ conf.fatal("Jansson JSON support not found. "
"Try installing libjansson-dev or jansson-devel. "
"Otherwise, use --without-json-audit to build without "
"JSON support. "
"JSON support is required for the JSON "
- "formatted audit log feature")
- if conf.CONFIG_GET('ENABLE_SELFTEST') and \
- (not Options.options.without_ad_dc):
- raise Utils.WafError('jansson JSON library required for '
- '--enable-selftest when building the AD DC')
- Logs.info("Building without jansson json log support")
+ "formatted audit log feature and the AD DC")
+ if not Options.options.without_ad_dc:
+ raise Utils.WafError('--without-json-audit requires '
+ '--without-ad-dc. '
+ 'Jansson JSON library is required for '
+ 'building the AD DC')
+ Logs.info("Building without Jansson JSON log support")
diff --git a/lib/audit_logging/wscript_build b/lib/audit_logging/wscript_build
index fff6837..24ac8bb 100644
--- a/lib/audit_logging/wscript_build
+++ b/lib/audit_logging/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM(
source='audit_logging.c'
)
-if bld.CONFIG_SET('ENABLE_SELFTEST'):
+if bld.AD_DC_BUILD_IS_ENABLED() and bld.CONFIG_GET('ENABLE_SELFTEST'):
bld.SAMBA_BINARY(
'audit_logging_test',
source='tests/audit_logging_test.c',
diff --git a/script/autobuild.py b/script/autobuild.py
index 429d644..a13b731 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -131,7 +131,7 @@ tasks = {
# We split out this so the isolated ad_dc tests do not wait for ad_dc_ntvfs tests (which are long)
"samba-fileserver" : [ ("random-sleep", "../script/random-sleep.sh 60 600", "text/plain"),
- ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
+ ("configure", "./configure.developer --without-ad-dc --without-ldap --without-ads --without-json-audit --with-selftest-prefix=./bin/ab" + samba_configure_params, "text/plain"),
("make", "make -j", "text/plain"),
("test", "make test FAIL_IMMEDIATELY=1 TESTS='--include-env=fileserver'", "text/plain"),
("check-clean-tree", "script/clean-source-tree.sh", "text/plain")],
diff --git a/source4/dsdb/samdb/ldb_modules/audit_log.c b/source4/dsdb/samdb/ldb_modules/audit_log.c
index 80914cb..fc2eb50 100644
--- a/source4/dsdb/samdb/ldb_modules/audit_log.c
+++ b/source4/dsdb/samdb/ldb_modules/audit_log.c
@@ -29,6 +29,7 @@
#include "dsdb/samdb/samdb.h"
#include "dsdb/samdb/ldb_modules/util.h"
+#include "dsdb/samdb/ldb_modules/audit_util_proto.h"
#include "libcli/security/dom_sid.h"
#include "auth/common_auth.h"
#include "param/param.h"
diff --git a/source4/dsdb/samdb/ldb_modules/audit_util.c b/source4/dsdb/samdb/ldb_modules/audit_util.c
index be2c522..766c34c 100644
--- a/source4/dsdb/samdb/ldb_modules/audit_util.c
+++ b/source4/dsdb/samdb/ldb_modules/audit_util.c
@@ -33,6 +33,7 @@
#include "auth/common_auth.h"
#include "param/param.h"
#include "dsdb/samdb/ldb_modules/util.h"
+#include "dsdb/samdb/ldb_modules/audit_util_proto.h"
#define MAX_LENGTH 1024
diff --git a/source4/dsdb/samdb/ldb_modules/group_audit.c b/source4/dsdb/samdb/ldb_modules/group_audit.c
index dc58677..bbd124a 100644
--- a/source4/dsdb/samdb/ldb_modules/group_audit.c
+++ b/source4/dsdb/samdb/ldb_modules/group_audit.c
@@ -28,6 +28,7 @@
#include "dsdb/samdb/samdb.h"
#include "dsdb/samdb/ldb_modules/util.h"
+#include "dsdb/samdb/ldb_modules/audit_util_proto.h"
#include "libcli/security/dom_sid.h"
#include "auth/common_auth.h"
#include "param/param.h"
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 1216a1f..9e0ac28 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -7,9 +7,9 @@ bld.SAMBA_LIBRARY('dsdb-module',
grouping_library=True)
bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
- source='util.c acl_util.c schema_util.c netlogon.c audit_util.c',
+ source='util.c acl_util.c schema_util.c netlogon.c',
autoproto='util_proto.h',
- deps='ldb ndr samdb-common samba-security audit_logging'
+ deps='ldb ndr samdb-common samba-security'
)
bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
@@ -41,47 +41,5 @@ bld.SAMBA_BINARY('test_encrypted_secrets',
''',
install=False)
-#
-# These tests require JANSSON, so we only build them if we are doing a selftest
-# build.
-#
-if bld.CONFIG_GET('ENABLE_SELFTEST'):
- bld.SAMBA_BINARY('test_audit_util',
- source='tests/test_audit_util.c',
- deps='''
- talloc
- samba-util
- samdb-common
- samdb
- cmocka
- audit_logging
- DSDB_MODULE_HELPERS
- ''',
- install=False)
- bld.SAMBA_BINARY('test_audit_log',
- source='tests/test_audit_log.c',
- deps='''
- talloc
- samba-util
- samdb-common
- samdb
- cmocka
- audit_logging
- DSDB_MODULE_HELPERS
- ''',
- install=False)
- bld.SAMBA_BINARY('test_group_audit',
- source='tests/test_group_audit.c',
- deps='''
- talloc
- samba-util
- samdb-common
- samdb
- cmocka
- audit_logging
- DSDB_MODULE_HELPERS
- ''',
- install=False)
-
if bld.AD_DC_BUILD_IS_ENABLED():
bld.PROCESS_SEPARATE_RULE("server")
diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build_server b/source4/dsdb/samdb/ldb_modules/wscript_build_server
index e5c5032..39c9477 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build_server
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build_server
@@ -1,5 +1,56 @@
#!/usr/bin/env python
+bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS_AUDIT',
+ source='audit_util.c',
+ autoproto='audit_util_proto.h',
+ deps='DSDB_MODULE_HELPERS audit_logging')
+
+#
+# These tests require JANSSON, so we only build them if we are doing a
+# build on the AD DC (where Jansson is required).
+#
+
+bld.SAMBA_BINARY('test_audit_util',
+ source='tests/test_audit_util.c',
+ deps='''
+ talloc
+ samba-util
+ samdb-common
+ samdb
+ cmocka
+ audit_logging
+ DSDB_MODULE_HELPERS
+ ''',
+ install=False)
+
+bld.SAMBA_BINARY('test_audit_log',
+ source='tests/test_audit_log.c',
+ deps='''
+ talloc
+ samba-util
+ samdb-common
+ samdb
+ cmocka
+ audit_logging
+ DSDB_MODULE_HELPERS
+ DSDB_MODULE_HELPERS_AUDIT
+ ''',
+ install=False)
+
+bld.SAMBA_BINARY('test_group_audit',
+ source='tests/test_group_audit.c',
+ deps='''
+ talloc
+ samba-util
+ samdb-common
+ samdb
+ cmocka
+ audit_logging
+ DSDB_MODULE_HELPERS
+ DSDB_MODULE_HELPERS_AUDIT
+ ''',
+ install=False)
+
bld.SAMBA_MODULE('ldb_samba_dsdb',
source='samba_dsdb.c',
subsystem='ldb',
@@ -437,7 +488,7 @@ bld.SAMBA_MODULE('ldb_audit_log',
talloc
samba-util
samdb-common
- DSDB_MODULE_HELPERS
+ DSDB_MODULE_HELPERS_AUDIT
samdb
'''
)
@@ -453,7 +504,7 @@ bld.SAMBA_MODULE('ldb_group_audit_log',
talloc
samba-util
samdb-common
- DSDB_MODULE_HELPERS
+ DSDB_MODULE_HELPERS_AUDIT
samdb
'''
)
diff --git a/wscript b/wscript
index dbfc121..b1b69c1 100644
--- a/wscript
+++ b/wscript
@@ -35,7 +35,7 @@ def system_mitkrb5_callback(option, opt, value, parser):
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.PRIVATE_EXTENSION_DEFAULT('samba4')
- opt.RECURSE('auth')
+ opt.RECURSE('lib/audit_logging')
opt.RECURSE('lib/replace')
opt.RECURSE('dynconfig')
opt.RECURSE('packaging')
@@ -213,7 +213,7 @@ def configure(conf):
# system-provided or embedded Heimdal build
if conf.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
conf.RECURSE('source4/heimdal_build')
- conf.RECURSE('auth')
+ conf.RECURSE('lib/audit_logging')
conf.RECURSE('source4/lib/tls')
conf.RECURSE('source4/dsdb/samdb/ldb_modules')
conf.RECURSE('source4/ntvfs/sysdep')
@@ -251,7 +251,6 @@ def configure(conf):
if conf.env.with_ctdb:
conf.RECURSE('ctdb')
conf.RECURSE('lib/socket')
- conf.RECURSE('auth')
conf.RECURSE('packaging')
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
--
Samba Shared Repository
More information about the samba-cvs
mailing list