Changeset 896

Timestamp:

Mar 21, 2016, 2:30:06 PM (9 years ago)

Author:

Silvan Scherrer

Message:

tdb: Ignore failed attempt to O_TRUNC the lock file.

This will happen if the file is already open by another process
that has locked some bytes and means the file is already empty.

File:

• trunk/server/lib/tdb/common/open.c (modified) (4 diffs)

trunk/server/lib/tdb/common/open.c

@@ -1 @@
- /* 
+ /*
    Unix SMB/CIFS implementation.
 
@@ -120 +120 @@
 }
 
-/* open the database, creating it if necessary 
+/* open the database, creating it if necessary
 
    The open_flags and mode are passed straight to the open call on the
@@ -126 +126 @@
    is advisory, use zero for a default value.
 
-   Return is NULL on error, in which case errno is also set.  Don't 
+   Return is NULL on error, in which case errno is also set.  Don't
    try to call tdb_error or tdb_errname, just do strerror(errno).
 
@@ -172 +172 @@
         char lock_name[_MAX_PATH + 5];
         snprintf(lock_name, sizeof(lock_name), "%s.lock", name);
+        /*
+         * First try to O_TRUNC it to make sure the file is empty (this
+         * will succeed on first open), but ignore the error that will
+         * happen if some bytes are already locked.
+         */
         tdb->lock_fd = open(lock_name, tdb->open_flags | O_CREAT | O_TRUNC, 0777);
+        if (tdb->lock_fd == -1 && errno == EACCES)
+                tdb->lock_fd = open(lock_name, tdb->open_flags | O_CREAT, 0777);
         if (tdb->lock_fd == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "os2_create_lockfile: cannot create lock file %s, errno=%d\n",