[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  e425a17 lib/param: fix typo _SAMBA_BUILD => _SAMBA_BUILD_ causing segfaults
       via  3c4eb2c script/autobuild.py: split 'samba3' 'make -j 4 everything' into multiple steps
      from  6760011 s3:dbwrap: change dbwrap_store_uint32() to NTSTATUS return type

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit e425a17cb4d05d7f98dac9d9ab868bab76eced98
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 11 15:38:43 2011 +0200

    lib/param: fix typo _SAMBA_BUILD => _SAMBA_BUILD_ causing segfaults
    
    If lpcfg_dns_update_command() returns NULL 'samba' segfaults on startup.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Oct 11 17:25:19 CEST 2011 on sn-devel-104

commit 3c4eb2cab68d4b60888dfb557734cdfaeef50b4c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Oct 11 15:32:36 2011 +0200

    script/autobuild.py: split 'samba3' 'make -j 4 everything' into multiple steps
    
    Calling 'waf configure' while compiling .c files makes it very hard to
    find compile errors. We do 'make -j 4 bin/smbtorture4' before 'make -j 4 everything'.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 lib/param/loadparm.c |    2 +-
 script/autobuild.py  |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/param/loadparm.c b/lib/param/loadparm.c
index 54ef040..880b521 100644
--- a/lib/param/loadparm.c
+++ b/lib/param/loadparm.c
@@ -3369,7 +3369,7 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
 	lpcfg_do_global_parameter(lp_ctx, "winbind separator", "\\");
 	lpcfg_do_global_parameter(lp_ctx, "winbind sealed pipes", "True");
 	lpcfg_do_global_parameter(lp_ctx, "winbindd socket directory", dyn_WINBINDD_SOCKET_DIR);
-#if _SAMBA_BUILD >= 4
+#if _SAMBA_BUILD_ >= 4
 	lpcfg_do_global_parameter(lp_ctx, "winbindd privileged socket directory", dyn_WINBINDD_PRIVILEGED_SOCKET_DIR);
 	lpcfg_do_global_parameter(lp_ctx, "ntp signd socket directory", dyn_NTP_SIGND_SOCKET_DIR);
 	lpcfg_do_global_parameter_var(lp_ctx, "dns update command", "%s/samba_dnsupdate", dyn_SCRIPTSBINDIR);
diff --git a/script/autobuild.py b/script/autobuild.py
index 9945c66..abca8e8 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -34,7 +34,11 @@ tasks = {
     "samba3" : [ ("autogen", "./autogen.sh", "text/plain"),
                  ("configure", "./configure.developer ${PREFIX}", "text/plain"),
                  ("make basics", "make basics", "text/plain"),
-                 ("make", "make -j 4 everything", "text/plain"), # don't use too many processes
+                 # we split 'make -j 4', 'make bin/smbtorture4' and 'make -j 4 everything'
+                 # because it makes it much easier to find errors.
+                 ("make", "make -j 4", "text/plain"), # don't use too many processes
+                 ("make bin/smbtorture4", "make -j 4 bin/smbtorture4", "text/plain"),
+                 ("make everything", "make -j 4 everything", "text/plain"),
                  ("install", "make install", "text/plain"),
                  ("test", "TDB_NO_FSYNC=1 make test FAIL_IMMEDIATELY=1", "text/plain"),
                  ("check-clean-tree", "../script/clean-source-tree.sh", "text/plain"),


-- 
Samba Shared Repository