From nobody Sun Jul 23 18:18:37 2023 X-Original-To: dev-commits-src-main@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 4R8BPV08Jkz4nyRD; Sun, 23 Jul 2023 18:18:38 +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 4R8BPT24MKz3MSm; Sun, 23 Jul 2023 18:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136317; 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=NeYAe1Zv69ZlXKbGUJeXE5KMGwNOmnGmlqVzditD/WE=; b=uZY0etvazW5+qjUqiU5/k24m8D6wFMfUzYKYTe5M7pSGMICCIDE9h5KD/1rBNX8ITen03W uht5lvxJEuIz+tLpMXfeR2VoyYmp/iu4zoEoEks00z9sOPHPyT2eNMHFBlJn/AA7fv81y4 hwQPsP9oHngYzZkz/mpSMi0PFVHZ77P/Cm9ZhHs0MToef2R7mIImPHnG2g8eAvYOb0TPDC 8+mXRHRsGGInOTNNCtr0VQlLguDkybsCEwf6bDRz8nqXUvK2krH9hqXINV7JCjKaEGpChH rswR872rmBF/M1Mnxx6GirEJ384gB2ehIFIwHVJTbVn/JRdH6T9T0wrz7VvURA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690136317; 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=NeYAe1Zv69ZlXKbGUJeXE5KMGwNOmnGmlqVzditD/WE=; b=R6EajDEn981t+b3fTuE96rXAYGy7DjGMOqzpjOSGgvYMgW8WMLooGiUbugt7FTSFuy+0ZJ V30jT4FScqYYzRxfbIJarUQZ9PlSePdnFYt7miUjukf9hFyEa1GOeL2ye3FBOObVC+H9Js 9Rp+uwTl+n1R2r/gWnm6a2K583r9B4bep4bEZDQ67X2vHimQLRTDJYFTjum3FiMJgZxAup fQXMxjw3frr5ds/gUpRLzs48ki+1RtuzqhKSQTPP8/hYPcwr5V3x/7Pkwox5FJsGtlCF5t 8O3S9MU2C8vp0e1Bv4574gDC4W931123liWT8BB9g/94Er0II/OtsY1OU5Qi0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690136317; a=rsa-sha256; cv=none; b=mikASNwblqeMV8I7Es4zaOcFA+VbLicpcjUaIA1BQ31ugVj4S3qWIQsJ2cy/NGC617cmIq 6k3RNBseXGUIkiL24ALcoqHv47TG+FvESXWUNRkyRVs2F6PqP6LG/OxJkty91KBQsssyLg gg0WQEcBGkY5SuGFXU7Iby5wyf8CHerWx4/G3My5mwOjRXuN8GXbuHOQWFzAXdCLpQ1r4z 9rnJlRHC6P0nur9O4OCn+B4jXSomaWkh4qKAmfNTJrOCNf17HUfzcrv2W5XIbhlAgIvIoc ImCBMIbRgXk1f/NK43EZ0K6XXtXHeBFJB4LvIEtXnNqcXhDrYqY8P4fRMRLAJQ== 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 4R8BPT1BDhzmJx; Sun, 23 Jul 2023 18:18:37 +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 36NIIb6g042236; Sun, 23 Jul 2023 18:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36NIIboM042235; Sun, 23 Jul 2023 18:18:37 GMT (envelope-from git) Date: Sun, 23 Jul 2023 18:18:37 GMT Message-Id: <202307231818.36NIIboM042235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: 9df529b8a106 - main - login_getclassbyname(3): use calloc. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9df529b8a106b18b15d561f7ae94f474c3fb4a7d Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=9df529b8a106b18b15d561f7ae94f474c3fb4a7d commit 9df529b8a106b18b15d561f7ae94f474c3fb4a7d Author: Xin LI AuthorDate: 2023-07-23 18:18:24 +0000 Commit: Xin LI CommitDate: 2023-07-23 18:18:24 +0000 login_getclassbyname(3): use calloc. --- lib/libutil/login_cap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c index ffefb865ed5e..6b3bf663bb2b 100644 --- a/lib/libutil/login_cap.c +++ b/lib/libutil/login_cap.c @@ -295,7 +295,7 @@ login_getclassbyname(char const *name, const struct passwd *pwd) { login_cap_t *lc; - if ((lc = malloc(sizeof(login_cap_t))) != NULL) { + if ((lc = calloc(1, sizeof(login_cap_t))) != NULL) { int r, me, i = 0; uid_t euid = 0; gid_t egid = 0; @@ -332,9 +332,6 @@ login_getclassbyname(char const *name, const struct passwd *pwd) login_dbarray[i++] = path_login_conf; login_dbarray[i] = NULL; - memset(lc, 0, sizeof(login_cap_t)); - lc->lc_cap = lc->lc_class = lc->lc_style = NULL; - if (name == NULL || *name == '\0') name = LOGIN_DEFCLASS;