From nobody Wed Dec 13 20:06:19 2023 X-Original-To: dev-commits-src-branches@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 4Sr61m2JXzz54Fgr; Wed, 13 Dec 2023 20:06:20 +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 4Sr61m1FPpz4Yht; Wed, 13 Dec 2023 20:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702497980; 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=I6AyUXtxTKHgDGfLq2Hig3HwZDxunnBp41WVgu5zZsU=; b=js9RWqn9jJpt3OwnpjTCpuCnRavAVMkVH5/tj7ImzproYrOzhH/6lG8fxyh6//gNV4LrXM GtMLYXAMVrnehIANBoQ5ollWOAzjV5khGDqMHqQRlXqmZEvLLlgagL+at05eRA9etHTrtl gXAZs09Dx0zTLNFD0Hfy88GhKNNvcRZ+URtYLBexJwPmtNCeQ8skQFLd3C05Ixxui/bC8T NlkmMnTc1KNnSZspOlgTf7EiL5DktklisI+XxJkuNSbqLSzLAQzj+WpNxy5YmV8DVm7X8t hRf+7itd+I+S6MhrNBRdDcrv35ihGmBCQjytK7Qb5FL9hr4epB7iQO6iRMf+0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702497980; a=rsa-sha256; cv=none; b=LbO2LBoyRFMK1YiLz4E3AC5bMFrD+joXPw2rnrHLYlPaRwSHDNmpfWNC2cmyoX3f254a94 C+uc6Q3N9p7Szcetn38y3/dSh9a0PS7W9JqDdUvveNjQnGJTqzF65DsLBrP/mcq/pIKsOo AMKSHPWCEKKZrknkNF7cvIwWF4XNdErttL8JQyAlMg5ylZbjUudf099CNRFpWt6qm+q0v8 JJ/5pTR3S/uxZRSLPrVrggB/LRn6ZougQaL+10ajphvq4BEtMMbhEQDDdrAkKObx0W20Tx XF46Y4rNGAaX8QRubMuchi9KsM3NLHVfzqEZ4ylVVL7jFmJJJoqDnQsuKgFM0A== 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=1702497980; 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=I6AyUXtxTKHgDGfLq2Hig3HwZDxunnBp41WVgu5zZsU=; b=PmNXUZEHhRpsvxCgcOhspH5FASAX8RmxXirdsRM9e+bMxwscj4wCb7bSQ1pVg2yIdnLHKI Qc8kdzQJ/6I2HSwBsikjCXb5Hf/JkncPs4aqXUy7RCy3+LgikZoxVKHEc5vW/JOeiAxluI wDNgfLqYBIsSZsqGY+uPNBLqOSWg/OIBO6bh+SEqHsp8c4i7UL2F7d5a1QEHyIGR05Ow/A K/H8CrBg05Y7Z+Gzm9jtkgY+PJTHd1P41sWAiWTxrGyvh0jsbR8ixBD91uUZRPELxubdCG bvd+Q6Y4pFvyefjUSvSM+G9DBMlZvNMvDr6FL/W71IP1yTu+SSkQEY3rWIJMDQ== 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 4Sr61m0M59z1Bxd; Wed, 13 Dec 2023 20:06:20 +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 3BDK6Jre086973; Wed, 13 Dec 2023 20:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDK6Jf6086970; Wed, 13 Dec 2023 20:06:19 GMT (envelope-from git) Date: Wed, 13 Dec 2023 20:06:19 GMT Message-Id: <202312132006.3BDK6Jf6086970@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: abbe12a5266a - stable/13 - nss_tacplus: Provide dummy setpwent(), getpwent_r(), endpwent(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: abbe12a5266aea17de82300e245d18908c8671dc Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=abbe12a5266aea17de82300e245d18908c8671dc commit abbe12a5266aea17de82300e245d18908c8671dc Author: Dag-Erling Smørgrav AuthorDate: 2023-08-31 07:49:41 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-12-13 16:08:13 +0000 nss_tacplus: Provide dummy setpwent(), getpwent_r(), endpwent(). These aren't really needed, since TACACS+ does not support enumeration, but providing placeholders keeps nsdispatch() from complaining that they're missing. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D41658 (cherry picked from commit 56b74a2d856c4d65a4b5c72d1352067b6b469d3b) --- lib/nss_tacplus/nss_tacplus.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/lib/nss_tacplus/nss_tacplus.c b/lib/nss_tacplus/nss_tacplus.c index e18ffe2315ce..238d7bf301ad 100644 --- a/lib/nss_tacplus/nss_tacplus.c +++ b/lib/nss_tacplus/nss_tacplus.c @@ -271,12 +271,43 @@ nss_tacplus_getpwnam_r(void *retval, void *mdata __unused, va_list ap) return (ret); } +static int +nss_tacplus_setpwent(void *retval __unused, void *mdata __unused, + va_list ap __unused) +{ + return (NS_SUCCESS); +} + +static int +nss_tacplus_getpwent_r(void *retval, void *mdata __unused, va_list ap) +{ + struct passwd *pwd __unused = va_arg(ap, struct passwd *); + char *buffer __unused = va_arg(ap, char *); + size_t bufsize __unused = va_arg(ap, size_t); + int *result = va_arg(ap, int *); + + *(void **)retval = NULL; + *result = 0; + return (NS_SUCCESS); + +} + +static int +nss_tacplus_endpwent(void *retval __unused, void *mdata __unused, + va_list ap __unused) +{ + return (NS_SUCCESS); +} + ns_mtab * nss_module_register(const char *name __unused, unsigned int *plen, nss_module_unregister_fn *unreg) { static ns_mtab mtab[] = { { "passwd", "getpwnam_r", &nss_tacplus_getpwnam_r, NULL }, + { "passwd", "setpwent", &nss_tacplus_setpwent, NULL }, + { "passwd", "getpwent_r", &nss_tacplus_getpwent_r, NULL }, + { "passwd", "endpwent", &nss_tacplus_endpwent, NULL }, }; *plen = nitems(mtab);