X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.h;h=0ddaaa4c2def37d33f99983ac4808b0613f580f5;hb=36adffeab07c74470bc96417b17a72b53055ee42;hp=7b85771a30fb9911672ad2e172e32942e31ddad6;hpb=c952c6ece28b6c0f774f823c917f458fe3424993;p=elogind.git

diff --git a/src/service.h b/src/service.h
index 7b85771a3..0ddaaa4c2 100644
--- a/src/service.h
+++ b/src/service.h
@@ -90,8 +90,6 @@ struct Service {
         ServiceType type;
         ServiceRestart restart;
 
-        NotifyAccess notify_access;
-
         /* If set we'll read the main daemon PID from this file */
         char *pid_file;
 
@@ -101,19 +99,18 @@ struct Service {
         ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX];
         ExecContext exec_context;
 
-        bool permissions_start_only;
-        bool root_directory_start_only;
-        bool valid_no_process;
-
         ServiceState state, deserialized_state;
 
-        KillMode kill_mode;
-
         ExecStatus main_exec_status;
 
         ExecCommand *control_command;
         ServiceExecCommand control_command_id;
         pid_t main_pid, control_pid;
+
+        bool permissions_start_only;
+        bool root_directory_start_only;
+        bool valid_no_process;
+
         bool main_pid_known:1;
 
         /* If we shut down, remember why */
@@ -126,8 +123,11 @@ struct Service {
         bool got_socket_fd:1;
 
         bool sysv_has_lsb:1;
-        char *sysv_path;
+
+        int socket_fd;
         int sysv_start_priority;
+
+        char *sysv_path;
         char *sysv_runlevels;
 
         char *bus_name;
@@ -136,14 +136,16 @@ struct Service {
 
         RateLimit ratelimit;
 
-        int socket_fd;
+        struct Socket *socket;
 
         Watch timer_watch;
+
+        NotifyAccess notify_access;
 };
 
 extern const UnitVTable service_vtable;
 
-int service_set_socket_fd(Service *s, int fd);
+int service_set_socket_fd(Service *s, int fd, struct Socket *socket);
 
 const char* service_state_to_string(ServiceState i);
 ServiceState service_state_from_string(const char *s);