audit.h   audit.h 
skipping to change at line 25 skipping to change at line 25
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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License You should have received a copy of the GNU Lesser 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 <sys/types.h>
#include "capability.h" #include "capability.h"
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);
#endif #endif
 End of changes. 2 change blocks. 
0 lines changed or deleted 3 lines changed or added


 config.h   config.h 
skipping to change at line 146 skipping to change at line 146
/* 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 "http://bugs.freedesktop.org/enter_bug.cgi?produc t=systemd" #define PACKAGE_BUGREPORT "http://bugs.freedesktop.org/enter_bug.cgi?produc t=systemd"
/* 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 193" #define PACKAGE_STRING "systemd 194"
/* 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 "http://www.freedesktop.org/wiki/Software/systemd" #define PACKAGE_URL "http://www.freedesktop.org/wiki/Software/systemd"
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "193" #define PACKAGE_VERSION "194"
/* 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 221 skipping to change at line 221
/* 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 "193" #define VERSION "194"
/* Enable large inode numbers on Mac OS X 10.5. */ /* Enable large inode numbers on Mac OS X 10.5. */
#ifndef _DARWIN_USE_64_BIT_INODE #ifndef _DARWIN_USE_64_BIT_INODE
# define _DARWIN_USE_64_BIT_INODE 1 # define _DARWIN_USE_64_BIT_INODE 1
#endif #endif
/* 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. */
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 dbus-common.h   dbus-common.h 
skipping to change at line 217 skipping to change at line 217
bool bus_error_is_no_service(const DBusError *error); bool bus_error_is_no_service(const DBusError *error);
int bus_method_call_with_reply(DBusConnection *bus, int bus_method_call_with_reply(DBusConnection *bus,
const char *destination, const char *destination,
const char *path, const char *path,
const char *interface, const char *interface,
const char *method, const char *method,
DBusMessage **return_reply, DBusMessage **return_reply,
DBusError *return_error, DBusError *return_error,
int first_arg_type, ...); int first_arg_type, ...);
void dbus_message_unref_p(DBusMessage **reply); const char *bus_message_get_sender_with_fallback(DBusMessage *m);
#define _cleanup_dbus_msg_unref_ __attribute__((cleanup(dbus_message_unref_
p))) void bus_message_unrefp(DBusMessage **reply);
#define _cleanup_dbus_message_unref_ __attribute__((cleanup(bus_message_unr
efp)))
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 dbus-unit.h   dbus-unit.h 
skipping to change at line 136 skipping to change at line 136
#define BUS_UNIT_INTERFACES_LIST \ #define BUS_UNIT_INTERFACES_LIST \
BUS_GENERIC_INTERFACES_LIST \ BUS_GENERIC_INTERFACES_LIST \
"org.freedesktop.systemd1.Unit\0" "org.freedesktop.systemd1.Unit\0"
extern const BusProperty bus_unit_properties[]; extern const BusProperty bus_unit_properties[];
void bus_unit_send_change_signal(Unit *u); void bus_unit_send_change_signal(Unit *u);
void bus_unit_send_removed_signal(Unit *u); void bus_unit_send_removed_signal(Unit *u);
DBusHandlerResult bus_unit_queue_job(
DBusConnection *connection,
DBusMessage *message,
Unit *u,
JobType type,
JobMode mode,
bool reload_if_possible);
extern const DBusObjectPathVTable bus_unit_vtable; extern const DBusObjectPathVTable bus_unit_vtable;
extern const char bus_unit_interface[]; extern const char bus_unit_interface[];
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 manager.h   manager.h 
skipping to change at line 203 skipping to change at line 203
char *cgroup_hierarchy; char *cgroup_hierarchy;
usec_t gc_queue_timestamp; usec_t gc_queue_timestamp;
int gc_marker; int gc_marker;
unsigned n_in_gc_queue; unsigned n_in_gc_queue;
/* Make sure the user cannot accidentally unmount our cgroup /* Make sure the user cannot accidentally unmount our cgroup
* file system */ * file system */
int pin_cgroupfs_fd; int pin_cgroupfs_fd;
/* Audit fd */
#ifdef HAVE_AUDIT
int audit_fd;
#endif
/* Flags */ /* Flags */
SystemdRunningAs running_as; SystemdRunningAs running_as;
ManagerExitCode exit_code:5; ManagerExitCode exit_code:5;
bool dispatching_load_queue:1; bool dispatching_load_queue:1;
bool dispatching_run_queue:1; bool dispatching_run_queue:1;
bool dispatching_dbus_queue:1; bool dispatching_dbus_queue:1;
bool taint_usr:1; bool taint_usr:1;
 End of changes. 1 change blocks. 
5 lines changed or deleted 0 lines changed or added


 selinux-access.h   selinux-access.h 
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#ifndef selinuxaccesshfoo #pragma once
#define selinuxaccesshfoo
/*** /***
This file is part of systemd. This file is part of systemd.
Copyright 2012 Dan Walsh Copyright 2012 Dan Walsh
systemd is free software; you can redistribute it and/or modify it systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
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/>.
***/ ***/
void selinux_access_finish(void); #include <dbus.h>
int selinux_manager_access_check(DBusConnection *connection, DBusMessage *m
essage, Manager *m, DBusError *error); void selinux_access_free(void);
int selinux_unit_access_check(DBusConnection *connection, DBusMessage *mess
age, Manager *m, const char *path, DBusError *error); int selinux_access_check(DBusConnection *connection, DBusMessage *message,
const char *path, const char *permission, DBusError *error);
#ifdef HAVE_SELINUX
#define SELINUX_ACCESS_CHECK(connection, message, permission) \
do { \
DBusError _error; \
int _r; \
DBusConnection *_c = (connection); \
DBusMessage *_m = (message); \
dbus_error_init(&_error); \
_r = selinux_access_check(_c, _m, NULL, (permission), &_err
or); \
if (_r < 0) \
return bus_send_error_reply(_c, _m, &_error, _r); \
} while (false)
#define SELINUX_UNIT_ACCESS_CHECK(unit, connection, message, permission) \
do { \
DBusError _error; \
int _r; \
DBusConnection *_c = (connection); \
DBusMessage *_m = (message); \
Unit *_u = (unit); \
dbus_error_init(&_error); \
_r = selinux_access_check(_c, _m, _u->source_path ?: _u->fr
agment_path, (permission), &_error); \
if (_r < 0) \
return bus_send_error_reply(_c, _m, &_error, _r); \
} while (false)
#else
#define SELINUX_ACCESS_CHECK(connection, message, permission) do { } while
(false)
#define SELINUX_UNIT_ACCESS_CHECK(unit, connection, message, permission) do
{ } while (false)
#endif #endif
 End of changes. 2 change blocks. 
7 lines changed or deleted 44 lines changed or added


 util.h   util.h 
skipping to change at line 561 skipping to change at line 561
return malloc(a * b); return malloc(a * b);
} }
_malloc_ static inline void *memdup_multiply(const void *p, size_t a, size_ t b) { _malloc_ static inline void *memdup_multiply(const void *p, size_t a, size_ t b) {
if (_unlikely_(b == 0 || a > ((size_t) -1) / b)) if (_unlikely_(b == 0 || a > ((size_t) -1) / b))
return NULL; return NULL;
return memdup(p, a * b); return memdup(p, a * b);
} }
bool filename_is_safe(const char *p);
bool string_is_safe(const char *p);
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/