Index: dbfile.scm
==================================================================
--- dbfile.scm
+++ dbfile.scm
@@ -412,13 +412,22 @@
   (debug:print-info 0 *default-log-port* "Opening "dbpath"/no-sync.db")
   (let* ((dbname    (conc dbpath "/no-sync.db"))
 	 (db-exists (file-exists? dbname))
 	 (init-proc (lambda (db)
 		      (if (not db-exists)
-			  (begin
-			    (sqlite3:execute db "CREATE TABLE IF NOT EXISTS no_sync_metadat (var TEXT,val TEXT, CONSTRAINT no_sync_metadat_constraint UNIQUE (var));"))
-			  )))
+			  (for-each
+			   (lambda (stmt)
+			     (sqlite3:execute db stmt))
+			   (list
+			    "CREATE TABLE IF NOT EXISTS no_sync_metadat
+                                (var TEXT,
+                                 val TEXT,
+                                   CONSTRAINT no_sync_metadat_constraint UNIQUE (var));"
+			    "CREATE TABLE IF NOT EXISTS no_sync_locks 
+                                (key TEXT,
+                                 val TEXT,
+                                   CONSTRAINT no_sync_metadat_constraint UNIQUE (var));")))))
 	 (on-tmp      (equal? (car (string-split dbpath "/")) "tmp"))
 	 (db        (if on-tmp
 			(dbfile:cautious-open-database dbname init-proc 0 "WAL")
 			(dbfile:cautious-open-database dbname init-proc 0 #f)
 			;; (sqlite3:open-database dbname)
@@ -462,20 +471,59 @@
 			  #f)))
           (if newres
               newres
               res))
         res)))
+
+(define (db:extract-time-identifier instr)
+  (let ((tokens (string-split instr "+")))
+    (match tokens
+      ((t i)(cons (string->number t) i))
+      ((t)  (cons (string->number t) #f))
+      (else
+       (assert #f "FATAL: db:extract-time-identifier handed bad data "instr)))))
+
+;; transaction protected lock aquisition
+;; either:
+;;    fails    returns  (#f . lock-creation-time)
+;;    succeeds (returns (#t . lock-creation-time)
+;; use (db:no-sync-del! db keyname) to release the lock
+;;
+(define (db:no-sync-get-lock-with-id db keyname identifier)
+  (sqlite3:with-transaction
+   db
+   (lambda ()
+     (condition-case
+      (let* ((curr-val (db:no-sync-get/default db keyname #f)))
+	(if curr-val
+	    (match (db:extract-time-identifier curr-val)
+	       ((timestamp ident)
+		(if (equal? ident identifier)
+		    #t     ;; this *is* my lock
+		    #f))   ;; nope, not my lock
+	       (else #f))  ;; nope, not my lock
+	    (let ((lock-value (if identifier
+				  (conc (current-seconds)"+"identifier)
+				  (current-seconds))))
+	      (sqlite3:execute db "INSERT OR REPLACE INTO no_sync_metadat (var,val) VALUES(?,?);" keyname lock-value)
+	      #t)))
+      (exn (io-error)  (dbfile:print-err "ERROR: i/o error with no-sync db. Check permissions, disk space etc. and try again."))
+      (exn (corrupt)   (dbfile:print-err "ERROR: database no-sync db is corrupt. Repair it to proceed."))
+      (exn (busy)      (dbfile:print-err "ERROR: database no-sync db is locked. Try copying to another location, remove original and copy back."))
+      (exn (permission)(dbfile:print-err "ERROR: database no-sync db has some permissions problem."))
+      (exn () ;; (status done) ;; I don't know how to detect status done but no data!
+	   (dbfile:print-err "ERROR: Unknown error with database no-sync db message: exn="(condition->list exn)", \n"
+			     ((condition-property-accessor 'exn 'message) exn))
+	   #f)))))
 
 ;; transaction protected lock aquisition
 ;; either:
 ;;    fails    returns  (#f . lock-creation-time)
 ;;    succeeds (returns (#t . lock-creation-time)
 ;; use (db:no-sync-del! db keyname) to release the lock
 ;;
-;; 
-;;
-(define (db:no-sync-get-lock db keyname . identification)
+(define (db:no-sync-get-lock db keyname)
   (sqlite3:with-transaction
    db
    (lambda ()
      (condition-case
 	 (let* ((curr-val (db:no-sync-get/default db keyname #f)))

Index: tcp-transportmod.scm
==================================================================
--- tcp-transportmod.scm
+++ tcp-transportmod.scm
@@ -395,15 +395,14 @@
 		       ((null? servers) #f) ;; not ok
 		       ((equal? (list-ref (car servers) 6) ;; compare the servinfofile
 				(tt-servinf-file ttdat))
 			(let* ((res (if db-locked-in
 					#t
-					(let* ((lockinfo  (dbfile:with-no-sync-db
-							   nosyncdbpath
-							   (lambda (db)
-							     (db:no-sync-get-lock db dbfname))))
-					       (success   (car lockinfo)))
+					(let* ((success (dbfile:with-no-sync-db
+							 nosyncdbpath
+							 (lambda (db)
+							   (db:no-sync-get-lock-with-id db dbfname (tt-servinf-file ttdat))))))
 					  (if success
 					      (begin
 						(tt-state-set! ttdat 'running)
 						(debug:print 0 *default-log-port* "Got server lock for "
 							     dbfname)