--- nagios-plugins-1.4-beta1/plugins/check_radius.c.orig 2004-12-26 09:17:44 +1000 +++ nagios-plugins-1.4-beta1/plugins/check_radius.c 2005-01-08 01:48:49 +1000 @@ -108,6 +108,7 @@ int result = STATE_UNKNOWN; UINT4 client_id; char *str; + REQUEST_INFO *req_info = NULL; setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); @@ -123,10 +124,10 @@ service = PW_AUTHENTICATE_ONLY; - 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 (&data.send_pairs, PW_SERVICE_TYPE, &service, 0, 0) && + rc_avpair_add (&data.send_pairs, PW_USER_NAME, username, 0, 0) && + rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0, 0) && + (nasid==NULL || rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0, 0)))) die (STATE_UNKNOWN, _("Out of Memory?")); /* @@ -136,13 +137,13 @@ if ((client_id = rc_own_ipaddress ()) == 0) return (ERROR_RC); - if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == + if (rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0, 0) == NULL) return (ERROR_RC); rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval, retries); - result = rc_send_server (&data, msg); + result = rc_send_server (&data, msg, req_info); rc_avpair_free (data.send_pairs); if (data.receive_pairs) rc_avpair_free (data.receive_pairs);