From aead49667ba2f716d18256cbee65e3e66ff5c7f0 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 15 Nov 2002 01:40:20 +0000
Subject: [PATCH] Rename show_source_port to log_source_port.

---
 doc/src/sgml/runtime.sgml                     | 4 ++--
 src/backend/postmaster/postmaster.c           | 6 +++---
 src/backend/utils/misc/guc.c                  | 4 ++--
 src/backend/utils/misc/postgresql.conf.sample | 2 +-
 src/include/tcop/tcopprot.h                   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 6ec4d72f02..c571c9a81f 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.152 2002/11/15 00:47:22 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.153 2002/11/15 01:40:15 momjian Exp $
 -->
 
 <Chapter Id="runtime">
@@ -1124,7 +1124,7 @@ env PGOPTIONS='-c geqo=off' psql
      </varlistentry>
 
      <varlistentry>
-      <term><varname>SHOW_SOURCE_PORT</varname> (<type>boolean</type>)</term>
+      <term><varname>LOG_SOURCE_PORT</varname> (<type>boolean</type>)</term>
       <listitem>
        <para>
         Shows the outgoing port number of the connecting host in the
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 69363cd8f7..c8c0642fc2 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.294 2002/11/14 23:53:27 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.295 2002/11/15 01:40:18 momjian Exp $
  *
  * NOTES
  *
@@ -200,7 +200,7 @@ int			AuthenticationTimeout = 60;
 int			CheckPointTimeout = 300;
 
 bool		HostnameLookup;		/* for ps display */
-bool		ShowPortNumber;
+bool		LogSourcePort;
 bool		Log_connections = false;
 bool		Db_user_namespace = false;
 
@@ -2119,7 +2119,7 @@ DoBackend(Port *port)
 			elog(LOG, "connection received: host=%s port=%hu",
 				 remote_host, remote_port);
 
-		if (ShowPortNumber)
+		if (LogSourcePort)
 		{
 			/* modify remote_host for use in ps status */
 			int			slen = strlen(remote_host) + 10;
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index ce60c09978..cfd632c331 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -5,7 +5,7 @@
  * command, configuration file, and command line options.
  * See src/backend/utils/misc/README for more information.
  *
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.103 2002/11/15 01:26:09 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.104 2002/11/15 01:40:19 momjian Exp $
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
@@ -480,7 +480,7 @@ static struct config_bool
 		false, NULL, NULL
 	},
 	{
-		{"show_source_port", PGC_SIGHUP}, &ShowPortNumber,
+		{"log_source_port", PGC_SIGHUP}, &LogSourcePort,
 		false, NULL, NULL
 	},
 
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index feca0810ad..9b4fb28c83 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -35,7 +35,6 @@
 
 #port = 5432 
 #hostname_lookup = false
-#show_source_port = false
 
 #unix_socket_directory = ''
 #unix_socket_group = ''
@@ -122,6 +121,7 @@
 #silent_mode = false
 
 #log_connections = false
+#log_source_port = false
 #log_pid = false
 #log_statement = false
 #log_duration = false
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index f4ba67b3be..c02b65c55c 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $Id: tcopprot.h,v 1.51 2002/10/21 18:57:35 petere Exp $
+ * $Id: tcopprot.h,v 1.52 2002/11/15 01:40:20 momjian Exp $
  *
  * OLD COMMENTS
  *	  This file was created so that other c files could get the two
@@ -31,7 +31,7 @@ extern bool Warn_restart_ready;
 extern bool InError;
 extern CommandDest whereToSendOutput;
 extern bool HostnameLookup;
-extern bool ShowPortNumber;
+extern bool LogSourcePort;
 extern DLLIMPORT char* debug_query_string;
 
 #ifndef BOOTSTRAP_INCLUDE