[systemd-commits] 2 commits - TODO src/shared

[Lennart Poettering]

 TODO                    |    4 ++++
 src/shared/smack-util.c |   12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

New commits:
commit 40ff4a4abd76d71408e598ed02d7860b8465fa9a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Dec 4 16:17:26 2014 +0100

    update TODO

diff --git a/TODO b/TODO
index 54e7c98..389c3c7 100644
--- a/TODO
+++ b/TODO
@@ -35,6 +35,10 @@ External:
 
 Features:
 
+* resolved should optionally register additional per-interface LLMNR
+  names, so that for the container case we can establish the same name
+  (maybe "host") for referencing the server, everywhere.
+
 * systemd-journal-upload (or a new, related tool): allow pushing out
   journal messages onto the network in BSD syslog protocol,
   continously. Default to some link-local IP mcast group, to make this

commit fae5694e1ab3226fea410aea86bd039831395ccf
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Dec 4 16:17:18 2014 +0100

    smack-util: remove warning when building without SMACK support

diff --git a/src/shared/smack-util.c b/src/shared/smack-util.c
index a62c479..64e2134 100644
--- a/src/shared/smack-util.c
+++ b/src/shared/smack-util.c
@@ -125,8 +125,11 @@ int mac_smack_apply_ip_in_fd(int fd, const char *label) {
 }
 
 int mac_smack_apply_pid(pid_t pid, const char *label) {
-        int r = 0;
+
+#ifdef HAVE_SMACK
         const char *p;
+#endif
+        int r = 0;
 
         assert(label);
 
@@ -144,13 +147,15 @@ int mac_smack_apply_pid(pid_t pid, const char *label) {
 }
 
 int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
-        int r = 0;
 
 #ifdef HAVE_SMACK
         struct stat st;
+#endif
+        int r = 0;
 
         assert(path);
 
+#ifdef HAVE_SMACK
         if (!mac_smack_use())
                 return 0;
 
@@ -194,8 +199,7 @@ int mac_smack_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
                 if (ignore_erofs && errno == EROFS)
                         return 0;
 
-                log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path);
-                r = -errno;
+                r = log_debug_errno(errno, "Unable to fix SMACK label of %s: %m", path);
         }
 #endif