direct, verify-full by default

Author: marcbowes

src/bin/psql/help.c

@@ -57,9 +57,9 @@ usage(unsigned short int pager)
 	 */
 	initPQExpBuffer(&buf);
 
-	HELP0("psql is the PostgreSQL interactive terminal.\n\n");
+	HELP0("psql (with DSQL support) is the PostgreSQL interactive terminal.\n\n");
 	HELP0("Usage:\n");
-	HELP0("  psql [OPTION]... [DBNAME [USERNAME]]\n\n");
+	HELP0("  pdsql [OPTION]... [DBNAME [USERNAME]]\n\n");
 
 	HELP0("General options:\n");
 	HELP0("  -c, --command=COMMAND    run only single command (SQL or internal) and exit\n");

src/bin/psql/startup.c

@@ -219,7 +219,6 @@ main(int argc, char *argv[])
 
 	if (pset.dsql)
 	{
-		setenv("PGSSLMODE", "require", 0);
 		setenv("PGDSQL", "1", 1);
 		pset.getPassword = TRI_NO;
 	}

src/interfaces/libpq/fe-connect.c

@@ -281,11 +281,11 @@ static const internalPQconninfoOption PQconninfoOptions[] = {
 	 * parameters have no effect on non-SSL connections, so there is no reason
 	 * to exclude them since none of them are mandatory.
 	 */
-	{"sslmode", "PGSSLMODE", DefaultSSLMode, NULL,
+	{"sslmode", "PGSSLMODE", "verify-full", NULL,
 		"SSL-Mode", "", 12,		/* sizeof("verify-full") == 12 */
 	offsetof(struct pg_conn, sslmode)},
 
-	{"sslnegotiation", "PGSSLNEGOTIATION", DefaultSSLNegotiation, NULL,
+	{"sslnegotiation", "PGSSLNEGOTIATION", "direct", NULL,
 		"SSL-Negotiation", "", 9,	/* sizeof("postgres") == 9  */
 	offsetof(struct pg_conn, sslnegotiation)},
 
@@ -309,7 +309,7 @@ static const internalPQconninfoOption PQconninfoOptions[] = {
 		"SSL-Client-Key-Password", "*", 20,
 	offsetof(struct pg_conn, sslpassword)},
 
-	{"sslrootcert", "PGSSLROOTCERT", NULL, NULL,
+	{"sslrootcert", "PGSSLROOTCERT", "system", NULL,
 		"SSL-Root-Certificate", "", 64,
 	offsetof(struct pg_conn, sslrootcert)},