Обсуждение: pgsql: Change libpq's PQgetssl() to return a void*, rather than SSL *,

Log Message:
-----------
Change libpq's PQgetssl() to return a void*, rather than SSL *, so that
applications don't need the SSL headers.

Martijn van Oosterhout

Modified Files:
--------------
    pgsql/src/interfaces/libpq:
        fe-secure.c (r1.76 -> r1.77)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/interfaces/libpq/fe-secure.c.diff?r1=1.76&r2=1.77)
        libpq-fe.h (r1.126 -> r1.127)
        (http://developer.postgresql.org/cvsweb.cgi/pgsql/src/interfaces/libpq/libpq-fe.h.diff?r1=1.126&r2=1.127)

Bruce Momjian wrote:
> Log Message:
> -----------
> Change libpq's PQgetssl() to return a void*, rather than SSL *, so that
> applications don't need the SSL headers.
>

Now that libpq-fe.h doesn't include <openssl/ssl.h> the code in psql's
startup.c needs to include it itself.

Kris Jurka wrote:
> Bruce Momjian wrote:
> > Log Message:
> > -----------
> > Change libpq's PQgetssl() to return a void*, rather than SSL *, so that
> > applications don't need the SSL headers.
> >
>
> Now that libpq-fe.h doesn't include <openssl/ssl.h> the code in psql's
> startup.c needs to include it itself.

You mean like the attached patch, applied.

--
  Bruce Momjian   http://candle.pha.pa.us
  EnterpriseDB    http://www.enterprisedb.com

  + If your life is a hard drive, Christ can be your backup. +
Index: src/bin/psql/startup.c
===================================================================
RCS file: /cvsroot/pgsql/src/bin/psql/startup.c,v
retrieving revision 1.131
diff -c -c -r1.131 startup.c
*** src/bin/psql/startup.c    5 Mar 2006 15:58:52 -0000    1.131
--- src/bin/psql/startup.c    27 Apr 2006 02:56:12 -0000
***************
*** 8,13 ****
--- 8,16 ----
  #include "postgres_fe.h"

  #include <sys/types.h>
+ #ifdef USE_SSL
+ #include <openssl/ssl.h>
+ #endif

  #ifndef WIN32
  #include <unistd.h>