projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add SOLR material for ZOOM and yaz-client
[yaz-moved-to-github.git]
/
src
/
daemon.c
diff --git
a/src/daemon.c
b/src/daemon.c
index
53dc766
..
69c2330
100644
(file)
--- 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-2010 Index Data
* See the file LICENSE for details.
* 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 <unistd.h>
#endif
#include <stdlib.h>
#include <unistd.h>
#endif
#include <stdlib.h>
-#include <signal.h>
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
#include <sys/types.h>
-
-#if HAVE_SYS_STAT_H
-#include <sys/stat.h>
#endif
#include <fcntl.h>
#endif
#include <fcntl.h>
@@
-38,6
+33,10
@@
#include <pwd.h>
#endif
#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>
#include <yaz/daemon.h>
#include <yaz/log.h>
#include <yaz/snprintf.h>
@@
-54,7
+53,7
@@
static void write_pidfile(int pid_fd)
yaz_log(YLOG_FATAL|YLOG_ERRNO, "ftruncate");
exit(1);
}
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);
{
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);
}
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)
}
if (flags & YAZ_DAEMON_FORK)
@@
-248,7
+254,10
@@
int yaz_daemon(const char *progname,
close(1);
close(2);
open("/dev/null", O_RDWR);
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]);
}
close(hand[1]);
}
@@
-272,7
+281,9
@@
int yaz_daemon(const char *progname,
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+