Changeset 427 for vendor/current/lib/util

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

Location:

vendor/current/lib/util

Files:

• talloc_stack.c (modified) (2 diffs)
• util_tdb.c (modified) (1 diff)
• util_tdb.h (modified) (1 diff)

vendor/current/lib/util/talloc_stack.c

@@ -104 +104 @@
                 }
                 talloc_free(ts->talloc_stack[i]);
+                ts->talloc_stack[i] = NULL;
         }
 
+        ts->talloc_stack[i] = NULL;
         ts->talloc_stacksize = i;
         return 0;
@@ -182 +184 @@
                 (struct talloc_stackframe *)SMB_THREAD_GET_TLS(global_ts);
 
-        if (ts == NULL) {
+        if (ts == NULL || ts->talloc_stacksize == 0) {
                 talloc_stackframe();
                 ts = (struct talloc_stackframe *)SMB_THREAD_GET_TLS(global_ts);

vendor/current/lib/util/util_tdb.c

@@ -39 +39 @@
 }
 
+bool tdb_data_equal(TDB_DATA t1, TDB_DATA t2)
+{
+        if (t1.dsize != t2.dsize) {
+                return false;
+        }
+        return (memcmp(t1.dptr, t2.dptr, t1.dsize) == 0);
+}
+
 TDB_DATA string_tdb_data(const char *string)
 {

vendor/current/lib/util/util_tdb.h

@@ -7 +7 @@
 ****************************************************************/
 TDB_DATA make_tdb_data(const uint8_t *dptr, size_t dsize);
+bool tdb_data_equal(TDB_DATA t1, TDB_DATA t2);
 TDB_DATA string_tdb_data(const char *string);
 TDB_DATA string_term_tdb_data(const char *string);