The branch, v3-6-test has been updated via aab7612 s4-libcli/rap: add NDR_RAP dependency to LIBCLI_RAP. via ae7abc6 s3-waf: enable nss_winbind in make test for nss_wrapper. via e74f580 s3-registry: remove some unused headers. from 0418a43 s3:locking: simplify the non cluster case of brl_get_locks_readonly()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit aab7612b65c0c33ebdc7417b29e81763e0bf23b4 Author: Günther Deschner <g...@samba.org> Date: Fri Mar 18 13:24:58 2011 +0100 s4-libcli/rap: add NDR_RAP dependency to LIBCLI_RAP. Guenther Autobuild-User: Günther Deschner <g...@samba.org> Autobuild-Date: Fri Mar 18 14:10:57 CET 2011 on sn-devel-104 (cherry picked from commit 9d813406e6c09f77164628102e66de1cf92f93c5) commit ae7abc6443f0dabf3896b1a9e1e9f61e320fb5a0 Author: Günther Deschner <g...@samba.org> Date: Fri Mar 18 13:00:55 2011 +0100 s3-waf: enable nss_winbind in make test for nss_wrapper. Guenther (cherry picked from commit 4e0521300f5620d4f3833dbdd1d2526dac0e86ab) commit e74f5806b0e5d5006a365e6d3f4f88c916591e18 Author: Günther Deschner <g...@samba.org> Date: Thu Mar 17 15:03:24 2011 +0100 s3-registry: remove some unused headers. Guenther (cherry picked from commit fa8471a616ae72667e7b3705f58275f419212fdf) ----------------------------------------------------------------------- Summary of changes: source3/registry/reg_api.c | 1 - source3/registry/reg_api_regf.c | 1 - source3/registry/reg_backend_printing.c | 2 -- source3/registry/reg_init_full.c | 1 - source3/registry/regfio.c | 2 -- source3/selftest/wscript | 1 + source4/libcli/rap/wscript_build | 2 +- 7 files changed, 2 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/registry/reg_api.c b/source3/registry/reg_api.c index 7c2e01d..935d244 100644 --- a/source3/registry/reg_api.c +++ b/source3/registry/reg_api.c @@ -66,7 +66,6 @@ #include "registry.h" #include "reg_api.h" #include "reg_cachehook.h" -#include "reg_util_internal.h" #include "reg_backend_db.h" #include "reg_dispatcher.h" #include "reg_objects.h" diff --git a/source3/registry/reg_api_regf.c b/source3/registry/reg_api_regf.c index b7a9522..3625fc4 100644 --- a/source3/registry/reg_api_regf.c +++ b/source3/registry/reg_api_regf.c @@ -25,7 +25,6 @@ #include "regfio.h" #include "reg_util_internal.h" #include "reg_dispatcher.h" -#include "reg_objects.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_REGISTRY diff --git a/source3/registry/reg_backend_printing.c b/source3/registry/reg_backend_printing.c index ea6a6f6..f764952 100644 --- a/source3/registry/reg_backend_printing.c +++ b/source3/registry/reg_backend_printing.c @@ -24,8 +24,6 @@ #include "registry.h" #include "reg_util_internal.h" #include "reg_backend_db.h" -#include "reg_objects.h" -#include "../librpc/gen_ndr/ndr_spoolss.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_REGISTRY diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c index e63dd92..b222d13 100644 --- a/source3/registry/reg_init_full.c +++ b/source3/registry/reg_init_full.c @@ -24,7 +24,6 @@ #include "registry.h" #include "reg_cachehook.h" #include "reg_backend_db.h" -#include "reg_perfcount.h" #include "reg_init_basic.h" #include "reg_init_full.h" diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index e300b14..507f720 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -18,9 +18,7 @@ */ #include "includes.h" -#include "reg_parse_prs.h" #include "regfio.h" -#include "reg_objects.h" #include "../librpc/gen_ndr/ndr_security.h" #undef DBGC_CLASS diff --git a/source3/selftest/wscript b/source3/selftest/wscript index f1c6510..05d0d37 100644 --- a/source3/selftest/wscript +++ b/source3/selftest/wscript @@ -156,6 +156,7 @@ def cmd_testonly(opt): # tell build system where to find config.h os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h' os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs') + os.environ['NSS_WRAPPER_WINBIND_SO_PATH'] = os.path.abspath('bin/default/nsswitch/libnss-winbind.so') st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done') if os.path.exists(st_done): diff --git a/source4/libcli/rap/wscript_build b/source4/libcli/rap/wscript_build index f764e37..32685cb 100644 --- a/source4/libcli/rap/wscript_build +++ b/source4/libcli/rap/wscript_build @@ -2,6 +2,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RAP', source='rap.c', - public_deps='LIBCLI_RAW', + public_deps='LIBCLI_RAW NDR_RAP', autoproto='proto.h' ) -- Samba Shared Repository