Index: trunk/src/sh_hash.c
===================================================================
--- trunk/src/sh_hash.c	(revision 103)
+++ trunk/src/sh_hash.c	(revision 105)
@@ -61,4 +61,8 @@
 #include "sh_forward.h"
 #endif
+
+
+#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
+
 
 #undef  FIL__
@@ -3568,5 +3572,4 @@
 	    SH_FREE(esc);
 	}
-      printf(_(" %s"), tmp);
       SH_FREE(tmp);
     }
Index: trunk/src/sh_tiger0.c
===================================================================
--- trunk/src/sh_tiger0.c	(revision 103)
+++ trunk/src/sh_tiger0.c	(revision 105)
@@ -54,4 +54,6 @@
 
 typedef unsigned char sh_byte;
+
+#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
 
 #undef  FIL__
Index: trunk/src/sh_unix.c
===================================================================
--- trunk/src/sh_unix.c	(revision 103)
+++ trunk/src/sh_unix.c	(revision 105)
@@ -139,4 +139,5 @@
 #endif
 
+#define SH_KEY_NULL _("000000000000000000000000000000000000000000000000")
 
 #undef  FIL__
@@ -3040,17 +3041,20 @@
 #endif
 
-  out = sh_unix_getinfo_xattr_int(path, fd, _("security.selinux"));
-
-  if (out)
-    {
-      if (collect) {
-	tmp = sh_util_strconcat(_("selinux:"), out, ":", collect, NULL);
-	SH_FREE(collect);
-      }
-      else {
-	tmp = sh_util_strconcat(_("selinux:"), out, NULL);
-      }
-      SH_FREE(out);
-      collect = tmp;
+  if (sh_unix_check_selinux == S_TRUE)
+    {
+      out = sh_unix_getinfo_xattr_int(path, fd, _("security.selinux"));
+
+      if (out)
+	{
+	  if (collect) {
+	    tmp = sh_util_strconcat(_("selinux:"), out, ":", collect, NULL);
+	    SH_FREE(collect);
+	  }
+	  else {
+	    tmp = sh_util_strconcat(_("selinux:"), out, NULL);
+	  }
+	  SH_FREE(out);
+	  collect = tmp;
+	}
     }
 
@@ -3321,5 +3325,8 @@
 #endif
 
-#if defined(USE_XATTR)
+#if defined(USE_XATTR) && defined(USE_ACL)
+  if (sh_unix_check_selinux == S_TRUE || sh_unix_check_acl == S_TRUE)
+    theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);
+#elif defined(USE_XATTR)
   if (sh_unix_check_selinux == S_TRUE)
     theFile->attr_string = sh_unix_getinfo_xattr (theFile->fullpath, fd, &buf);