[apparmor] [Branch ~apparmor-dev/apparmor/master] Rev 2136: Kshitij Gupta found and fixed a problem with Glob and Glob w/ Ext behavior

[Steve Beattie]

On Mon, Jul 08, 2013 at 05:36:45PM -0700, Seth Arnold wrote:
> So, how about the following, to fix both problems? (I picked @options as
> the solution -- to match the path among items in the list.)
> 
> Proposed for trunk and 2.8:
> 
> Acked-by: Seth Arnold <seth.arnold at canonical.com>

Acked-by: Steve Beattie <sbeattie at ubuntu.com> for both

Thanks.

> === modified file 'utils/Immunix/AppArmor.pm'
> --- utils/Immunix/AppArmor.pm	2013-07-05 21:12:08 +0000
> +++ utils/Immunix/AppArmor.pm	2013-07-09 00:31:23 +0000
> @@ -3879,8 +3879,8 @@
>                                              $newpath =~ s/\/[^\/]+$/\/\*/;
>                                          }
>                                      }
> -                                    if (not $newpath ~~ $options) {
> -					push @options, $newpath;	
> +                                    if (not $newpath ~~ @options) {
> +                                        push @options, $newpath;	
>                                          $defaultoption = $#options + 1;
>                                      }
>                                  }
> @@ -3897,8 +3897,8 @@
>                                          $newpath =~ s/\/[^\/]+(\.[^\/]+)$/\/\*$1/;
>                                      }
>                                      if (not $newpath ~~ @options) {
> -					push @options, $newpath;
> -					$defaultoption = $#options + 1;
> +                                        push @options, $newpath;
> +                                        $defaultoption = $#options + 1;
>                                      }
>                                  }
>                              } elsif ($ans =~ /\d/) {
> 

-- 
Steve Beattie
<sbeattie at ubuntu.com>
http://NxNW.org/~steve/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20130709/1676243b/attachment.pgp>