Changeset 223 for branches/samba-3.3.x/source/lib/dbwrap.c

Timestamp:

May 24, 2009, 7:51:24 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.3

File:

• branches/samba-3.3.x/source/lib/dbwrap.c (modified) (2 diffs)

branches/samba-3.3.x/source/lib/dbwrap.c

@@ -43 +43 @@
 }
 
+/*
+ * Fall back using fetch if no genuine parse operation is provided
+ */
+
+static int dbwrap_fallback_parse_record(struct db_context *db, TDB_DATA key,
+                                        int (*parser)(TDB_DATA key,
+                                                      TDB_DATA data,
+                                                      void *private_data),
+                                        void *private_data)
+{
+        TDB_DATA data;
+        int res;
+
+        res = db->fetch(db, talloc_tos(), key, &data);
+        if (res != 0) {
+                return res;
+        }
+
+        res = parser(key, data, private_data);
+        TALLOC_FREE(data.dptr);
+        return res;
+}
+
+bool db_is_local(const char *name)
+{
+#ifdef CLUSTER_SUPPORT
+        const char *sockname = lp_ctdbd_socket();
+
+        if(!sockname || !*sockname) {
+                sockname = CTDB_PATH;
+        }
+
+        if (lp_clustering() && socket_exist(sockname)) {
+                const char *partname;
+                /* ctdb only wants the file part of the name */
+                partname = strrchr(name, '/');
+                if (partname) {
+                        partname++;
+                } else {
+                        partname = name;
+                }
+                /* allow ctdb for individual databases to be disabled */
+                if (lp_parm_bool(-1, "ctdb", partname, True)) {
+                        return false;
+                }
+        }
+#endif
+        return true;
+}
+
 /**
  * open a database
@@ -102 +152 @@
                 result->fetch = dbwrap_fallback_fetch;
         }
+        if ((result != NULL) && (result->parse_record == NULL)) {
+                result->parse_record = dbwrap_fallback_parse_record;
+        }
 
         return result;