Commit9df188b

committed

A little more code reorg for MD5/crypt.

1 parent0a3094b commit9df188bCopy full SHA for 9df188b

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 7 additions & 7 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.61 2001/08/17 15:40:07 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/libpq/auth.c,v 1.62 2001/08/17 15:44:17 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -419,9 +419,9 @@ auth_failed(Port *port)`
`419`	`419`	`caseuaIdent:`
`420`	`420`	`authmethod="IDENT";`
`421`	`421`	`break;`
`422`		`-caseuaPassword:`
`423`	`422`	`caseuaMD5:`
`424`	`423`	`caseuaCrypt:`
	`424`	`+caseuaPassword:`
`425`	`425`	`authmethod="Password";`
`426`	`426`	`break;`
`427`	`427`	`}`
`@@ -496,11 +496,6 @@ ClientAuthentication(Port *port)`
`496`	`496`	`status=authident(port);`
`497`	`497`	`break;`
`498`	`498`
`499`		`-caseuaPassword:`
`500`		`-sendAuthRequest(port,AUTH_REQ_PASSWORD);`
`501`		`-status=recv_and_check_password_packet(port);`
`502`		`-break;`
`503`		`-`
`504`	`499`	`caseuaMD5:`
`505`	`500`	`sendAuthRequest(port,AUTH_REQ_MD5);`
`506`	`501`	`status=recv_and_check_password_packet(port);`
`@@ -511,6 +506,11 @@ ClientAuthentication(Port *port)`
`511`	`506`	`status=recv_and_check_password_packet(port);`
`512`	`507`	`break;`
`513`	`508`
	`509`	`+caseuaPassword:`
	`510`	`+sendAuthRequest(port,AUTH_REQ_PASSWORD);`
	`511`	`+status=recv_and_check_password_packet(port);`
	`512`	`+break;`
	`513`	`+`
`514`	`514`	`caseuaTrust:`
`515`	`515`	`status=STATUS_OK;`
`516`	`516`	`break;`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group`
`3`	`3`	`* Portions Copyright (c) 1994, Regents of the University of California`
`4`	`4`	`*`
`5`		`- * $Id: password.c,v 1.38 2001/08/15 18:42:15 momjian Exp $`
	`5`	`+ * $Id: password.c,v 1.39 2001/08/17 15:44:17 momjian Exp $`
`6`	`6`	`*`
`7`	`7`	`*/`
`8`	`8`
`@@ -82,8 +82,8 @@ verify_password(const Port port, const char user, const char *password)`
`82`	`82`	`* the current code needs non-encrypted passwords to`
`83`	`83`	`* encrypt with a random salt.`
`84`	`84`	`*/`
`85`		`-if (port->auth_method==uaCrypt\|\|`
`86`		`-port->auth_method==uaMD5\|\|`
	`85`	`+if (port->auth_method==uaMD5\|\|`
	`86`	`+port->auth_method==uaCrypt\|\|`
`87`	`87`	`test_pw==NULL\|\|`
`88`	`88`	`test_pw[0]=='\0'\|\|`
`89`	`89`	`strcmp(test_pw,"+")==0)`

Comments

(0)