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 c3714b8d84f0ff103a8af8ec3a302e9f9103fe46..9390055c1f0e3a2f561f9a466066db8a96e5181f 100644 (file)
--- 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 485a7843eb69d25f9cf53e1a319748077a17fb73..f89aa638d17ec13b3cca69f885972f38376f4171 100644 (file)
--- 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 7379356403d504ae9ac6aa65fc822c31d96ec8bb..4a45600ea921b64ed77482f25b4c504ffa138f11 100644 (file)
--- 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 c4b91533915917b9c424bee2241e16f006ef0bed..0d7538c1fa3fec592e6600a7d6ebb7915df67b68 100644 (file)
--- 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;