Commitcd68681

committed

Remove protocol version change. Try MD5 first, then crypt() on all clients.

1 parent368e87e commitcd68681Copy full SHA for cd68681

File tree

+16

-20

lines changed

+16

-20

lines changed

Lines changed: 9 additions & 6 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.57 2001/08/15 18:42:14 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.58 2001/08/16 04:27:18 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -501,13 +501,16 @@ ClientAuthentication(Port *port)`
`501`	`501`	`status=recv_and_check_password_packet(port);`
`502`	`502`	`break;`
`503`	`503`
`504`		`-caseuaCrypt:`
`505`		`-sendAuthRequest(port,AUTH_REQ_CRYPT);`
`506`		`-status=recv_and_check_password_packet(port);`
`507`		`-break;`
`508`		`-`
`509`	`504`	`caseuaMD5:`
`510`	`505`	`sendAuthRequest(port,AUTH_REQ_MD5);`
	`506`	`+if ((status=recv_and_check_password_packet(port))==STATUS_OK)`
	`507`	`+break;`
	`508`	`+port->auth_method=uaCrypt;`
	`509`	`+/* Try crypt() for old client */`
	`510`	`+/* FALL THROUGH */`
	`511`	`+`
	`512`	`+caseuaCrypt:`
	`513`	`+sendAuthRequest(port,AUTH_REQ_CRYPT);`
`511`	`514`	`status=recv_and_check_password_packet(port);`
`512`	`515`	`break;`
`513`	`516`

Lines changed: 3 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.62 2001/08/15 18:42:15 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/hba.c,v 1.63 2001/08/16 04:27:18 momjian Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -227,15 +227,8 @@ parse_hba_auth(List line, ProtocolVersion proto, UserAuth userauth_p,`
`227`	`227`	`elseif (strcmp(token,"reject")==0)`
`228`	`228`	`*userauth_p=uaReject;`
`229`	`229`	`elseif (strcmp(token,"crypt")==0)`
`230`		`-{`
`231`		`-/* if the client supports it, use MD5 */`
`232`		`-if (PG_PROTOCOL_MAJOR(proto)>2\|\|`
`233`		`-(PG_PROTOCOL_MAJOR(proto)==2&&`
`234`		`-PG_PROTOCOL_MINOR(proto) >=1))`
`235`		`-*userauth_p=uaMD5;`
`236`		`-else`
`237`		`-*userauth_p=uaCrypt;`
`238`		`-}`
	`230`	`+/* Try MD5 first; on failure, switch to crypt() */`
	`231`	`+*userauth_p=uaMD5;`
`239`	`232`	`else`
`240`	`233`	`*error_p= true;`
`241`	`234`	`line=lnext(line);`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`10`	`10`	`* Portions Copyright (c) 1994, Regents of the University of California`
`11`	`11`	`*`
`12`		`- * $Id: pqcomm.h,v 1.56 2001/08/15 18:42:15 momjian Exp $`
	`12`	`+ * $Id: pqcomm.h,v 1.57 2001/08/16 04:27:18 momjian Exp $`
`13`	`13`	`*`
`14`	`14`	`*-------------------------------------------------------------------------`
`15`	`15`	`*/`
`@@ -90,7 +90,7 @@ typedef union SockAddr`
`90`	`90`	`/* The earliest and latest frontend/backend protocol version supported. */`
`91`	`91`
`92`	`92`	`#definePG_PROTOCOL_EARLIESTPG_PROTOCOL(0,0)`
`93`		`-#definePG_PROTOCOL_LATESTPG_PROTOCOL(2,1)`
	`93`	`+#definePG_PROTOCOL_LATESTPG_PROTOCOL(2,0)`
`94`	`94`
`95`	`95`	`/*`
`96`	`96`	`* All packets sent to the postmaster start with the length. This is omitted`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`13`	`13`	`* Portions Copyright (c) 1994, Regents of the University of California`
`14`	`14`	`*`
`15`		`- * $Id: libpq-int.h,v 1.37 2001/08/15 18:42:16 momjian Exp $`
	`15`	`+ * $Id: libpq-int.h,v 1.38 2001/08/16 04:27:18 momjian Exp $`
`16`	`16`	`*`
`17`	`17`	`*-------------------------------------------------------------------------`
`18`	`18`	`*/`
`@@ -45,7 +45,7 @@`
`45`	`45`	`* pqcomm.h describe what the backend knows, not what libpq knows.`
`46`	`46`	`*/`
`47`	`47`
`48`		`-#definePG_PROTOCOL_LIBPQPG_PROTOCOL(2,1)`
	`48`	`+#definePG_PROTOCOL_LIBPQPG_PROTOCOL(2,0)`
`49`	`49`
`50`	`50`	`/*`
`51`	`51`	`* POSTGRES backend dependent Constants.`

Comments

(0)