Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 175254 Details for
Bug 250946
net-misc/networkmanager-vpnc: add hybrid auth support
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
networkmanager-vpnc-0.7.0-hybrid-auth.patch
networkmanager-vpnc-0.7.0-hybrid-auth.patch (text/plain), 23.42 KB, created by
Constantin Bergemann
on 2008-12-14 16:15:21 UTC
(
hide
)
Description:
networkmanager-vpnc-0.7.0-hybrid-auth.patch
Filename:
MIME Type:
Creator:
Constantin Bergemann
Created:
2008-12-14 16:15:21 UTC
Size:
23.42 KB
patch
obsolete
>--- a/src/nm-vpnc-service.c 2008-11-28 16:31:34.000000000 +0100 >+++ b/src/nm-vpnc-service.c 2008-12-14 16:16:42.000000000 +0100 >@@ -58,6 +58,9 @@ > /* Ignored option for internal use */ > { NM_VPNC_KEY_SECRET_TYPE, G_TYPE_NONE, 0, 0 }, > { NM_VPNC_KEY_XAUTH_PASSWORD_TYPE, G_TYPE_NONE, 0, 0 }, >+ /* Hybrid auth */ >+ { NM_VPNC_KEY_AUTHMODE, G_TYPE_STRING, 0, 0 }, >+ { NM_VPNC_KEY_CA_FILE, G_TYPE_STRING, 0, 0 }, > /* Legacy options that are ignored */ > { LEGACY_NAT_KEEPALIVE, G_TYPE_STRING, 0, 0 }, > { NULL, G_TYPE_NONE, 0, 0 } >diff -Nur -x '*.orig' -x '*~' network-manager-vpnc-0.7~~svn20081015t024626/properties/nm-vpnc-dialog.glade network-manager-vpnc-0.7~~svn20081015t024626.new/properties/nm-vpnc-dialog.glade >--- a/properties/nm-vpnc-dialog.glade 2008-09-08 21:55:33.000000000 +0200 >+++ b/properties/nm-vpnc-dialog.glade 2008-10-31 21:05:05.000000000 +0100 >@@ -40,59 +40,55 @@ > <placeholder/> > </child> > <child> >- <widget class="GtkCheckButton" id="show_passwords_checkbutton"> >+ <widget class="GtkEntry" id="user_password_entry"> > <property name="visible">True</property> > <property name="can_focus">True</property> >- <property name="label" translatable="yes">Show passwords</property> >- <property name="response_id">0</property> >- <property name="draw_indicator">True</property> >+ <property name="visibility">False</property> > </widget> > <packing> > <property name="left_attach">1</property> > <property name="right_attach">2</property> >- <property name="top_attach">4</property> >- <property name="bottom_attach">5</property> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkEntry" id="group_password_entry"> >+ <widget class="GtkLabel" id="label3"> > <property name="visible">True</property> >- <property name="can_focus">True</property> >- <property name="visibility">False</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">_User password:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">group_entry</property> > </widget> > <packing> >- <property name="left_attach">1</property> >- <property name="right_attach">2</property> >- <property name="top_attach">3</property> >- <property name="bottom_attach">4</property> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ <property name="x_options">GTK_FILL</property> > <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkLabel" id="label4"> >+ <widget class="GtkEntry" id="group_entry"> > <property name="visible">True</property> >- <property name="xalign">0</property> >- <property name="label" translatable="yes">Gro_up password:</property> >- <property name="use_underline">True</property> >- <property name="mnemonic_widget">group_entry</property> >+ <property name="can_focus">True</property> > </widget> > <packing> >- <property name="top_attach">3</property> >- <property name="bottom_attach">4</property> >- <property name="x_options">GTK_FILL</property> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> > <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkLabel" id="label23"> >+ <widget class="GtkEntry" id="gateway_entry"> > <property name="visible">True</property> >- <property name="xalign">0</property> >- <property name="label" translatable="yes">_Gateway:</property> >- <property name="use_underline">True</property> >- <property name="mnemonic_widget">gateway_entry</property> >+ <property name="can_focus">True</property> > </widget> > <packing> >- <property name="x_options">GTK_FILL</property> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> > <property name="y_options"></property> > </packing> > </child> >@@ -112,56 +108,60 @@ > </packing> > </child> > <child> >- <widget class="GtkEntry" id="gateway_entry"> >+ <widget class="GtkLabel" id="label23"> > <property name="visible">True</property> >- <property name="can_focus">True</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">_Gateway:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">gateway_entry</property> > </widget> > <packing> >- <property name="left_attach">1</property> >- <property name="right_attach">2</property> >+ <property name="x_options">GTK_FILL</property> > <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkEntry" id="group_entry"> >+ <widget class="GtkLabel" id="label4"> > <property name="visible">True</property> >- <property name="can_focus">True</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">Gro_up password:</property> >+ <property name="use_underline">True</property> >+ <property name="mnemonic_widget">group_entry</property> > </widget> > <packing> >- <property name="left_attach">1</property> >- <property name="right_attach">2</property> >- <property name="top_attach">1</property> >- <property name="bottom_attach">2</property> >+ <property name="top_attach">3</property> >+ <property name="bottom_attach">4</property> >+ <property name="x_options">GTK_FILL</property> > <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkLabel" id="label3"> >+ <widget class="GtkEntry" id="group_password_entry"> > <property name="visible">True</property> >- <property name="xalign">0</property> >- <property name="label" translatable="yes">_User password:</property> >- <property name="use_underline">True</property> >- <property name="mnemonic_widget">group_entry</property> >+ <property name="can_focus">True</property> >+ <property name="visibility">False</property> > </widget> > <packing> >- <property name="top_attach">2</property> >- <property name="bottom_attach">3</property> >- <property name="x_options">GTK_FILL</property> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">3</property> >+ <property name="bottom_attach">4</property> > <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkEntry" id="user_password_entry"> >+ <widget class="GtkCheckButton" id="show_passwords_checkbutton"> > <property name="visible">True</property> > <property name="can_focus">True</property> >- <property name="visibility">False</property> >+ <property name="label" translatable="yes">Show passwords</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> > </widget> > <packing> > <property name="left_attach">1</property> > <property name="right_attach">2</property> >- <property name="top_attach">2</property> >- <property name="bottom_attach">3</property> >- <property name="y_options"></property> >+ <property name="top_attach">4</property> >+ <property name="bottom_attach">5</property> > </packing> > </child> > </widget> >@@ -199,70 +199,93 @@ > <child> > <widget class="GtkTable" id="table3"> > <property name="visible">True</property> >- <property name="n_rows">5</property> >+ <property name="n_rows">7</property> > <property name="n_columns">2</property> > <property name="column_spacing">6</property> > <property name="row_spacing">6</property> > <child> >- <placeholder/> >+ <widget class="GtkEntry" id="ca_file_entry"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">6</property> >+ <property name="bottom_attach">7</property> >+ </packing> > </child> > <child> >- <widget class="GtkCheckButton" id="disable_dpd_checkbutton"> >+ <widget class="GtkLabel" id="label6"> >+ <property name="visible">True</property> >+ <property name="label" translatable="yes">Location of CA File</property> >+ </widget> >+ <packing> >+ <property name="top_attach">6</property> >+ <property name="bottom_attach">7</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="enable_hybrid_checkbutton"> > <property name="visible">True</property> > <property name="can_focus">True</property> >- <property name="label" translatable="yes">Disable Dead Peer Detection</property> >+ <property name="label" translatable="yes">Enable Hybrid Authentication</property> > <property name="response_id">0</property> > <property name="draw_indicator">True</property> > </widget> > <packing> > <property name="left_attach">1</property> > <property name="right_attach">2</property> >- <property name="top_attach">4</property> >- <property name="bottom_attach">5</property> >+ <property name="top_attach">5</property> >+ <property name="bottom_attach">6</property> > </packing> > </child> > <child> >- <widget class="GtkComboBox" id="encryption_combo"> >+ <widget class="GtkLabel" id="label5"> > <property name="visible">True</property> >- <property name="items" translatable="yes"> </property> >+ <property name="label" translatable="yes">Hybrid Authentication</property> > </widget> > <packing> >- <property name="left_attach">1</property> >- <property name="right_attach">2</property> >- <property name="top_attach">2</property> >- <property name="bottom_attach">3</property> >+ <property name="top_attach">5</property> >+ <property name="bottom_attach">6</property> > </packing> > </child> > <child> >- <widget class="GtkLabel" id="label1"> >+ <placeholder/> >+ </child> >+ <child> >+ <widget class="GtkComboBox" id="natt_combo"> > <property name="visible">True</property> >- <property name="xalign">0</property> >- <property name="label" translatable="yes">Encryption method:</property> >+ <property name="items" translatable="yes"> </property> > </widget> > <packing> >- <property name="top_attach">2</property> >- <property name="bottom_attach">3</property> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">3</property> >+ <property name="bottom_attach">4</property> > </packing> > </child> > <child> >- <widget class="GtkLabel" id="label26"> >+ <widget class="GtkLabel" id="label2"> > <property name="visible">True</property> > <property name="xalign">0</property> >- <property name="label" translatable="yes">User name:</property> >+ <property name="label" translatable="yes">NAT traversal:</property> > </widget> > <packing> >- <property name="x_options">GTK_FILL</property> >- <property name="y_options"></property> >+ <property name="top_attach">3</property> >+ <property name="bottom_attach">4</property> > </packing> > </child> > <child> >- <widget class="GtkEntry" id="user_entry"> >+ <widget class="GtkEntry" id="domain_entry"> > <property name="visible">True</property> > <property name="can_focus">True</property> > </widget> > <packing> > <property name="left_attach">1</property> > <property name="right_attach">2</property> >+ <property name="top_attach">1</property> >+ <property name="bottom_attach">2</property> > <property name="y_options"></property> > </packing> > </child> >@@ -280,39 +303,63 @@ > </packing> > </child> > <child> >- <widget class="GtkEntry" id="domain_entry"> >+ <widget class="GtkEntry" id="user_entry"> > <property name="visible">True</property> > <property name="can_focus">True</property> > </widget> > <packing> > <property name="left_attach">1</property> > <property name="right_attach">2</property> >- <property name="top_attach">1</property> >- <property name="bottom_attach">2</property> > <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkLabel" id="label2"> >+ <widget class="GtkLabel" id="label26"> > <property name="visible">True</property> > <property name="xalign">0</property> >- <property name="label" translatable="yes">NAT traversal:</property> >+ <property name="label" translatable="yes">User name:</property> > </widget> > <packing> >- <property name="top_attach">3</property> >- <property name="bottom_attach">4</property> >+ <property name="x_options">GTK_FILL</property> >+ <property name="y_options"></property> > </packing> > </child> > <child> >- <widget class="GtkComboBox" id="natt_combo"> >+ <widget class="GtkLabel" id="label1"> >+ <property name="visible">True</property> >+ <property name="xalign">0</property> >+ <property name="label" translatable="yes">Encryption method:</property> >+ </widget> >+ <packing> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkComboBox" id="encryption_combo"> > <property name="visible">True</property> > <property name="items" translatable="yes"> </property> > </widget> > <packing> > <property name="left_attach">1</property> > <property name="right_attach">2</property> >- <property name="top_attach">3</property> >- <property name="bottom_attach">4</property> >+ <property name="top_attach">2</property> >+ <property name="bottom_attach">3</property> >+ </packing> >+ </child> >+ <child> >+ <widget class="GtkCheckButton" id="disable_dpd_checkbutton"> >+ <property name="visible">True</property> >+ <property name="can_focus">True</property> >+ <property name="label" translatable="yes">Disable Dead Peer Detection</property> >+ <property name="response_id">0</property> >+ <property name="draw_indicator">True</property> >+ </widget> >+ <packing> >+ <property name="left_attach">1</property> >+ <property name="right_attach">2</property> >+ <property name="top_attach">4</property> >+ <property name="bottom_attach">5</property> > </packing> > </child> > </widget> >Index: properties/nm-vpnc.c >=================================================================== >--- a/properties/nm-vpnc.c (Revision 4295) >+++ b/properties/nm-vpnc.c (Arbeitskopie) >@@ -500,7 +500,28 @@ > g_signal_connect (G_OBJECT (widget), "toggled", > (GCallback) show_toggled_cb, > self); >+ >+ /* hybrid auth */ > >+ widget = glade_xml_get_widget (priv->xml, "enable_hybrid_checkbutton"); >+ g_return_val_if_fail (widget != NULL, FALSE); >+ if (s_vpn) { >+ value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_AUTHMODE); >+ if (value && !strcmp("hybrid",value)) >+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); >+ } >+ g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (stuff_changed_cb), self); >+ >+ widget = glade_xml_get_widget (priv->xml, "ca_file_entry"); >+ g_return_val_if_fail (widget != NULL, FALSE); >+ gtk_size_group_add_widget (priv->group, GTK_WIDGET (widget)); >+ if (s_vpn) { >+ value = nm_setting_vpn_get_data_item (s_vpn, NM_VPNC_KEY_CA_FILE); >+ if (value && strlen (value)) >+ gtk_entry_set_text (GTK_ENTRY (widget), value); >+ } >+ g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (stuff_changed_cb), self); >+ > return TRUE; > } > >@@ -640,7 +661,23 @@ > if (str && strlen (str) && (gpw_type != PW_TYPE_UNUSED)) > nm_setting_vpn_add_secret (s_vpn, NM_VPNC_KEY_SECRET, str); > } >+ >+ /* hybrid auth */ >+ widget = glade_xml_get_widget (priv->xml, "enable_hybrid_checkbutton"); >+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) { >+ nm_setting_vpn_add_data_item (s_vpn, >+ g_strdup (NM_VPNC_KEY_AUTHMODE), >+ g_strdup ("hybrid")); >+ } > >+ widget = glade_xml_get_widget (priv->xml, "ca_file_entry"); >+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget)); >+ if (str && strlen (str)) { >+ nm_setting_vpn_add_data_item (s_vpn, >+ g_strdup (NM_VPNC_KEY_CA_FILE), >+ g_strdup (str)); >+ } >+ > nm_connection_add_setting (connection, NM_SETTING (s_vpn)); > return TRUE; > } >--- a/src/nm-vpnc-service.h 2008-11-28 16:31:34.000000000 +0100 >+++ b/src/nm-vpnc-service.h 2008-12-14 16:40:25.000000000 +0100 >@@ -34,6 +34,8 @@ > #define NM_VPNC_KEY_NAT_TRAVERSAL_MODE "NAT Traversal Mode" > #define NM_VPNC_KEY_DPD_IDLE_TIMEOUT "DPD idle timeout (our side)" > #define NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT "Cisco UDP Encapsulation Port" >+#define NM_VPNC_KEY_AUTHMODE "IKE Authmode" >+#define NM_VPNC_KEY_CA_FILE "CA-File" > > #define NM_VPNC_NATT_MODE_NATT "natt" > #define NM_VPNC_NATT_MODE_NONE "none"
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=175254">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 250946
:
175252
| 175254
