Imported Upstream version 2.7.1

This commit is contained in:
Laurent Bigonville 2013-11-24 16:00:12 +01:00
parent a1fa151fc7
commit 0121794af9
451 changed files with 41339 additions and 10887 deletions

View file

@ -23,9 +23,16 @@
#ifndef NUT_CTYPE_H_SEEN
#define NUT_CTYPE_H_SEEN 1
#ifdef HAVE_SSL
#include <openssl/err.h>
#include <openssl/ssl.h>
/* Mozilla NSS */
#ifdef WITH_NSS
#include <nss.h>
#include <ssl.h>
#endif
/* OpenSSL */
#ifdef WITH_OPENSSL
#include <openssl/err.h>
#include <openssl/ssl.h>
#endif
#include "parseconf.h"
@ -39,10 +46,12 @@ typedef struct nut_ctype_s {
char *password;
char *username;
#ifdef HAVE_SSL
#ifdef WITH_OPENSSL
SSL *ssl;
#elif defined(WITH_NSS)
PRFileDesc *ssl;
#else
void *ssl;
void *ssl;
#endif
int ssl_connected;