From cd510a676d15d67268e83eb9bd7c8971d7a4a7d6 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@iki.fi>
Date: Mon, 24 Jun 2013 14:24:55 +0300
Subject: 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.
---
 .mailmap | 1 +
 1 file changed, 1 insertion(+)

(limited to '.mailmap')

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>
-- 
cgit v1.2.3-54-g00ecf