diff options
| author | Magnus Hagander <magnus@hagander.net> | 2009-05-11 08:06:21 +0000 |
|---|---|---|
| committer | Magnus Hagander <magnus@hagander.net> | 2009-05-11 08:06:21 +0000 |
| commit | d9ebc8822b8015d7269630aa5e56fcc005c02876 (patch) | |
| tree | 33897150f5f8cfc7e45d8880becc6a5e56459253 /src | |
| parent | 723476c72ef50c102635d4c9c6f9b43244e78f7d (diff) | |
| download | postgresql-d9ebc8822b8015d7269630aa5e56fcc005c02876.tar.gz | |
Support SSL certificate chains in the server certificate file.
Andrew Gierth
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/be-secure.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c index d7cf20ccf0..a6478b5523 100644 --- a/src/backend/libpq/be-secure.c +++ b/src/backend/libpq/be-secure.c @@ -11,7 +11,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.90 2009/01/28 15:06:47 mha Exp $ + * $PostgreSQL: pgsql/src/backend/libpq/be-secure.c,v 1.91 2009/05/11 08:06:21 mha Exp $ * * Since the server static private key ($DataDir/server.key) * will normally be stored unencrypted so that the database @@ -729,9 +729,8 @@ initialize_SSL(void) /* * Load and verify certificate and private key */ - if (SSL_CTX_use_certificate_file(SSL_context, - SERVER_CERT_FILE, - SSL_FILETYPE_PEM) != 1) + if (SSL_CTX_use_certificate_chain_file(SSL_context, + SERVER_CERT_FILE) != 1) ereport(FATAL, (errcode(ERRCODE_CONFIG_FILE_ERROR), errmsg("could not load server certificate file \"%s\": %s", |