Hello community,
here is the log from the commit of package NetworkManager-strongswan for
openSUSE:Factory checked in at 2014-04-26 10:09:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/NetworkManager-strongswan (Old)
and /work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-strongswan"
Changes:
--------
---
/work/SRC/openSUSE:Factory/NetworkManager-strongswan/NetworkManager-strongswan.changes
2014-04-03 17:12:10.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.NetworkManager-strongswan.new/NetworkManager-strongswan.changes
2014-04-26 10:09:11.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 25 09:09:01 UTC 2014 - dims...@opensuse.org
+
+- Update to version 1.3.1:
+ + Add PSK support.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
NetworkManager-strongswan-1.3.0.tar.bz2
New:
----
NetworkManager-strongswan-1.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-strongswan.spec ++++++
--- /var/tmp/diff_new_pack.FTZe3K/_old 2014-04-26 10:09:12.000000000 +0200
+++ /var/tmp/diff_new_pack.FTZe3K/_new 2014-04-26 10:09:12.000000000 +0200
@@ -17,7 +17,7 @@
Name: NetworkManager-strongswan
-Version: 1.3.0
+Version: 1.3.1
Release: 0
Summary: NetworkManager VPN support for strongSwan
License: GPL-2.0+
++++++ NetworkManager-strongswan-1.3.0.tar.bz2 ->
NetworkManager-strongswan-1.3.1.tar.bz2 ++++++
++++ 2162 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/Makefile.am
new/NetworkManager-strongswan-1.3.1/Makefile.am
--- old/NetworkManager-strongswan-1.3.0/Makefile.am 2011-09-07
13:58:05.000000000 +0200
+++ new/NetworkManager-strongswan-1.3.1/Makefile.am 2014-04-17
15:56:29.000000000 +0200
@@ -11,6 +11,7 @@
@INTLTOOL_DESKTOP_RULE@
nm-strongswan-service.name: $(srcdir)/nm-strongswan-service.name.in
+ $(AM_V_GEN) \
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|' \
-e 's|[@]CHARON[@]|$(charon)|' $< >$@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/NEWS
new/NetworkManager-strongswan-1.3.1/NEWS
--- old/NetworkManager-strongswan-1.3.0/NEWS 2011-09-07 15:38:06.000000000
+0200
+++ new/NetworkManager-strongswan-1.3.1/NEWS 2014-04-24 15:53:38.000000000
+0200
@@ -1,3 +1,9 @@
+NetworkManager-strongswan-1.3.1
+-------------------------------
+
+- Add PSK support
+- Updated german translations
+
NetworkManager-strongswan-1.3.0
-------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/auth-dialog/main.c
new/NetworkManager-strongswan-1.3.1/auth-dialog/main.c
--- old/NetworkManager-strongswan-1.3.0/auth-dialog/main.c 2011-09-07
13:58:05.000000000 +0200
+++ new/NetworkManager-strongswan-1.3.1/auth-dialog/main.c 2014-04-17
15:56:29.000000000 +0200
@@ -99,7 +99,7 @@
fprintf (stderr, "Failed to read data and secrets from
stdin.\n");
return NULL;
}
-
+
method = g_hash_table_lookup (data, "method");
if (method)
method = g_strdup(method);
@@ -118,7 +118,7 @@
gchar *name = NULL, *uuid = NULL, *service = NULL, *keyring = NULL,
*pass;
GOptionContext *context;
char *agent, *type;
- guint32 itemid;
+ guint32 itemid, minlen = 0;
GtkWidget *dialog;
GOptionEntry entries[] = {
{ "reprompt", 'r', 0, G_OPTION_ARG_NONE, &retry, "Reprompt for
passwords", NULL},
@@ -159,7 +159,8 @@
fprintf(stderr, "Connection lookup failed\n");
return 1;
}
- if (!strcmp(type, "eap") || !strcmp(type, "key") || !strcmp(type,
"smartcard"))
+ if (!strcmp(type, "eap") || !strcmp(type, "key") || !strcmp(type,
"psk") ||
+ !strcmp(type, "smartcard"))
{
pass = lookup_password(name, service);
if ((!pass || retry) && allow_interaction)
@@ -178,6 +179,14 @@
NULL, NULL, TRUE);
gnome_password_dialog_set_show_remember(GNOME_PASSWORD_DIALOG(dialog), TRUE);
}
+ else if (!strcmp(type, "psk"))
+ {
+ dialog = gnome_password_dialog_new(_("VPN
password required"),
+ _("Pre-shared key
required to establish VPN connection (min. 20 characters):"),
+ NULL, NULL, TRUE);
+
gnome_password_dialog_set_show_remember(GNOME_PASSWORD_DIALOG(dialog), TRUE);
+ minlen = 20;
+ }
else /* smartcard */
{
dialog = gnome_password_dialog_new(_("VPN
password required"),
@@ -190,12 +199,18 @@
{
gnome_password_dialog_set_password(GNOME_PASSWORD_DIALOG(dialog), pass);
}
+
+too_short_retry:
if
(!gnome_password_dialog_run_and_block(GNOME_PASSWORD_DIALOG(dialog)))
{
return 1;
}
pass =
gnome_password_dialog_get_password(GNOME_PASSWORD_DIALOG(dialog));
+ if (minlen && strlen(pass) < minlen)
+ {
+ goto too_short_retry;
+ }
switch
(gnome_password_dialog_get_remember(GNOME_PASSWORD_DIALOG(dialog)))
{
case GNOME_PASSWORD_DIALOG_REMEMBER_NOTHING:
@@ -244,4 +259,3 @@
wait_for_quit ();
return 0;
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/configure.ac
new/NetworkManager-strongswan-1.3.1/configure.ac
--- old/NetworkManager-strongswan-1.3.0/configure.ac 2011-09-07
13:58:05.000000000 +0200
+++ new/NetworkManager-strongswan-1.3.1/configure.ac 2014-04-24
15:53:38.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.52)
-AC_INIT(NetworkManager-strongswan, 1.3.0, mar...@strongswan.org,
NetworkManager-strongswan)
+AC_INIT(NetworkManager-strongswan, 1.3.1, mar...@strongswan.org,
NetworkManager-strongswan)
AM_INIT_AUTOMAKE([subdir-objects])
AM_MAINTAINER_MODE
@@ -71,9 +71,9 @@
AC_ARG_WITH(
[charon],
- AS_HELP_STRING([--with-charon=file],[path to the strongSwan IKEv2
daemon charon"]),
+ AS_HELP_STRING([--with-charon=file],[path to the strongSwan charon
NetworkManager backend"]),
[AC_SUBST(charon, "$withval")],
- [AC_SUBST(charon, "${libexecdir}/ipsec/charon")]
+ [AC_SUBST(charon, "${libexecdir}/ipsec/charon-nm")]
)
NM_COMPILER_WARNINGS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/po/POTFILES.in
new/NetworkManager-strongswan-1.3.1/po/POTFILES.in
--- old/NetworkManager-strongswan-1.3.0/po/POTFILES.in 2011-09-07
13:58:05.000000000 +0200
+++ new/NetworkManager-strongswan-1.3.1/po/POTFILES.in 2014-04-17
15:56:29.000000000 +0200
@@ -1,5 +1,5 @@
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
properties/nm-strongswan.c
-properties/nm-strongswan-dialog.ui
+[type: gettext/glade]properties/nm-strongswan-dialog.ui
auth-dialog/main.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/po/de.po
new/NetworkManager-strongswan-1.3.1/po/de.po
--- old/NetworkManager-strongswan-1.3.0/po/de.po 2011-09-07
13:58:05.000000000 +0200
+++ new/NetworkManager-strongswan-1.3.1/po/de.po 2014-04-17
15:56:29.000000000 +0200
@@ -6,19 +6,20 @@
msgstr ""
"Project-Id-Version: NetworkManager-strongswan\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 16:12+0200\n"
+"POT-Creation-Date: 2013-11-25 18:14+0100\n"
"PO-Revision-Date: 2010-02-18 09:20+0100\n"
"Last-Translator: Martin Willi <mar...@strongswan.org>\n"
"Language-Team: de <mar...@strongswan.org>\n"
+"Language: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../properties/nm-strongswan.c:38
+#: ../properties/nm-strongswan.c:37
msgid "IPsec/IKEv2 (strongswan)"
msgstr "IPsec/IKEv2 (strongswan)"
-#: ../properties/nm-strongswan.c:39
+#: ../properties/nm-strongswan.c:38
msgid "IPsec with the IKEv2 key exchange protocol."
msgstr "IPsec mit dem IKEv2 Protokoll."
@@ -38,47 +39,27 @@
msgid "EAP"
msgstr "EAP"
-#: ../properties/nm-strongswan-dialog.glade.h:1
-msgid "<b>Client</b>"
-msgstr "<b>Client</b>"
+#: ../properties/nm-strongswan.c:212
+msgid "Pre-shared key"
+msgstr "Pre-shared Key"
-#: ../properties/nm-strongswan-dialog.glade.h:2
+#: ../properties/nm-strongswan-dialog.ui.h:1
msgid "<b>Gateway</b>"
msgstr "<b>Gateway</b>"
-#: ../properties/nm-strongswan-dialog.glade.h:3
-msgid "<b>Options</b>"
-msgstr "<b>Optionen</b>"
+#: ../properties/nm-strongswan-dialog.ui.h:2
+msgid "_Address:"
+msgstr "_Adresse:"
-#: ../properties/nm-strongswan-dialog.glade.h:4
+#: ../properties/nm-strongswan-dialog.ui.h:3
msgid "An IP address or hostname the Gateway can be contacted."
msgstr "Ein IP-Adresse oder einen Rechnernamen des Gateways."
-#: ../properties/nm-strongswan-dialog.glade.h:5
-msgid "Au_thentication:"
-msgstr "Au_thentisierung:"
-
-#: ../properties/nm-strongswan-dialog.glade.h:6
-msgid "Authentication Method to use for authentication against the Gateway. "
-msgstr "Methode zur Authentisierung gegenüber dem Gateway."
-
-#: ../properties/nm-strongswan-dialog.glade.h:7
+#: ../properties/nm-strongswan-dialog.ui.h:4
msgid "C_ertificate:"
msgstr "Z_ertifikat:"
-#: ../properties/nm-strongswan-dialog.glade.h:8
-msgid "Ce_rtificate:"
-msgstr "Ze_rtifikat:"
-
-#: ../properties/nm-strongswan-dialog.glade.h:9
-msgid "Client certificate to use for client authentication."
-msgstr "Zertifikat des Clients für dessen Authentisierung."
-
-#: ../properties/nm-strongswan-dialog.glade.h:10
-msgid "En_force UDP encapsulation"
-msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP"
-
-#: ../properties/nm-strongswan-dialog.glade.h:11
+#: ../properties/nm-strongswan-dialog.ui.h:5
msgid ""
"Gateway or CA certificate to use for gateway authentication. If none is "
"specified, pre-installed CA certificates are used."
@@ -86,19 +67,11 @@
"Gateway- oder CA-Zertifikat für die Authentisierung des Gateways. Ohne "
"Angabe eines Zertifikates werden die CA-Zertifikate des Systems verwendet."
-#: ../properties/nm-strongswan-dialog.glade.h:12
-msgid ""
-"IPComp compresses raw IP packets before they get encrypted. This saves some "
-"bandwidth, but uses more processing power."
-msgstr ""
-"IPComp komprimiert IP-Pakete, bevor sie verschlüsselt werden. Diese Option "
-"kann Bandbreite sparen, benötigt jedoch zusätzliche Rechenleistung."
-
-#: ../properties/nm-strongswan-dialog.glade.h:13
-msgid "Private _key:"
-msgstr "Privater _Schlüssel:"
+#: ../properties/nm-strongswan-dialog.ui.h:6
+msgid "<b>Client</b>"
+msgstr "<b>Client</b>"
-#: ../properties/nm-strongswan-dialog.glade.h:14
+#: ../properties/nm-strongswan-dialog.ui.h:7
msgid ""
"Private key to use for client authentication. This key has to match the "
"certificates public key and may be encrypted."
@@ -106,20 +79,39 @@
"Privater Schlüssel für die Authentisierung des Clients. Dieser Schlüssel "
"muss zum konfigurierten Zertifikat passen und kann verschlüsselt sein."
-#: ../properties/nm-strongswan-dialog.glade.h:15
+#: ../properties/nm-strongswan-dialog.ui.h:8
+msgid "Private _key:"
+msgstr "Privater _Schlüssel:"
+
+#: ../properties/nm-strongswan-dialog.ui.h:9
+msgid "Au_thentication:"
+msgstr "Au_thentisierung:"
+
+#: ../properties/nm-strongswan-dialog.ui.h:10
+msgid "_Username:"
+msgstr "_Benutzername:"
+
+#: ../properties/nm-strongswan-dialog.ui.h:11
+msgid "The username (identity) to use for authentication against the gateway."
+msgstr "Benutzername/Identität für die Authentisierung gegenüber dem Gateway."
+
+#: ../properties/nm-strongswan-dialog.ui.h:12
+msgid "Ce_rtificate:"
+msgstr "Ze_rtifikat:"
+
+#: ../properties/nm-strongswan-dialog.ui.h:13
+msgid "Client certificate to use for client authentication."
+msgstr "Zertifikat des Clients für dessen Authentisierung."
+
+#: ../properties/nm-strongswan-dialog.ui.h:14
+msgid "<b>Options</b>"
+msgstr "<b>Optionen</b>"
+
+#: ../properties/nm-strongswan-dialog.ui.h:15
msgid "Request an _inner IP address"
msgstr "_Innere IP-Adresse beziehen"
-#: ../properties/nm-strongswan-dialog.glade.h:16
-msgid ""
-"Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT "
-"situation is detected might help in such cases."
-msgstr ""
-"Manche Firewalls blockieren Datenverkehr mit dem ESP-Protokoll. Das "
-"erzwingen einer zustzlichen Einbettung in UDP, auch wenn kein NAT-Router "
-"detektiert wurde, kann in solchen Situationen hilfreich sein."
-
-#: ../properties/nm-strongswan-dialog.glade.h:17
+#: ../properties/nm-strongswan-dialog.ui.h:16
msgid ""
"The Gateway may provide addresses from a pool to use for communication in "
"the Gateways network. Check to request such an address."
@@ -128,46 +120,61 @@
"Kommunikation im dahinterliegenden Netz verwenden kann. Aktivieren, um eine "
"solche Adresse zu beziehen."
-#: ../properties/nm-strongswan-dialog.glade.h:18
-msgid "The username (identity) to use for authentication against the gateway."
-msgstr "Benutzername/Identität für die Authentisierung gegenüber dem Gateway."
+#: ../properties/nm-strongswan-dialog.ui.h:17
+msgid "En_force UDP encapsulation"
+msgstr "Erzwingen einer zusätzlichen Einbettung der Datenpakete in _UDP"
-#: ../properties/nm-strongswan-dialog.glade.h:19
+#: ../properties/nm-strongswan-dialog.ui.h:18
+msgid ""
+"Some firewalls block ESP traffic. Enforcing UDP capsulation even if no NAT "
+"situation is detected might help in such cases."
+msgstr ""
+"Manche Firewalls blockieren Datenverkehr mit dem ESP-Protokoll. Das "
+"erzwingen einer zustzlichen Einbettung in UDP, auch wenn kein NAT-Router "
+"detektiert wurde, kann in solchen Situationen hilfreich sein."
+
+#: ../properties/nm-strongswan-dialog.ui.h:19
msgid "Use IP c_ompression"
msgstr "IP-Pakete k_omprimieren"
-#: ../properties/nm-strongswan-dialog.glade.h:20
-msgid "_Address:"
-msgstr "_Adresse:"
-
-#: ../properties/nm-strongswan-dialog.glade.h:21
-msgid "_Username:"
-msgstr "_Benutzername:"
+#: ../properties/nm-strongswan-dialog.ui.h:20
+msgid ""
+"IPComp compresses raw IP packets before they get encrypted. This saves some "
+"bandwidth, but uses more processing power."
+msgstr ""
+"IPComp komprimiert IP-Pakete, bevor sie verschlüsselt werden. Diese Option "
+"kann Bandbreite sparen, benötigt jedoch zusätzliche Rechenleistung."
-#: ../auth-dialog/main.c:172 ../auth-dialog/main.c:179
-#: ../auth-dialog/main.c:186
+#: ../auth-dialog/main.c:170 ../auth-dialog/main.c:177
+#: ../auth-dialog/main.c:184 ../auth-dialog/main.c:191
msgid "VPN password required"
msgstr "VPN Passwort notwendig"
-#: ../auth-dialog/main.c:173
+#: ../auth-dialog/main.c:171
msgid "EAP password required to establish VPN connection:"
msgstr "Für die Erstellung des VPN-Tunnels ist ein EAP-Passwort erforderlich:"
-#: ../auth-dialog/main.c:180
+#: ../auth-dialog/main.c:178
msgid "Private key decryption password required to establish VPN connection:"
msgstr ""
"Der Private Schlüssel für die Erstellung des VPN-Tunnels ist durch ein "
"Passwort geschützt:"
-#: ../auth-dialog/main.c:187
-#, fuzzy
+#: ../auth-dialog/main.c:185
+msgid ""
+"Pre-shared key required to establish VPN connection (min. 20 characters):"
+msgstr ""
+"Für die Erstellung des VPN-Tunnels ist ein Pre-shared Key erforderlich (min. "
+"20 Zeichen):"
+
+#: ../auth-dialog/main.c:192
msgid "Smartcard PIN required to establish VPN connection:"
msgstr "Für die Smartcard ist eine PIN erforderlich:"
-#: ../auth-dialog/main.c:233
+#: ../auth-dialog/main.c:242
msgid ""
"Configuration uses ssh-agent for authentication, but ssh-agent is not "
"running!"
msgstr ""
-"Die Konfiguration verwendet ssh-agent fr die Authentisierung, aber ssh-agent "
-"ist nicht gestartet!"
+"Die Konfiguration verwendet ssh-agent für die Authentisierung, aber ssh-"
+"agent ist nicht gestartet!"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/NetworkManager-strongswan-1.3.0/properties/nm-strongswan.c
new/NetworkManager-strongswan-1.3.1/properties/nm-strongswan.c
--- old/NetworkManager-strongswan-1.3.0/properties/nm-strongswan.c
2011-09-07 13:58:05.000000000 +0200
+++ new/NetworkManager-strongswan-1.3.1/properties/nm-strongswan.c
2014-04-17 15:56:29.000000000 +0200
@@ -1,4 +1,5 @@
/*
+ * Copyright (C) 2013 Tobias Brunner
* Copyright (C) 2008 Martin Willi
* Hochschule fuer Technik Rapperswil
* Copyright (C) 2005 David Zeuthen
@@ -30,7 +31,6 @@
#include <nm-vpn-plugin-ui-interface.h>
#include <nm-setting-vpn.h>
#include <nm-setting-connection.h>
-#include <nm-setting-ip4-config.h>
#include "nm-strongswan.h"
@@ -149,6 +149,7 @@
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object
(priv->builder, "userkey-button")));
break;
case 3:
+ case 4:
gtk_widget_show (GTK_WIDGET (gtk_builder_get_object
(priv->builder, "user-label")));
gtk_widget_show (GTK_WIDGET (gtk_builder_get_object
(priv->builder, "user-entry")));
gtk_widget_hide (GTK_WIDGET (gtk_builder_get_object
(priv->builder, "usercert-label")));
@@ -208,6 +209,7 @@
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget),
_("Certificate/ssh-agent"));
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget),
_("Smartcard"));
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), _("EAP"));
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget),
_("Pre-shared key"));
value = nm_setting_vpn_get_data_item (settings, "method");
if (value) {
if (g_strcmp0 (value, "key") == 0) {
@@ -222,6 +224,9 @@
if (g_strcmp0 (value, "eap") == 0) {
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 3);
}
+ if (g_strcmp0 (value, "psk") == 0) {
+ gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 4);
+ }
}
if (gtk_combo_box_get_active (GTK_COMBO_BOX (widget)) == -1)
{
@@ -351,6 +356,14 @@
}
str = "eap";
break;
+ case 4:
+ widget = GTK_WIDGET (gtk_builder_get_object
(priv->builder, "user-entry"));
+ str = (char *) gtk_entry_get_text (GTK_ENTRY (widget));
+ if (str && strlen (str)) {
+ nm_setting_vpn_add_data_item (settings, "user",
str);
+ }
+ str = "psk";
+ break;
}
nm_setting_vpn_add_data_item (settings, "method", str);
@@ -366,16 +379,8 @@
active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
nm_setting_vpn_add_data_item (settings, "ipcomp", active ? "yes" :
"no");
-
- if (!nm_setting_set_secret_flags (NM_SETTING (settings),
- "password", NM_SETTING_SECRET_FLAG_AGENT_OWNED,
NULL))
- {
- fprintf(stderr, "no\n");
- }
- else
- {
- fprintf(stderr, "yes\n");
- }
+ nm_setting_set_secret_flags (NM_SETTING (settings), "password",
+
NM_SETTING_SECRET_FLAG_AGENT_OWNED, NULL);
nm_connection_add_setting (connection, NM_SETTING (settings));
return TRUE;
@@ -544,4 +549,3 @@
return NM_VPN_PLUGIN_UI_INTERFACE (g_object_new
(STRONGSWAN_TYPE_PLUGIN_UI, NULL));
}
-
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
