[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  0048dd9 smbconf: remove python shebang from wscript_build
       via  e75a9c1 s4:lib: remove unused wscript_build file
       via  7eb8125 util: use SMB_ASSERT with panic also in non-developer builds !!!
       via  8be7e6b util: reformat the DEVELOPER definition of SMB_ASSERT
      from  c11c4df s3:smb2_ioctl: allow functions to disconnect the smb connection

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


- Log -----------------------------------------------------------------
commit 0048dd95cda1f80bbf3bac9bf50d1cc129681f49
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 11 19:13:36 2012 +0200

    smbconf: remove python shebang from wscript_build
    
    Autobuild-User: Michael Adam <obnox at samba.org>
    Autobuild-Date: Fri May 11 22:05:32 CEST 2012 on sn-devel-104

commit e75a9c1ad8d8d21f74d049ea41badef3cc859869
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 11 18:05:36 2012 +0200

    s4:lib: remove unused wscript_build file
    
    This only contains a "GENCACHE" subsystem that is not
    referenced anywhere.

commit 7eb812566832724b06760fe709de106302146068
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 11 16:42:33 2012 +0200

    util: use SMB_ASSERT with panic also in non-developer builds !!!
    
    This has been around since a long time: In non-developer builds,
    we don't panic in SMB_ASSERT but happly continue with the error
    condition, which is ridiculous and dangerous...

commit 8be7e6b7fb294bd1469a9a5a0081bcaa4f07e2f2
Author: Michael Adam <obnox at samba.org>
Date:   Fri May 11 16:41:18 2012 +0200

    util: reformat the DEVELOPER definition of SMB_ASSERT

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

Summary of changes:
 lib/smbconf/wscript_build |    2 --
 lib/util/samba_util.h     |   18 ++++++++----------
 source4/lib/wscript_build |    7 -------
 wscript_build             |    1 -
 4 files changed, 8 insertions(+), 20 deletions(-)
 delete mode 100644 source4/lib/wscript_build


Changeset truncated at 500 lines:

diff --git a/lib/smbconf/wscript_build b/lib/smbconf/wscript_build
index cf92c3b..9879624 100644
--- a/lib/smbconf/wscript_build
+++ b/lib/smbconf/wscript_build
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-
 bld.SAMBA_SUBSYSTEM('LIBSMBCONF',
                     source='smbconf.c smbconf_txt.c smbconf_util.c',
                     deps='talloc'
diff --git a/lib/util/samba_util.h b/lib/util/samba_util.h
index 6096722..f4ffe64 100644
--- a/lib/util/samba_util.h
+++ b/lib/util/samba_util.h
@@ -45,16 +45,14 @@ extern const char *panic_action;
 /**
  * assert macros 
  */
-#ifdef DEVELOPER
-#define SMB_ASSERT(b) do { if (!(b)) { \
-        DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \
-		 __FILE__, __LINE__, #b)); smb_panic("assert failed: " #b); }} while(0)
-#else
-/* redefine the assert macro for non-developer builds */
-#define SMB_ASSERT(b) do { if (!(b)) { \
-        DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \
-	    __FILE__, __LINE__, #b)); }} while (0)
-#endif
+#define SMB_ASSERT(b) \
+do { \
+	if (!(b)) { \
+		DEBUG(0,("PANIC: assert failed at %s(%d): %s\n", \
+			 __FILE__, __LINE__, #b)); \
+		smb_panic("assert failed: " #b); \
+	} \
+} while(0)
 
 #ifndef ABS
 #define ABS(a) ((a)>0?(a):(-(a)))
diff --git a/source4/lib/wscript_build b/source4/lib/wscript_build
deleted file mode 100644
index cf60820..0000000
--- a/source4/lib/wscript_build
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('GENCACHE',
-	source='../../source3/lib/gencache.c',
-        enabled=False,
-	deps='tdb-wrap'
-	)
diff --git a/wscript_build b/wscript_build
index e35ddae..0a9d697 100755
--- a/wscript_build
+++ b/wscript_build
@@ -71,7 +71,6 @@ bld.RECURSE('lib/tsocket')
 bld.RECURSE('lib/crypto')
 bld.RECURSE('lib/torture')
 bld.RECURSE('lib/zlib')
-bld.RECURSE('source4/lib')
 bld.RECURSE('source4/lib/com')
 bld.RECURSE('source4/dns_server')
 bld.RECURSE('source4/echo_server')


-- 
Samba Shared Repository