Kyoshiro/bip
1
0
Fork 0
forked from bip/bip
Code Pull Requests Activity

Fix --without-openssl build

Browse Source 
Reported & fixed by Whoopie, thanks to him !
Closes #313
This commit is contained in:
Pierre-Louis Bonicoli 2013-11-04 08:49:06 +01:00
parent acfad6dee2
commit 8d3539a7d0
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bip.c
View File

@ -2255,8 +2255,10 @@ int adm_bip(bip_t *bip, struct link_client *ic, struct line *line, int privmsg)
adm_bip_delconn(bip, ic, adm_bip_delconn(bip, ic,
irc_line_elem(line, privmsg + 2)); irc_line_elem(line, privmsg + 2));
} }
#ifdef HAVE_LIBSSL
} else if (strcasecmp(irc_line_elem(line, privmsg + 1), "TRUST") == 0) { } else if (strcasecmp(irc_line_elem(line, privmsg + 1), "TRUST") == 0) {
return adm_trust(ic, line); return adm_trust(ic, line);
#endif
} else { } else {
bip_notify(ic, "Unknown command."); bip_notify(ic, "Unknown command.");
} }

3
src/connection.c
View File

@ -24,13 +24,13 @@ static int ssl_cx_idx;
extern FILE *conf_global_log_file; extern FILE *conf_global_log_file;
static BIO *errbio = NULL; static BIO *errbio = NULL;
extern char *conf_ssl_certfile; extern char *conf_ssl_certfile;
static int cn_want_write(connection_t *cn);
static int SSLize(connection_t *cn, int *nc); static int SSLize(connection_t *cn, int *nc);
static SSL_CTX *SSL_init_context(void); static SSL_CTX *SSL_init_context(void);
/* SSH like trust management */ /* SSH like trust management */
int link_add_untrusted(void *ls, X509 *cert); int link_add_untrusted(void *ls, X509 *cert);
#endif #endif
static int cn_want_write(connection_t *cn);
static int connection_timedout(connection_t *cn); static int connection_timedout(connection_t *cn);
static int socket_set_nonblock(int s); static int socket_set_nonblock(int s);
static void connection_connected(connection_t *c); static void connection_connected(connection_t *c);
@ -1538,6 +1538,7 @@ connection_t *connection_new(char *dsthostname, int dstport, char *srchostname,
(void)ssl; (void)ssl;
(void)ssl_check_mode; (void)ssl_check_mode;
(void)ssl_check_store; (void)ssl_check_store;
(void)ssl_client_certfile;
#endif #endif
/* TODO: allow litteral service name in the function interface */ /* TODO: allow litteral service name in the function interface */
if (snprintf(dstportbuf, 20, "%d", dstport) >= 20) if (snprintf(dstportbuf, 20, "%d", dstport) >= 20)