View | Details | Raw Unified | Return to bug 354592
Collapse All | Expand All

(-)/root/DhcpServer.pm (-8 / +6 lines)
Lines 2128-2134 Link Here
2128
    {
2128
    {
2129
	@options = @{$self->GetEntryDirectives ("", "") || []};
2129
	@options = @{$self->GetEntryDirectives ("", "") || []};
2130
    }
2130
    }
2131
    @options = @{$self->SetOption (\@options, $option, $value) || []};
2131
    @options = @{SetOption (\@options, $option, $value) || []};
2132
    if (substr ($option, 0, 7) eq "option ")
2132
    if (substr ($option, 0, 7) eq "option ")
2133
    {
2133
    {
2134
	$ret = $self->SetEntryOptions ("", "", \@options);
2134
	$ret = $self->SetEntryOptions ("", "", \@options);
Lines 2152-2175 Link Here
2152
    my @options = ();
2152
    my @options = ();
2153
    my $ret = 0;
2153
    my $ret = 0;
2154
2154
2155
    my $id = $subnet . " netmask " . $netmask;
2156
2157
    if (substr ($option, 0, 7) eq "option ")
2155
    if (substr ($option, 0, 7) eq "option ")
2158
    {
2156
    {
2159
	@options = @{$self->GetEntryOptions ("subnet", $id) || []};
2157
	@options = @{$self->GetEntryOptions ("subnet", "") || []};
2160
    }
2158
    }
2161
    else
2159
    else
2162
    {
2160
    {
2163
	@options = @{$self->GetEntryDirectives ("subnet", $id) || []};
2161
	@options = @{$self->GetEntryDirectives ("subnet", "") || []};
2164
    }
2162
    }
2165
    @options = @{$self->SetOption (\@options, $option, $value) || []};
2163
    @options = @{SetOption (\@options, $option, $value) || []};
2166
    if (substr ($option, 0, 7) eq "option ")
2164
    if (substr ($option, 0, 7) eq "option ")
2167
    {
2165
    {
2168
	$ret = $self->SetEntryOptions ("subnet", $id, \@options);
2166
	$ret = $self->SetEntryOptions ("subnet", "", \@options);
2169
    }
2167
    }
2170
    else
2168
    else
2171
    {
2169
    {
2172
	$ret = $self->SetEntryDirectives ("subnet", $id, \@options);
2170
	$ret = $self->SetEntryDirectives ("subnet", "", \@options);
2173
    }
2171
    }
2174
    $modified = 1;
2172
    $modified = 1;
2175
    return Boolean ($ret);
2173
    return Boolean ($ret);

Return to bug 354592