Message tuning

3 files changed, 12 insertions, 12 deletions

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 8838113c575..17372844cfe 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.196 2010/03/13 14:55:57 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.197 2010/03/21 00:17:58 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2271,7 +2271,7 @@ CheckLDAPAuth(Port *port)
 				*c == '/')
 			{
 				ereport(LOG,
-						(errmsg("invalid character in username for LDAP authentication")));
+						(errmsg("invalid character in user name for LDAP authentication")));
 				return STATUS_ERROR;
 			}
 		}
@@ -2636,7 +2636,7 @@ CheckRADIUSAuth(Port *port)
 	if (!pg_md5_binary(cryptvector, RADIUS_VECTOR_LENGTH + strlen(port->hba->radiussecret), encryptedpassword))
 	{
 		ereport(LOG,
-				(errmsg("could not perform md5 encryption of password")));
+				(errmsg("could not perform MD5 encryption of password")));
 		pfree(cryptvector);
 		return STATUS_ERROR;
 	}
@@ -2825,7 +2825,7 @@ CheckRADIUSAuth(Port *port)
 	else
 	{
 		ereport(LOG,
-				(errmsg("RADIUS response has invalid code (%i) for user '%s'",
+				(errmsg("RADIUS response has invalid code (%i) for user \"%s\"",
 						receivepacket->code, port->user_name)));
 		return STATUS_ERROR;
 	}
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index be6b2f742ab..8cf7624a70a 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.202 2010/03/08 09:57:26 mha Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.203 2010/03/21 00:17:58 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1271,7 +1271,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 			{
 				ereport(LOG,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd or ldapsearchattribute together with ldapprefix"),
+						 errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, or ldapsearchattribute together with ldapprefix"),
 						 errcontext("line %d of configuration file \"%s\"",
 									line_num, HbaFileName)));
 				return false;
@@ -1281,7 +1281,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 		{
 			ereport(LOG,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
-					 errmsg("authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\" or \"ldapsuffix\" to be set"),
+					 errmsg("authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set"),
 					 errcontext("line %d of configuration file \"%s\"",
 								line_num, HbaFileName)));
 			return false;
@@ -1747,7 +1747,7 @@ check_usermap(const char *usermap_name,
 				return STATUS_OK;
 		}
 		ereport(LOG,
-				(errmsg("provided username (%s) and authenticated username (%s) don't match",
+				(errmsg("provided user name (%s) and authenticated user name (%s) do not match",
 						auth_user, pg_role)));
 		return STATUS_ERROR;
 	}
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 38c24267610..7bf82933d5c 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -30,7 +30,7 @@
  * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.208 2010/03/13 16:56:37 momjian Exp $
+ *	$PostgreSQL: pgsql/src/backend/libpq/pqcomm.c,v 1.209 2010/03/21 00:17:58 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -843,7 +843,7 @@ pq_getbyte_if_available(unsigned char *c)
 #else
 	if (!pg_set_noblock(MyProcPort->sock))
 		ereport(ERROR,
-				(errmsg("couldn't put socket to non-blocking mode: %m")));
+				(errmsg("could not set socket to non-blocking mode: %m")));
 #endif
 	MyProcPort->noblock = true;
 	PG_TRY();
@@ -889,7 +889,7 @@ pq_getbyte_if_available(unsigned char *c)
 #else
 		if (!pg_set_block(MyProcPort->sock))
 			ereport(FATAL,
-					(errmsg("couldn't put socket to blocking mode: %m")));
+					(errmsg("could not set socket to blocking mode: %m")));
 #endif
 		MyProcPort->noblock = false;
 		PG_RE_THROW();
@@ -900,7 +900,7 @@ pq_getbyte_if_available(unsigned char *c)
 #else
 	if (!pg_set_block(MyProcPort->sock))
 		ereport(FATAL,
-				(errmsg("couldn't put socket to blocking mode: %m")));
+				(errmsg("could not set socket to blocking mode: %m")));
 #endif
 	MyProcPort->noblock = false;