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/signal.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/signal.c')
-rw-r--r-- | source3/lib/signal.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/lib/signal.c b/source3/lib/signal.c index 99f908235c..dceb3b53bc 100644 --- a/source3/lib/signal.c +++ b/source3/lib/signal.c @@ -96,10 +96,11 @@ void BlockSignals(BOOL block,int signum) 2) The signal should be blocked during handler execution. ********************************************************************/ -void CatchSignal(int signum,void (*handler)(int )) +void (*CatchSignal(int signum,void (*handler)(int )))(int) { #ifdef HAVE_SIGACTION struct sigaction act; + struct sigaction oldact; ZERO_STRUCT(act); @@ -113,10 +114,11 @@ void CatchSignal(int signum,void (*handler)(int )) #endif sigemptyset(&act.sa_mask); sigaddset(&act.sa_mask,signum); - sigaction(signum,&act,NULL); + sigaction(signum,&act,&oldact); + return oldact.sa_handler; #else /* !HAVE_SIGACTION */ /* FIXME: need to handle sigvec and systems with broken signal() */ - signal(signum, handler); + return signal(signum, handler); #endif } |