j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

*** empty log message ***

Browse source
This commit is contained in:
Guus Sliepen 2001-11-03 22:53:02 +00:00
parent e5047d2835
commit cf0e133e19
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/net.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"
@ -549,7 +549,7 @@ cp
asprintf(&fname, "%s/hosts/%s", confbase, c->name); asprintf(&fname, "%s/hosts/%s", confbase, c->name);
if((fp = fopen(fname, "r"))) 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); fclose(fp);
} }

5
src/process.c
View file

@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 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" #include "config.h"
@ -446,6 +446,9 @@ setup_signals(void)
ignored. */ ignored. */
for(i = 0; i < NSIG; i++) for(i = 0; i < NSIG; i++)
{ {
if(!do_detach)
act.sa_sigaction = SIG_DFL;
else
act.sa_sigaction = unexpected_signal_handler; act.sa_sigaction = unexpected_signal_handler;
sigaction(i, &act, NULL); sigaction(i, &act, NULL);
} }