valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 08:35:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1873 from marcinkuzminski/patch-2

Browse Source 
Update salt/modules/mysql.py
This commit is contained in:
Thomas S Hatch 2012-08-24 09:16:00 -07:00
commit cb709d47fe
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/modules/mysql.py
View File

@ -496,7 +496,7 @@ def user_chpass(user,
salt '*' mysql.user_chpass frank localhost password_hash='hash'
'''
if password is None or password_hash is None:
if password is None and password_hash is None:
log.error('No password provided')
return False
elif password is not None:
@ -505,14 +505,15 @@ def user_chpass(user,
password_sql = "\"%s\"" % password_hash
db = connect()
cur = db.cursor ()
query = "UPDATE mysql.user SET password=%s WHERE User='%s' AND Host = '%s';" % (password_sql,user,host,)
cur = db.cursor()
query = "UPDATE mysql.user SET password=%s WHERE User='%s' AND Host = '%s';" % (password_sql, user, host,)
log.debug("Query: {0}".format(query,))
if cur.execute( query ):
log.info("Password for user '{0}'@'{1}' has been changed".format(user,host,))
if cur.execute(query):
cur.execute('FLUSH PRIVILEGES;')
log.info("Password for user '{0}'@'{1}' has been changed".format(user, host,))
return True
log.info("Password for user '{0}'@'{1}' is not changed".format(user,host,))
log.info("Password for user '{0}'@'{1}' is not changed".format(user, host,))
return False