From: 2xsec <dh48.jeong@samsung.com>
Date: Fri, 9 Nov 2018 07:06:33 +0000 (+0900)
Subject: pam_cgfs: remove dependency from cap & log
X-Git-Tag: lxc-3.1.0~15^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4a090bebfb28a35975ee4317326e82bf2756707;p=thirdparty%2Flxc.git

pam_cgfs: remove dependency from cap & log

Signed-off-by: 2xsec <dh48.jeong@samsung.com>
---

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index c3714b8d8..9390055c1 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -424,9 +424,7 @@ if HAVE_PAM
 pam_LTLIBRARIES = pam_cgfs.la
 
 pam_cgfs_la_SOURCES = pam/pam_cgfs.c \
-		      caps.c caps.h \
 		      file_utils.c file_utils.h \
-		      log.c log.h \
 		      macro.h \
 		      string_utils.c string_utils.h
 
diff --git a/src/lxc/file_utils.c b/src/lxc/file_utils.c
index 485a7843e..f89aa638d 100644
--- a/src/lxc/file_utils.c
+++ b/src/lxc/file_utils.c
@@ -30,12 +30,9 @@
 
 #include "config.h"
 #include "file_utils.h"
-#include "log.h"
 #include "macro.h"
 #include "string.h"
 
-lxc_log_define(file_utils, lxc);
-
 int lxc_write_to_file(const char *filename, const void *buf, size_t count,
 		      bool add_newline, mode_t mode)
 {
diff --git a/src/lxc/pam/pam_cgfs.c b/src/lxc/pam/pam_cgfs.c
index 737935640..4a45600ea 100644
--- a/src/lxc/pam/pam_cgfs.c
+++ b/src/lxc/pam/pam_cgfs.c
@@ -57,8 +57,9 @@
 #include <unistd.h>
 
 #include "config.h"
+#include "file_utils.h"
 #include "macro.h"
-#include "utils.h"
+#include "string_utils.h"
 
 #define PAM_SM_SESSION
 #include <security/_pam_macros.h>
diff --git a/src/lxc/string_utils.c b/src/lxc/string_utils.c
index c4b915339..0d7538c1f 100644
--- a/src/lxc/string_utils.c
+++ b/src/lxc/string_utils.c
@@ -29,6 +29,7 @@
 #include <inttypes.h>
 #include <libgen.h>
 #include <pthread.h>
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -43,7 +44,6 @@
 #include <unistd.h>
 
 #include "config.h"
-#include "log.h"
 #include "lxclock.h"
 #include "macro.h"
 #include "namespace.h"
@@ -58,8 +58,6 @@
 #include "include/strlcat.h"
 #endif
 
-lxc_log_define(string_utils, lxc);
-
 char **lxc_va_arg_list_to_argv(va_list ap, size_t skip, int do_strdup)
 {
 	va_list ap2;