priv-helper: fix D-Bus patch to not contain forbidden character '-'

"-" is not allowed as D-Bus path and interface name, and discouraged as
bus name. This cause nm-priv-helper to crash, because GDBus asserts the
the object path is valid.

Replace the '-' with '_'. This way, it's consistent with
"nm_dispatcher".

Fixes: d68ab6b8f02a ('nm-sudo: rename to nm-priv-helper')

9 files changed, 22 insertions, 21 deletions

diff --git a/.gitignore b/.gitignore
index d4e172c0c6..34d5af178f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,7 @@ test-*.trs
 /src/nm-dispatcher/tests/test-dispatcher-envp
 
 /src/nm-priv-helper/nm-priv-helper
-/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service
+/src/nm-priv-helper/org.freedesktop.nm_priv_helper.service
 
 /data/NetworkManager.service
 /data/NetworkManager-wait-online.service
@@ -437,6 +437,7 @@ test-*.trs
 /src/ndisc/tests/test-ndisc-linux
 /src/nm-daemon-helper/nm-daemon-helper
 /src/nm-iface-helper
+/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service
 /src/nm-sudo/nm-sudo
 /src/nm-sudo/org.freedesktop.nm.sudo.service
 /src/platform/tests/dump
diff --git a/Makefile.am b/Makefile.am
index ed4ffb0455..bc8dc4cf27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4595,19 +4595,19 @@ src_nm_priv_helper_nm_priv_helper_LDADD = \
 	$(GLIB_LIBS) \
 	$(NULL)
 
-src/nm-priv-helper/org.freedesktop.nm-priv-helper.service: $(srcdir)/src/nm-priv-helper/org.freedesktop.nm-priv-helper.service.in
+src/nm-priv-helper/org.freedesktop.nm_priv_helper.service: $(srcdir)/src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in
 	@sed \
 	-e 's|@libexecdir[@]|$(libexecdir)|g' \
 	$< >$@
 
-dbusactivation_DATA += src/nm-priv-helper/org.freedesktop.nm-priv-helper.service
-CLEANFILES += src/nm-priv-helper/org.freedesktop.nm-priv-helper.service
+dbusactivation_DATA += src/nm-priv-helper/org.freedesktop.nm_priv_helper.service
+CLEANFILES += src/nm-priv-helper/org.freedesktop.nm_priv_helper.service
 
 dbusservice_DATA += src/nm-priv-helper/nm-priv-helper.conf
 
 EXTRA_DIST += \
 	src/nm-priv-helper/nm-priv-helper.conf \
-	src/nm-priv-helper/org.freedesktop.nm-priv-helper.service.in \
+	src/nm-priv-helper/org.freedesktop.nm_priv_helper.service.in \
 	src/nm-priv-helper/meson.build \
 	$(NULL)
 
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 602b2213ae..83d1f6deb0 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -1047,7 +1047,7 @@ fi
 %dir %{_localstatedir}/lib/NetworkManager
 %dir %{_sysconfdir}/sysconfig/network-scripts
 %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
-%{_datadir}/dbus-1/system-services/org.freedesktop.nm-priv-helper.service
+%{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service
 %{_datadir}/polkit-1/actions/*.policy
 %{_prefix}/lib/udev/rules.d/*.rules
 %if %{with firewalld_zone}
diff --git a/data/nm-priv-helper.service.in b/data/nm-priv-helper.service.in
index aa028e6c1d..df2868f527 100644
--- a/data/nm-priv-helper.service.in
+++ b/data/nm-priv-helper.service.in
@@ -18,7 +18,7 @@ Description=NetworkManager Privileged Helper
 
 [Service]
 Type=dbus
-BusName=org.freedesktop.nm-priv-helper
+BusName=org.freedesktop.nm_priv_helper
 ExecStart=@libexecdir@/nm-priv-helper
 NotifyAccess=main
 
@@ -76,4 +76,4 @@ SystemCallFilter=@resources
 
 
 [Install]
-Alias=dbus-org.freedesktop.nm-priv-helper.service
+Alias=dbus-org.freedesktop.nm_priv_helper.service
diff --git a/src/libnm-base/nm-priv-helper-utils.h b/src/libnm-base/nm-priv-helper-utils.h
index 22387cff46..f866dd7066 100644
--- a/src/libnm-base/nm-priv-helper-utils.h
+++ b/src/libnm-base/nm-priv-helper-utils.h
@@ -5,9 +5,9 @@
 
 /*****************************************************************************/
 
-#define NM_PRIV_HELPER_DBUS_BUS_NAME    "org.freedesktop.nm-priv-helper"
-#define NM_PRIV_HELPER_DBUS_OBJECT_PATH "/org/freedesktop/nm-priv-helper"
-#define NM_PRIV_HELPER_DBUS_IFACE_NAME  "org.freedesktop.nm-priv-helper"
+#define NM_PRIV_HELPER_DBUS_BUS_NAME    "org.freedesktop.nm_priv_helper"
+#define NM_PRIV_HELPER_DBUS_OBJECT_PATH "/org/freedesktop/nm_priv_helper"
+#define NM_PRIV_HELPER_DBUS_IFACE_NAME  "org.freedesktop.nm_priv_helper"
 
 /*****************************************************************************/
 
diff --git a/src/nm-priv-helper/meson.build b/src/nm-priv-helper/meson.build
index e9f8a7c3e1..6141e0e207 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 c56b20077e..c0d046178b 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 0ca3066922..0000000000
--- 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 0000000000..5e2c5e1dc4
--- /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=dbus-org.freedesktop.nm_priv_helper.service