aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2007-03-30 03:19:19 +0000
committerBruce Momjian <bruce@momjian.us>2007-03-30 03:19:19 +0000
commit4dd2d9192d35424d534909b79ceea14b34055555 (patch)
tree28d769ee62761ccea29e1662d72ae236f68d9a81
parent0e95abd64cd3d68da4e9134554ede4badcd106d4 (diff)
downloadpostgresql-4dd2d9192d35424d534909b79ceea14b34055555.tar.gz
postgresql-4dd2d9192d35424d534909b79ceea14b34055555.zip
Update SSL description for when SSL root.crt/server.crt is required;
add link to libpq SSL does from server docs. Backpatch to 8.2.X.
-rw-r--r--doc/src/sgml/libpq.sgml4
-rw-r--r--doc/src/sgml/runtime.sgml11
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index bba83920d9b..9aa7961cf86 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.220.2.6 2007/02/19 22:06:30 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/libpq.sgml,v 1.220.2.7 2007/03/30 03:19:19 momjian Exp $ -->
<chapter id="libpq">
<title><application>libpq</application> - C Library</title>
@@ -4458,7 +4458,7 @@ ldap://ldap.mycompany.com/dc=mycompany,dc=com?uniqueMember?one?(cn=mydatabase)
<filename>%APPDATA%\postgresql\root.crt</filename>.)
The SSL connection will
fail if the server does not present a certificate; therefore, to
- use this feature the server must also have a <filename>root.crt</> file.
+ use this feature the server must have a <filename>server.crt</> file.
Certificate Revocation List (CRL) entries are also checked if the file
<filename>~/.postgresql/root.crl</filename> exists (<filename>%APPDATA%\postgresql\root.crl</filename>
on Microsoft Windows).
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 4eaf2bab591..7d8adc9a920 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.374 2006/11/25 22:44:48 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.374.2.1 2007/03/30 03:19:19 momjian Exp $ -->
<chapter Id="runtime">
<title>Operating System Environment</title>
@@ -1552,10 +1552,11 @@ chmod og-rwx server.key
certificates of the <acronym>CA</acronym>(s) you wish to check for in
the file <filename>root.crt</filename> in the data directory. When
present, a client certificate will be requested from the client
- during SSL connection startup, and it must have been signed by one of the
- certificates present in <filename>root.crt</filename>. Certificate
- Revocation List (CRL) entries are also checked if the file
- <filename>root.crl</filename> exists.
+ during SSL connection startup, and it must have been signed by one of
+ the certificates present in <filename>root.crt</filename>. (See <xref
+ linkend="libpq-ssl"> for a description of how to set up client
+ certificates.) Certificate Revocation List (CRL) entries are also
+ checked if the file <filename>root.crl</filename> exists.
</para>
<para>