diff options
| author | Hyejin Kim <hyejin0906.kim@samsung.com> | 2016-01-04 18:40:24 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-01-04 18:40:24 -0800 |
| commit | 16d8d570a162fa40d5ed64798eb1c72e3288e3fc (patch) | |
| tree | 6c9facfed32104c65e386ff01728b52d79b25723 | |
| parent | 754aabd8e38dc3d6d9d8bd275347c8db174c9ad0 (diff) | |
| parent | 8144f777408a575b8d94a008980f918b117d713e (diff) | |
| download | toybox-16d8d570a162fa40d5ed64798eb1c72e3288e3fc.tar.gz toybox-16d8d570a162fa40d5ed64798eb1c72e3288e3fc.tar.bz2 toybox-16d8d570a162fa40d5ed64798eb1c72e3288e3fc.zip | |
Merge "use consistent string for security context" into tizen
| -rw-r--r-- | toys/other/stat.c | 2 | ||||
| -rw-r--r-- | toys/posix/cp.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/toys/other/stat.c b/toys/other/stat.c index 27b167c..b1355a5 100644 --- a/toys/other/stat.c +++ b/toys/other/stat.c @@ -78,7 +78,7 @@ static char* ftype_to_string(uint64_t ftype) case 0x517B: return "smb"; case 0x4d44: return "msdos"; case 0x4006: return "fat"; - //case 0x43415d53: return "smackfs"; + case 0x43415d53: return "smackfs"; case 0x73717368: return "squashfs"; default: return "unknown"; } diff --git a/toys/posix/cp.c b/toys/posix/cp.c index 0a378b8..6a395a4 100644 --- a/toys/posix/cp.c +++ b/toys/posix/cp.c @@ -67,7 +67,7 @@ config CP_Z help usage: cp [-Z] - set SMACK security context of destination file to default type + set security context of destination file to default type config MV bool "mv" @@ -401,7 +401,7 @@ void cp_main(void) TT.c.context = NULL; if (!CFG_TOYBOX_LSM_NONE && lsm_enabled()) { if (0>lsm_lget_context(src, &TT.c.context)) - perror_exit("unknown SMACK label for '%s'", src); + perror_exit("unknown security context for '%s'", src); if (0>lsm_set_create(TT.c.context)) perror_exit("preserve context '%s' failed", TT.c.context); free(TT.c.context); @@ -416,7 +416,7 @@ void cp_main(void) if (toys.optflags & FLAG_Z) TT.c.context = lsm_context(); else { if (0>lsm_lget_context(src, &TT.c.context)) - perror_exit("unknown SMACK label for '%s'", src); + perror_exit("unknown security context for '%s'", src); } } else error_exit("%s disabled", lsm_name()); } |