RepoMirrors/selinux
1
0
Fork 0
mirror of https://github.com/SELinuxProject/selinux synced 2025-01-12 08:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

policycoreutils: restorecond: make restorecond -u exit when terminal closes

Browse Source 
Make restorecond -u watch the terminal io channel for and exit indicator
and then exit itself if it is not being run from dbus.  If being run
from dbus, dbus takes care of the session cleanup.

Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Dan Walsh 2011-10-06 16:05:03 -04:00 committed by Eric Paris
parent 9961ca6499
commit 4a145b76d0
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
policycoreutils/restorecond/user.c
View File

@ -123,6 +123,11 @@ io_channel_callback
sizeof (buffer),
&bytes_read);
if (! bytes_read) {
/* Sesssion/Terminal Ended */
exit(0);
}
while (i < bytes_read) {
struct inotify_event *event;
event = (struct inotify_event *)&buffer[i];
@ -148,6 +153,7 @@ io_channel_callback
if (condition & G_IO_HUP) {
g_io_channel_close (source);
exit(0);
return FALSE;
}
@ -210,6 +216,13 @@ static int local_server() {
perror("flock");
return -1;
}
/* watch for stdin/terminal going away */
GIOChannel *in = g_io_channel_unix_new(0);
g_io_add_watch_full( in,
G_PRIORITY_HIGH,
G_IO_IN|G_IO_ERR|G_IO_HUP,
io_channel_callback, NULL, NULL);
return 0;
}
@ -221,7 +234,7 @@ int server(int master_fd, const char *watch_file) {
#ifdef HAVE_DBUS
if (dbus_server(loop) != 0)
#endif /* HAVE_DBUS */
if (local_server(loop))
if (local_server())
goto end;
read_config(master_fd, watch_file);