From e5194fd346d3736851c6ca03f391e919e249fd51 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 7 Oct 2014 08:46:36 +0200
Subject: [PATCH] libnm: hide API for generic handling of secrets

The functions nm_setting_clear_secrets(),
nm_setting_clear_secrets_with_flags(), and nm_setting_need_secrets()
are not used outside of libnm-core. Remove them from public API.

Signed-off-by: Thomas Haller <thaller@redhat.com>
---
 libnm-core/nm-connection.c      |  2 +-
 libnm-core/nm-setting-private.h |  2 ++
 libnm-core/nm-setting.c         | 26 ++++++++------------------
 libnm-core/nm-setting.h         |  8 --------
 libnm/libnm.ver                 |  3 ---
 5 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 23e9f2159c..1e0cdbf934 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -1104,7 +1104,7 @@ nm_connection_need_secrets (NMConnection *connection,
 		GPtrArray *secrets;
 
 		setting = NM_SETTING (iter->data);
-		secrets = nm_setting_need_secrets (setting);
+		secrets = _nm_setting_need_secrets (setting);
 		if (secrets) {
 			if (hints)
 				*hints = secrets;
diff --git a/libnm-core/nm-setting-private.h b/libnm-core/nm-setting-private.h
index f277992481..9f0c51a983 100644
--- a/libnm-core/nm-setting-private.h
+++ b/libnm-core/nm-setting-private.h
@@ -158,4 +158,6 @@ void _nm_setting_class_transform_property (NMSettingClass *setting_class,
                                            NMSettingPropertyTransformToFunc to_dbus,
                                            NMSettingPropertyTransformFromFunc from_dbus);
 
+GPtrArray  *_nm_setting_need_secrets (NMSetting *setting);
+
 #endif  /* NM_SETTING_PRIVATE_H */
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 3de3309018..ede4635a38 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -1287,19 +1287,15 @@ nm_setting_enumerate_values (NMSetting *setting,
 }
 
 /**
- * nm_setting_clear_secrets:
+ * _nm_setting_clear_secrets:
  * @setting: the #NMSetting
  *
  * Resets and clears any secrets in the setting.  Secrets should be added to the
  * setting only when needed, and cleared immediately after use to prevent
  * leakage of information.
+ *
+ * Returns: %TRUE if the setting changed at all
  **/
-void
-nm_setting_clear_secrets (NMSetting *setting)
-{
-	_nm_setting_clear_secrets (setting);
-}
-
 gboolean
 _nm_setting_clear_secrets (NMSetting *setting)
 {
@@ -1366,22 +1362,16 @@ clear_secrets_with_flags (NMSetting *setting,
 }
 
 /**
- * nm_setting_clear_secrets_with_flags:
+ * _nm_setting_clear_secrets_with_flags:
  * @setting: the #NMSetting
  * @func: (scope call): function to be called to determine whether a
  *     specific secret should be cleared or not
  * @user_data: caller-supplied data passed to @func
  *
  * Clears and frees secrets determined by @func.
+ *
+ * Returns: %TRUE if the setting changed at all
  **/
-void
-nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                     NMSettingClearSecretsWithFlagsFn func,
-                                     gpointer user_data)
-{
-	_nm_setting_clear_secrets_with_flags (setting, func, user_data);
-}
-
 gboolean
 _nm_setting_clear_secrets_with_flags (NMSetting *setting,
                                       NMSettingClearSecretsWithFlagsFn func,
@@ -1411,7 +1401,7 @@ _nm_setting_clear_secrets_with_flags (NMSetting *setting,
 }
 
 /**
- * nm_setting_need_secrets:
+ * _nm_setting_need_secrets:
  * @setting: the #NMSetting
  *
  * Returns an array of property names for each secret which may be required
@@ -1425,7 +1415,7 @@ _nm_setting_clear_secrets_with_flags (NMSetting *setting,
  * free the elements.
  **/
 GPtrArray *
-nm_setting_need_secrets (NMSetting *setting)
+_nm_setting_need_secrets (NMSetting *setting)
 {
 	GPtrArray *secrets = NULL;
 
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h
index 5ed3e6b4f7..bf8dd23362 100644
--- a/libnm-core/nm-setting.h
+++ b/libnm-core/nm-setting.h
@@ -269,14 +269,6 @@ void        nm_setting_enumerate_values (NMSetting *setting,
 char       *nm_setting_to_string      (NMSetting *setting);
 
 /* Secrets */
-void        nm_setting_clear_secrets  (NMSetting *setting);
-
-void        nm_setting_clear_secrets_with_flags (NMSetting *setting,
-                                                 NMSettingClearSecretsWithFlagsFn func,
-                                                 gpointer user_data);
-
-GPtrArray  *nm_setting_need_secrets   (NMSetting *setting);
-
 gboolean    nm_setting_get_secret_flags (NMSetting *setting,
                                          const char *secret_name,
                                          NMSettingSecretFlags *out_flags,
diff --git a/libnm/libnm.ver b/libnm/libnm.ver
index ca8283abb4..e0c4795f9e 100644
--- a/libnm/libnm.ver
+++ b/libnm/libnm.ver
@@ -521,8 +521,6 @@ global:
 	nm_setting_cdma_get_type;
 	nm_setting_cdma_get_username;
 	nm_setting_cdma_new;
-	nm_setting_clear_secrets;
-	nm_setting_clear_secrets_with_flags;
 	nm_setting_compare;
 	nm_setting_compare_flags_get_type;
 	nm_setting_connection_add_permission;
@@ -689,7 +687,6 @@ global:
 	nm_setting_ip6_config_remove_route_by_value;
 	nm_setting_lookup_type;
 	nm_setting_lookup_type_by_quark;
-	nm_setting_need_secrets;
 	nm_setting_olpc_mesh_error_get_type;
 	nm_setting_olpc_mesh_error_quark;
 	nm_setting_olpc_mesh_get_channel;