From 0da466aa08611f3723cc0086f316a492133ab5c2 Mon Sep 17 00:00:00 2001 From: Choong Wei Tjeng Date: Mon, 4 Apr 2022 20:32:50 +0200 Subject: [PATCH 1/2] #1553 fix ini writing --- server/lib/classes/ini_parser.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/lib/classes/ini_parser.inc.php b/server/lib/classes/ini_parser.inc.php index f75f4b4cb7..52a8dc36c1 100644 --- a/server/lib/classes/ini_parser.inc.php +++ b/server/lib/classes/ini_parser.inc.php @@ -86,8 +86,8 @@ class ini_parser{ } } } - if($q!=true && !empty($out)) - return "[".$out."]\r\n".$t; + if($q!==true && !empty($out)) + return "\r\n\r\n[".$out."]".$t; if(!empty($out)) return $t; return trim($t); -- GitLab From f8c8c0e068b0f068c5fee62989f8fc7af026d06f Mon Sep 17 00:00:00 2001 From: Choong Wei Tjeng Date: Mon, 4 Apr 2022 20:33:17 +0200 Subject: [PATCH 2/2] #1553 use php function to read jk_socketd.ini --- server/lib/classes/system.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php index 7e4e7ae447..332a5d94da 100644 --- a/server/lib/classes/system.inc.php +++ b/server/lib/classes/system.inc.php @@ -2809,7 +2809,7 @@ $app->log("update_jailkit_chroot: removing deprecated directory which jk_update // remove non-existent jails from /etc/jailkit/jk_socketd.ini if (is_file('/etc/jailkit/jk_socketd.ini')) { $rewrite = false; - $jk_socketd_ini = $app->ini_parser->parse_ini_file('/etc/jailkit/jk_socketd.ini'); + $jk_socketd_ini = parse_ini_file('/etc/jailkit/jk_socketd.ini', true); foreach ($jk_socketd_ini as $log => $settings) { $jail = preg_replace('@/dev/log$@', '', $log); if ($jail != $log && !is_dir($jail)) { @@ -2819,7 +2819,7 @@ $app->log("update_jailkit_chroot: removing deprecated directory which jk_update } if ($rewrite) { $app->log('update_jailkit_chroot: writing /etc/jailkit/jk_socketd.ini', LOGLEVEL_DEBUG); - $app->ini_parse->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini'); + $app->ini_parser->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini'); } } @@ -2901,12 +2901,12 @@ $app->log("delete_jailkit_chroot called for $home_dir with options ".print_r($op // remove $home_dir from /etc/jailkit/jk_socketd.ini if (is_file('/etc/jailkit/jk_socketd.ini')) { - $jk_socketd_ini = $app->ini_parser->parse_ini_file('/etc/jailkit/jk_socketd.ini'); + $jk_socketd_ini = parse_ini_file('/etc/jailkit/jk_socketd.ini', true); $log = $home . '/dev/log'; if (isset($jk_socketd_ini[$log])) { unset($jk_socketd_ini[$log]); $app->log('delete_jailkit_chroot: writing /etc/jailkit/jk_socketd.ini', LOGLEVEL_DEBUG); - $app->ini_parse->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini'); + $app->ini_parser->write_ini_file($jk_socketd_ini, '/etc/jailkit/jk_socketd.ini'); } } -- GitLab