Export dm_set_selinux_context.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 60cb014e64d7f942f31449c731e3091321bb079f..3ee22beeb9b8d199a23d33e8b5648df75220ee9a 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.00 - 
 =============================
+  Export dm_set_selinux_context().
   Add dm_driver_version().
   Added dependency tree functions to library.
   Added hash, bitset, pool, dbg_malloc to library.

diff --git a/libdm/.exported_symbols b/libdm/.exported_symbols
index 5f7d31f32a849369dc81108dd291be77a5e142f0..6dac95471310f637e9435893f3390ec803dab27c 100644 (file)
--- a/libdm/.exported_symbols
+++ b/libdm/.exported_symbols
@@ -83,3 +83,4 @@ dm_hash_get_first
 dm_hash_get_next
 dm_driver_version
 dm_deptree_deactivate_children
+dm_set_selinux_context

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index cc5df7602979bbccea7a671f7cc740bfd124a420..f773026d8e3e718838d7d11371063c0056725bf0 100644 (file)
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -453,3 +453,8 @@ struct dm_hash_node *dm_hash_get_next(struct dm_hash_table *t, struct dm_hash_no
             v = dm_hash_get_next(h, v))
 
 #endif                         /* LIB_DEVICE_MAPPER_H */
+
+/*
+ * selinux
+ */
+int dm_set_selinux_context(const char *path, mode_t mode);

diff --git a/libdm/libdm-common.c b/libdm/libdm-common.c
index c288eafc7f5c1308ef050528956737622aeb7a1f..2439f2f0d31beed4452376851f41cc40b82d0978 100644 (file)
--- a/libdm/libdm-common.c
+++ b/libdm/libdm-common.c
@@ -199,7 +199,7 @@ int dm_task_add_target(struct dm_task *dmt, uint64_t start, uint64_t size,
 }
 
 #ifdef HAVE_SELINUX
-int set_selinux_context(const char *path, mode_t mode)
+int dm_set_selinux_context(const char *path, mode_t mode)
 {
        security_context_t scontext;
 
@@ -266,7 +266,7 @@ static int _add_dev_node(const char *dev_name, uint32_t major, uint32_t minor,
        }
 
 #ifdef HAVE_SELINUX
-       if (!set_selinux_context(path, S_IFBLK))
+       if (!dm_set_selinux_context(path, S_IFBLK))
                return 0;
 #endif
 

diff --git a/libdm/libdm-common.h.in b/libdm/libdm-common.h.in
index c2ae54380d13ffd4ef4860e5c659c1a33afc292c..3407fc442389f3b11573b9334784381c3bbb8cae 100644 (file)
--- a/libdm/libdm-common.h.in
+++ b/libdm/libdm-common.h.in
@@ -28,8 +28,6 @@ int rm_dev_node(const char *dev_name);
 int rename_dev_node(const char *old_name, const char *new_name);
 void update_devs(void);
 
-int set_selinux_context(const char *path, mode_t mode);
-
 #define DM_LIB_VERSION @DM_LIB_VERSION@
 
 #endif