pgindent run for 9.0, second run

3 files changed, 65 insertions, 63 deletions

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 5648a45dfe7..ec75945e85a 100644
--- 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.202 2010/06/29 04:12:47 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/auth.c,v 1.203 2010/07/06 19:18:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -179,7 +179,7 @@ static int	pg_GSS_recvauth(Port *port);
  *----------------------------------------------------------------
  */
 #ifdef ENABLE_SSPI
-typedef SECURITY_STATUS
+typedef		SECURITY_STATUS
 			(WINAPI * QUERY_SECURITY_CONTEXT_TOKEN_FN) (
 													   PCtxtHandle, void **);
 static int	pg_SSPI_recvauth(Port *port);
@@ -233,8 +233,8 @@ static void
 auth_failed(Port *port, int status)
 {
 	const char *errstr;
-	int		errcode_return = ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION;
-	
+	int			errcode_return = ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION;
+
 	/*
 	 * If we failed due to EOF from client, just quit; there's no point in
 	 * trying to send a message to the client, and not much point in logging
@@ -369,13 +369,13 @@ ClientAuthentication(Port *port)
 
 			/*
 			 * An explicit "reject" entry in pg_hba.conf.  This report exposes
-			 * the fact that there's an explicit reject entry, which is perhaps
-			 * not so desirable from a security standpoint; but the message
-			 * for an implicit reject could confuse the DBA a lot when the
-			 * true situation is a match to an explicit reject.  And we don't
-			 * want to change the message for an implicit reject.  As noted
-			 * below, the additional information shown here doesn't expose
-			 * anything not known to an attacker.
+			 * the fact that there's an explicit reject entry, which is
+			 * perhaps not so desirable from a security standpoint; but the
+			 * message for an implicit reject could confuse the DBA a lot when
+			 * the true situation is a match to an explicit reject.  And we
+			 * don't want to change the message for an implicit reject.  As
+			 * noted below, the additional information shown here doesn't
+			 * expose anything not known to an attacker.
 			 */
 			{
 				char		hostinfo[NI_MAXHOST];
@@ -389,32 +389,32 @@ ClientAuthentication(Port *port)
 				{
 #ifdef USE_SSL
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s",
-									hostinfo, port->user_name,
-									port->ssl ? _("SSL on") : _("SSL off"))));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("pg_hba.conf rejects replication connection for host \"%s\", user \"%s\", %s",
+							   hostinfo, port->user_name,
+							   port->ssl ? _("SSL on") : _("SSL off"))));
 #else
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("pg_hba.conf rejects replication connection for host \"%s\", user \"%s\"",
-									hostinfo, port->user_name)));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("pg_hba.conf rejects replication connection for host \"%s\", user \"%s\"",
+							   hostinfo, port->user_name)));
 #endif
 				}
 				else
 				{
 #ifdef USE_SSL
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s",
-									hostinfo, port->user_name,
-									port->database_name,
-									port->ssl ? _("SSL on") : _("SSL off"))));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\", %s",
+							   hostinfo, port->user_name,
+							   port->database_name,
+							   port->ssl ? _("SSL on") : _("SSL off"))));
 #else
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\"",
-									hostinfo, port->user_name,
-									port->database_name)));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("pg_hba.conf rejects connection for host \"%s\", user \"%s\", database \"%s\"",
+							   hostinfo, port->user_name,
+							   port->database_name)));
 #endif
 				}
 				break;
@@ -442,32 +442,32 @@ ClientAuthentication(Port *port)
 				{
 #ifdef USE_SSL
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s",
-									hostinfo, port->user_name,
-									port->ssl ? _("SSL on") : _("SSL off"))));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\", %s",
+							   hostinfo, port->user_name,
+							   port->ssl ? _("SSL on") : _("SSL off"))));
 #else
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\"",
-									hostinfo, port->user_name)));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("no pg_hba.conf entry for replication connection from host \"%s\", user \"%s\"",
+							   hostinfo, port->user_name)));
 #endif
 				}
 				else
 				{
 #ifdef USE_SSL
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s",
-									hostinfo, port->user_name,
-									port->database_name,
-									port->ssl ? _("SSL on") : _("SSL off"))));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\", %s",
+							   hostinfo, port->user_name,
+							   port->database_name,
+							   port->ssl ? _("SSL on") : _("SSL off"))));
 #else
 					ereport(FATAL,
-							(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
-							 errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\"",
-									hostinfo, port->user_name,
-									port->database_name)));
+					   (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						errmsg("no pg_hba.conf entry for host \"%s\", user \"%s\", database \"%s\"",
+							   hostinfo, port->user_name,
+							   port->database_name)));
 #endif
 				}
 				break;
@@ -2781,7 +2781,7 @@ CheckRADIUSAuth(Port *port)
 	timeout.tv_sec = RADIUS_TIMEOUT;
 	timeout.tv_usec = 0;
 	FD_ZERO(&fdset);
