projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update RPM requires
[yaz-moved-to-github.git]
/
src
/
comstack.c
diff --git
a/src/comstack.c
b/src/comstack.c
index
fdcfcdb
..
d364f05
100644
(file)
--- a/
src/comstack.c
+++ b/
src/comstack.c
@@
-1,5
+1,5
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2013 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
/**
* See the file LICENSE for details.
*/
/**
@@
-21,14
+21,6
@@
#include <yaz/odr.h>
#include <yaz/matchstr.h>
#include <yaz/odr.h>
#include <yaz/matchstr.h>
-#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",
static const char *cs_errlist[] =
{
"No error or unspecified error",
@@
-139,7
+131,7
@@
int cs_parse_host(const char *uri, const char **host,
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
@@
-158,7
+150,7
@@
int cs_parse_host(const char *uri, const char **host,
}
else if (strncmp(uri, "https:", 6) == 0)
{
}
else if (strncmp(uri, "https:", 6) == 0)
{
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
*t = ssl_type;
*host = uri + 6;
while (**host == '/')
*t = ssl_type;
*host = uri + 6;
while (**host == '/')