minor fixes

diff --git a/htdocs/cgi-bin/system/modules/CNFParser.pm b/htdocs/cgi-bin/system/modules/CNFParser.pm
index c05759f5cb595c82f8c80fa763213396bfdb105b..6feaed25afddf5a30ba2bb1719b2e3122b4e571b 100644 (file)
--- a/htdocs/cgi-bin/system/modules/CNFParser.pm
+++ b/htdocs/cgi-bin/system/modules/CNFParser.pm
@@ -263,7 +263,7 @@ try{
             }              
 
             if($t eq 'CONST'){#Single constant with mulit-line value;
-               $v =~ s/^\s//;
+               $v =~ s/^\s// if $v;
                $consts{$e} = $v if not $consts{$e}; # Not allowed to overwrite constant.
             }elsif($t eq 'DATA'){
                $st ="";
@@ -278,7 +278,7 @@ try{
                             $v =  $d;            #capture spected value.
                             $d =~ s/\$$|\s*$//g; #trim any space and system or constant '$' end marker.
                             if($v=~m/\$$/){
-                                $v = $consts{$d}
+                                $v = $consts{$d}; $v="" if not $v;
                             }
                             else{
                                 $v = $d;