Commit 031aaa10 by Michael DeHaan

Merge pull request #6157 from rgbkrk/patch-1

Fix expires
parents be0be16e b5eb4d2a
...@@ -176,7 +176,7 @@ def user_add(cursor, user, password, role_attr_flags, encrypted, expires): ...@@ -176,7 +176,7 @@ def user_add(cursor, user, password, role_attr_flags, encrypted, expires):
query = query + " PASSWORD %(password)s" query = query + " PASSWORD %(password)s"
query_password_data.update(password=password) query_password_data.update(password=password)
if expires is not None: if expires is not None:
query = query + " VALID UNTIL '%(expires)s'" % { "exipres": expires } query = query + " VALID UNTIL '%(expires)s'" % { "expires": expires }
query = query + " " + role_attr_flags query = query + " " + role_attr_flags
cursor.execute(query, query_password_data) cursor.execute(query, query_password_data)
return True return True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment