From bf144a4ec07619c2ac60b5f6514f53b5c163a830 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sun, 13 May 2007 23:14:55 +0000 Subject: [PATCH] apply fixes in ITS#4951 (tested) --- contrib/slapd-modules/passwd/radius.c | 30 ++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/contrib/slapd-modules/passwd/radius.c b/contrib/slapd-modules/passwd/radius.c index f4bbb284bb..22aa461eaf 100644 --- a/contrib/slapd-modules/passwd/radius.c +++ b/contrib/slapd-modules/passwd/radius.c @@ -17,6 +17,7 @@ #include #include /* BER_BVC definition */ #include "lutil.h" +#include #include #include @@ -25,6 +26,7 @@ static LUTIL_PASSWD_CHK_FUNC chk_radius; static const struct berval scheme = BER_BVC("{RADIUS}"); static char *config_filename; +static ldap_pvt_thread_mutex_t libradius_mutex; static int chk_radius( @@ -58,8 +60,11 @@ chk_radius( return LUTIL_PASSWD_ERR; /* passwd must behave like a string */ } + ldap_pvt_thread_mutex_lock( &libradius_mutex ); + h = rad_auth_open(); if ( h == NULL ) { + ldap_pvt_thread_mutex_unlock( &libradius_mutex ); return LUTIL_PASSWD_ERR; } @@ -79,16 +84,37 @@ chk_radius( goto done; } - if ( rad_send_request( h ) == RAD_ACCESS_ACCEPT ) { + switch ( rad_send_request( h ) ) { + case RAD_ACCESS_ACCEPT: rc = LUTIL_PASSWD_OK; + break; + + case RAD_ACCESS_REJECT: + rc = LUTIL_PASSWD_ERR; + break; + + case RAD_ACCESS_CHALLENGE: + rc = LUTIL_PASSWD_ERR; + break; + + case -1: + /* no valid response is received */ + break; } done:; rad_close( h ); + ldap_pvt_thread_mutex_unlock( &libradius_mutex ); return rc; } +int +term_module() +{ + return ldap_pvt_thread_mutex_destroy( &libradius_mutex ); +} + int init_module( int argc, char *argv[] ) { @@ -109,5 +135,7 @@ init_module( int argc, char *argv[] ) } } + ldap_pvt_thread_mutex_init( &libradius_mutex ); + return lutil_passwd_add( (struct berval *)&scheme, chk_radius, NULL ); } -- 2.39.5