From: Guus Sliepen Date: Sat, 3 Nov 2001 22:53:02 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: release-1.0pre5~31 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=cf0e133e191cb40954bf5b6ee0a579442fe4b60b;p=tinc *** empty log message *** --- diff --git a/src/net.c b/src/net.c index 384e878b..b7d340f4 100644 --- a/src/net.c +++ b/src/net.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.35.4.146 2001/11/03 21:21:04 guus Exp $ + $Id: net.c,v 1.35.4.147 2001/11/03 22:53:01 guus Exp $ */ #include "config.h" @@ -549,7 +549,7 @@ cp asprintf(&fname, "%s/hosts/%s", confbase, c->name); if((fp = fopen(fname, "r"))) { - c->rsa_key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL); + c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL); fclose(fp); } diff --git a/src/process.c b/src/process.c index 7c8d31f6..8ca8733f 100644 --- a/src/process.c +++ b/src/process.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: process.c,v 1.1.2.31 2001/10/31 20:37:54 guus Exp $ + $Id: process.c,v 1.1.2.32 2001/11/03 22:53:02 guus Exp $ */ #include "config.h" @@ -446,7 +446,10 @@ setup_signals(void) ignored. */ for(i = 0; i < NSIG; i++) { - act.sa_sigaction = unexpected_signal_handler; + if(!do_detach) + act.sa_sigaction = SIG_DFL; + else + act.sa_sigaction = unexpected_signal_handler; sigaction(i, &act, NULL); }