summaryrefslogtreecommitdiff
path: root/source3/lib/replace
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-11-06 21:47:57 -0800
committerJeremy Allison <jra@samba.org>2007-11-06 21:47:57 -0800
commitd8f3c9d0786ff637241d2a9409e1c7c253715ba5 (patch)
tree7fe843ce0e72d348e6114af9626d41c29419c1c0 /source3/lib/replace
parent7498e1b8c09abef2db0658c6bfd6d42891c9690d (diff)
downloadsamba-d8f3c9d0786ff637241d2a9409e1c7c253715ba5.tar.gz
samba-d8f3c9d0786ff637241d2a9409e1c7c253715ba5.tar.bz2
samba-d8f3c9d0786ff637241d2a9409e1c7c253715ba5.zip
Fix bug where tdb lock call interrupted with
an alarm sig would not terminate and could lead to runaway smbd processes. Thanks to Dave Daugherty @ Centrify for pointing this out to us. Jeremy. (This used to be commit ef8da1698371c95495add53df81a978df709c88d)
Diffstat (limited to 'source3/lib/replace')
-rw-r--r--source3/lib/replace/replace.h4
-rw-r--r--source3/lib/replace/system/wait.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h
index e42d5ff168..55ed2e9570 100644
--- a/source3/lib/replace/replace.h
+++ b/source3/lib/replace/replace.h
@@ -452,6 +452,10 @@ typedef int bool;
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif
+#if !defined(HAVE_VOLATILE)
+#define volatile
+#endif
+
/**
this is a warning hack. The idea is to use this everywhere that we
get the "discarding const" warning from gcc. That doesn't actually
diff --git a/source3/lib/replace/system/wait.h b/source3/lib/replace/system/wait.h
index de94cf09d5..5784b1ae92 100644
--- a/source3/lib/replace/system/wait.h
+++ b/source3/lib/replace/system/wait.h
@@ -48,4 +48,8 @@
#define SA_RESETHAND SA_ONESHOT
#endif
+#if !defined(HAVE_SIG_ATOMIC_T_TYPE)
+typedef int sig_atomic_t;
+#endif
+
#endif