X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fcomstack.c;h=0020c97669f6f019869c8a4419d787431ad8832a;hb=3489c6eaceb7ab7f4e8298a2f898dda0c3d0a09c;hp=4c8fe05eaec496864f3f2de10615a470f60df62b;hpb=3576736bac485d8f04b2fc4f6b5cfcef7576d741;p=yaz-moved-to-github.git diff --git a/src/comstack.c b/src/comstack.c index 4c8fe05..0020c97 100644 --- a/src/comstack.c +++ b/src/comstack.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2007, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: comstack.c,v 1.22 2007-11-30 11:44:47 adam Exp $ */ /** @@ -24,6 +22,14 @@ #define strncasecmp _strnicmp #endif +#if HAVE_GNUTLS_H +#define ENABLE_SSL 1 +#endif + +#if HAVE_OPENSSL_SSL_H +#define ENABLE_SSL 1 +#endif + static const char *cs_errlist[] = { "No error or unspecified error", @@ -100,7 +106,7 @@ static int cs_parse_host(const char *uri, const char **host, } else if (strncmp (uri, "ssl:", 4) == 0) { -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL *t = ssl_type; *host = uri + 4; *proto = PROTO_Z3950; @@ -128,7 +134,7 @@ static int cs_parse_host(const char *uri, const char **host, } else if (strncmp(uri, "https:", 6) == 0) { -#if HAVE_OPENSSL_SSL_H +#if ENABLE_SSL *t = ssl_type; *host = uri + 6; while (**host == '/')