summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--plugins/check_radius.c34
2 files changed, 12 insertions, 24 deletions
diff --git a/NEWS b/NEWS
index 5d950ba..3156907 100644
--- a/NEWS
+++ b/NEWS
@@ -29,6 +29,8 @@ This file documents the major additions and syntax changes between releases.
29 - enforce a full path for the command to run 29 - enforce a full path for the command to run
30 The "negate" utility can now remap custom states 30 The "negate" utility can now remap custom states
31 Check_radius now supports radiusclient-ng 31 Check_radius now supports radiusclient-ng
32 The (undocumented) positional parameter parsing which check_radius used
33 instead of getopt(3) if 8 arguments were given is no longer available
32 Check_by_ssh now supports multiline output 34 Check_by_ssh now supports multiline output
33 IPv6 support can now be disabled using ./configure --without-ipv6 35 IPv6 support can now be disabled using ./configure --without-ipv6
34 Fix check_ntp now honor ntp flags 36 Fix check_ntp now honor ntp flags
diff --git a/plugins/check_radius.c b/plugins/check_radius.c
index 32af91f..dcb85ac 100644
--- a/plugins/check_radius.c
+++ b/plugins/check_radius.c
@@ -225,30 +225,6 @@ process_arguments (int argc, char **argv)
225 {0, 0, 0, 0} 225 {0, 0, 0, 0}
226 }; 226 };
227 227
228 if (argc < 2)
229 return ERROR;
230
231 if (argc == 9) {
232 config_file = argv[1];
233 username = argv[2];
234 password = argv[3];
235 if (is_intpos (argv[4]))
236 timeout_interval = atoi (argv[4]);
237 else
238 usage2 (_("Timeout interval must be a positive integer"), optarg);
239 if (is_intpos (argv[5]))
240 retries = atoi (argv[5]);
241 else
242 usage4 (_("Number of retries must be a positive integer"));
243 server = argv[6];
244 if (is_intpos (argv[7]))
245 port = atoi (argv[7]);
246 else
247 usage4 (_("Port must be a positive integer"));
248 expect = argv[8];
249 return OK;
250 }
251
252 while (1) { 228 while (1) {
253 c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts, 229 c = getopt_long (argc, argv, "+hVvH:P:F:u:p:n:t:r:e:", longopts,
254 &option); 230 &option);
@@ -309,6 +285,16 @@ process_arguments (int argc, char **argv)
309 break; 285 break;
310 } 286 }
311 } 287 }
288
289 if (server == NULL)
290 usage4 (_("Host not specified"));
291 if (username == NULL)
292 usage4 (_("User not specified"));
293 if (password == NULL)
294 usage4 (_("Password not specified"));
295 if (config_file == NULL)
296 usage4 (_("Configuration file not specified"));
297
312 return OK; 298 return OK;
313} 299}
314 300