diff options
| author | Renato Botelho <renato@netgate.com> | 2016-10-27 15:26:49 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-10-27 15:26:49 -0200 |
| commit | aa9cf3fa4d532e9f2dbd05d38ca438980b21e06b (patch) | |
| tree | 4a28103d2eec6bc15b39b535b3bba92d1e00e2e5 | |
| parent | fc0e31d71cd4f293fabe068355a4405285754c2c (diff) | |
| download | pfsense-aa9cf3fa4d532e9f2dbd05d38ca438980b21e06b.zip pfsense-aa9cf3fa4d532e9f2dbd05d38ca438980b21e06b.tar.gz | |
Fix #6758
extensions.ini must be readable by any users otherwise any php script
called by a non-root user will not be able to use PHP extensions
This is a direct fix for RELENG_2_3_2 since extensions.ini is not being
used anymore on RELENG_2_3 or master
| -rwxr-xr-x | src/etc/rc.php_ini_setup | 1 | ||||
| -rwxr-xr-x | src/usr/local/sbin/pfSense-upgrade | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup index 6f6cd20..3d670a1 100755 --- a/src/etc/rc.php_ini_setup +++ b/src/etc/rc.php_ini_setup @@ -102,6 +102,7 @@ else fi /usr/bin/sort -u -o /usr/local/etc/php/extensions.ini /usr/local/etc/php/extensions.ini +chmod 0644 /usr/local/etc/php/extensions.ini # Set upload directory if [ "$PLATFORM" = "nanobsd" ]; then diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index aa31a2d..f425260 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -432,6 +432,7 @@ pkg_upgrade() { # XXX: workaround for #5300 sort -u ${chroot_dir}/usr/local/etc/php/extensions.ini > /tmp/extensions.ini mv /tmp/extensions.ini ${chroot_dir}/usr/local/etc/php/extensions.ini + chmod 0644 ${chroot_dir}/usr/local/etc/php/extensions.ini pkg ${pkg_chroot} annotate -q -M ${kernel_pkg} next_stage 3 next_stage=3 |
