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

[Ben Hutchings]

Author: benh
Date: Tue Mar 16 22:02:27 2010
New Revision: 15406

Log:
Scrub /etc/network/interfaces whether or not the running kernel matches

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 Mar 16 21:55:25 2010	(r15405)
+++ dists/sid/linux-2.6/debian/changelog	Tue Mar 16 22:02:27 2010	(r15406)
@@ -76,6 +76,8 @@
     - ata_piix, pata_oldpiix, pata_mpiix mostly replace piix
     - ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
   * linux-base: Add libata transition script
+  * Hide sensitive information when including network configuration in bug
+    reports and running a different kernel version
 
   [ Martin Michlmayr ]
   * Add some ARM patches from git:

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 Mar 16 21:55:25 2010	(r15405)
+++ dists/sid/linux-2.6/debian/templates/image.plain.bug/include-network	Tue Mar 16 22:02:27 2010	(r15406)
@@ -1,7 +1,4 @@
-add_network() {
-  yesno "Include network configuration and status from this computer? " nop
-  test $REPLY = yep || return 0
-
+_add_etc_network_interfaces() {
   echo '** Network interface configuration:' >&3
   # Hide passwords/keys
   awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
@@ -9,6 +6,13 @@
        !/^[[:space:]]*\#/ { print; }
       ' </etc/network/interfaces >&3
   echo >&3
+}
+
+add_network() {
+  yesno "Include network configuration and status from this computer? " nop
+  test $REPLY = yep || return 0
+
+  _add_etc_network_interfaces
   echo '** Network status:' >&3
   if command -v ip >/dev/null; then
     echo '*** IP interfaces and addresses:' >&3
@@ -36,7 +40,5 @@
   yesno "Include network configuration from this computer? " nop
   test $REPLY = yep || return 0
 
-  echo '** Network interface configuration:' >&3
-  cat /etc/network/interfaces >&3
-  echo >&3
+  _add_etc_network_interfaces
 }