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

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

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

trunk/server/source3/lib/sessionid_tdb.c

@@ -24 +24 @@
 #include "util_tdb.h"
 
+static struct db_context *session_db_ctx_ptr = NULL;
+
 static struct db_context *session_db_ctx(void)
 {
-        static struct db_context *session_db_ctx_ptr;
+        return session_db_ctx_ptr;
+}
 
-        if (session_db_ctx_ptr != NULL) {
-                return session_db_ctx_ptr;
-        }
-
+static struct db_context *session_db_ctx_init(bool readonly)
+{
         session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0,
                                      TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_INCOMPATIBLE_HASH,
-                                     O_RDWR | O_CREAT, 0644);
+                                     readonly ? O_RDONLY : O_RDWR | O_CREAT, 0644);
         return session_db_ctx_ptr;
 }
@@ -40 +41 @@
 bool sessionid_init(void)
 {
-        if (session_db_ctx() == NULL) {
+        if (session_db_ctx_init(false) == NULL) {
+                DEBUG(1,("session_init: failed to open sessionid tdb\n"));
+                return False;
+        }
+
+        return True;
+}
+
+bool sessionid_init_readonly(void)
+{
+        if (session_db_ctx_init(true) == NULL) {
                 DEBUG(1,("session_init: failed to open sessionid tdb\n"));
                 return False;