mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 11:41:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Allow for empty groups (groups with no users) for iSCSI.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@185 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Mark Buechler
2007-09-07 19:48:20 +00:00
parent cf4c66e1f4
commit 3c952e4d0f
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scstadmin/scstadmin
View File

@@ -420,6 +420,8 @@ sub main {
}
sub readWorkingConfig {
my %empty;
print "Collecting current configuration.. ";
$TARGETS = undef;
@@ -452,6 +454,7 @@ sub readWorkingConfig {
foreach my $user (@{$eUsers}) {
$USERS{$group}->{$user}++; # For quick lookups
}
$USERS{$group} = \%empty if (!$USERS{$group});
}
print "done.\n\n";
@@ -570,6 +573,7 @@ sub applyConfiguration {
my %used_devs;
my %used_users;
my %used_assignments;
my %empty;
# Cache device/handler configuration
foreach my $entry (keys %{$$config{'HANDLER'}}) {
@@ -585,6 +589,7 @@ sub applyConfiguration {
foreach my $user (@{$$config{'GROUP'}->{$group}->{'USER'}}) {
$used_users{$group}->{$user}++;
}
$used_users{$group} = \%empty if (!$used_users{$group});
}
# Cache device association configuration
@@ -1373,7 +1378,10 @@ sub readConfig {
my $confile = shift;
my %config;
my $section;
my $last_section;
my $arg;
my $last_arg;
my %empty;
my $io = new IO::File $confile, O_RDONLY;
@@ -1384,7 +1392,13 @@ sub readConfig {
$line = cleanupString($line);
if ($line =~ /^\[(.*)\]$/) {
$last_arg = $arg;
$last_section = $section;
($section, $arg) = split(/\s+/, $1, 2);
if ($last_arg && ($last_arg ne $arg) && !$config{$last_section}->{$last_arg}) {
$config{$last_section}->{$last_arg} = \%empty;
}
} elsif ($section && $arg && $line) {
my($parameter, $value) = split(/\s+/, $line, 2);