Merge branch 'master' into 'master'

Master

See merge request !173

Author: Marius Cramer

interface/web/dns/form/dns_cname.tform.php

@@ -86,7 +86,7 @@
 					'type' => 'TOLOWER')
 			),
 			'validators' => array (  0 => array ( 'type' => 'REGEX',
-					'regex' => '/^[a-zA-Z0-9\.\-\*]{0,255}$/',
+					'regex' => '/^[a-zA-Z0-9\.\-\*\_]{0,255}$/',
 					'errmsg'=> 'name_error_regex'),
 			),
 			'default' => '',

server/plugins-available/backup_plugin.inc.php

@@ -156,6 +156,7 @@ public function backup_action($action_name, $data) {
 						}
 					}
 				}
+				if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
 			} else {
 				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
 			}
@@ -227,6 +228,7 @@ public function backup_action_mail($action_name, $data) {
 						}
 					}
 				}
+				if( $server_config['backup_dir_is_mount'] == 'y' ) $app->system->umount_backup_dir($backup_dir);
 			} else {
 				$app->log('Backup directory not ready.', LOGLEVEL_DEBUG);
 			}

server/plugins-available/mail_plugin_dkim.inc.php

@@ -75,9 +75,9 @@ function onLoad() {
 	 */
 	function get_amavis_config() {
 		$pos_config=array(
-			'/etc/amavisd.conf',
 			'/etc/amavisd.conf/50-user',
 			'/etc/amavis/conf.d/50-user',
+			'/etc/amavisd.conf',
 			'/etc/amavisd/amavisd.conf'
 		);
 		$amavis_configfile='';