Make pwdfMatchesString() a little more careful about matching * fields.

tglsfdc · tglsfdc · commit 2c39ab12f32c · 2009-05-18T16:15:22.000Z
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.373 2009/04/24 09:43:10 mha Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.374 2009/05/18 16:15:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3779,7 +3779,7 @@ pwdfMatchesString(char *buf, char *token)
 		return NULL;
 	tbuf = buf;
 	ttok = token;
-	if (*tbuf == '*')
+	if (tbuf[0] == '*' && tbuf[1] == ':')
 		return tbuf + 2;
 	while (*tbuf != 0)
 	{

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.373 2009/04/24 09:43:10 mha Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-connect.c,v 1.374 2009/05/18 16:15:22 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -3779,7 +3779,7 @@ pwdfMatchesString(char buf, char token)`
`3779`	`3779`	`return NULL;`
`3780`	`3780`	`tbuf = buf;`
`3781`	`3781`	`ttok = token;`
`3782`		`- if (tbuf == '')`
	`3782`	`+ if (tbuf[0] == '*' && tbuf[1] == ':')`
`3783`	`3783`	`return tbuf + 2;`
`3784`	`3784`	`while (*tbuf != 0)`
`3785`	`3785`	`{`