diff -Nru network-manager-0.6.6/debian/changelog network-manager-0.6.6/debian/changelog
--- network-manager-0.6.6/debian/changelog	2008-03-22 11:42:01.000000000 +0100
+++ network-manager-0.6.6/debian/changelog	2008-03-22 11:42:02.000000000 +0100
@@ -1,3 +1,9 @@
+network-manager (0.6.6-0ubuntu3) hardy; urgency=low
+
+  * Fix segfault in 42a_ath_pci_supplicant_tweaks.patch (Closes: #204868)
+
+ -- Emanuel Steen <kozz@pegasos.org>  Sat, 22 Mar 2008 11:35:13 +0100
+
 network-manager (0.6.6-0ubuntu2) hardy; urgency=low
 
   * resurrect and adapt driver tweaks to new code base for ath_pci cards
diff -Nru /tmp/Rb1JIQwEIT/network-manager-0.6.6/debian/patches/42a_ath_pci_supplicant_tweaks.patch /tmp/dDpw7H6Jkl/network-manager-0.6.6/debian/patches/42a_ath_pci_supplicant_tweaks.patch
--- network-manager-0.6.6/debian/patches/42a_ath_pci_supplicant_tweaks.patch	2008-03-22 11:42:01.000000000 +0100
+++ network-manager-0.6.6/debian/patches/42a_ath_pci_supplicant_tweaks.patch	2008-03-22 11:42:02.000000000 +0100
@@ -38,7 +38,7 @@
  		ap_scan = "AP_SCAN 2";
  	else if (!nm_ap_get_broadcast (ap))
 -		ap_scan = self->priv->has_scan_capa_ssid ? "AP_SCAN 1" : "AP_SCAN 2";
-+		ap_scan = self->priv->has_scan_capa_ssid && strcmp("ath_pci", kernel_driver) ? "AP_SCAN 1" : "AP_SCAN 2";
++		ap_scan = self->priv->has_scan_capa_ssid && nm_null_safe_strcmp("ath_pci", kernel_driver) ? "AP_SCAN 1" : "AP_SCAN 2";
  
  	/* Tell wpa_supplicant that we'll do the scanning */
  	if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, ap_scan))
@@ -83,7 +83,7 @@
 +      */
 +	kernel_driver = nm_device_get_driver (NM_DEVICE (self));
 +     
-+	if (!strcmp (kernel_driver, "ath_pci"))
++	if (!nm_null_safe_strcmp (kernel_driver, "ath_pci"))
 +		wpa_driver = "madwifi";
 +	else
 +		wpa_driver = "wext";