diff -Nru network-manager-0.9.6.0+git201301190407.6056/cli/src/settings.c network-manager-0.9.6.0+git201301211417.6057/cli/src/settings.c --- network-manager-0.9.6.0+git201301190407.6056/cli/src/settings.c 2013-01-19 04:07:42.000000000 +0000 +++ network-manager-0.9.6.0+git201301211417.6057/cli/src/settings.c 2013-01-21 14:17:45.000000000 +0000 @@ -963,8 +963,8 @@ { int i; const GByteArray *ssid, *bssid, *mac; - char *ssid_str, *channel_str, *rate_str, *tx_power_str, *mtu_str; - char *device_mac_str = NULL, *cloned_mac_str = NULL, *bssid_str = NULL; + char *channel_str, *rate_str, *tx_power_str, *mtu_str; + char *device_mac_str = NULL, *cloned_mac_str = NULL, *ssid_str = NULL, *bssid_str = NULL; GString *mac_blacklist, *seen_bssids; const GSList *iter; guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; @@ -979,7 +979,8 @@ print_fields (nmc->print_fields, nmc->allowed_fields); /* Print field names */ ssid = nm_setting_wireless_get_ssid (s_wireless); - ssid_str = ssid_to_printable ((const char *) ssid->data, ssid->len); + if (ssid) + ssid_str = ssid_to_printable ((const char *) ssid->data, ssid->len); channel_str = g_strdup_printf ("%d", nm_setting_wireless_get_channel (s_wireless)); rate_str = g_strdup_printf ("%d", nm_setting_wireless_get_rate (s_wireless)); bssid = nm_setting_wireless_get_bssid (s_wireless); @@ -1594,7 +1595,7 @@ setting_olpc_mesh_details (NMSettingOlpcMesh *s_olpc_mesh, NmCli *nmc) { const GByteArray *ssid, *dhcp_anycast; - char *ssid_str, *channel_str, *dhcp_anycast_str = NULL; + char *channel_str, *ssid_str = NULL, *dhcp_anycast_str = NULL; guint32 mode_flag = (nmc->print_output == NMC_PRINT_PRETTY) ? NMC_PF_FLAG_PRETTY : (nmc->print_output == NMC_PRINT_TERSE) ? NMC_PF_FLAG_TERSE : 0; guint32 multiline_flag = nmc->multiline_output ? NMC_PF_FLAG_MULTILINE : 0; guint32 escape_flag = nmc->escape_values ? NMC_PF_FLAG_ESCAPE : 0; @@ -1607,7 +1608,8 @@ print_fields (nmc->print_fields, nmc->allowed_fields); /* Print field names */ ssid = nm_setting_olpc_mesh_get_ssid (s_olpc_mesh); - ssid_str = ssid_to_printable ((const char *) ssid->data, ssid->len); + if (ssid) + ssid_str = ssid_to_printable ((const char *) ssid->data, ssid->len); channel_str = g_strdup_printf ("%d", nm_setting_olpc_mesh_get_channel (s_olpc_mesh)); dhcp_anycast = nm_setting_olpc_mesh_get_dhcp_anycast_address (s_olpc_mesh); if (dhcp_anycast) diff -Nru network-manager-0.9.6.0+git201301190407.6056/debian/bzr-builder.manifest network-manager-0.9.6.0+git201301211417.6057/debian/bzr-builder.manifest --- network-manager-0.9.6.0+git201301190407.6056/debian/bzr-builder.manifest 2013-01-19 04:07:50.000000000 +0000 +++ network-manager-0.9.6.0+git201301211417.6057/debian/bzr-builder.manifest 2013-01-21 14:17:51.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version 0.9.6.0+git201301190407.6056-0~pkg630 -lp:network-manager revid:git-v1:e7813c04519aee3d6a6ac6bd4c41d770f1f8c3b9 +# bzr-builder format 0.3 deb-version 0.9.6.0+git201301211417.6057-0~pkg630 +lp:network-manager revid:git-v1:0f05bfb01fe6b7e15f1f0660fb8374f9a5dd56cd nest-part debian lp:~network-manager/network-manager/ubuntu debian debian revid:mathieu-tl@ubuntu.com-20130107162527-a8fo2al3ybugq1n2 diff -Nru network-manager-0.9.6.0+git201301190407.6056/debian/changelog network-manager-0.9.6.0+git201301211417.6057/debian/changelog --- network-manager-0.9.6.0+git201301190407.6056/debian/changelog 2013-01-19 04:07:50.000000000 +0000 +++ network-manager-0.9.6.0+git201301211417.6057/debian/changelog 2013-01-21 14:17:51.000000000 +0000 @@ -1,8 +1,8 @@ -network-manager (0.9.6.0+git201301190407.6056-0~pkg630~quantal1) quantal; urgency=low +network-manager (0.9.6.0+git201301211417.6057-0~pkg630~quantal1) quantal; urgency=low * Auto build. - -- Launchpad Package Builder Sat, 19 Jan 2013 04:07:50 +0000 + -- Launchpad Package Builder Mon, 21 Jan 2013 14:17:51 +0000 network-manager (0.9.6.0+git201301021750.e78c3e8-0ubuntu1) raring; urgency=low