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
- *
- * License: GPL
- * Copyright (c) 1999 Ethan Galstad (nagios@nagios.org)
- *
- * Last Modified: 11-05-1999
- *
- * Description:
- *
- * 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
- * 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 common 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 defines used in many of
+* the plugins.
+* 
+* 
+* 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 _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
-* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
 * $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$
- * 
- * Author: Andreas Ericsson <ae@op5.se>
- *
- * Copyright: GNU GPL v2 or any later version.
- * 
- */
+/****************************************************************************
+* 
+* License: GPL
+* Copyright (c) 2005 Nagios Plugins Development Team
+* Author: Andreas Ericsson <ae@op5.se>
+* 
+* 
+* 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