RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2024-12-21 21:50:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Author: Daniel J Walsh

Browse Source 
Email: dwalsh@redhat.com
Subject: policycoreutils_restorecond.patch
Date: Tue, 13 Jan 2009 08:53:50 -0500

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

Add more error checking.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iEYEARECAAYFAklsnO4ACgkQrlYvE4MpobOqdgCgvkzLK6bi1m9oTv217A7CYIvZ
BRcAn005E3lop2wmkaH5DcfVwVv3kCYD
=Xjf4
-----END PGP SIGNATURE-----

Signed-off-by: Joshua Brindle <method@manicmethod.com>
This commit is contained in:
Joshua Brindle 2009-02-16 11:48:37 -05:00
parent 244fd583d8
commit f5a700d107
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
policycoreutils/restorecond/restorecond.c
View File

@ -283,6 +283,8 @@ static void read_config(int fd)
inotify_rm_watch(fd, master_wd);
master_wd =
inotify_add_watch(fd, watch_file_path, IN_MOVED_FROM | IN_MODIFY);
if (master_wd == -1)
exitApp("Error watching config file.");
}
/*
@ -411,7 +413,14 @@ void watch_list_add(int fd, const char *path)
if (!ptr)
exitApp("Out of Memory");
ptr->wd = inotify_add_watch(fd, dir, IN_CREATE | IN_MOVED_TO);
if (ptr->wd == -1) {
free(ptr);
syslog(LOG_ERR, "Unable to watch (%s) %s\n",
path, strerror(errno));
return;
}
ptr->dir = strdup(dir);
if (!ptr->dir)

5
policycoreutils/restorecond/utmpwatcher.c
View File

@ -57,7 +57,7 @@ unsigned int utmpwatcher_handle(int inotify_fd, int wd)
utmp_ptr = NULL;
FILE *cfg = fopen(utmp_path, "r");
if (!cfg)
exitApp("Error reading config file.");
exitApp("Error reading utmp file.");
while (fread(&u, sizeof(struct utmp), 1, cfg) > 0) {
if (u.ut_type == USER_PROCESS)
@ -69,6 +69,9 @@ unsigned int utmpwatcher_handle(int inotify_fd, int wd)
utmp_wd =
inotify_add_watch(inotify_fd, utmp_path, IN_MOVED_FROM | IN_MODIFY);
if (utmp_wd == -1)
exitApp("Error watching utmp file.");
if (prev_utmp_ptr) {
changed = strings_list_diff(prev_utmp_ptr, utmp_ptr);
strings_list_free(prev_utmp_ptr);