Skip to content

Commit c9a382b

Browse files
bmomjianbmomjian
committed
Rename Rendezvous to Bonjour to match OS/X renaming.
1 parent c8a6b52 commit c9a382b

File tree

9 files changed

+55
-55
lines changed

9 files changed

+55
-55
lines changed

‎configure

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -871,7 +871,7 @@ Optional Packages:
871871
--with-krb5 build with Kerberos 5 support
872872
--with-krb-srvnam=NAME name of the service principal in Kerberos [postgres]
873873
--with-pam build with PAM support
874-
--with-rendezvous build with Rendezvous support
874+
--with-bonjour build with Bonjour support
875875
--with-openssl build with OpenSSL support
876876
--without-readline do not use Readline
877877
--without-zlib do not use Zlib
@@ -3431,42 +3431,42 @@ echo "${ECHO_T}$with_pam" >&6
34313431

34323432

34333433
#
3434-
# Rendezvous
3434+
# Bonjour
34353435
#
3436-
echo "$as_me:$LINENO: checking whether to build with Rendezvous support" >&5
3437-
echo $ECHO_N "checking whether to build with Rendezvous support... $ECHO_C" >&6
3436+
echo "$as_me:$LINENO: checking whether to build with Bonjour support" >&5
3437+
echo $ECHO_N "checking whether to build with Bonjour support... $ECHO_C" >&6
34383438

34393439

34403440

3441-
# Check whether --with-rendezvous or --without-rendezvous was given.
3442-
if test "${with_rendezvous+set}" = set; then
3443-
withval="$with_rendezvous"
3441+
# Check whether --with-bonjour or --without-bonjour was given.
3442+
if test "${with_bonjour+set}" = set; then
3443+
withval="$with_bonjour"
34443444

34453445
case $withval in
34463446
yes)
34473447

34483448
cat >>confdefs.h <<\_ACEOF
3449-
#define USE_RENDEZVOUS 1
3449+
#define USE_BONJOUR 1
34503450
_ACEOF
34513451

34523452
;;
34533453
no)
34543454
:
34553455
;;
34563456
*)
3457-
{ { echo "$as_me:$LINENO: error: no argument expected for --with-rendezvous option" >&5
3458-
echo "$as_me: error: no argument expected for --with-rendezvous option" >&2;}
3457+
{ { echo "$as_me:$LINENO: error: no argument expected for --with-bonjour option" >&5
3458+
echo "$as_me: error: no argument expected for --with-bonjour option" >&2;}
34593459
{ (exit 1); exit 1; }; }
34603460
;;
34613461
esac
34623462

34633463
else
3464-
with_rendezvous=no
3464+
with_bonjour=no
34653465

34663466
fi;
34673467

3468-
echo "$as_me:$LINENO: result: $with_rendezvous" >&5
3469-
echo "${ECHO_T}$with_rendezvous" >&6
3468+
echo "$as_me:$LINENO: result: $with_bonjour" >&5
3469+
echo "${ECHO_T}$with_bonjour" >&6
34703470

34713471

34723472

@@ -9674,7 +9674,7 @@ done
96749674

96759675
fi
96769676

9677-
if test "$with_rendezvous" = yes ; then
9677+
if test "$with_bonjour" = yes ; then
96789678
if test "${ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h+set}" = set; then
96799679
echo "$as_me:$LINENO: checking for DNSServiceDiscovery/DNSServiceDiscovery.h" >&5
96809680
echo $ECHO_N "checking for DNSServiceDiscovery/DNSServiceDiscovery.h... $ECHO_C" >&6
@@ -9779,8 +9779,8 @@ fi
97799779
if test $ac_cv_header_DNSServiceDiscovery_DNSServiceDiscovery_h = yes; then
97809780
:
97819781
else
9782-
{ { echo "$as_me:$LINENO: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous" >&5
9783-
echo "$as_me: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous" >&2;}
9782+
{ { echo "$as_me:$LINENO: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour" >&5
9783+
echo "$as_me: error: header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour" >&2;}
97849784
{ (exit 1); exit 1; }; }
97859785
fi
97869786

@@ -19710,7 +19710,7 @@ s,@with_krb4@,$with_krb4,;t t
1971019710
s,@with_krb5@,$with_krb5,;t t
1971119711
s,@krb_srvtab@,$krb_srvtab,;t t
1971219712
s,@with_pam@,$with_pam,;t t
19713-
s,@with_rendezvous@,$with_rendezvous,;t t
19713+
s,@with_bonjour@,$with_bonjour,;t t
1971419714
s,@with_openssl@,$with_openssl,;t t
1971519715
s,@ELF_SYS@,$ELF_SYS,;t t
1971619716
s,@LDFLAGS_SL@,$LDFLAGS_SL,;t t

‎configure.in

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.410 2005/05/07 05:48:50 neilc Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.411 2005/05/15 00:26:18 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -466,14 +466,14 @@ AC_SUBST(with_pam)
466466

467467

468468
#
469-
# Rendezvous
469+
# Bonjour
470470
#
471-
AC_MSG_CHECKING([whether to build with Rendezvous support])
472-
PGAC_ARG_BOOL(with, rendezvous, no,
473-
[ --with-rendezvous build with Rendezvous support],
474-
[AC_DEFINE([USE_RENDEZVOUS], 1, [Define to 1 to build with Rendezvous support. (--with-rendezvous)])])
475-
AC_MSG_RESULT([$with_rendezvous])
476-
AC_SUBST(with_rendezvous)
471+
AC_MSG_CHECKING([whether to build with Bonjour support])
472+
PGAC_ARG_BOOL(with, bonjour, no,
473+
[ --with-bonjour build with Bonjour support],
474+
[AC_DEFINE([USE_BONJOUR], 1, [Define to 1 to build with Bonjour support. (--with-bonjour)])])
475+
AC_MSG_RESULT([$with_bonjour])
476+
AC_SUBST(with_bonjour)
477477

478478

479479
#
@@ -781,8 +781,8 @@ if test "$with_pam" = yes ; then
781781
[AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])])
782782
fi
783783

