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

2013-06-12 Miguel de Dios <miguel.dedios@artica.es> 

* util/pandora_xml_stress.pl: cleaned source code style.
	
	* pandora_server.redhat.spec: added the directories of collections
	and remote configuration into the list of chmod perms.
	
	Fixes: #2290
	
	MERGED FROM THE BRANCH PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8298 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-06-12 12:16:44 +00:00
parent 87267de112
commit d267b07bcd
3 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pandora_server/ChangeLog
View File

@ -1,3 +1,14 @@
2013-06-12 Miguel de Dios <miguel.dedios@artica.es>
* util/pandora_xml_stress.pl: cleaned source code style.
* pandora_server.redhat.spec: added the directories of collections
and remote configuration into the list of chmod perms.
Fixes: #2290
MERGED FROM THE BRANCH PANDORA_4.0
2013-06-07 Ramon Novoa <rnovoa@artica.es>
* pandora_server_installer: Fixed a bug that created

4
pandora_server/pandora_server.redhat.spec
View File

@ -164,5 +164,9 @@ exit 0
/etc/pandora/pandora_server.conf.new
%defattr(770,pandora,apache)
%{_localstatedir}/spool/pandora
%{_localstatedir}/spool/pandora/data_in
%{_localstatedir}/spool/pandora/spool/pandora/data_in/md5
%{_localstatedir}/spool/pandora/spool/pandora/data_in/collections
%{_localstatedir}/spool/pandora/spool/pandora/data_in/conf

31
pandora_server/util/pandora_xml_stress.pl
View File

@ -38,9 +38,9 @@ my $XMLFiles :shared = 0;
my $LogLock :shared;
################################################################################
########################################################################
# Load the configuration file.
################################################################################
########################################################################
sub load_config ($\%\@) {
my ($conf_file, $conf, $modules) = @_;
@ -525,19 +525,20 @@ sub log_message ($$) {
################################################################################
########################################################################
# INI MD5 FUNCTIONS
################################################################################
########################################################################
# Used to calculate the MD5 checksum of a string
use constant MOD232 => 2**32;
###############################################################################
# MD5 leftrotate function. See http://en.wikipedia.org/wiki/MD5#Pseudocode.
###############################################################################
########################################################################
# MD5 leftrotate function.
# See http://en.wikipedia.org/wiki/MD5#Pseudocode.
########################################################################
sub leftrotate ($$) {
my ($x, $c) = @_;
return (0xFFFFFFFF & ($x << $c)) | ($x >> (32 - $c));
}
@ -625,21 +626,21 @@ sub md5 ($) {
$f = $c ^ ($b | (0xFFFFFFFF & (~ $d)));
$g = (7 * $y) % 16;
}
my $temp = $d;
$d = $c;
$c = $b;
$b = ($b + leftrotate (($a + $f + $K[$y] + $w[$g]) % MOD232, $R[$y])) % MOD232;
$a = $temp;
}
# Add this chunk's hash to result so far
$h0 = ($h0 + $a) % MOD232;
$h1 = ($h1 + $b) % MOD232;
$h2 = ($h2 + $c) % MOD232;
$h3 = ($h3 + $d) % MOD232;
}
# Digest := h0 append h1 append h2 append h3 #(expressed as little-endian)
return unpack ("H*", pack ("V", $h0)) . unpack ("H*", pack ("V", $h1)) . unpack ("H*", pack ("V", $h2)) . unpack ("H*", pack ("V", $h3));
}
@ -875,15 +876,15 @@ sub parse_local_conf($$) {
# A module definition
if ($line =~ m/module_begin/) {
my %module;
# A comment
next if ($line =~ m/^#/);
while (my $line = <CONF_FILE>) {
# A comment
next if ($line =~ m/^#/);
last if ($line =~ m/module_end/);
# Unknown line