From 3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 3 Nov 2011 14:26:38 +0100 Subject: Don't fail in makedb if SELinux is disabled --- ChangeLog | 5 +++++ nss/makedb.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d132b0b9ff..28b9a43ef8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-11-03 Andreas Schwab + + * nss/makedb.c (set_file_creation_context): Do nothing if SELinux + is disabled. + 2011-11-02 Samuel Thibault * bits/ioctl-types.h (_IOT_sgttyb): Set number of chars to 4. diff --git a/nss/makedb.c b/nss/makedb.c index 8cee92f891..1b1996647c 100644 --- a/nss/makedb.c +++ b/nss/makedb.c @@ -842,7 +842,7 @@ set_file_creation_context (const char *outname, mode_t mode) /* Check if SELinux is enabled, and remember. */ if (enabled == 0) - enabled = is_selinux_enabled (); + enabled = is_selinux_enabled () ? 1 : -1; if (enabled < 0) return; -- cgit 1.4.1