[gnome-remote-desktop] ctl: Use GKeyFile as fallback for TPM
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-remote-desktop] ctl: Use GKeyFile as fallback for TPM
- Date: Fri, 2 Sep 2022 18:49:39 +0000 (UTC)
commit 4d8fec7a155655f9d2df280882a78f5e0f03856f
Author: Alynx Zhou <alynx zhou gmail com>
Date: Mon Aug 8 16:28:09 2022 +0800
ctl: Use GKeyFile as fallback for TPM
src/grd-ctl.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/src/grd-ctl.c b/src/grd-ctl.c
index 02331fee..e07ed0f0 100644
--- a/src/grd-ctl.c
+++ b/src/grd-ctl.c
@@ -24,6 +24,7 @@
#include <glib/gi18n.h>
#include <stdio.h>
+#include "grd-credentials-file.h"
#include "grd-credentials-libsecret.h"
#include "grd-credentials-tpm.h"
@@ -101,6 +102,8 @@ static GrdCredentials *
create_credentials (CredentialsType credentials_type,
GError **error)
{
+ g_autoptr (GError) local_error = NULL;
+
switch (credentials_type)
{
case CREDENTIALS_TYPE_SCREEN_SHARE:
@@ -108,12 +111,19 @@ create_credentials (CredentialsType credentials_type,
case CREDENTIALS_TYPE_HEADLESS:
{
GrdCredentialsTpm *credentials_tpm;
+ GrdCredentialsFile *credentials_file;
+
+ credentials_tpm = grd_credentials_tpm_new (&local_error);
+ if (credentials_tpm)
+ return GRD_CREDENTIALS (credentials_tpm);
- credentials_tpm = grd_credentials_tpm_new (error);
- if (!credentials_tpm)
- return NULL;
+ g_warning ("Init TPM credentials failed because %s, using GKeyFile as fallback",
+ local_error->message);
+ credentials_file = grd_credentials_file_new (error);
+ if (credentials_file)
+ return GRD_CREDENTIALS (credentials_file);
- return GRD_CREDENTIALS (credentials_tpm);
+ return NULL;
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]