RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-24 14:22:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Author: Daniel J Walsh

Browse Source 
Email: dwalsh@redhat.com
Subject: semodule patch to use new semanage interfaces
Date: Fri, 07 Nov 2008 09:41:24 -0500

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Allows semodule to read bzip compressed policy packages directly.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAkkUU5QACgkQrlYvE4MpobMHGQCdGwEl3h1ZwV92u1mfgrr3z7XT
NGYAoIwz76N7QFdEr8I0t3ncGhbo6heq
=raBi
-----END PGP SIGNATURE-----

Signed-off-by: Joshua Brindle <method@manicmethod.com>
This commit is contained in:
Joshua Brindle 2009-01-05 07:02:25 -05:00
parent 844e23c77b
commit 8c51c70d59
1 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
policycoreutils/semodule/semodule.c
View File

@ -60,24 +60,6 @@ static void cleanup(void)
free(commands);
}
/* mmap() a file to '*data', returning the total number of bytes in
* the file. Returns 0 if file could not be opened or mapped. */
static size_t map_file(char *filename, char **data)
{
int fd;
struct stat sb;
if ((fd = open(filename, O_RDONLY)) == -1) {
return 0;
}
if (fstat(fd, &sb) == -1 ||
(*data = mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)) ==
MAP_FAILED) {
sb.st_size = 0;
}
close(fd);
return sb.st_size;
}
/* Signal handlers. */
static void handle_signal(int sig_num)
{
@ -339,16 +321,6 @@ int main(int argc, char *argv[])
for (i = 0; i < num_commands; i++) {
enum client_modes mode = commands[i].mode;
char *mode_arg = commands[i].arg;
char *data = NULL;
size_t data_len = 0;
if (mode == INSTALL_M || mode == UPGRADE_M || mode == BASE_M) {
if ((data_len = map_file(mode_arg, &data)) == 0) {
fprintf(stderr,
"%s: Could not read file '%s': %s\n",
argv[0], mode_arg, errno ? strerror(errno) : "");
goto cleanup;
}
}
switch (mode) {
case INSTALL_M:{
if (verbose) {
@ -357,7 +329,7 @@ int main(int argc, char *argv[])
mode_arg);
}
result =
semanage_module_install(sh, data, data_len);
semanage_module_install_file(sh, mode_arg);
break;
}
case UPGRADE_M:{
@ -367,7 +339,7 @@ int main(int argc, char *argv[])
mode_arg);
}
result =
semanage_module_upgrade(sh, data, data_len);
semanage_module_upgrade_file(sh, mode_arg);
break;
}
case BASE_M:{
@ -377,8 +349,7 @@ int main(int argc, char *argv[])
mode_arg);
}
result =
semanage_module_install_base(sh, data,
data_len);
semanage_module_install_base_file(sh, mode_arg);
break;
}
case REMOVE_M:{
@ -429,9 +400,6 @@ int main(int argc, char *argv[])
}
}
commit += do_commit[mode];
if (mode == INSTALL_M || mode == UPGRADE_M || mode == BASE_M) {
munmap(data, data_len);
}
if (result < 0) {
fprintf(stderr, "%s: Failed on %s!\n", argv[0],
mode_arg ? : "list");