- ported patch

Marius Cramer

2015-05-15 a52337130b0675d43e8b15d33cea1fa8c7654ef4

- ported patch

 interface/lib/classes/validate_domain.inc.php

@@ -158,6 +158,10 @@
        if($domain['ip_address'] == '' || $domain['ipv6_address'] == ''){
            if($domain['parent_domain_id'] > 0){
                $parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $domain['parent_domain_id']);
                if(is_array($parent_domain) && !empty($parent_domain)){
                    $domain['ip_address'] = $parent_domain['ip_address'];
                    $domain['ipv6_address'] = $parent_domain['ipv6_address'];
                }
            }
        }


 server/plugins-available/shelluser_base_plugin.inc.php

@@ -96,6 +96,8 @@
            return false;
        }

        if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
		
        if($app->system->is_user($data['new']['puser'])) {

            // Get the UID of the parent user
@@ -194,6 +196,8 @@
            return false;
        }
        
        if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
		
        if($app->system->is_user($data['new']['puser'])) {
            // Get the UID of the parent user
            $uid = intval($app->system->getuid($data['new']['puser']));