RepoMirrors
/
selinux
mirror of https://github.com/SELinuxProject/selinux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "libsemanage: Alternate path for semanage.conf" 

This reverts commit 66dd98b83a.
This commit is contained in:
Steve Lawrence 2013-08-01 10:15:56 -04:00
parent b5fe34deba
commit 07e1c247cf
4 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libsemanage/src/handle.c
View File

@ -37,12 +37,10 @@
#include "semanage_store.h"
#define SEMANAGE_COMMIT_READ_WAIT 5
#define SEMANAGE_CONF_PATH "/etc/selinux/semanage.conf"
#include <string.h>
#include <selinux/selinux.h>
static char *private_selinux_path = NULL;
static char *private_semanage_conf_path = NULL;
static char *private_file_context_path = NULL;
static char *private_file_context_local_path = NULL;
static char *private_file_context_homedir_path = NULL;
@ -54,7 +52,6 @@ static char *private_policy_root = NULL;
void semanage_free_root() {
free(private_selinux_path); private_selinux_path = NULL;
free(private_semanage_conf_path); private_semanage_conf_path = NULL;
free(private_file_context_path); private_file_context_path = NULL;
free(private_file_context_local_path); private_file_context_local_path = NULL;
free(private_file_context_homedir_path); private_file_context_homedir_path = NULL;
@ -71,10 +68,6 @@ int semanage_set_root(const char *path) {
goto error;
}
if ( asprintf(&private_semanage_conf_path, "%s/%s", path, SEMANAGE_CONF_PATH) < 0 ) {
goto error;
}
if ( asprintf(&private_file_context_path, "%s/%s", path, selinux_file_context_path()) < 0 ) {
goto error;
}
@ -178,20 +171,6 @@ const char *semanage_selinux_path(void) {
return selinux_path();
}
/* Return a fully-qualified path + filename to the semanage
* configuration file. The caller must not alter the string returned
* (and hence why this function return type is const).
*
*/
const char *semanage_conf_path(void)
{
if (private_semanage_conf_path)
return private_semanage_conf_path;
return SEMANAGE_CONF_PATH;
}
semanage_handle_t *semanage_handle_create(void)
{
semanage_handle_t *sh = NULL;

2
libsemanage/src/handle.h
View File

@ -105,8 +105,6 @@ struct semanage_handle {
dbase_config_t dbase[DBASE_COUNT];
};
const char *semanage_conf_path(void);
/* === Local modifications === */
static inline
dbase_config_t * semanage_user_base_dbase_local(semanage_handle_t * handle)

12
libsemanage/src/semanage_store.c
View File

@ -262,6 +262,18 @@ const char *semanage_path(enum semanage_store_defs store,
return semanage_paths[store][path_name];
}
/* Return a fully-qualified path + filename to the semanage
* configuration file. The caller must not alter the string returned
* (and hence why this function return type is const).
*
* This is going to be hard coded to /etc/selinux/semanage.conf for
* the time being. FIXME
*/
const char *semanage_conf_path(void)
{
return "/etc/selinux/semanage.conf";
}
/**************** functions that create module store ***************/
/* Check that the semanage store exists. If 'create' is non-zero then

1
libsemanage/src/semanage_store.h
View File

@ -66,6 +66,7 @@ enum semanage_sandbox_defs {
/* FIXME: this needs to be made a module store specific init and the
* global configuration moved to another file.
*/
const char *semanage_conf_path(void);
int semanage_check_init(const char *root);
extern const char *semanage_fname(enum semanage_sandbox_defs file_enum);