rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.8, 1.9 NetworkManager-vpnc.spec, 1.43, 1.44
Daniel Williams
dcbw at fedoraproject.org
Tue Oct 14 17:52:23 UTC 2008
Author: dcbw
Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24482
Modified Files:
NetworkManager-vpnc-0.7.0-gppasswd.patch
NetworkManager-vpnc.spec
Log Message:
* Tue Oct 14 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn4175
- Fix password issue with configurations that don't save the user password
in the keyring (rh #466864)
NetworkManager-vpnc-0.7.0-gppasswd.patch:
Index: NetworkManager-vpnc-0.7.0-gppasswd.patch
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc-0.7.0-gppasswd.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NetworkManager-vpnc-0.7.0-gppasswd.patch 12 Oct 2008 17:05:14 -0000 1.8
+++ NetworkManager-vpnc-0.7.0-gppasswd.patch 14 Oct 2008 17:52:22 -0000 1.9
@@ -1,6 +1,6 @@
diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.grouppswd 2008-09-13 16:47:27.000000000 -0400
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-10-12 12:25:08.000000000 -0400
++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2008-10-14 12:25:40.000000000 -0400
@@ -70,6 +70,7 @@ struct GnomeTwoPasswordDialogDetails
GtkWidget *remember_session_button;
@@ -97,7 +97,7 @@
}
diff -up NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h
--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.grouppswd 2008-09-13 16:47:27.000000000 -0400
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-10-12 12:25:08.000000000 -0400
++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2008-10-14 12:25:40.000000000 -0400
@@ -57,6 +57,7 @@ struct GnomeTwoPasswordDialogClass
typedef enum {
GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
@@ -108,7 +108,7 @@
diff -up NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd NetworkManager-vpnc-0.7.0/auth-dialog/main.c
--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.grouppswd 2008-09-13 16:47:27.000000000 -0400
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-10-12 12:31:57.000000000 -0400
++++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2008-10-14 13:47:38.000000000 -0400
@@ -74,9 +74,11 @@ get_secrets (const char *vpn_uuid,
gnome_two_password_dialog_set_password_secondary_label (dialog, _("_Group Password:"));
@@ -123,16 +123,6 @@
gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION);
else
gnome_two_password_dialog_set_remember (dialog, GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER);
-@@ -97,8 +99,8 @@ get_secrets (const char *vpn_uuid,
-
- gtk_widget_show (GTK_WIDGET (dialog));
-
-- if (gnome_two_password_dialog_run_and_block (dialog)) {
- *password = gnome_two_password_dialog_get_password (dialog);
-+ if (gnome_two_password_dialog_run_and_block (dialog)) {
- *group_password = gnome_two_password_dialog_get_password_secondary (dialog);
-
- switch (gnome_two_password_dialog_get_remember (dialog)) {
@@ -110,6 +112,9 @@ get_secrets (const char *vpn_uuid,
keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_USER_PASSWORD, *password);
keyring_helpers_save_secret (vpn_uuid, vpn_name, NULL, VPNC_GROUP_PASSWORD, *group_password);
@@ -153,9 +143,9 @@
int
diff -up NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c.grouppswd NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c
---- NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c.grouppswd 2008-10-12 12:30:24.000000000 -0400
-+++ NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c 2008-10-12 12:30:53.000000000 -0400
-@@ -84,8 +84,6 @@ keyring_helpers_lookup_secrets (const ch
+--- NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c.grouppswd 2008-09-13 16:47:27.000000000 -0400
++++ NetworkManager-vpnc-0.7.0/common-gnome/keyring-helpers.c 2008-10-14 12:25:40.000000000 -0400
+@@ -84,18 +84,18 @@ keyring_helpers_lookup_secrets (const ch
g_return_val_if_fail (*group_password == NULL, FALSE);
*password = find_one_password (vpn_uuid, VPNC_USER_PASSWORD, is_session);
@@ -164,7 +154,14 @@
*group_password = find_one_password (vpn_uuid, VPNC_GROUP_PASSWORD, is_session);
if (!*group_password) {
-@@ -95,7 +93,7 @@ keyring_helpers_lookup_secrets (const ch
+- memset (*password, 0, strlen (*password));
+- gnome_keyring_memory_free (*password);
+- *password = NULL;
++ if (*password) {
++ memset (*password, 0, strlen (*password));
++ gnome_keyring_memory_free (*password);
++ *password = NULL;
++ }
return FALSE;
}
Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- NetworkManager-vpnc.spec 12 Oct 2008 17:05:14 -0000 1.43
+++ NetworkManager-vpnc.spec 14 Oct 2008 17:52:22 -0000 1.44
@@ -10,7 +10,7 @@
Name: NetworkManager-vpnc
Epoch: 1
Version: 0.7.0
-Release: 0.10.%{svn_snapshot}%{?dist}
+Release: 0.11.%{svn_snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Base
URL: http://www.gnome.org/projects/NetworkManager/
@@ -100,6 +100,10 @@
%{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
%changelog
+* Tue Oct 14 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-11.svn4175
+- Fix password issue with configurations that don't save the user password
+ in the keyring (rh #466864)
+
* Sun Oct 12 2008 Dan Williams <dcbw at redhat.com> 1:0.7.0-10.svn4175
- Rebuild for updated NetworkManager
- Allow changing passwords from the connection editor
More information about the scm-commits
mailing list