From 5416881b00e3dd6958f158a719a6a003efc6935d Mon Sep 17 00:00:00 2001
From: Ramon Novoa <rnovoa@artica.es>
Date: Tue, 20 Jul 2010 11:51:12 +0000
Subject: [PATCH] 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
---
pandora_server/ChangeLog | 7 +++++++
pandora_server/pandora_server_installer | 1 +
pandora_server/util/pandora_db.pl | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index 527838aaf6..50e37809ea 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -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,
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 907d7a3206..95f765d569 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -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
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 29919da3cc..8599b16dec 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -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);