Imported Upstream version 1.8.7

[debian/sudo] / plugins / sudoers / sudoers2ldif

diff --git a/plugins/sudoers/sudoers2ldif b/plugins/sudoers/sudoers2ldif
index 442155e352cece25cd9eb83f6bd0b7f9b6fea0ed..1a6951905c4d1bd1afcd1401a2b8b7f4f4f4ca39 100755 (executable)
--- a/plugins/sudoers/sudoers2ldif
+++ b/plugins/sudoers/sudoers2ldif
@@ -1,4 +1,20 @@
 #!/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;
 
 #
@@ -46,7 +62,7 @@ while (<>){
     my $opt=$';
     $opt=~s/\s+$//; # remove trailing whitespace
     push @options,$opt;
-  } elsif (/^(\S+)\s+(.+)=\s*(.*)/) {
+  } elsif (/^(\S+)\s+([^=]+)=\s*(.*)/) {
 
     # Aliases or Definitions
     my ($p1,$p2,$p3)=($1,$2,$3);
@@ -127,7 +143,7 @@ sub expand{
     s/NOLOG_INPUT:\s*// && push @options,"!log_input";
     s/LOG_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
   }