rpms/NetworkManager-vpnc/devel NetworkManager-vpnc-0.7.0-gppasswd.patch, 1.1, 1.2
Denis Leroy (denis)
fedora-extras-commits at redhat.com
Tue Nov 27 08:54:16 UTC 2007
Author: denis
Update of /cvs/pkgs/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8117
Modified Files:
NetworkManager-vpnc-0.7.0-gppasswd.patch
Log Message:
Fixed group password patch for svn 3109
NetworkManager-vpnc-0.7.0-gppasswd.patch:
Index: NetworkManager-vpnc-0.7.0-gppasswd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc-0.7.0-gppasswd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NetworkManager-vpnc-0.7.0-gppasswd.patch 24 Oct 2006 09:31:40 -0000 1.1
+++ NetworkManager-vpnc-0.7.0-gppasswd.patch 27 Nov 2007 08:54:13 -0000 1.2
@@ -1,28 +1,21 @@
---- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig 2006-10-21 15:01:07.000000000 +0200
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2006-10-21 15:03:55.000000000 +0200
-@@ -33,13 +33,39 @@
-
- #define VPN_SERVICE "org.freedesktop.NetworkManager.vpnc"
-
--static GSList *
--lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
-+struct keyring_data {
-+ const char* password;
-+ const char* group_password;
-+ gboolean is_session;
-+};
+--- NetworkManager-vpnc-0.7.0/auth-dialog/main.c.orig 2007-11-07 19:05:57.000000000 +0100
++++ NetworkManager-vpnc-0.7.0/auth-dialog/main.c 2007-11-27 09:24:17.000000000 +0100
+@@ -35,6 +35,32 @@
+ #include "../src/nm-vpnc-service.h"
+ #include "gnome-two-password-dialog.h"
+
++typedef struct {
++ const char *password;
++ const char *group_password;
++ gboolean is_session;
++} KeyringData;
+
-+void keyring_data_init(struct keyring_data* d)
- {
-- GSList *passwords;
-- GList *keyring_result;
-+ d->password = NULL;
-+ d->group_password = NULL;
-+ d->is_session = FALSE;
++void keyring_data_init(KeyringData* d)
++{
++ memset(d, 0, sizeof(KeyringData));
+}
-
-- passwords = NULL;
-+void keyring_data_free(struct keyring_data* d)
++
++void keyring_data_free(KeyringData* d)
+{
+ /* For security reasons, Make sure to clear the data before freeing */
+ if (d->password) {
@@ -36,105 +29,55 @@
+ d->group_password = NULL;
+ }
+}
-+
+
-+gboolean
-+lookup_pass (const char *vpn_name, const char *vpn_service, struct keyring_data* kd)
-+{
-+ GList *keyring_result;
-
- if (gnome_keyring_find_network_password_sync (g_get_user_name (), /* user */
- NULL, /* domain */
-@@ -51,40 +77,32 @@
- &keyring_result) != GNOME_KEYRING_RESULT_OK)
- return FALSE;
-
-- if (keyring_result != NULL && g_list_length (keyring_result) == 2) {
-- char *password;
-- char *group_password;
-- GnomeKeyringNetworkPasswordData *data1 = keyring_result->data;
-- GnomeKeyringNetworkPasswordData *data2 = (g_list_next (keyring_result))->data;
-+ char *password = NULL;
-+ char *group_password = NULL;
-+ GList* i;
-+
-+ for (i = keyring_result; i; i = g_list_next(i)) {
-+ GnomeKeyringNetworkPasswordData *data = i->data;
-+
-+ if (data) {
-+ if (strcmp (data->object, "group_password") == 0) {
-+ group_password = data->password;
-+ } else if (strcmp (data->object, "password") == 0) {
-+ password = data->password;
-+ }
+ static char *
+ find_one_password (const char *vpn_name,
+ const char *vpn_service,
+@@ -74,27 +100,14 @@
+ return secret;
+ }
-- password = NULL;
-- group_password = NULL;
+-static GSList *
+-lookup_pass (const char *vpn_name, const char *vpn_service, gboolean *is_session)
++void
++lookup_pass (const char *vpn_name, const char *vpn_service, KeyringData *kdata)
+ {
+- GSList *passwords = NULL;
+- char *password;
+- char *group_password;
-
-- if (strcmp (data1->object, "group_password") == 0) {
-- group_password = data1->password;
-- } else if (strcmp (data1->object, "password") == 0) {
-- password = data1->password;
-- }
+- password = find_one_password (vpn_name, vpn_service, "password", is_session);
+- if (!password)
+- return NULL;
-
-- if (strcmp (data2->object, "group_password") == 0) {
-- group_password = data2->password;
-- } else if (strcmp (data2->object, "password") == 0) {
-- password = data2->password;
-+ kd->is_session = (strcmp (data->keyring, "session") == 0);
- }
-+ }
-
-- if (password != NULL && group_password != NULL) {
-- passwords = g_slist_append (passwords, g_strdup (group_password));
-- passwords = g_slist_append (passwords, g_strdup (password));
-- if (strcmp (data1->keyring, "session") == 0)
-- *is_session = TRUE;
-- else
-- *is_session = FALSE;
-- }
-+ if (password)
-+ kd->password = g_strdup(password);
-+ if (group_password)
-+ kd->group_password = g_strdup(group_password);
-
-- gnome_keyring_network_password_list_free (keyring_result);
+- group_password = find_one_password (vpn_name, vpn_service, "group-password", is_session);
+- if (!group_password) {
+- g_free (password);
+- return NULL;
- }
-+ gnome_keyring_network_password_list_free (keyring_result);
++ keyring_data_init(kdata);
+- /* Group password first */
+- passwords = g_slist_append (passwords, group_password);
+- passwords = g_slist_append (passwords, password);
- return passwords;
-+ return TRUE;
++ kdata->password = find_one_password (vpn_name, vpn_service, "password", &(kdata->is_session));
++ kdata->group_password = find_one_password (vpn_name, vpn_service, "group-password",
++ &(kdata->is_session));
}
- static void save_vpn_password (const char *vpn_name, const char *vpn_service, const char *keyring,
-@@ -93,6 +111,7 @@
- guint32 item_id;
- GnomeKeyringResult keyring_result;
-
-+ if (password) {
- keyring_result = gnome_keyring_set_network_password_sync (keyring,
- g_get_user_name (),
- NULL,
-@@ -107,6 +126,7 @@
- {
- g_warning ("Couldn't store password in keyring, code %d", (int) keyring_result);
- }
-+ }
-
- keyring_result = gnome_keyring_set_network_password_sync (keyring,
- g_get_user_name (),
-@@ -125,38 +145,20 @@
- }
+ static void
+@@ -136,38 +149,24 @@
+ g_free (display_name);
}
-static GSList *
-get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry)
+gboolean
-+get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, struct keyring_data* kdata)
++get_passwords (const char *vpn_name, const char *vpn_service, gboolean retry, KeyringData *kdata)
{
-- GSList *result;
-- char *prompt;
-+ char *prompt;
+ GSList *result;
+ char *prompt;
GtkWidget *dialog;
- char *keyring_password;
- char *keyring_group_password;
@@ -142,15 +85,14 @@
- GSList *keyring_result;
GnomeTwoPasswordDialogRemember remember;
-- result = NULL;
+ result = NULL;
- keyring_password = NULL;
- keyring_group_password = NULL;
- keyring_result = NULL;
-
- g_return_val_if_fail (vpn_name != NULL, NULL);
-+ g_return_val_if_fail (vpn_name != NULL, FALSE);
-
- /* Use the system user name, since the VPN might have a different user name */
+-
+- /* Use the system user name, since the VPN might have a different user name */
- if (!retry) {
- if ((result = lookup_pass (vpn_name, vpn_service, &keyring_is_session)) != NULL) {
- return result;
@@ -163,41 +105,47 @@
- g_slist_foreach (keyring_result, (GFunc)g_free, NULL);
- g_slist_free (keyring_result);
- }
-+ gboolean has_keyring = lookup_pass (vpn_name, vpn_service, kdata);
+
-+ if (!retry && has_keyring && kdata->password)
++ g_return_val_if_fail (vpn_name != NULL, FALSE);
++
++ lookup_pass (vpn_name, vpn_service, kdata);
++
++ /* If this is not a retry and we have a keyring password,
++ don't prompt and attempt to connect */
++ if (!retry && kdata->password)
+ return TRUE;
prompt = g_strdup_printf (_("You need to authenticate to access the Virtual Private Network '%s'."), vpn_name);
dialog = gnome_two_password_dialog_new (_("Authenticate VPN"), prompt, NULL, NULL, FALSE);
-@@ -169,21 +171,24 @@
+@@ -180,21 +179,23 @@
gnome_two_password_dialog_set_password_secondary_label (GNOME_TWO_PASSWORD_DIALOG (dialog), _("_Group Password:"));
/* use the same keyring storage options as from the items we put in the entry boxes */
remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING;
- if (keyring_result != NULL) {
- if (keyring_is_session)
-+ if (has_keyring) {
-+ if (!kdata->password && kdata->group_password)
-+ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
-+ else if (kdata->is_session)
- remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
- else
+- remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
+- else
- remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
-+ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
- }
+- }
++ if (kdata->group_password)
++ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
++ else if (kdata->is_session)
++ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
++ else if (kdata->password)
++ remember = GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
+
gnome_two_password_dialog_set_remember (GNOME_TWO_PASSWORD_DIALOG (dialog), remember);
-- /* if retrying, put in the passwords from the keyring */
+ /* if retrying, put in the passwords from the keyring */
- if (keyring_password != NULL) {
- gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_password);
- }
- if (keyring_group_password != NULL) {
- gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog), keyring_group_password);
- }
-+/* if retrying, put in the passwords from the keyring */
+ if (kdata->password)
-+ gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog), kdata->password);
++ gnome_two_password_dialog_set_password (GNOME_TWO_PASSWORD_DIALOG (dialog),
++ kdata->password);
+
+ if (kdata->group_password)
+ gnome_two_password_dialog_set_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog),
@@ -205,35 +153,26 @@
gtk_widget_show (dialog);
-@@ -192,18 +197,21 @@
- char *password;
- char *group_password;
+@@ -205,11 +206,16 @@
-- password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
-- group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
+ password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
+ group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
- result = g_slist_append (result, group_password);
- result = g_slist_append (result, password);
+ keyring_data_free(kdata);
++ kdata->password = g_strdup(password);
++ kdata->group_password = g_strdup(group_password);
+
-+ kdata->password = gnome_two_password_dialog_get_password (GNOME_TWO_PASSWORD_DIALOG (dialog));
-+ kdata->group_password = gnome_two_password_dialog_get_password_secondary (GNOME_TWO_PASSWORD_DIALOG (dialog));
switch (gnome_two_password_dialog_get_remember (GNOME_TWO_PASSWORD_DIALOG (dialog)))
{
- case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
-- save_vpn_password (vpn_name, vpn_service, "session", password, group_password);
-+ save_vpn_password (vpn_name, vpn_service, "session", kdata->password, kdata->group_password);
-+ break;
+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
-+ save_vpn_password (vpn_name, vpn_service, NULL, NULL, kdata->group_password);
- break;
- case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
-- save_vpn_password (vpn_name, vpn_service, NULL, password, group_password);
-+ save_vpn_password (vpn_name, vpn_service, NULL, kdata->password, kdata->group_password);
- break;
- default:
- break;
-@@ -211,12 +219,9 @@
++ save_vpn_password (vpn_name, vpn_service, NULL, "group-password", group_password);
++ break;
+ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
+ save_vpn_password (vpn_name, vpn_service, "session", "password", password);
+ save_vpn_password (vpn_name, vpn_service, "session", "group-password", group_password);
+@@ -224,18 +230,14 @@
}
@@ -247,99 +186,116 @@
}
int
-@@ -262,22 +267,28 @@
- gnome_program_init ("nm-vpnc-auth-dialog", VERSION, LIBGNOMEUI_MODULE,
- argc, argv,
- GNOME_PARAM_NONE, GNOME_PARAM_NONE);
-+
-+ struct keyring_data kdata;
+ main (int argc, char *argv[])
+ {
+- GSList *passwords;
+ static gboolean retry = FALSE;
+ static gchar *vpn_name = NULL;
+ static gchar *vpn_service = NULL;
+@@ -249,13 +251,13 @@
+ { NULL }
+ };
+ char buf[1];
++ KeyringData keyring_data;
+ gboolean success = FALSE;
-+
-+ keyring_data_init(&kdata);
+
+ bindtextdomain (GETTEXT_PACKAGE, NULL);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+- passwords = NULL;
+-
+ context = g_option_context_new ("- vpnc auth dialog");
+ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+
+@@ -265,7 +267,6 @@
+ GNOME_PARAM_GOPTION_CONTEXT, context,
+ GNOME_PARAM_NONE);
+-
+ if (vpn_name == NULL || vpn_service == NULL) {
+ fprintf (stderr, "Have to supply both name and service\n");
+ goto out;
+@@ -276,21 +277,22 @@
+ goto out;
+ }
+
- passwords = get_passwords (vpn_name, vpn_service, retry);
- if (passwords == NULL)
-+ if (! get_passwords (vpn_name, vpn_service, retry, &kdata))
++ keyring_data_init(&keyring_data);
++
++ if (! get_passwords (vpn_name, vpn_service, retry, &keyring_data))
goto out;
-+ if (!kdata.password || !kdata.group_password)
-+ goto out;
-+
+ success = TRUE;
/* dump the passwords to stdout */
-- for (i = passwords; i != NULL; i = g_slist_next (i)) {
-- char *password = (char *) i->data;
-- printf ("%s\n", password);
-- }
-+ printf ("%s\n", kdata.group_password);
-+ printf ("%s\n", kdata.password);
-+
+
+- printf ("%s\n%s\n", NM_VPNC_KEY_SECRET, (char *) passwords->data);
+- printf ("%s\n%s\n", NM_VPNC_KEY_XAUTH_PASSWORD, (char *) passwords->next->data);
++ printf ("%s\n%s\n", NM_VPNC_KEY_SECRET, keyring_data.group_password);
++ printf ("%s\n%s\n", NM_VPNC_KEY_XAUTH_PASSWORD, keyring_data.password);
printf ("\n\n");
+
/* for good measure, flush stdout since Kansas is going Bye-Bye */
fflush (stdout);
- g_slist_foreach (passwords, (GFunc)g_free, NULL);
- g_slist_free (passwords);
-+ keyring_data_free(&kdata);
++ keyring_data_free(&keyring_data);
/* wait for data on stdin */
fread (buf, sizeof (char), sizeof (buf), stdin);
-@@ -285,5 +296,5 @@
+@@ -298,5 +300,5 @@
out:
- g_option_context_free (context);
+ g_object_unref (program);
- return passwords != NULL ? 0 : 1;
-+ return success ? 0 : 1;
++ return (success ? 0 : 1);
}
---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig 2006-10-21 15:01:07.000000000 +0200
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2006-10-21 15:01:12.000000000 +0200
-@@ -57,6 +57,7 @@
- typedef enum {
- GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
- GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION,
-+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP,
- GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER
- } GnomeTwoPasswordDialogRemember;
-
---- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig 2006-10-21 15:01:07.000000000 +0200
-+++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2006-10-21 15:01:12.000000000 +0200
-@@ -68,6 +68,7 @@
+--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c.orig 2007-11-27 09:23:30.000000000 +0100
++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.c 2007-11-27 09:24:17.000000000 +0100
+@@ -69,6 +69,7 @@
GtkWidget *remember_session_button;
GtkWidget *remember_forever_button;
-+ GtkWidget *remember_group_forever_button;
++ GtkWidget *remember_group_button;
GtkWidget *radio_vbox;
GtkWidget *connect_with_no_userpass_button;
-@@ -465,11 +466,15 @@
- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
+@@ -462,14 +463,18 @@
+ gtk_widget_show_all (GTK_DIALOG (password_dialog)->vbox);
+
+ password_dialog->details->remember_session_button =
+- gtk_check_button_new_with_mnemonic (_("_Remember passwords for this session"));
++ gtk_radio_button_new_with_mnemonic (NULL, _("_Remember passwords for this session"));
password_dialog->details->remember_forever_button =
- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
-+ password_dialog->details->remember_group_forever_button =
-+ gtk_check_button_new_with_mnemonic (_("S_ave group password in keyring"));
+- gtk_check_button_new_with_mnemonic (_("_Save passwords in keyring"));
++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("_Save passwords in keyring"));
++ password_dialog->details->remember_group_button =
++ gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (password_dialog->details->remember_session_button), _("S_ave group password in keyring"));
gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_session_button,
- TRUE, TRUE, 6);
+ FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_forever_button,
- TRUE, TRUE, 0);
-+ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_forever_button,
-+ TRUE, TRUE, 6);
-
+ FALSE, FALSE, 0);
++ gtk_box_pack_start (GTK_BOX (vbox), password_dialog->details->remember_group_button,
++ FALSE, FALSE, 0);
gnome_two_password_dialog_set_username (password_dialog, username);
-@@ -689,9 +694,11 @@
+ gnome_two_password_dialog_set_password (password_dialog, password);
+@@ -688,9 +693,11 @@
if (show_remember) {
gtk_widget_show (password_dialog->details->remember_session_button);
gtk_widget_show (password_dialog->details->remember_forever_button);
-+ gtk_widget_show (password_dialog->details->remember_group_forever_button);
++ gtk_widget_show (password_dialog->details->remember_group_button);
} else {
gtk_widget_hide (password_dialog->details->remember_session_button);
gtk_widget_hide (password_dialog->details->remember_forever_button);
-+ gtk_widget_hide (password_dialog->details->remember_group_forever_button);
++ gtk_widget_hide (password_dialog->details->remember_group_button);
}
}
-@@ -699,30 +706,38 @@
+@@ -698,32 +705,46 @@
gnome_two_password_dialog_set_remember (GnomeTwoPasswordDialog *password_dialog,
GnomeTwoPasswordDialogRemember remember)
{
@@ -348,19 +304,27 @@
session = FALSE;
forever = FALSE;
+- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) {
+ group = FALSE;
- if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION) {
++
++ switch (remember) {
++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION:
session = TRUE;
- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){
+- } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER){
++ break;
++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER:
forever = TRUE;
-+ } else if (remember == GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP){
++ break;
++ case GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP:
+ group = TRUE;
++ break;
}
++
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button),
session);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button),
forever);
-+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button),
++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button),
+ group);
}
@@ -372,11 +336,23 @@
session = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_session_button));
forever = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_forever_button));
-+ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_forever_button));
++ group = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (password_dialog->details->remember_group_button));
if (forever) {
return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER;
-+ } else if (group) {
-+ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
} else if (session) {
return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION;
++ } else if (group) {
++ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP;
}
+ return GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING;
+ }
+--- NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h.orig 2007-11-27 09:23:26.000000000 +0100
++++ NetworkManager-vpnc-0.7.0/auth-dialog/gnome-two-password-dialog.h 2007-11-27 09:24:17.000000000 +0100
+@@ -57,6 +57,7 @@
+ typedef enum {
+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_NOTHING,
+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_SESSION,
++ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_GROUP,
+ GNOME_TWO_PASSWORD_DIALOG_REMEMBER_FOREVER
+ } GnomeTwoPasswordDialogRemember;
+
More information about the fedora-extras-commits
mailing list