[kernel] r14660 - in dists/trunk/linux-2.6/debian: . templates/image.plain.bug

[Ben Hutchings]

Author: benh
Date: Sat Nov 21 18:22:26 2009
New Revision: 14660

Log:
Hide WPA authentication parameters and comments when including network configuration in bug reports (bug #555680)

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Nov 21 15:09:57 2009	(r14659)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Nov 21 18:22:26 2009	(r14660)
@@ -11,6 +11,8 @@
   * r8169: Remove firmware for RTL8168D v1 and v2 and use
     request_firmware() to load it
   * DocBook: Fix build breakage
+  * Hide WPA authentication parameters and comments when including network
+    configuration in bug reports
 
   [ Bastian Blank ]
   * [mips] Don't force EMBEDDED on.

Modified: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network	Sat Nov 21 15:09:57 2009	(r14659)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-network	Sat Nov 21 18:22:26 2009	(r14660)
@@ -4,9 +4,9 @@
 
   echo '** Network interface configuration:' >&3
   # Hide passwords/keys
-  awk '$1 ~ /^wireless-key/ { gsub(".", "*", $2); }
+  awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
        $1 == "ethtool-wol" { gsub(".", "*", $3); }
-       { print; }
+       !/^[[:space:]]*\#/ { print; }
       ' </etc/network/interfaces >&3
   echo >&3
   echo '** Network status:' >&3