From 4d44f11288132a225258a6d2d94e984624aae557 Mon Sep 17 00:00:00 2001 From: Lars-Dominik Braun Date: Wed, 9 Nov 2011 21:15:49 +0100 Subject: TLS is not optional any more --- src/settings.c | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'src/settings.c') diff --git a/src/settings.c b/src/settings.c index 04bfff0..f29fcfa 100644 --- a/src/settings.c +++ b/src/settings.c @@ -93,9 +93,7 @@ void BarSettingsDestroy (BarSettings_t *settings) { free (settings->npStationFormat); free (settings->listSongFormat); free (settings->fifo); -#ifdef ENABLE_TLS free (settings->tlsCaPath); -#endif for (size_t i = 0; i < MSG_COUNT; i++) { free (settings->msgFormat[i].prefix); free (settings->msgFormat[i].postfix); @@ -134,10 +132,7 @@ void BarSettingsRead (BarSettings_t *settings) { settings->listSongFormat = strdup ("%i) %a - %t%r"); settings->fifo = malloc (PATH_MAX * sizeof (*settings->fifo)); BarGetXdgConfigDir (PACKAGE "/ctl", settings->fifo, PATH_MAX); -#ifdef ENABLE_TLS - settings->tls = true; settings->tlsCaPath = strdup ("/etc/ssl/certs/ca-certificates.crt"); -#endif settings->msgFormat[MSG_NONE].prefix = NULL; settings->msgFormat[MSG_NONE].postfix = NULL; @@ -246,17 +241,9 @@ void BarSettingsRead (BarSettings_t *settings) { } else if (streq ("fifo", key)) { free (settings->fifo); settings->fifo = strdup (val); -#ifdef ENABLE_TLS - } else if (streq ("tls", key)) { - if (streq ("1", val)) { - settings->tls = true; - } else { - settings->tls = false; - } } else if (streq ("tls_ca_path", key)) { free (settings->tlsCaPath); settings->tlsCaPath = strdup (val); -#endif } else if (strncmp (formatMsgPrefix, key, strlen (formatMsgPrefix)) == 0) { static const char *mapping[] = {"none", "info", "nowplaying", -- cgit v1.2.3