From 0857097f7cd49f503c966eb42716415dd5540352 Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@efficios.com>
Date: Mon, 16 Jan 2012 12:00:24 -0500
Subject: [PATCH] Move runas.h to common/ directory

Simply put to improve semantic over the code includes and knowing that
runas.h comes from the common library.

It's arguable to do this across the code base for all internal
libraries. This should be discuss at least for the code tree
consistency.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---
 common/runas.c                           | 2 ++
 {include => common}/runas.h              | 0
 include/Makefile.am                      | 2 +-
 liblttng-kconsumer/lttng-kconsumer.c     | 3 ++-
 liblttng-ustconsumer/lttng-ustconsumer.c | 3 ++-
 lttng-sessiond/main.c                    | 2 +-
 lttng-sessiond/session.c                 | 2 +-
 lttng-sessiond/ust-app.c                 | 3 +--
 8 files changed, 10 insertions(+), 7 deletions(-)
 rename {include => common}/runas.h (100%)

diff --git a/common/runas.c b/common/runas.c
index b3fa81469..22bd2fe8f 100644
--- a/common/runas.c
+++ b/common/runas.c
@@ -32,6 +32,8 @@
 
 #include <lttngerr.h>
 
+#include "runas.h"
+
 #define CHILD_STACK_SIZE	10485760
 
 struct run_as_data {
diff --git a/include/runas.h b/common/runas.h
similarity index 100%
rename from include/runas.h
rename to common/runas.h
diff --git a/include/Makefile.am b/include/Makefile.am
index 00120a6a0..fd212f22f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,4 +2,4 @@ lttnginclude_HEADERS = lttng/lttng.h lttng/lttng-kconsumer.h \
 					   lttng/lttng-ustconsumer.h lttng/lttng-consumer.h
 
 noinst_HEADERS = lttngerr.h lttng-kernel.h lttng-consumerd.h lttng-share.h \
-				 lttng-sessiond-comm.h lttng-kernel-ctl.h lttng-ht.h runas.h
+				 lttng-sessiond-comm.h lttng-kernel-ctl.h lttng-ht.h
diff --git a/liblttng-kconsumer/lttng-kconsumer.c b/liblttng-kconsumer/lttng-kconsumer.c
index 388cc5b20..2b69438ca 100644
--- a/liblttng-kconsumer/lttng-kconsumer.c
+++ b/liblttng-kconsumer/lttng-kconsumer.c
@@ -33,7 +33,8 @@
 #include <lttng-sessiond-comm.h>
 #include <lttng/lttng-kconsumer.h>
 #include <lttngerr.h>
-#include <runas.h>
+
+#include "common/runas.h"
 
 extern struct lttng_consumer_global_data consumer_data;
 extern int consumer_poll_timeout;
diff --git a/liblttng-ustconsumer/lttng-ustconsumer.c b/liblttng-ustconsumer/lttng-ustconsumer.c
index 8305b061a..bc262572a 100644
--- a/liblttng-ustconsumer/lttng-ustconsumer.c
+++ b/liblttng-ustconsumer/lttng-ustconsumer.c
@@ -33,7 +33,8 @@
 #include <lttng/lttng-ustconsumer.h>
 #include <lttng/ust-ctl.h>
 #include <lttngerr.h>
-#include <runas.h>
+
+#include "common/runas.h"
 
 extern struct lttng_consumer_global_data consumer_data;
 extern int consumer_poll_timeout;
diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index f7cd81027..6f34bb722 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -44,7 +44,7 @@
 #include <lttng/lttng-consumer.h>
 
 #include <lttngerr.h>
-#include <runas.h>
+#include "common/runas.h"
 
 #include "channel.h"
 #include "compat/poll.h"
diff --git a/lttng-sessiond/session.c b/lttng-sessiond/session.c
index cccb43b74..050942cee 100644
--- a/lttng-sessiond/session.c
+++ b/lttng-sessiond/session.c
@@ -27,8 +27,8 @@
 
 #include <lttng-sessiond-comm.h>
 #include <lttngerr.h>
-#include <runas.h>
 
+#include "common/runas.h"
 #include "session.h"
 
 /*
diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c
index 913d2de27..209a7fed4 100644
--- a/lttng-sessiond/ust-app.c
+++ b/lttng-sessiond/ust-app.c
@@ -25,15 +25,14 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <runas.h>
 
 #include <urcu/compiler.h>
 
 #include <lttngerr.h>
 #include <lttng-ht.h>
 #include <lttng-share.h>
-#include <runas.h>
 
+#include "common/runas.h"
 #include "ust-app.h"
 #include "ust-consumer.h"
 #include "ust-ctl.h"
-- 
2.34.1