fixed compilation warnings and errors when not using curl

This commit is contained in:
Martin Willi
2007-03-13 14:52:18 +00:00
parent db0f828413
commit 96567fc8a2
5 changed files with 10 additions and 3 deletions
+4
View File
@@ -54,6 +54,10 @@ if USE_LEAK_DETECTIVE
AM_CFLAGS = -DLEAK_DETECTIVE
endif
if USE_LIBCURL
libstrongswan_la_LIBADD += -lcurl
endif
asn1/oid.c : asn1/oid.txt asn1/oid.pl
cd asn1 && $(PERL) oid.pl
-1
View File
@@ -456,7 +456,6 @@ static int print(FILE *stream, const struct printf_info *info,
bool utc = TRUE;
int written = 0;
const x509_t *cacert;
chunk_t keyid;
if (info->alt)
{
-1
View File
@@ -467,7 +467,6 @@ static bool ocsp_parse_basic_response(chunk_t blob, int level0, response_t *res)
{
u_int level, version;
u_int extn_oid = OID_UNKNOWN;
u_char buf[BUF_LEN];
asn1_ctx_t ctx;
bool critical;
chunk_t object;
+2
View File
@@ -137,7 +137,9 @@ static chunk_t post(private_fetcher_t *this, const char *request_type, chunk_t r
*/
static void destroy(private_fetcher_t *this)
{
#ifdef LIBCURL
curl_easy_cleanup(this->curl);
#endif /* LIBCURL */
free(this);
}
+4 -1
View File
@@ -176,8 +176,9 @@ struct whitelist_t {
};
#ifdef LIBCURL
/* dummy declaration for whitelisting */
void *Curl_getaddrinfo(void);
#endif
#endif /* LIBCURL */
whitelist_t whitelist[] = {
{pthread_create, 2542},
@@ -191,8 +192,10 @@ whitelist_t whitelist[] = {
{register_printf_function, 159},
{syslog, 45},
{dlopen, 109},
# ifdef LIBCURL
/* from /usr/lib/libcurl.so.3 */
{Curl_getaddrinfo, 480},
# endif /* LIBCURL */
};
/**