From d3026a6d331298003ccc6cd9d2e20dcb7fa9ae1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20=C4=8Cech?= <sleep_walker@gnu.org>
Date: Wed, 3 Jul 2019 13:31:54 +0200
Subject: [PATCH] respect NM_VPN_PLUGIN_DIR

Rebased by Maxim Cournoyer on 2022/08/23.

diff --git a/src/core/vpn/nm-vpn-manager.c b/src/core/vpn/nm-vpn-manager.c
index 6bf8edaee5..9bd960ba86 100644
--- a/src/core/vpn/nm-vpn-manager.c
+++ b/src/core/vpn/nm-vpn-manager.c
@@ -209,8 +209,9 @@ nm_vpn_manager_init(NMVpnManager *self)
     NMVpnManagerPrivate *priv = NM_VPN_MANAGER_GET_PRIVATE(self);
     GFile               *file;
     GSList              *infos, *info;
-    const char          *conf_dir_etc = _nm_vpn_plugin_info_get_default_dir_etc();
-    const char          *conf_dir_lib = _nm_vpn_plugin_info_get_default_dir_lib();
+    const char          *conf_dir_etc  = _nm_vpn_plugin_info_get_default_dir_etc();
+    const char          *conf_dir_lib  = _nm_vpn_plugin_info_get_default_dir_lib();
+    const char          *conf_dir_user = _nm_vpn_plugin_info_get_default_dir_user();
 
     /* Watch the VPN directory for changes */
     file              = g_file_new_for_path(conf_dir_lib);
@@ -229,6 +230,14 @@ nm_vpn_manager_init(NMVpnManager *self)
             g_signal_connect(priv->monitor_etc, "changed", G_CALLBACK(vpn_dir_changed), self);
     }
 
+    file              = g_file_new_for_path(conf_dir_user);
+    priv->monitor_etc = g_file_monitor_directory(file, G_FILE_MONITOR_NONE, NULL, NULL);
+    g_object_unref(file);
+    if (priv->monitor_etc) {
+        priv->monitor_id_etc =
+            g_signal_connect(priv->monitor_etc, "changed", G_CALLBACK(vpn_dir_changed), self);
+    }
+
     /* first read conf_dir_lib. The name files are not really user configuration, but
      * plugin configuration. Hence we expect ~newer~ plugins to install their files
      * in /usr/lib/NetworkManager. We want to prefer those files.
@@ -243,6 +252,11 @@ nm_vpn_manager_init(NMVpnManager *self)
         try_add_plugin(self, info->data);
     g_slist_free_full(infos, g_object_unref);
 
+    infos = _nm_vpn_plugin_info_list_load_dir(conf_dir_user, TRUE, 0, NULL, NULL);
+    for (info = infos; info; info = info->next)
+        try_add_plugin(self, info->data);
+    g_slist_free_full(infos, g_object_unref);
+
     priv->active_services = g_hash_table_new_full(nm_str_hash, g_str_equal, g_free, NULL);
 }
 
 class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/pam.scm?id=98de21a72148865219dba60ff333d00010c8874c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-05-08 16:30:50 +0200'>2020-05-08</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=dd0804c67e99914eecc471fdb92f4220425a1cbc'>services: Add descriptions.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/dbus.scm (polkit-service-type)[description]: New field.
* gnu/services/dict.scm (dicod-service-type)[description]: New field.
* gnu/services/dns.scm (knot-service-type)[description]: New field.
* gnu/services/networking.scm (dhcpd-service-type)[description]: New field.
* gnu/services/shepherd.scm (shepherd-root-service-type)[description]:
New field.
* gnu/services/xorg.scm (slim-service-type)[description]: New field.
(screen-locker-service-type)[description]: New field.
* gnu/system/pam.scm (pam-root-service-type)[description]: New field.
* gnu/system/shadow.scm (account-service-type)[description]: New field.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-09 12:11:36 +0200'>2019-05-09</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=af55ca481d9e6c1d1e06632f96d550b42f33210f'>system: pam: Add #:login-uid? parameter to 'unix-pam-service'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/system/pam.scm (unix-pam-service): Add #:login-uid? parameter.  In
then 'session' field, add "pam_loginuid.so" as required when LOGIN-UID?
is true.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-09-22 00:05:08 +0200'>2017-09-22</span></td><td><a href='/guix/commit/gnu/system/pam.scm?id=fbc31dc1247d3a494246e69f3cf28476af9eb9d6'>services: Move 'session-environment-service-type' to pam.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/base.scm (environment-variables-&gt;environment-file)
(session-environment-service-type)
(session-environment-service): Move to...
* gnu/system/pam.scm: ... here.
</span></span></td><td>Ludovic Courtès</td></tr>