Make client_cert bool everywhere

diff --git a/src/include/tls-h b/src/include/tls-h
index 0ba9b63..9ae3182 100644 (file)
--- a/src/include/tls-h
+++ b/src/include/tls-h
@@ -297,7 +297,7 @@ int         cbtls_verify(int ok, X509_STORE_CTX *ctx);
 void           tls_global_init(void);
 int            tls_global_version_check(char const *acknowledged);
 void           tls_global_cleanup(void);
-tls_session_t  *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQUEST *request, int client_cert);
+tls_session_t  *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQUEST *request, bool client_cert);
 tls_session_t  *tls_new_client_session(fr_tls_server_conf_t *conf, int fd);
 fr_tls_server_conf_t *tls_server_conf_parse(CONF_SECTION *cs);
 fr_tls_server_conf_t *tls_client_conf_parse(CONF_SECTION *cs);

diff --git a/src/main/tls.c b/src/main/tls.c
index 426ff82..640bed4 100644 (file)
--- a/src/main/tls.c
+++ b/src/main/tls.c
@@ -197,7 +197,7 @@ static int _tls_session_free(tls_session_t *ssn)
        return 0;
 }
 
-tls_session_t *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQUEST *request, int client_cert)
+tls_session_t *tls_new_session(TALLOC_CTX *ctx, fr_tls_server_conf_t *conf, REQUEST *request, bool client_cert)
 {
        tls_session_t *state = NULL;
        SSL *new_tls = NULL;

diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index 97973ea..3e44ebe 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -182,7 +182,7 @@ static int eappeap_initiate(void *type_arg, eap_handler_t *handler)
         */
        vp = pairfind(handler->request->config_items, PW_EAP_TLS_REQUIRE_CLIENT_CERT, 0, TAG_ANY);
        if (vp) {
-               client_cert = vp->vp_integer;
+               client_cert = vp->vp_integer ? true : false;
        } else {
                client_cert = inst->req_client_cert;
        }

diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index 4a3e017..3c031d3 100644 (file)
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -197,7 +197,7 @@ static int eapttls_initiate(void *type_arg, eap_handler_t *handler)
         */
        vp = pairfind(handler->request->config_items, PW_EAP_TLS_REQUIRE_CLIENT_CERT, 0, TAG_ANY);
        if (vp) {
-               client_cert = vp->vp_integer;
+               client_cert = vp->vp_integer ? true : false;
        } else {
                client_cert = inst->req_client_cert;
        }