use consistent string for security context

Change-Id: Ieb878c674e058170051b1e6256a88da8cc3bf819

diff --git a/toys/other/stat.c b/toys/other/stat.c
index 27b167c..b1355a5 100644 (file)
--- 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 (file)
--- 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());
       }