diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2009-11-05 08:06:02 -0500 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-11-05 14:55:20 -0500 |
| commit | 9d56215d973676130fede91e39ee34d56ca19fb6 (patch) | |
| tree | 794aeed697c80557c4e007950cbf41ba8203e50a /server | |
| parent | ba7e028069a4de7b91f454e50cc672cb94f72421 (diff) | |
| download | sssd-9d56215d973676130fede91e39ee34d56ca19fb6.tar.gz sssd-9d56215d973676130fede91e39ee34d56ca19fb6.tar.xz sssd-9d56215d973676130fede91e39ee34d56ca19fb6.zip | |
Build files.c only for tools
Move files.c into tools directory
Diffstat (limited to 'server')
| -rw-r--r-- | server/Makefile.am | 6 | ||||
| -rw-r--r-- | server/tools/files.c (renamed from server/util/files.c) | 1 | ||||
| -rw-r--r-- | server/tools/tools_util.h | 10 | ||||
| -rw-r--r-- | server/util/util.h | 10 |
4 files changed, 14 insertions, 13 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index 2173b171c..483684519 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -183,7 +183,6 @@ SSSD_UTIL_OBJ = \ util/backup_file.c \ util/strtonum.c \ util/check_and_open.c \ - util/files.c \ $(SSSD_DEBUG_OBJ) SSSD_RESPONDER_OBJ = \ @@ -194,7 +193,8 @@ SSSD_RESPONDER_OBJ = \ SSSD_TOOLS_OBJ = \ tools/sss_sync_ops.c \ - tools/tools_util.c + tools/tools_util.c \ + tools/files.c SSSD_RESOLV_OBJ = \ resolv/async_resolv.c @@ -433,7 +433,7 @@ files_tests_SOURCES = \ $(SSSD_DEBUG_OBJ) \ tests/files-tests.c \ util/check_and_open.c \ - util/files.c + tools/files.c files_tests_CFLAGS = \ $(AM_CFLAGS) \ $(CHECK_CFLAGS) diff --git a/server/util/files.c b/server/tools/files.c index ce73fc8be..6c6447059 100644 --- a/server/util/files.c +++ b/server/tools/files.c @@ -64,6 +64,7 @@ #include "config.h" #include "util/util.h" +#include "tools/tools_util.h" #ifdef HAVE_SELINUX #include <selinux/selinux.h> diff --git a/server/tools/tools_util.h b/server/tools/tools_util.h index 2a1ee25e8..a643e739f 100644 --- a/server/tools/tools_util.h +++ b/server/tools/tools_util.h @@ -95,4 +95,14 @@ int remove_homedir(TALLOC_CTX *mem_ctx, const char *username, uid_t uid, bool force); +/* from files.c */ +int remove_tree(const char *root); + +int copy_tree(const char *src_root, + const char *dst_root, + uid_t uid, gid_t gid); + +int selinux_file_context(const char *dst_name); +int reset_selinux_file_context(void); + #endif /* __TOOLS_UTIL_H__ */ diff --git a/server/util/util.h b/server/util/util.h index 70dba3721..9a27ae559 100644 --- a/server/util/util.h +++ b/server/util/util.h @@ -205,14 +205,4 @@ int backup_file(const char *src, int dbglvl); errno_t check_and_open_readonly(const char *filename, int *fd, const uid_t uid, const gid_t gid, const mode_t mode); -/* from files.c */ -int remove_tree(const char *root); - -int copy_tree(const char *src_root, - const char *dst_root, - uid_t uid, gid_t gid); - -int selinux_file_context(const char *dst_name); -int reset_selinux_file_context(void); - #endif /* __SSSD_UTIL_H__ */ |