Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 31ae87c

Browse files
committed
This patch attempts to note the use of the root.crt file in the server.
Given that PostgreSQL will output a message complaining about it's absence if you're using SSL mode, I feel it's important that it gets a mention in the documentation at some point. Dominic Mitchell
1 parent 505d9be commit 31ae87c

File tree

2 files changed

+25
-4
lines changed

2 files changed

+25
-4
lines changed

doc/src/sgml/runtime.sgml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.282 2004/09/22 03:55:24 neilc Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.283 2004/09/23 13:15:57 momjian Exp $
33
-->
44

55
<Chapter Id="runtime">
@@ -4358,6 +4358,24 @@ chmod og-rwx server.key
43584358
to turn the certificate into a self-signed certificate and to copy the
43594359
key and certificate to where the server will look for them.
43604360
</para>
4361+
4362+
<para>
4363+
If verification of client certificates is required, place the
4364+
certificates of the <acronym>CA</acronym> you wish to check for in
4365+
the file <filename>root.crt</filename> in the data directory. When
4366+
present, a client certificate will be requested from the client
4367+
making the connection and it must have been signed by one of the
4368+
certificates present in <filename>root.crt</filename>. If no
4369+
certificate is presented, the connection will be allowed to proceed
4370+
anway.
4371+
</para>
4372+
4373+
<para>
4374+
The <filename>root.crt</filename> file is always checked for, and
4375+
its absence will be noted through a message in the log. This is
4376+
merely an informative message that client certificates will not be
4377+
requested.
4378+
</para>
43614379
</sect1>
43624380

43634381
<sect1 id="ssh-tunnels">

src/include/c.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group
1313
* Portions Copyright (c) 1994, Regents of the University of California
1414
*
15-
* $PostgreSQL: pgsql/src/include/c.h,v 1.172 2004/09/16 16:58:38 tgl Exp $
15+
* $PostgreSQL: pgsql/src/include/c.h,v 1.173 2004/09/23 13:16:02 momjian Exp $
1616
*
1717
*-------------------------------------------------------------------------
1818
*/
@@ -75,10 +75,13 @@
7575
#include <SupportDefs.h>
7676
#endif
7777

78-
#if (defined(WIN32) || defined(__CYGWIN__)) && \
79-
!defined(_MSC_VER) && !defined(__BORLANDC__)
78+
#if defined(WIN32) || defined(__CYGWIN__)
79+
#if !defined(_MSC_VER) && !defined(__BORLANDC__)
8080
/* We have to redefine some system functions after they are included above */
8181
#include "pg_config_os.h"
82+
#else
83+
#include <windows.h> /* We don't have a port file for MSC/BCC */
84+
#endif
8285
#endif
8386

8487
/* Must be before gettext() games below */

0 commit comments

Comments
 (0)