Skip to content

Commit

Permalink
add allow to the gssEncMode property and correct the comment in GSSEn…
Browse files Browse the repository at this point in the history
…cMode enum (#1920)
  • Loading branch information
davecramer committed Oct 13, 2020
1 parent 901962b commit c097024
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pgjdbc/src/main/java/org/postgresql/PGProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -184,10 +184,10 @@ public enum PGProperty {

GSS_ENC_MODE(
"gssEncMode",
"prefer",
"allow",
"Force Encoded GSS Mode",
false,
new String[] {"disable", "prefer", "require"}
new String[] {"disable", "allow", "prefer", "require"}
),

/**
Expand Down
2 changes: 1 addition & 1 deletion pgjdbc/src/main/java/org/postgresql/jdbc/GSSEncMode.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public boolean requireEncryption() {

public static GSSEncMode of(Properties info) throws PSQLException {
String gssEncMode = PGProperty.GSS_ENC_MODE.get(info);
// If gssEncMode is not set, fallback to prefer
// If gssEncMode is not set, fallback to allow
if (gssEncMode == null) {
return ALLOW;
}
Expand Down

0 comments on commit c097024

Please sign in to comment.