4 files changed, 76 insertions, 63 deletions
diff --git a/plugins/common.h b/plugins/common.h
index 752e21ff..554eb108 100644
--- a/plugins/common.h
+++ b/plugins/common.h
@@ -1,36 +1,35 @@
-/******************************************************************************
+/*****************************************************************************
- *
+* 
- * Nagios plugins common include file
+* Nagios plugins common include file
- *
+* 
- * License: GPL
+* License: GPL
- * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
+* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
- *
+* Copyright (c) 2003-2007 Nagios Plugins Development Team
- * Last Modified: 11-05-1999
+* 
- *
+* Last Modified: $Date$
- * Description:
+* 
- *
+* Description:
- * This file contains common include files and defines used in many of
+* 
- * the plugins.
+* This file contains common include files and defines 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
+* 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.
+* (at your option) any later version.
- *
+* 
- * This program is distributed in the hope that it will be useful,
+* This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+* GNU General Public License for more details.
- *
+* 
- * You should have received a copy of the GNU General Public License
+* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* 
- *
+* $Id$
- * $Id$
+* 
- *
+*****************************************************************************/
- *****************************************************************************/
 #ifndef _COMMON_H_
 #define _COMMON_H_
diff --git a/plugins/netutils.h b/plugins/netutils.h
index b90c5e67..4c0a563c 100644
--- a/plugins/netutils.h
+++ b/plugins/netutils.h
@@ -1,36 +1,35 @@
-/******************************************************************************
+/*****************************************************************************
-*
+* 
 * Nagios plugins net utilities include file
-*
+* 
 * License: GPL
 * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
-*
+* Copyright (c) 2003-2007 Nagios Plugins Development Team
+* 
 * Last Modified: $Date$
-*
+* 
 * Description:
-*
+* 
 * This file contains common include files and function definitions
 * 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
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+* 
-*
 * $Id$
-*
+* 
-******************************************************************************/
+*****************************************************************************/
 #ifndef _NETUTILS_H_
 #define _NETUTILS_H_
diff --git a/plugins/popen.h b/plugins/popen.h
index c2a79df0..8b09edd9 100644
--- a/plugins/popen.h
+++ b/plugins/popen.h
@@ -1,8 +1,8 @@
 /******************************************************************************
- *
+*
- * $Id$
+* $Id$
- *
+*
- ******************************************************************************/
+*****************************************************************************/
 FILE *spopen (const char *);
 int spclose (FILE *);
diff --git a/plugins/runcmd.h b/plugins/runcmd.h
index 35ebc255..a048def3 100644
--- a/plugins/runcmd.h
+++ b/plugins/runcmd.h
@@ -1,11 +1,26 @@
-/*
+/****************************************************************************
- * $Id$
+* 
- * 
+* License: GPL
- * Author: Andreas Ericsson <ae@op5.se>
+* Copyright (c) 2005 Nagios Plugins Development Team
- *
+* Author: Andreas Ericsson <ae@op5.se>
- * Copyright: GNU GPL v2 or any later version.
+* 
- * 
+* 
- */
+* 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 <http://www.gnu.org/licenses/>.
+* 
+* $Id$
+* 
+*****************************************************************************/
 #ifndef NAGIOSPLUG_RUNCMD_H
 #define NAGIOSPLUG_RUNCMD_H

diff --git a/plugins/common.h b/plugins/common.h index 752e21ff..554eb108 100644 --- a/plugins/common.h +++ b/plugins/common.h
@@ -1,36 +1,35 @@
1	/******************************************************************************	1	/*****************************************************************************
2	*	2	*
3	* Nagios plugins common include file	3	* Nagios plugins common include file
4	*	4	*
5	* License: GPL	5	* License: GPL
6	* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)	6	* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7	*	7	* Copyright (c) 2003-2007 Nagios Plugins Development Team
8	* Last Modified: 11-05-1999	8	*
9	*	9	* Last Modified: $Date$
10	* Description:	10	*
11	*	11	* Description:
12	* This file contains common include files and defines used in many of	12	*
13	* the plugins.	13	* This file contains common include files and defines used in many of
14	*	14	* the plugins.
15	* License Information:	15	*
16	*	16	*
17	* This program is free software; you can redistribute it and/or modify	17	* This program is free software: you can redistribute it and/or modify
18	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
19	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation, either version 3 of the License, or
20	* (at your option) any later version.	20	* (at your option) any later version.
21	*	21	*
22	* This program is distributed in the hope that it will be useful,	22	* This program is distributed in the hope that it will be useful,
23	* but WITHOUT ANY WARRANTY; without even the implied warranty of	23	* but WITHOUT ANY WARRANTY; without even the implied warranty of
24	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	24	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25	* GNU General Public License for more details.	25	* GNU General Public License for more details.
26	*	26	*
27	* You should have received a copy of the GNU General Public License	27	* You should have received a copy of the GNU General Public License
28	* along with this program; if not, write to the Free Software	28	* along with this program. If not, see <http://www.gnu.org/licenses/>.
29	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	29	*
30	*	30	* $Id$
31	* $Id$	31	*
32	*	32	*****************************************************************************/
33	*****************************************************************************/
34		33
35	#ifndef _COMMON_H_	34	#ifndef _COMMON_H_
36	#define _COMMON_H_	35	#define _COMMON_H_


