d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

By popular demand, have adduser preserve comments at the top of the

Browse Source 
group file. Because of the way the group sorting works while printing
out the new file it's not possible at this time to restore comments
in other locations, but at least they won't just disappear altogether.
This commit is contained in:
Doug Barton 2001-04-17 09:42:07 +00:00
parent f84e29a06c
commit 555dff94cc
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/adduser/adduser.perl
View File

@ -70,6 +70,7 @@ sub variables {
$groupname =''; # $groupname{groupname} = gid
$groupmembers = ''; # $groupmembers{gid} = members of group/kommalist
$gid = ''; # $gid{gid} = groupname; gid form group db
@group_comments; # Comments in the group file
# shell
$shell = ''; # $shell{`basename sh`} = sh
@ -265,9 +266,13 @@ sub group_read {
while(<G>) {
chop;
push(@group_backup, $_);
# ignore comments
# Ignore empty lines
next if /^\s*$/;
next if /^\s*#/;
# Save comments to restore later
if (/^\s*\#/) {
push(@group_comments, $_);
next;
}
($g_groupname, $pw, $g_gid, $memb) = (split(/:/, $_))[0..3];
@ -566,6 +571,9 @@ sub new_users_group_update {
# new login group is already in name space
rename($group, "$group.bak");
#warn "$group_login $groupname{$group_login} $groupmembers{$groupname{$group_login}}\n";
# Restore comments from the top of the group file
@a = @group_comments;
foreach $e (sort {$a <=> $b} (keys %gid)) {
push(@a, "$gid{$e}:*:$e:$groupmembers{$e}");
}