Attachment 889325 Details for Bug 1060460 – [PATCH] keyfile: don't put VPN 'user-name' property to vpn.data

[patch] [PATCH] keyfile: don't put VPN 'user-name' property to vpn.data

0001-keyfile-don-t-put-VPN-user-name-property-to-vpn.data.patch (text/plain), 1.18 KB, created by Jirka Klimes on 2014-04-24 15:24:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jirka Klimes

Created: 2014-04-24 15:24:24 UTC

Size: 1.18 KB

patch

obsolete

>From 6fd74aee5885121bb4e7d80729d09d9ad62a49cc Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
>Date: Thu, 24 Apr 2014 17:22:16 +0200
>Subject: [PATCH] keyfile: don't put VPN 'user-name' property to vpn.data on
> read (rh #1060460)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>https://bugzilla.redhat.com/show_bug.cgi?id=1060460
>
>Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>---
> src/settings/plugins/keyfile/reader.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
>index bfdd1e1..5ceb764 100644
>--- a/src/settings/plugins/keyfile/reader.c
>+++ b/src/settings/plugins/keyfile/reader.c
>@@ -610,7 +610,7 @@ read_hash_of_string (GKeyFile *file, NMSetting *setting, const char *key)
> 			continue;
> 
> 		if (NM_IS_SETTING_VPN (setting)) {
>-			if (strcmp (*iter, NM_SETTING_VPN_SERVICE_TYPE))
>+			if (strcmp (*iter, NM_SETTING_VPN_SERVICE_TYPE) && strcmp (*iter, NM_SETTING_VPN_USER_NAME))
> 				nm_setting_vpn_add_data_item (NM_SETTING_VPN (setting), *iter, value);
> 		}
> 		if (NM_IS_SETTING_BOND (setting)) {
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 1060460: 889325