X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Ftools%2Fsysdbd%2Fmain.c;h=759eee2f5652ebee72c9131d22a05ddbf8f704b2;hp=c7fad8027b4a0da2fe6175af33001ca6f9fd7145;hb=dc7d88e992d19870cbec25244e0f1d4ddc0541b7;hpb=eb349b8f286dcd4e587c1229fb78c8d6ad41d1c9

diff --git a/src/tools/sysdbd/main.c b/src/tools/sysdbd/main.c
index c7fad80..759eee2 100644
--- a/src/tools/sysdbd/main.c
+++ b/src/tools/sysdbd/main.c
@@ -33,6 +33,7 @@
 #include "core/plugin.h"
 #include "core/store.h"
 #include "utils/error.h"
+#include "utils/ssl.h"
 
 #include "frontend/connection.h"
 #include "frontend/sock.h"
@@ -60,9 +61,6 @@
 
 #include <pthread.h>
 
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-
 #ifndef CONFIGFILE
 #	define CONFIGFILE SYSCONFDIR"/sysdb/sysdbd.conf"
 #endif
@@ -77,8 +75,8 @@ static sdb_fe_loop_t frontend_main_loop = SDB_FE_LOOP_INIT;
 static char *config_filename = NULL;
 static int reconfigure = 0;
 
-static char *default_listen_addresses[] = {
-	DEFAULT_SOCKET,
+static daemon_listener_t default_listen_addresses[] = {
+	{ DEFAULT_SOCKET, SDB_SSL_DEFAULT_OPTIONS },
 };
 
 static void
@@ -257,7 +255,8 @@ main_loop(void)
 		}
 
 		for (i = 0; i < listen_addresses_num; ++i) {
-			if (sdb_fe_sock_add_listener(sock, listen_addresses[i], NULL)) {
+			if (sdb_fe_sock_add_listener(sock, listen_addresses[i].address,
+						&listen_addresses[i].ssl_opts)) {
 				status = 1;
 				break;
 			}
@@ -369,9 +368,8 @@ main(int argc, char **argv)
 		if (daemonize())
 			exit(1);
 
-	SSL_load_error_strings();
-	OpenSSL_add_ssl_algorithms();
-
+	if (sdb_ssl_init())
+		exit(1);
 	sdb_plugin_init_all();
 	plugin_main_loop.default_interval = SECS_TO_SDB_TIME(60);
 
@@ -395,8 +393,8 @@ main(int argc, char **argv)
 	sdb_log(SDB_LOG_INFO, "Shutting down SysDB daemon "SDB_VERSION_STRING
 			SDB_VERSION_EXTRA" (pid %i)", (int)getpid());
 	sdb_plugin_shutdown_all();
-
-	ERR_free_strings();
+	sdb_plugin_unregister_all();
+	sdb_ssl_shutdown();
 	return status;
 } /* main */