Message wordsmithing

petere · petere · commit 0d8c613180e4 · 2009-01-19T08:59:13.000Z
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.116 2009/01/07 12:02:46 mha Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.117 2009/01/19 08:59:13 petere Exp $
  *
  * NOTES
  *
@@ -508,7 +508,7 @@ verify_peer_name_matches_certificate(PGconn *conn)
 	if (conn->pghostaddr)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("verified SSL connections are only supported when connecting to a hostname"));
+						  libpq_gettext("verified SSL connections are only supported when connecting to a host name"));
 		return false;
 	}
 	else
@@ -527,7 +527,7 @@ verify_peer_name_matches_certificate(PGconn *conn)
 		else
 		{
 			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("server common name '%s' does not match hostname '%s'"),
+							  libpq_gettext("server common name \"%s\" does not match host name \"%s\""),
 							  conn->peer_cn, conn->pghost);
 			return false;
 		}
@@ -569,7 +569,7 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 		if (!pqGetHomeDirectory(homedir, sizeof(homedir)))
 		{
 			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("cannot find home directory to locate client certificate files"));
+							  libpq_gettext("could not get home directory to locate client certificate files"));
 			return 0;
 		}
 	}
@@ -983,7 +983,7 @@ initialize_SSL(PGconn *conn)
 			if (strcmp(conn->sslverify, "none") != 0)
 			{
 				printfPQExpBuffer(&conn->errorMessage,
-								  libpq_gettext("cannot find home directory to locate root certificate file"));
+								  libpq_gettext("could not get home directory to locate root certificate file"));
 				return -1;
 			}
 		}
@@ -1049,7 +1049,7 @@ initialize_SSL(PGconn *conn)
 		if (strcmp(conn->sslverify, "none") != 0)
 		{
 			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("root certificate file (%s) not found"), fnbuf);
+							  libpq_gettext("root certificate file »%s« does not exist"), fnbuf);
 			return -1;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.116 2009/01/07 12:02:46 mha Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.117 2009/01/19 08:59:13 petere Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`*`
`@@ -508,7 +508,7 @@ verify_peer_name_matches_certificate(PGconn *conn)`
`508`	`508`	`if (conn->pghostaddr)`
`509`	`509`	`{`
`510`	`510`	`printfPQExpBuffer(&conn->errorMessage,`
`511`		`- libpq_gettext("verified SSL connections are only supported when connecting to a hostname"));`
	`511`	`+ libpq_gettext("verified SSL connections are only supported when connecting to a host name"));`
`512`	`512`	`return false;`
`513`	`513`	`}`
`514`	`514`	`else`
`@@ -527,7 +527,7 @@ verify_peer_name_matches_certificate(PGconn *conn)`
`527`	`527`	`else`
`528`	`528`	`{`
`529`	`529`	`printfPQExpBuffer(&conn->errorMessage,`
`530`		`- libpq_gettext("server common name '%s' does not match hostname '%s'"),`
	`530`	`+ libpq_gettext("server common name \"%s\" does not match host name \"%s\""),`
`531`	`531`	`conn->peer_cn, conn->pghost);`
`532`	`532`	`return false;`
`533`	`533`	`}`
`@@ -569,7 +569,7 @@ client_cert_cb(SSL ssl, X509 x509, EVP_PKEY *pkey)`
`569`	`569`	`if (!pqGetHomeDirectory(homedir, sizeof(homedir)))`
`570`	`570`	`{`
`571`	`571`	`printfPQExpBuffer(&conn->errorMessage,`
`572`		`- libpq_gettext("cannot find home directory to locate client certificate files"));`
	`572`	`+ libpq_gettext("could not get home directory to locate client certificate files"));`
`573`	`573`	`return 0;`
`574`	`574`	`}`
`575`	`575`	`}`
`@@ -983,7 +983,7 @@ initialize_SSL(PGconn *conn)`
`983`	`983`	`if (strcmp(conn->sslverify, "none") != 0)`
`984`	`984`	`{`
`985`	`985`	`printfPQExpBuffer(&conn->errorMessage,`
`986`		`- libpq_gettext("cannot find home directory to locate root certificate file"));`
	`986`	`+ libpq_gettext("could not get home directory to locate root certificate file"));`
`987`	`987`	`return -1;`
`988`	`988`	`}`
`989`	`989`	`}`
`@@ -1049,7 +1049,7 @@ initialize_SSL(PGconn *conn)`
`1049`	`1049`	`if (strcmp(conn->sslverify, "none") != 0)`
`1050`	`1050`	`{`
`1051`	`1051`	`printfPQExpBuffer(&conn->errorMessage,`
`1052`		`- libpq_gettext("root certificate file (%s) not found"), fnbuf);`
	`1052`	`+ libpq_gettext("root certificate file »%s« does not exist"), fnbuf);`
`1053`	`1053`	`return -1;`
`1054`	`1054`	`}`
`1055`	`1055`	`}`