From 6b23344e5af433305cca2c533e3603c3268aac99 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 2 Feb 2021 17:09:25 +0000 Subject: [PATCH] Rename Privileged Actioneer to Privileged Proxy Sadly actioneer is not a real word. --- src/dhcpcd.h | 2 +- src/privsep-root.c | 6 +++--- src/privsep.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dhcpcd.h b/src/dhcpcd.h index 8a21277c..d7fb8164 100644 --- a/src/dhcpcd.h +++ b/src/dhcpcd.h @@ -199,7 +199,7 @@ struct dhcpcd_ctx { #ifdef PRIVSEP struct passwd *ps_user; /* struct passwd for privsep user */ pid_t ps_root_pid; - int ps_root_fd; /* Privileged Actioneer commands */ + int ps_root_fd; /* Privileged Proxy commands */ int ps_log_fd; /* chroot logging */ int ps_data_fd; /* Data from root spawned processes */ struct eloop *ps_eloop; /* eloop for polling root data */ diff --git a/src/privsep-root.c b/src/privsep-root.c index f5b9611e..45af3910 100644 --- a/src/privsep-root.c +++ b/src/privsep-root.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-2-Clause */ /* - * Privilege Separation for dhcpcd, privileged actioneer + * Privilege Separation for dhcpcd, privileged proxy * Copyright (c) 2006-2021 Roy Marples * All rights reserved @@ -642,9 +642,9 @@ ps_root_startcb(void *arg) struct dhcpcd_ctx *ctx = arg; if (ctx->options & DHCPCD_MANAGER) - setproctitle("[privileged actioneer]"); + setproctitle("[privileged proxy]"); else - setproctitle("[privileged actioneer] %s%s%s", + setproctitle("[privileged proxy] %s%s%s", ctx->ifv[0], ctx->options & DHCPCD_IPV4 ? " [ip4]" : "", ctx->options & DHCPCD_IPV6 ? " [ip6]" : ""); diff --git a/src/privsep.c b/src/privsep.c index c6380da5..e939fb50 100644 --- a/src/privsep.c +++ b/src/privsep.c @@ -33,7 +33,7 @@ * or address specific listener. * Spawn an unpriv process to send/receive common network data. * Then drop all privs and start running. - * Every process aside from the privileged actioneer is chrooted. + * Every process aside from the privileged proxy is chrooted. * All privsep processes ignore signals - only the manager process accepts them. * * dhcpcd will maintain the config file in the chroot, no need to handle @@ -465,7 +465,7 @@ ps_start(struct dhcpcd_ctx *ctx) case 0: return 0; default: - logdebugx("spawned privileged actioneer on PID %d", pid); + logdebugx("spawned privileged proxy on PID %d", pid); } /* No point in spawning the generic network listener if we're @@ -606,7 +606,7 @@ ps_stop(struct dhcpcd_ctx *ctx) ret = r; /* We've been chrooted, so we need to tell the - * privileged actioneer to remove the pidfile. */ + * privileged proxy to remove the pidfile. */ ps_root_unlink(ctx, ctx->pidfile); r = ps_root_stop(ctx); -- 2.47.2