From de2ce68a9f8a89c1a84d98d56d6a6983a82e55c5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 6 Jul 2016 13:50:15 +0200 Subject: [PATCH] shared: add NM_VPN_PLUGIN_CONFIG_PROXY_PAC to "nm-vpn-plugin-macros.h" for VPN plugins Soon we will add proxy support where VPN plugins set a property NM_VPN_PLUGIN_CONFIG_PROXY_PAC. All a VPN plugin needs to make use of this new setting is the NM_VPN_PLUGIN_CONFIG_PROXY_PAC define. We don't want that older plugins (still compatible with libnm 1.2 API) require a new API only for this define. Define it instead in "shared/nm-utils/nm-vpn-plugin-macros.h" as fallback. https://mail.gnome.org/archives/networkmanager-list/2016-June/msg00154.html --- shared/nm-utils/nm-vpn-plugin-macros.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shared/nm-utils/nm-vpn-plugin-macros.h b/shared/nm-utils/nm-vpn-plugin-macros.h index c85ef17a7..06f5b2866 100644 --- a/shared/nm-utils/nm-vpn-plugin-macros.h +++ b/shared/nm-utils/nm-vpn-plugin-macros.h @@ -43,6 +43,10 @@ nm_utils_syslog_to_str (int syslog_level) /* possibly missing defines from newer libnm API. */ +#ifndef NM_VPN_PLUGIN_CONFIG_PROXY_PAC +#define NM_VPN_PLUGIN_CONFIG_PROXY_PAC "pac" +#endif + #ifndef NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES #define NM_VPN_PLUGIN_IP4_CONFIG_PRESERVE_ROUTES "preserve-routes" #endif