Commit a0cc9f3c authored by Bruce Momjian's avatar Bruce Momjian

Add GUC parameter to control rendezvous name.

parent 25114d3e
<!-- <!--
$Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.193 2003/07/14 20:00:22 tgl Exp $ $Header: /cvsroot/pgsql/doc/src/sgml/runtime.sgml,v 1.194 2003/07/22 20:29:13 momjian Exp $
--> -->
<Chapter Id="runtime"> <Chapter Id="runtime">
...@@ -732,6 +732,16 @@ SET ENABLE_SEQSCAN TO OFF; ...@@ -732,6 +732,16 @@ SET ENABLE_SEQSCAN TO OFF;
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry>
<term><varname>RENDEZVOUS_NAME</varname> (<type>string</type>)</term>
<listitem>
<para>
Specifies the Rendezvous broadcast name. By default, the
computer name is used, specified as ''.
</para>
</listitem>
</varlistentry>
</variablelist> </variablelist>
</sect3> </sect3>
<sect3 id="runtime-config-connection-security"> <sect3 id="runtime-config-connection-security">
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.334 2003/07/22 19:00:10 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.335 2003/07/22 20:29:13 momjian Exp $
* *
* NOTES * NOTES
* *
...@@ -210,6 +210,8 @@ bool LogSourcePort; ...@@ -210,6 +210,8 @@ bool LogSourcePort;
bool Log_connections = false; bool Log_connections = false;
bool Db_user_namespace = false; bool Db_user_namespace = false;
char *rendezvous_name;
/* For FNCTL_NONBLOCK */ /* For FNCTL_NONBLOCK */
#if defined(WIN32) || defined(__BEOS__) #if defined(WIN32) || defined(__BEOS__)
long ioctlsocket_ret; long ioctlsocket_ret;
...@@ -771,17 +773,17 @@ PostmasterMain(int argc, char *argv[]) ...@@ -771,17 +773,17 @@ PostmasterMain(int argc, char *argv[])
"socket."); "socket.");
} }
} }
#ifdef USE_RENDEZVOUS #ifdef USE_RENDEZVOUS
if (service_name != NULL) if (rendezvous_name != NULL)
{ {
DNSServiceRegistrationCreate(NULL, /* default to hostname */ DNSServiceRegistrationCreate(rendezvous_name,
"_postgresql._tcp.", "_postgresql._tcp.",
"", "",
htonl(PostPortNumber), htonl(PostPortNumber),
"", "",
(DNSServiceRegistrationReply)reg_reply, (DNSServiceRegistrationReply)reg_reply,
NULL); NULL);
} }
#endif #endif
} }
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>. * Written by Peter Eisentraut <peter_e@gmx.net>.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.137 2003/07/15 19:19:56 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.138 2003/07/22 20:29:13 momjian Exp $
* *
*-------------------------------------------------------------------- *--------------------------------------------------------------------
*/ */
...@@ -1299,6 +1299,15 @@ static struct config_string ConfigureNamesString[] = ...@@ -1299,6 +1299,15 @@ static struct config_string ConfigureNamesString[] =
PG_KRB_SRVTAB, NULL, NULL PG_KRB_SRVTAB, NULL, NULL
}, },
{
{"rendezvous_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
gettext_noop("The Rendezvous broadcast service name"),
NULL
},
&rendezvous_name,
"", NULL, NULL
},
/* See main.c about why defaults for LC_foo are not all alike */ /* See main.c about why defaults for LC_foo are not all alike */
{ {
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#unix_socket_group = '' #unix_socket_group = ''
#unix_socket_permissions = 0777 # octal #unix_socket_permissions = 0777 # octal
#virtual_host = '' #virtual_host = ''
#rendezvous_name = '' # defaults to the computer name
# - Security & Authentication - # - Security & Authentication -
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* *
* $Id: tcopprot.h,v 1.57 2003/05/05 00:44:56 tgl Exp $ * $Id: tcopprot.h,v 1.58 2003/07/22 20:29:13 momjian Exp $
* *
* OLD COMMENTS * OLD COMMENTS
* This file was created so that other c files could get the two * This file was created so that other c files could get the two
...@@ -32,6 +32,7 @@ extern CommandDest whereToSendOutput; ...@@ -32,6 +32,7 @@ extern CommandDest whereToSendOutput;
extern bool log_hostname; extern bool log_hostname;
extern bool LogSourcePort; extern bool LogSourcePort;
extern DLLIMPORT const char *debug_query_string; extern DLLIMPORT const char *debug_query_string;
extern char *rendezvous_name;
#ifndef BOOTSTRAP_INCLUDE #ifndef BOOTSTRAP_INCLUDE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment