Fix wrong merging of SCRAM

afiskon · afiskon · commit 54a0ccc72240 · 2016-12-05T15:38:44.000+03:00
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -722,7 +722,7 @@ CheckMD5Auth(Port *port, char **logdetail)
 		return STATUS_ERROR;
 	}
 
-	sendAuthRequest(port, AUTH_REQ_MD5, NULL, 0);
+	sendAuthRequest(port, AUTH_REQ_MD5, port->md5Salt, 4);
 	return recv_and_check_password_packet(port, logdetail);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -722,7 +722,7 @@ CheckMD5Auth(Port port, char *logdetail)`
`722`	`722`	`return STATUS_ERROR;`
`723`	`723`	`}`
`724`	`724`
`725`		`- sendAuthRequest(port, AUTH_REQ_MD5, NULL, 0);`
	`725`	`+ sendAuthRequest(port, AUTH_REQ_MD5, port->md5Salt, 4);`
`726`	`726`	`return recv_and_check_password_packet(port, logdetail);`
`727`	`727`	`}`
`728`	`728`