From 4d61fddb4f7e895b8814e7d18e0276498dca9bdb Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Thu, 19 Apr 2012 11:23:06 +0200 Subject: [PATCH] Don't say RADPROT_TLS when we mean RAD_TLS. RADPROT_TLS is legacy from radsecproxy and will go away. It happens to be defined to 1, the same as RAD_TLS, so it happens to work. --- lib/configure.ac | 4 ++-- lib/tls.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/configure.ac b/lib/configure.ac index 9a618f8..9c24310 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -22,12 +22,12 @@ AC_CHECK_LIB([freeradius-radius], [rad_alloc],, # Enable-knobs. AH_TEMPLATE([RS_ENABLE_TLS], [TLS (RadSec) enabled]) -AH_TEMPLATE([RADPROT_TLS], []) +AH_TEMPLATE([RADPROT_TLS], []) dnl Legacy. AC_ARG_ENABLE([tls], AS_HELP_STRING([--enable-tls], [enable TLS (RadSec)]), [AC_CHECK_LIB([event_openssl], [bufferevent_openssl_socket_new],, AC_MSG_ERROR([required library event_openssl not found])) AC_DEFINE([RS_ENABLE_TLS]) - AC_DEFINE([RADPROT_TLS])]) + AC_DEFINE([RADPROT_TLS])]) dnl Legacy. AM_CONDITIONAL([RS_ENABLE_TLS], [test "${enable_tls+set}" = set]) # Checks for header files. diff --git a/lib/tls.c b/lib/tls.c index 9427f78..12af489 100644 --- a/lib/tls.c +++ b/lib/tls.c @@ -123,7 +123,7 @@ rs_tls_init (struct rs_connection *conn) tlsconf = _get_tlsconf (conn, conn->active_peer->realm); if (!tlsconf) return -1; - ssl_ctx = tlsgetctx (RADPROT_TLS, tlsconf); + ssl_ctx = tlsgetctx (RAD_TLS, tlsconf); if (!ssl_ctx) { for (sslerr = ERR_get_error (); sslerr; sslerr = ERR_get_error ()) -- 2.1.4