  
  					/*
  					 * if the resultStatus is FATAL, then conn->errorMessage
-@@ -1857,6 +1885,8 @@
+@@ -1857,6 +1886,8 @@
  	conn->std_strings = false;	/* unless server says differently */
  	conn->verbosity = PQERRORS_DEFAULT;
  	conn->sock = -1;

 				{
 					if (pqGetnchar(conn->cryptSalt,
 								   sizeof(conn->cryptSalt), conn))
@@ -1664,7 +1690,7 @@
 				 * XXX fe-auth.c has not been fixed to support PQExpBuffers,
 				 * so:
 				 */

 #else
diff -urN postgresql-8.2.3/src/interfaces/libpq/libpq-fe.h postgresql-8.2.3-tsnorri/src/interfaces/libpq/libpq-fe.h
--- postgresql-8.2.3/src/interfaces/libpq/libpq-fe.h	2006-10-04 03:30:13.000000000 +0300
+++ postgresql-8.2.3-tsnorri/src/interfaces/libpq/libpq-fe.h	2007-03-05 16:55:07.000000000 +0200
@@ -53,11 +53,19 @@
 								 * backend startup. */
 	CONNECTION_SETENV,			/* Negotiating environment. */
