| config.h | | config.h | |
| | | | |
| skipping to change at line 58 | | skipping to change at line 58 | |
| | | | |
| /* Define to 1 if you have the <security/pam_modules.h> header file. */ | | /* Define to 1 if you have the <security/pam_modules.h> header file. */ | |
| #define HAVE_SECURITY_PAM_MODULES_H 1 | | #define HAVE_SECURITY_PAM_MODULES_H 1 | |
| | | | |
| /* Define to 1 if you have the <security/pam_modutil.h> header file. */ | | /* Define to 1 if you have the <security/pam_modutil.h> header file. */ | |
| #define HAVE_SECURITY_PAM_MODUTIL_H 1 | | #define HAVE_SECURITY_PAM_MODUTIL_H 1 | |
| | | | |
| /* Define if SELinux is available */ | | /* Define if SELinux is available */ | |
| #define HAVE_SELINUX 1 | | #define HAVE_SELINUX 1 | |
| | | | |
|
| | | /* Define if /bin, /sbin aren't symlinks into /usr */ | |
| | | /* #undef HAVE_SPLIT_USR */ | |
| | | | |
| /* Define to 1 if you have the <stdint.h> header file. */ | | /* Define to 1 if you have the <stdint.h> header file. */ | |
| #define HAVE_STDINT_H 1 | | #define HAVE_STDINT_H 1 | |
| | | | |
| /* Define to 1 if you have the <stdlib.h> header file. */ | | /* Define to 1 if you have the <stdlib.h> header file. */ | |
| #define HAVE_STDLIB_H 1 | | #define HAVE_STDLIB_H 1 | |
| | | | |
| /* Define to 1 if you have the <strings.h> header file. */ | | /* Define to 1 if you have the <strings.h> header file. */ | |
| #define HAVE_STRINGS_H 1 | | #define HAVE_STRINGS_H 1 | |
| | | | |
| /* Define to 1 if you have the <string.h> header file. */ | | /* Define to 1 if you have the <string.h> header file. */ | |
| | | | |
| skipping to change at line 108 | | skipping to change at line 111 | |
| /* Name of package */ | | /* Name of package */ | |
| #define PACKAGE "systemd" | | #define PACKAGE "systemd" | |
| | | | |
| /* Define to the address where bug reports for this package should be sent.
*/ | | /* Define to the address where bug reports for this package should be sent.
*/ | |
| #define PACKAGE_BUGREPORT "systemd-devel@lists.freedesktop.org" | | #define PACKAGE_BUGREPORT "systemd-devel@lists.freedesktop.org" | |
| | | | |
| /* Define to the full name of this package. */ | | /* Define to the full name of this package. */ | |
| #define PACKAGE_NAME "systemd" | | #define PACKAGE_NAME "systemd" | |
| | | | |
| /* Define to the full name and version of this package. */ | | /* Define to the full name and version of this package. */ | |
|
| #define PACKAGE_STRING "systemd 40" | | #define PACKAGE_STRING "systemd 41" | |
| | | | |
| /* Define to the one symbol short name of this package. */ | | /* Define to the one symbol short name of this package. */ | |
| #define PACKAGE_TARNAME "systemd" | | #define PACKAGE_TARNAME "systemd" | |
| | | | |
| /* Define to the home page for this package. */ | | /* Define to the home page for this package. */ | |
| #define PACKAGE_URL "" | | #define PACKAGE_URL "" | |
| | | | |
| /* Define to the version of this package. */ | | /* Define to the version of this package. */ | |
|
| #define PACKAGE_VERSION "40" | | #define PACKAGE_VERSION "41" | |
| | | | |
| /* Define to 1 if you have the ANSI C header files. */ | | /* Define to 1 if you have the ANSI C header files. */ | |
| #define STDC_HEADERS 1 | | #define STDC_HEADERS 1 | |
| | | | |
| /* Target is ALTLinux */ | | /* Target is ALTLinux */ | |
| /* #undef TARGET_ALTLINUX */ | | /* #undef TARGET_ALTLINUX */ | |
| | | | |
| /* Target is Ångström */ | | /* Target is Ångström */ | |
| /* #undef TARGET_ANGSTROM */ | | /* #undef TARGET_ANGSTROM */ | |
| | | | |
| | | | |
| skipping to change at line 186 | | skipping to change at line 189 | |
| /* Enable extensions on HP NonStop. */ | | /* Enable extensions on HP NonStop. */ | |
| #ifndef _TANDEM_SOURCE | | #ifndef _TANDEM_SOURCE | |
| # define _TANDEM_SOURCE 1 | | # define _TANDEM_SOURCE 1 | |
| #endif | | #endif | |
| /* Enable general extensions on Solaris. */ | | /* Enable general extensions on Solaris. */ | |
| #ifndef __EXTENSIONS__ | | #ifndef __EXTENSIONS__ | |
| # define __EXTENSIONS__ 1 | | # define __EXTENSIONS__ 1 | |
| #endif | | #endif | |
| | | | |
| /* Version number of package */ | | /* Version number of package */ | |
|
| #define VERSION "40" | | #define VERSION "41" | |
| | | | |
| /* Number of bits in a file offset, on hosts where this is settable. */ | | /* Number of bits in a file offset, on hosts where this is settable. */ | |
| #define _FILE_OFFSET_BITS 64 | | #define _FILE_OFFSET_BITS 64 | |
| | | | |
| /* Define for large files, on AIX-style hosts. */ | | /* Define for large files, on AIX-style hosts. */ | |
| /* #undef _LARGE_FILES */ | | /* #undef _LARGE_FILES */ | |
| | | | |
| /* Define to 1 if on MINIX. */ | | /* Define to 1 if on MINIX. */ | |
| /* #undef _MINIX */ | | /* #undef _MINIX */ | |
| | | | |
| | | | |
End of changes. 4 change blocks. |
| 3 lines changed or deleted | | 6 lines changed or added | |
|
| dbus-execute.h | | dbus-execute.h | |
| | | | |
| skipping to change at line 98 | | skipping to change at line 98 | |
| " <property name=\"ReadOnlyDirectories\" type=\"as\" access=\"read
\"/>\n" \ | | " <property name=\"ReadOnlyDirectories\" type=\"as\" access=\"read
\"/>\n" \ | |
| " <property name=\"InaccessibleDirectories\" type=\"as\" access=\"
read\"/>\n" \ | | " <property name=\"InaccessibleDirectories\" type=\"as\" access=\"
read\"/>\n" \ | |
| " <property name=\"MountFlags\" type=\"t\" access=\"read\"/>\n" \ | | " <property name=\"MountFlags\" type=\"t\" access=\"read\"/>\n" \ | |
| " <property name=\"PrivateTmp\" type=\"b\" access=\"read\"/>\n" \ | | " <property name=\"PrivateTmp\" type=\"b\" access=\"read\"/>\n" \ | |
| " <property name=\"SameProcessGroup\" type=\"b\" access=\"read\"/>
\n" \ | | " <property name=\"SameProcessGroup\" type=\"b\" access=\"read\"/>
\n" \ | |
| " <property name=\"KillMode\" type=\"s\" access=\"read\"/>\n" \ | | " <property name=\"KillMode\" type=\"s\" access=\"read\"/>\n" \ | |
| " <property name=\"KillSignal\" type=\"i\" access=\"read\"/>\n" \ | | " <property name=\"KillSignal\" type=\"i\" access=\"read\"/>\n" \ | |
| " <property name=\"UtmpIdentifier\" type=\"s\" access=\"read\"/>\n
" \ | | " <property name=\"UtmpIdentifier\" type=\"s\" access=\"read\"/>\n
" \ | |
| " <property name=\"ControlGroupModify\" type=\"b\" access=\"read\"
/>\n" \ | | " <property name=\"ControlGroupModify\" type=\"b\" access=\"read\"
/>\n" \ | |
| " <property name=\"ControlGroupPersistent\" type=\"b\" access=\"re
ad\"/>\n" \ | | " <property name=\"ControlGroupPersistent\" type=\"b\" access=\"re
ad\"/>\n" \ | |
|
| " <property name=\"PrivateNetwork\" type=\"b\" access=\"read\"/>\n | | " <property name=\"PrivateNetwork\" type=\"b\" access=\"read\"/>\n | |
| " | | " \ | |
| | | " <property name=\"IgnoreSIGPIPE\" type=\"b\" access=\"read\"/>\n" | |
| | | | |
| #define BUS_EXEC_COMMAND_INTERFACE(name) \ | | #define BUS_EXEC_COMMAND_INTERFACE(name) \ | |
| " <property name=\"" name "\" type=\"a(sasbttuii)\" access=\"read\
"/>\n" | | " <property name=\"" name "\" type=\"a(sasbttuii)\" access=\"read\
"/>\n" | |
| | | | |
| extern const BusProperty bus_exec_context_properties[]; | | extern const BusProperty bus_exec_context_properties[]; | |
| | | | |
| #define BUS_EXEC_COMMAND_PROPERTY(name, command, indirect) \ | | #define BUS_EXEC_COMMAND_PROPERTY(name, command, indirect) \ | |
| { name, bus_execute_append_command, "a(sasbttttuii)", (command), (i
ndirect), NULL } | | { name, bus_execute_append_command, "a(sasbttttuii)", (command), (i
ndirect), NULL } | |
| | | | |
| int bus_execute_append_output(DBusMessageIter *i, const char *property, voi
d *data); | | int bus_execute_append_output(DBusMessageIter *i, const char *property, voi
d *data); | |
| | | | |
End of changes. 1 change blocks. |
| 2 lines changed or deleted | | 3 lines changed or added | |
|
| service.h | | service.h | |
| | | | |
| skipping to change at line 98 | | skipping to change at line 98 | |
| _NOTIFY_ACCESS_INVALID = -1 | | _NOTIFY_ACCESS_INVALID = -1 | |
| } NotifyAccess; | | } NotifyAccess; | |
| | | | |
| typedef enum ServiceResult { | | typedef enum ServiceResult { | |
| SERVICE_SUCCESS, | | SERVICE_SUCCESS, | |
| SERVICE_FAILURE_RESOURCES, | | SERVICE_FAILURE_RESOURCES, | |
| SERVICE_FAILURE_TIMEOUT, | | SERVICE_FAILURE_TIMEOUT, | |
| SERVICE_FAILURE_EXIT_CODE, | | SERVICE_FAILURE_EXIT_CODE, | |
| SERVICE_FAILURE_SIGNAL, | | SERVICE_FAILURE_SIGNAL, | |
| SERVICE_FAILURE_CORE_DUMP, | | SERVICE_FAILURE_CORE_DUMP, | |
|
| | | SERVICE_FAILURE_WATCHDOG, | |
| _SERVICE_RESULT_MAX, | | _SERVICE_RESULT_MAX, | |
| _SERVICE_RESULT_INVALID = -1 | | _SERVICE_RESULT_INVALID = -1 | |
| } ServiceResult; | | } ServiceResult; | |
| | | | |
| struct Service { | | struct Service { | |
| Unit meta; | | Unit meta; | |
| | | | |
| ServiceType type; | | ServiceType type; | |
| ServiceRestart restart; | | ServiceRestart restart; | |
| | | | |
| /* If set we'll read the main daemon PID from this file */ | | /* If set we'll read the main daemon PID from this file */ | |
| char *pid_file; | | char *pid_file; | |
| | | | |
| usec_t restart_usec; | | usec_t restart_usec; | |
| usec_t timeout_usec; | | usec_t timeout_usec; | |
| | | | |
| dual_timestamp watchdog_timestamp; | | dual_timestamp watchdog_timestamp; | |
|
| | | usec_t watchdog_usec; | |
| | | Watch watchdog_watch; | |
| | | | |
| ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX]; | | ExecCommand* exec_command[_SERVICE_EXEC_COMMAND_MAX]; | |
| ExecContext exec_context; | | ExecContext exec_context; | |
| | | | |
| ServiceState state, deserialized_state; | | ServiceState state, deserialized_state; | |
| | | | |
| /* The exit status of the real main process */ | | /* The exit status of the real main process */ | |
| ExecStatus main_exec_status; | | ExecStatus main_exec_status; | |
| | | | |
| /* The currently executed control process */ | | /* The currently executed control process */ | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|