diff --git a/bureau/admin/sql_dorestore.php b/bureau/admin/sql_dorestore.php index cb9131f9..d4308322 100644 --- a/bureau/admin/sql_dorestore.php +++ b/bureau/admin/sql_dorestore.php @@ -43,7 +43,7 @@ if ($r["enabled"]) {

restore($restfile,true,$r)) { +if (!$mysql->restore($restfile,true,$id)) { $error=$err->errstr(); } else { $error=_("Your database has been restored, check out the previous text for error messages."); diff --git a/bureau/class/m_mysql.php b/bureau/class/m_mysql.php index 38b24d2b..813aeca9 100644 --- a/bureau/class/m_mysql.php +++ b/bureau/class/m_mysql.php @@ -298,7 +298,7 @@ class m_mysql { */ function restore($file,$stdout,$id) { global $err,$bro,$mem,$L_MYSQL_HOST; - if (!$r=$mysql->get_mysql_details($id)) { + if (!$r=$this->get_mysql_details($id)) { return false; } if (!($fi=$bro->convertabsolute($file,0))) { diff --git a/install/alternc.install b/install/alternc.install index 7038c5de..68b45d8c 100644 --- a/install/alternc.install +++ b/install/alternc.install @@ -182,7 +182,7 @@ ln -nsf /var/alternc/bureau /var/alternc/dns/$FQDN_LETTER/$FQDN # Bind stuff touch /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf chown root:bind /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf -chmod 640 /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf +chmod 640 /var/alternc/bind/automatic.conf /var/alternc/bind/slaveip.conf touch /var/run/alternc/refresh_slave /usr/lib/alternc/slave_dns @@ -207,6 +207,10 @@ if [ -e /etc/courier/authmysqlrc ] ; then chmod 640 /etc/courier/authmysqlrc fi +if [ -e /etc/proftpd.conf ] ; then + chmod 640 /etc/proftpd.conf +fi + ####################################################################### # Reload services #