Revert "socket: introduce SELinuxLabelViaNet option"

[elogind.git] / src / core / execute.c

diff --git a/src/core/execute.c b/src/core/execute.c
index 88d094e8cc49e4efef22c3113d0b60298c1eee6f..d8452a666c490ae0b9cda8900fcbb839edd4644a 100644 (file)
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -333,7 +333,7 @@ static int setup_input(const ExecContext *context, int socket_fd, bool apply_tty
                                       i == EXEC_INPUT_TTY_FAIL,
                                       i == EXEC_INPUT_TTY_FORCE,
                                       false,
                                       i == EXEC_INPUT_TTY_FAIL,
                                       i == EXEC_INPUT_TTY_FORCE,
                                       false,

-                                      (usec_t) -1);
+                                      USEC_INFINITY);

                 if (fd < 0)
                         return fd;
 
                 if (fd < 0)
                         return fd;
 


@@ -571,7 +571,7 @@ static int ask_for_confirmation(char *response, char **argv) {
         if (!line)
                 return -ENOMEM;
 
         if (!line)
                 return -ENOMEM;
 

-        r = ask(response, "yns", "Execute %s? [Yes, No, Skip] ", line);
+        r = ask_char(response, "yns", "Execute %s? [Yes, No, Skip] ", line);

 
         restore_confirm_stdio(&saved_stdin, &saved_stdout);
 
 
         restore_confirm_stdio(&saved_stdin, &saved_stdout);
 


@@ -1464,7 +1464,7 @@ int exec_spawn(ExecCommand *command,
                                 goto fail_child;
                         }
 
                                 goto fail_child;
                         }
 

-                if (context->timer_slack_nsec != (nsec_t) -1)
+                if (context->timer_slack_nsec != NSEC_INFINITY)

                         if (prctl(PR_SET_TIMERSLACK, context->timer_slack_nsec) < 0) {
                                 err = -errno;
                                 r = EXIT_TIMERSLACK;
                         if (prctl(PR_SET_TIMERSLACK, context->timer_slack_nsec) < 0) {
                                 err = -errno;
                                 r = EXIT_TIMERSLACK;


@@ -1833,7 +1833,7 @@ void exec_context_init(ExecContext *c) {
         c->syslog_priority = LOG_DAEMON|LOG_INFO;
         c->syslog_level_prefix = true;
         c->ignore_sigpipe = true;
         c->syslog_priority = LOG_DAEMON|LOG_INFO;
         c->syslog_level_prefix = true;
         c->ignore_sigpipe = true;

-        c->timer_slack_nsec = (nsec_t) -1;
+        c->timer_slack_nsec = NSEC_INFINITY;

         c->personality = 0xffffffffUL;
         c->runtime_directory_mode = 0755;
 }
         c->personality = 0xffffffffUL;
         c->runtime_directory_mode = 0755;
 }


@@ -2177,7 +2177,7 @@ void exec_context_dump(ExecContext *c, FILE* f, const char *prefix) {
                 fputs("\n", f);
         }
 
                 fputs("\n", f);
         }
 

-        if (c->timer_slack_nsec != (nsec_t) -1)
+        if (c->timer_slack_nsec != NSEC_INFINITY)

                 fprintf(f, "%sTimerSlackNSec: "NSEC_FMT "\n", prefix, c->timer_slack_nsec);
 
         fprintf(f,
                 fprintf(f, "%sTimerSlackNSec: "NSEC_FMT "\n", prefix, c->timer_slack_nsec);
 
         fprintf(f,