Index: src/backend/libpq/hba.c
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/backend/libpq/hba.c,v
retrieving revision 1.65
diff -c -r1.65 hba.c
*** src/backend/libpq/hba.c	2001/08/21 00:33:27	1.65
--- src/backend/libpq/hba.c	2001/08/21 13:54:45
***************
*** 892,898 ****
  	if (pass == NULL)
  	{
  		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
! 			 "ident_unix: unknown local user with uid %d\n",
  		fputs(PQerrormsg, stderr);
  		pqdebug("%s", PQerrormsg);
  		return false;
--- 892,898 ----
  	if (pass == NULL)
  	{
  		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
! 			 "ident_unix: unknown local user with uid %d\n"),
  		fputs(PQerrormsg, stderr);
  		pqdebug("%s", PQerrormsg);
  		return false;
Index: src/interfaces/ecpg/include/ecpgtype.h
===================================================================
RCS file: /home/projects/pgsql/cvsroot/pgsql/src/interfaces/ecpg/include/ecpgtype.h,v
retrieving revision 1.18
diff -c -r1.18 ecpgtype.h
*** src/interfaces/ecpg/include/ecpgtype.h	2001/03/29 09:59:00	1.18
--- src/interfaces/ecpg/include/ecpgtype.h	2001/08/21 13:54:47
***************
*** 52,58 ****
  	/* descriptor items */
  	enum ECPGdtype
  	{
! 		ECPGd_count = 1,
  		ECPGd_data,
  		ECPGd_di_code,
  		ECPGd_di_precision,
--- 52,59 ----
  	/* descriptor items */
  	enum ECPGdtype
  	{
! 		ECPGd_cardinality = 1,
! 		ECPGd_count,
  		ECPGd_data,
  		ECPGd_di_code,
  		ECPGd_di_precision,