source3/lib/util.c: str_checksum to use Jenkins hash from CCAN.

Rather than tdb's internal one.

diff --git a/source3/lib/util.c b/source3/lib/util.c
index d04887c854ceb231fe7b0037a3f1fd0c5a2272c5..b25c15c7a3e894f1796d24c8f46927b35cdcfe49 100644 (file)
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -28,6 +28,7 @@
 #include "ctdbd_conn.h"
 #include "../lib/util/util_pw.h"
 #include "messages.h"
+#include <ccan/hash/hash.h>
 
 /* Max allowable allococation - 256mb - 0x10000000 */
 #define MAX_ALLOC_SIZE (1024*1024*256)
@@ -1306,8 +1307,9 @@ const char *tab_depth(int level, int depth)
 
 int str_checksum(const char *s)
 {
-       TDB_DATA key = string_tdb_data(s);
-       return tdb_jenkins_hash(&key);
+       if (s == NULL)
+               return 0;
+       return hash(s, strlen(s), 0);
 }
 
 /*****************************************************************

diff --git a/source3/wscript_build b/source3/wscript_build
index 1aefad0b672a860950452c63ab75b2481108438d..0e8ec502f5f7da1d6b1a1b9c02b3a4d0bdfed92b 100755 (executable)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -800,7 +800,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA3_SUBSYSTEM('samba3core',
                    source=LIB_SRC,
-                   deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache',
+                   deps='LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray SECRETS3 dbwrap_util util_sec util_malloc memcache ccan',
                    vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('LIB_NONSMBD',