diff options
author | Jim Meyering <jim@meyering.net> | 2007-09-05 10:57:54 +0200 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2007-09-05 10:58:45 +0200 |
commit | 0fb836f179d0cb2509aefcf007157e02dd0814b6 (patch) | |
tree | f4c6040fe50cac03c0fb58df15e36f608f2f4bf2 /src/ls.c | |
parent | 4055cd5a2679bc625c4dde7bce941461481ea8b0 (diff) | |
download | coreutils-0fb836f179d0cb2509aefcf007157e02dd0814b6.tar.xz |
Adapt to new SELinux behavior: "?" vs. new "unlabeled"
* src/ls.c (gobble_file): Interpret the new "unlabeled" indicator
from getfilecon/lgetfilecon the same way we interpret a negative
return value: no security context. So we don't print the "+".
* tests/selinux: Recognize that "unlabeled" means insufficient
support for SELinux, just like "?".
Diffstat (limited to 'src/ls.c')
-rw-r--r-- | src/ls.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -2651,7 +2651,8 @@ gobble_file (char const *name, enum filetype type, ino_t inode, ? getfilecon (absolute_name, &f->scontext) : lgetfilecon (absolute_name, &f->scontext)); err = (attr_len < 0); - file_has_security_context = (err == 0); + file_has_security_context = + (err == 0 && ! STREQ ("unlabeled", f->scontext)); /* When requesting security context information, don't make ls fail just because the file (even a command line argument) |