From 32159b86894d4599f705b2e102b29f82de1f4dac Mon Sep 17 00:00:00 2001
From: Bandie <bandie@chaospott.de>
Date: Fri, 28 Sep 2018 21:00:16 +0200
Subject: [PATCH] Cleaning up headers/using them properly

---
 src/pam_panic/pam_panic.c            |  2 ++
 src/pam_panic/pam_panic.h            | 16 ++--------------
 src/pam_panic/pam_panic_authdevice.c |  4 +---
 src/pam_panic/pam_panic_authdevice.h |  2 ++
 src/pam_panic/pam_panic_password.c   |  6 ++----
 src/pam_panic/pam_panic_password.h   |  5 ++++-
 src/pam_panic/pam_panic_reject.c     |  4 +---
 src/pam_panic/pam_panic_reject.h     |  3 +++
 src/pam_panic_pw/pam_panic_pw.c      |  2 +-
 9 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/src/pam_panic/pam_panic.c b/src/pam_panic/pam_panic.c
index 4b61085..6face42 100644
--- a/src/pam_panic/pam_panic.c
+++ b/src/pam_panic/pam_panic.c
@@ -6,6 +6,8 @@ DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
+#include "pam_panic.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/src/pam_panic/pam_panic.h b/src/pam_panic/pam_panic.h
index d0761a2..b5dc29f 100644
--- a/src/pam_panic/pam_panic.h
+++ b/src/pam_panic/pam_panic.h
@@ -1,27 +1,15 @@
 /*
-FILENAME :     pam_panic.c
-DESCRIPTION :  Header is made for testing purposes.
+FILENAME :     pam_panic.h
+DESCRIPTION :  Header.
 AUTHOR :       Bandie
 DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/wait.h>
-#include <regex.h>
-#include <string.h>
 #include <security/pam_modules.h>
 #include <security/pam_ext.h>
 #include <syslog.h>
-#include "../../lib/gettext.h"
-
-#include "pam_panic_reject.h"
-#include "pam_panic_authdevice.h"
-#include "pam_panic_password.h"
 
 
 void argSplit(char **some_arg, char **some_temp, const char *arg);
diff --git a/src/pam_panic/pam_panic_authdevice.c b/src/pam_panic/pam_panic_authdevice.c
index 9b3e9f3..3a09c45 100644
--- a/src/pam_panic/pam_panic_authdevice.c
+++ b/src/pam_panic/pam_panic_authdevice.c
@@ -6,12 +6,10 @@ DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
+#include "pam_panic_authdevice.h"
 
-#include <stdint.h>
 #include <unistd.h>
 
-#include "../config.h"
-
 #include "../../lib/gettext.h"
 #include <security/pam_modules.h>
 #include <security/pam_ext.h>
diff --git a/src/pam_panic/pam_panic_authdevice.h b/src/pam_panic/pam_panic_authdevice.h
index 73139f5..3302a34 100644
--- a/src/pam_panic/pam_panic_authdevice.h
+++ b/src/pam_panic/pam_panic_authdevice.h
@@ -6,5 +6,7 @@ LICENSE :      GNU-GPLv3
 */
 
 #include "../config.h"
+#include <stdint.h>
+#include <security/pam_modules.h>
 
 int authDevice(pam_handle_t *pamh, char *allowed, char *rejected, char *serious_dev, int8_t bSerious, int8_t bReboot, int8_t bPoweroff);
diff --git a/src/pam_panic/pam_panic_password.c b/src/pam_panic/pam_panic_password.c
index b3b9544..ee36dc6 100644
--- a/src/pam_panic/pam_panic_password.c
+++ b/src/pam_panic/pam_panic_password.c
@@ -6,20 +6,18 @@ DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
+#include "pam_panic_password.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "../config.h"
 #include "../../lib/gettext.h"
 
-#include <security/pam_modules.h>
-#include <security/pam_ext.h>
 #include <syslog.h>
 #include <crypt.h>
-#include "pam_panic_password.h"
 #include "pam_panic_reject.h"
 
 #define _(String) gettext(String)
diff --git a/src/pam_panic/pam_panic_password.h b/src/pam_panic/pam_panic_password.h
index 7ecf411..356d73e 100644
--- a/src/pam_panic/pam_panic_password.h
+++ b/src/pam_panic/pam_panic_password.h
@@ -5,7 +5,10 @@ DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
-#include "config.h"
+#include "../config.h"
+#include <stdint.h>
+#include <security/pam_modules.h>
+#include <security/pam_ext.h>
 
 #ifndef PPASSFILE
   #error PPASSFILE must be declared!
diff --git a/src/pam_panic/pam_panic_reject.c b/src/pam_panic/pam_panic_reject.c
index 44ef9e3..b0af67e 100644
--- a/src/pam_panic/pam_panic_reject.c
+++ b/src/pam_panic/pam_panic_reject.c
@@ -6,7 +6,7 @@ DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
-#include <stdint.h>
+#include "pam_panic_reject.h"
 #include <unistd.h>
 #ifdef TEST
   #include <stdio.h>
@@ -14,8 +14,6 @@ LICENSE :      GNU-GPLv3
   #include <security/pam_ext.h>
 #endif
 #include <sys/wait.h>
-#include "config.h"
-#include "pam_panic_reject.h"
 
 int reject(char *serious_dev, int8_t bSerious, int8_t bReboot, int8_t bPoweroff){
   if(bSerious){
diff --git a/src/pam_panic/pam_panic_reject.h b/src/pam_panic/pam_panic_reject.h
index 5c18236..de44350 100644
--- a/src/pam_panic/pam_panic_reject.h
+++ b/src/pam_panic/pam_panic_reject.h
@@ -5,4 +5,7 @@ DATE :         2018-03-27T02:34:08+02:00
 LICENSE :      GNU-GPLv3
 */
 
+#include "../config.h"
+#include <stdint.h>
+
 int reject(char *serious_dev, int8_t bSerious, int8_t bReboot, int8_t bPoweroff);
diff --git a/src/pam_panic_pw/pam_panic_pw.c b/src/pam_panic_pw/pam_panic_pw.c
index 3d2e8eb..e626e92 100644
--- a/src/pam_panic_pw/pam_panic_pw.c
+++ b/src/pam_panic_pw/pam_panic_pw.c
@@ -7,7 +7,7 @@ LICENSE :      GNU-GPLv3
 */
 
 
-
+#include "pam_panic_pw.h"
 
 #include <stdio.h>
 #include <stdlib.h>