mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-25 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Only retry creating a temp group name the max possible names

Browse Source 
to prevent an infinite loop. Since we're using rand() here,
  it's possible we could exit the loop with no unique name.     
  However, this is pretty unlikely considering thousands
  if temp group names would have to already exist.
- Fail out if we can't come up with a temp group name and just
  use the original specified.



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1143 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2009-09-25 14:11:43 +00:00
parent 35a00370ae
commit af3245ca0a
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
scstadmin/scstadmin
View File

@@ -972,11 +972,17 @@ sub applyConfiguration {
if ($group =~ /^$_TGT_DEF_PREFIX_/) {
my $tmp_group = randomGroup();
print "\t-> Using temporary group '$tmp_group' for group '$group'.\n";
if (!defined($tmp_group)) {
print "\t-> WARNING: Unable to find a free temporary group for '$group', ".
"using the original group name instead.\n";
$rename_group{$tmp_group} = $group;
$used_users{$tmp_group} = $used_users{$group};
$group = $tmp_group;
} else {
print "\t-> Using temporary group '$tmp_group' for group '$group'.\n";
$rename_group{$tmp_group} = $group;
$used_users{$tmp_group} = $used_users{$group};
$group = $tmp_group;
}
}
if ($check) {
@@ -1955,13 +1961,17 @@ sub validHandlerTypes {
sub randomGroup {
my $tmp_group;
my $retry = 0;
while (!$tmp_group || $SCST->groupExists($tmp_group)) {
while (($retry < 10000) && (!$tmp_group || $SCST->groupExists($tmp_group))) {
my $id = int(rand(10000));
$tmp_group = $_TGT_TMP_PREFIX_.$id;
$retry++;
}
return undef if ($SCST->groupExists($tmp_group));
return $tmp_group;
}