Cosmetics

bastion/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories("${bastion_SOURCE_DIR}/termrec/libtty/")
-include_directories("${bastion_SOURCE_DIR}/common")
+include_directories("${bastion_SOURCE_DIR}/")
 
 file(GLOB_RECURSE SOURCES *.c)
 

bastion/client.c

@@ -3,11 +3,11 @@
 #include <stdlib.h>
 
 #include "../config.h"
+#include "common/mysql.h"
 #include "client.h"
 #ifdef SESSION_RECORDING
 #include "recording.h"
 #endif
-#include "mysql.h"
 #include "state.h"
 
 // callback function for channel data and exceptions

bastion/main.c

@@ -5,7 +5,7 @@
 #include <sys/wait.h>
 
 #include "../config.h"
-#include "mysql.h"
+#include "common/mysql.h"
 #include "session.h"
 
 /* SIGCHLD handler for cleaning up dead children. */

bastion/proxy.c

@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "common/mysql.h"
 #include "client.h"
-#include "mysql.h"
 #include "proxy.h"
 #include "state.h"
 

bastion/session.c

@@ -9,7 +9,7 @@
 #include <sys/wait.h>
 
 #include "../config.h"
-#include "mysql.h"
+#include "common/mysql.h"
 #include "proxy.h"
 #include "session.h"
 #include "state.h"

common/mysql.h

@@ -1,5 +1,5 @@
-#ifndef MYSQL_H_
-#define MYSQL_H_
+#ifndef COMMON_MYSQL_H_
+#define COMMON_MYSQL_H_
 
 struct db_host_info {
     char * privkeytxt;