Rename Privileged Actioneer to Privileged Proxy

Sadly actioneer is not a real word.

diff --git a/src/dhcpcd.h b/src/dhcpcd.h
index 8a21277ca56c366d8fdacfcbbfecc110dc778f53..d7fb8164574d4d8fd12586c44fa60cca9e3cf950 100644 (file)
--- 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 92406c4da73e6ea174df4525445dc8c1b0e4a767..c04cf2215e77e5137a4af308d6f775689b8efc00 100644 (file)
--- 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 <roy@marples.name>
  * All rights reserved
 
@@ -649,9 +649,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 b63a9d4bbe17620035bf651da22dd01ffae15efd..0a9f93bfaf39574ea94f222a46cb41550ea7d8b2 100644 (file)
--- 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
@@ -470,7 +470,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
@@ -611,7 +611,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. */
        if (ps_root_unlink(ctx, ctx->pidfile) == -1)
                ret = -1;