summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorPavel Březina <pbrezina@redhat.com>2012-10-18 10:16:06 +0200
committerJakub Hrozek <jhrozek@redhat.com>2012-11-06 12:02:45 +0100
commit715e09ece039af851b96bcf1861c4fff6169d499 (patch)
tree9abe9ea33beb1e0e251c079372c385fd249f0a62 /src/util
parente02ec7366b7ab4c1eae82fdaca8bbe136bde36c0 (diff)
downloadsssd-715e09ece039af851b96bcf1861c4fff6169d499.tar.gz
sssd-715e09ece039af851b96bcf1861c4fff6169d499.tar.bz2
sssd-715e09ece039af851b96bcf1861c4fff6169d499.zip
exit original process after sssd is initialized
https://fedorahosted.org/sssd/ticket/1357 Neither systemd or our init script use pid file as a notification that sssd is finished initializing. They will continue starting up next service right after the original (not daemonized) sssd process is terminated. If any of the responders fail to start, we will never terminate the original process via signal and "service sssd start" will hang. Thus we take this as an error and terminate the daemon with a non-zero value. This will also terminate the original process and init script or systemd will print failure.
Diffstat (limited to 'src/util')
-rw-r--r--src/util/server.c31
-rw-r--r--src/util/util.h1
2 files changed, 30 insertions, 2 deletions
diff --git a/src/util/server.c b/src/util/server.c
index ccb3f3be..3dc9bcc0 100644
--- a/src/util/server.c
+++ b/src/util/server.c
@@ -24,6 +24,7 @@
*/
#include <sys/types.h>
+#include <sys/wait.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <unistd.h>
@@ -67,17 +68,42 @@ static void close_low_fds(void)
#endif
}
+static void deamon_parent_sigterm(int sig)
+{
+ _exit(0);
+}
+
/**
Become a daemon, discarding the controlling terminal.
**/
void become_daemon(bool Fork)
{
+ pid_t pid;
+ int status;
int ret;
if (Fork) {
- if (fork()) {
- _exit(0);
+ pid = fork();
+ if (pid != 0) {
+ /* Terminate parent process on demand so we can hold systemd
+ * or initd from starting next service until sssd in initialized.
+ * We use signals directly here because we don't have a tevent
+ * context yet. */
+ CatchSignal(SIGTERM, deamon_parent_sigterm);
+
+ /* or exit when sssd monitor is terminated */
+ waitpid(pid, &status, 0);
+
+ /* return error if we didn't exited normally */
+ ret = 1;
+
+ if (WIFEXITED(status)) {
+ /* but return our exit code otherwise */
+ ret = WEXITSTATUS(status);
+ }
+
+ _exit(ret);
}
}
@@ -434,6 +460,7 @@ int server_setup(const char *name, int flags,
return ENOMEM;
}
+ ctx->parent_pid = getppid();
ctx->event_ctx = event_ctx;
conf_db = talloc_asprintf(ctx, "%s/%s", DB_PATH, CONFDB_FILE);
diff --git a/src/util/util.h b/src/util/util.h
index 61e1b139..de9e6b89 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -364,6 +364,7 @@ void sss_log(int priority, const char *format, ...);
struct main_context {
struct tevent_context *event_ctx;
struct confdb_ctx *confdb_ctx;
+ pid_t parent_pid;
};
int die_if_parent_died(void);