Commit50036e8

committed

Add a check for end of client connection before expecting a password

response, to avoid noise in the server log.

1 parent2f4759d commit50036e8Copy full SHA for 50036e8

File tree

+25

-4

lines changed

+25

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.55 2001/08/01 23:25:39 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.56 2001/08/07 10:44:13 petere Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -554,7 +554,7 @@ recv_and_check_password_packet(Port *port)`
`554`	`554`	`int32len;`
`555`	`555`	`intresult;`
`556`	`556`
`557`		`-if (pq_getint(&len,4)==EOF)`
	`557`	`+if (pq_eof()==EOF\|\|pq_getint(&len,4)==EOF)`
`558`	`558`	`returnSTATUS_ERROR;/* client didn't want to send password */`
`559`	`559`	`initStringInfo(&buf);`
`560`	`560`	`pq_getstr(&buf);`

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@`
`29`	`29`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`30`	`30`	`* Portions Copyright (c) 1994, Regents of the University of California`
`31`	`31`	`*`
`32`		`- *$Id: pqcomm.c,v 1.119 2001/08/05 01:22:16 tgl Exp $`
	`32`	`+ *$Id: pqcomm.c,v 1.120 2001/08/07 10:44:15 petere Exp $`
`33`	`33`	`*`
`34`	`34`	`*-------------------------------------------------------------------------`
`35`	`35`	`*/`
`@@ -695,6 +695,26 @@ pq_flush(void)`
`695`	`695`	`}`
`696`	`696`
`697`	`697`
	`698`	`+/*`
	`699`	`+ * Return EOF if the connection has been broken, else 0.`
	`700`	`+ */`
	`701`	`+int`
	`702`	`+pq_eof(void)`
	`703`	`+{`
	`704`	`+charx;`
	`705`	`+intres;`
	`706`	`+`
	`707`	`+res=recv(MyProcPort->sock,&x,1,MSG_PEEK);`
	`708`	`+`
	`709`	`+if (res==-1)`
	`710`	`+fprintf(stderr,"pq_eof: recv() failed: %s\n",strerror(errno));`
	`711`	`+elseif (res==0)`
	`712`	`+returnEOF;`
	`713`	`+else`
	`714`	`+return0;`
	`715`	`+}`
	`716`	`+`
	`717`	`+`
`698`	`718`	`/* --------------------------------`
`699`	`719`	`* Message-level I/O routines begin here.`
`700`	`720`	`*`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $Id: libpq.h,v 1.44 2001/03/22 04:00:48 momjian Exp $`
	`10`	`+ * $Id: libpq.h,v 1.45 2001/08/07 10:44:16 petere Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -65,6 +65,7 @@ extern intpq_getstring(StringInfo s);`
`65`	`65`	`externintpq_peekbyte(void);`
`66`	`66`	`externintpq_putbytes(constchar*s,size_tlen);`
`67`	`67`	`externintpq_flush(void);`
	`68`	`+externintpq_eof(void);`
`68`	`69`	`externintpq_putmessage(charmsgtype,constchar*s,size_tlen);`
`69`	`70`	`externvoidpq_startcopyout(void);`
`70`	`71`	`externvoidpq_endcopyout(boolerrorAbort);`

Comments

(0)