diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2017-05-03 11:19:07 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2017-05-03 11:19:07 +0300 |
| commit | 8f8b9be51fd788bb11276df89606bc653163524e (patch) | |
| tree | 4d2daef287c2adb74da34bd6fcdbd47febbb47df /src/bin/scripts/createuser.c | |
| parent | af2c5aa88d38573724e40fa029499b4db20b0eb2 (diff) | |
| download | postgresql-8f8b9be51fd788bb11276df89606bc653163524e.tar.gz postgresql-8f8b9be51fd788bb11276df89606bc653163524e.zip | |
Add PQencryptPasswordConn function to libpq, use it in psql and createuser.
The new function supports creating SCRAM verifiers, in addition to md5
hashes. The algorithm is chosen based on password_encryption, by default.
This fixes the issue reported by Jeff Janes, that there was previously
no way to create a SCRAM verifier with "\password".
Michael Paquier and me
Discussion: https://www.postgresql.org/message-id/CAMkU%3D1wfBgFPbfAMYZQE78p%3DVhZX7nN86aWkp0QcCp%3D%2BKxZ%3Dbg%40mail.gmail.com
Diffstat (limited to 'src/bin/scripts/createuser.c')
| -rw-r--r-- | src/bin/scripts/createuser.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c index 3d74797a8f5..35a53bf2064 100644 --- a/src/bin/scripts/createuser.c +++ b/src/bin/scripts/createuser.c @@ -274,11 +274,14 @@ main(int argc, char *argv[]) { char *encrypted_password; - encrypted_password = PQencryptPassword(newpassword, - newuser); + encrypted_password = PQencryptPasswordConn(conn, + newpassword, + newuser, + NULL); if (!encrypted_password) { - fprintf(stderr, _("Password encryption failed.\n")); + fprintf(stderr, _("%s: password encryption failed: %s"), + progname, PQerrorMessage(conn)); exit(1); } appendStringLiteralConn(&sql, encrypted_password, conn); |