← Back to branch summary

~ubuntu-branches/ubuntu/precise/networkmanagement/precise

« back to all changes in this revision

Viewing changes to debian/patches/020_git-8894d0de848c4bad7ae689eba62e3f34089b6510.patch

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-23 14:00:13 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20111023140013-e38hdzybcg6zndrk
Tags: 0.9~svngit.nm09.20111023.ff842e-0ubuntu1
* New upstream snapshot.
* Drop all patches, merged upstream.
* Add kubuntu_add_subdirectory_po.diff to build the translations.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/020_git-8894d0de848c4bad7ae689eba62e3f34089b6510.patch
1
 
From: Lukas Tinkl <lukas@kde.org>
2
 
Date: Mon, 13 Jun 2011 12:31:44 +0000
3
 
Subject: minor vpnc fixes
4
 
X-Git-Url: http://quickgit.kde.org/?p=networkmanagement.git&amp;a=commitdiff&amp;h=8894d0de848c4bad7ae689eba62e3f34089b6510
5
 
---
6
 
minor vpnc fixes
7
 
 
8
 
- update the vpnc header file, use the DH group defines
9
 
- fix/update NAT mode traversal
10
 
- fix UI file (buddies, tab stops)
11
 
---
12
 
 
13
 
 
14
 
--- a/vpnplugins/vpnc/nm-vpnc-service.h
15
 
+++ b/vpnplugins/vpnc/nm-vpnc-service.h
16
 
@@ -15,7 +15,7 @@
17
 
  * with this program; if not, write to the Free Software Foundation, Inc.,
18
 
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19
 
  *
20
 
- * (C) Copyright 2005 - 2008 Red Hat, Inc.
21
 
+ * (C) Copyright 2005 - 2011 Red Hat, Inc.
22
 
  * (C) Copyright 2007 - 2008 Novell, Inc.
23
 
  */
24
 
 
25
 
@@ -36,6 +36,7 @@
26
 
 #define NM_VPNC_KEY_DOMAIN "Domain"
27
 
 #define NM_VPNC_KEY_DHGROUP "IKE DH Group"
28
 
 #define NM_VPNC_KEY_PERFECT_FORWARD "Perfect Forward Secrecy"
29
 
+#define NM_VPNC_KEY_VENDOR "Vendor"
30
 
 #define NM_VPNC_KEY_APP_VERSION "Application Version"
31
 
 #define NM_VPNC_KEY_SINGLE_DES "Enable Single DES"
32
 
 #define NM_VPNC_KEY_NO_ENCRYPTION "Enable no encryption"
33
 
@@ -44,9 +45,17 @@
34
 
 #define NM_VPNC_KEY_CISCO_UDP_ENCAPS_PORT "Cisco UDP Encapsulation Port"
35
 
 #define NM_VPNC_KEY_LOCAL_PORT "Local Port"
36
 
 
37
 
-#define NM_VPNC_NATT_MODE_NATT "natt"
38
 
+#define NM_VPNC_NATT_MODE_NATT        "natt"
39
 
+#define NM_VPNC_NATT_MODE_NONE        "none"
40
 
 #define NM_VPNC_NATT_MODE_NATT_ALWAYS "force-natt"
41
 
-#define NM_VPNC_NATT_MODE_NONE "none"
42
 
-#define NM_VPNC_NATT_MODE_CISCO "cisco-udp"
43
 
+#define NM_VPNC_NATT_MODE_CISCO       "cisco-udp"
44
 
+
45
 
+#define NM_VPNC_PW_TYPE_SAVE   "save"
46
 
+#define NM_VPNC_PW_TYPE_ASK    "ask"
47
 
+#define NM_VPNC_PW_TYPE_UNUSED "unused"
48
 
+
49
 
+#define NM_VPNC_DHGROUP_DH1 "dh1"
50
 
+#define NM_VPNC_DHGROUP_DH2 "dh2"
51
 
+#define NM_VPNC_DHGROUP_DH5 "dh5"
52
 
 
53
 
 #endif /* NM_VPNC_PLUGIN_H */
54
 
 
55
 
--- a/vpnplugins/vpnc/vpncprop.ui
56
 
+++ b/vpnplugins/vpnc/vpncprop.ui
57
 
@@ -238,12 +238,17 @@
58
 
         </property>
