diff options
| author | Peter Eisentraut | 2020-01-31 15:26:12 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2020-01-31 15:28:43 +0000 |
| commit | a9cff89f7e638c060621a62ca35da97a12adde42 (patch) | |
| tree | 733f5f5cbc7af6abf965ae40c1139fffda0bf6ab /src/include/libpq | |
| parent | 7c23bfd25c423b4513a16d41c5e4d09c32807155 (diff) | |
Allow building without default socket directory
We have code paths for Unix socket support and no Unix socket support.
Now add a third variant: Unix socket support but do not use a Unix
socket by default in the client or the server, only if you explicitly
specify one. This will be useful when we enable Unix socket support
on Windows.
To implement this, tweak things so that setting DEFAULT_PGSOCKET_DIR
to "" has the desired effect. This mostly already worked like that;
only a few places needed to be adjusted. Notably, the reference to
DEFAULT_PGSOCKET_DIR in UNIXSOCK_PATH() could be removed because all
callers already resolve an empty socket directory setting with a
default if appropriate.
Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>
Discussion: https://www.postgresql.org/message-id/75f72249-8ae6-322a-63df-4fe03eeccb9f@2ndquadrant.com
Diffstat (limited to 'src/include/libpq')
| -rw-r--r-- | src/include/libpq/pqcomm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h index 6c8bc29acea..781d86c8efa 100644 --- a/src/include/libpq/pqcomm.h +++ b/src/include/libpq/pqcomm.h @@ -68,10 +68,10 @@ typedef struct /* Configure the UNIX socket location for the well known port. */ #define UNIXSOCK_PATH(path, port, sockdir) \ + (AssertMacro(sockdir), \ + AssertMacro(*(sockdir) != '\0'), \ snprintf(path, sizeof(path), "%s/.s.PGSQL.%d", \ - ((sockdir) && *(sockdir) != '\0') ? (sockdir) : \ - DEFAULT_PGSOCKET_DIR, \ - (port)) + (sockdir), (port))) /* * The maximum workable length of a socket path is what will fit into |