-/*
- * Copyright (C) 1995-2008, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2012 Index Data
* See the file LICENSE for details.
- *
- * $Id: daemon.c,v 1.3 2008-02-21 10:18:15 adam Exp $
*/
/**
#include <unistd.h>
#endif
#include <stdlib.h>
-#include <signal.h>
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
#endif
#include <fcntl.h>
#include <pwd.h>
#endif
+#if HAVE_SYS_PRCTL_H
+#include <sys/prctl.h>
+#endif
+
#include <yaz/daemon.h>
#include <yaz/log.h>
#include <yaz/snprintf.h>
yaz_log(YLOG_FATAL|YLOG_ERRNO, "ftruncate");
exit(1);
}
- if (write(pid_fd, buf, strlen(buf)) != strlen(buf))
+ if (write(pid_fd, buf, strlen(buf)) != (int) strlen(buf))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "write");
exit(1);
int cont = 1;
void (*old_sighup)(int);
void (*old_sigterm)(int);
+ void (*old_sigusr1)(int);
/* keep signals in their original state and make sure that some signals
to parent process also gets sent to the child..
*/
old_sighup = signal(SIGHUP, kill_child_handler);
old_sigterm = signal(SIGTERM, kill_child_handler);
+ old_sigusr1 = signal(SIGUSR1, kill_child_handler);
while (cont)
{
pid_t p = fork();
/* child */
signal(SIGHUP, old_sighup); /* restore */
signal(SIGTERM, old_sigterm);/* restore */
+ signal(SIGUSR1, old_sigusr1);/* restore */
work(data);
exit(0);
yaz_log(YLOG_FATAL|YLOG_ERRNO, "setuid");
exit(1);
}
+ /* Linux don't produce core dumps evern if the limit is right and
+ files are writable.. This fixes this. See prctl(2) */
+#if HAVE_SYS_PRCTL_H
+#ifdef PR_SET_DUMPABLE
+ prctl(PR_SET_DUMPABLE, 1, 0, 0);
+#endif
+#endif
}
if (flags & YAZ_DAEMON_FORK)
close(1);
close(2);
open("/dev/null", O_RDWR);
- dup(0); dup(0);
+ if (dup(0) == -1)
+ return 1;
+ if (dup(0) == -1)
+ return 1;
close(hand[1]);
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+