Cleaned up the code a little bit

Made sure we only include needed include files and checked that
the copyright headers are equal and correct

12 files changed, 28 insertions, 25 deletions

diff --git a/plugin/eurephia-auth.c b/plugin/eurephia-auth.c
index 81eb046..2f52b33 100644
--- a/plugin/eurephia-auth.c
+++ b/plugin/eurephia-auth.c
@@ -1,6 +1,8 @@
-/* eurephia-auth.c  --  Main OpenVPN plugin functions.  The API level between OpenVPN and eurephia-auth
+/* eurephia-auth.c  --  Main OpenVPN plugin functions.
+ *                      The API level between OpenVPN and eurephia-auth
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008, 2009
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -19,10 +21,7 @@
  */
 
 #include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <sqlite3.h>
 
 #include "openvpn-plugin.h"
 #define EUREPHIA_FWINTF
diff --git a/plugin/eurephia.c b/plugin/eurephia.c
index e52ca19..65dc39f 100644
--- a/plugin/eurephia.c
+++ b/plugin/eurephia.c
@@ -1,6 +1,7 @@
 /* eurephia.c  --  Main functions for the eurephia authentication module
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008, 2009
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -17,9 +18,9 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
+
 #include <stdio.h>
 #include <stdarg.h>
-#include <stdlib.h>
 #include <string.h>
 #include <getopt.h>
 
diff --git a/plugin/eurephia.h b/plugin/eurephia.h
index 5e2dfb9..700804e 100644
--- a/plugin/eurephia.h
+++ b/plugin/eurephia.h
@@ -1,6 +1,7 @@
 /* eurephia.h  --  Main API for the eurephia authentication module
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/eurephiadb_session.c b/plugin/eurephiadb_session.c
index 3b59f77..0a0cb25 100644
--- a/plugin/eurephiadb_session.c
+++ b/plugin/eurephiadb_session.c
@@ -1,6 +1,7 @@
 /* eurephiadb_session.c  --  Functions for handling sessions from eurephia-auth
  *
- *  GPLv2 - Copyright (C) 2008, 2009  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008, 2009
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/eurephiadb_session.h b/plugin/eurephiadb_session.h
index 61deb15..20429c9 100644
--- a/plugin/eurephiadb_session.h
+++ b/plugin/eurephiadb_session.h
@@ -1,6 +1,7 @@
 /* eurephia_session.h  --  Internal API to provide storing of variables connected to a session
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/firewall/eurephiafw.c b/plugin/firewall/eurephiafw.c
index a253631..a8b599c 100644
--- a/plugin/firewall/eurephiafw.c
+++ b/plugin/firewall/eurephiafw.c
@@ -1,6 +1,7 @@
 /* eurephiafw.c  --  Firewall interface loader for the eurephia module
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008, 2009
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -19,14 +20,11 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <dlfcn.h>
 #include <errno.h>
-#include <signal.h>
 #include <unistd.h>
 #include <sys/mman.h>
-#include <sys/types.h>
 #include <sys/wait.h>
 #include <time.h>
 
diff --git a/plugin/firewall/eurephiafw.h b/plugin/firewall/eurephiafw.h
index 9beee4d..074f95e 100644
--- a/plugin/firewall/eurephiafw.h
+++ b/plugin/firewall/eurephiafw.h
@@ -1,6 +1,7 @@
 /* eurephiafw.h  --  Firewall interface loader for the eurephia module
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/firewall/eurephiafw_helpers.c b/plugin/firewall/eurephiafw_helpers.c
index 00bf516..f10df13 100644
--- a/plugin/firewall/eurephiafw_helpers.c
+++ b/plugin/firewall/eurephiafw_helpers.c
@@ -1,7 +1,8 @@
 /* eurephiafw_helpers.c  --  Helper functions, shared between main module and
  *                           firewall module.  Setting up Posix MQ and semaphores
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008, 2009
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -20,10 +21,8 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <signal.h>
 #include <unistd.h>
 #include <semaphore.h>
 #include <mqueue.h>
diff --git a/plugin/firewall/eurephiafw_helpers.h b/plugin/firewall/eurephiafw_helpers.h
index 9c21a2f..de979ac 100644
--- a/plugin/firewall/eurephiafw_helpers.h
+++ b/plugin/firewall/eurephiafw_helpers.h
@@ -1,7 +1,8 @@
 /* eurephiafw_helpers.h  --  Helper functions, shared between main module and
  *                           firewall module.  Setting up Posix MQ and semaphores
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/firewall/eurephiafw_intf.h b/plugin/firewall/eurephiafw_intf.h
index 0f18cc2..9bc878b 100644
--- a/plugin/firewall/eurephiafw_intf.h
+++ b/plugin/firewall/eurephiafw_intf.h
@@ -1,6 +1,7 @@
-/* eurephiafw_intf.h  --  
+/* eurephiafw_intf.h  --  Driver interface for the firewall module
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/firewall/eurephiafw_struct.h b/plugin/firewall/eurephiafw_struct.h
index b714975..3989564 100644
--- a/plugin/firewall/eurephiafw_struct.h
+++ b/plugin/firewall/eurephiafw_struct.h
@@ -1,6 +1,7 @@
 /* eurephiafw.h  --  Firewall interface struct typedef
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
diff --git a/plugin/firewall/iptables/efw-iptables.c b/plugin/firewall/iptables/efw-iptables.c
index 6c02fbd..83569d5 100644
--- a/plugin/firewall/iptables/efw-iptables.c
+++ b/plugin/firewall/iptables/efw-iptables.c
@@ -1,6 +1,7 @@
 /* efw_iptables.c  --  iptables implementation - updates Linux iptables
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 2008, 2009
+ *               David Sommerseth <dazo@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public License
@@ -24,9 +25,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <pthread.h>
-#include <sys/types.h>
 #include <sys/wait.h>
-#include <time.h>
 
 #define EUREPHIA_FWINTF
 #include <eurephiafw_struct.h>