[apparmor] Rev 1497: Effectively revert revno 1471, and fix the misdetected error condition

[Kees Cook]

Hi Steve,

On Wed, Sep 15, 2010 at 12:31:44AM -0700, Steve Beattie wrote:
> [investigations]
> 
> Thus, I think the relevant bit of this commit that can be merged into
> the 2.5 branch is the following:
> 
> === modified file 'parser/parser_interface.c'
> --- parser/parser_interface.c	2010-08-26 18:24:41 +0000
> +++ parser/parser_interface.c	2010-09-15 07:15:59 +0000
> @@ -844,7 +844,7 @@
>  		break;
>  	}
>  
> -	if (kernel_load && fd < 0) {
> +	if (fd < 0 && (kernel_load || option == OPTION_STDOUT)) {
>  		PERROR(_("Unable to open %s - %s\n"), filename,
>  		       strerror(errno));
>  		error = -errno;
> 
> Okay to commit to 2.5?

Yeah, that looks right. Thanks for parting it down.

-Kees

-- 
Kees Cook
Ubuntu Security Team