Changeset 2711 for trunk

Timestamp:

03/21/10 16:24:06 (2 years ago)

Author:

nuxwin

Message:

• [MERGE] Latest omega-1.0.5 changes

Location:

trunk

Files:

• . (modified) (1 prop)
• CHANGELOG (modified) (2 diffs)
• configs/freebsd/fcgi/parts/master/php5/php.ini (modified) (1 diff)
• configs/freebsd/postfix/main.cf (modified) (1 diff)
• database/database.sql (modified) (1 diff)
• gui/tools/filemanager/skins/mobile/admin1.template.php (modified) (1 diff)

trunk/CHANGELOG

@@ -2 +2 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+2010-03-20 Laurent Declercq
+        - DATABASE:
+                * Updated database revision
+
 2010-03-20 Benedikt Heintel
         - CONFIGS:
                 * Removed wc Command
         - DISTS:
+                * Fixed #2246: FreeBSD improvements
                 * Fixed #2285: [FreeBSD] Add needed packages to freebsd-packages
                 * Fixed #2286: [FreeBSD] Correct ispcp.conf -> Local Alias
         - LANGUAGE:
                 * Fixed #2278: dutch translation for 1.05
+        - TOOLS:
+                * Fixed possible vulnerability. See: 
+                        http://packetstormsecurity.org/1003-exploits/ispcp-rfi.txt
 
 2010-03-19 Laurent Declercq
@@ -72 +80 @@
                 * Fixed #2244: Undefined variable in hosting_plan_edit.php of the admin
                 * Fixed: All occurred errors are now shown in Hosting Plans
-        - TOOLS:
-                * Fixed possible vulnerability. See: 
-                        http://packetstormsecurity.org/1003-exploits/ispcp-rfi.txt
 
 2010-03-10 Benedikt Heintel

trunk/configs/freebsd/fcgi/parts/master/php5/php.ini

@@ -377 +377 @@
 ; *NOT* affected by whether Safe Mode is turned On or Off.
 ; http://php.net/open-basedir
-open_basedir = "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/var/run/dmesg.boot:/proc/:/bin/df:/bin/mount:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}:{OTHER_ROOTKIT_LOG}"
+open_basedir = "{WWW_DIR}/{DMN_NAME}/:{CONF_DIR}/:{MR_LOCK_FILE}:/proc/:/bin/df:/bin/:/sbin/:/usr/bin/:/usr/sbin/:/usr/local/bin/:/usr/local/sbin/:{RKHUNTER_LOG}:{CHKROOTKIT_LOG}:{PEAR_DIR}:{OTHER_ROOTKIT_LOG}"
 
 ; This directive allows you to disable certain functions for security reasons.

trunk/configs/freebsd/postfix/main.cf

@@ -114 +114 @@
                                reject_unlisted_recipient,
                                check_policy_service inet:127.0.0.1:12525,
-                               check_policy_service inet:127.0.0.1:60000,
+                               check_policy_service inet:127.0.0.1:10023,
                                permit
 

trunk/database/database.sql

@@ -127 +127 @@
 ('PREVENT_EXTERNAL_LOGIN_RESELLER', '1'),
 ('PREVENT_EXTERNAL_LOGIN_CLIENT', '1'),
-('DATABASE_REVISION', '28'),
+('DATABASE_REVISION', '29'),
 ('CRITICAL_UPDATE_REVISION', '5');
 

trunk/gui/tools/filemanager/skins/mobile/admin1.template.php

@@ -1 @@
-<?php require_once($net2ftp_globals["application_skinsdir"] . "/blue/admin1.template.php"); ?>
+<?php 
+// ispCP Modification to avoid vulnerability 
+// http://packetstormsecurity.org/1003-exploits/ispcp-rfi.txt
+// Make sure this file is included by net2ftp, not accessed directly
+defined("NET2FTP") or die("Direct access to this location is not allowed.");
+// End of Modification
+require_once($net2ftp_globals["application_skinsdir"] . "/blue/admin1.template.php"); ?>