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

2012-08-28 Junichi Satoh <junichi@rworks.jp> 

* pandora_agent: Improved to be able to use CRLF in pandora_agent.conf.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6917 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
jsatoh 2012-08-28 04:42:28 +00:00
parent b65d36054e
commit bd5abdf277
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_agents/unix/ChangeLog
View File

@ -1,3 +1,7 @@
2012-08-28 Junichi Satoh <junichi@rworks.jp>
* pandora_agent: Improved to be able to use CRLF in pandora_agent.conf.
2012-08-15 Junichi Satoh <junichi@rworks.jp> 2012-08-15 Junichi Satoh <junichi@rworks.jp>
* pandora_agent: Changed not to use thread library when agent_threads * pandora_agent: Changed not to use thread library when agent_threads

3
pandora_agents/unix/pandora_agent
View File

@ -577,6 +577,9 @@ sub read_config (;$) {
# Skip comments and empty lines # Skip comments and empty lines
next if ($line =~ m/^\s*#/) or ($line =~ m/^\s*$/); next if ($line =~ m/^\s*#/) or ($line =~ m/^\s*$/);
# Replace CRLF with LF
$line =~ s/\r\n/\n/g;
# Token search # Token search
if (defined ($token)) { if (defined ($token)) {
if ($line =~ /^\s*(\S+)\s+(.*)$/ && $1 eq $token) { if ($line =~ /^\s*(\S+)\s+(.*)$/ && $1 eq $token) {