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

22 files changed, 46 insertions, 40 deletions

diff --git a/eurephiadm/argparser.c b/eurephiadm/argparser.c
index cbfdc67..0e4f4c8 100644
--- a/eurephiadm/argparser.c
+++ b/eurephiadm/argparser.c
@@ -1,6 +1,7 @@
 /* argparser.c  --  Simple argument parser - inspired by getopt, but simpler
  *
- *  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/eurephiadm/argparser.h b/eurephiadm/argparser.h
index 2b6b26d..edc1e51 100644
--- a/eurephiadm/argparser.h
+++ b/eurephiadm/argparser.h
@@ -1,6 +1,7 @@
 /* argparser.c  --  Simple argument parser - inspired by getopt, but simpler
  *
- *  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/eurephiadm/client_config.c b/eurephiadm/client_config.c
index 85805d7..6a55053 100644
--- a/eurephiadm/client_config.c
+++ b/eurephiadm/client_config.c
@@ -1,6 +1,7 @@
 /*  client_config.c  --  Handles reading and parsing of config files
  *
- *  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/eurephiadm/client_config.h b/eurephiadm/client_config.h
index 76a0572..c1c2f82 100644
--- a/eurephiadm/client_config.h
+++ b/eurephiadm/client_config.h
@@ -1,6 +1,7 @@
 /*  client_config.h  --  Handles reading and parsing of config files
  *
- *  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/eurephiadm/client_context.c b/eurephiadm/client_context.c
index 2907ce5..eb07900 100644
--- a/eurephiadm/client_context.c
+++ b/eurephiadm/client_context.c
@@ -1,6 +1,7 @@
-/* context.c  --  Handles eurephia contexts used by admin interfaces
+/* client_context.c  --  Handles eurephia contexts used by admin interfaces
  *
- *  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,7 +20,6 @@
 */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/eurephiadm/client_context.h b/eurephiadm/client_context.h
