Comment out check for substitution of private key file on Windows,

tglsfdc · tglsfdc · commit a54ea1f75e75 · 2005-01-10T00:37:12.000Z
since st_ino can't be trusted on that platform.  Per report from T.J.
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.66 2005/01/08 22:51:15 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.67 2005/01/10 00:37:12 tgl Exp $
  *
  * NOTES
  *	  [ Most of these notes are wrong/obsolete, but perhaps not all ]
@@ -768,8 +768,10 @@ static int
 client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 {
 	char		homedir[MAXPGPATH];
-	struct stat buf,
-				buf2;
+	struct stat buf;
+#ifndef WIN32
+	struct stat buf2;
+#endif
 	char		fnbuf[MAXPGPATH];
 	FILE	   *fp;
 	PGconn	   *conn = (PGconn *) SSL_get_app_data(ssl);
@@ -831,13 +833,15 @@ client_cert_cb(SSL *ssl, X509 **x509, EVP_PKEY **pkey)
 						  fnbuf, pqStrerror(errno, sebuf, sizeof(sebuf)));
 		return 0;
 	}
+#ifndef WIN32
 	if (fstat(fileno(fp), &buf2) == -1 ||
 		buf.st_dev != buf2.st_dev || buf.st_ino != buf2.st_ino)
 	{
 		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("private key file \"%s\" changed during execution\n"), fnbuf);
 		return 0;
 	}
+#endif
 	if (PEM_read_PrivateKey(fp, pkey, cb, NULL) == NULL)
 	{
 		char	   *err = SSLerrmessage();

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`*`
`13`	`13`	`* IDENTIFICATION`
`14`		`- * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.66 2005/01/08 22:51:15 tgl Exp $`
	`14`	`+ * $PostgreSQL: pgsql/src/interfaces/libpq/fe-secure.c,v 1.67 2005/01/10 00:37:12 tgl Exp $`
`15`	`15`	`*`
`16`	`16`	`* NOTES`
`17`	`17`	`* [ Most of these notes are wrong/obsolete, but perhaps not all ]`
`@@ -768,8 +768,10 @@ static int`
`768`	`768`	`client_cert_cb(SSL ssl, X509 x509, EVP_PKEY *pkey)`
`769`	`769`	`{`
`770`	`770`	`char homedir[MAXPGPATH];`
`771`		`- struct stat buf,`
`772`		`- buf2;`
	`771`	`+ struct stat buf;`
	`772`	`+#ifndef WIN32`
	`773`	`+ struct stat buf2;`
	`774`	`+#endif`
`773`	`775`	`char fnbuf[MAXPGPATH];`
`774`	`776`	`FILE *fp;`
`775`	`777`	`PGconn conn = (PGconn ) SSL_get_app_data(ssl);`
`@@ -831,13 +833,15 @@ client_cert_cb(SSL ssl, X509 x509, EVP_PKEY *pkey)`
`831`	`833`	`fnbuf, pqStrerror(errno, sebuf, sizeof(sebuf)));`
`832`	`834`	`return 0;`
`833`	`835`	`}`
	`836`	`+#ifndef WIN32`
`834`	`837`	`if (fstat(fileno(fp), &buf2) == -1 \|\|`
`835`	`838`	`buf.st_dev != buf2.st_dev \|\| buf.st_ino != buf2.st_ino)`
`836`	`839`	`{`
`837`	`840`	`printfPQExpBuffer(&conn->errorMessage,`
`838`	`841`	`libpq_gettext("private key file \"%s\" changed during execution\n"), fnbuf);`
`839`	`842`	`return 0;`
`840`	`843`	`}`
	`844`	`+#endif`
`841`	`845`	`if (PEM_read_PrivateKey(fp, pkey, cb, NULL) == NULL)`
`842`	`846`	`{`
`843`	`847`	`char *err = SSLerrmessage();`