- SELinux patch fix: don't display '(null)' if getfilecon() fails (bug

#131196).
This commit is contained in:
Tim Waugh 2004-09-14 10:16:04 +00:00
parent 8592c20dd5
commit 272cac1a14
2 changed files with 6 additions and 2 deletions

View File

@ -2118,7 +2118,7 @@
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+ +
+ if ( print_scontext ) { + if ( print_scontext ) {
+ sprintf (p, "%-32s ", f->scontext); + sprintf (p, "%-32s ", f->scontext ?: "");
+ p += strlen (p); + p += strlen (p);
+ } + }
+#endif +#endif
@ -2317,7 +2317,7 @@
+ } + }
+ } + }
+ +
+ (void) sprintf (p, "%-32s ", f->scontext); + (void) sprintf (p, "%-32s ", f->scontext ?: "");
+ p += strlen (p); + p += strlen (p);
+ +
+ DIRED_INDENT (); + DIRED_INDENT ();

View File

@ -244,6 +244,10 @@ fi
%_sbindir/chroot %_sbindir/chroot
%changelog %changelog
* Tue Sep 14 2004 Tim Waugh <twaugh@redhat.com>
- SELinux patch fix: don't display '(null)' if getfilecon() fails
(bug #131196).
* Fri Aug 20 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-23 * Fri Aug 20 2004 Tim Waugh <twaugh@redhat.com> 5.2.1-23
- Fixed colorls.csh quoting (bug #102412). - Fixed colorls.csh quoting (bug #102412).
- Fixed another join LSB test failure (bug #121153). - Fixed another join LSB test failure (bug #121153).