From b04d9e46756f373e7d33cd0d804e26f4beaf1bee Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Wed, 9 Feb 2011 00:52:47 -0600
Subject: [PATCH] libnm-util: assume VPN connections need secrets

Because most of the time they will.  They need special handling all
around anyway because only the VPN plugin itself knows whether the
connection needs secrets.
---
 libnm-util/nm-setting-vpn.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 512c2b4207..d249e03016 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -399,6 +399,13 @@ set_secret_flags (NMSetting *setting,
 	return TRUE;
 }
 
+static GPtrArray *
+need_secrets (NMSetting *setting)
+{
+	/* Assume that VPN connections need secrets since they almost always will */
+	return g_ptr_array_sized_new (1);
+}
+
 static void
 destroy_one_secret (gpointer data)
 {
@@ -517,6 +524,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
 	parent_class->update_one_secret = update_one_secret;
 	parent_class->get_secret_flags  = get_secret_flags;
 	parent_class->set_secret_flags  = set_secret_flags;
+	parent_class->need_secrets      = need_secrets;
 
 	/* Properties */
 	/**