Clean up pg_SSPI_error() coding a little bit: make the messages more

tglsfdc · tglsfdc · commit 727ffa1d1eba · 2009-03-22T18:06:35.000Z
consistent, translate where intended, const-ify declarations.
Resolves a gripe from Alvaro as well as some stuff I didn't like.
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.178 2009/01/09 10:13:18 mha Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.179 2009/03/22 18:06:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1084,11 +1084,12 @@ pg_GSS_recvauth(Port *port)
  */
 #ifdef ENABLE_SSPI
 static void
-pg_SSPI_error(int severity, char *errmsg, SECURITY_STATUS r)
+pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)
 {
 	char		sysmsg[256];
 
-	if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0, sysmsg, sizeof(sysmsg), NULL) == 0)
+	if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0,
+					  sysmsg, sizeof(sysmsg), NULL) == 0)
 		ereport(severity,
 				(errmsg_internal("%s", errmsg),
 				 errdetail("SSPI error %x", (unsigned int) r)));
@@ -1150,8 +1151,7 @@ pg_SSPI_recvauth(Port *port)
 								 &sspicred,
 								 &expiry);
 	if (r != SEC_E_OK)
-		pg_SSPI_error(ERROR,
-			   gettext_noop("could not acquire SSPI credentials handle"), r);
+		pg_SSPI_error(ERROR, _("could not acquire SSPI credentials"), r);
 
 	/*
 	 * Loop through SSPI message exchange. This exchange can consist of
@@ -1240,7 +1240,7 @@ pg_SSPI_recvauth(Port *port)
 			}
 			FreeCredentialsHandle(&sspicred);
 			pg_SSPI_error(ERROR,
-				  gettext_noop("could not accept SSPI security context"), r);
+						  _("could not accept SSPI security context"), r);
 		}
 
 		if (sspictx == NULL)
@@ -1296,7 +1296,7 @@ pg_SSPI_recvauth(Port *port)
 	{
 		FreeLibrary(secur32);
 		pg_SSPI_error(ERROR,
-			   gettext_noop("could not get security token from context"), r);
+					  _("could not get token from SSPI security context"), r);
 	}
 
 	FreeLibrary(secur32);
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.140 2009/01/13 10:43:21 mha Exp $
+ *	  $PostgreSQL: pgsql/src/interfaces/libpq/fe-auth.c,v 1.141 2009/03/22 18:06:35 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -472,13 +472,13 @@ pg_GSS_startup(PGconn *conn)
  */
 
 static void
-pg_SSPI_error(PGconn *conn, char *mprefix, SECURITY_STATUS r)
+pg_SSPI_error(PGconn *conn, const char *mprefix, SECURITY_STATUS r)
 {
 	char		sysmsg[256];
 
 	if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0,
 					  sysmsg, sizeof(sysmsg), NULL) == 0)
-		printfPQExpBuffer(&conn->errorMessage, "%s: sspi error %x",
+		printfPQExpBuffer(&conn->errorMessage, "%s: SSPI error %x",
 						  mprefix, (unsigned int) r);
 	else
 		printfPQExpBuffer(&conn->errorMessage, "%s: %s (%x)",
@@ -623,10 +623,18 @@ pg_SSPI_startup(PGconn *conn, int use_negotiate)
 		return STATUS_ERROR;
 	}
 
-	r = AcquireCredentialsHandle(NULL, use_negotiate ? "negotiate" : "kerberos", SECPKG_CRED_OUTBOUND, NULL, NULL, NULL, NULL, conn->sspicred, &expire);
+	r = AcquireCredentialsHandle(NULL,
+								 use_negotiate ? "negotiate" : "kerberos",
+								 SECPKG_CRED_OUTBOUND,
+								 NULL,
+								 NULL,
+								 NULL,
+								 NULL,
+								 conn->sspicred,
+								 &expire);
 	if (r != SEC_E_OK)
 	{
-		pg_SSPI_error(conn, "acquire credentials failed", r);
+		pg_SSPI_error(conn, libpq_gettext("could not acquire SSPI credentials"), r);
 		free(conn->sspicred);
 		conn->sspicred = NULL;
 		return STATUS_ERROR;

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/backend/libpq/auth.c,v 1.178 2009/01/09 10:13:18 mha Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.179 2009/03/22 18:06:35 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1084,11 +1084,12 @@ pg_GSS_recvauth(Port *port)`
`1084`	`1084`	`*/`
`1085`	`1085`	`#ifdef ENABLE_SSPI`
`1086`	`1086`	`static void`
`1087`		`-pg_SSPI_error(int severity, char *errmsg, SECURITY_STATUS r)`
	`1087`	`+pg_SSPI_error(int severity, const char *errmsg, SECURITY_STATUS r)`
`1088`	`1088`	`{`
`1089`	`1089`	`char sysmsg[256];`
`1090`	`1090`
`1091`		`- if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0, sysmsg, sizeof(sysmsg), NULL) == 0)`
	`1091`	`+ if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, r, 0,`
	`1092`	`+ sysmsg, sizeof(sysmsg), NULL) == 0)`
`1092`	`1093`	`ereport(severity,`
`1093`	`1094`	`(errmsg_internal("%s", errmsg),`
`1094`	`1095`	`errdetail("SSPI error %x", (unsigned int) r)));`
`@@ -1150,8 +1151,7 @@ pg_SSPI_recvauth(Port *port)`
`1150`	`1151`	`&sspicred,`
`1151`	`1152`	`&expiry);`
`1152`	`1153`	`if (r != SEC_E_OK)`
`1153`		`- pg_SSPI_error(ERROR,`
`1154`		`- gettext_noop("could not acquire SSPI credentials handle"), r);`
	`1154`	`+ pg_SSPI_error(ERROR, _("could not acquire SSPI credentials"), r);`
`1155`	`1155`
`1156`	`1156`	`/*`
`1157`	`1157`	`* Loop through SSPI message exchange. This exchange can consist of`
`@@ -1240,7 +1240,7 @@ pg_SSPI_recvauth(Port *port)`
`1240`	`1240`	`}`
`1241`	`1241`	`FreeCredentialsHandle(&sspicred);`
`1242`	`1242`	`pg_SSPI_error(ERROR,`
`1243`		`- gettext_noop("could not accept SSPI security context"), r);`
	`1243`	`+ _("could not accept SSPI security context"), r);`
`1244`	`1244`	`}`
`1245`	`1245`
`1246`	`1246`	`if (sspictx == NULL)`
`@@ -1296,7 +1296,7 @@ pg_SSPI_recvauth(Port *port)`
`1296`	`1296`	`{`
`1297`	`1297`	`FreeLibrary(secur32);`
`1298`	`1298`	`pg_SSPI_error(ERROR,`
`1299`		`- gettext_noop("could not get security token from context"), r);`
	`1299`	`+ _("could not get token from SSPI security context"), r);`
`1300`	`1300`	`}`
`1301`	`1301`
`1302`	`1302`	`FreeLibrary(secur32);`