diff options
| author | Julian Blake Kongslie <jblake@omgwallhack.org> | 2010-06-29 22:51:14 -0700 |
|---|---|---|
| committer | Julian Blake Kongslie <jblake@omgwallhack.org> | 2010-06-29 22:51:14 -0700 |
| commit | 6eb23f2537b0bc09d110a09d5b50784054e59416 (patch) | |
| tree | 3a4daa1991cf6a9883efa1a64261ea8b3a974767 | |
| parent | 8944a40faca17416faa6688183706263bef0ef4c (diff) | |
| download | piny-code-6eb23f2537b0bc09d110a09d5b50784054e59416.tar.gz piny-code-6eb23f2537b0bc09d110a09d5b50784054e59416.zip | |
Properly close pwent; correct precedence on membership tests.
| -rw-r--r-- | usr/src/libpiny/lib/Piny/Repo.pm | 2 | ||||
| -rw-r--r-- | usr/src/libpiny/lib/Piny/User.pm | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/usr/src/libpiny/lib/Piny/Repo.pm b/usr/src/libpiny/lib/Piny/Repo.pm index bd1a3c6..84b5bb4 100644 --- a/usr/src/libpiny/lib/Piny/Repo.pm +++ b/usr/src/libpiny/lib/Piny/Repo.pm @@ -102,7 +102,7 @@ sub remove_access { sub has_access { my ( $s, $user ) = @_; - return $s->owner( )->uid( ) == $user->uid( ) or $user->has_group( $s->group( ) ); + return $s->owner( )->uid( ) == $user->uid( ) || $user->has_group( $s->group( ) ); }; # Triggers diff --git a/usr/src/libpiny/lib/Piny/User.pm b/usr/src/libpiny/lib/Piny/User.pm index f9a5f0d..14e2ca1 100644 --- a/usr/src/libpiny/lib/Piny/User.pm +++ b/usr/src/libpiny/lib/Piny/User.pm @@ -92,14 +92,16 @@ sub has_group { sub all_users { my ( $class ) = @_; - endpwent( ); - my @ret; + endpwent( ); + while ( my @info = getpwent( ) ) { push( @ret, $class->new( uid => $info[2] ) ); }; + endpwent( ); + return @ret; }; |