/mandos/release : revision 237.2.136

To get this branch, use:

bzr branch
http://bzr.recompile.se/loggerhead/mandos/release

Committer: Teddy Hogeborn
Date: 2009-09-17 04:16:32 UTC
mto: (24.1.142 mandos) (237.12.2 mandos-persistent) (299.1.1 release) (300.1.1 release) (301.1.1 release)
mto: This revision was merged to the branch mainline in revision 264.
Revision ID: teddy@fukt.bsnet.se-20090917041632-7m1rm83pxguw5zw7

* plugins.d/usplash.c (main): Bug fix: only close FIFO if opened.

added added

removed removed

612

}

613

614

/* Close FIFO (again) */

615

ret = (int)TEMP_FAILURE_RETRY(close(fifo_fd));

616

if(ret == -1 and errno != EINTR){

617

perror("close");

615

if(fifo_fd != -1){

616

ret = (int)TEMP_FAILURE_RETRY(close(fifo_fd));

617

if(ret == -1 and errno != EINTR){

618

perror("close");

619

}

620

fifo_fd = -1;

618

621

}

619

fifo_fd = -1;

620

622

621

623

if(interrupted_by_signal){

622

624

struct sigaction signal_action = { .sa_handler = SIG_DFL };