Development

Wiki Start
Wishlist
Timeline
Roadmap
Browse Source
New Ticket
View Tickets

Changeset 1301

Show
Ignore:
Timestamp:
08/05/08 23:39:38 (4 months ago)
Author:
rats
Message:

* Fixed: MySQL root password containing " or ` ends up with an error

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG

    r1300 r1301  
    33 
    442008-08-05 Benedikt Heintel 
     5        - RELEASE ispCP ω Omega 1.0.0 RC6 
    56        - SETUP: 
    67                * Fixed #1447: proftpd.conf missing replacements 
     8                * Fixed: MySQL root password containing " or ` ends up with an error 
    79 
    8102008-08-05 Daniel Andreca 

  • trunk/configs/centos/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/debian/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/fedora/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/gentoo/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/openbsd/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/opensuse/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/redhat/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/configs/ubuntu/ispcp.conf

    r1295 r1301  
    99# 
    1010 
    11 BuildDate = 20080804 
     11BuildDate = 20080805 
    1212 
    1313Version = 1.0.0 RC6 OMEGA 

  • trunk/engine/ispcp-dmn-mngr

    r1298 r1301  
    34443444                                        # if username and pass for db exists - restore database from file 
    34453445                                        if ($dbuser && $dbpass) { 
     3446                                                $dbpass =~ s/([\'\"])/\\$1/g; 
    34463447                                                $cmd = "$cmd_bzcat -d $dmn_bk_dir/$fname | $cmd_mysql --user=\"$dbuser\" --password=\"$dbpass\" --database=\"$db_name\""; 
    34473448                                                $rs = sys_command($cmd); 
    …… 
    34723473                                        # if username and pass for db exists - restore database from file 
    34733474                                        if ($dbuser && $dbpass) { 
     3475                                                $dbpass =~ s/([\'\"])/\\$1/g; 
    34743476                                                $cmd = "$cmd_gzcat -d $dmn_bk_dir/$fname | $cmd_mysql --user=\"$dbuser\" --password=\"$dbpass\" --database=\"$db_name\""; 
    34753477                                                $rs = sys_command($cmd); 

  • trunk/engine/setup/ispcp-setup

    r1298 r1301  
    687687        return $rs if ($rs != 0); 
    688688 
     689        # Escape " and ` 
     690        $main::db_pwd =~ s/([\'\"])/\\$1/g; 
    689691        my $cmd = "$main::cfg{'CMD_MYSQL'} --host=\"$main::db_host\" --user=\"$main::db_user\" --pass=\"$main::db_pwd\" < /tmp/db.sql 1>/tmp/db.sql.stdout 2>/tmp/db.sql.stderr"; 
    690692