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

[Lennart Poettering]

 TODO               |   14 ++++++++++++++
 src/shared/label.c |   27 +++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

New commits:
commit 7bb2954901b2e568efaf67254e480032e0958cad
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 19 16:23:30 2014 +0100

    update TODO

diff --git a/TODO b/TODO
index dabe2e2..be7d5db 100644
--- a/TODO
+++ b/TODO
@@ -33,6 +33,20 @@ Preparation for 209:
 
 Features:
 
+* systemctl (and possibly related tools): support a new switch that
+  allows enumerating units in local containers recursively. "systemctl
+  list-units -R" or so should not only lists on the host, but also the
+  services in all containers in a pretty way, to give an overview of
+  the entire system. Also, maybe add "systemctl list-machines" which
+  works like "machinectl list" but includes information about the
+  health status of each registered machine. For that we should
+  probably implement something that encodes the system health status
+  in a single enum state, i.e. something like a system-wide state
+  starting → running → failed → stopping, that is based on the current
+  job queue and a check for failed services. Maybe then change
+  "systemctl status" without args to output this state along with a
+  selection of other data, such as the uptime or so.
+
 * generalize ConditionXYZ= logic and make it available in networkd's
   .network, .netdev, .network files, too. This is particularly useful
   to match on containers with ConditionVirtualization to

commit 708e25e137f8938791b72194a3d56c3476793175
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 19 16:13:42 2014 +0100

    label: minor optimizations

diff --git a/src/shared/label.c b/src/shared/label.c
index 4a26ba9..92f10f9 100644
--- a/src/shared/label.c
+++ b/src/shared/label.c
@@ -137,7 +137,10 @@ int label_fix(const char *path, bool ignore_enoent, bool ignore_erofs) {
 void label_finish(void) {
 
 #ifdef HAVE_SELINUX
-        if (use_selinux() && label_hnd)
+        if (!use_selinux())
+                return;
+
+        if (label_hnd)
                 selabel_close(label_hnd);
 #endif
 }
@@ -260,8 +263,8 @@ int label_mkdir(const char *path, mode_t mode) {
 
         /* Creates a directory and labels it according to the SELinux policy */
 #ifdef HAVE_SELINUX
-        int r;
         security_context_t fcon = NULL;
+        int r;
 
         if (!use_selinux() || !label_hnd)
                 goto skipped;
@@ -269,14 +272,13 @@ int label_mkdir(const char *path, mode_t mode) {
         if (path_is_absolute(path))
                 r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFDIR);
         else {
-                char *newpath;
+                _cleanup_free_ char *newpath;
 
                 newpath = path_make_absolute_cwd(path);
                 if (!newpath)
                         return -ENOMEM;
 
                 r = selabel_lookup_raw(label_hnd, &fcon, newpath, S_IFDIR);
-                free(newpath);
         }
 
         if (r == 0)
@@ -311,10 +313,10 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
         /* Binds a socket and label its file system object according to the SELinux policy */
 
 #ifdef HAVE_SELINUX
-        int r;
         security_context_t fcon = NULL;
         const struct sockaddr_un *un;
-        char *path = NULL;
+        char *path;
+        int r;
 
         assert(fd >= 0);
         assert(addr);
@@ -336,24 +338,18 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
         if (un->sun_path[0] == 0)
                 goto skipped;
 
-        path = strndup(un->sun_path, addrlen - offsetof(struct sockaddr_un, sun_path));
-        if (!path)
-                return -ENOMEM;
+        path = strndupa(un->sun_path, addrlen - offsetof(struct sockaddr_un, sun_path));
 
         if (path_is_absolute(path))
                 r = selabel_lookup_raw(label_hnd, &fcon, path, S_IFSOCK);
         else {
-                char *newpath;
+                _cleanup_free_ char *newpath;
 
                 newpath = path_make_absolute_cwd(path);
-
-                if (!newpath) {
-                        free(path);
+                if (!newpath)
                         return -ENOMEM;
-                }
 
                 r = selabel_lookup_raw(label_hnd, &fcon, newpath, S_IFSOCK);
-                free(newpath);
         }
 
         if (r == 0)
@@ -375,7 +371,6 @@ int label_bind(int fd, const struct sockaddr *addr, socklen_t addrlen) {
 finish:
         setfscreatecon(NULL);
         freecon(fcon);
-        free(path);
 
         return r;