diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-11-03 14:26:38 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2011-11-03 14:41:10 +0100 |
| commit | 3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d (patch) | |
| tree | d2a79493fb9dfd3d1dc9b78c706b00af70cbb185 | |
| parent | bc8db248baddc8309372158378337fdf7877ad68 (diff) | |
| download | glibc-3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d.tar.gz glibc-3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d.tar.xz glibc-3d7ba52b68e4dc5c4d3eb19de436c66ed9bb2f0d.zip | |
Don't fail in makedb if SELinux is disabled
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | nss/makedb.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index d132b0b9ff..28b9a43ef8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-11-03 Andreas Schwab <schwab@redhat.com> + + * nss/makedb.c (set_file_creation_context): Do nothing if SELinux + is disabled. + 2011-11-02 Samuel Thibault <samuel.thibault@ens-lyon.org> * 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; |