[SCM] Samba Shared Repository - branch master updated

Stefan Metzmacher metze at samba.org
Sat Oct 22 05:16:04 MDT 2011


The branch, master has been updated
       via  6b06b0d talloc: simplifiy the logic to build talloc_testsuite in the standalone build
       via  c2b5106 lib/util: remove the "includes.h" dependeny from xfile.c
       via  b6026df lib/util: remove the "includes.h" dependeny from util_file.c
       via  fbe7ed7 dynconfig: replace #if (_SAMBA_BUILD_ >= 4) by feature tests
       via  04fd3a9 talloc/testsuite: remove #if _SAMBA_BUILD_==3
       via  061dad7 auth/gensec: replace #if _SAMBA_BUILD_ == 4 by a feature test
      from  f459318 Third part of fix for bug #8541 - readlink() on Linux clients fails if the symlink target is outside of the share.

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


- Log -----------------------------------------------------------------
commit 6b06b0d3b4971107b561a818c627a11021ef5812
Author: Stefan Metzmacher <metze at samba.org>
Date:   Sat Oct 22 09:38:22 2011 +0200

    talloc: simplifiy the logic to build talloc_testsuite in the standalone build
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Sat Oct 22 13:15:52 CEST 2011 on sn-devel-104

commit c2b5106387f2fcfa2d789f40d492d53e6c978076
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 21 13:42:34 2011 +0200

    lib/util: remove the "includes.h" dependeny from xfile.c
    
    metze

commit b6026dfa94e148b8a6b7a75ad22b5097654c4b7d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 21 13:42:34 2011 +0200

    lib/util: remove the "includes.h" dependeny from util_file.c
    
    metze

commit fbe7ed79b0f056a9a8f44a9b42e887441d2f00d5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 21 13:18:25 2011 +0200

    dynconfig: replace #if (_SAMBA_BUILD_ >= 4) by feature tests
    
    metze

commit 04fd3a9d696c4f7ada2b37297a92e25f8210211d
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 21 13:17:22 2011 +0200

    talloc/testsuite: remove #if _SAMBA_BUILD_==3
    
    We don't include "includes.h" anymore...
    
    metze

commit 061dad7727bfef1903f072fbbe97f2875428059c
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Oct 21 13:16:44 2011 +0200

    auth/gensec: replace #if _SAMBA_BUILD_ == 4 by a feature test
    
    metze

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

Summary of changes:
 auth/gensec/gensec_start.c |    2 +-
 dynconfig/dynconfig.c      |   12 ++++++++++--
 lib/talloc/testsuite.c     |    9 ---------
 lib/talloc/wscript         |   14 ++++++--------
 lib/util/util_file.c       |    9 ++++-----
 lib/util/xfile.c           |    7 ++-----
 6 files changed, 23 insertions(+), 30 deletions(-)


Changeset truncated at 500 lines:

diff --git a/auth/gensec/gensec_start.c b/auth/gensec/gensec_start.c
index d5a5dc8..c38b970 100644
--- a/auth/gensec/gensec_start.c
+++ b/auth/gensec/gensec_start.c
@@ -876,7 +876,7 @@ _PUBLIC_ NTSTATUS gensec_init(void)
 {
 	static bool initialized = false;
 #define _MODULE_PROTO(init) extern NTSTATUS init(void);
-#if _SAMBA_BUILD_ == 4
+#ifdef STATIC_gensec_MODULES
 	STATIC_gensec_MODULES_PROTO;
 	init_module_fn static_init[] = { STATIC_gensec_MODULES };
 #else
diff --git a/dynconfig/dynconfig.c b/dynconfig/dynconfig.c
index 4bcdab3..79332a2 100644
--- a/dynconfig/dynconfig.c
+++ b/dynconfig/dynconfig.c
@@ -107,11 +107,19 @@ DEFINE_DYN_CONFIG_PARAM(DATADIR)
 DEFINE_DYN_CONFIG_PARAM(SETUPDIR)
 DEFINE_DYN_CONFIG_PARAM(WINBINDD_SOCKET_DIR) /* from winbind_struct_protocol.h in s3 autoconf */
 
-/* these are not in s3 */
-#if (_SAMBA_BUILD_ >= 4)
+/* these are not used in s3 */
+#ifdef WINBINDD_PRIVILEGED_SOCKET_DIR
 DEFINE_DYN_CONFIG_PARAM(WINBINDD_PRIVILEGED_SOCKET_DIR)
+#endif
+#ifdef NTP_SIGND_SOCKET_DIR
 DEFINE_DYN_CONFIG_PARAM(NTP_SIGND_SOCKET_DIR)
+#endif
+#ifdef PYTHONDIR
 DEFINE_DYN_CONFIG_PARAM(PYTHONDIR)
+#endif
+#ifdef PYTHONARCHDIR
 DEFINE_DYN_CONFIG_PARAM(PYTHONARCHDIR)
+#endif
+#ifdef SCRIPTSBINDIR
 DEFINE_DYN_CONFIG_PARAM(SCRIPTSBINDIR)
 #endif
diff --git a/lib/talloc/testsuite.c b/lib/talloc/testsuite.c
index 003d74b..7860ad2 100644
--- a/lib/talloc/testsuite.c
+++ b/lib/talloc/testsuite.c
@@ -57,15 +57,6 @@ static double timeval_elapsed(struct timeval *tv)
 		return false; \
 	}
 
-#if _SAMBA_BUILD_==3
-#ifdef malloc
-#undef malloc
-#endif
-#ifdef strdup
-#undef strdup
-#endif
-#endif
-
 #define CHECK_SIZE(test, ptr, tsize) do { \
 	if (talloc_total_size(ptr) != (tsize)) { \
 		printf("failed: %s [\n%s: wrong '%s' tree size: got %u  expected %u\n]\n", \
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 2340152..dd83e16 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -84,6 +84,12 @@ def build(bld):
                           pc_files=[],
                           public_headers=[],
                           enabled=bld.env.TALLOC_COMPAT1)
+
+        bld.SAMBA_BINARY('talloc_testsuite',
+                         'testsuite_main.c testsuite.c',
+                         deps='talloc',
+                         install=False)
+
     else:
         private_library = True
 
@@ -121,14 +127,6 @@ def build(bld):
                          enabled=True,
                          realname='talloc.so')
 
-    if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4:
-        # s4 already has the talloc testsuite builtin to smbtorture
-        bld.SAMBA_BINARY('talloc_testsuite',
-                         'testsuite_main.c testsuite.c',
-                         deps='talloc',
-                         install=False)
-
-
 def test(ctx):
     '''run talloc testsuite'''
     import Utils, samba_utils
diff --git a/lib/util/util_file.c b/lib/util/util_file.c
index 7c00dd8..e031fc5 100644
--- a/lib/util/util_file.c
+++ b/lib/util/util_file.c
@@ -19,13 +19,12 @@
  * this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/shmem.h"
 #include "system/filesys.h"
-#if _SAMBA_BUILD_ == 3
-#undef malloc
-#undef realloc
-#endif
+#include <talloc.h>
+#include "lib/util/samba_util.h"
+#include "lib/util/debug.h"
 
 /**
  * @file
diff --git a/lib/util/xfile.c b/lib/util/xfile.c
index 16499e1..58a34bf 100644
--- a/lib/util/xfile.c
+++ b/lib/util/xfile.c
@@ -33,12 +33,9 @@
   and doesn't support O_RDWR. That keeps the code simple.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/filesys.h"
-
-#if _SAMBA_BUILD_ == 3
-#undef malloc
-#endif
+#include "lib/util/samba_util.h"
 
 #define XBUFSIZE BUFSIZ
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list