diff --git a/bureau/class/m_bro.php b/bureau/class/m_bro.php index 030809db..56210142 100644 --- a/bureau/class/m_bro.php +++ b/bureau/class/m_bro.php @@ -659,23 +659,28 @@ class m_bro { return 1; } $lfile = strtolower($file); - if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z") { + if (substr($lfile, -4) == ".tar" || substr($lfile, -8) == ".tar.bz2" || substr($lfile, -7) == ".tar.gz" || substr($lfile, -6) == ".tar.z" || substr($lfile, -4) == ".tgz" || substr($lfile, -4) == ".tbz" || substr($lfile, -5) == ".tbz2" ) { // TODO new version of tar supports `tar xf ...` so there is no // need to specify the compression format echo "
" . _("Uncompressing through TAR") . "
"; $ret = 0; - passthru("tar -xvf " . escapeshellarg($file) . " -C " . escapeshellarg($dest) . " 2>&1", $ret); + passthru("tar -xvf " . escapeshellarg($file) . " --numeric-owner -C " . escapeshellarg($dest) . " 2>&1", $ret); } - if (substr($lfile, -4) == ".zip") { + elseif (substr($lfile, -4) == ".zip") { echo "" . _("Uncompressing through UNZIP") . "
"; $cmd = "unzip -o " . escapeshellarg($file) . " -d " . escapeshellarg($dest) . " 2>&1"; passthru($cmd, $ret); } - if (substr($lfile, -3) == ".gz" && substr($lfile, -7) != ".tar.gz") { + elseif (substr($lfile, -3) == ".gz" || substr($lfile, -2) == ".Z") { echo "" . _("Uncompressing through GUNZIP") . "
"; $cmd = "gunzip " . escapeshellarg($file) . " 2>&1"; passthru($cmd, $ret); } + elseif (substr($lfile, -3) == ".bz" || substr($lfile, -4) == ".bz2") { + echo "" . _("Uncompressing through bunzip2") . "
"; + $cmd = "bunzip2 " . escapeshellarg($file) . " 2>&1"; + passthru($cmd, $ret); + } echo ""; if ($ret) { $err->raise("bro", _("I cannot find a way to extract the file %s, it is an unsupported compressed format"), $file); diff --git a/bureau/class/m_dom.php b/bureau/class/m_dom.php index 22a2a96e..5701bafa 100644 --- a/bureau/class/m_dom.php +++ b/bureau/class/m_dom.php @@ -987,6 +987,14 @@ class m_dom { } } break; + case "co": + if (preg_match("#Name Server:#", $ligne)) { + $found = true; + $tmp = strtolower(str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", str_replace("Name Server:", "", $ligne))))); + if ($tmp) + $serveurList[] = $tmp; + } + break; case "cx": $ligne = str_replace(chr(10), "", str_replace(chr(13), "", str_replace(" ", "", $ligne))); if ($ligne == "" && $state == 1) { diff --git a/etc/alternc/templates/alternc/postfix/postfix.cf b/etc/alternc/templates/alternc/postfix/postfix.cf index 857fe844..2e246818 100644 --- a/etc/alternc/templates/alternc/postfix/postfix.cf +++ b/etc/alternc/templates/alternc/postfix/postfix.cf @@ -55,3 +55,19 @@ message_size_limit = 100000000 virtual_mailbox_limit = 0 mailbox_size_limit = 0 enable_original_recipient = no +smtp_tls_dcert_file = $smtpd_tls_dcert_file +smtp_tls_dkey_file = $smtpd_tls_dcert_file +smtp_tls_CAfile = $smtpd_tls_CAfile +smtp_tls_key_file = $smtpd_tls_dcert_file +smtp_tls_cert_file = $smtpd_tls_dcert_file +smtp_use_tls = yes +smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache +smtpd_tls_protocols = TLSv1, TLSv1.1, TLSv1.2 +smtp_tls_protocols = TLSv1, TLSv1.1, TLSv1.2 +smtpd_tls_exclude_ciphers = aNULL, DES, 3DES, MD5, DES+MD5, RC4 +smtp_tls_exclude_ciphers = aNULL, DES, 3DES, MD5, DES+MD5, RC4 +tls_preempt_cipherlist = yes +smtpd_tls_mandatory_ciphers = high +smtp_tls_mandatory_ciphers = high +smtpd_tls_ciphers = high +smtp_tls_ciphers = high diff --git a/install/upgrades/3.4.4.sql b/install/upgrades/3.4.4.sql new file mode 100644 index 00000000..ae509f4b --- /dev/null +++ b/install/upgrades/3.4.4.sql @@ -0,0 +1,3 @@ + +INSERT IGNORE INTO tld VALUES ('co', 1); +INSERT IGNORE INTO tld VALUES ('cc', 1);