summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorJarkko Sakkinen <jarkko.sakkinen@iki.fi>2013-06-24 14:24:55 +0300
committerPádraig Brady <P@draigBrady.com>2013-06-24 21:00:14 +0100
commitcd510a676d15d67268e83eb9bd7c8971d7a4a7d6 (patch)
tree2fc11a1e5b38bc8a1c9702ceaf97b28d5fd8f279 /.mailmap
parentbc70095df2ea1bc4338ea7331d44b916e0c82258 (diff)
downloadcoreutils-cd510a676d15d67268e83eb9bd7c8971d7a4a7d6.tar.xz
ls: with -Z, show SMACK security context
Enable showing of file SMACK security with '-Z' command-line switch if SMACK is enabled. Showing SMACK context of a file does not strictly require SMACK to be enabled but this required to make choice whether to show SELinux or SMACK security context. * src/ls.c (getfilecon_cache): Retrieve SMACK context if available. (gobble_file): Handle SMACK context similarly to SELinux context. * src/local.mk: Link lsl with libsmack. * NEWS: Mention the new feature. * .mailmap: Merge the Author's 2 email addresses.
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index dcabcb534..b5cf17cf4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,6 +26,7 @@ Pádraig Brady <p@draigBrady.com> <P@draigBrady.com>
<psfales@alcatel-lucent.com> <psfales@lucent.com>
<karl@gnu.org> <karl@freefriends.org>
<stephane.raimbault@gmail.com> <stephane.raimbault@makina-corpus.com>
+<jarkko.sakkinen@iki.fi> <jarkko.sakkinen@linux.intel.com>
# Prefer spelled-out middle name and its address.
Arne Henrik Juul <arnej@imf.unit.no> Arne H. Juul <arnej@solan.unit.no>