[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  8ea2b5d s3: Fix "make bin/smbtorture4" in the autoconf build
       via  c17d03f heimdal: Fix the build on FreeBSD
      from  1c2aacd Add open_dir_with_privilege() to ensure we're opening the correct directory when doing backup requests.

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


- Log -----------------------------------------------------------------
commit 8ea2b5da0c9a8a2bb4e1c93d96d1d7c500ab88b8
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 1 02:58:28 2012 +0100

    s3: Fix "make bin/smbtorture4" in the autoconf build
    
    tdb2 support does not work with a system-supplied libtdb yet
    
    Autobuild-User: Volker Lendecke <vl at samba.org>
    Autobuild-Date: Thu Mar  1 05:23:57 CET 2012 on sn-devel-104

commit c17d03f82339141c2942f7bc271424864c01af1a
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Mar 1 02:56:10 2012 +0100

    heimdal: Fix the build on FreeBSD
    
    We don't have BACKTRACE_SYMBOLS by default

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

Summary of changes:
 source3/Makefile-smbtorture4    |    2 +-
 source4/heimdal/lib/krb5/misc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile-smbtorture4 b/source3/Makefile-smbtorture4
index 0dc4706..57fff2b 100644
--- a/source3/Makefile-smbtorture4
+++ b/source3/Makefile-smbtorture4
@@ -6,7 +6,7 @@ SAMBA4_BINARIES="smbtorture,ndrdump"
 samba4-configure:
 	@(cd .. && \
 		CFLAGS='' $(WAF) reconfigure || \
-		CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-developer)
+		CFLAGS='' $(WAF) configure --enable-socket-wrapper --enable-nss-wrapper --enable-uid-wrapper --nonshared-binary=$(SAMBA4_BINARIES) --enable-auto-reconfigure --enable-developer --disable-tdb2)
 
 .PHONY: samba4-configure
 
diff --git a/source4/heimdal/lib/krb5/misc.c b/source4/heimdal/lib/krb5/misc.c
index ac6720c..39a3282 100644
--- a/source4/heimdal/lib/krb5/misc.c
+++ b/source4/heimdal/lib/krb5/misc.c
@@ -96,7 +96,7 @@ krb5_enomem(krb5_context context)
 void
 _krb5_debug_backtrace(krb5_context context)
 {
-#if defined(HAVE_BACKTRACE) && !defined(HEIMDAL_SMALLER)
+#if defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS) && !defined(HEIMDAL_SMALLER)
     void *stack[128];
     char **strs = NULL;
     int i, frames = backtrace(stack, sizeof(stack) / sizeof(stack[0]));


-- 
Samba Shared Repository