Commit bd86fbb9 authored by Michael Biebl's avatar Michael Biebl

Imported Upstream version 1.1.90

parent 588d3407
Tim Niemueller <tim@niemueller.de>
Dan Williams <dcbw@redhat.com>
David Zeuthen <davidz@redhat.com>
Huzaifa S. Sidhpurwala <huzaifas@redhat.com>
Federico Mena Quintero <federico@gnome.org>
Dan Winship <danw@gnome.org>
Thomas Haller <thaller@redhat.com>
Lubomir Rintel <lkundrak@v3.sk>
Jiří Klimeš <jklimes@redhat.com>
Dan Williams <dcbw@redhat.com>
......@@ -9,27 +9,18 @@ endif
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openvpn-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
desktopfile = nm-openvpn.desktop.in
iconfile = gnome-mime-application-x-openvpn-settings.png
if WITH_GNOME
# FIXME: uncomment when nmce gets --import support
#desktopdir = $(datadir)/applications
#desktop_in_files = $(desktopfile)
#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
#@INTLTOOL_DESKTOP_RULE@
#icondir = $(datadir)/icons/hicolor/48x48/apps
#icon_DATA = $(iconfile)
if WITH_LIBNM_GLIB
nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnoldservice_DATA = nm-openvpn-service.name
endif
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
$< >$@
$^ >$@
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
......@@ -37,14 +28,12 @@ DISTCHECK_CONFIGURE_FLAGS = \
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
$(desktopfile) \
$(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
nm-test-helpers.h
CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
CLEANFILES = $(nmvpnservice_DATA) *~
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
ACLOCAL_AMFLAGS = -I m4
......@@ -161,8 +161,10 @@ am__uninstall_files_from_dir = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(dbusservicedir)" \
"$(DESTDIR)$(nmvpnoldservicedir)" \
"$(DESTDIR)$(nmvpnservicedir)"
DATA = $(dbusservice_DATA) $(nmvpnservice_DATA)
DATA = $(dbusservice_DATA) $(nmvpnoldservice_DATA) \
$(nmvpnservice_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
......@@ -232,8 +234,8 @@ am__relativize = \
done; \
reldir="$$dir2"
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.bz2
DIST_TARGETS = dist-bzip2
DIST_ARCHIVES = $(distdir).tar.xz
DIST_TARGETS = dist-xz
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
......@@ -257,11 +259,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
......@@ -296,6 +295,14 @@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNMA_CFLAGS = @LIBNMA_CFLAGS@
LIBNMA_LIBS = @LIBNMA_LIBS@
LIBNM_CFLAGS = @LIBNM_CFLAGS@
LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
LIBNM_GTK_CFLAGS = @LIBNM_GTK_CFLAGS@
LIBNM_GTK_LIBS = @LIBNM_GTK_LIBS@
LIBNM_LIBS = @LIBNM_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@
......@@ -315,10 +322,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NMGTK_CFLAGS = @NMGTK_CFLAGS@
NMGTK_LIBS = @NMGTK_LIBS@
NM_CFLAGS = @NM_CFLAGS@
NM_LIBS = @NM_LIBS@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
......@@ -404,24 +408,22 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = common src $(am__append_1)
dbusservicedir = $(sysconfdir)/dbus-1/system.d
dbusservice_DATA = nm-openvpn-service.conf
nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
desktopfile = nm-openvpn.desktop.in
iconfile = gnome-mime-application-x-openvpn-settings.png
@WITH_LIBNM_GLIB_TRUE@nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN
@WITH_LIBNM_GLIB_TRUE@nmvpnoldservice_DATA = nm-openvpn-service.name
DISTCHECK_CONFIGURE_FLAGS = \
--with-tests=yes \
--enable-more-warnings=yes
EXTRA_DIST = nm-openvpn-service.name.in \
$(dbusservice_DATA) \
$(desktopfile) \
$(iconfile) \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
nm-test-helpers.h
CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~
CLEANFILES = $(nmvpnservice_DATA) *~
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
......@@ -505,6 +507,27 @@ uninstall-dbusserviceDATA:
@list='$(dbusservice_DATA)'; test -n "$(dbusservicedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(dbusservicedir)'; $(am__uninstall_files_from_dir)
install-nmvpnoldserviceDATA: $(nmvpnoldservice_DATA)
@$(NORMAL_INSTALL)
@list='$(nmvpnoldservice_DATA)'; test -n "$(nmvpnoldservicedir)" || list=; \
if test -n "$$list"; then \
echo " $(MKDIR_P) '$(DESTDIR)$(nmvpnoldservicedir)'"; \
$(MKDIR_P) "$(DESTDIR)$(nmvpnoldservicedir)" || exit 1; \
fi; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(nmvpnoldservicedir)'"; \
$(INSTALL_DATA) $$files "$(DESTDIR)$(nmvpnoldservicedir)" || exit $$?; \
done
uninstall-nmvpnoldserviceDATA:
@$(NORMAL_UNINSTALL)
@list='$(nmvpnoldservice_DATA)'; test -n "$(nmvpnoldservicedir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
dir='$(DESTDIR)$(nmvpnoldservicedir)'; $(am__uninstall_files_from_dir)
install-nmvpnserviceDATA: $(nmvpnservice_DATA)
@$(NORMAL_INSTALL)
@list='$(nmvpnservice_DATA)'; test -n "$(nmvpnservicedir)" || list=; \
......@@ -700,6 +723,7 @@ distdir: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
......@@ -707,7 +731,6 @@ dist-bzip2: distdir
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
......@@ -825,7 +848,7 @@ check: check-recursive
all-am: Makefile $(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
for dir in "$(DESTDIR)$(dbusservicedir)" "$(DESTDIR)$(nmvpnoldservicedir)" "$(DESTDIR)$(nmvpnservicedir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
......@@ -882,7 +905,8 @@ info: info-recursive
info-am:
install-data-am: install-dbusserviceDATA install-nmvpnserviceDATA
install-data-am: install-dbusserviceDATA install-nmvpnoldserviceDATA \
install-nmvpnserviceDATA
install-dvi: install-dvi-recursive
......@@ -928,7 +952,8 @@ ps: ps-recursive
ps-am:
uninstall-am: uninstall-dbusserviceDATA uninstall-nmvpnserviceDATA
uninstall-am: uninstall-dbusserviceDATA uninstall-nmvpnoldserviceDATA \
uninstall-nmvpnserviceDATA
.MAKE: $(am__recursive_targets) all install-am install-strip
......@@ -943,30 +968,22 @@ uninstall-am: uninstall-dbusserviceDATA uninstall-nmvpnserviceDATA
install-dbusserviceDATA install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \
install-info install-info-am install-man \
install-nmvpnserviceDATA install-pdf install-pdf-am install-ps \
install-ps-am install-strip installcheck installcheck-am \
installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am uninstall-dbusserviceDATA \
install-nmvpnoldserviceDATA install-nmvpnserviceDATA \
install-pdf install-pdf-am install-ps install-ps-am \
install-strip installcheck installcheck-am installdirs \
installdirs-am maintainer-clean maintainer-clean-generic \
mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
ps ps-am tags tags-am uninstall uninstall-am \
uninstall-dbusserviceDATA uninstall-nmvpnoldserviceDATA \
uninstall-nmvpnserviceDATA
.PRECIOUS: Makefile
# FIXME: uncomment when nmce gets --import support
#desktopdir = $(datadir)/applications
#desktop_in_files = $(desktopfile)
#desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
#@INTLTOOL_DESKTOP_RULE@
#icondir = $(datadir)/icons/hicolor/48x48/apps
#icon_DATA = $(iconfile)
nm-openvpn-service.name: $(srcdir)/nm-openvpn-service.name.in
sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
-e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \
$< >$@
$^ >$@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
=======================================================
NetworkManagerg-openvpn-1.0.8
Overview of changes since NetworkManagerg-openvpn-1.0.6
NetworkManagerg-openvpn-1.2
Overview of changes since network-manager-openvpn-1.0
=======================================================
This is a new stable release of network-manager-openvpn. Notable changes include:
* Ported to libnm, libnma and GDBus
* Support multiple concurrent OpenVPN connections
* Various import/export fixes
* Add support for --ping option to backend
* Translation updates
The following features were backported to 1.0.x releases from 1.0.0 to 1.0.8
are also present in NetworkManager-openvpn-1.2:
* Fix operations in IPv6-only configurations
* Add support for importing configurations with inline certificates
* Do not require password if user chose not to store it
* Cosmetic UI fixes
* Updated Italian, Portuguese, Swedish, Czech, Brazilian, Lithuanian, German,
Indonesian, Hungarian and Polish polish translations
=======================================================
network-manager-openvpn-1.0.6
Overview of changes since network-manager-openvpn-1.0.2
=======================================================
* Enhanced the GUI to support agent-owned and always-ask passwords
* Updated Polish, Czech and Hungarian translations
* Support running unprivileged
=======================================================
network-manager-openvpn-1.0.2
Overview of changes since network-manager-openvpn-1.0.0
=======================================================
* Default to disabling periodic renegotioation. This avoids renegotiating
unnecessarily if the server doesn't specify a renegotiation timeout,
improving usability for OTP users
* Build fixes
* Updated translations
=======================================================
......
......@@ -463,13 +463,13 @@ dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
dnl This file can can be used in projects which are not available under
dnl This file can be used in projects which are not available under
dnl the GNU General Public License or the GNU Library General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
dnl by the GNU Library General Public License, and the rest of the GNU
dnl gettext package package is covered by the GNU General Public License.
dnl gettext package is covered by the GNU General Public License.
dnl They are *not* in the public domain.
dnl Authors:
......
......@@ -2,28 +2,23 @@ libexec_PROGRAMS = nm-openvpn-auth-dialog
nm_openvpn_auth_dialog_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
$(NMGTK_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS) \
$(LIBSECRET_CFLAGS) \
-I$(top_srcdir)/
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
nm_openvpn_auth_dialog_SOURCES = \
main.c
nm_openvpn_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(NM_LIBS) \
$(NMGTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS) \
$(LIBSECRET_LIBS) \
$(top_builddir)/common/libnm-openvpn-common.la
$(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
CLEANFILES = *~
......@@ -112,7 +112,7 @@ am__DEPENDENCIES_1 =
nm_openvpn_auth_dialog_DEPENDENCIES = $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) \
$(top_builddir)/common/libnm-openvpn-common.la
$(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
......@@ -198,11 +198,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
......@@ -237,6 +234,14 @@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNMA_CFLAGS = @LIBNMA_CFLAGS@
LIBNMA_LIBS = @LIBNMA_LIBS@
LIBNM_CFLAGS = @LIBNM_CFLAGS@
LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
LIBNM_GTK_CFLAGS = @LIBNM_GTK_CFLAGS@
LIBNM_GTK_LIBS = @LIBNM_GTK_LIBS@
LIBNM_LIBS = @LIBNM_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@
......@@ -256,10 +261,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NMGTK_CFLAGS = @NMGTK_CFLAGS@
NMGTK_LIBS = @NMGTK_LIBS@
NM_CFLAGS = @NM_CFLAGS@
NM_LIBS = @NM_LIBS@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
......@@ -343,21 +345,24 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
nm_openvpn_auth_dialog_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GTK_CFLAGS) \
$(NM_CFLAGS) \
$(NMGTK_CFLAGS) \
$(GTK_CFLAGS) \
$(LIBNM_CFLAGS) \
$(LIBNMA_CFLAGS) \
$(LIBSECRET_CFLAGS) \
-I$(top_srcdir)/
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
nm_openvpn_auth_dialog_SOURCES = \
main.c
nm_openvpn_auth_dialog_LDADD = \
$(GTK_LIBS) \
$(NM_LIBS) \
$(NMGTK_LIBS) \
$(LIBNM_LIBS) \
$(LIBNMA_LIBS) \
$(LIBSECRET_LIBS) \
$(top_builddir)/common/libnm-openvpn-common.la
$(top_builddir)/common/libnm-vpn-plugin-openvpn-common.la
CLEANFILES = *~
all: all-am
......@@ -373,9 +378,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign auth-dialog/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu auth-dialog/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign auth-dialog/Makefile
$(AUTOMAKE) --gnu auth-dialog/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -709,14 +714,6 @@ uninstall-am: uninstall-libexecPROGRAMS
.PRECIOUS: Makefile
-DICONDIR=\""$(datadir)/pixmaps"\" \
-DUIDIR=\""$(uidir)"\" \
-DBINDIR=\""$(bindir)"\" \
-DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
-DVERSION=\"$(VERSION)\"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -34,13 +34,13 @@
#define SECRET_API_SUBJECT_TO_CHANGE
#include <libsecret/secret.h>
#include <nm-setting-vpn.h>
#include <nm-setting-connection.h>
#include <nm-vpn-plugin-utils.h>
#include <nm-vpn-password-dialog.h>
#include "common/utils.h"
#include "src/nm-openvpn-service.h"
#include <NetworkManager.h>
#include <nm-vpn-service-plugin.h>
#include <nma-vpn-password-dialog.h>
#include "../common/utils.h"
#include "../src/nm-openvpn-service-defines.h"
#define KEYRING_UUID_TAG "connection-uuid"
#define KEYRING_SN_TAG "setting-name"
......@@ -346,7 +346,7 @@ get_existing_passwords (GHashTable *vpn_data,
g_return_if_fail (out_certpass != NULL);
g_return_if_fail (out_proxypass != NULL);
nm_vpn_plugin_utils_get_secret_flags (vpn_data, NM_OPENVPN_KEY_PASSWORD, &pw_flags);
nm_vpn_service_plugin_get_secret_flags (vpn_data, NM_OPENVPN_KEY_PASSWORD, &pw_flags);
if (need_password) {
if (!(pw_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
*out_password = g_strdup (g_hash_table_lookup (existing_secrets, NM_OPENVPN_KEY_PASSWORD));
......@@ -355,7 +355,7 @@ get_existing_passwords (GHashTable *vpn_data,
}
}
nm_vpn_plugin_utils_get_secret_flags (vpn_data, NM_OPENVPN_KEY_CERTPASS, &cp_flags);
nm_vpn_service_plugin_get_secret_flags (vpn_data, NM_OPENVPN_KEY_CERTPASS, &cp_flags);
if (need_certpass) {
if (!(cp_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
*out_certpass = g_strdup (g_hash_table_lookup (existing_secrets, NM_OPENVPN_KEY_CERTPASS));
......@@ -364,7 +364,7 @@ get_existing_passwords (GHashTable *vpn_data,
}
}
nm_vpn_plugin_utils_get_secret_flags (vpn_data, NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD, &proxy_flags);
nm_vpn_service_plugin_get_secret_flags (vpn_data, NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD, &proxy_flags);
if (need_proxypass) {
if (!(proxy_flags & NM_SETTING_SECRET_FLAG_NOT_SAVED)) {
*out_proxypass = g_strdup (g_hash_table_lookup (existing_secrets, NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD));
......@@ -409,7 +409,7 @@ get_passwords_required (GHashTable *data,
if (!strcmp (ctype, NM_OPENVPN_CONTYPE_TLS) || !strcmp (ctype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)) {
/* Normal user password */
flags = NM_SETTING_SECRET_FLAG_NONE;
nm_vpn_plugin_utils_get_secret_flags (data, NM_OPENVPN_KEY_PASSWORD, &flags);
nm_vpn_service_plugin_get_secret_flags (data, NM_OPENVPN_KEY_PASSWORD, &flags);
if ( !strcmp (ctype, NM_OPENVPN_CONTYPE_PASSWORD_TLS)
&& !(flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
*out_need_password = TRUE;
......@@ -420,7 +420,7 @@ get_passwords_required (GHashTable *data,
*out_need_certpass = is_encrypted (val);
} else if (!strcmp (ctype, NM_OPENVPN_CONTYPE_PASSWORD)) {
flags = NM_SETTING_SECRET_FLAG_NONE;
nm_vpn_plugin_utils_get_secret_flags (data, NM_OPENVPN_KEY_PASSWORD, &flags);
nm_vpn_service_plugin_get_secret_flags (data, NM_OPENVPN_KEY_PASSWORD, &flags);
if (!(flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
*out_need_password = TRUE;
}
......@@ -428,7 +428,7 @@ get_passwords_required (GHashTable *data,
val = g_hash_table_lookup (data, NM_OPENVPN_KEY_PROXY_SERVER);
if (val && val[0]) {
flags = NM_SETTING_SECRET_FLAG_NONE;
nm_vpn_plugin_utils_get_secret_flags (data, NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD, &flags);
nm_vpn_service_plugin_get_secret_flags (data, NM_OPENVPN_KEY_HTTP_PROXY_PASSWORD, &flags);
if (!(flags & NM_SETTING_SECRET_FLAG_NOT_REQUIRED))
*out_need_proxypass = TRUE;
}
......@@ -492,12 +492,12 @@ main (int argc, char *argv[])
return EXIT_FAILURE;
}
if (strcmp (vpn_service, NM_DBUS_SERVICE_OPENVPN) != 0) {
fprintf (stderr, "This dialog only works with the '%s' service\n", NM_DBUS_SERVICE_OPENVPN);
if (strcmp (vpn_service, NM_VPN_SERVICE_TYPE_OPENVPN) != 0) {
fprintf (stderr, "This dialog only works with the '%s' service\n", NM_VPN_SERVICE_TYPE_OPENVPN);
return EXIT_FAILURE;
}
if (!nm_vpn_plugin_utils_read_vpn_details (0, &data, &secrets)) {
if (!nm_vpn_service_plugin_read_vpn_details (0, &data, &secrets)) {
fprintf (stderr, "Failed to read '%s' (%s) data and secrets from stdin.\n",
vpn_name, vpn_uuid);
return 1;
......
noinst_LTLIBRARIES=libnm-openvpn-common.la
noinst_LTLIBRARIES=libnm-vpn-plugin-openvpn-common.la
if WITH_LIBNM_GLIB
noinst_LTLIBRARIES += libnm-openvpn-common.la
endif
libnm_vpn_plugin_openvpn_common_la_CPPFLAGS = \
$(LIBNM_CFLAGS) \
-I$(top_srcdir)/src/
libnm_openvpn_common_la_CPPFLAGS = \
$(NM_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DNM_OPENVPN_OLD \
$(LIBNM_GLIB_CFLAGS) \
-I$(top_srcdir)/src/
libnm_openvpn_common_la_SOURCES= \
libnm_vpn_plugin_openvpn_common_la_SOURCES= \
utils.c \
utils.h \
nm-glib-compat.h
libnm_openvpn_common_la_SOURCES = \
$(libnm_vpn_plugin_openvpn_common_la_SOURCES)
libnm_vpn_plugin_openvpn_common_la_LIBADD = \
$(LIBNM_LIBS)
libnm_openvpn_common_la_LIBADD = \
$(NM_LIBS)
$(LIBNM_GLIB_LIBS)
EXTRA_DIST = nm-glib-compat.h
......@@ -88,6 +88,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
@WITH_LIBNM_GLIB_TRUE@am__append_1 = libnm-openvpn-common.la
subdir = common
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/compiler_warnings.m4 \
......@@ -105,13 +106,21 @@ CONFIG_CLEAN_VPATH_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
libnm_openvpn_common_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libnm_openvpn_common_la_OBJECTS = libnm_openvpn_common_la-utils.lo
am__objects_1 = libnm_openvpn_common_la-utils.lo
am_libnm_openvpn_common_la_OBJECTS = $(am__objects_1)
libnm_openvpn_common_la_OBJECTS = \
$(am_libnm_openvpn_common_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
@WITH_LIBNM_GLIB_TRUE@am_libnm_openvpn_common_la_rpath =
libnm_vpn_plugin_openvpn_common_la_DEPENDENCIES = \
$(am__DEPENDENCIES_1)
am_libnm_vpn_plugin_openvpn_common_la_OBJECTS = \
libnm_vpn_plugin_openvpn_common_la-utils.lo
libnm_vpn_plugin_openvpn_common_la_OBJECTS = \
$(am_libnm_vpn_plugin_openvpn_common_la_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false
......@@ -146,8 +155,10 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
SOURCES = $(libnm_openvpn_common_la_SOURCES)
DIST_SOURCES = $(libnm_openvpn_common_la_SOURCES)
SOURCES = $(libnm_openvpn_common_la_SOURCES) \
$(libnm_vpn_plugin_openvpn_common_la_SOURCES)
DIST_SOURCES = $(libnm_openvpn_common_la_SOURCES) \
$(libnm_vpn_plugin_openvpn_common_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
......@@ -193,11 +204,8 @@ CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_CFLAGS = @DBUS_CFLAGS@
DBUS_LIBS = @DBUS_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
......@@ -232,6 +240,14 @@ INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBNMA_CFLAGS = @LIBNMA_CFLAGS@
LIBNMA_LIBS = @LIBNMA_LIBS@
LIBNM_CFLAGS = @LIBNM_CFLAGS@
LIBNM_GLIB_CFLAGS = @LIBNM_GLIB_CFLAGS@
LIBNM_GLIB_LIBS = @LIBNM_GLIB_LIBS@
LIBNM_GTK_CFLAGS = @LIBNM_GTK_CFLAGS@
LIBNM_GTK_LIBS = @LIBNM_GTK_LIBS@
LIBNM_LIBS = @LIBNM_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBSECRET_CFLAGS = @LIBSECRET_CFLAGS@
......@@ -251,10 +267,7 @@ MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
NM = @NM@
NMEDIT = @NMEDIT@
NMGTK_CFLAGS = @NMGTK_CFLAGS@
NMGTK_LIBS = @NMGTK_LIBS@
NM_CFLAGS = @NM_CFLAGS@
NM_LIBS = @NM_LIBS@
NM_VPN_SERVICE_DIR = @NM_VPN_SERVICE_DIR@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OTOOL = @OTOOL@
......@@ -336,19 +349,30 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LTLIBRARIES = libnm-openvpn-common.la
noinst_LTLIBRARIES = libnm-vpn-plugin-openvpn-common.la \
$(am__append_1)
libnm_vpn_plugin_openvpn_common_la_CPPFLAGS = \
$(LIBNM_CFLAGS) \
-I$(top_srcdir)/src/
libnm_openvpn_common_la_CPPFLAGS = \
$(NM_CFLAGS) \
-DG_DISABLE_DEPRECATED \
-DNM_OPENVPN_OLD \
$(LIBNM_GLIB_CFLAGS) \
-I$(top_srcdir)/src/
libnm_openvpn_common_la_SOURCES = \
libnm_vpn_plugin_openvpn_common_la_SOURCES = \
utils.c \
utils.h \
nm-glib-compat.h
libnm_openvpn_common_la_SOURCES = \
$(libnm_vpn_plugin_openvpn_common_la_SOURCES)
libnm_vpn_plugin_openvpn_common_la_LIBADD = \
$(LIBNM_LIBS)
libnm_openvpn_common_la_LIBADD = \
$(NM_LIBS)
$(LIBNM_GLIB_LIBS)
EXTRA_DIST = nm-glib-compat.h
all: all-am
......@@ -364,9 +388,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign common/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign common/Makefile
$(AUTOMAKE) --gnu common/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -397,7 +421,10 @@ clean-noinstLTLIBRARIES:
}
libnm-openvpn-common.la: $(libnm_openvpn_common_la_OBJECTS) $(libnm_openvpn_common_la_DEPENDENCIES) $(EXTRA_libnm_openvpn_common_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libnm_openvpn_common_la_OBJECTS) $(libnm_openvpn_common_la_LIBADD) $(LIBS)
$(AM_V_CCLD)$(LINK) $(am_libnm_openvpn_common_la_rpath) $(libnm_openvpn_common_la_OBJECTS) $(libnm_openvpn_common_la_LIBADD) $(LIBS)
libnm-vpn-plugin-openvpn-common.la: $(libnm_vpn_plugin_openvpn_common_la_OBJECTS) $(libnm_vpn_plugin_openvpn_common_la_DEPENDENCIES) $(EXTRA_libnm_vpn_plugin_openvpn_common_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) $(libnm_vpn_plugin_openvpn_common_la_OBJECTS) $(libnm_vpn_plugin_openvpn_common_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
......@@ -406,6 +433,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_openvpn_common_la-utils.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnm_vpn_plugin_openvpn_common_la-utils.Plo@am__quote@
<