diff options
| author | Bruce Momjian | 2003-07-22 20:29:13 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2003-07-22 20:29:13 +0000 |
| commit | a0cc9f3cb9e46178b1d6d995802b54deaffd69f3 (patch) | |
| tree | 2584d8daaa74cfd74118652b52e3a750b952927d /src/backend | |
| parent | 25114d3e293f00b59be722b6148cdc00d2eb1b4d (diff) | |
Add GUC parameter to control rendezvous name.
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 26 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 11 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 1 |
3 files changed, 25 insertions, 13 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index ec98fc6f53..614c76e64e 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.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 * @@ -210,6 +210,8 @@ bool LogSourcePort; bool Log_connections = false; bool Db_user_namespace = false; +char *rendezvous_name; + /* For FNCTL_NONBLOCK */ #if defined(WIN32) || defined(__BEOS__) long ioctlsocket_ret; @@ -771,17 +773,17 @@ PostmasterMain(int argc, char *argv[]) "socket."); } } -#ifdef USE_RENDEZVOUS - if (service_name != NULL) - { - DNSServiceRegistrationCreate(NULL, /* default to hostname */ - "_postgresql._tcp.", - "", - htonl(PostPortNumber), - "", - (DNSServiceRegistrationReply)reg_reply, - NULL); - } +#ifdef USE_RENDEZVOUS + if (rendezvous_name != NULL) + { + DNSServiceRegistrationCreate(rendezvous_name, + "_postgresql._tcp.", + "", + htonl(PostPortNumber), + "", + (DNSServiceRegistrationReply)reg_reply, + NULL); + } #endif } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 8138c46918..3a3d64b256 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * 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[] = 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 */ { diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index b3c1ad7f5b..584e24f428 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -38,6 +38,7 @@ #unix_socket_group = '' #unix_socket_permissions = 0777 # octal #virtual_host = '' +#rendezvous_name = '' # defaults to the computer name # - Security & Authentication - |