| config.h | | config.h | |
| | | | |
| skipping to change at line 40 | | skipping to change at line 40 | |
| | | | |
| /* Define to 1 if you have the <libaudit.h> header file. */ | | /* Define to 1 if you have the <libaudit.h> header file. */ | |
| #define HAVE_LIBAUDIT_H 1 | | #define HAVE_LIBAUDIT_H 1 | |
| | | | |
| /* Define if libcryptsetup is available */ | | /* Define if libcryptsetup is available */ | |
| #define HAVE_LIBCRYPTSETUP 1 | | #define HAVE_LIBCRYPTSETUP 1 | |
| | | | |
| /* Have tcpwrap? */ | | /* Have tcpwrap? */ | |
| #define HAVE_LIBWRAP /**/ | | #define HAVE_LIBWRAP /**/ | |
| | | | |
|
| | | /* Logind support available */ | |
| | | #define HAVE_LOGIND 1 | |
| | | | |
| /* Define to 1 if you have the <memory.h> header file. */ | | /* Define to 1 if you have the <memory.h> header file. */ | |
| #define HAVE_MEMORY_H 1 | | #define HAVE_MEMORY_H 1 | |
| | | | |
| /* PAM available */ | | /* PAM available */ | |
| #define HAVE_PAM 1 | | #define HAVE_PAM 1 | |
| | | | |
| /* Define to 1 if you have the <security/pam_ext.h> header file. */ | | /* Define to 1 if you have the <security/pam_ext.h> header file. */ | |
| #define HAVE_SECURITY_PAM_EXT_H 1 | | #define HAVE_SECURITY_PAM_EXT_H 1 | |
| | | | |
| /* 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. */ | |
| | | | |
| skipping to change at line 111 | | skipping to change at line 114 | |
| /* 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 43" | | #define PACKAGE_STRING "systemd 44" | |
| | | | |
| /* 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 "43" | | #define PACKAGE_VERSION "44" | |
| | | | |
| /* 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 189 | | skipping to change at line 192 | |
| /* 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 "43" | | #define VERSION "44" | |
| | | | |
| /* 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 | |
|
| journal-file.h | | journal-file.h | |
| | | | |
| skipping to change at line 92 | | skipping to change at line 92 | |
| } JournalFile; | | } JournalFile; | |
| | | | |
| typedef enum direction { | | typedef enum direction { | |
| DIRECTION_UP, | | DIRECTION_UP, | |
| DIRECTION_DOWN | | DIRECTION_DOWN | |
| } direction_t; | | } direction_t; | |
| | | | |
| int journal_file_open(const char *fname, int flags, mode_t mode, JournalFil
e *template, JournalFile **ret); | | int journal_file_open(const char *fname, int flags, mode_t mode, JournalFil
e *template, JournalFile **ret); | |
| void journal_file_close(JournalFile *j); | | void journal_file_close(JournalFile *j); | |
| | | | |
|
| | | int journal_file_open_reliably(const char *fname, int flags, mode_t mode, J | |
| | | ournalFile *template, JournalFile **ret); | |
| | | | |
| int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset,
Object **ret); | | int journal_file_move_to_object(JournalFile *f, int type, uint64_t offset,
Object **ret); | |
| | | | |
| uint64_t journal_file_entry_n_items(Object *o); | | uint64_t journal_file_entry_n_items(Object *o); | |
| | | | |
| int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, con
st struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, u
int64_t *offset); | | int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, con
st struct iovec iovec[], unsigned n_iovec, uint64_t *seqno, Object **ret, u
int64_t *offset); | |
| | | | |
| int journal_file_find_data_object(JournalFile *f, const void *data, uint64_
t size, Object **ret, uint64_t *offset); | | int journal_file_find_data_object(JournalFile *f, const void *data, uint64_
t size, Object **ret, uint64_t *offset); | |
| int journal_file_find_data_object_with_hash(JournalFile *f, const void *dat
a, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset); | | int journal_file_find_data_object_with_hash(JournalFile *f, const void *dat
a, uint64_t size, uint64_t hash, Object **ret, uint64_t *offset); | |
| | | | |
| int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, directio
n_t direction, Object **ret, uint64_t *offset); | | int journal_file_next_entry(JournalFile *f, Object *o, uint64_t p, directio
n_t direction, Object **ret, uint64_t *offset); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 3 lines changed or added | |
|
| log.h | | log.h | |
| | | | |
| skipping to change at line 27 | | skipping to change at line 27 | |
| WITHOUT ANY WARRANTY; without even the implied warranty of | | WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| General Public License for more details. | | General Public License for more details. | |
| | | | |
| You should have received a copy of the GNU General Public License | | You should have received a copy of the GNU General Public License | |
| along with systemd; If not, see <http://www.gnu.org/licenses/>. | | along with systemd; If not, see <http://www.gnu.org/licenses/>. | |
| ***/ | | ***/ | |
| | | | |
| #include <syslog.h> | | #include <syslog.h> | |
| #include <stdbool.h> | | #include <stdbool.h> | |
|
| | | #include <stdarg.h> | |
| | | | |
| #include "macro.h" | | #include "macro.h" | |
| | | | |
| typedef enum LogTarget{ | | typedef enum LogTarget{ | |
| LOG_TARGET_CONSOLE, | | LOG_TARGET_CONSOLE, | |
| LOG_TARGET_KMSG, | | LOG_TARGET_KMSG, | |
| LOG_TARGET_JOURNAL, | | LOG_TARGET_JOURNAL, | |
| LOG_TARGET_JOURNAL_OR_KMSG, | | LOG_TARGET_JOURNAL_OR_KMSG, | |
| LOG_TARGET_SYSLOG, | | LOG_TARGET_SYSLOG, | |
| LOG_TARGET_SYSLOG_OR_KMSG, | | LOG_TARGET_SYSLOG_OR_KMSG, | |
| | | | |
| skipping to change at line 76 | | skipping to change at line 77 | |
| | | | |
| void log_parse_environment(void); | | void log_parse_environment(void); | |
| | | | |
| int log_meta( | | int log_meta( | |
| int level, | | int level, | |
| const char*file, | | const char*file, | |
| int line, | | int line, | |
| const char *func, | | const char *func, | |
| const char *format, ...) _printf_attr_(5,6); | | const char *format, ...) _printf_attr_(5,6); | |
| | | | |
|
| | | int log_metav( | |
| | | int level, | |
| | | const char*file, | |
| | | int line, | |
| | | const char *func, | |
| | | const char *format, | |
| | | va_list ap); | |
| | | | |
| _noreturn_ void log_assert_failed(const char *text, const char *file, int l
ine, const char *func); | | _noreturn_ void log_assert_failed(const char *text, const char *file, int l
ine, const char *func); | |
| _noreturn_ void log_assert_failed_unreachable(const char *text, const char
*file, int line, const char *func); | | _noreturn_ void log_assert_failed_unreachable(const char *text, const char
*file, int line, const char *func); | |
| | | | |
| /* This modifies the buffer passed! */ | | /* This modifies the buffer passed! */ | |
| int log_dump_internal( | | int log_dump_internal( | |
| int level, | | int level, | |
| const char*file, | | const char*file, | |
| int line, | | int line, | |
| const char *func, | | const char *func, | |
| char *buffer); | | char *buffer); | |
| | | | |
End of changes. 2 change blocks. |
| 0 lines changed or deleted | | 9 lines changed or added | |
|
| macro.h | | macro.h | |
| | | | |
| skipping to change at line 26 | | skipping to change at line 26 | |
| systemd is distributed in the hope that it will be useful, but | | systemd is distributed in the hope that it will be useful, but | |
| WITHOUT ANY WARRANTY; without even the implied warranty of | | WITHOUT ANY WARRANTY; without even the implied warranty of | |
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| General Public License for more details. | | General Public License for more details. | |
| | | | |
| You should have received a copy of the GNU General Public License | | You should have received a copy of the GNU General Public License | |
| along with systemd; If not, see <http://www.gnu.org/licenses/>. | | along with systemd; If not, see <http://www.gnu.org/licenses/>. | |
| ***/ | | ***/ | |
| | | | |
| #include <assert.h> | | #include <assert.h> | |
|
| | | #include <sys/param.h> | |
| #include <sys/types.h> | | #include <sys/types.h> | |
| #include <sys/uio.h> | | #include <sys/uio.h> | |
| #include <inttypes.h> | | #include <inttypes.h> | |
| | | | |
| #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b))) | | #define _printf_attr_(a,b) __attribute__ ((format (printf, a, b))) | |
| #define _sentinel_ __attribute__ ((sentinel)) | | #define _sentinel_ __attribute__ ((sentinel)) | |
| #define _noreturn_ __attribute__((noreturn)) | | #define _noreturn_ __attribute__((noreturn)) | |
| #define _unused_ __attribute__ ((unused)) | | #define _unused_ __attribute__ ((unused)) | |
| #define _destructor_ __attribute__ ((destructor)) | | #define _destructor_ __attribute__ ((destructor)) | |
| #define _pure_ __attribute__ ((pure)) | | #define _pure_ __attribute__ ((pure)) | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| sd-login.h | | sd-login.h | |
| | | | |
| skipping to change at line 97 | | skipping to change at line 97 | |
| /* Determine seat of session */ | | /* Determine seat of session */ | |
| int sd_session_get_seat(const char *session, char **seat); | | int sd_session_get_seat(const char *session, char **seat); | |
| | | | |
| /* Determine the (PAM) service name this session was registered by. */ | | /* Determine the (PAM) service name this session was registered by. */ | |
| int sd_session_get_service(const char *session, char **service); | | int sd_session_get_service(const char *session, char **service); | |
| | | | |
| /* Determine the type of this session, i.e. one of "tty", "x11" or "unspeci
fied". */ | | /* Determine the type of this session, i.e. one of "tty", "x11" or "unspeci
fied". */ | |
| int sd_session_get_type(const char *session, char **type); | | int sd_session_get_type(const char *session, char **type); | |
| | | | |
| /* Determine the class of this session, i.e. one of "user", "greeter" or "l
ock-screen". */ | | /* Determine the class of this session, i.e. one of "user", "greeter" or "l
ock-screen". */ | |
|
| int sd_session_get_class(const char *session, char **class); | | int sd_session_get_class(const char *session, char **clazz); | |
| | | | |
| /* Determine the X11 display of this session. */ | | /* Determine the X11 display of this session. */ | |
| int sd_session_get_display(const char *session, char **display); | | int sd_session_get_display(const char *session, char **display); | |
| | | | |
| /* Return active session and user of seat */ | | /* Return active session and user of seat */ | |
| int sd_seat_get_active(const char *seat, char **session, uid_t *uid); | | int sd_seat_get_active(const char *seat, char **session, uid_t *uid); | |
| | | | |
| /* Return sessions and users on seat. Returns number of sessions as | | /* Return sessions and users on seat. Returns number of sessions as | |
| * return value. If sessions is NULL returns only the number of | | * return value. If sessions is NULL returns only the number of | |
| * sessions. */ | | * sessions. */ | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| socket.h | | socket.h | |
| | | | |
| skipping to change at line 75 | | skipping to change at line 75 | |
| _SOCKET_FIFO_INVALID = -1 | | _SOCKET_FIFO_INVALID = -1 | |
| } SocketType; | | } SocketType; | |
| | | | |
| typedef enum SocketResult { | | typedef enum SocketResult { | |
| SOCKET_SUCCESS, | | SOCKET_SUCCESS, | |
| SOCKET_FAILURE_RESOURCES, | | SOCKET_FAILURE_RESOURCES, | |
| SOCKET_FAILURE_TIMEOUT, | | SOCKET_FAILURE_TIMEOUT, | |
| SOCKET_FAILURE_EXIT_CODE, | | SOCKET_FAILURE_EXIT_CODE, | |
| SOCKET_FAILURE_SIGNAL, | | SOCKET_FAILURE_SIGNAL, | |
| SOCKET_FAILURE_CORE_DUMP, | | SOCKET_FAILURE_CORE_DUMP, | |
|
| | | SOCKET_FAILURE_SERVICE_FAILED_PERMANENT, | |
| _SOCKET_RESULT_MAX, | | _SOCKET_RESULT_MAX, | |
| _SOCKET_RESULT_INVALID = -1 | | _SOCKET_RESULT_INVALID = -1 | |
| } SocketResult; | | } SocketResult; | |
| | | | |
| typedef struct SocketPort { | | typedef struct SocketPort { | |
| SocketType type; | | SocketType type; | |
| int fd; | | int fd; | |
| | | | |
| SocketAddress address; | | SocketAddress address; | |
| char *path; | | char *path; | |
| | | | |
| skipping to change at line 131 | | skipping to change at line 132 | |
| SocketResult result; | | SocketResult result; | |
| | | | |
| bool accept; | | bool accept; | |
| | | | |
| /* Socket options */ | | /* Socket options */ | |
| bool keep_alive; | | bool keep_alive; | |
| bool free_bind; | | bool free_bind; | |
| bool transparent; | | bool transparent; | |
| bool broadcast; | | bool broadcast; | |
| bool pass_cred; | | bool pass_cred; | |
|
| | | bool pass_sec; | |
| int priority; | | int priority; | |
| int mark; | | int mark; | |
| size_t receive_buffer; | | size_t receive_buffer; | |
| size_t send_buffer; | | size_t send_buffer; | |
| int ip_tos; | | int ip_tos; | |
| int ip_ttl; | | int ip_ttl; | |
| size_t pipe_size; | | size_t pipe_size; | |
| char *bind_to_device; | | char *bind_to_device; | |
| char *tcp_congestion; | | char *tcp_congestion; | |
| long mq_maxmsg; | | long mq_maxmsg; | |
| long mq_msgsize; | | long mq_msgsize; | |
| | | | |
| /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */ | | /* Only for INET6 sockets: issue IPV6_V6ONLY sockopt */ | |
| SocketAddressBindIPv6Only bind_ipv6_only; | | SocketAddressBindIPv6Only bind_ipv6_only; | |
| }; | | }; | |
| | | | |
| /* Called from the service code when collecting fds */ | | /* Called from the service code when collecting fds */ | |
| int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds); | | int socket_collect_fds(Socket *s, int **fds, unsigned *n_fds); | |
| | | | |
| /* Called from the service when it shut down */ | | /* Called from the service when it shut down */ | |
|
| void socket_notify_service_dead(Socket *s); | | void socket_notify_service_dead(Socket *s, bool failed_permanent); | |
| | | | |
| /* Called from the mount code figure out if a mount is a dependency of | | /* Called from the mount code figure out if a mount is a dependency of | |
| * any of the sockets of this socket */ | | * any of the sockets of this socket */ | |
| int socket_add_one_mount_link(Socket *s, Mount *m); | | int socket_add_one_mount_link(Socket *s, Mount *m); | |
| | | | |
| /* Called from the service code when a per-connection service ended */ | | /* Called from the service code when a per-connection service ended */ | |
| void socket_connection_unref(Socket *s); | | void socket_connection_unref(Socket *s); | |
| | | | |
| extern const UnitVTable socket_vtable; | | extern const UnitVTable socket_vtable; | |
| | | | |
| | | | |
End of changes. 3 change blocks. |
| 1 lines changed or deleted | | 3 lines changed or added | |
|
| util.h | | util.h | |
| | | | |
| skipping to change at line 469 | | skipping to change at line 469 | |
| | | | |
| int audit_session_from_pid(pid_t pid, uint32_t *id); | | int audit_session_from_pid(pid_t pid, uint32_t *id); | |
| int audit_loginuid_from_pid(pid_t pid, uid_t *uid); | | int audit_loginuid_from_pid(pid_t pid, uid_t *uid); | |
| | | | |
| bool display_is_local(const char *display); | | bool display_is_local(const char *display); | |
| int socket_from_display(const char *display, char **path); | | int socket_from_display(const char *display, char **path); | |
| | | | |
| int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const cha
r **home); | | int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const cha
r **home); | |
| int get_group_creds(const char **groupname, gid_t *gid); | | int get_group_creds(const char **groupname, gid_t *gid); | |
| | | | |
|
| | | int in_group(const char *name); | |
| | | | |
| int glob_exists(const char *path); | | int glob_exists(const char *path); | |
| | | | |
| int dirent_ensure_type(DIR *d, struct dirent *de); | | int dirent_ensure_type(DIR *d, struct dirent *de); | |
| | | | |
| int in_search_path(const char *path, char **search); | | int in_search_path(const char *path, char **search); | |
| int get_files_in_directory(const char *path, char ***list); | | int get_files_in_directory(const char *path, char ***list); | |
| | | | |
| char *join(const char *x, ...) _sentinel_; | | char *join(const char *x, ...) _sentinel_; | |
| | | | |
| bool is_main_thread(void); | | bool is_main_thread(void); | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 2 lines changed or added | |
|