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

[Ben Hutchings]

Author: benh
Date: Wed Nov 11 02:58:25 2009
New Revision: 14597

Log:
Hide wireless keys and wake-on-LAN password when including network configuration in bug reports (bug #555680)

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

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Nov 10 14:20:30 2009	(r14596)
+++ dists/sid/linux-2.6/debian/changelog	Wed Nov 11 02:58:25 2009	(r14597)
@@ -22,6 +22,8 @@
     - KEYS: get_instantiation_keyring() should inc the keyring refcount
       in all cases (CVE-2009-3624)
     - netlink: fix typo in initialization (CVE-2009-3612)
+  * Hide wireless keys and wake-on-LAN password when including network
+    configuration in bug reports
 
   [ Bastian Blank ]
   * [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124)

Modified: dists/sid/linux-2.6/debian/templates/image.plain.bug/include-network
==============================================================================
--- dists/sid/linux-2.6/debian/templates/image.plain.bug/include-network	Tue Nov 10 14:20:30 2009	(r14596)
+++ dists/sid/linux-2.6/debian/templates/image.plain.bug/include-network	Wed Nov 11 02:58:25 2009	(r14597)
@@ -3,7 +3,11 @@
   test $REPLY = yep || return 0
 
   echo '** Network interface configuration:' >&3
-  cat /etc/network/interfaces >&3
+  # Hide passwords/keys
+  awk '$1 ~ /^wireless-key/ { gsub(".", "*", $2); }
+       $1 == "ethtool-wol" { gsub(".", "*", $3); }
+       { print; }
+      ' </etc/network/interfaces >&3
   echo >&3
   echo '** Network status:' >&3
   if command -v ip >/dev/null; then