removed unrequired explicit 'list' data levels

[scpubgit/System-Introspector.git] / lib / System / Introspector / Probe / Users.pm

diff --git a/lib/System/Introspector/Probe/Users.pm b/lib/System/Introspector/Probe/Users.pm
index 34886e6..0b4047a 100644 (file)
--- a/lib/System/Introspector/Probe/Users.pm
+++ b/lib/System/Introspector/Probe/Users.pm
@@ -43,7 +43,7 @@ sub _gather_crontab {
     unless ($ok) {
         return {}
             if $err =~ m{^no crontab}i;
-        return { error => $err };
+        return { __error__ => $err };
     }
     return { body => $out };
 }
@@ -51,9 +51,10 @@ sub _gather_crontab {
 sub _gather_ssh_keys {
     my ($self, $user, $home) = @_;
     my $ssh_dir = "$home/.ssh";
+    my $ssh_authkeys = "$ssh_dir/authorized_keys";
     return {
         files => {},
-        authorized => { file_name => "$ssh_dir/authorized_keys", body => '' }
+        authorized => { file_name => $ssh_authkeys, body => '' }
     } unless -d $ssh_dir;
     my %key;
     for my $item (files_from_dir $ssh_dir) {
@@ -65,19 +66,19 @@ sub _gather_ssh_keys {
             };
         };
     }
-    my $auth_keys = transform_exceptions {
+    my $auth_keys = (-e $ssh_authkeys) ? (transform_exceptions {
         return {
-            file_name => "$ssh_dir/authorized_keys",
-            body => scalar output_from_file "$ssh_dir/authorized_keys",
+            file_name => $ssh_authkeys,
+            body => scalar output_from_file $ssh_authkeys,
         };
-    };
+    }) : { file_name => $ssh_authkeys, body => '' };
     return { files => \%key, authorized => $auth_keys };
 }
 
 sub _gather_user_groups {
     my ($self, $user) = @_;
     my $groups = output_from_command [groups => $user];
-    return { list => [split m{\s+}, $groups] };
+    return [split m{\s+}, $groups];
 }
 
 sub _deparse_htpasswd_line {