From 272cac1a140def5ee7dca1f1bc8a61350edf4746 Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Sep 14 2004 10:16:04 +0000 Subject: - SELinux patch fix: don't display '(null)' if getfilecon() fails (bug #131196). --- diff --git a/coreutils-selinux.patch b/coreutils-selinux.patch index ca3cdd3..7c04a55 100644 --- a/coreutils-selinux.patch +++ b/coreutils-selinux.patch @@ -2118,7 +2118,7 @@ +#ifdef WITH_SELINUX + + if ( print_scontext ) { -+ sprintf (p, "%-32s ", f->scontext); ++ sprintf (p, "%-32s ", f->scontext ?: ""); + p += strlen (p); + } +#endif @@ -2317,7 +2317,7 @@ + } + } + -+ (void) sprintf (p, "%-32s ", f->scontext); ++ (void) sprintf (p, "%-32s ", f->scontext ?: ""); + p += strlen (p); + + DIRED_INDENT (); diff --git a/coreutils.spec b/coreutils.spec index be1be15..7184e73 100644 --- a/coreutils.spec +++ b/coreutils.spec @@ -244,6 +244,10 @@ fi %_sbindir/chroot %changelog +* Tue Sep 14 2004 Tim Waugh +- SELinux patch fix: don't display '(null)' if getfilecon() fails + (bug #131196). + * Fri Aug 20 2004 Tim Waugh 5.2.1-23 - Fixed colorls.csh quoting (bug #102412). - Fixed another join LSB test failure (bug #121153).