summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Kos <okos@redhat.com>2013-05-20 17:23:27 +0200
committerJakub Hrozek <jhrozek@redhat.com>2013-05-21 16:40:12 +0200
commitdb78f4c750943fcd4b60bca5f3fdfd6cc5d3d4f8 (patch)
tree0ca0aa94c24e590d0193ed5f7d2f7ee8e72b35fc
parent2f6b38151c6dd21cbe0cf2579c20f8c5a358d956 (diff)
downloadsssd-db78f4c750943fcd4b60bca5f3fdfd6cc5d3d4f8.tar.gz
sssd-db78f4c750943fcd4b60bca5f3fdfd6cc5d3d4f8.tar.xz
sssd-db78f4c750943fcd4b60bca5f3fdfd6cc5d3d4f8.zip
Move nscd.c from tools to util
Preparation for the following patch which will include the nscd.c in the monitor code due to newly introduced function for checking the nscd configuration file.
-rw-r--r--Makefile.am2
-rw-r--r--src/tools/tools_util.h8
-rw-r--r--src/util/nscd.c (renamed from src/tools/nscd.c)0
-rw-r--r--src/util/util.h8
4 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 94ad8c04a..c6680521f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -311,7 +311,7 @@ SSSD_TOOLS_OBJ = \
src/tools/tools_util.c \
src/tools/files.c \
src/tools/selinux.c \
- src/tools/nscd.c
+ src/util/nscd.c
SSSD_LCL_TOOLS_OBJ = \
src/sss_client/common.c \
diff --git a/src/tools/tools_util.h b/src/tools/tools_util.h
index 50f5a51f7..cc35475de 100644
--- a/src/tools/tools_util.h
+++ b/src/tools/tools_util.h
@@ -120,14 +120,6 @@ int remove_tree(const char *root);
int copy_tree(const char *src_root, const char *dst_root,
mode_t mode_root, uid_t uid, gid_t gid);
-/* from nscd.c */
-enum nscd_db {
- NSCD_DB_PASSWD,
- NSCD_DB_GROUP
-};
-
-int flush_nscd_cache(enum nscd_db flush_db);
-
/* from selinux.c */
int selinux_file_context(const char *dst_name);
int reset_selinux_file_context(void);
diff --git a/src/tools/nscd.c b/src/util/nscd.c
index b9f2ba88c..b9f2ba88c 100644
--- a/src/tools/nscd.c
+++ b/src/util/nscd.c
diff --git a/src/util/util.h b/src/util/util.h
index fa45fdfdf..566530387 100644
--- a/src/util/util.h
+++ b/src/util/util.h
@@ -491,6 +491,14 @@ bool string_in_list(const char *string, char **list, bool case_sensitive);
*/
void safezero(void *data, size_t size);
+/* from nscd.c */
+enum nscd_db {
+ NSCD_DB_PASSWD,
+ NSCD_DB_GROUP
+};
+
+int flush_nscd_cache(enum nscd_db flush_db);
+
/* from sss_tc_utf8.c */
char *
sss_tc_utf8_str_tolower(TALLOC_CTX *mem_ctx, const char *s);