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

2010-07-20 Ramon Novoa <rnovoa@artica.es> 

* pandora_server_installer: Set safer permissions for data_in/conf.

        * util/pandora_db.pl: Fixed the setup password regular expression.
          Fixes bug #3026997.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3038 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
Ramon Novoa 2010-07-20 11:51:12 +00:00
parent ece05e4fda
commit 5416881b00
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_server/ChangeLog
View File

@ -1,3 +1,10 @@
2010-07-20 Ramon Novoa <rnovoa@artica.es>
* pandora_server_installer: Set safer permissions for data_in/conf.
* util/pandora_db.pl: Fixed the setup password regular expression.
Fixes bug #3026997.
2010-07-19 Ramon Novoa <rnovoa@artica.es>
* DEBIAN/make_deb_package.sh,

1
pandora_server/pandora_server_installer
View File

@ -199,6 +199,7 @@ perl-TimeDate perl-XML-Simple perl-libwww-perl mysql-client"
mkdir $PANDORA_SPOOL 2> /dev/null
mkdir $PANDORA_SPOOL/data_in 2> /dev/null
mkdir $PANDORA_SPOOL/data_in/conf 2> /dev/null
chmod 750 $PANDORA_SPOOL/data_in/conf
mkdir $PANDORA_SPOOL/data_in/md5 2> /dev/null
chmod 770 $PANDORA_SPOOL/data_in/md5
mkdir $PANDORA_SPOOL/data_in/collections 2> /dev/null

2
pandora_server/util/pandora_db.pl
View File

@ -334,7 +334,7 @@ sub pandora_load_config ($) {
# Read conf file
open (CFG, '< ' . $conf->{'_pandora_path'}) or die ("[ERROR] Could not open configuration file: $!\n");
while (my $line = <CFG>){
next unless ($line =~ m/([\w-_\.]+)\s([0-9\w-_\.\/\?\&\=\)\(\_\-\\*\@\#\%\$\~\"\']+)/);
next unless ($line =~ /^(\S+)\s+(.*)\s+$/);
$conf->{$1} = $2;
}
close (CFG);