[telepathy-sofiasip/master] fd.o #24561: flag password, extra-auth-password as secret

[Simon McVittie]

Also enhance write-mgr-file.c to put that in the .manager file.
---
 src/sip-connection-manager.c |    7 +++----
 src/write-mgr-file.c         |    5 +++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/sip-connection-manager.c b/src/sip-connection-manager.c
index 97abe41..5776465 100644
--- a/src/sip-connection-manager.c
+++ b/src/sip-connection-manager.c
@@ -131,9 +131,7 @@ static const TpCMParamSpec tpsip_params[] = {
       0, NULL, G_STRUCT_OFFSET (TpsipConnParams, auth_user) },
     /* Password */
     { "password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING,
-      0, /* according to the .manager file this is 
-      TP_CONN_MGR_PARAM_FLAG_REQUIRED | TP_CONN_MGR_PARAM_FLAG_REGISTER,
-      but in the code this is not the case */
+      TP_CONN_MGR_PARAM_FLAG_SECRET,
       NULL, G_STRUCT_OFFSET (TpsipConnParams, password) },
     /* Display name for self */
     { "alias", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING, 0, NULL,
@@ -190,7 +188,8 @@ static const TpCMParamSpec tpsip_params[] = {
     { "extra-auth-user", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING,
       0, NULL, G_STRUCT_OFFSET (TpsipConnParams, extra_auth_user) },
     { "extra-auth-password", DBUS_TYPE_STRING_AS_STRING, G_TYPE_STRING,
-      0, NULL, G_STRUCT_OFFSET (TpsipConnParams, extra_auth_password) },
+      TP_CONN_MGR_PARAM_FLAG_SECRET,
+      NULL, G_STRUCT_OFFSET (TpsipConnParams, extra_auth_password) },
     { NULL, NULL, 0, 0, NULL, 0 }
 };
 
diff --git a/src/write-mgr-file.c b/src/write-mgr-file.c
index 486f3af..e718d91 100644
--- a/src/write-mgr-file.c
+++ b/src/write-mgr-file.c
@@ -47,9 +47,10 @@ mgr_file_contents (const char *busname,
       for (row = protocol->parameters; row->name; row++)
         {
           gchar *param_name = g_strdup_printf("param-%s", row->name);
-          gchar *param_value = g_strdup_printf("%s%s%s", row->dtype,
+          gchar *param_value = g_strdup_printf("%s%s%s%s", row->dtype,
               (row->flags & TP_CONN_MGR_PARAM_FLAG_REQUIRED ? " required" : ""),
-              (row->flags & TP_CONN_MGR_PARAM_FLAG_REGISTER ? " register" : ""));
+              (row->flags & TP_CONN_MGR_PARAM_FLAG_REGISTER ? " register" : ""),
+              (row->flags & TP_CONN_MGR_PARAM_FLAG_SECRET ? " secret" : ""));
           g_key_file_set_string(f, section_name, param_name, param_value);
           g_free(param_value);
           g_free(param_name);
-- 
1.5.6.5