projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Write pidfile AFTER detaching...
[tinc]
/
src
/
process.c
diff --git
a/src/process.c
b/src/process.c
index
eb066ab
..
29e49fa
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.
7 2000/11/20 23:29:47
guus Exp $
+ $Id: process.c,v 1.1.2.
10 2000/11/22 19:14:08
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-145,12
+145,12
@@
int detach(void)
cp
setup_signals();
cp
setup_signals();
- if(write_pidfile())
- return -1;
-
if(do_detach)
daemon(0, 0);
if(do_detach)
daemon(0, 0);
+ if(write_pidfile())
+ return -1;
+
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
if(debug_lvl > DEBUG_NOTHING)
openlog(identname, LOG_CONS | LOG_PID, LOG_DAEMON);
if(debug_lvl > DEBUG_NOTHING)
@@
-174,6
+174,8
@@
void _execute_script(const char *name)
int error = 0;
char *scriptname;
char *s;
int error = 0;
char *scriptname;
char *s;
+ int fd;
+
cp
if(netname)
{
cp
if(netname)
{
@@
-207,14
+209,20
@@
cp
fcloseall();
/* Open standard input */
fcloseall();
/* Open standard input */
- if(
open("/dev/null", O_RDONLY
) < 0)
+ if(
(fd = open("/dev/null", O_RDONLY)
) < 0)
{
syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
error = 1;
}
{
syslog(LOG_ERR, _("Opening `/dev/null' failed: %m"));
error = 1;
}
+ if(dup2(fd, 0) != 0)
+ {
+ syslog(LOG_ERR, _("Couldn't assign /dev/null to standard input: %m"));
+ error = 1;
+ }
if(!error)
{
if(!error)
{
+ close(1); /* fd #1 should be the first available filedescriptor now. */
/* Standard output directly goes to syslog */
openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
/* Standard error as well */
/* Standard output directly goes to syslog */
openlog(name, LOG_CONS | LOG_PID, LOG_DAEMON);
/* Standard error as well */