diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-22 16:51:45 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2022-02-22 16:51:45 -0500 |
| commit | 9d53567404b8f256e36619ee9345cef6dfb59f76 (patch) | |
| tree | 8c760223d10c83710d45d5c2819f39f121e3d9f0 /src/nm-priv-helper | |
| parent | da4d2b990df5b0119d1dffd76ff68141517d6136 (diff) | |
| parent | 2f94dba7385fd0e0ef19a06eb4a2fcf6c43d7946 (diff) | |
Merge tag 'upstream/1.35.91' into ubuntu/master
Upstream version 1.35.91
Diffstat (limited to 'src/nm-priv-helper')
| -rw-r--r-- | src/nm-priv-helper/meson.build | 2 | ||||
| -rw-r--r-- | src/nm-priv-helper/nm-priv-helper.conf | 8 | ||||
| -rw-r--r-- | src/nm-priv-helper/org.freedesktop.nm-priv-helper.service.in | 5 | ||||
| -rw-r--r-- | src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in | 5 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/nm-priv-helper/meson.build b/src/nm-priv-helper/meson.build index e9f8a7c3..6141e0e2 100644 --- a/src/nm-priv-helper/meson.build +++ b/src/nm-priv-helper/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later configure_file( - input: 'org.freedesktop.nm-priv-helper.service.in', + input: 'org.freedesktop.nm_priv_helper.service.in', output: '@BASENAME@', install_dir: dbus_system_bus_services_dir, configuration: data_conf, diff --git a/src/nm-priv-helper/nm-priv-helper.conf b/src/nm-priv-helper/nm-priv-helper.conf index c56b2007..c0d04617 100644 --- a/src/nm-priv-helper/nm-priv-helper.conf +++ b/src/nm-priv-helper/nm-priv-helper.conf @@ -3,11 +3,11 @@ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> <busconfig> <policy user="root"> - <allow own="org.freedesktop.nm.priv-helper"/> - <allow send_destination="org.freedesktop.nm.priv-helper"/> + <allow own="org.freedesktop.nm_priv_helper"/> + <allow send_destination="org.freedesktop.nm_priv_helper"/> </policy> <policy context="default"> - <deny own="org.freedesktop.nm.priv-helper"/> - <deny send_destination="org.freedesktop.nm.priv-helper"/> + <deny own="org.freedesktop.nm_priv_helper"/> + <deny send_destination="org.freedesktop.nm_priv_helper"/> </policy> </busconfig> diff --git a/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service.in b/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service.in deleted file mode 100644 index 0ca30669..00000000 --- a/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service.in +++ /dev/null @@ -1,5 +0,0 @@ -[D-BUS Service] -Name=org.freedesktop.nm-priv-helper -Exec=@libexecdir@/nm-priv-helper -User=root -SystemdService=dbus-org.freedesktop.nm-priv-helper.service diff --git a/src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in b/src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in new file mode 100644 index 00000000..9e86a635 --- /dev/null +++ b/src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in @@ -0,0 +1,5 @@ +[D-BUS Service] +Name=org.freedesktop.nm_priv_helper +Exec=@libexecdir@/nm-priv-helper +User=root +SystemdService=nm-priv-helper.service |