Changeset 862 for trunk/server/source3/lib/serverid.c

Timestamp:

May 13, 2014, 11:39:04 AM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/serverid.c (modified) (2 diffs)

trunk/server/source3/lib/serverid.c

@@ -35 +35 @@
 };
 
+
+
+
+
+
+
+
+
+
+
+
+
 bool serverid_parent_init(TALLOC_CTX *mem_ctx)
 {
-        struct tdb_wrap *db;
-
         /*
          * Open the tdb in the parent process (smbd) so that our
@@ -45 +55 @@
          */
 
-        db = tdb_wrap_open(mem_ctx, lock_path("serverid.tdb"),
-                           0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT,
-                           0644);
-        if (db == NULL) {
+        if (serverid_init(mem_ctx, false) == NULL) {
                 DEBUG(1, ("could not open serverid.tdb: %s\n",
                           strerror(errno)));
                 return false;
         }
+
         return true;
 }
 
+
+
+
+
+
+
+
+
+
+
+
 static struct db_context *serverid_db(void)
 {
-        static struct db_context *db;
-
-        if (db != NULL) {
-                return db;
-        }
-        db = db_open(NULL, lock_path("serverid.tdb"), 0,
-                     TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, 0644);
-        return db;
+        if (db_ptr != NULL) {
+                return db_ptr;
+        }
+
+        return serverid_init(NULL, false);
 }