From patchwork Sun Jul 7 19:28:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jelle Licht X-Patchwork-Id: 14497 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 48E97171C1; Sun, 7 Jul 2019 20:30:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D5A82171C5 for ; Sun, 7 Jul 2019 20:30:11 +0100 (BST) Received: from localhost ([::1]:36690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrT-0004HW-G1 for patchwork@mira.cbaines.net; Sun, 07 Jul 2019 15:30:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48846) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hkCrN-0004H5-VK for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hkCrM-0008Km-TV for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hkCrM-0008KU-OS for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hkCrM-0005RN-J3 for guix-patches@gnu.org; Sun, 07 Jul 2019 15:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#36542] [PATCH 3/6] services: network-manager: Clear default OpenVPN user. Resent-From: Jelle Licht Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jul 2019 19:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 36542 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 36542@debbugs.gnu.org Received: via spool by 36542-submit@debbugs.gnu.org id=B36542.156252775320761 (code B ref 36542); Sun, 07 Jul 2019 19:30:04 +0000 Received: (at 36542) by debbugs.gnu.org; 7 Jul 2019 19:29:13 +0000 Received: from localhost ([127.0.0.1]:57439 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqW-0005On-U0 for submit@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:13 -0400 Received: from mail1.fsfe.org ([217.69.89.151]:48232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hkCqV-0005Oc-38 for 36542@debbugs.gnu.org; Sun, 07 Jul 2019 15:29:11 -0400 From: Jelle Licht Date: Sun, 7 Jul 2019 21:28:45 +0200 Message-Id: <20190707192848.10049-3-jlicht@fsfe.org> In-Reply-To: <20190707192848.10049-1-jlicht@fsfe.org> References: <20190707192848.10049-1-jlicht@fsfe.org> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/services/networking.scm (network-manager-shepherd-service): Clear 'NM_OPENVPN_USER' and 'NM_OPENVPN_GROUP' in #:environment-variables. --- gnu/services/networking.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gnu/services/networking.scm b/gnu/services/networking.scm index 7423bac1aa..376b4ccc4e 100644 --- a/gnu/services/networking.scm +++ b/gnu/services/networking.scm @@ -938,7 +938,10 @@ and @command{wicd-curses} user interfaces." "--no-daemon") #:environment-variables (list (string-append "NM_VPN_PLUGIN_DIR=" #$vpn - "/lib/NetworkManager/VPN")))) + "/lib/NetworkManager/VPN") + ;; Override non-existent default users + "NM_OPENVPN_USER=" + "NM_OPENVPN_GROUP="))) (stop #~(make-kill-destructor)))))))) (define network-manager-service-type