X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.h;h=eb44a43895709a4592fd3e407944197254ce59a9;hb=50caaedb2c416c8972f9b2f835a69a20c524e81e;hp=f01906cad47126fa73e1c3c5760868f72528dfb4;hpb=fdf20a316035779bbec469e11d73c7544acbf30f;p=elogind.git

diff --git a/src/service.h b/src/service.h
index f01906cad..eb44a4389 100644
--- a/src/service.h
+++ b/src/service.h
@@ -48,8 +48,10 @@ typedef enum ServiceState {
 } ServiceState;
 
 typedef enum ServiceRestart {
-        SERVICE_ONCE,
+        SERVICE_RESTART_NO,
         SERVICE_RESTART_ON_SUCCESS,
+        SERVICE_RESTART_ON_FAILURE,
+        SERVICE_RESTART_ON_ABORT,
         SERVICE_RESTART_ALWAYS,
         _SERVICE_RESTART_MAX,
         _SERVICE_RESTART_INVALID = -1
@@ -106,6 +108,7 @@ struct Service {
         ExecCommand *control_command;
         ServiceExecCommand control_command_id;
         pid_t main_pid, control_pid;
+        int socket_fd;
 
         bool permissions_start_only;
         bool root_directory_start_only;
@@ -117,14 +120,14 @@ struct Service {
         bool bus_name_good:1;
         bool forbid_restart:1;
         bool got_socket_fd:1;
+#ifdef HAVE_SYSV_COMPAT
         bool sysv_has_lsb:1;
         bool sysv_enabled:1;
-
-        int socket_fd;
         int sysv_start_priority;
 
         char *sysv_path;
         char *sysv_runlevels;
+#endif
 
         char *bus_name;
 
@@ -132,7 +135,8 @@ struct Service {
 
         RateLimit ratelimit;
 
-        struct Socket *socket;
+        struct Socket *accept_socket;
+        Set *configured_sockets;
 
         Watch timer_watch;