← Back to branch summary

~ubuntu-branches/ubuntu/trusty/policycoreutils/trusty-proposed

« back to all changes in this revision

Viewing changes to restorecond/restorecond.c

  • Committer: Bazaar Package Importer
  • Author(s): Manoj Srivastava
  • Date: 2009-10-14 02:08:04 UTC
  • mfrom: (1.3.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20091014020804-u45uxbr54c4mdyre
Tags: 2.0.74-1
http://bugs.debian.org/515710
* New upstream point release
  + Change semodule upgrade behavior to install even if the module
  + is not present from Dan Walsh.
  + Make setfiles label if selinux is disabled and a seclabel aware
  + kernel is running from Caleb Case.
  + Clarify forkpty() error message in run_init from Manoj Srivastava.
  + Add semanage dontaudit to turn off dontaudits from Dan Walsh.
  + Fix semanage to set correct mode for setrans file from Dan Walsh.
  + Fix malformed dictionary in portRecord from Dan Walsh.
* Added patch from Martin Orr to fix a loop in the inotify watch code
  when installing a watch on utmp.
* [863fb62]: topic--debian: Improve error messages on forkpty failure
  The current error message when forkpty() fails is not clear or
  useful. The following patch makes indicate what went wrong. 
  Bug fix: "The error message on forkpty() failure is not clear or
  useful.", thanks to Russell Coker              (Closes: #515710).

Show diffs side-by-side

added added

removed removed

Lines of Context:
restorecond/restorecond.c
315
315
                        printf("wd=%d mask=%u cookie=%u len=%u\n",
316
316
                               event->wd, event->mask,
317
317
                               event->cookie, event->len);
318
 
                if (event->wd == master_wd)
319
 
                        read_config(fd);
320
 
                else {
321
 
                        switch (utmpwatcher_handle(fd, event->wd)) {
322
 
                        case -1:        /* Message was not for utmpwatcher */
323
 
                                if (event->len)
324
 
                                        watch_list_find(event->wd, event->name);
325
 
                                break;
326
318
 
327
 
                        case 1: /* utmp has changed need to reload */
 
319
                if (event->mask & ~IN_IGNORED) {
 
320
                        if (event->wd == master_wd)
328
321
                                read_config(fd);
329
 
                                break;
330
 
 
331
 
                        default:        /* No users logged in or out */
332
 
                                break;
 
322
                        else {
 
323
                                switch (utmpwatcher_handle(fd, event->wd)) {
 
324
                                case -1:        /* Message was not for utmpwatcher */
 
325
                                        if (event->len)
 
326
                                                watch_list_find(event->wd, event->name);
 
327
                                        break;
 
328
 
 
329
                                case 1: /* utmp has changed need to reload */
 
330
                                        read_config(fd);
 
331
                                        break;
 
332
 
 
333
                                default:        /* No users logged in or out */
 
334
                                        break;
 
335
                                }
333
336
                        }
334
337
                }
335
338