tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2014-06-26 Ramon Novoa <rnovoa@artica.es> 

* util/pandora_xml_stress.pl: Remove new line and carriage return
	  characters when parsing the configuration file.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@10290 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
ramonn 2014-06-26 10:11:47 +00:00
parent f2d05bc443
commit a3ac3bb0d8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pandora_server/ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-26 Ramon Novoa <rnovoa@artica.es>
* util/pandora_xml_stress.pl: Remove new line and carriage return
characters when parsing the configuration file.
2014-06-24 Ramon Novoa <rnovoa@artica.es>
* util/recon_scripts/snmp-recon.pl: Improved host connection.

4
pandora_server/util/pandora_xml_stress.pl
View File

@ -47,7 +47,8 @@ sub load_config ($\%\@) {
open (FILE, "<", $conf_file) || die ("[error] Could not open configuration file '$conf_file': $!.\n\n");
while (my $line = <FILE>) {
$line =~ s/[\r\n]+//g;
# A module definition
if ($line =~ m/module_begin/) {
my %module;
@ -56,6 +57,7 @@ sub load_config ($\%\@) {
next if ($line =~ m/^#/);
while (my $line = <FILE>) {
$line =~ s/[\r\n]+//g;
# A comment
next if ($line =~ m/^#/);