From 0b6423f9c99d9edf8c96fefd0f6c453859395aa1 Mon Sep 17 00:00:00 2001
From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Mon, 30 Sep 2013 00:03:24 +0200
Subject: Import Nagios Plugins site

Import the Nagios Plugins web site, Cronjobs, infrastructure scripts,
and configuration files.
---
 web/attachments/280540-check_radius.c.diff | 95 ++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)
 create mode 100644 web/attachments/280540-check_radius.c.diff

(limited to 'web/attachments/280540-check_radius.c.diff')

diff --git a/web/attachments/280540-check_radius.c.diff b/web/attachments/280540-check_radius.c.diff
new file mode 100644
index 0000000..94052ab
--- /dev/null
+++ b/web/attachments/280540-check_radius.c.diff
@@ -0,0 +1,95 @@
+--- nagios-plugins-1.4.12.orig/plugins/check_radius.c	2008-06-06 13:54:31.000000000 +0200
++++ nagios-plugins-1.4.12/plugins/check_radius.c	2008-06-06 14:08:00.000000000 +0200
+@@ -73,6 +73,7 @@
+ char *username = NULL;
+ char *password = NULL;
+ char *nasid = NULL;
++char *nasipaddress = NULL;
+ char *expect = NULL;
+ char *config_file = NULL;
+ unsigned short port = PW_AUTH_UDP_PORT;
+@@ -173,19 +174,26 @@
+ 	memset (&data, 0, sizeof(data));
+ 	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))))
++				my_rc_avpair_add (&data.send_pairs, PW_USER_PASSWORD, password, 0)
++				))
+ 		die (STATE_UNKNOWN, _("Out of Memory?"));
+ 
+-	/* 
+-	 * Fill in NAS-IP-Address 
+-	 */
+-
+-	if ((client_id = my_rc_own_ipaddress ()) == 0)
+-		return (ERROR_RC);
++	if (nasid != NULL) {
++		if (!(my_rc_avpair_add (&data.send_pairs, PW_NAS_IDENTIFIER, nasid, 0)))
++			die (STATE_UNKNOWN, _("Invalid NAS-Identifier"));
++	}
+ 
+-	if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) ==
+-			NULL) return (ERROR_RC);
++	if (nasipaddress != NULL) {
++		if (rc_good_ipaddr (nasipaddress))
++			die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
++		if ((client_id = rc_get_ipaddr(nasipaddress)) == 0)
++			die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
++	} else {
++		if ((client_id = my_rc_own_ipaddress ()) == 0)
++			die (STATE_UNKNOWN, _("Can't find local IP for NAS-IP-Address"));
++	}
++	if (my_rc_avpair_add (&(data.send_pairs), PW_NAS_IP_ADDRESS, &client_id, 0) == NULL)
++		die (STATE_UNKNOWN, _("Invalid NAS-IP-Address"));
+ 
+ 	my_rc_buildreq (&data, PW_ACCESS_REQUEST, server, port, (int)timeout_interval,
+ 	             retries);
+@@ -223,6 +231,7 @@
+ 		{"username", required_argument, 0, 'u'},
+ 		{"password", required_argument, 0, 'p'},
+ 		{"nas-id", required_argument, 0, 'n'},
++		{"nas-ip-address", required_argument, 0, 'N'},
+ 		{"filename", required_argument, 0, 'F'},
+ 		{"expect", required_argument, 0, 'e'},
+ 		{"retries", required_argument, 0, 'r'},
+@@ -234,7 +243,7 @@
+ 	};
+ 
+ 	while (1) {
+-		c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts,
++		c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:N:t:r:e:", longopts,
+ 									 &option);
+ 
+ 		if (c == -1 || c == EOF || c == 1)
+@@ -279,6 +288,9 @@
+ 		case 'n':									/* nas id */
+ 			nasid = optarg;
+ 			break;
++		case 'N':									/* nas ip address */
++			nasipaddress = optarg;
++			break;
+ 		case 'F':									/* configuration file */
+ 			config_file = optarg;
+ 			break;
+@@ -342,6 +354,8 @@
+   printf ("    %s\n", _("Password for autentication (SECURITY RISK)"));
+   printf (" %s\n", "-n, --nas-id=STRING");
+   printf ("    %s\n", _("NAS identifier"));
++  printf (" %s\n", "-N, --nas-ip-address=STRING");
++  printf ("    %s\n", _("NAS IP Address"));
+   printf (" %s\n", "-F, --filename=STRING");
+   printf ("    %s\n", _("Configuration file"));
+   printf (" %s\n", "-e, --expect=STRING");
+@@ -377,8 +391,9 @@
+ print_usage (void)
+ {
+   printf (_("Usage:"));
+-	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);
++	printf ("%s -H host -F config_file -u username -p password\n\
++			[-P port] [-t timeout] [-r retries] [-e expect]\n\
++			[-n nas-id] [-N nas-ip-addr]\n", progname);
+ }
+ 
+ 
-- 
cgit v1.2.3-74-g34f1