Attachment 190917 Details for Bug 354592

[patch] fixes the bug

DhcpServer.pm.patch (text/plain), 1.39 KB, created by Thadeu Cascardo on 2008-01-17 21:19:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thadeu Cascardo

Created: 2008-01-17 21:19:38 UTC

Size: 1.39 KB

patch

obsolete

>--- /root/DhcpServer.pm	2008-01-17 19:19:01.000000000 -0200
>+++ ../modules/DhcpServer.pm	2006-11-13 11:37:20.000000000 -0200
>@@ -2128,7 +2128,7 @@
>     {
> 	@options = @{$self->GetEntryDirectives ("", "") || []};
>     }
>-    @options = @{$self->SetOption (\@options, $option, $value) || []};
>+    @options = @{SetOption (\@options, $option, $value) || []};
>     if (substr ($option, 0, 7) eq "option ")
>     {
> 	$ret = $self->SetEntryOptions ("", "", \@options);
>@@ -2152,24 +2152,22 @@
>     my @options = ();
>     my $ret = 0;
> 
>-    my $id = $subnet . " netmask " . $netmask;
>-
>     if (substr ($option, 0, 7) eq "option ")
>     {
>-	@options = @{$self->GetEntryOptions ("subnet", $id) || []};
>+	@options = @{$self->GetEntryOptions ("subnet", "") || []};
>     }
>     else
>     {
>-	@options = @{$self->GetEntryDirectives ("subnet", $id) || []};
>+	@options = @{$self->GetEntryDirectives ("subnet", "") || []};
>     }
>-    @options = @{$self->SetOption (\@options, $option, $value) || []};
>+    @options = @{SetOption (\@options, $option, $value) || []};
>     if (substr ($option, 0, 7) eq "option ")
>     {
>-	$ret = $self->SetEntryOptions ("subnet", $id, \@options);
>+	$ret = $self->SetEntryOptions ("subnet", "", \@options);
>     }
>     else
>     {
>-	$ret = $self->SetEntryDirectives ("subnet", $id, \@options);
>+	$ret = $self->SetEntryDirectives ("subnet", "", \@options);
>     }
>     $modified = 1;
>     return Boolean ($ret);

Actions: View | Diff

Attachments on bug 354592: 190917