From 8f4617d9bd3f36323f707f6ec02c0272c10d4481 Mon Sep 17 00:00:00 2001
From: Julien Dessaux
Date: Mon, 11 Mar 2019 16:32:53 +0100
Subject: Cosmetics

---
 bastion/CMakeLists.txt | 2 +-
 bastion/client.c       | 2 +-
 bastion/main.c         | 2 +-
 bastion/proxy.c        | 2 +-
 bastion/session.c      | 2 +-
 common/mysql.h         | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/bastion/CMakeLists.txt b/bastion/CMakeLists.txt
index aab97e4..0f826d2 100644
--- a/bastion/CMakeLists.txt
+++ b/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)
 
diff --git a/bastion/client.c b/bastion/client.c
index c1f5ff2..bf20b2c 100644
--- a/bastion/client.c
+++ b/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
diff --git a/bastion/main.c b/bastion/main.c
index 661a603..d2cde12 100644
--- a/bastion/main.c
+++ b/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. */
diff --git a/bastion/proxy.c b/bastion/proxy.c
index 7d410db..7fbf816 100644
--- a/bastion/proxy.c
+++ b/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"
 
diff --git a/bastion/session.c b/bastion/session.c
index 3d3b1b7..fdca980 100644
--- a/bastion/session.c
+++ b/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"
diff --git a/common/mysql.h b/common/mysql.h
index 8c6040f..ac9a360 100644
--- a/common/mysql.h
+++ b/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;
-- 
cgit v1.2.3