summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2009-12-07 14:40:18 +0100
committerPaolo Bonzini <bonzini@gnu.org>2009-12-07 14:41:49 +0100
commit118d2df47a5100b9a25315c445caf742f360913c (patch)
tree25df162adc3e48886658a71523510a1dcd9546d8
parent70172377a7f4b0c175763c51d8191771e5818404 (diff)
downloadsed-118d2df47a5100b9a25315c445caf742f360913c.tar.gz
fix debian bug 559539
2009-12-07 Clint Adams <schizo@debian.org> (tiny change) * sed/execute.c (open_next_file): If is_selinux_enabled returns -1, treat it as "disabled".
-rw-r--r--ChangeLog5
-rw-r--r--sed/execute.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b22e782..79fe768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-07 Clint Adams <schizo@debian.org> (tiny change)
+
+ * sed/execute.c (open_next_file): If is_selinux_enabled returns -1,
+ treat it as "disabled".
+
2009-10-15 Paolo Bonzini <bonzini@gnu.org>
* sed/execute.c (closedown, open_next_file): Merge 5156c19b correctly.
diff --git a/sed/execute.c b/sed/execute.c
index b707a6b..e9cb627 100644
--- a/sed/execute.c
+++ b/sed/execute.c
@@ -740,7 +740,7 @@ open_next_file(name, input)
panic(_("couldn't edit %s: not a regular file"), input->in_file_name);
#ifndef BOOTSTRAP
- if (is_selinux_enabled ())
+ if (is_selinux_enabled () > 0)
{
security_context_t con;
if (getfilecon (input->in_file_name, &con) != -1)