-	FD_SET		(sock, &fdset);
+	FD_SET(sock, &fdset);
 
 	while (true)
 	{
@@ -2904,8 +2904,8 @@ CheckRADIUSAuth(Port *port)
 	else
 	{
 		ereport(LOG,
-				(errmsg("RADIUS response has invalid code (%i) for user \"%s\"",
-						receivepacket->code, port->user_name)));
+			 (errmsg("RADIUS response has invalid code (%i) for user \"%s\"",
+					 receivepacket->code, port->user_name)));
 		return STATUS_ERROR;
 	}
 }
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index f74f8f92757..b7000a653a1 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -11,7 +11,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.101 2010/05/26 16:15:57 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.102 2010/07/06 19:18:56 momjian Exp $
  *
  *	  Since the server static private key ($DataDir/server.key)
  *	  will normally be stored unencrypted so that the database
@@ -500,7 +500,7 @@ err:
  *	to verify that the DBA-generated DH parameters file contains
  *	what we expect it to contain.
  */
-static DH *
+static DH  *
 load_dh_file(int keylength)
 {
 	FILE	   *fp;
@@ -558,7 +558,7 @@ load_dh_file(int keylength)
  *	To prevent problems if the DH parameters files don't even
  *	exist, we can load DH parameters hardcoded into this file.
  */
-static DH *
+static DH  *
 load_dh_buffer(const char *buffer, size_t len)
 {
 	BIO		   *bio;
@@ -590,7 +590,7 @@ load_dh_buffer(const char *buffer, size_t len)
  *	the OpenSSL library can efficiently generate random keys from
  *	the information provided.
  */
-static DH *
+static DH  *
 tmp_dh_cb(SSL *s, int is_export, int keylength)
 {
 	DH		   *r = NULL;
@@ -720,6 +720,7 @@ static void
 initialize_SSL(void)
 {
 	struct stat buf;
+
 	STACK_OF(X509_NAME) *root_cert_list = NULL;
 
 	if (!SSL_context)
@@ -809,7 +810,7 @@ initialize_SSL(void)
 						 ROOT_CERT_FILE)));
 	}
 	else if (SSL_CTX_load_verify_locations(SSL_context, ROOT_CERT_FILE, NULL) != 1 ||
-			 (root_cert_list = SSL_load_client_CA_file(ROOT_CERT_FILE)) == NULL)
+		  (root_cert_list = SSL_load_client_CA_file(ROOT_CERT_FILE)) == NULL)
 	{
 		/*
 		 * File was there, but we could not load it. This means the file is
@@ -867,7 +868,7 @@ initialize_SSL(void)
 			ssl_loaded_verify_locations = true;
 		}
 
-		/* 
+		/*
 		 * Tell OpenSSL to send the list of root certs we trust to clients in
 		 * CertificateRequests.  This lets a client with a keystore select the
 		 * appropriate client certificate to send to us.
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 02b57920f8e..4e1cff3502c 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -10,7 +10,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.208 2010/06/03 19:29:38 petere Exp $
+ *	  $PostgreSQL: pgsql/src/backend/libpq/hba.c,v 1.209 2010/07/06 19:18:56 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -711,7 +711,7 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 			ereport(LOG,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
 					 errmsg("hostssl not supported on this platform"),
-				 errhint("Compile with --with-openssl to use SSL connections."),
+			  errhint("Compile with --with-openssl to use SSL connections."),
 					 errcontext("line %d of configuration file \"%s\"",
 								line_num, HbaFileName)));
 			return false;
@@ -891,8 +891,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 					ereport(LOG,
 							(errcode(ERRCODE_CONFIG_FILE_ERROR),
 							 errmsg("IP address and mask do not match"),
-							 errcontext("line %d of configuration file \"%s\"",
-										line_num, HbaFileName)));
+						   errcontext("line %d of configuration file \"%s\"",
+									  line_num, HbaFileName)));
 					return false;
 				}
 			}
@@ -1011,14 +1011,15 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 	{
 		ereport(LOG,
 				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-			 errmsg("gssapi authentication is not supported on local sockets"),
+		   errmsg("gssapi authentication is not supported on local sockets"),
 				 errcontext("line %d of configuration file \"%s\"",
 							line_num, HbaFileName)));
 		return false;
 	}
+
 	/*
-	 * SSPI authentication can never be enabled on ctLocal connections, because
-	 * it's only supported on Windows, where ctLocal isn't supported.
+	 * SSPI authentication can never be enabled on ctLocal connections,
+	 * because it's only supported on Windows, where ctLocal isn't supported.
 	 */
 
 
@@ -1248,8 +1249,8 @@ parse_hba_line(List *line, int line_num, HbaLine *parsedline)
 			{
 				ereport(LOG,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("unrecognized authentication option name: \"%s\"",
-								token),
+					errmsg("unrecognized authentication option name: \"%s\"",
+						   token),
 						 errcontext("line %d of configuration file \"%s\"",
 									line_num, HbaFileName)));
 				return false;
@@ -1633,8 +1634,8 @@ parse_ident_usermap(List *line, int line_number, const char *usermap_name,
 				pg_regerror(r, &re, errstr, sizeof(errstr));
 				ereport(LOG,
 						(errcode(ERRCODE_INVALID_REGULAR_EXPRESSION),
-						 errmsg("regular expression match for \"%s\" failed: %s",
-								file_ident_user + 1, errstr)));
+					 errmsg("regular expression match for \"%s\" failed: %s",
+							file_ident_user + 1, errstr)));
 				*error_p = true;
 			}