From nobody Wed Sep 20 15:41:32 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 4RrN705hHcz4tprZ; Wed, 20 Sep 2023 15:41:32 +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 4RrN705C7Tz4Kv4; Wed, 20 Sep 2023 15:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695224492; 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=dZVmjMn4ZuykFlZijd8BFJGqMQjlSwyJ5OV/SfzA/lk=; b=ewSfU/FreXU9adVTkHOzozFY05F+y2wBH86GtMRnJ5LAB+n++vsjAW4r8drN9cEGDTcfu1 RwNQOW6vUkdYWcHkxHiVn4O6nUXvC2ZLI2ukUZqJFDii1uOczMxif/o1rqCA+0kS9pztCG ubxYG3vXm5lC7eabccla38FyjvpmXj9W56qhd4H80CJWLHV8PC1hqnoew0m2BgihqMUvGO IAD3YezVwPeiUHmOGtO8zgt+/KbTOx2/a8Z/59+Vrri1LE4ukB5bqSIoBMY1SOrHikzgJQ LPuRbNp/cBjnzY0boycG47ejSu+tQ/Nh671xIh9YHobn1z20O29obwfYDyRbVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695224492; a=rsa-sha256; cv=none; b=JNPSxccPwF5kqoWd7qqEc+opwLoHFd+QA7qWatZLfUL1KWWYs2JswG5twy5cKrYyZwf79z PyjSsgb57HyjVkyiKYj2U8mapcljdLQjjM4mF3TIZuP7Wp7MVwGB8VoN11ABDvL0IsAvY4 xky8mFCFwLzfsTI3rBmgv6gHgX6NHUcpiRzdvU9VJegVeizL2rER1niE1wvmBXHdMe68V1 p8ebha8UpneYt9S7OcFAfJvtmeiYfqGLs+5oGUdhtPtIM1JVTZVM6lx0PsFu00lk4D8xVo 4kOmGE+8OllVgr/RfD34UUE/bTYvWQvNjwC0VWZt8bDYn/hsUTDp/FOiB0sGSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695224492; 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=dZVmjMn4ZuykFlZijd8BFJGqMQjlSwyJ5OV/SfzA/lk=; b=w5BfosDaG3lo/hJx/QRo5whH+YJYLG975gUQ1Pc6dfy9EhS5x37KjN/X04wn0DvG26eo3v ocpSQjl5+3HH2RFwRVDeo5mUW51TqLeBULJdKhQZ8DwYbgD0fMYcWqIn4AAOxcAiYQX5qD TCkFC5qi9K/3TJyn3AP25RcBlKNsFKwSX6s7/smxruIZKUdwTwfyXTGByus9LwOx1sxd95 oJoTSAzSyCXmSRN0oytojsBfcgPS4fG1q33JJlFQrZYkCrZuP5KYBlDbXLM+4+5sLzwVKc kWReARwwO64VT3AREln9ejTDj3pU/y529OzJTufvbr+362Vjb/MXgLDTh1QuMA== 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 4RrN703z90z11yg; Wed, 20 Sep 2023 15:41:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38KFfWW3017110; Wed, 20 Sep 2023 15:41:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38KFfW0g017107; Wed, 20 Sep 2023 15:41:32 GMT (envelope-from git) Date: Wed, 20 Sep 2023 15:41:32 GMT Message-Id: <202309201541.38KFfW0g017107@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Stephen J. Kiernan" Subject: git: 8789e3b0214e - main - rpcbind: Add flag for foreground mode 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: stevek X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8789e3b0214e1bea8452d62b41ac2e32547686a4 Auto-Submitted: auto-generated The branch main has been updated by stevek: URL: https://cgit.FreeBSD.org/src/commit/?id=8789e3b0214e1bea8452d62b41ac2e32547686a4 commit 8789e3b0214e1bea8452d62b41ac2e32547686a4 Author: Stephen J. Kiernan AuthorDate: 2023-08-31 16:59:41 +0000 Commit: Stephen J. Kiernan CommitDate: 2023-09-20 15:40:52 +0000 rpcbind: Add flag for foreground mode Added the -N flag to enable foreground mode. It is useful to be able to run rpcbind in foreground mode when starting from launcher applications. The existing debug flag is not sufficient as it enables additional debug messages. Update man page to document the added flag. Reviewed by: imp Obtained from: Juniper Networks, Inc. Differential Revision: https://reviews.freebsd.org/D41674 --- usr.sbin/rpcbind/rpcbind.8 | 9 +++++++-- usr.sbin/rpcbind/rpcbind.c | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/usr.sbin/rpcbind/rpcbind.8 b/usr.sbin/rpcbind/rpcbind.8 index c0efb1e838ef..270cab88823c 100644 --- a/usr.sbin/rpcbind/rpcbind.8 +++ b/usr.sbin/rpcbind/rpcbind.8 @@ -1,7 +1,7 @@ .\" @(#)rpcbind.1m 1.19 92/09/14 SMI; from SVr4 .\" Copyright 1989 AT&T .\" Copyright 1991 Sun Microsystems, Inc. -.Dd April 19, 2017 +.Dd August 31, 2023 .Dt RPCBIND 8 .Os .Sh NAME @@ -9,7 +9,7 @@ .Nd universal addresses to RPC program number mapper .Sh SYNOPSIS .Nm -.Op Fl 6adiLlswW +.Op Fl 6adiLlNswW .Op Fl h Ar bindip .Sh DESCRIPTION The @@ -122,6 +122,11 @@ Without this flag, local connections are only allowed over a local socket, .Pa /var/run/rpcbind.sock . .It Fl l Turn on libwrap connection logging. +.It Fl N +Run in foreground mode. +In this mode, +.Nm +will not fork when it starts. .It Fl s Cause .Nm diff --git a/usr.sbin/rpcbind/rpcbind.c b/usr.sbin/rpcbind/rpcbind.c index 0f7da00198a9..31064558fb6c 100644 --- a/usr.sbin/rpcbind/rpcbind.c +++ b/usr.sbin/rpcbind/rpcbind.c @@ -94,6 +94,7 @@ int oldstyle_local = 0; #ifdef LIBWRAP int libwrap = 0; #endif +int nofork = 0; int verboselog = 0; static char **hosts = NULL; @@ -226,7 +227,7 @@ main(int argc, char *argv[]) } else { printf("\n"); } - } else { + } else if (!nofork) { if (daemon(0, 0)) err(1, "fork failed"); } @@ -809,7 +810,7 @@ parseargs(int argc, char *argv[]) #else #define WRAPOP "" #endif - while ((c = getopt(argc, argv, "6adh:iLls" WRAPOP WSOP)) != -1) { + while ((c = getopt(argc, argv, "6adh:iLlNs" WRAPOP WSOP)) != -1) { switch (c) { case '6': ipv6_only = 1; @@ -839,6 +840,9 @@ parseargs(int argc, char *argv[]) case 'l': verboselog = 1; break; + case 'N': + nofork = 1; + break; case 's': runasdaemon = 1; break;