Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building with --disable-ssl #290

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix building with --disable-ssl #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ba78ac
Don't define ssl_verify_callback_common when using --disable-ssl.
sebastic Dec 11, 2024
3116544
Ensure use_ssl is set when using --disable-ssl.
sebastic Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/nrpe-ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ extern SSL_CTX *ctx;
extern SslParms sslprm;
#endif

extern int use_ssl;


void ssl_initialize(void);
void ssl_set_protocol_version(SslVer ssl_proto_ver, unsigned long *ssl_opts);
void ssl_log_startup(int server);
int ssl_load_certificates(void);
int ssl_set_ciphers(void);
#ifdef HAVE_SSL
int ssl_verify_callback_common(int preverify_ok, X509_STORE_CTX * ctx, int is_invalid);
#endif
3 changes: 3 additions & 0 deletions src/check_nrpe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ extern char *log_file;

#ifdef HAVE_SSL
SSL *ssl;
int use_ssl = TRUE;
unsigned long ssl_opts = SSL_OP_ALL;
#else
int use_ssl = FALSE;
#endif
int have_log_opts = FALSE;
SslParms sslprm = {
Expand Down
6 changes: 6 additions & 0 deletions src/nrpe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ int rfc931_timeout=15;
# endif
#endif

#ifdef HAVE_SSL
int use_ssl = TRUE;
#else
int use_ssl = FALSE;
#endif


#define DEFAULT_COMMAND_TIMEOUT 60 /* default timeout for execution of plugins */
#define MAXFD 64
Expand Down