From: Marko Kreen <markokr@gmail.com>
Date: Sun, 14 Feb 2016 11:55:15 +0000 (+0200)
Subject: Rename sslmode "disabled" to "disable" as in libpq
X-Git-Tag: pgbouncer_1_7_1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8ca1873585d1ca4d63826436f42646c032f8dcc;p=pgbouncer

Rename sslmode "disabled" to "disable" as in libpq
---

diff --git a/doc/config.rst b/doc/config.rst
index 6d3b56a..1a863ae 100644
--- a/doc/config.rst
+++ b/doc/config.rst
@@ -529,7 +529,7 @@ are disabled by default.  When enabled, `client_tls_key_file`_
 and `client_tls_cert_file`_ must be also configured to set up
 key and cert PgBouncer uses to accept client connections.
 
-disabled
+disable
     Plain TCP.  If client requests TLS, it's ignored.  Default.
 
 allow
@@ -607,7 +607,7 @@ server_tls_sslmode
 TLS mode to use for connections to PostgreSQL servers.
 TLS connections are disabled by default.
 
-disabled
+disable
     Plain TCP.  TCP is not event requested from server.  Default.
 
 allow
diff --git a/src/main.c b/src/main.c
index 128d854..2a09c0b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -183,7 +183,7 @@ const struct CfLookup pool_mode_map[] = {
 };
 
 const struct CfLookup sslmode_map[] = {
-	{ "disabled", SSLMODE_DISABLED },
+	{ "disable", SSLMODE_DISABLED },
 	{ "allow", SSLMODE_ALLOW },
 	{ "prefer", SSLMODE_PREFER },
 	{ "require", SSLMODE_REQUIRE },
@@ -268,7 +268,7 @@ CF_ABS("log_disconnections", CF_INT, cf_log_disconnections, 0, "1"),
 CF_ABS("log_pooler_errors", CF_INT, cf_log_pooler_errors, 0, "1"),
 CF_ABS("application_name_add_host", CF_INT, cf_application_name_add_host, 0, "0"),
 
-CF_ABS("client_tls_sslmode", CF_LOOKUP(sslmode_map), cf_client_tls_sslmode, CF_NO_RELOAD, "disabled"),
+CF_ABS("client_tls_sslmode", CF_LOOKUP(sslmode_map), cf_client_tls_sslmode, CF_NO_RELOAD, "disable"),
 CF_ABS("client_tls_ca_file", CF_STR, cf_client_tls_ca_file, CF_NO_RELOAD, ""),
 CF_ABS("client_tls_cert_file", CF_STR, cf_client_tls_cert_file, CF_NO_RELOAD, ""),
 CF_ABS("client_tls_key_file", CF_STR, cf_client_tls_key_file, CF_NO_RELOAD, ""),
@@ -277,7 +277,7 @@ CF_ABS("client_tls_ciphers", CF_STR, cf_client_tls_ciphers, CF_NO_RELOAD, "fast"
 CF_ABS("client_tls_dheparams", CF_STR, cf_client_tls_dheparams, CF_NO_RELOAD, "auto"),
 CF_ABS("client_tls_ecdhcurve", CF_STR, cf_client_tls_ecdhecurve, CF_NO_RELOAD, "auto"),
 
-CF_ABS("server_tls_sslmode", CF_LOOKUP(sslmode_map), cf_server_tls_sslmode, CF_NO_RELOAD, "disabled"),
+CF_ABS("server_tls_sslmode", CF_LOOKUP(sslmode_map), cf_server_tls_sslmode, CF_NO_RELOAD, "disable"),
 CF_ABS("server_tls_ca_file", CF_STR, cf_server_tls_ca_file, CF_NO_RELOAD, ""),
 CF_ABS("server_tls_cert_file", CF_STR, cf_server_tls_cert_file, CF_NO_RELOAD, ""),
 CF_ABS("server_tls_key_file", CF_STR, cf_server_tls_key_file, CF_NO_RELOAD, ""),