7 files changed, 0 insertions, 24 deletions
diff --git a/source3/tdb/spinlock.c b/source3/tdb/spinlock.c
index 2370ce3bdd..74472854cf 100644
--- a/source3/tdb/spinlock.c
+++ b/source3/tdb/spinlock.c
@@ -30,7 +30,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <time.h>
-#include <signal.h>
 #include "tdb.h"
 #include "spinlock.h"
 
diff --git a/source3/tdb/tdb.c b/source3/tdb/tdb.c
index 5bb75ffe07..ed75a55e3e 100644
--- a/source3/tdb/tdb.c
+++ b/source3/tdb/tdb.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
-#include <signal.h>
 #include "tdb.h"
 #include "spinlock.h"
 #else
@@ -161,18 +160,6 @@ struct list_struct {
 	*/
 };
 
-/***************************************************************
- Allow a caller to set a "alarm" flag that tdb can check to abort
- a blocking lock on SIGALRM.
-***************************************************************/
-
-static sig_atomic_t *palarm_fired;
-
-void tdb_set_lock_alarm(sig_atomic_t *palarm)
-{
-	palarm_fired = palarm;
-}
-
 /* a byte range locking function - return 0 on success
    this functions locks/unlocks 1 byte at the specified offset.
 
@@ -199,8 +186,6 @@ static int tdb_brlock(TDB_CONTEXT *tdb, tdb_off offset,
 
 	do {
 		ret = fcntl(tdb->fd,lck_type,&fl);
-		if (ret == -1 && errno == EINTR && palarm_fired && *palarm_fired)
-			break;
 	} while (ret == -1 && errno == EINTR);
 
 	if (ret == -1) {
@@ -532,20 +517,17 @@ int tdb_printfreelist(TDB_CONTEXT *tdb)
 
 	/* read in the freelist top */
 	if (ofs_read(tdb, offset, &rec_ptr) == -1) {
-		tdb_unlock(tdb, -1, F_WRLCK);
 		return 0;
 	}
 
 	printf("freelist top=[0x%08x]\n", rec_ptr );
 	while (rec_ptr) {
 		if (tdb_read(tdb, rec_ptr, (char *)&rec, sizeof(rec), DOCONV()) == -1) {
-			tdb_unlock(tdb, -1, F_WRLCK);
 			return -1;
 		}
 
 		if (rec.magic != TDB_FREE_MAGIC) {
 			printf("bad magic 0x%08x in free list\n", rec.magic);
-			tdb_unlock(tdb, -1, F_WRLCK);
 			return -1;
 		}
 
diff --git a/source3/tdb/tdb.h b/source3/tdb/tdb.h
index 42b88aeb16..8cc908703f 100644
--- a/source3/tdb/tdb.h
+++ b/source3/tdb/tdb.h
@@ -126,7 +126,6 @@ int tdb_lockall(TDB_CONTEXT *tdb);
 void tdb_unlockall(TDB_CONTEXT *tdb);
 
 /* Low level locking functions: use with care */
-void tdb_set_lock_alarm(sig_atomic_t *palarm);
 int tdb_chainlock(TDB_CONTEXT *tdb, TDB_DATA key);
 int tdb_chainunlock(TDB_CONTEXT *tdb, TDB_DATA key);
 
diff --git a/source3/tdb/tdbbackup.c b/source3/tdb/tdbbackup.c
index 36ba7db918..f59f98a90f 100644
--- a/source3/tdb/tdbbackup.c
+++ b/source3/tdb/tdbbackup.c
@@ -53,7 +53,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <ctype.h>
-#include <signal.h>
 #include "tdb.h"
 
 static int failed;
diff --git a/source3/tdb/tdbdump.c b/source3/tdb/tdbdump.c
index 9c1dc2761b..6664213209 100644
--- a/source3/tdb/tdbdump.c
+++ b/source3/tdb/tdbdump.c
@@ -30,7 +30,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <ctype.h>
-#include <signal.h>
 #include "tdb.h"
 
 static void print_data(TDB_DATA d)
diff --git a/source3/tdb/tdbtest.c b/source3/tdb/tdbtest.c
index 89295a3291..0741073ce1 100644
--- a/source3/tdb/tdbtest.c
+++ b/source3/tdb/tdbtest.c
@@ -8,7 +8,6 @@
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <signal.h>
 #include "tdb.h"
 #include <gdbm.h>
 
diff --git a/source3/tdb/tdbtool.c b/source3/tdb/tdbtool.c
index f529c6e6ee..ba0fb48957 100644
--- a/source3/tdb/tdbtool.c
+++ b/source3/tdb/tdbtool.c
@@ -33,7 +33,6 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <ctype.h>
-#include <signal.h>
 #include "tdb.h"
 
 /* a tdb tool for manipulating a tdb database */