index 8d6475c..1a8e34b 100644
--- a/eurephiadm/client_context.h
+++ b/eurephiadm/client_context.h
@@ -1,6 +1,7 @@
-/* context.h  --  Handles eurephia contexts used by admin interfaces
+/* client_context.h  --  Handles eurephia contexts used by admin interfaces
  *
- *  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/eurephiadm/client_session.c b/eurephiadm/client_session.c
index e4d7dd3..9b4ff34 100644
--- a/eurephiadm/client_session.c
+++ b/eurephiadm/client_session.c
@@ -1,6 +1,7 @@
 /* client_session.c  --  Handles eurephia session in admin clients
  *
- *  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
diff --git a/eurephiadm/client_session.h b/eurephiadm/client_session.h
index 335b074..ffb3acd 100644
--- a/eurephiadm/client_session.h
+++ b/eurephiadm/client_session.h
@@ -1,6 +1,7 @@
 /* client_session.h  --  Handles eurephia session in admin clients
  *
- *  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/eurephiadm/commands.h b/eurephiadm/commands.h
index a96d93b..5c48951 100644
--- a/eurephiadm/commands.h
+++ b/eurephiadm/commands.h
@@ -2,7 +2,8 @@
  *                 The function is found in the ./commands dir
  *                 where each command have their own file
  *
- *  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
diff --git a/eurephiadm/commands/adminaccess.c b/eurephiadm/commands/adminaccess.c
index d710d50..a57892a 100644
--- a/eurephiadm/commands/adminaccess.c
+++ b/eurephiadm/commands/adminaccess.c
@@ -1,7 +1,8 @@
 /* useraccess.c  --  eurephiadm useraccess command:
  *                   Management of user access levels (eurpehia_adminaccess table)
  *
- *  GPLv2  - Copyright (C) 2009  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 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,12 +21,10 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #ifdef HAVE_LIBXML2
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #endif
diff --git a/eurephiadm/commands/certificates.c b/eurephiadm/commands/certificates.c
index 1b20db8..b82c55e 100644
--- a/eurephiadm/commands/certificates.c
+++ b/eurephiadm/commands/certificates.c
@@ -1,7 +1,8 @@
 /* certificates.c  --  eurephiadm command: certs 
  *                     Certificate management
  *
- *  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,7 +21,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 #include <sys/types.h>
@@ -30,7 +30,6 @@
 #include <assert.h>
 
 #ifdef HAVE_LIBXML2
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #endif
diff --git a/eurephiadm/commands/edit_config.c b/eurephiadm/commands/edit_config.c
index eae957b..ad8b892 100644
--- a/eurephiadm/commands/edit_config.c
+++ b/eurephiadm/commands/edit_config.c
@@ -1,7 +1,8 @@
 /* edit_config.c  --  eurephiadm command:
  *                    Sets, deletes or prints a config setting in the database
  *
- *  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
@@ -20,7 +21,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/eurephiadm/commands/lastlog.c b/eurephiadm/commands/lastlog.c
index 77235ec..fb0b8c6 100644
--- a/eurephiadm/commands/lastlog.c
+++ b/eurephiadm/commands/lastlog.c
@@ -1,7 +1,8 @@
 /* usercerts.c  --  eurephiadm lastlog command:
  *                  Queries the lastlog table
  *
- *  GPLv2 - Copyright (C) 2008  David Sommerseth <dazo@users.sourceforge.net>
+ *  GPLv2      - Copyright (C) 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,12 +21,10 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #ifdef HAVE_LIBXML2
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #endif
diff --git a/eurephiadm/commands/usercerts.c b/eurephiadm/commands/usercerts.c
index 318f4b6..013eefe 100644
--- a/eurephiadm/commands/usercerts.c
+++ b/eurephiadm/commands/usercerts.c
@@ -1,7 +1,8 @@
 /* usercerts.c  --  eurephiadm usercerts command:
  *                  Management of user account <-> certificate links
  *
- *  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,12 +21,10 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
 #ifdef HAVE_LIBXML2
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
 #endif
diff --git a/eurephiadm/commands/users.c b/eurephiadm/commands/users.c
index 55097a5..e6cbd94 100644
--- a/eurephiadm/commands/users.c
+++ b/eurephiadm/commands/users.c
@@ -1,6 +1,7 @@
 /* users.c  --  eurephiadm command - User Account Management
  *
- *  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,19 +20,14 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
-#include <unistd.h>
 #include <errno.h>
 #include <assert.h>
 
 #ifdef HAVE_LIBXML2
-#include <libxml/parser.h>
 #include <libxml/tree.h>
 #include <libxml/xpath.h>
-#include <libxml/xmlstring.h>
 #endif
 
 #define MODULE "eurephia::Users"
diff --git a/eurephiadm/eurephiadm.c b/eurephiadm/eurephiadm.c
index d9c4bbd..b04fb54 100644
--- a/eurephiadm/eurephiadm.c
+++ b/eurephiadm/eurephiadm.c
@@ -1,6 +1,7 @@
 /* eurephiadm.c  --  CLI based admin program for eurephia
  *
- *  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
diff --git a/eurephiadm/field_print.c b/eurephiadm/field_print.c
index c63528a..454b6f6 100644
--- a/eurephiadm/field_print.c
+++ b/eurephiadm/field_print.c
@@ -1,6 +1,7 @@
 /* field_print.c  --  simple functions for printing label/value pairs
  *
- *  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/eurephiadm/field_print.h b/eurephiadm/field_print.h
index a1442c6..7d92293 100644
--- a/eurephiadm/field_print.h
+++ b/eurephiadm/field_print.h
@@ -1,6 +1,7 @@
 /* field_print.h  --  simple functions for printing label/value pairs
  *
- *  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/eurephiadm/get_console_input.c b/eurephiadm/get_console_input.c
index 992617e..dc5faec 100644
--- a/eurephiadm/get_console_input.c
+++ b/eurephiadm/get_console_input.c
@@ -1,6 +1,7 @@
 /* getpassword.c  --  Get password via console
  *
- *  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/eurephiadm/get_console_input.h b/eurephiadm/get_console_input.h
index 684a717..9ef649f 100644
--- a/eurephiadm/get_console_input.h
+++ b/eurephiadm/get_console_input.h
@@ -1,6 +1,7 @@
 /* get_console_input.h  --  Get input from console
  *
- *  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/eurephiadm/parse_certificate_files.c b/eurephiadm/parse_certificate_files.c
index b2e5ca2..9e8043b 100644
--- a/eurephiadm/parse_certificate_files.c
+++ b/eurephiadm/parse_certificate_files.c
@@ -1,6 +1,7 @@
 /* parse_certificate_files.c  --  Parses PEM or PKCS12 formated cert. files
  *
- *  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,7 +21,6 @@
 
 #ifdef HAVE_OPENSSL
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 
diff --git a/eurephiadm/parse_certificate_files.h b/eurephiadm/parse_certificate_files.h
index 03d66e4..81a7a8b 100644
--- a/eurephiadm/parse_certificate_files.h
+++ b/eurephiadm/parse_certificate_files.h
@@ -1,6 +1,7 @@
 /* parse_certificate_files.h  --  
  *
- *  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