4 files changed, 57 insertions, 13 deletions

diff --git a/NEWS b/NEWS
index 2ef3915..a2a4868 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,8 @@ This file documents the major additions and syntax changes between releases.
         WARNING: check_disk's -E option must now be passed before -p or -r/-R arguments
           Passing -E after -p or -r results in UNKNOWN state, now
           This is needed due to the new ignore feature
-        Fix bug when mixing case sensitive and case insensitive regex arguments
+        Fix check_disk bug when mixing case sensitive and case insensitive regex arguments
+        Check_radius now supports radiusclient-ng
 
 1.4.9 4th June 2006
         Inclusion of contrib/check_cluster2 as check_cluster with some improvements
diff --git a/THANKS.in b/THANKS.in
index d56a3f4..f6fe941 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -224,3 +224,4 @@ Aurelien Bompard
 Christoph Schell
 Andrew Elwell
 Heiti Ernits
+Sebastien Guay
diff --git a/configure.in b/configure.in
index dc89b05..ee928d4 100644
--- a/configure.in
+++ b/configure.in
@@ -218,8 +218,15 @@ if test "$ac_cv_lib_radiusclient_rc_read_config" = "yes"; then
         RADIUSLIBS="-lradiusclient"
   AC_SUBST(RADIUSLIBS)
 else
-  AC_MSG_WARN([Skipping radius plugin])
-  AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+  AC_CHECK_LIB(radiusclient-ng,rc_read_config)
+  if test "$ac_cv_lib_radiusclient_ng_rc_read_config" = "yes"; then
+    EXTRAS="$EXTRAS check_radius"
+          RADIUSLIBS="-lradiusclient-ng"
+    AC_SUBST(RADIUSLIBS)
+  else
+    AC_MSG_WARN([Skipping radius plugin])
+    AC_MSG_WARN([install radius libs to compile this plugin (see REQUIREMENTS).])
+  fi
 fi
 LIBS="$_SAVEDLIBS"
 
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 4b340c3..32af91f 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -43,12 +43,35 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net";
 #include "utils.h"
 #include "netutils.h"
 
+#ifdef HAVE_LIBRADIUSCLIENT_NG
+#include <radiusclient-ng.h>
+rc_handle *rch = NULL;
+#else
 #include <radiusclient.h>
+#endif
 
 int process_arguments (int, char **);
 void print_help (void);
 void print_usage (void);
 
+/* libradiusclient(-ng) wrapper functions */
+#ifdef HAVE_LIBRADIUSCLIENT_NG
+#define my_rc_conf_str(a) rc_conf_str(rch,a)
+#define my_rc_send_server(a,b) rc_send_server(rch,a,b)
+#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(rch,a,b,c,d,e,f)
+#define my_rc_own_ipaddress() rc_own_ipaddress(rch)
+#define my_rc_avpair_add(a,b,c,d) rc_avpair_add(rch,a,b,c,-1,d)
+#define my_rc_read_dictionary(a) rc_read_dictionary(rch, a)
+#else
+#define my_rc_conf_str(a) rc_conf_str(a)
+#define my_rc_send_server(a,b) rc_send_server(a, b)
+#define my_rc_buildreq(a,b,c,d,e,f) rc_buildreq(a,b,c,d,e,f)
+#define my_rc_own_ipaddress() rc_own_ipaddress()
+#define my_rc_avpair_add(a,b,c,d) rc_avpair_add(a, b, c, d)
+#define my_rc_read_dictionary(a) rc_read_dictionary(a)
+#endif
+int my_rc_read_config(char *);
+
 char *server = NULL;
 char *username = NULL;
 char *password = NULL;
@@ -133,33 +156,33 @@ main (int argc, char **argv)
                 usage4 (_("Could not parse arguments"));
 
         str = strdup ("dictionary");
-        if ((config_file && rc_read_config (config_file)) ||
-                        rc_read_dictionary (rc_conf_str (str)))
+        if ((config_file && my_rc_read_config (config_file)) ||
+                        my_rc_read_dictionary (my_rc_conf_str (str)))
                 die (STATE_UNKNOWN, _("Config file error"));
 
         service = PW_AUTHENTICATE_ONLY;
 
         memset (&data, 0, sizeof(data));
-        if (!(rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
-                                rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
-                                rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
-                                (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
+        if (!(my_rc_avpair_add (&data.send_pairs, PW_SERVICE_TYPE, &service, 0) &&
+                                my_rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0) &&
+                                my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0) &&
+                                (nasid==NULL || my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0))))
                 die (STATE_UNKNOWN, _("Out of Memory?"));
 
         /* 
          * Fill in NAS-IP-Address 
          */
 
-        if ((client_id = rc_own_ipaddress ()) == 0)
+        if ((client_id = my_rc_own_ipaddress ()) == 0)
                 return (ERROR_RC);
 
-        if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
+        if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
                         NULL) return (ERROR_RC);
 
-        rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+        my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
                      retries);
 
-        result = rc_send_server (&data, msg);
+        result = my_rc_send_server (&data, msg);
         rc_avpair_free (data.send_pairs);
         if (data.receive_pairs)
                 rc_avpair_free (data.receive_pairs);
@@ -350,3 +373,15 @@ print_usage (void)
         printf ("%s -H host -F config_file -u username -p password [-n nas-id] [-P port]\n\
                   [-t timeout] [-r retries] [-e expect]\n", progname);
 }
+
+
+
+int my_rc_read_config(char * a)
+{
+#ifdef HAVE_LIBRADIUSCLIENT_NG
+        rch = rc_read_config(a);
+        return (rch == NULL) ? 1 : 0;
+#else
+        return rc_read_config(a);
+#endif
+}