dbus: return DBUS_ERROR_UNKNOWN_OBJECT when an object is unknown

[elogind.git] / src / execute.h

diff --git a/src/execute.h b/src/execute.h
index a6766f9e995b0ed799dc9be37aefdd47636ab0f3..2856d2f33d86239117654718d76d990da201bc80 100644 (file)
--- a/src/execute.h
+++ b/src/execute.h
@@ -78,7 +78,9 @@ typedef enum ExecOutput {
         EXEC_OUTPUT_NULL,
         EXEC_OUTPUT_TTY,
         EXEC_OUTPUT_SYSLOG,
+        EXEC_OUTPUT_SYSLOG_AND_CONSOLE,
         EXEC_OUTPUT_KMSG,
+        EXEC_OUTPUT_KMSG_AND_CONSOLE,
         EXEC_OUTPUT_SOCKET,
         _EXEC_OUTPUT_MAX,
         _EXEC_OUTPUT_INVALID = -1
@@ -102,6 +104,8 @@ struct ExecCommand {
 
 struct ExecContext {
         char **environment;
+        char **environment_files;
+
         struct rlimit *rlimit[RLIMIT_NLIMITS];
         char *working_directory, *root_directory;
 
@@ -201,6 +205,8 @@ void exec_context_init(ExecContext *c);
 void exec_context_done(ExecContext *c);
 void exec_context_dump(ExecContext *c, FILE* f, const char *prefix);
 
+int exec_context_load_environment(const ExecContext *c, char ***l);
+
 void exec_status_start(ExecStatus *s, pid_t pid);
 void exec_status_exit(ExecStatus *s, pid_t pid, int code, int status, const char *utmp_id);
 void exec_status_dump(ExecStatus *s, FILE *f, const char *prefix);