introduce and use setfscreatecon_or_die
(patch by Yuichi Nakamura <ynakam@hitachisoft.jp>) runcon: *yet another* fix for vda's brainfart :(
This commit is contained in:
@@ -110,9 +110,7 @@ int install_main(int argc, char **argv)
|
||||
}
|
||||
if (flags & OPT_SET_SECURITY_CONTEXT) {
|
||||
selinux_or_die();
|
||||
if (setfscreatecon(scontext) < 0) {
|
||||
bb_error_msg_and_die("setfscreatecon(%s)", scontext); // perror?
|
||||
}
|
||||
setfscreatecon_or_die(scontext);
|
||||
use_default_selinux_context = 0;
|
||||
copy_flags |= FILEUTILS_SET_SECURITY_CONTEXT;
|
||||
}
|
||||
|
||||
@@ -43,10 +43,7 @@ mode_t getopt_mk_fifo_nod(int argc, char **argv)
|
||||
#if ENABLE_SELINUX
|
||||
if (opt & 2) {
|
||||
selinux_or_die();
|
||||
if (setfscreatecon(scontext)) {
|
||||
bb_error_msg_and_die("cannot set default file creation context "
|
||||
"to %s", scontext);
|
||||
}
|
||||
setfscreatecon_or_die(scontext);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -62,10 +62,7 @@ int mkdir_main(int argc, char **argv)
|
||||
#if ENABLE_SELINUX
|
||||
if (opt & 4) {
|
||||
selinux_or_die();
|
||||
if (setfscreatecon(scontext)) {
|
||||
bb_error_msg_and_die("cannot set default file creation context "
|
||||
"to %s", scontext);
|
||||
}
|
||||
setfscreatecon_or_die(scontext);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user