aboutsummaryrefslogtreecommitdiff
path: root/src/backend/commands/user.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/commands/user.c')
-rw-r--r--src/backend/commands/user.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 994c093250b..14b97791442 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -139,7 +139,12 @@ CreateRole(ParseState *pstate, CreateRoleStmt *stmt)
parser_errposition(pstate, defel->location)));
dpassword = defel;
if (strcmp(defel->defname, "encryptedPassword") == 0)
- password_type = PASSWORD_TYPE_MD5;
+ {
+ if (Password_encryption == PASSWORD_TYPE_SCRAM)
+ password_type = PASSWORD_TYPE_SCRAM;
+ else
+ password_type = PASSWORD_TYPE_MD5;
+ }
else if (strcmp(defel->defname, "unencryptedPassword") == 0)
password_type = PASSWORD_TYPE_PLAINTEXT;
}
@@ -542,7 +547,12 @@ AlterRole(AlterRoleStmt *stmt)
errmsg("conflicting or redundant options")));
dpassword = defel;
if (strcmp(defel->defname, "encryptedPassword") == 0)
- password_type = PASSWORD_TYPE_MD5;
+ {
+ if (Password_encryption == PASSWORD_TYPE_SCRAM)
+ password_type = PASSWORD_TYPE_SCRAM;
+ else
+ password_type = PASSWORD_TYPE_MD5;
+ }
else if (strcmp(defel->defname, "unencryptedPassword") == 0)
password_type = PASSWORD_TYPE_PLAINTEXT;
}