From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 30 Dec 2011 23:59:37 +0000 (+0100)
Subject: Merge branch 'journal'
X-Git-Tag: v38~144
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=dc1ecd78e9f046880d10ddb45cf9b06df1084b10

Merge branch 'journal'
---

dc1ecd78e9f046880d10ddb45cf9b06df1084b10
diff --cc TODO
index 359ae09e8,02688ad9a..e9ab9de6e
--- a/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 src/kmsg-syslogd.c
index 7fd69f858,70cc0730e..8cc423a29
--- a/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 units/syslog.socket
index e74b55948,ca3d95ea3..f9e317152
--- a/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