Merge branch 'journal'

diff --cc Makefile.am
Simple merge

diff --cc TODO
index 359ae09e83682b0883cec4a0e02df908e5fd021c,02688ad9a80b527621235ee8e1f92f8b700d3214..e9ab9de6e7936a35b2407b639ffb9f0b7fe0b92a
--- 1/TODO
--- 2/TODO
+++ b/TODO
@@@ -17,12 -17,22 +17,24 @@@ Bugfixes
  
  * make polkit checks async
  
+ * properly handle .mount unit state tracking when two mount points are stacked one on top of another on the exact same mount point.
+ 
  Features:
  
+ * logind: selinux is borked...
+ 
+ * logind: sends SessionNew on Lock()?
+ 
+ * logind: allow showing logout dialog from system
+ 
+ * document that %% can be used to write % in a string that is specifier extended
+ 
+ * check utf8 everywhere
+ 
  * when an instanced service exits, remove its parent cgroup too if possible.
  
 +* Make libselinux, libattr, libcap, libdl dependencies only of the tools which actually need them.
 +
  * as Tom Gundersen pointed out there's a always a dep loop if people use crypto file systems with random keys
  
  * unset container= in PID1?

diff --cc man/sd_notify.xml
Simple merge

diff --cc src/kmsg-syslogd.c
index 7fd69f858428f79380f047aa448d5bfb463b3014,70cc0730eeed7c608502595518ca35d44d1d36a4..8cc423a299a517dadd2bba7fe3622123430b6f49
--- 1/src/kmsg-syslogd.c
--- 2/src/kmsg-syslogd.c
+++ b/src/kmsg-syslogd.c
@@@ -102,10 -111,12 +111,9 @@@ static int server_init(Server *s) 
  
                  if (!r) {
                          log_error("Wrong file descriptor type.");
-                         r = -EINVAL;
-                         goto fail;
+                         return -EINVAL;
                  }
  
 -                if (setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0)
 -                        log_error("SO_PASSCRED failed: %m");
 -
                  zero(ev);
                  ev.events = EPOLLIN;
                  ev.data.fd = fd;

diff --cc src/manager.c
Simple merge

diff --cc src/pam-module.c
Simple merge

diff --cc src/systemctl.c
Simple merge

diff --cc src/util.c
Simple merge

diff --cc units/syslog.socket
index e74b55948e8d4baa47282ea4fdf1edec19ea79de,ca3d95ea35758258f23125c88a20e72b766aac2e..f9e3171522628b15e5dd62239cd120edc8d2e3f8
--- 1/units/syslog.socket
--- 2/units/syslog.socket
+++ b/units/syslog.socket
@@@ -16,9 -16,8 +16,9 @@@ Before=sockets.target syslog.targe
  Wants=syslog.target
  
  [Socket]
- ListenDatagram=/dev/log
+ ListenDatagram=/run/systemd/syslog
  SocketMode=0666
 +PassCred=yes
  
  # The service we activate on incoming traffic is
  # systemd-kmsg-syslogd.service. That doesn't mean however, that this