database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-10 17:42:29 +03:00
Code Activity

Rename Rendezvous to Bonjour to match OS/X renaming.

Browse Source
This commit is contained in:
Bruce Momjian
2005-05-15 00:26:19 +00:00
parent c8a6b52705
commit c9a382b2ed
9 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/backend/postmaster/postmaster.c
View File

@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.450 2005/03/25 00:34:21 tgl Exp $
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.451 2005/05/15 00:26:18 momjian Exp $
*
* NOTES
*
@@ -88,7 +88,7 @@
#include <getopt.h>
#endif
#ifdef USE_RENDEZVOUS
#ifdef USE_BONJOUR
#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
#endif
@@ -198,7 +198,7 @@ bool log_hostname; /* for ps display and logging */
bool Log_connections = false;
bool Db_user_namespace = false;
char *rendezvous_name;
char *bonjour_name;
/* list of library:init-function to be preloaded */
char *preload_libraries_string = NULL;
@@ -242,7 +242,7 @@ extern int optreset;
*/
static void checkDataDir(void);
#ifdef USE_RENDEZVOUS
#ifdef USE_BONJOUR
static void reg_reply(DNSServiceRegistrationReplyErrorType errorCode,
void *context);
#endif
@@ -746,11 +746,11 @@ PostmasterMain(int argc, char *argv[])
pfree(rawstring);
}
#ifdef USE_RENDEZVOUS
/* Register for Rendezvous only if we opened TCP socket(s) */
if (ListenSocket[0] != -1 && rendezvous_name != NULL)
#ifdef USE_BONJOUR
/* Register for Bonjour only if we opened TCP socket(s) */
if (ListenSocket[0] != -1 && bonjour_name != NULL)
{
DNSServiceRegistrationCreate(rendezvous_name,
DNSServiceRegistrationCreate(bonjour_name,
"_postgresql._tcp.",
"",
htonl(PostPortNumber),
@@ -1009,7 +1009,7 @@ checkDataDir(void)
}
#ifdef USE_RENDEZVOUS
#ifdef USE_BONJOUR
/*
* empty callback function for DNSServiceRegistrationCreate()
@@ -1019,7 +1019,7 @@ reg_reply(DNSServiceRegistrationReplyErrorType errorCode, void *context)
{
}
#endif /* USE_RENDEZVOUS */
#endif /* USE_BONJOUR */
/*

8
src/backend/utils/misc/guc.c
View File

@@ -10,7 +10,7 @@
* Written by Peter Eisentraut <peter_e@gmx.net>.
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.261 2005/05/01 18:56:19 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.262 2005/05/15 00:26:19 momjian Exp $
*
*--------------------------------------------------------------------
*/
@@ -1573,11 +1573,11 @@ static struct config_string ConfigureNamesString[] =
},
{
{"rendezvous_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
gettext_noop("Sets the Rendezvous broadcast service name."),
{"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
gettext_noop("Sets the Bonjour broadcast service name."),
NULL
},
&rendezvous_name,
&bonjour_name,
"", NULL, NULL
},

2
src/backend/utils/misc/postgresql.conf.sample
View File

@@ -56,7 +56,7 @@
#unix_socket_directory = ''
#unix_socket_group = ''
#unix_socket_permissions = 0777 # octal
#rendezvous_name = '' # defaults to the computer name
#bonjour_name = '' # defaults to the computer name
# - Security & Authentication -