From 184ce9f6a38f5ee3355fdb8a6e557c3dc7811482 Mon Sep 17 00:00:00 2001 From: Thomas Guyot-Sionnest Date: Thu, 31 Jan 2008 11:27:22 +0000 Subject: Bump plugins/ to GPLv3 (non-plugind files) git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1918 f882894a-f735-0410-b71e-b25c423dba1c --- plugins/negate.c | 115 ++++++++++------------------------------------------- plugins/netutils.c | 35 ++++++++-------- plugins/popen.c | 87 +++++++++++++++++++--------------------- plugins/runcmd.c | 79 ++++++++++++++++++------------------ plugins/sslutils.c | 34 ++++++++-------- plugins/urlize.c | 47 ++++++++++------------ plugins/utils.c | 38 ++++++++++++------ 7 files changed, 183 insertions(+), 252 deletions(-) (limited to 'plugins') diff --git a/plugins/negate.c b/plugins/negate.c index 7bfef95a..eccc404d 100644 --- a/plugins/negate.c +++ b/plugins/negate.c @@ -1,72 +1,36 @@ -/****************************************************************************** -* +/***************************************************************************** +* * Nagios negate plugin -* +* * License: GPL -* Copyright (c) 2002-2007 nagios-plugins team -* +* Copyright (c) 2002-2007 Nagios Plugins Development Team +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains the negate plugin -* -* Negates the status of a plugin (returns OK for CRITICAL, and vice-versa) -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* Negates the status of a plugin (returns OK for CRITICAL, and vice-versa). +* Can also perform custom state switching. +* +* +* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or +* the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* +* along with this program. If not, see . +* * $Id$ - -@@-
- - -Quick Reference - -5 - -&progname; -&SUMMARY; - - - - - -FAQ - - - -Theory, Installation, and Operation - - -General Description - -&DESCRIPTION; - - - - -Future Enhancements -ToDo List - -Add option to do regex substitution in output text - --@@ - -******************************************************************************/ +* +*****************************************************************************/ const char *progname = "negate"; const char *revision = "$Revision$"; @@ -142,25 +106,6 @@ main (int argc, char **argv) } } -/****************************************************************************** -@@- - -Functions - - -process_arguments - -This function parses the command line into the needed -variables. - -Aside from the standard 'help' and 'version' options, there -is a only a 'timeout' option. - - --@@ -******************************************************************************/ - - /* process command-line arguments */ static const char ** @@ -239,19 +184,6 @@ process_arguments (int argc, char **argv) } -/****************************************************************************** -@@- - -validate_arguments - -No validation is currently done. - - --@@ -******************************************************************************/ - - - int validate_arguments (char **command_line) { @@ -262,13 +194,6 @@ validate_arguments (char **command_line) usage4 (_("Require path to command")); } -/****************************************************************************** -@@- - - -
--@@ -******************************************************************************/ int translate_state (char *state_text) diff --git a/plugins/netutils.c b/plugins/netutils.c index 09a73e45..5e00723e 100644 --- a/plugins/netutils.c +++ b/plugins/netutils.c @@ -1,35 +1,34 @@ -/**************************************************************************** -* +/***************************************************************************** +* * Nagios plugins network utilities -* +* * License: GPL * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org) -* +* Copyright (c) 2003-2008 Nagios Plugins Development Team +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains commons functions used in many of the plugins. -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* +* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or +* the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* +* along with this program. If not, see . +* * $Id$ -* -****************************************************************************/ +* +*****************************************************************************/ #define LOCAL_TIMEOUT_ALARM_HANDLER diff --git a/plugins/popen.c b/plugins/popen.c index 45d2a3dc..df00ebeb 100644 --- a/plugins/popen.c +++ b/plugins/popen.c @@ -1,48 +1,45 @@ -/**************************************************************************** - * - * Nagios plugins popen - * - * License: GPL - * Copyright (c) 2005 nagios-plugins team - * - * Last Modified: $Date$ - * - * Description: - * - * A safe alternative to popen - * - * Provides spopen and spclose - * - * FILE * spopen(const char *); - * int spclose(FILE *); - * - * - * Code taken with liitle modification from "Advanced Programming for the Unix - * Environment" by W. Richard Stevens - * - * This is considered safe in that no shell is spawned, and the environment and - * path passed to the exec'd program are esstially empty. (popen create a shell - * and passes the environment to it). - * - * License Information: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ - * - ******************************************************************************/ +/***************************************************************************** +* +* Nagios plugins popen +* +* License: GPL +* Copyright (c) 2005-2007 Nagios Plugins Development Team +* +* Last Modified: $Date$ +* +* Description: +* +* A safe alternative to popen +* +* Provides spopen and spclose +* +* FILE * spopen(const char *); +* int spclose(FILE *); +* +* Code taken with liitle modification from "Advanced Programming for the Unix +* Environment" by W. Richard Stevens +* +* This is considered safe in that no shell is spawned, and the environment +* and path passed to the exec'd program are essentially empty. (popen create +* a shell and passes the environment to it). +* +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* $Id$ +* +*****************************************************************************/ #include "common.h" diff --git a/plugins/runcmd.c b/plugins/runcmd.c index af12d224..8c52b5c9 100644 --- a/plugins/runcmd.c +++ b/plugins/runcmd.c @@ -1,42 +1,43 @@ -/**************************************************************************** - * Nagios run command utilities - * - * License: GPL - * Copyright (c) 2005 nagios-plugins team - * - * $Id$ - * - * Description : - * - * A simple interface to executing programs from other programs, using an - * optimized and safe popen()-like implementation. It is considered safe - * in that no shell needs to be spawned and the environment passed to the - * execve()'d program is essentially empty. - * - * - * The code in this file is a derivative of popen.c which in turn was taken - * from "Advanced Programming for the Unix Environment" by W. Richard Stevens. - * - * Care has been taken to make sure the functions are async-safe. The one - * function which isn't is np_runcmd_init() which it doesn't make sense to - * call twice anyway, so the api as a whole should be considered async-safe. - * - * License Information: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ +/***************************************************************************** +* +* Nagios run command utilities +* +* License: GPL +* Copyright (c) 2005-2006 Nagios Plugins Development Team +* +* Last Modified: $Date$ +* +* Description : +* +* A simple interface to executing programs from other programs, using an +* optimized and safe popen()-like implementation. It is considered safe +* in that no shell needs to be spawned and the environment passed to the +* execve()'d program is essentially empty. +* +* The code in this file is a derivative of popen.c which in turn was taken +* from "Advanced Programming for the Unix Environment" by W. Richard Stevens. +* +* Care has been taken to make sure the functions are async-safe. The one +* function which isn't is np_runcmd_init() which it doesn't make sense to +* call twice anyway, so the api as a whole should be considered async-safe. +* +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* $Id$ +* +*****************************************************************************/ #define NAGIOSPLUG_API_C 1 diff --git a/plugins/sslutils.c b/plugins/sslutils.c index 8d2e93c7..3d4f9016 100644 --- a/plugins/sslutils.c +++ b/plugins/sslutils.c @@ -1,35 +1,33 @@ -/**************************************************************************** -* +/***************************************************************************** +* * Nagios plugins SSL utilities -* +* * License: GPL -* Copyright (c) 2005 nagios-plugins team -* +* Copyright (c) 2005-2007 Nagios Plugins Development Team +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains common functions for plugins that require SSL. +* * -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or +* the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* +* along with this program. If not, see . +* * $Id$ -* -****************************************************************************/ +* +*****************************************************************************/ #define LOCAL_TIMEOUT_ALARM_HANDLER #include "common.h" diff --git a/plugins/urlize.c b/plugins/urlize.c index 612dd14d..34e25c4e 100644 --- a/plugins/urlize.c +++ b/plugins/urlize.c @@ -1,40 +1,37 @@ -/****************************************************************************** -* +/***************************************************************************** +* * Nagios urlize plugin -* +* * License: GPL -* Copyright (c) 2000-2006 nagios-plugins team -* +* Copyright (c) 2000-2007 Nagios Plugins Development Team +* * Last Modified: $Date$ -* +* * Description: -* +* * This file contains the urlize plugin -* -* This plugin wraps the text output of another command (plugin) -* in HTML tags, thus displaying the plugin output in as a clickable link in -* the Nagios status screen. The return status is the same as the invoked plugin. -* -* License Information: -* -* This program is free software; you can redistribute it and/or modify +* +* This plugin wraps the text output of another command (plugin) in HTML +* tags, thus displaying the plugin output in as a clickable link in the +* Nagios status screen. The return status is the same as the invoked plugin. +* +* +* This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or +* the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -* - - $Id$ - -******************************************************************************/ +* along with this program. If not, see . +* +* $Id$ +* +*****************************************************************************/ const char *progname = "urlize"; const char *revision = "$Revision$"; diff --git a/plugins/utils.c b/plugins/utils.c index 88b44114..c8f3a00d 100644 --- a/plugins/utils.c +++ b/plugins/utils.c @@ -1,16 +1,30 @@ /***************************************************************************** - * - * utils.c - * - * Library of useful functions for plugins - * - * Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) - * Copyright (c) 2006 Nagios Plugin Development Team - * License: GPL - * - * $Revision$ - * $Date$ - ****************************************************************************/ +* +* Library of useful functions for plugins +* +* License: GPL +* Copyright (c) 2000 Karl DeBisschop (karl@debisschop.net) +* Copyright (c) 2002-2007 Nagios Plugin Development Team +* +* Last Modified: $Date$ +* +* +* This program is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program. If not, see . +* +* $Id$ +* +*****************************************************************************/ #define LOCAL_TIMEOUT_ALARM_HANDLER -- cgit v1.2.3