diff options
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.c | 42 | ||||
| -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 |
5 files changed, 31 insertions, 31 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.c b/src/nm-priv-helper/nm-priv-helper.c index 76ca0cab..ec064bca 100644 --- a/src/nm-priv-helper/nm-priv-helper.c +++ b/src/nm-priv-helper/nm-priv-helper.c @@ -38,7 +38,7 @@ typedef struct { struct _GlobalData { GDBusConnection *dbus_connection; - GCancellable * quit_cancellable; + GCancellable *quit_cancellable; GSource *source_sigterm; @@ -112,9 +112,9 @@ _handle_ping(GlobalData *gl, GDBusMethodInvocation *invocation, const char *arg) static void _handle_get_fd(GlobalData *gl, GDBusMethodInvocation *invocation, guint32 fd_type) { - nm_auto_close int fd = -1; + nm_auto_close int fd = -1; gs_unref_object GUnixFDList *fd_list = NULL; - gs_free_error GError *error = NULL; + gs_free_error GError *error = NULL; if (fd_type != (NMPrivHelperGetFDType) fd_type) fd_type = NM_PRIV_HELPER_GET_FD_TYPE_NONE; @@ -151,7 +151,7 @@ _signal_callback_term(gpointer user_data) static GDBusConnection * _bus_get(GCancellable *cancellable, int *out_exit_code) { - gs_free_error GError *error = NULL; + gs_free_error GError *error = NULL; gs_unref_object GDBusConnection *dbus_connection = NULL; dbus_connection = nm_g_bus_get_blocking(cancellable, &error); @@ -178,11 +178,11 @@ _bus_get(GCancellable *cancellable, int *out_exit_code) static void _name_owner_changed_cb(GDBusConnection *connection, - const char * sender_name, - const char * object_path, - const char * interface_name, - const char * signal_name, - GVariant * parameters, + const char *sender_name, + const char *object_path, + const char *interface_name, + const char *signal_name, + GVariant *parameters, gpointer user_data) { GlobalData *gl = user_data; @@ -207,7 +207,7 @@ _name_owner_changed_cb(GDBusConnection *connection, typedef struct { GlobalData *gl; - char ** p_name_owner; + char **p_name_owner; gboolean is_cancelled; } BusFindNMNameOwnerData; @@ -226,7 +226,7 @@ _bus_find_nm_nameowner(GlobalData *gl) { BusFindNMNameOwnerData data; guint name_owner_changed_id; - gs_free char * name_owner = NULL; + gs_free char *name_owner = NULL; name_owner_changed_id = nm_dbus_connection_signal_subscribe_name_owner_changed(gl->dbus_connection, @@ -262,12 +262,12 @@ _bus_find_nm_nameowner(GlobalData *gl) /*****************************************************************************/ static void -_bus_method_call(GDBusConnection * connection, - const char * sender, - const char * object_path, - const char * interface_name, - const char * method_name, - GVariant * parameters, +_bus_method_call(GDBusConnection *connection, + const char *sender, + const char *object_path, + const char *interface_name, + const char *method_name, + GVariant *parameters, GDBusMethodInvocation *invocation, gpointer user_data) { @@ -351,9 +351,9 @@ _bus_register_service(GlobalData *gl) static const GDBusInterfaceVTable interface_vtable = { .method_call = _bus_method_call, }; - gs_free_error GError * error = NULL; + gs_free_error GError *error = NULL; NMDBusConnectionCallBlockingData data = { - .result = NULL, + .result = NULL, }; gs_unref_variant GVariant *ret = NULL; guint32 ret_val; @@ -455,7 +455,7 @@ static gboolean _pending_job_register_object_release_on_idle_cb(gpointer data) { PendingJobData *idle_data = data; - GlobalData * gl = idle_data->gl; + GlobalData *gl = idle_data->gl; c_list_unlink_stale(&idle_data->pending_jobs_lst); nm_g_slice_free(idle_data); @@ -498,7 +498,7 @@ static void _bus_release_name_cb(GObject *source, GAsyncResult *result, gpointer user_data) { _nm_unused gs_unref_object GObject *keep_alive_object = NULL; - GlobalData * gl; + GlobalData *gl; nm_utils_user_data_unpack(user_data, &gl, &keep_alive_object); 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 |