projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- halt's -w depends on FEATURE_WTMP (Vladimir Dronnikov)
[oweals/busybox.git]
/
util-linux
/
mkswap.c
diff --git
a/util-linux/mkswap.c
b/util-linux/mkswap.c
index bf0d7b0749358a92cf8e2c963c60397365156e1e..11c411b6ac14043f3ce2f0bfcb83b740c235638d 100644
(file)
--- a/
util-linux/mkswap.c
+++ b/
util-linux/mkswap.c
@@
-23,7
+23,7
@@
static void mkswap_selinux_setcontext(int fd, const char *path)
security_context_t oldcon = NULL;
context_t context;
security_context_t oldcon = NULL;
context_t context;
- if (fgetfilecon
_raw
(fd, &oldcon) < 0) {
+ if (fgetfilecon(fd, &oldcon) < 0) {
if (errno != ENODATA)
goto error;
if (matchpathcon(path, stbuf.st_mode, &oldcon) < 0)
if (errno != ENODATA)
goto error;
if (matchpathcon(path, stbuf.st_mode, &oldcon) < 0)
@@
-35,7
+35,8
@@
static void mkswap_selinux_setcontext(int fd, const char *path)
newcon = context_str(context);
if (!newcon)
goto error;
newcon = context_str(context);
if (!newcon)
goto error;
- if (strcmp(oldcon, newcon) != 0 && fsetfilecon_raw(fd, newcon) < 0)
+ /* fsetfilecon_raw is hidden */
+ if (strcmp(oldcon, newcon) != 0 && fsetfilecon(fd, newcon) < 0)
goto error;
if (ENABLE_FEATURE_CLEAN_UP) {
context_free(context);
goto error;
if (ENABLE_FEATURE_CLEAN_UP) {
context_free(context);