Skip to content

Commit 8d3466b

Browse files
author
Marius Cramer
committed
- backported patches
1 parent 6f6aa98 commit 8d3466b

File tree

6 files changed

+44
-36
lines changed

6 files changed

+44
-36
lines changed

‎install/dist/conf/debian40.conf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
$conf['jailkit']['config_dir'] = '/etc/jailkit';
184184
$conf['jailkit']['jk_init'] = 'jk_init.ini';
185185
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
186-
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
186+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch';
187187
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
188188

189189
//* Squid

‎install/dist/conf/debian60.conf.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
$conf['jailkit']['config_dir'] = '/etc/jailkit';
184184
$conf['jailkit']['jk_init'] = 'jk_init.ini';
185185
$conf['jailkit']['jk_chrootsh'] = 'jk_chrootsh.ini';
186-
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico';
186+
$conf['jailkit']['jailkit_chroot_app_programs'] = '/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch';
187187
$conf['jailkit']['jailkit_chroot_cron_programs'] = '/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php';
188188

189189
//* Squid

‎install/tpl/server.ini.master‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fastcgi_config_syntax=1
129129
[jailkit]
130130
jailkit_chroot_home=/home/[username]
131131
jailkit_chroot_app_sections=basicshell editors extendedshell netutils ssh sftp scp groups jk_lsh
132-
jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico
132+
jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico /usr/bin/mysql /usr/bin/mysqldump /usr/bin/git /usr/bin/git-receive-pack /usr/bin/git-upload-pack /usr/bin/unzip /usr/bin/zip /bin/tar /bin/rm /usr/bin/patch
133133
jailkit_chroot_cron_programs=/usr/bin/php /usr/bin/perl /usr/share/perl /usr/share/php
134134

135135
[vlogger]

‎interface/lib/classes/db_mysql.inc.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ class db extends mysqli
5555
private $autoCommit = 1; // Autocommit Transactions
5656
private $currentRow; // current row number
5757
private $errorNumber = 0; // last error number
58+
*/
5859
public $errorMessage = ''; // last error message
60+
/*
5961
private $errorLocation = '';// last error location
6062
private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
6163
////
@@ -503,6 +505,7 @@ private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '') {
503505

504506
$mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
505507
$mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
508+
$this->errorMessage = $mysql_error;
506509

507510
//$sAddMsg .= getDebugBacktrace();
508511

‎server/lib/classes/db_mysql.inc.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ class db extends mysqli
5555
private $autoCommit = 1; // Autocommit Transactions
5656
private $currentRow; // current row number
5757
public $errorNumber = 0; // last error number
58+
*/
5859
public $errorMessage = ''; // last error message
60+
/*
5961
private $errorLocation = '';// last error location
6062
private $isConnected = false; // needed to know if we have a valid mysqli object from the constructor
6163
////
@@ -467,6 +469,7 @@ private function _sqlerror($sErrormsg = 'Unbekannter Fehler', $sAddMsg = '') {
467469

468470
$mysql_error = (is_object($this->_iConnId) ? mysqli_error($this->_iConnId) : mysqli_connect_error());
469471
$mysql_errno = (is_object($this->_iConnId) ? mysqli_errno($this->_iConnId) : mysqli_connect_errno());
472+
$this->errorMessage = $mysql_error;
470473

471474
//$sAddMsg .= getDebugBacktrace();
472475

‎server/plugins-available/mail_plugin_dkim.inc.php‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ function add_dkim($data) {
325325
$this->remove_dkim_key($mail_config['dkim_path']."/".$data['new']['domain'], $data['new']['domain']);
326326
}
327327
} else {
328-
$app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_ERROR);
328+
$app->log('Error saving the DKIM Private-key for '.$data['new']['domain'].' - DKIM is not enabled for the domain.', LOGLEVEL_DEBUG);
329329
}
330330
}
331331
}
@@ -369,45 +369,47 @@ function domain_dkim_insert($event_name, $data) {
369369
*/
370370
function domain_dkim_update($event_name, $data) {
371371
global $app;
372-
if ($this->check_system($data)) {
373-
/* maildomain disabled */
374-
if ($data['new']['active'] == 'n' && $data['old']['active'] == 'y' && $data['new']['dkim']=='y') {
375-
$app->log('Maildomain '.$data['new']['domain'].' disabled - remove DKIM-settings', LOGLEVEL_DEBUG);
376-
$this->remove_dkim($data['new']);
377-
}
378-
/* maildomain re-enabled */
379-
if ($data['new']['active'] == 'y' && $data['old']['active'] == 'n' && $data['new']['dkim']=='y')
380-
$this->add_dkim($data);
381-
382-
/* maildomain active - only dkim changes */
383-
if ($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
384-
/* dkim disabled */
385-
if ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'n') {
372+
if($data['new']['dkim'] == 'y' || $data['old']['dkim'] == 'y'){
373+
if ($this->check_system($data)) {
374+
/* maildomain disabled */
375+
if ($data['new']['active'] == 'n' && $data['old']['active'] == 'y' && $data['new']['dkim']=='y') {
376+
$app->log('Maildomain '.$data['new']['domain'].' disabled - remove DKIM-settings', LOGLEVEL_DEBUG);
386377
$this->remove_dkim($data['new']);
387378
}
388-
/* dkim enabled */
389-
elseif ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'y') {
390-
$this->add_dkim($data);
391-
}
392-
/* new private-key */
393-
if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
394-
$this->add_dkim($data);
395-
}
396-
/* new selector */
397-
if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
379+
/* maildomain re-enabled */
380+
if ($data['new']['active'] == 'y' && $data['old']['active'] == 'n' && $data['new']['dkim']=='y')
398381
$this->add_dkim($data);
382+
383+
/* maildomain active - only dkim changes */
384+
if ($data['new']['active'] == 'y' && $data['old']['active'] == 'y') {
385+
/* dkim disabled */
386+
if ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'n') {
387+
$this->remove_dkim($data['new']);
388+
}
389+
/* dkim enabled */
390+
elseif ($data['new']['dkim'] != $data['old']['dkim'] && $data['new']['dkim'] == 'y') {
391+
$this->add_dkim($data);
392+
}
393+
/* new private-key */
394+
if ($data['new']['dkim_private'] != $data['old']['dkim_private'] && $data['new']['dkim'] == 'y') {
395+
$this->add_dkim($data);
396+
}
397+
/* new selector */
398+
if ($data['new']['dkim_selector'] != $data['old']['dkim_selector'] && $data['new']['dkim'] == 'y') {
399+
$this->add_dkim($data);
400+
}
401+
/* new domain-name */
402+
if ($data['new']['domain'] != $data['old']['domain']) {
403+
$this->remove_dkim($data['old']);
404+
$this->add_dkim($data);
405+
}
399406
}
400-
/* new domain-name */
401-
if ($data['new']['domain'] != $data['old']['domain']) {
402-
$this->remove_dkim($data['old']);
407+
408+
/* resync */
409+
if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
403410
$this->add_dkim($data);
404411
}
405412
}
406-
407-
/* resync */
408-
if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
409-
$this->add_dkim($data);
410-
}
411413
}
412414
}
413415

0 commit comments

Comments
 (0)