shared/nm-service-defines.h | 6 +++--- src/nm-openvpn-service.c | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/shared/nm-service-defines.h b/shared/nm-service-defines.h index 5055fc2..d177ac6 100644 --- a/shared/nm-service-defines.h +++ b/shared/nm-service-defines.h @@ -133,8 +133,8 @@ #define NM_OPENVPN_VERIFY_X509_NAME_TYPE_SUBJECT "subject" /* User name and group to run nm-openvpn-service under */ -#define NM_OPENVPN_USER "nm-openvpn" -#define NM_OPENVPN_GROUP "nm-openvpn" -#define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn/chroot" +#define NM_OPENVPN_USER "openvpn" +#define NM_OPENVPN_GROUP "openvpn" +#define NM_OPENVPN_CHROOT LOCALSTATEDIR "/lib/openvpn" #endif /* __NM_SERVICE_DEFINES_H__ */ diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c index 7fac66b..d613ee5 100644 --- a/src/nm-openvpn-service.c +++ b/src/nm-openvpn-service.c @@ -1289,6 +1289,7 @@ static gboolean check_chroot_dir_usability (const char *chdir, const char *user) { char *tmp_dir; + char *cache_dir; gboolean b1, b2; tmp_dir = g_strdup_printf ("%s/tmp", chdir); @@ -1297,8 +1298,11 @@ check_chroot_dir_usability (const char *chdir, const char *user) return FALSE; } - b1 = is_dir_writable (chdir, user); + cache_dir = g_strdup_printf ("%s/cache", chdir); + b1 = is_dir_writable (cache_dir, user); b2 = is_dir_writable (tmp_dir, user); + + g_free (cache_dir); g_free (tmp_dir); return b1 && b2; }