projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e5047d2
)
*** empty log message ***
author
Guus Sliepen
<guus@tinc-vpn.org>
Sat, 3 Nov 2001 22:53:02 +0000
(22:53 +0000)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sat, 3 Nov 2001 22:53:02 +0000
(22:53 +0000)
src/net.c
patch
|
blob
|
history
src/process.c
patch
|
blob
|
history
diff --git
a/src/net.c
b/src/net.c
index 384e878b9e96b7982e8dda33a51ce59a96a108b0..b7d340f4c099710a1a911b77492e21bc5709dd63 100644
(file)
--- 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.
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.14
6 2001/11/03 21:21:04
guus Exp $
+ $Id: net.c,v 1.35.4.14
7 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);
if((fp = fopen(fname, "r")))
{
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);
}
fclose(fp);
}
diff --git
a/src/process.c
b/src/process.c
index 7c8d31f6a236e999be33960288be2eabde7b2e25..8ca8733f72c74f8c619b1c9906c5801d83e029fd 100644
(file)
--- 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.
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.3
1 2001/10/31 20:37:54
guus Exp $
+ $Id: process.c,v 1.1.2.3
2 2001/11/03 22:53:02
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-446,7
+446,10
@@
setup_signals(void)
ignored. */
for(i = 0; i < NSIG; i++)
{
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);
}
sigaction(i, &act, NULL);
}