mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-29 05:17:54 +00:00
Code Issues Releases Wiki Activity

Fix compilation error when not built with OpenSSL support.

Browse Source 
Adds a missing #ifdef HAVE_OPENSSL and reorders code to avoid the
need for a static init_tls_server_context() prototype.
This commit is contained in:
Todd C. Miller 2020-02-18 10:35:30 -07:00
parent 982c003b8d
commit adb3bdf6dd
1 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
logsrvd/logsrvd.c
View File

@ -87,8 +87,6 @@ static double random_drop;
/* Server callback may redirect to client callback for TLS. */ /* Server callback may redirect to client callback for TLS. */
static void client_msg_cb(int fd, int what, void *v); static void client_msg_cb(int fd, int what, void *v);
static SSL_CTX *init_tls_server_context(void);
/* /*
* Free a struct connection_closure container and its contents. * Free a struct connection_closure container and its contents.
*/ */
@ -916,48 +914,6 @@ bad:
debug_return; debug_return;
} }
static void
server_reload(struct sudo_event_base *base)
{
debug_decl(server_reload, SUDO_DEBUG_UTIL);
sudo_debug_printf(SUDO_DEBUG_INFO, "reloading server config");
if (logsrvd_conf_read(conf_file)) {
/* Re-initialize TLS server context on reload. */
if (logsrvd_conf_get_tls_opt() == true) {
struct logsrvd_tls_runtime *tls_runtime = logsrvd_get_tls_runtime();
if ((tls_runtime->ssl_ctx = init_tls_server_context()) == NULL)
sudo_fatal(NULL);
}
}
debug_return;
}
static void
signal_cb(int signo, int what, void *v)
{
struct sudo_event_base *base = v;
debug_decl(signal_cb, SUDO_DEBUG_UTIL);
switch (signo) {
case SIGHUP:
server_reload(base);
break;
case SIGINT:
case SIGTERM:
/* Shut down active connections. */
server_shutdown(base);
break;
default:
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"unexpected signal %d", signo);
break;
}
debug_return;
}
#if defined(HAVE_OPENSSL) #if defined(HAVE_OPENSSL)
static int static int
verify_peer_identity(int preverify_ok, X509_STORE_CTX *ctx) verify_peer_identity(int preverify_ok, X509_STORE_CTX *ctx)
@ -1583,6 +1539,50 @@ register_listener(struct listen_address *addr, struct sudo_event_base *base)
debug_return; debug_return;
} }
static void
server_reload(struct sudo_event_base *base)
{
debug_decl(server_reload, SUDO_DEBUG_UTIL);
sudo_debug_printf(SUDO_DEBUG_INFO, "reloading server config");
if (logsrvd_conf_read(conf_file)) {
#if defined(HAVE_OPENSSL)
/* Re-initialize TLS server context on reload. */
if (logsrvd_conf_get_tls_opt() == true) {
struct logsrvd_tls_runtime *tls_runtime = logsrvd_get_tls_runtime();
if ((tls_runtime->ssl_ctx = init_tls_server_context()) == NULL)
sudo_fatal(NULL);
}
#endif
}
debug_return;
}
static void
signal_cb(int signo, int what, void *v)
{
struct sudo_event_base *base = v;
debug_decl(signal_cb, SUDO_DEBUG_UTIL);
switch (signo) {
case SIGHUP:
server_reload(base);
break;
case SIGINT:
case SIGTERM:
/* Shut down active connections. */
server_shutdown(base);
break;
default:
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"unexpected signal %d", signo);
break;
}
debug_return;
}
static void static void
register_signal(int signo, struct sudo_event_base *base) register_signal(int signo, struct sudo_event_base *base)
{ {