Hello community, here is the log from the commit of package NetworkManager checked in at Tue Nov 11 15:46:48 CET 2008. -------- --- NetworkManager/NetworkManager.changes 2008-11-07 14:51:03.000000000 +0100 +++ /mounts/work_src_done/STABLE/NetworkManager/NetworkManager.changes 2008-11-10 16:34:37.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 10 17:32:27 EET 2008 - tambet@suse.de + +- Fix the bug where the keyfile system settings plugin would + return empty strings for passwords when they're not set. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ NetworkManager.spec ++++++ --- /var/tmp/diff_new_pack.a29897/_old 2008-11-11 15:45:56.000000000 +0100 +++ /var/tmp/diff_new_pack.a29897/_new 2008-11-11 15:45:56.000000000 +0100 @@ -20,7 +20,7 @@ Name: NetworkManager Url: http://www.gnome.org/projects/NetworkManager/ Version: 0.7.0.r4274 -Release: 1 +Release: 2 License: GPL v2 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: PolicyKit-devel dhcp-client gtk-doc hal-devel intltool iproute2 libgcrypt-devel libnl-devel libtool mozilla-nss-devel ppp-devel wireless-tools @@ -235,6 +235,9 @@ %{_datadir}/gtk-doc/html/libnm-glib/* %changelog +* Mon Nov 10 2008 tambet@suse.de +- Fix the bug where the keyfile system settings plugin would + return empty strings for passwords when they're not set. * Fri Nov 07 2008 tambet@suse.de - Add support for passing through PKCS#11 certificates. - Monitor /etc/HOSTNAME and set hostname accordingly (bnc #)440809. ++++++ nm-pkcs11.patch ++++++ --- /var/tmp/diff_new_pack.a29897/_old 2008-11-11 15:45:57.000000000 +0100 +++ /var/tmp/diff_new_pack.a29897/_new 2008-11-11 15:45:57.000000000 +0100 @@ -486,7 +486,7 @@ #endif /* NM_SETTING_8021X_H */ diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c -index 97be23e..ed27c19 100644 +index 97be23e..080fa0c 100644 --- a/src/supplicant-manager/nm-supplicant-config.c +++ b/src/supplicant-manager/nm-supplicant-config.c @@ -49,6 +49,9 @@ typedef struct @@ -508,17 +508,7 @@ priv->dispose_has_run = FALSE; } -@@ -140,6 +145,9 @@ nm_supplicant_config_add_option (NMSupplicantConfig *self, - opt->len = len; - opt->type = type; - -+ if (!strcmp (key, "password")) -+ key = "private_key_passwd"; -+ - { - char buf[255]; - memset (&buf[0], 0, sizeof (buf)); -@@ -220,9 +228,14 @@ nm_info ("Config: added '%s' value '%s'", key, opt->value); +@@ -220,9 +225,14 @@ nm_info ("Config: added '%s' value '%s'", key, opt->value); static void nm_supplicant_config_finalize (GObject *object) { @@ -535,7 +525,7 @@ /* Chain up to the parent class */ G_OBJECT_CLASS (nm_supplicant_config_parent_class)->finalize (object); -@@ -257,6 +270,69 @@ nm_supplicant_config_set_ap_scan (NMSupplicantConfig * self, +@@ -257,6 +267,69 @@ nm_supplicant_config_set_ap_scan (NMSupplicantConfig * self, NM_SUPPLICANT_CONFIG_GET_PRIVATE (self)->ap_scan = ap_scan; } @@ -605,7 +595,7 @@ static void get_hash_cb (gpointer key, gpointer value, gpointer user_data) { -@@ -565,6 +641,8 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, +@@ -565,6 +638,8 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, gboolean success; GString *phase1, *phase2; char *tmp; @@ -614,7 +604,7 @@ g_return_val_if_fail (NM_IS_SUPPLICANT_CONFIG (self), FALSE); g_return_val_if_fail (setting != NULL, FALSE); -@@ -636,6 +714,27 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, +@@ -636,6 +711,27 @@ nm_supplicant_config_add_setting_8021x (NMSupplicantConfig *self, ADD_STRING_VAL (nm_setting_802_1x_get_identity (setting), "identity", FALSE, FALSE, FALSE); ADD_STRING_VAL (nm_setting_802_1x_get_anonymous_identity (setting), "anonymous_identity", FALSE, FALSE, FALSE); @@ -765,3 +755,36 @@ { "fragment_size", TYPE_INT, 1, 2000, FALSE, NULL }, }; +diff --git a/system-settings/plugins/keyfile/nm-keyfile-connection.c b/system-settings/plugins/keyfile/nm-keyfile-connection.c +index f037b2d..6bf3e39 100644 +--- a/system-settings/plugins/keyfile/nm-keyfile-connection.c ++++ b/system-settings/plugins/keyfile/nm-keyfile-connection.c +@@ -85,9 +85,12 @@ string_to_gvalue (const char *str) + static void + copy_one_secret (gpointer key, gpointer value, gpointer user_data) + { +- g_hash_table_insert ((GHashTable *) user_data, +- g_strdup ((char *) key), +- string_to_gvalue (value)); ++ const char *value_str = (const char *) value; ++ ++ if (value_str) ++ g_hash_table_insert ((GHashTable *) user_data, ++ g_strdup ((char *) key), ++ string_to_gvalue (value_str)); + } + + static void +@@ -103,7 +106,11 @@ add_secrets (NMSetting *setting, + return; + + if (G_VALUE_HOLDS_STRING (value)) { +- g_hash_table_insert (secrets, g_strdup (key), string_to_gvalue (g_value_get_string (value))); ++ const char *tmp; ++ ++ tmp = g_value_get_string (value); ++ if (tmp) ++ g_hash_table_insert (secrets, g_strdup (key), string_to_gvalue (tmp)); + } else if (G_VALUE_HOLDS (value, DBUS_TYPE_G_MAP_OF_STRING)) { + /* Flatten the string hash by pulling its keys/values out */ + g_hash_table_foreach (g_value_get_boxed (value), copy_one_secret, secrets); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org