diff options
Diffstat (limited to 'perl-install/standalone/drakperm')
| -rwxr-xr-x | perl-install/standalone/drakperm | 442 |
1 files changed, 227 insertions, 215 deletions
diff --git a/perl-install/standalone/drakperm b/perl-install/standalone/drakperm index b5d25b0fb..fa69be838 100755 --- a/perl-install/standalone/drakperm +++ b/perl-install/standalone/drakperm @@ -5,16 +5,17 @@ use diagnostics; use lib qw(/usr/lib/libDrakX); use standalone; +use MDK::Common; use common; -use ugtk2 qw(:helpers :wrappers :create); -use interactive; +use mygtk3 qw(gtknew gtkset); +use ugtk3 qw(:create :dialogs :helpers :wrappers); -my $in = 'interactive'->vnew('su'); -local $_ = join '', @ARGV; +$ugtk3::wm_icon = "/usr/share/mcc/themes/default/drakperm-mdk.png"; +require_root_capability(); #- vars declaration my ($level) = chomp_(`cat /etc/sysconfig/msec | grep SECURE_LEVEL= |cut -d= -f2`); -my ($default_perm_level) = "level " . $level; +my $default_perm_level = "level " . $level; my %perm_files = ($default_perm_level => '/usr/share/msec/perm.' . $level, 'editable' => '/etc/security/msec/perm.local', ); @@ -25,46 +26,53 @@ my %perm_l10n = ($default_perm_level => N("System settings"), ); my %rev_perm_l10n = reverse %perm_l10n; my ($editable, $modified) = (0, 0); -my $prec_txt = $default_perm_level; + +my @rules; #- Widget declaration -my $w = ugtk2->new('drakperm'); -$w->{rwindow}->set_size_request(550, 400) unless $::isEmbedded; +my $w = ugtk3->new(N("Security Permissions")); +$w->{rwindow}->set_size_request(620, 400) unless $::isEmbedded; my $W = $w->{window}; -$W->signal_connect(delete_event => sub { ugtk2->exit }); -my $model = Gtk2::ListStore->new("Gtk2::Gdk::Pixbuf", ("Glib::String") x 4); -my $permList = Gtk2::TreeView->new_with_model($model); +$W->signal_connect(delete_event => sub { ugtk3->exit }); +my $model = Gtk3::ListStore->new("Gtk3::Gdk::Pixbuf", ("Glib::String") x 5); +my $permList = Gtk3::TreeView->new_with_model($model); -my $pixbuf = gtkcreate_pixbuf('non-editable'); +my $pixbuf = gtknew('Pixbuf', file => 'non-editable'); my @column_sizes = (150, 100, 100, 15, -1); -$permList->append_column(Gtk2::TreeViewColumn->new_with_attributes(N("Editable"), Gtk2::CellRendererPixbuf->new, 'pixbuf' => 0)); +# TreeView layout is (Editable, Path, User, Group, Permissions, [hidden]index_id) +$permList->append_column(Gtk3::TreeViewColumn->new_with_attributes(N("Editable"), Gtk3::CellRendererPixbuf->new, 'pixbuf' => 0)); each_index { - my $col = Gtk2::TreeViewColumn->new_with_attributes($_, Gtk2::CellRendererText->new, 'text' => $::i + 1); + my $col = Gtk3::TreeViewColumn->new_with_attributes($_, Gtk3::CellRendererText->new, 'text' => $::i + 1); $col->set_min_width($column_sizes[$::i+1]); $permList->append_column($col); } (N("Path"), N("User"), N("Group"), N("Permissions")); +my $index = 0; +load_perms(); + #- widgets settings -my $combo_perm = new Gtk2::OptionMenu; -$combo_perm->set_popdown_strings(sort(values %perm_l10n)); +my $combo_perm_value = $perm_l10n{all}; +my $combo_perm = gtknew('ComboBox', list => [ sort(values %perm_l10n) ], text_ref => \$combo_perm_value); sub add_callback() { - row_setting_dialog(); + row_setting_dialog(N("Add a new rule")); $modified++; } sub edit_callback() { my (undef, $iter) = $permList->get_selection->get_selected; return unless $iter; - row_setting_dialog($iter); + row_setting_dialog(N("Edit current rule"), $iter); } my @buttons; sub del_callback() { my ($tree, $iter) = $permList->get_selection->get_selected; + my $removed_idx = $tree->get($iter, 5); + @rules = grep { $_->{index} ne $removed_idx } @rules; $tree->remove($iter); sensitive_buttons(0); $modified++; @@ -86,52 +94,56 @@ sub move_callback { $permList->queue_draw; } -my $combo_sig = $combo_perm->entry->signal_connect(changed => sub { display_perm($rev_perm_l10n{$combo_perm->entry->get_text} , @_) }); - $permList->signal_connect(button_press_event => sub { return unless $editable; my (undef, $event) = @_; my (undef, $iter) = $permList->get_selection->get_selected; return unless $iter; - row_setting_dialog($iter) if $event->type eq '2button-press'; + row_setting_dialog(N("Edit current rule"), $iter) if $event->type eq '2button-press'; }); -my $tips = new Gtk2::Tooltips; - -$W->add(gtkpack_(Gtk2::VBox->new(0,5), - 0, gtkset_property(Gtk2::Label->new(N("Drakperm is used to see files to use in order to fix permissions, owners, and groups via msec.\nYou can also edit your own rules which will owerwrite the default rules.")), 'wrap', 1), - 1, gtkadd(Gtk2::Frame->new, - gtkpack_(Gtk2::VBox->new(0,5), - 0, gtkadd(Gtk2::HBox->new(0,5), - Gtk2::Label->new(N("The current security level is %s -Select permissions to see/edit", $default_perm_level)), - $combo_perm - ), - 1, create_scrolled_window($permList), - 0, my $up_down_box = gtkadd(Gtk2::HBox->new(0, 5), @buttons = +$W->add(gtknew('VBox', spacing => 5, children => [ + if_(!$::isEmbedded, 0, Gtk3::Banner->new('/usr/share/mcc/themes/default/drakperm-mdk.png', N("Permissions"))), + 0, gtknew('Label_Left', text => N("Here you can see files to use in order to fix permissions, owners, and groups via msec.\nYou can also edit your own rules which will overwrite the default rules."), alignment => [ 0.5, 0 ]), + 1, gtknew('VBox', border_width => 0, children => [ + 0, gtknew('Label_Left', text => N("The current security level is %s. +Select permissions to see/edit", $level), alignment => [ 0, 0 ]), + 0, gtknew('HButtonBox', layout => 'start', children => [ + 0, $combo_perm, + ]), + 0, gtknew('Label'), + 1, gtknew('ScrolledWindow', child => $permList), + 0, my $up_down_box = gtknew('HBox', spacing => 5, children_loose => [ @buttons = map { - gtkset_tip($tips, - gtksignal_connect(Gtk2::Button->new($_->[0]), clicked => $_->[2]), + gtkset_tip( + gtknew('Button', text => $_->[0], clicked => $_->[2]), $_->[1]); } ([ N("Up"), N("Move selected rule up one level"), sub { move_callback('up') } ], [ N("Down"), N("Move selected rule down one level"), sub { move_callback('down') } ], [ N("Add a rule"), N("Add a new rule at the end"), \&add_callback ], [ N("Delete"), N("Delete selected rule"), \&del_callback ], - [ N("Edit"), N("Edit current rule"), \&edit_callback ])), - 0, gtkpack(Gtk2::HButtonBox->new, - gtksignal_connect(Gtk2::Button->new(N("Cancel")), clicked => sub { ugtk2->exit }), - gtksignal_connect(Gtk2::Button->new(N("Ok")), clicked => \&save_perm), - ) - ) - ) - ) + [ N("Edit"), N("Edit current rule"), \&edit_callback ]) ]), + 0, gtknew('VBox'), + ]), + 0, create_okcancel({ + cancel_clicked => sub { ugtk3->exit }, + ok_clicked => \&save_perm, + }, + undef, undef, '', + [ N("Help"), sub { run_program::raw({ detach => 1 }, 'drakhelp', '--id', 'drakperm') } ], + ) + ]) ); $W->show_all; $w->{rwindow}->set_position('center') unless $::isEmbedded; -display_perm($default_perm_level); -$combo_perm->entry->set_text($perm_l10n{$default_perm_level}); +display_perm('all'); +my $_combo_sig = $combo_perm->entry->signal_connect(changed => sub { + my $class = $rev_perm_l10n{$combo_perm_value}; + $permList->set_reorderable($class eq 'editable'); + display_perm($class , @_); + }); $permList->get_selection->signal_connect('changed' => sub { my ($select) = @_; @@ -146,7 +158,7 @@ $permList->get_selection->signal_connect('changed' => sub { }); $w->main; -ugtk2->exit; +ugtk3->exit; sub hide_up_button_iffirst_item { @@ -162,255 +174,255 @@ sub hide_down_button_iflast_item { $buttons[1]->set_sensitive($next_item && !$model->get($next_item, 0)); } -sub check_save() { - $modified or return 0; - my $sav_ = $in->ask_okcancel('Warning', 'your changed will be lost do you wish to continue?'); - $sav_ and $modified = 0; - return $sav_; -} sub display_perm { - my $perm_level = shift @_; + my ($perm_level) = @_; return unless $perm_level; - my @files = $perm_level eq 'all' ? (sort values %perm_files) : $perm_files{$perm_level}; - my $sav_ = &check_save; - if ($modified && ! $sav_) { - $combo_perm->entry->signal_handler_block($combo_sig); - $combo_perm->entry->set_text($prec_txt); - $combo_perm->entry->signal_handler_unblock($combo_sig); - return 0; + my $show_sys_rules = $perm_level eq $default_perm_level; + my $show_user_rules = $perm_level eq 'editable'; + my $show_all_rules = $perm_level eq 'all'; + # cleaner way: only remove filtered out rules, add those not any more filtered rather than refilling the whole tree + $model->clear; + foreach my $rule (@rules) { + next if !$show_all_rules && ($show_user_rules && $rule->{editable} || $show_sys_rules && !$rule->{editable}); + $model->append_set(map_index { if_(defined $rule->{$_}, $::i => $rule->{$_}) } qw(editable path user group perms index)); } + # alter button box behavior $editable = $perm_level =~ /^level \d/ ? 0 : 1; - - $model->clear; - foreach my $file (@files) { - local *F; - open F, $file; - - local $_; - my $is_uneditable = $file ne $perm_files{editable}; - while (<F>) { - if (m/^([^#]\S+)\s+([^.\s]+)\.(\S+)?\s+(\d+)/) { - $model->append_set(if_($is_uneditable, 0 => $pixbuf), 1 => $1, 2 => $2, 3 => $3, 4 => $4); - } elsif (m/^([^#]\S+)\s+current?\s+(\d+)/) { - $model->append_set(if_($is_uneditable, 0 => $pixbuf), 1 => $1, 2 => 'current', 3 => '', 4 => $2); - } - } - close F; - } $up_down_box->set_sensitive($editable); sensitive_buttons(0) if $editable; - - $prec_txt = $perm_level; } sub save_perm() { my $val; if ($modified) { - local *F; - open F, '>' . $perm_files{editable} or die("Impossible to process \"", $perm_files{editable}, "\""); + my $F; + open $F, '>' . $perm_files{editable} or die(qq(Impossible to process "$perm_files{editable}")); $model->foreach(sub { my ($model, $_path, $iter) = @_; return 0 if $model->get($iter, 0); my $line = $model->get($iter, 1) . "\t" . $model->get($iter, 2) . ($model->get($iter, 3) ? "." . $model->get($iter, 3) : "") . "\t" . $model->get($iter, 4) . "\n"; - print F $line; + print $F $line; return 0; }, $val); - close F; + close $F; } $modified = 0; - ugtk2->exit; + ugtk3->exit; +} + +sub load_perms() { + foreach my $file (@perm_files{($default_perm_level, 'editable')}) { + my @editable = if_($file ne $perm_files{editable}, editable => $pixbuf); + local $_; + foreach (cat_($file)) { + next if /^#/; + # Editable, Path, User, Group, Permissions + if (m/^(\S+)\s+([^.\s]+)\.(\S+)?\s+(\d+)/) { + push @rules, { @editable, path => $1, user => $2, group => $3, perms => $4, index => $index }; + } elsif (m/^(\S+)\s+current?\s+(\d+)/) { + push @rules, { @editable, path => $1, user => 'current', group => '', perms => $2, index => $index }; + } else { + warn qq(unparsable "$_"line); + } + $index++; + } + } } sub row_setting_dialog { - my ($iter) = @_; + my ($title, $o_iter) = @_; - my $dlg = new Gtk2::Dialog(); - $dlg->set_transient_for($w->{rwindow}) unless $::isEmbedded; - $dlg->set_modal(1); + my $dlg = gtknew('Dialog', transient_for => $w->{real_window}, title => $title); # $dlg->set_resizable(0); - my $ok = Gtk2::Button->new(N("Ok")); - my $cancel = Gtk2::Button->new(N("Cancel")); - my $browse = new Gtk2::Button(N("browse")); - my $file = new Gtk2::Entry; - my $usr_check = new Gtk2::CheckButton(N("Current user")); - my $sticky = new Gtk2::CheckButton(N("Sticky-bit")); - my $suid = new Gtk2::CheckButton(N("Set-UID")); - my $gid = new Gtk2::CheckButton(N("Set-GID")); - my $rght = $model->get($iter, 4) if $iter; - my $s = length($rght) == 4 ? substr($rght,0,1) : 0; - my $user = $s ? substr($rght,1,1) : substr($rght,0,1); - my $group = $s ? substr($rght,2,1) : substr($rght,1,1); - my $other = $s ? substr($rght,3,1) : substr($rght,2,1); + my $browse = gtknew('Button', text => N("browse")); + my $file = gtknew('Entry', $o_iter ? (text => $model->get($o_iter, 1)) : ()); + my ($other, $group, $user, $s) = $o_iter ? reverse(split(//, $model->get($o_iter, 4))) : (); + my @bits = qw(sticky gid suid); + my @rights = qw(read write execute); + my @owners = (N_("user"), N_("group"), N_("other")); my %rights = (user => $user, group => $group, other => $other); my %rights_labels = (user => N("User"), group => N("Group"), other => N("Other")); - my @check = ('', 'read', 'write', 'execute'); - my %checks = ('read' => { label => N("Read"), - tip => { map { $_ => N("Enable \"%s\" to read the file", $_) } keys %rights }, + tip => { map { $_ => + #-PO: here %s will be either "user", "group" or "other" + N("Enable \"%s\" to read the file", translate($_)); + } keys %rights }, }, 'write' => { label => N("Write"), - tip => { map { $_ => N("Enable \"%s\" to write the file", $_) } keys %rights }, + tip => { map { $_ => + #-PO: here %s will be either "user", "group" or "other" + N("Enable \"%s\" to write the file", translate($_)); + } keys %rights }, }, 'execute' => { label => N("Execute"), - tip => { map { $_ => N("Enable \"%s\" to execute the file", $_) } keys %rights }, + tip => { map { $_ => + #-PO: here %s will be either "user", "group" or "other" + N("Enable \"%s\" to execute the file", translate($_)); + } keys %rights }, }, - '' => { label => '', tip => '' }, + sticky => { label => N("Sticky-bit"), tip => N("Used for directory:\n only owner of directory or file in this directory can delete it") }, + suid => { label => N("Set-UID"), tip => N("Use owner id for execution") }, + gid => { label => N("Set-GID"), tip => N("Use group id for execution") }, ); - $tips->set_tip($sticky, N("Used for directory:\n only owner of directory or file in this directory can delete it")); - $tips->set_tip($suid, N("Use owner id for execution")); - $tips->set_tip($gid, N("Use group id for execution")); - $tips->set_tip($usr_check, N("When checked, owner and group won't be changed")); #- dlg widgets settings my %s_right = get_right($s); - $sticky->set_active($s_right{execute}); - $gid->set_active($s_right{write}); - $suid->set_active($s_right{read}); - $file->set_text($model->get($iter, 1)) if $iter; + my $alrd_exsts = defined $o_iter; - my $users = Gtk2::OptionMenu->new; - $users->set_popdown_strings(&get_user_or_group('users')); - $users->entry->set_text($model->get($iter, 2)) if $iter; + my $users = gtknew('ComboBox', list => [ my @users = get_user_or_group('users') ]); + $users->entry->set_text($model->get($o_iter, 2)) if $o_iter; + $users->set_wrap_width(3); - my $groups = Gtk2::OptionMenu->new; - $groups->set_popdown_strings(&get_user_or_group); - $groups->entry->set_text($model->get($iter, 3)) if $iter; + my $groups = gtknew('ComboBox', list => [ my @groups = get_user_or_group('groups') ]); + $groups->entry->set_text($model->get($o_iter, 3)) if $o_iter; + $groups->set_wrap_width(3); + + my $id_box = gtknew('Table', homogeneous => 0, xpadding => 0.1, ypadding => 0, border_width => 0, children => [ + [ gtknew('Label_Left', text => N("User:")), $users ], + [ gtknew('Label_Left', text => N("Group:")), $groups ], + ] + ); + + my $usr_check = gtksignal_connect(gtkset_tip(gtknew('CheckButton', text => N("Current user")), + N("When checked, owner and group will not be changed")), + clicked => sub { $id_box->set_sensitive(!$_[0]->get_active) }); - if ($iter && $model->get($iter, 2) eq 'current') { + if ($o_iter && $model->get($o_iter, 2) eq 'current') { $usr_check->set_active(1); - $groups->set_sensitive(0); - $users->set_sensitive(0); - } + $id_box->set_sensitive(0); + } else { $usr_check->set_active(0) } - $tips->set_tip($sticky, N("Used for directory:\n only owner of directory or file in this directory can delete it")); - $tips->set_tip($suid, N("Use owner id for execution")); - $tips->set_tip($gid, N("Use group id for execution")); - $tips->set_tip($usr_check, N("when checked, owner and group won't be changed")); - $cancel->signal_connect(clicked => sub { $dlg->destroy }); $browse->signal_connect(clicked => sub { - my $file_dlg = new Gtk2::FileSelection(N("Path selection")); - $file_dlg->set_modal(1); - $file_dlg->set_transient_for($dlg); - $file_dlg->show; + my $file_dlg = gtknew('FileChooserDialog', title => N("Path selection"), action => 'select_folder', + modal => 1, transient_for => $dlg); $file_dlg->set_filename($file->get_text); - $file_dlg->cancel_button->signal_connect(clicked => sub { $file_dlg->destroy }); - $file_dlg->ok_button->signal_connect(clicked => sub { - $file->set_text($file_dlg->get_filename); - $file_dlg->destroy; - }); + $file_dlg->show; + my $answer = $file_dlg->run; + if ($answer eq 'ok') { + $file->set_text($file_dlg->get_filename); + } + $file_dlg->hide; + $file_dlg->destroy; }); my %perms; - $ok->signal_connect(clicked => sub { - if (!$iter) { # create new item when adding a new one - $iter = $model->append; - my $first_iter = $model->get_iter_first; - if ($first_iter) { - $model->move_after($iter, $first_iter); - $model->swap($iter, $first_iter); - } - } - $model->set($iter, 1 => $file->get_text); - if ($usr_check->get_active) { - $model->set($iter, 2 => 'current'); - $model->set($iter, 3 => ''); - } else { - $model->set($iter, 2 => $users->entry->get_text); - $model->set($iter, 3 => $groups->entry->get_text); - } - $user = ($perms{user}{read}->get_active ? 4 : 0)+($perms{user}{write}->get_active ? 2 : 0)+($perms{user}{execute}->get_active ? 1 : 0); - $group = ($perms{group}{read}->get_active ? 4 : 0)+($perms{group}{write}->get_active ? 2 : 0)+($perms{group}{execute}->get_active ? 1 : 0); - $other = ($perms{other}{read}->get_active ? 4 : 0)+($perms{other}{write}->get_active ? 2 : 0)+($perms{other}{execute}->get_active ? 1 : 0); - my $s = ($sticky->get_active ? 1 : 0) + ($suid->get_active ? 4 : 0) + ($gid->get_active ? 2 : 0); - $model->set($iter, 4 => ($s || '') . $user . $group . $other); - $dlg->destroy; - $modified++; - }); - $usr_check->signal_connect(clicked => sub { - my $bool = $usr_check->get_active; - $groups->set_sensitive(!$bool); - $users->set_sensitive(!$bool); - }); - gtkpack_($dlg->vbox, - 0, gtkadd(Gtk2::Frame->new(N("Path")), - gtkpack_(Gtk2::HBox->new(0,5), + gtkpack_($dlg->get_child, + 0, gtknew('Title2', label => N("Path")), + 0, gtknew('HBox', border_width => 18, children => [ 1, $file, 0, $browse - ) + ] ), - 0, gtkadd(Gtk2::Frame->new(N("Property")), - gtkadd(Gtk2::VBox->new(0,5), - $usr_check, - gtkadd(Gtk2::HBox->new(0,5), - Gtk2::Label->new(N("User :")), - $users, - Gtk2::Label->new(N("Group :")), - $groups, - ), - ), + 0, gtknew('Title2', label => N("Property")), + 0, gtknew('VBox', border_width => 18, children => [ + 0, $usr_check, + ] ), - 1, gtkadd(Gtk2::Frame->new(N("Permissions")), - gtkpack(Gtk2::HBox->new(0,15), - gtkadd(Gtk2::VBox->new(0,15), - map { gtkset_tip($tips, Gtk2::Label->new($checks{$_}{label}), $checks{$_}{tip}) } @check, - ), + 0, $id_box, + 0, gtknew('Title2', label => N("Permissions")), + 1, gtknew('HBox', border_width => 0, children_loose => [ + gtknew('VBox', border_width => 0, children_loose => [ + gtknew('Label', text => ""), + map { gtknew('Label_Left', text => $checks{$_}{label}, alignment => [ 0, 0 ]) } @rights, + ]), (map { my $owner = $_; $perms{$owner} = { get_right($rights{$owner}) }; - my $vbox = gtkadd(Gtk2::VBox->new(0,5), - Gtk2::Label->new($rights_labels{$owner}), + my $vbox = gtknew('VBox', children_loose => [ + gtknew('Label', text => $rights_labels{$owner}), map { my $c = $_; my $active = $perms{$owner}{$c}; - $perms{$owner}{$c} = Gtk2::CheckButton->new; - $tips->set_tip($perms{$owner}{$c}, + $perms{$owner}{$c} = gtkset_tip(gtknew('CheckButton'), $checks{$c}{tip}{$owner}, ); gtkset_active($perms{$owner}{$c}, $active); - } grep { $_ } @check, - ); + } @rights, + ]); $vbox; - } keys %rights), - gtkpack(Gtk2::VBox->new(0,5), - Gtk2::Label->new(' '), - $suid, - $gid, - $sticky, - ), - ), - ), + } @owners), + gtknew('VBox', children_loose => [ + gtknew('Label', text => ' '), + map { $perms{$_} = gtkset(gtknew('CheckButton', text => $checks{$_}{label}), tip => $checks{$_}{tip}) } @bits, + ]), + ]), ); - - gtkadd($dlg->action_area, - $cancel, - $ok + $perms{sticky}->set_active($s_right{execute}); + $perms{gid}->set_active($s_right{write}); + $perms{suid}->set_active($s_right{read}); + + gtkadd($dlg->get_action_area, + create_okcancel(my $w = + { + cancel_clicked => sub { $dlg->destroy }, + ok_clicked => sub { + my ($path, $user, $group, $perms, $_idx); + $path = $file->get_text; + if ($path !~ m!^/!) { + err_dialog(N("Warning"), N("The first character of the path must be a slash (\"/\"):\n\"%s\"", $path)); + return 1; + } + if ($usr_check->get_active) { + $user = 'current'; + $group = ''; + } else { + $user = $users->entry->get_text; + $group = $groups->entry->get_text; + if (!member($user, @users) || !member($group, @groups)) { + err_dialog(N("Warning"), join("\n", N("Both the username and the group must valid!"), + N("User: %s", $user), + N("Group: %s", $group), + ) + ); + return 1; + } + } + $perms = sprintf("%03o", eval(join('', "0b", + (map { $perms{$_}->get_active || 0 } reverse @bits), + (map { my $owner = $_;map_index { + $perms{$owner}{$_}->get_active || 0; + } @rights } @owners)))); + # create new item if needed (that is when adding a new one) at end of list + if (!$o_iter) { + $o_iter = $model->append; + push @rules, { path => $path, user => $user, group => $group, perms => $perms, index => $index }; + $model->set($o_iter, 5 => $index++); + } + $model->set($o_iter, 1 => $path, 2 => $user, 3 => $group, 4 => $perms); + $dlg->destroy; + $modified++; + } + }, + ), ); + $w->{ok}->set_sensitive(!$model->get($o_iter, 0)) if $alrd_exsts; $dlg->show_all; } sub get_user_or_group { - my $what = @_; + my ($what) = @_; my @users; - local *F; - open F, $what eq 'users' ? '/etc/passwd' : '/etc/group'; local $_; - while (<F>) { - m/^([^#:]+):[^:]+:[^:]+:/ or next; - push @users, $1; + my $is_users = $what eq 'users'; + foreach (cat_($is_users ? '/etc/passwd' : '/etc/group')) { + if ($is_users) { + push @users, $1 if m/^([^#:]+):[^:]+:[^:]+:/; # or next; + } else { + push @users, $1 if m/^([^#:]+):[^:]*:[^:]*:/; # or next; + } } - close F; return sort(@users); } |