diff --git a/plugins/netutils.h b/plugins/netutils.h index b90c5e67..4c0a563c 100644 --- a/plugins/netutils.h +++ b/plugins/netutils.h
@@ -1,36 +1,35 @@
1	/******************************************************************************	1	/*****************************************************************************
2	*	2	*
3	* Nagios plugins net utilities include file	3	* Nagios plugins net utilities include file
4	*	4	*
5	* License: GPL	5	* License: GPL
6	* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)	6	* Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
7	*	7	* Copyright (c) 2003-2007 Nagios Plugins Development Team
		8	*
8	* Last Modified: $Date$	9	* Last Modified: $Date$
9	*	10	*
10	* Description:	11	* Description:
11	*	12	*
12	* This file contains common include files and function definitions	13	* This file contains common include files and function definitions
13	* used in many of the plugins.	14	* used in many of the plugins.
14	*	15	*
15	* License Information:	16	*
16	*	17	* This program is free software: you can redistribute it and/or modify
17	* This program is free software; you can redistribute it and/or modify
18	* it under the terms of the GNU General Public License as published by	18	* it under the terms of the GNU General Public License as published by
19	* the Free Software Foundation; either version 2 of the License, or	19	* the Free Software Foundation, either version 3 of the License, or
20	* (at your option) any later version.	20	* (at your option) any later version.
21	*	21	*
22	* This program is distributed in the hope that it will be useful,	22	* This program is distributed in the hope that it will be useful,
23	* but WITHOUT ANY WARRANTY; without even the implied warranty of	23	* but WITHOUT ANY WARRANTY; without even the implied warranty of
24	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	24	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25	* GNU General Public License for more details.	25	* GNU General Public License for more details.
26	*	26	*
27	* You should have received a copy of the GNU General Public License	27	* You should have received a copy of the GNU General Public License
28	* along with this program; if not, write to the Free Software	28	* along with this program. If not, see <http://www.gnu.org/licenses/>.
29	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	29	*
30	*
31	* $Id$	30	* $Id$
32	*	31	*
33	******************************************************************************/	32	*****************************************************************************/
34		33
35	#ifndef _NETUTILS_H_	34	#ifndef _NETUTILS_H_
36	#define _NETUTILS_H_	35	#define _NETUTILS_H_


diff --git a/plugins/popen.h b/plugins/popen.h index c2a79df0..8b09edd9 100644 --- a/plugins/popen.h +++ b/plugins/popen.h
@@ -1,8 +1,8 @@
1	/******************************************************************************	1	/******************************************************************************
2	*	2	*
3	* $Id$	3	* $Id$
4	*	4	*
5	******************************************************************************/	5	*****************************************************************************/
6		6
7	FILE spopen (const char );	7	FILE spopen (const char );
8	int spclose (FILE *);	8	int spclose (FILE *);


diff --git a/plugins/runcmd.h b/plugins/runcmd.h index 35ebc255..a048def3 100644 --- a/plugins/runcmd.h +++ b/plugins/runcmd.h
@@ -1,11 +1,26 @@
1	/*	1	/****************************************************************************
2	* $Id$	2	*
3	*	3	* License: GPL
4	* Author: Andreas Ericsson <ae@op5.se>	4	* Copyright (c) 2005 Nagios Plugins Development Team
5	*	5	* Author: Andreas Ericsson <ae@op5.se>
6	* Copyright: GNU GPL v2 or any later version.	6	*
7	*	7	*
8	*/	8	* This program is free software: you can redistribute it and/or modify
		9	* it under the terms of the GNU General Public License as published by
		10	* the Free Software Foundation, either version 3 of the License, or
		11	* (at your option) any later version.
		12	*
		13	* This program is distributed in the hope that it will be useful,
		14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
		15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		16	* GNU General Public License for more details.
		17	*
		18	* You should have received a copy of the GNU General Public License
		19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
		20	*
		21	* $Id$
		22	*
		23	*****************************************************************************/
9		24
10	#ifndef NAGIOSPLUG_RUNCMD_H	25	#ifndef NAGIOSPLUG_RUNCMD_H
11	#define NAGIOSPLUG_RUNCMD_H	26	#define NAGIOSPLUG_RUNCMD_H