mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
6bfab6796f
Due to a bug, we required VPN secrets to be prefixed with "vpn.secret." instead of "vpn.secrets.". This was a change in behavior with 1.12.0 release. Fix it, to restore the old behavior. For backward compatibility to the broken behavior, adjust parse_passwords() to treat accept that as well. https://bugzilla.redhat.com/show_bug.cgi?id=1628833 https://github.com/NetworkManager/NetworkManager/pull/201 Fixes:0601b5d725
(cherry picked from commit5815ae8c60
)
75 lines
2.9 KiB
C
75 lines
2.9 KiB
C
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of the
|
|
* License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Copyright 2013 - 2015 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef __NM_SECRET_AGENT_SIMPLE_H__
|
|
#define __NM_SECRET_AGENT_SIMPLE_H__
|
|
|
|
#include "nm-secret-agent-old.h"
|
|
|
|
#define NM_TYPE_SECRET_AGENT_SIMPLE (nm_secret_agent_simple_get_type ())
|
|
#define NM_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))
|
|
#define NM_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
|
|
#define NM_IS_SECRET_AGENT_SIMPLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_SECRET_AGENT_SIMPLE))
|
|
#define NM_IS_SECRET_AGENT_SIMPLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_SECRET_AGENT_SIMPLE))
|
|
#define NM_SECRET_AGENT_SIMPLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimpleClass))
|
|
|
|
/* Signals */
|
|
#define NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS "request-secrets"
|
|
|
|
typedef struct {
|
|
NMSecretAgentOld parent;
|
|
|
|
} NMSecretAgentSimple;
|
|
|
|
typedef struct {
|
|
NMSecretAgentOldClass parent;
|
|
|
|
} NMSecretAgentSimpleClass;
|
|
|
|
typedef enum {
|
|
NM_SECRET_AGENT_SECRET_TYPE_PROPERTY,
|
|
NM_SECRET_AGENT_SECRET_TYPE_SECRET,
|
|
NM_SECRET_AGENT_SECRET_TYPE_VPN_SECRET,
|
|
} NMSecretAgentSecretType;
|
|
|
|
typedef struct {
|
|
const NMSecretAgentSecretType secret_type;
|
|
const char *pretty_name;
|
|
const char *entry_id;
|
|
char *value;
|
|
const char *vpn_type;
|
|
gboolean is_secret;
|
|
} NMSecretAgentSimpleSecret;
|
|
|
|
#define NM_SECRET_AGENT_ENTRY_ID_PREFX_VPN_SECRETS "vpn.secrets."
|
|
|
|
#define NM_SECRET_AGENT_VPN_TYPE_OPENCONNECT NM_DBUS_INTERFACE".openconnect"
|
|
|
|
GType nm_secret_agent_simple_get_type (void);
|
|
|
|
NMSecretAgentOld *nm_secret_agent_simple_new (const char *name);
|
|
|
|
void nm_secret_agent_simple_response (NMSecretAgentSimple *self,
|
|
const char *request_id,
|
|
GPtrArray *secrets);
|
|
|
|
void nm_secret_agent_simple_enable (NMSecretAgentSimple *self,
|
|
const char *path);
|
|
|
|
#endif /* __NM_SECRET_AGENT_SIMPLE_H__ */
|