[systemd-commits] 2 commits - man/pam_systemd.xml src/shared

[Lennart Poettering]

 man/pam_systemd.xml       |    4 ++--
 src/shared/selinux-util.c |    3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit a07e9cfb790f3f5f492f2ff895a9de65e2b00a09
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Oct 24 01:15:53 2014 +0200

    selinux: fix handling of relative paths when setting up create label

diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c
index 4332c91..1eddd17 100644
--- a/src/shared/selinux-util.c
+++ b/src/shared/selinux-util.c
@@ -23,6 +23,7 @@
 #include <unistd.h>
 #include <malloc.h>
 #include <sys/un.h>
+
 #ifdef HAVE_SELINUX
 #include <selinux/selinux.h>
 #include <selinux/label.h>
@@ -328,7 +329,7 @@ int mac_selinux_create_file_prepare(const char *path, mode_t mode) {
                 if (!newpath)
                         return -ENOMEM;
 
-                r = selabel_lookup_raw(label_hnd, &filecon, newpath, S_IFDIR);
+                r = selabel_lookup_raw(label_hnd, &filecon, newpath, mode);
         }
 
         if (r < 0 && errno != ENOENT)

commit 989fc2c61cb3c5376bd8bff6b2cfba9e4d740ffc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Oct 24 01:14:38 2014 +0200

    man: in pam_systemd, it must be "his" (or "her"), not their

diff --git a/man/pam_systemd.xml b/man/pam_systemd.xml
index 43949af..40709f7 100644
--- a/man/pam_systemd.xml
+++ b/man/pam_systemd.xml
@@ -98,7 +98,7 @@
                         <citerefentry><refentrytitle>logind.conf</refentrytitle>
                         <manvolnum>5</manvolnum></citerefentry>,
                         all processes of the session are terminated. If
-                        the last concurrent session of a user ends, their
+                        the last concurrent session of a user ends, his
                         user systemd instance will be terminated too,
                         and so will the user's slice
                         unit.</para></listitem>
@@ -202,7 +202,7 @@
                                 to the user login time on the
                                 machine. It is automatically created
                                 the first time a user logs in and
-                                removed on their final logout. If a user
+                                removed on his final logout. If a user
                                 logs in twice at the same time, both
                                 sessions will see the same
                                 <varname>$XDG_RUNTIME_DIR</varname>