Move rpmtsSELabelFoo() functions to an internal-only header

- The sepolicy plugin needs them so the symbols can't be hidden, but
  these are not something external API-users should be messing with.
- Ultimately we'll want to push the actual labeling from FSM to
  the plugin, insulating rpm from all SELinux specifics, this is
  just a band-aid temporary "solution" to keep this out of the API.
(cherry picked from commit 00463e2fe0d115d873f141995e7d8b3041de7d36)

diff --git a/lib/fsm.c b/lib/fsm.c
index 18ec6ba..3c3cfa2 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -25,6 +25,7 @@
 #define        fsmUNSAFE       fsmStage
 #include "lib/rpmfi_internal.h"        /* XXX fi->apath, ... */
 #include "lib/rpmte_internal.h"        /* XXX rpmfs */
+#include "lib/rpmts_internal.h"        /* rpmtsSELabelFoo() only */
 #include "lib/rpmug.h"
 
 #include "debug.h"

diff --git a/lib/rpmts.h b/lib/rpmts.h
index 2e5ed30..0b8d970 100644 (file)
--- a/lib/rpmts.h
+++ b/lib/rpmts.h
@@ -390,27 +390,6 @@ FD_t rpmtsScriptFd(rpmts ts);
 void rpmtsSetScriptFd(rpmts ts, FD_t scriptFd);
 
 /** \ingroup rpmts
- * Get the selabel handle from the transaction set
- * @param ts           transaction set
- * @return             rpm selabel handle, or NULL if it hasn't been initialized yet
- */
-struct selabel_handle * rpmtsSELabelHandle(rpmts ts);
-
-/** \ingroup rpmts
- * Initialize selabel
- * @param ts           transaction set
- * @param path         path to contexts file
- * @return             RPMRC_OK on success, RPMRC_FAIL otherwise
- */
-rpmRC rpmtsSELabelInit(rpmts ts, const char * path);
-
-/** \ingroup rpmts
- * Clean up selabel
- * @param ts           transaction set
- */
-void rpmtsSELabelFini(rpmts ts);
-
-/** \ingroup rpmts
  * Get transaction id, i.e. transaction time stamp.
  * @param ts           transaction set
  * @return             transaction id

diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
index 7ed6eb6..438fd46 100644 (file)
--- a/lib/rpmts_internal.h
+++ b/lib/rpmts_internal.h
@@ -81,6 +81,27 @@ int rpmtsSolve(rpmts ts, rpmds key);
 RPM_GNUC_INTERNAL
 rpmlock rpmtsAcquireLock(rpmts ts);
 
+/** \ingroup rpmts
+ * Get the selabel handle from the transaction set
+ * @param ts           transaction set
+ * @return             rpm selabel handle, or NULL if it hasn't been initialized yet
+ */
+struct selabel_handle * rpmtsSELabelHandle(rpmts ts);
+
+/** \ingroup rpmts
+ * Initialize selabel
+ * @param ts           transaction set
+ * @param path         path to contexts file
+ * @return             RPMRC_OK on success, RPMRC_FAIL otherwise
+ */
+rpmRC rpmtsSELabelInit(rpmts ts, const char * path);
+
+/** \ingroup rpmts
+ * Clean up selabel
+ * @param ts           transaction set
+ */
+void rpmtsSELabelFini(rpmts ts);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/plugins/sepolicy.c b/plugins/sepolicy.c
index 101187f..7f8ba5d 100644 (file)
--- a/plugins/sepolicy.c
+++ b/plugins/sepolicy.c
@@ -14,6 +14,7 @@
 
 #include "rpmio/base64.h"
 #include "lib/rpmte_internal.h"
+#include "lib/rpmts_internal.h"        /* rpmtsSELabelFoo() */
 
 rpmPluginHook PLUGIN_HOOKS = \
        PLUGINHOOK_INIT | \