diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 20 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 8 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 4 | ||||
| -rw-r--r-- | src/include/postmaster/postmaster.h | 4 |
5 files changed, 19 insertions, 19 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index a7d289ffb3..ae46bec131 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -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 */ /* diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 4549611243..6dde284bae 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <[email protected]>. * * 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 }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index b175236883..88272d35b5 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -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 - diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 08cbc4bb2e..51a13907bb 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -645,8 +645,8 @@ /* Define to 1 to build with PAM support. (--with-pam) */ #undef USE_PAM -/* Define to 1 to build with Rendezvous support. (--with-rendezvous) */ -#undef USE_RENDEZVOUS +/* Define to 1 to build with Bonjour support. (--with-bonjour) */ +#undef USE_BONJOUR /* Use replacement snprintf() functions. */ #undef USE_SNPRINTF diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h index c5c611eab4..1b11d056c7 100644 --- a/src/include/postmaster/postmaster.h +++ b/src/include/postmaster/postmaster.h @@ -6,7 +6,7 @@ * Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.9 2004/12/31 22:03:39 pgsql Exp $ + * $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.10 2005/05/15 00:26:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -28,7 +28,7 @@ extern int AuthenticationTimeout; extern char *preload_libraries_string; extern bool Log_connections; extern bool log_hostname; -extern char *rendezvous_name; +extern char *bonjour_name; #ifdef WIN32 extern HANDLE PostmasterHandle; |