Changeset 2192 for trunk/LATMOS-Accounts/lib/LATMOS

Timestamp:

02/06/19 11:07:17 (5 years ago)

Author:

nanardon

Message:

always return non empty authorizedKeys if filter are set

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -1323 +1323 @@
                     my @filters = $self->_get_attributes('sshPublicKeyFilter');
 
+                    my %users = ( $self->id => 1 );
+
                     if (@filters) {
                         foreach my $user ($self->base->search_objects('user', @filters, 'oalias=NULL')) {
                             my $ouser = $self->base->get_object('user', $user) or next;
+                            $users{ $user } and next;
+                            $users{ $user } = 1;
                             push(@keys, $ouser->_get_attributes('sshPublicKey'));
                         }
                     }
 
-                    return \@keys;
+                    return @keys ? \@keys : (@filters ? [ '# No key' ] : undef);
                 },
             },