file: replace 'ls -Z' with 'ls -lZ' for consistent results

I'm not sure the exact date of the change, but 'ls -Z' on Rawhide is a bit different than in the past; the output now looks like this:

  # /bin/ls -Z test
  system_u:object_r:test_file_t:s0 test

This patch converts the testsuite to use 'ls -lZ' which appears to be consistent.

Signed-off-by Paul Moore <[email protected]>

---
 tests/file/test |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tests/file/test +2 -2

index e6ed44d..1c8485a 100755
@@ -45,9 +45,9 @@ system "chcon -t fileop_exec_t $basedir/wait_io 2>&1 > /dev/null";
 #
 # Get the SID of the good file.
 #
-$output = `ls -Z $basedir/temp_file`;
+$output = `ls -lZ $basedir/temp_file`;
 @arr = split(' ', $output);
-$good_file_sid = $arr[3];
+$good_file_sid = $arr[4];
 
 #
 # Attempt to access a restricted file as the 'good' domain.  The first test

_______________________________________________
Selinux mailing list
[email protected]
To unsubscribe, send email to [email protected].
To get help, send an email containing "help" to [email protected].

Quoted 5 lines · Paul Moore

I'm not sure the exact date of the change, but 'ls -Z' on Rawhide is

a bit different than in the past; the output now looks like this:

  # /bin/ls -Z test
  system_u:object_r:test_file_t:s0 test

That seems very wrong - who knows how many userspace scripts may rely on
the output of ls -Z having a given format? Is this a change in
upstream coreutils or Fedora-specific?

Quoted 10 lines · Stephen Smalley

Quoted 5 lines · Paul Moore

I'm not sure the exact date of the change, but 'ls -Z' on Rawhide is

a bit different than in the past; the output now looks like this:

  # /bin/ls -Z test
  system_u:object_r:test_file_t:s0 test

That seems very wrong - who knows how many userspace scripts may rely on
the output of ls -Z having a given format? Is this a change in
upstream coreutils or Fedora-specific?

It does seems a bit odd to me too, but I'm in need of a quick solution and changing to using the '-l' flag served that purpose. I can try to track down the source of the change, but it probably isn't going to happen today.

In the meantime, using '-l' doesn't hurt anything, and it works.

Quoted 17 lines · Paul Moore

Quoted 10 lines · Stephen Smalley

Quoted 5 lines · Paul Moore

I'm not sure the exact date of the change, but 'ls -Z' on Rawhide is

a bit different than in the past; the output now looks like this:

  # /bin/ls -Z test
  system_u:object_r:test_file_t:s0 test

That seems very wrong - who knows how many userspace scripts may rely on
the output of ls -Z having a given format? Is this a change in
upstream coreutils or Fedora-specific?

It does seems a bit odd to me too, but I'm in need of a quick solution and changing to using the '-l' flag served that purpose. I can try to track down the source of the change, but it probably isn't going to happen today.

Quoted 1 line

In the meantime, using '-l' doesn't hurt anything, and it works.

...on rawhide, maybe. It breaks the test on Fedora 20, and presumably on every older Fedora and RHEL release.

Quoted 1 line · Paul Moore

In the meantime, using '-l' doesn't hurt anything, and it works.

...on rawhide, maybe. It breaks the test on Fedora 20, and presumably on every older Fedora and RHEL release.