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

remove group limits checks

Browse Source
This commit is contained in:
Wolfram Schneider 1996-12-29 15:06:52 +00:00
parent c84f83e0c2
commit 9a43d0d77b
2 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
usr.sbin/adduser/addgroup.tcl
View File

@ -29,7 +29,7 @@
# signal handling
# add only users who exist
#
# $Id: addgroup.tcl,v 1.5 1996/10/29 19:11:50 wosch Exp wosch $
# $Id: addgroup.tcl,v 1.1 1996/10/29 20:31:43 wosch Exp $
# set global variables
set etc_group "/etc/group"; #set etc_group "/usr/tmp/group"
@ -66,23 +66,6 @@ proc double_name {groupmembers} {
return 0
}
# check group(5) limits
proc group_limit {string} {
set line_max 100; # max group line length
set groups_max 200; # max group members
if {[string length $string] >= $line_max} {
return 1
}
set l [split $string ","]
if {[llength $l] >= $groups_max} {
return 1
}
return 0
}
# cleanup and die
proc Err {string} {
upvar etc_group_new new
@ -172,20 +155,12 @@ while {[gets $db line] >= 0 } {
# group with no group members?
if {[string compare $y ""] == 0} {
if {[group_limit "$line$groupmembers"] == 0} {
puts $db_new "$line$groupmembers"
} else {
Err "group line too long: ``$line$groupmembers''"
}
puts $db_new "$line$groupmembers"
} else {
if {[group_limit "$line,$groupmembers"] == 0} {
if {[double_name "$y,$groupmembers"] != 0} {
Err "\t$line,$groupmembers"
} else {
puts $db_new "$line,$groupmembers"
}
if {[double_name "$y,$groupmembers"] != 0} {
Err "\t$line,$groupmembers"
} else {
Err "group line too long: ``$line,$groupmembers''"
puts $db_new "$line,$groupmembers"
}
}
set done 1
@ -198,11 +173,7 @@ while {[gets $db line] >= 0 } {
if {$done == 0} {
for {set i $gid_start} {$i < $gid_max} {incr i} {
if {[info exists gid($i)] == 0} {
if {[group_limit "$groupname:*:$i:$groupmembers"] == 0} {
puts $db_new "$groupname:*:$i:$groupmembers"
} else {
Err "group line too long: ``$groupname:*:$i:$groupmembers''"
}
puts $db_new "$groupname:*:$i:$groupmembers"
set done 1
break
}

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

@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
# $Id: adduser.perl,v 1.22 1996/12/07 21:25:12 ache Exp $
# $Id: adduser.perl,v 1.23 1996/12/23 00:10:19 mpp Exp $
# read variables
@ -394,15 +394,6 @@ sub add_group {
$groupmembers{$gid} .= "," if $groupmembers{$gid};
$groupmembers{$gid} .= "$name";
local(@l) = split(',', $groupmembers{$gid});
# group(5): A group cannot have more than 200 members.
# The maximum line length of /etc/group is 1024 characters.
# Longer lines will be skiped.
if ($#l >= 200 ||
length($groupmembers{$gid}) > 1024 - 50) { # 50 is for group name
warn "WARNING, maybe group line ``$gid{$gid}'' is to long or to\n" .
"much users in group, see group(5)\a\n";
}
return $name;
}