diff options
| author | Jeremy Allison <jra@samba.org> | 2002-06-13 22:49:13 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-06-13 22:49:13 +0000 |
| commit | d179b191794c06626375692ea81c1931db57f550 (patch) | |
| tree | d3b2b2a25d01a7a4c085c5ef8fa24031e62dc03d /source3/lib/messages.c | |
| parent | 824375e310b5af41a12443aace9ab18c5a2ff647 (diff) | |
| download | samba-d179b191794c06626375692ea81c1931db57f550.tar.gz samba-d179b191794c06626375692ea81c1931db57f550.tar.bz2 samba-d179b191794c06626375692ea81c1931db57f550.zip | |
Ensure we save any older SIGALRM signal handler.
Jeremy.
(This used to be commit aa0a6f5532a2689409426eef9a4b66a28fb97635)
Diffstat (limited to 'source3/lib/messages.c')
| -rw-r--r-- | source3/lib/messages.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 3929f526dc..5d861b485c 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -475,6 +475,7 @@ BOOL message_named_mutex(char *name, unsigned int timeout) { TDB_DATA key; int ret; + void (*oldsig_handler)(int); if (!message_init()) return False; @@ -484,7 +485,7 @@ BOOL message_named_mutex(char *name, unsigned int timeout) if (timeout) { gotalarm = 0; - CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig); + oldsig_handler = CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig); alarm(timeout); } @@ -492,7 +493,7 @@ BOOL message_named_mutex(char *name, unsigned int timeout) if (timeout) { alarm(0); - CatchSignal(SIGALRM, SIGNAL_CAST SIG_IGN); + CatchSignal(SIGALRM, SIGNAL_CAST oldsig_handler); if (gotalarm) return False; } |