diff options
author | Martin Matuska <mm@FreeBSD.org> | 2007-10-14 08:40:47 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2007-10-14 08:40:47 +0000 |
commit | 64bde32282f6b9a44c92811eed8839b6d8910b22 (patch) | |
tree | ddbf460b1fa2d9e0a75a609af2bf03522ed5fc11 /net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c | |
parent | Switch to a newer (non-deprecated) version of Emacs. (diff) |
- Update to 1.4.10
- Remove patch for check_radius (obsolete)
PR: ports/117112
Submitted by: mm
Approved by: Jarrod Sayers <jarrod at netleader.com.au> (maintainer)
Reviewed by: maintainer
Diffstat (limited to 'net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c')
-rw-r--r-- | net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c b/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c deleted file mode 100644 index 9220d25fdb5f..000000000000 --- a/net-mgmt/nagios-plugins/files/patch-plugins__check_radius.c +++ /dev/null @@ -1,66 +0,0 @@ ---- plugins/check_radius.c.orig Mon Jan 29 08:16:40 2007 -+++ plugins/check_radius.c Tue Feb 27 21:36:09 2007 -@@ -43,7 +43,7 @@ - #include "utils.h" - #include "netutils.h" - --#include <radiusclient.h> -+#include <radiusclient-ng.h> - - int process_arguments (int, char **); - void print_help (void); -@@ -124,6 +124,7 @@ - int result = STATE_UNKNOWN; - UINT4 client_id; - char *str; -+ rc_handle *rh; - - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); -@@ -133,33 +134,36 @@ - 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) -+ rh = rc_read_config (config_file); -+ else -+ rh = NULL; -+ if (!rh || rc_read_dictionary (rh, rc_conf_str (rh, 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 (!(rc_avpair_add (rh, &data.send_pairs, PW_SERVICE_TYPE, &service, -1, 0) && -+ rc_avpair_add (rh, &data.send_pairs, PW_USER_NAME, username, -1, 0) && -+ rc_avpair_add (rh, &data.send_pairs, PW_USER_PASSWORD, password, -1, 0) && -+ (nasid==NULL || rc_avpair_add (rh, &data.send_pairs, PW_NAS_IDENTIFIER, nasid, -1, 0)))) - die (STATE_UNKNOWN, _("Out of Memory?")); - - /* - * Fill in NAS-IP-Address - */ - -- if ((client_id = rc_own_ipaddress ()) == 0) -+ if ((client_id = rc_own_ipaddress (rh)) == 0) - return (ERROR_RC); - -- if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == -+ if (rc_avpair_add (rh, &(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, -1, 0) == - NULL) return (ERROR_RC); - -- rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, -+ rc_buildreq (rh, &data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, - retries); - -- result = rc_send_server (&data, msg); -+ result = rc_send_server (rh, &data, msg); - rc_avpair_free (data.send_pairs); - if (data.receive_pairs) - rc_avpair_free (data.receive_pairs); |