X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fdaemon.c;h=838a808a86b8fb19315a1f1eb0c2be126b4a68dd;hp=53dc766c84110ab28ac035107e03e383c89e7cd5;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=cd5dfe9bb7b6a784a5591d659881a3c6fb428512 diff --git a/src/daemon.c b/src/daemon.c index 53dc766..838a808 100644 --- a/src/daemon.c +++ b/src/daemon.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2008, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. - * - * $Id: daemon.c,v 1.3 2008-02-21 10:18:15 adam Exp $ */ /** @@ -21,15 +19,12 @@ #include #endif #include -#include #if HAVE_SYS_WAIT_H #include #endif +#if HAVE_SYS_TYPES_H #include - -#if HAVE_SYS_STAT_H -#include #endif #include @@ -38,6 +33,10 @@ #include #endif +#if HAVE_SYS_PRCTL_H +#include +#endif + #include #include #include @@ -54,7 +53,7 @@ static void write_pidfile(int pid_fd) 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); @@ -204,6 +203,13 @@ int yaz_daemon(const char *progname, 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) @@ -248,7 +254,10 @@ int yaz_daemon(const char *progname, 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]); } @@ -272,7 +281,9 @@ int yaz_daemon(const char *progname, /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +