39c651e90
Denis Vlasenko
2007-03-12
Subject
introduce and use setfscreatecon_or_die (patch by Yuichi Nakamura
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/install.c +1 -3coreutils/libcoreutils/getopt_mk_fifo_nod.c +1 -4coreutils/mkdir.c +1 -4include/libbb.h +1 -0libbb/copy_file.c +1 -1libbb/selinux_common.c +10 -0selinux/runcon.c +1 -1
coreutils/install.c+1 -3
| @@ -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; | |
| } | |
coreutils/libcoreutils/getopt_mk_fifo_nod.c+1 -4
| @@ -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 | |
coreutils/mkdir.c+1 -4
| @@ -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 | |
include/libbb.h+1 -0
| @@ -601,6 +601,7 @@ extern void renew_current_security_context(void); | |
| extern void set_current_security_context(security_context_t sid); | |
| extern context_t set_security_context_component(security_context_t cur_context, | |
| char *user, char *role, char *type, char *range); | |
| + | extern void setfscreatecon_or_die(security_context_t scontext); |
| #endif | |
| extern void selinux_or_die(void); | |
| extern int restricted_shell(const char *shell); | |
libbb/copy_file.c+1 -1
| @@ -74,7 +74,7 @@ int copy_file(const char *source, const char *dest, int flags) | |
| } | |
| } else { | |
| if (errno == ENOTSUP || errno == ENODATA) { | |
| - | setfscreatecon(NULL); |
| + | setfscreatecon_or_die(NULL); |
| } else { | |
| bb_perror_msg("cannot lgetfilecon %s", source); | |
| return -1; | |
libbb/selinux_common.c+10 -0
| @@ -28,3 +28,13 @@ error: | |
| context_free(con); | |
| return NULL; | |
| } | |
| + | |
| + | void setfscreatecon_or_die(security_context_t scontext) |
| + | { |
| + | if (setfscreatecon(scontext) < 0) { |
| + | /* Can be NULL. All known printf implementations |
| + | * display "(null)", "<null>" etc */ |
| + | bb_perror_msg_and_die("cannot set default " |
| + | "file creation context to %s", scontext); |
| + | } |
| + | } |
selinux/runcon.c+1 -1
| @@ -132,6 +132,6 @@ int runcon_main(int argc, char *argv[]) | |
| execvp(argv[0], argv); | |
| - | bb_perror_msg_and_die("cannot execute '%s'", command); |
| + | bb_perror_msg_and_die("cannot execute '%s'", argv[0]); |
| return 1; | |
| } | |