RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-02-20 03:26:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

libselinux: selinux_restorecon: only log no default label warning for caller-supplied pathname

Browse Source 
$ touch /tmp/foo
$ chcon -t etc_t /tmp/foo
$ restorecon /tmp/foo
Warning no default label for /tmp/foo
$ restorecon -R /tmp/foo
Warning no default label for /tmp/foo
$ restorecon -R /tmp

Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
This commit is contained in:
Stephen Smalley 2017-01-13 15:21:01 -05:00
parent 908898846a
commit 1cd972fc81
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libselinux/src/selinux_restorecon.c
View File

@ -90,6 +90,7 @@ struct rest_flags {
bool syslog_changes;
bool log_matches;
bool ignore_noent;
bool warnonnomatch;
};
static void restorecon_init(void)
@ -613,7 +614,7 @@ static int restorecon_sb(const char *pathname, const struct stat *sb,
sb->st_mode);
if (rc < 0) {
if (errno == ENOENT && flags->verbose && !flags->recurse)
if (errno == ENOENT && flags->warnonnomatch)
selinux_log(SELINUX_INFO,
"Warning no default label for %s\n",
lookup_path);
@ -761,6 +762,7 @@ int selinux_restorecon(const char *pathname_orig,
SELINUX_RESTORECON_LOG_MATCHES) ? true : false;
flags.ignore_noent = (restorecon_flags &
SELINUX_RESTORECON_IGNORE_NOENTRY) ? true : false;
flags.warnonnomatch = true;
ignore_mounts = (restorecon_flags &
SELINUX_RESTORECON_IGNORE_MOUNTS) ? true : false;
@ -983,7 +985,8 @@ int selinux_restorecon(const char *pathname_orig,
default:
error |= restorecon_sb(ftsent->fts_path,
ftsent->fts_statp, &flags);
if (flags.warnonnomatch)
flags.warnonnomatch = false;
if (error && flags.abort_on_error)
goto out;
break;