From nobody Sat Apr 22 15:19:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q3Znk5sSvz46sJM; Sat, 22 Apr 2023 15:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q3Znk4Csbz3nWT; Sat, 22 Apr 2023 15:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682176794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9u6D9LDH3KDfNe8+v9jVBMvH07DMjNN7hkHBQn4A88=; b=fR8Bmpa0XAw7H/qP31zoN5UnfeTTBLZBW9KuP6/LS00ckbA9EqfZbzQNgGGUb0JDE+J5XU MtB4WL10UkXk2FYcP8xQVl02GyBE/LLVilpOYrKGM6umKH4XvYu9HxahjEsvaFVNbNpoxY yGGBnNsPl8s9CWgO469wVb7BIS/jiBbZ/mcpb5HN4RPYXfNFC4a4TpJhq1XB+sD1MPjAN+ PrC08A7/Obs/lcyh0wF8UVi0vhhgHvCBfqoRiMZyv2Zx362gte+kPe4WMAZaQmw5QqHfkc khM170m9PY5YAgCHj5OAMQ60hUzNIizAfk0mSM8lSXipNgLBjWbpFE3LDf4zRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682176794; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e9u6D9LDH3KDfNe8+v9jVBMvH07DMjNN7hkHBQn4A88=; b=JvQQyEsd4Rp3IP8DmNBxW6Nmkx1sjToC8v5nRwg/1HR7XdThN4peMZ3xaZwrnF7REd9JG9 2tHilg9FRzD8hqjQQIJKaoozQ9KHccnqslPCq5NYao4YMftdAWT/iOAL+KCMnWkeS2CDbM Vgqyf3Xu482NZD6S7xmyjtxUIfKP/5l5x79PsqGgBYlPToWPZq+nz3QuOIFVLbiWWVC6m9 cpyuB8QjjVXcKJ/Qo+verFxb8aK1E1t/Hx472SNmMl2+fDYzfK/kX4X2s49fUSoKlR03J9 z8FvVRxrmlT4aTRhSI6IBOfpuusCw+SIojtwkCUSXxLpQpZED2szsxKwqaZfxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682176794; a=rsa-sha256; cv=none; b=vop+Xm4uS5HYwOCLZB9DynlAtLg9/YxwuJct6Exp0Vm4Unb7L0NkO1Xzb6bSIgD6CHXSqY QTz329R4HrcR9R6YAvlFfYT5tq005k6gbjpRrQ2hIm+E+0wdZd/bsX48g5ZC1IYeYFHcmP LxqX6wItjwYWb3lBKFGrGV9tqC/6su/Qz2/mH62eSLrDVoCK1o/WDlNyGq9MX5pR5ZWhdL ZqD++o0F5ZBB5VBFirrJB96Pid7/Oi+oiq5BVneNKQSqOBhMlzoDEq5d9tOsbi8oTA/27O PPbT4ylqkM4AWCJoyAlKUCy2e7g1N8WVaVYIzd2z0YGoFxjqmy+89pcMxoAJDg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q3Znk34gMz16Kg; Sat, 22 Apr 2023 15:19:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33MFJsvt089963; Sat, 22 Apr 2023 15:19:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MFJsFu089962; Sat, 22 Apr 2023 15:19:54 GMT (envelope-from git) Date: Sat, 22 Apr 2023 15:19:54 GMT Message-Id: <202304221519.33MFJsFu089962@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 33906122e1ff - main - nfsuserd.c: Replace slave with server List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33906122e1ff6c35f7023c7dbaf112cfec088b93 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=33906122e1ff6c35f7023c7dbaf112cfec088b93 commit 33906122e1ff6c35f7023c7dbaf112cfec088b93 Author: Rick Macklem AuthorDate: 2023-04-22 15:18:02 +0000 Commit: Rick Macklem CommitDate: 2023-04-22 15:18:02 +0000 nfsuserd.c: Replace slave with server --- usr.sbin/nfsuserd/nfsuserd.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/usr.sbin/nfsuserd/nfsuserd.c b/usr.sbin/nfsuserd/nfsuserd.c index 1e99f806637d..3095948dce75 100644 --- a/usr.sbin/nfsuserd/nfsuserd.c +++ b/usr.sbin/nfsuserd/nfsuserd.c @@ -96,9 +96,9 @@ u_char *defaultuser = "nobody"; uid_t defaultuid = 65534; u_char *defaultgroup = "nogroup"; gid_t defaultgid = 65533; -int verbose = 0, im_a_slave = 0, nfsuserdcnt = -1, forcestart = 0; +int verbose = 0, im_a_server = 0, nfsuserdcnt = -1, forcestart = 0; int defusertimeout = DEFUSERTIMEOUT, manage_gids = 0; -pid_t slaves[MAXNFSUSERD]; +pid_t servers[MAXNFSUSERD]; static struct sockaddr_storage fromip; #ifdef INET6 static struct in6_addr in6loopback = IN6ADDR_LOOPBACK_INIT; @@ -290,7 +290,7 @@ main(int argc, char *argv[]) dnsname, nid.nid_usermax, nid.nid_usertimeout); for (i = 0; i < nfsuserdcnt; i++) - slaves[i] = (pid_t)-1; + servers[i] = (pid_t)-1; nargs.nuserd_family = fromip.ss_family; /* @@ -444,7 +444,7 @@ main(int argc, char *argv[]) exit(0); #endif /* - * Temporarily block SIGUSR1 and SIGCHLD, so slaves[] can't + * Temporarily block SIGUSR1 and SIGCHLD, so servers[] can't * end up bogus. */ sigemptyset(&signew); @@ -463,14 +463,14 @@ main(int argc, char *argv[]) openlog("nfsuserd:", LOG_PID, LOG_DAEMON); /* - * Fork off the slave daemons that do the work. All the master - * does is kill them off and cleanup. + * Fork off the server daemons that do the work. All the master + * does is terminate them and cleanup. */ for (i = 0; i < nfsuserdcnt; i++) { - slaves[i] = fork(); - if (slaves[i] == 0) { - im_a_slave = 1; - setproctitle("slave"); + servers[i] = fork(); + if (servers[i] == 0) { + im_a_server = 1; + setproctitle("server"); sigemptyset(&signew); sigaddset(&signew, SIGUSR1); sigprocmask(SIG_UNBLOCK, &signew, NULL); @@ -481,7 +481,7 @@ main(int argc, char *argv[]) svc_run(); syslog(LOG_ERR, "nfsuserd died: %m"); exit(1); - } else if (slaves[i] < 0) { + } else if (servers[i] < 0) { syslog(LOG_ERR, "fork: %m"); } } @@ -800,7 +800,7 @@ cleanup_term(int signo __unused) { int i, cnt; - if (im_a_slave) + if (im_a_server) exit(0); /* @@ -809,9 +809,9 @@ cleanup_term(int signo __unused) */ cnt = 0; for (i = 0; i < nfsuserdcnt; i++) { - if (slaves[i] != (pid_t)-1) { + if (servers[i] != (pid_t)-1) { cnt++; - kill(slaves[i], SIGUSR1); + kill(servers[i], SIGUSR1); } }