59
 
         <item>
60
 
          <property name="text">
61
 
-          <string>Cisco UDP</string>
62
 
+          <string>NAT-T (if available)</string>
63
 
          </property>
64
 
         </item>
65
 
         <item>
66
 
          <property name="text">
67
 
-          <string>NAT-T</string>
68
 
+          <string>Force NAT-T</string>
69
 
+         </property>
70
 
+        </item>
71
 
+        <item>
72
 
+         <property name="text">
73
 
+          <string>Cisco UDP</string>
74
 
          </property>
75
 
         </item>
76
 
         <item>
77
 
@@ -256,7 +261,10 @@
78
 
       <item row="4" column="0">
79
 
        <widget class="QLabel" name="label_9">
80
 
         <property name="text">
81
 
-         <string>IKE DH Group</string>
82
 
+         <string>&amp;IKE DH Group</string>
83
 
+        </property>
84
 
+        <property name="buddy">
85
 
+         <cstring>cboDHGroup</cstring>
86
 
         </property>
87
 
        </widget>
88
 
       </item>
89
 
@@ -321,6 +329,21 @@
90
 
    <header>klineedit.h</header>
91
 
   </customwidget>
92
 
  </customwidgets>
93
 
+ <tabstops>
94
 
+  <tabstop>leGateway</tabstop>
95
 
+  <tabstop>leGroupName</tabstop>
96
 
+  <tabstop>leUserPassword</tabstop>
97
 
+  <tabstop>cboUserPassOptions</tabstop>
98
 
+  <tabstop>leGroupPassword</tabstop>
99
 
+  <tabstop>cboGroupPassOptions</tabstop>
100
 
+  <tabstop>cbShowPasswords</tabstop>
101
 
+  <tabstop>leUserName</tabstop>
102
 
+  <tabstop>leDomain</tabstop>
103
 
+  <tabstop>cboEncryptionMethod</tabstop>
104
 
+  <tabstop>cboNatTraversal</tabstop>
105
 
+  <tabstop>cboDHGroup</tabstop>
106
 
+  <tabstop>chkDeadPeerDetection</tabstop>
107
 
+ </tabstops>
108
 
  <resources/>
109
 
  <connections>
110
 
   <connection>
111
 
 
112
 
--- a/vpnplugins/vpnc/vpncwidget.cpp
113
 
+++ b/vpnplugins/vpnc/vpncwidget.cpp
114
 
@@ -49,7 +49,7 @@ VpncSettingWidget::VpncSettingWidget(Knm
115
 
 
116
 
 VpncSettingWidget::~VpncSettingWidget()
117
 
 {
118
 
-   delete d_ptr;
119
 
+    delete d_ptr;
120
 
 }
121
 
 
122
 
 void VpncSettingWidget::userPasswordTypeChanged(int index)
123
 
@@ -102,11 +102,15 @@ void VpncSettingWidget::readConfig()
124
 
     }
125
 
 
126
 
     //   nat traversal
127
 
-    if (dataMap[NM_VPNC_KEY_NAT_TRAVERSAL_MODE] == NM_VPNC_NATT_MODE_NATT) {
128
 
+    if (dataMap[NM_VPNC_KEY_NAT_TRAVERSAL_MODE] == NM_VPNC_NATT_MODE_NATT)
129
 
+        d->ui.cboNatTraversal->setCurrentIndex(0);
130
 
+    else if (dataMap[NM_VPNC_KEY_NAT_TRAVERSAL_MODE] == NM_VPNC_NATT_MODE_NATT_ALWAYS)
131
 
         d->ui.cboNatTraversal->setCurrentIndex(1);
132
 
-    } else if (dataMap[NM_VPNC_KEY_NAT_TRAVERSAL_MODE] == NM_VPNC_NATT_MODE_NONE) {
133
 
+    else if (dataMap[NM_VPNC_KEY_NAT_TRAVERSAL_MODE] == NM_VPNC_NATT_MODE_CISCO)
134
 
         d->ui.cboNatTraversal->setCurrentIndex(2);
135
 
-    }
136
 
+    else if (dataMap[NM_VPNC_KEY_NAT_TRAVERSAL_MODE] == NM_VPNC_NATT_MODE_NONE)
137
 
+        d->ui.cboNatTraversal->setCurrentIndex(3);
138
 
