>From 827cf897abb5d35571416fdbf7efcc32a733fbf5 Mon Sep 17 00:00:00 2001 From: Mathias Hasselmann Date: Tue, 27 Nov 2007 10:34:00 +0100 Subject: [PATCH] Rename bonjour_name configuration option to zeroconf_name. Bonjour is just one of many implementations of ZeroConf (DNS-SD). Therefore the option should be called zeroconf_name, not bonjour_name for political correctness. The old option name is preserved as (deprecated alias). * src/backend/utils/misc/guc.c: Add zeroconf_name and make bonjour_name a deprecated alias of zeroconf_name. * src/backend/postmaster/postmaster.c, src/include/postmaster/postmaster.h, src/backend/utils/misc/postgresql.conf.sample: Use zeroconf_name instead of bonjour_name. Signed-off-by: Mathias Hasselmann --- src/backend/postmaster/postmaster.c | 6 +++--- src/backend/utils/misc/guc.c | 13 +++++++++++-- src/backend/utils/misc/postgresql.conf.sample | 2 +- src/include/postmaster/postmaster.h | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 6798310..e4e5bda 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -205,7 +205,7 @@ bool log_hostname; /* for ps display and logging */ bool Log_connections = false; bool Db_user_namespace = false; -char *bonjour_name; +char *zeroconf_name; /* PIDs of special child processes; 0 when not running */ static pid_t StartupPID = 0, @@ -850,9 +850,9 @@ PostmasterMain(int argc, char *argv[]) #ifdef USE_BONJOUR /* Register for Bonjour only if we opened TCP socket(s) */ - if (ListenSocket[0] != -1 && bonjour_name != NULL) + if (ListenSocket[0] != -1 && zeroconf_name != NULL) { - DNSServiceRegistrationCreate(bonjour_name, + DNSServiceRegistrationCreate(zeroconf_name, "_postgresql._tcp.", "", htons(PostPortNumber), diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 3ce3d4e..da1cc62 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -2083,10 +2083,19 @@ static struct config_string ConfigureNamesString[] = { {"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS, - gettext_noop("Sets the Bonjour broadcast service name."), + gettext_noop("Sets the Bonjour broadcast service name. Deprecated, use zeroconf_name."), NULL }, - &bonjour_name, + &zeroconf_name, + "", NULL, NULL + }, + + { + {"zeroconf_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS, + gettext_noop("Sets the ZeroConf (Bonjour) broadcast service name."), + NULL + }, + &zeroconf_name, "", NULL, NULL }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 3a94829..55473b9 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -67,7 +67,7 @@ #unix_socket_group = '' # (change requires restart) #unix_socket_permissions = 0777 # octal # (change requires restart) -#bonjour_name = '' # defaults to the computer name +#zeroconf_name = '' # defaults to the computer name # (change requires restart) # - Security & Authentication - diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h index 0a963b7..70f2a75 100644 --- a/src/include/postmaster/postmaster.h +++ b/src/include/postmaster/postmaster.h @@ -27,7 +27,7 @@ extern int PreAuthDelay; extern int AuthenticationTimeout; extern bool Log_connections; extern bool log_hostname; -extern char *bonjour_name; +extern char *zeroconf_name; #ifdef WIN32 extern HANDLE PostmasterHandle; -- 1.5.2.5