michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Put new directives over commented version, to preserve correct file order

Browse Source
This commit is contained in:
Jamie Cameron
2008-11-28 19:54:03 +00:00
parent 8b1408a774
commit 5b4d30ccab
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ldap-server/ldap-server-lib.pl
View File

@@ -269,13 +269,33 @@ for(my $i=0; $i<@old || $i<@values; $i++) {
push(@$conf, $newdir);
}
else {
# At end of file
local $newdir = { 'name' => $name,
'line' => scalar(@$lref),
'eline' => scalar(@$lref),
'values' => \@unqvalues };
push(@$lref, $line);
push(@$conf, $newdir);
# At end of file, or over commented directive
my $cmtline = undef;
for(my $i=0; $i<@$lref; $i++) {
if ($lref->[$i] =~ /^\s*\#+\s*(\S+)/ &&
$1 eq $name) {
$cmtline = $i;
last;
}
}
if (defined($cmtline)) {
# Over comment
local $newdir = { 'name' => $name,
'line' => $cmtline,
'eline' => $cmtline,
'values' => \@unqvalues };
$lref->[$cmtline] = $line;
push(@$conf, $newdir);
}
else {
# Really at end
local $newdir = { 'name' => $name,
'line' => scalar(@$lref),
'eline' => scalar(@$lref),
'values' => \@unqvalues };
push(@$lref, $line);
push(@$conf, $newdir);
}
}
}
}