+
139
 
     //   dead peer detection
140
 
     if (dataMap.contains(NM_VPNC_KEY_DPD_IDLE_TIMEOUT)) {
141
 
         uint dpdTimeout = dataMap.value(NM_VPNC_KEY_DPD_IDLE_TIMEOUT).toUInt();
142
 
@@ -118,13 +122,13 @@ void VpncSettingWidget::readConfig()
143
 
     //   dh group
144
 
     if (dataMap.contains(NM_VPNC_KEY_DHGROUP)) {
145
 
         QString dhGroup = dataMap.value(NM_VPNC_KEY_DHGROUP);
146
 
-        if (dhGroup == "dh1") {
147
 
+        if (dhGroup == NM_VPNC_DHGROUP_DH1) {
148
 
             // DH Group 1
149
 
             d->ui.cboDHGroup->setCurrentIndex(0);
150
 
-        } else if (dhGroup == "dh2") {
151
 
+        } else if (dhGroup == NM_VPNC_DHGROUP_DH2) {
152
 
             // DH Group 2
153
 
             d->ui.cboDHGroup->setCurrentIndex(1);
154
 
-        } else if (dhGroup == "dh5") {
155
 
+        } else if (dhGroup == NM_VPNC_DHGROUP_DH5) {
156
 
             // DH Group 5
157
 
             d->ui.cboDHGroup->setCurrentIndex(2);
158
 
         }
159
 
@@ -202,14 +206,19 @@ void VpncSettingWidget::writeConfig()
160
 
 
161
 
     // nat traversal
162
 
     switch (d->ui.cboNatTraversal->currentIndex()) {
163
 
-        case 1:
164
 
-            data.insert(NM_VPNC_KEY_NAT_TRAVERSAL_MODE, QLatin1String(NM_VPNC_NATT_MODE_NATT));
165
 
-            break;
166
 
-        case 2:
167
 
-            data.insert(NM_VPNC_KEY_NAT_TRAVERSAL_MODE, QLatin1String(NM_VPNC_NATT_MODE_NONE));
168
 
-            break;
169
 
-        default:
170
 
-            break;
171
 
+    case 1:
172
 
+        data.insert(NM_VPNC_KEY_NAT_TRAVERSAL_MODE, QLatin1String(NM_VPNC_NATT_MODE_NATT_ALWAYS));
173
 
+        break;
174
 
+    case 2:
175
 
+        data.insert(NM_VPNC_KEY_NAT_TRAVERSAL_MODE, QLatin1String(NM_VPNC_NATT_MODE_CISCO));
176
 
+        break;
177
 
+    case 3:
178
 
+        data.insert(NM_VPNC_KEY_NAT_TRAVERSAL_MODE, QLatin1String(NM_VPNC_NATT_MODE_NONE));
179
 
+        break;
180
 
+    case 0:
181
 
+    default:
182
 
+        data.insert(NM_VPNC_KEY_NAT_TRAVERSAL_MODE, QLatin1String(NM_VPNC_NATT_MODE_NATT));
183
 
+        break;
184
 
     }
185
 
 
186
 
     // dead peer detection
187
 
@@ -224,14 +233,14 @@ void VpncSettingWidget::writeConfig()
188
 
     // dh group
189
 
     switch (d->ui.cboDHGroup->currentIndex()) {
190
 
     case 0:    // DH Group 1
191
 
-       data.insert(NM_VPNC_KEY_DHGROUP, "dh1");
192
 
-       break;
193
 
+        data.insert(NM_VPNC_KEY_DHGROUP, NM_VPNC_DHGROUP_DH1);
194
 
+        break;
195
 
     case 1:    // DH Group 2
196
 
-       data.insert(NM_VPNC_KEY_DHGROUP, "dh2");
197
 
-       break;
198
 
+        data.insert(NM_VPNC_KEY_DHGROUP, NM_VPNC_DHGROUP_DH2);
199
 
+        break;
200
 
     case 2:    // DH Group 5
201
 
-       data.insert(NM_VPNC_KEY_DHGROUP, "dh5");
202
 
-       break;
203
 
+        data.insert(NM_VPNC_KEY_DHGROUP, NM_VPNC_DHGROUP_DH5);
204
 
+        break;
205
 
     }
206
 
 
207
 
     d->setting->setData(data);
208