From nobody Thu Feb 01 21:31:07 2024 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 4TQsXX1Tl3z58jCp; Thu, 1 Feb 2024 21:31:08 +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 4TQsXX0QRPz4bV4; Thu, 1 Feb 2024 21:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823068; 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=iD6bkPXh5jI2l2LMu4lB90jH1BlPVj8H2BNDA96pqhg=; b=TsymL6rwj8XaK8sgMLum8opcLrdHngpkBVyb0wdlkXtO0wpfpXtSkLAZ7+N4sTK75fgDm/ jD8qFngr4YjfIbEYOzsV9zCQ/y9m9GI/DRZu16yrsgwsi0eWc/ThQeIaPQAYQPWOzHMKN4 GVhv3/H/30LEFTDB2HPf+jrCtwUzmm5MZ0ctjwPFIsVbgJpFWV4PGJyxKlpvM3RIcpZh+J 9OO9hef+HMp1Nhhd31CQ7Gka/3OB5DlKlrzqzh8TO7n6qkZ5xtE2kWiXuITsXEZO5RqBOz ei8MP5CpG4SvOVmzI0rGVoNEiuMLqURTa8cWsjtzzIKO9GSOs5ZU94YKK73cUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706823068; 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=iD6bkPXh5jI2l2LMu4lB90jH1BlPVj8H2BNDA96pqhg=; b=V+oOzRyCzAIqOFX0OeaoT9/bg5eW6SD10++sKDc0V+ikKUPupTIVYCz/t6bDm8iE5kCDzx 4IRY4Mg5L1wp/5NLSBFWMeY225tw8w4xQ9Ht+SPzHcwchVgKoxnJJ3mVUwd2lJoLZdwF06 48ST+a/sfbl/zCHWNbsSbkcaGkfA2vjAjI5zUkXSpCCwMtVK6qaqHQJTc0ZJNXVovyZbCA YIiHrkkPYpleXbmq1PMopq3CfOI3rN2E3MkTNXzHEmypZR9VmwrNSn9F05FGXwCluYv7w3 6b+NuMrfFNsuEeo0L6N3C/FsSOh859/u6PQ2CH3vLEW1E7zDYIEQW4xqwWkcNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706823068; a=rsa-sha256; cv=none; b=SSX0cWO+f5MMaZ/0wYOma2eMfXi1+9VbIQhEIB6JJSRNwGdbLva9SuE5VvqRB0+CYbmOuA wiGsMjnWW+xeiIHfKvkFmVQFIOalWO65SXcF6gN7S/bwjld1a7asKY0iyvuhn24FDPkeYr tfOCd90MHkWcuC0rBIZfa+YmQi5dfLBPbFTiJCtyeU19ekXNCYuz3ZDnxXYBSZsqcAe1rf f5CV2f2OHD5J0FQfEuqPlafijeJJ0KdVtL4ZPnM6hxAHsMPp3cbyFvQB/scPlNC3w2m7Ln VWPpXj90/oa3GjFDWnI6PsPFHZhDSQikaVAg0e7eRexlOprrA3DkNB4cWqZGMg== 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 4TQsXW6d6mz1HwK; Thu, 1 Feb 2024 21:31:07 +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 411LV7oC080426; Thu, 1 Feb 2024 21:31:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 411LV7HI080423; Thu, 1 Feb 2024 21:31:07 GMT (envelope-from git) Date: Thu, 1 Feb 2024 21:31:07 GMT Message-Id: <202402012131.411LV7HI080423@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 37aaacd41016 - stable/14 - New login_getcapenum(): Allows to read named enum values 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 37aaacd410163ec3c2ffb3e402ba8c192a26c171 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=37aaacd410163ec3c2ffb3e402ba8c192a26c171 commit 37aaacd410163ec3c2ffb3e402ba8c192a26c171 Author: Olivier Certner AuthorDate: 2023-06-20 16:41:32 +0000 Commit: Olivier Certner CommitDate: 2024-02-01 21:28:40 +0000 New login_getcapenum(): Allows to read named enum values Reviewed by: emaste Approved by: emaste (mentor) MFC after: 3 days Sponsored by: Kumacom SAS Differential Revision: https://reviews.freebsd.org/D40684 (cherry picked from commit 90e914cd5ac1c8ecbf1ea88e9a65e7fa866c17a9) Approved by: markj (mentor) --- lib/libutil/login_cap.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ lib/libutil/login_cap.h | 2 ++ 2 files changed, 48 insertions(+) diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c index aeda7d5e828b..eeaf12836597 100644 --- a/lib/libutil/login_cap.c +++ b/lib/libutil/login_cap.c @@ -761,6 +761,52 @@ login_getcapnum(login_cap_t *lc, const char *cap, rlim_t def, rlim_t error) return val; } +/* + * Extract a string capability expected to hold a specific value from a list. + * + * 'values' must be a NULL-terminated array of strings listing the possible + * values. + * + * A non-negative return code indicates success, and is the index of the value + * in 'values' the capability is set to. + * + * Negative return codes indicate an error: + * -4: 'lc' or 'cap' insufficiently initialized or not valid. + * -3: System error (allocation failure). + * -2: Capability not found or not a string. + * -1: Capability has a string value, but not one listed in 'values'. + */ +int +login_getcapenum(login_cap_t *lc, const char *cap, const char * const *values) +{ + int ret, i; + char *cand; + const char * const *val; + + if (lc == NULL || lc->lc_cap == NULL || cap == NULL || *cap == '\0') + return (-4); + + ret = cgetstr(lc->lc_cap, cap, &cand); + + if (ret == -1) + /* Cap not found. */ + return (-2); + else if (ret < 0) + /* System error (normally, allocation failure). */ + return (-3); + + ret = -1; + + for (i = 0, val = values; *val != NULL; val++) + if (strcmp(cand, *val) == 0) { + ret = i; + break; + } + + free(cand); + return (ret); +} + /* diff --git a/lib/libutil/login_cap.h b/lib/libutil/login_cap.h index 7312914900a8..0037b41d9055 100644 --- a/lib/libutil/login_cap.h +++ b/lib/libutil/login_cap.h @@ -110,6 +110,8 @@ const char **login_getcaplist(login_cap_t *, const char *, const char *); const char *login_getstyle(login_cap_t *, const char *, const char *); rlim_t login_getcaptime(login_cap_t *, const char *, rlim_t, rlim_t); rlim_t login_getcapnum(login_cap_t *, const char *, rlim_t, rlim_t); +int login_getcapenum(login_cap_t *lc, const char *cap, + const char * const *values); rlim_t login_getcapsize(login_cap_t *, const char *, rlim_t, rlim_t); const char *login_getpath(login_cap_t *, const char *, const char *); int login_getcapbool(login_cap_t *, const char *, int);