784-
if test "$with_rendezvous" = yes ; then
785-
AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Rendezvous])])
784+
if test "$with_bonjour" = yes ; then
785+
AC_CHECK_HEADER(DNSServiceDiscovery/DNSServiceDiscovery.h, [], [AC_MSG_ERROR([header file <DNSServiceDiscovery/DNSServiceDiscovery.h> is required for Bonjour])])
786786
fi
787787

788788

‎doc/src/sgml/installation.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.232 2005/04/09 03:52:43 momjian Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.233 2005/05/15 00:26:18 momjian Exp $ -->
22

33
<chapter id="installation">
44
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -864,10 +864,10 @@ su - postgres
864864
</varlistentry>
865865

866866
<varlistentry>
867-
<term><option>--with-rendezvous</option></term>
867+
<term><option>--with-bonjour</option></term>
868868
<listitem>
869869
<para>
870-
Build with Rendezvous support. This requires Rendezvous support
870+
Build with Bonjour support. This requires Bonjour support
871871
in your operating system. Recommended on Mac OS X.
872872
</para>
873873
</listitem>

‎doc/src/sgml/runtime.sgml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.318 2005/05/09 17:26:22 momjian Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.319 2005/05/15 00:26:18 momjian Exp $
33
-->
44

55
<chapter Id="runtime">
@@ -873,17 +873,17 @@ SET ENABLE_SEQSCAN TO OFF;
873873
</listitem>
874874
</varlistentry>
875875

876-
<varlistentry id="guc-rendezvous-name" xreflabel="rendezvous_name">
877-
<term><varname>rendezvous_name</varname> (<type>string</type>)</term>
876+
<varlistentry id="guc-bonjour-name" xreflabel="bonjour_name">
877+
<term><varname>bonjour_name</varname> (<type>string</type>)</term>
878878
<indexterm>
879-
<primary><varname>rendezvous_name</> configuration parameter</primary>
879+
<primary><varname>bonjour_name</> configuration parameter</primary>
880880
</indexterm>
881881
<listitem>
882882
<para>
883-
Specifies the <productname>Rendezvous</productname> broadcast
883+
Specifies the <productname>Bonjour</productname> broadcast
884884
name. By default, the computer name is used, specified as an
885885
empty string ''. This option is ignored if the server was not
886-
compiled with <productname>Rendezvous</productname> support. This
886+
compiled with <productname>Bonjour</productname> support. This
887887
option can only be set at server start.
888888
</para>
889889
</listitem>

‎src/backend/postmaster/postmaster.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
*
3838
*
3939
* IDENTIFICATION
40-
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.450 2005/03/25 00:34:21 tgl Exp $
40+
* $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.451 2005/05/15 00:26:18 momjian Exp $
4141
*
4242
* NOTES
4343
*
@@ -88,7 +88,7 @@
8888
#include <getopt.h>
8989
#endif
9090

91-
#ifdef USE_RENDEZVOUS
91+
#ifdef USE_BONJOUR
9292
#include <DNSServiceDiscovery/DNSServiceDiscovery.h>
9393
#endif
9494

@@ -198,7 +198,7 @@ bool log_hostname; /* for ps display and logging */
198198
bool Log_connections = false;
199199
bool Db_user_namespace = false;
200200

201-
char *rendezvous_name;
201+
char *bonjour_name;
202202

203203
/* list of library:init-function to be preloaded */
204204
char *preload_libraries_string = NULL;
@@ -242,7 +242,7 @@ extern int optreset;
242242
*/
243243
static void checkDataDir(void);
244244

245-
#ifdef USE_RENDEZVOUS
245+
#ifdef USE_BONJOUR
246246
static void reg_reply(DNSServiceRegistrationReplyErrorType errorCode,
247247
void *context);
248248
#endif
@@ -746,11 +746,11 @@ PostmasterMain(int argc, char *argv[])
746746
pfree(rawstring);
747747
}
748748

749-
#ifdef USE_RENDEZVOUS
750-
/* Register for Rendezvous only if we opened TCP socket(s) */
751-
if (ListenSocket[0] != -1 && rendezvous_name != NULL)
749+
#ifdef USE_BONJOUR
750+
/* Register for Bonjour only if we opened TCP socket(s) */
751+
if (ListenSocket[0] != -1 && bonjour_name != NULL)
752752
{
753-
DNSServiceRegistrationCreate(rendezvous_name,
753+
DNSServiceRegistrationCreate(bonjour_name,
754754
"_postgresql._tcp.",
755755
"",
756756
htonl(PostPortNumber),
@@ -1009,7 +1009,7 @@ checkDataDir(void)
10091009
}
10101010

10111011

1012-
#ifdef USE_RENDEZVOUS
1012+
#ifdef USE_BONJOUR
10131013

10141014
/*
10151015
* empty callback function for DNSServiceRegistrationCreate()
@@ -1019,7 +1019,7 @@ reg_reply(DNSServiceRegistrationReplyErrorType errorCode, void *context)
10191019
{
10201020

10211021
}
1022-
#endif /* USE_RENDEZVOUS */
1022+
#endif /* USE_BONJOUR */
10231023

10241024

10251025
/*

‎src/backend/utils/misc/guc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.261 2005/05/01 18:56:19 tgl Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.262 2005/05/15 00:26:19 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1573,11 +1573,11 @@ static struct config_string ConfigureNamesString[] =
15731573
},
15741574

15751575
{
1576-
{"rendezvous_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
1577-
gettext_noop("Sets the Rendezvous broadcast service name."),
1576+
{"bonjour_name", PGC_POSTMASTER, CONN_AUTH_SETTINGS,
1577+
gettext_noop("Sets the Bonjour broadcast service name."),
15781578
NULL
15791579
},
1580-
&rendezvous_name,
1580+
&bonjour_name,
15811581
"", NULL, NULL
15821582
},
15831583

‎src/backend/utils/misc/postgresql.conf.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
#unix_socket_directory = ''
5757
#unix_socket_group = ''
5858
#unix_socket_permissions = 0777 # octal
59-
#rendezvous_name = '' # defaults to the computer name
59+
#bonjour_name = '' # defaults to the computer name
6060

6161
# - Security & Authentication -
6262

‎src/include/pg_config.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,8 +645,8 @@
645645
/* Define to 1 to build with PAM support. (--with-pam) */
646646
#undef USE_PAM
647647

648-
/* Define to 1 to build with Rendezvous support. (--with-rendezvous) */
649-
#undef USE_RENDEZVOUS
648+
/* Define to 1 to build with Bonjour support. (--with-bonjour) */
649+
#undef USE_BONJOUR
650650

651651
/* Use replacement snprintf() functions. */
652652
#undef USE_SNPRINTF

‎src/include/postmaster/postmaster.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2005, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
* $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.9 2004/12/31 22:03:39 pgsql Exp $
9+
* $PostgreSQL: pgsql/src/include/postmaster/postmaster.h,v 1.10 2005/05/15 00:26:19 momjian Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -28,7 +28,7 @@ extern int AuthenticationTimeout;
2828
extern char *preload_libraries_string;
2929
extern bool Log_connections;
3030
extern bool log_hostname;
31-
extern char *rendezvous_name;
31+
extern char *bonjour_name;
3232

3333
#ifdef WIN32
3434
extern HANDLE PostmasterHandle;

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy