diff options
| author | Bruce Momjian | 2000-11-25 04:13:18 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2000-11-25 04:13:18 +0000 |
| commit | 9d5098ca789dde1d48238f8cdb875eff28c3a251 (patch) | |
| tree | 95120306cf681229ded142db5ece4cdf98d63475 /src | |
| parent | 7a161ac3b727dbf0beb39fefedde5d62240003b5 (diff) | |
Rename GUC name from unixsocket to unix_socket_directory
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 4 | ||||
| -rw-r--r-- | src/include/libpq/pqcomm.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 817ddfbcbec..32ebb2c48ea 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.189 2000/11/21 21:16:00 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.190 2000/11/25 04:13:17 momjian Exp $ * * NOTES * @@ -114,7 +114,7 @@ static Dllist *PortList; /* The socket number we are listening for connections on */ int PostPortNumber; -char * UnixSocketName; +char * UnixSocketDir; char * Virtual_host; /* @@ -456,7 +456,7 @@ PostmasterMain(int argc, char *argv[]) break; case 'k': /* Set PGUNIXSOCKET by hand. */ - UnixSocketName = optarg; + UnixSocketDir = optarg; break; #ifdef USE_SSL case 'l': @@ -606,7 +606,7 @@ PostmasterMain(int argc, char *argv[]) if (NetServer) { status = StreamServerPort(AF_INET, Virtual_host, - (unsigned short) PostPortNumber, UnixSocketName, + (unsigned short) PostPortNumber, UnixSocketDir, &ServerSock_INET); if (status != STATUS_OK) { @@ -618,7 +618,7 @@ PostmasterMain(int argc, char *argv[]) #ifdef HAVE_UNIX_SOCKETS status = StreamServerPort(AF_UNIX, Virtual_host, - (unsigned short) PostPortNumber, UnixSocketName, + (unsigned short) PostPortNumber, UnixSocketDir, &ServerSock_UNIX); if (status != STATUS_OK) { diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index fd1113eb722..7813b6d10ba 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -4,7 +4,7 @@ * Support for grand unified configuration scheme, including SET * command, configuration file, and command line options. * - * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.22 2000/11/20 05:18:39 vadim Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/misc/guc.c,v 1.23 2000/11/25 04:13:17 momjian Exp $ * * Copyright 2000 by PostgreSQL Global Development Group * Written by Peter Eisentraut <peter_e@gmx.net>. @@ -316,7 +316,7 @@ ConfigureNamesString[] = "postgres", NULL}, #endif - {"unixsocket", PGC_POSTMASTER, &UnixSocketName, + {"unix_socket_directory", PGC_POSTMASTER, &UnixSocketDir, "", NULL}, {"virtual_host", PGC_POSTMASTER, &Virtual_host, diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index 8d5419dab45..ceb6956bb17 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -9,7 +9,7 @@ * Portions Copyright (c) 1996-2000, PostgreSQL, Inc * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: pqcomm.h,v 1.49 2000/11/22 03:40:19 momjian Exp $ + * $Id: pqcomm.h,v 1.50 2000/11/25 04:13:18 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -178,7 +178,7 @@ typedef struct CancelRequestPacket extern int Unix_socket_permissions; extern char * Unix_socket_group; -extern char * UnixSocketName; +extern char * UnixSocketDir; extern char * Virtual_host; #endif /* PQCOMM_H */ |