[SCM] Samba Shared Repository - branch master updated

Matthieu Patou mat at samba.org
Wed Mar 14 01:32:03 MDT 2012


The branch, master has been updated
       via  442f1c8 autoconf: make autoconf build work on OS X 10.6
       via  b68f72c lib/crypto: Detect CommonCrypto and use it if available
      from  6dea4f2 lib/tdb2: make summary handle capabilities properly.

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


- Log -----------------------------------------------------------------
commit 442f1c81df3c4d530457d44ef25c80c295982b33
Author: Matthieu Patou <mat at matws.net>
Date:   Mon Mar 12 22:49:32 2012 -0700

    autoconf: make autoconf build work on OS X 10.6
    
    Autobuild-User: Matthieu Patou <mat at samba.org>
    Autobuild-Date: Wed Mar 14 08:31:19 CET 2012 on sn-devel-104

commit b68f72c7f58c05870100d0d993c9baf0fa80a891
Author: Matthieu Patou <mat at matws.net>
Date:   Mon Mar 12 16:21:28 2012 -0700

    lib/crypto: Detect CommonCrypto and use it if available
    
    CommonCrypto/CommonDigest is available on Mac and there is function in
    the libc for MD5 calculation. MD5Final is a C define of CC_MD5_Final.
    Under some circumstance we have the symbol defined twice in samba
    binaries on Snow Leopard at least.
    
    By detecting CommonCrypto/CommonDigest we end up always using the system
    version if available.

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

Summary of changes:
 lib/crypto/md5.h             |   12 ++++++++++++
 lib/crypto/wscript_build     |    2 +-
 lib/crypto/wscript_configure |    2 ++
 source3/Makefile.in          |    2 +-
 source3/configure.in         |   11 +++++++++--
 5 files changed, 25 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/crypto/md5.h b/lib/crypto/md5.h
index bcdf50c..388cdf8 100644
--- a/lib/crypto/md5.h
+++ b/lib/crypto/md5.h
@@ -10,6 +10,16 @@
 /* Try to avoid clashes with BSD MD5 implementation */
 #include <bsd/md5.h>
 #else
+/* Try to use CommonCrypto on Mac as otherwise we can get MD5Final twice */
+#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H
+#include <CommonCrypto/CommonDigest.h>
+
+#define MD5Init(c)					CC_MD5_Init(c)
+#define MD5Update(c,d,l)			CC_MD5_Update(c,d,l)
+#define MD5Final(m, c)				CC_MD5_Final((unsigned char *)m,c)
+#define MD5Context CC_MD5state_st
+
+#else
 typedef struct MD5Context {
 	uint32_t buf[4];
 	uint32_t bits[2];
@@ -22,6 +32,8 @@ void MD5Init(MD5_CTX *context);
 void MD5Update(MD5_CTX *context, const uint8_t *buf,
 	       size_t len);
 void MD5Final(uint8_t digest[MD5_DIGEST_LENGTH], MD5_CTX *context);
+#endif /* HAVE_COMMONCRYPTO_COMMONDIGEST_H */
+
 #endif /* HAVE_BSD_MD5_H */
 
 #endif /* !MD5_H */
diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
index f502698..849bf16 100644
--- a/lib/crypto/wscript_build
+++ b/lib/crypto/wscript_build
@@ -4,7 +4,7 @@ extra_source = ''
 extra_deps = ''
 if bld.CONFIG_SET('HAVE_BSD_MD5_H'):
 	extra_deps += ' bsd'
-else:
+elif not bld.CONFIG_SET('HAVE_COMMONCRYPTO_COMMONDIGEST_H'):
 	extra_source += ' md5.c'
 
 bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
diff --git a/lib/crypto/wscript_configure b/lib/crypto/wscript_configure
index 77d21e9..5fc00fb 100644
--- a/lib/crypto/wscript_configure
+++ b/lib/crypto/wscript_configure
@@ -1,2 +1,4 @@
 conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h',
     checklibc=True)
+conf.CHECK_FUNCS_IN('CC_MD5_Init', '', headers='CommonCrypto/CommonDigest.h',
+    checklibc=True)
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 5fcf859..acd47b7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -422,7 +422,7 @@ UTIL_OBJ = ../lib/util/rbtree.o ../lib/util/signal.o ../lib/util/time.o \
 		   ../lib/util/blocking.o ../lib/util/rfc1738.o \
 		   ../lib/util/select.o ../lib/util/util_pw.o ../lib/util/server_id.o
 
-CRYPTO_OBJ = ../lib/crypto/crc32.o ../lib/crypto/md5.o \
+CRYPTO_OBJ = ../lib/crypto/crc32.o @CRYPTO_MD5_OBJ@ \
 			 ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
 			 ../lib/crypto/md4.o \
 			 ../lib/crypto/sha256.o ../lib/crypto/hmacsha256.o \
diff --git a/source3/configure.in b/source3/configure.in
index 3736dcb..611e1d8 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -750,12 +750,19 @@ AC_CHECK_HEADERS(xfs/libxfs.h)
 AC_CHECK_HEADERS(netgroup.h)
 AC_CHECK_HEADERS(linux/falloc.h)
 AC_CHECK_HEADERS(sys/uuid.h)
+AC_CHECK_HEADERS(CommonCrypto/CommonDigest.h)
 
 AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
 #if HAVE_RPC_RPC_H
 #include <rpc/rpc.h>
 #endif
 ]])
+CRYPTO_MD5_OBJ=
+if test "x$ac_cv_header_CommonCrypto_CommonDigest_h" != "xyes"
+then
+	CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
+fi
+AC_SUBST(CRYPTO_MD5_OBJ)
 
 ## These fail to compile on IRIX so just check for their presence
 AC_CHECK_HEADERS(sys/mode.h,,,)
@@ -767,9 +774,9 @@ AC_CHECK_HEADERS([CoreFoundation/CFStringEncodingConverter.h], [], [AC_CHECK_HEA
 CPPFLAGS="$old_CPPFLAGS"
 
 # To link lib/util/charset/charset_macosxfs.c, we need to tell the linker
-# about CoreFoundation
+# about CoreFoundation, at least on os X 10.6 and 10.7
 case "$host_os" in
-    *darwin11*)
+    *darwin11*|*darwin10*)
 		LDFLAGS="$LDFLAGS -framework CoreFoundation"
 	;;
 esac


-- 
Samba Shared Repository


More information about the samba-cvs mailing list