summaryrefslogtreecommitdiff
path: root/usr/src/lib/libsec/common/aclutils.c
diff options
context:
space:
mode:
authorstephanie scheffler <Stephanie.Scheffler@Sun.COM>2009-07-31 10:03:17 -0600
committerstephanie scheffler <Stephanie.Scheffler@Sun.COM>2009-07-31 10:03:17 -0600
commit2269545aca348693948db4c9329109dbd770ffa9 (patch)
tree347245a0a14faa8527fded7e17f6407413261034 /usr/src/lib/libsec/common/aclutils.c
parentad848a7f37880ceed23810bba54d7afdfa4976da (diff)
downloadillumos-joyent-2269545aca348693948db4c9329109dbd770ffa9.tar.gz
6835751 typo in zfs upgrade -v
6465047 zfs unshare usage message is wrong 6856021 confusing grammatical error in chmod error output
Diffstat (limited to 'usr/src/lib/libsec/common/aclutils.c')
-rw-r--r--usr/src/lib/libsec/common/aclutils.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/src/lib/libsec/common/aclutils.c b/usr/src/lib/libsec/common/aclutils.c
index 2b79d0c649..2850c4dd1a 100644
--- a/usr/src/lib/libsec/common/aclutils.c
+++ b/usr/src/lib/libsec/common/aclutils.c
@@ -702,7 +702,7 @@ acl_strerror(int errnum)
"ACL entry doesn't exist"));
case EACL_DIFF_TYPE:
return (dgettext(TEXT_DOMAIN,
- "ACL type's are different"));
+ "Different file system ACL types cannot be merged"));
case EACL_INVALID_USER_GROUP:
return (dgettext(TEXT_DOMAIN, "Invalid user or group"));
case EACL_INVALID_STR: