From 865de1999b7ce400868e7c8fb19eb4fca0f9595b Mon Sep 17 00:00:00 2001 From: Mark Theunissen Date: Tue, 26 Feb 2013 16:27:23 -0600 Subject: [PATCH] Adding back support for pass= --- mysql_db | 16 ++++++++++++++-- mysql_user | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/mysql_db b/mysql_db index eac18c4aba2..49badb20e3d 100644 --- a/mysql_db +++ b/mysql_db @@ -131,8 +131,20 @@ def load_mycnf(): return False try: config.readfp(open(mycnf)) - creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'password')) - except (ConfigParser.NoOptionError, IOError): + except (IOError): + return False + # We support two forms of passwords in .my.cnf, both pass= and password=, + # as these are both supported by MySQL. + try: + passwd = config.get('client', 'password') + except (ConfigParser.NoOptionError): + try: + passwd = config.get('client', 'pass') + except (ConfigParser.NoOptionError): + return False + try: + creds = dict(user=config.get('client', 'user'),passwd=passwd) + except (ConfigParser.NoOptionError): return False return creds diff --git a/mysql_user b/mysql_user index 3f40411b0db..4330c35338b 100644 --- a/mysql_user +++ b/mysql_user @@ -236,8 +236,20 @@ def load_mycnf(): return False try: config.readfp(open(mycnf)) - creds = dict(user=config.get('client', 'user'),password=config.get('client', 'password')) - except (ConfigParser.NoOptionError, IOError): + except (IOError): + return False + # We support two forms of passwords in .my.cnf, both pass= and password=, + # as these are both supported by MySQL. + try: + passwd = config.get('client', 'password') + except (ConfigParser.NoOptionError): + try: + passwd = config.get('client', 'pass') + except (ConfigParser.NoOptionError): + return False + try: + creds = dict(user=config.get('client', 'user'),passwd=passwd) + except (ConfigParser.NoOptionError): return False return creds