[BACK]Return to sudoers2ldif CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo / plugins / sudoers

Diff for /embedaddon/sudo/plugins/sudoers/sudoers2ldif between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 16:23:02 version 1.1.1.2, 2013/07/22 10:46:12
Line 1 Line 1
 #!/usr/bin/env perl  #!/usr/bin/env perl
   #
   # Copyright (c) 2007, 2010-2011, 2013 Todd C. Miller <Todd.Miller@courtesan.com>
   #
   # Permission to use, copy, modify, and distribute this software for any
   # purpose with or without fee is hereby granted, provided that the above
   # copyright notice and this permission notice appear in all copies.
   #
   # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
   # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
   # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
   # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
   # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
   # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   #
   
 use strict;  use strict;
   
 #  #
Line 46  while (<>){ Line 62  while (<>){
     my $opt=$';      my $opt=$';
     $opt=~s/\s+$//; # remove trailing whitespace      $opt=~s/\s+$//; # remove trailing whitespace
     push @options,$opt;      push @options,$opt;
  } elsif (/^(\S+)\s+(.+)=\s*(.*)/) {  } elsif (/^(\S+)\s+([^=]+)=\s*(.*)/) {
   
     # Aliases or Definitions      # Aliases or Definitions
     my ($p1,$p2,$p3)=($1,$2,$3);      my ($p1,$p2,$p3)=($1,$2,$3);
Line 127  sub expand{ Line 143  sub expand{
     s/NOLOG_INPUT:\s*// && push @options,"!log_input";      s/NOLOG_INPUT:\s*// && push @options,"!log_input";
     s/LOG_OUTPUT:\s*// && push @options,"log_output";      s/LOG_OUTPUT:\s*// && push @options,"log_output";
     s/NOLOG_OUTPUT:\s*// && push @options,"!log_output";      s/NOLOG_OUTPUT:\s*// && push @options,"!log_output";
    s/\w+://; # silently remove other directives    s/[[:upper:]]+://; # silently remove other tags
     s/\s+$//; # right trim      s/\s+$//; # right trim
   }    }
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>