From owner-svn-src-all@freebsd.org Sat Jun 27 09:01:31 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BF6753495CA; Sat, 27 Jun 2020 09:01:31 +0000 (UTC) (envelope-from pstef@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49v7634l4zz4Ybk; Sat, 27 Jun 2020 09:01:31 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DFD522BC1; Sat, 27 Jun 2020 09:01:31 +0000 (UTC) (envelope-from pstef@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05R91VuJ071447; Sat, 27 Jun 2020 09:01:31 GMT (envelope-from pstef@FreeBSD.org) Received: (from pstef@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05R91VGL071445; Sat, 27 Jun 2020 09:01:31 GMT (envelope-from pstef@FreeBSD.org) Message-Id: <202006270901.05R91VGL071445@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pstef set sender to pstef@FreeBSD.org using -f From: Piotr Pawel Stefaniak Date: Sat, 27 Jun 2020 09:01:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r362673 - stable/12/lib/libutil X-SVN-Group: stable-12 X-SVN-Commit-Author: pstef X-SVN-Commit-Paths: stable/12/lib/libutil X-SVN-Commit-Revision: 362673 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jun 2020 09:01:31 -0000 Author: pstef Date: Sat Jun 27 09:01:30 2020 New Revision: 362673 URL: https://svnweb.freebsd.org/changeset/base/362673 Log: MFC r362429 and r362430: libutil: remove extraneous ": " from error messages Make vipw error message less cryptic Modified: stable/12/lib/libutil/gr_util.c stable/12/lib/libutil/pw_util.c Directory Properties: stable/12/ (props changed) Modified: stable/12/lib/libutil/gr_util.c ============================================================================== --- stable/12/lib/libutil/gr_util.c Sat Jun 27 07:34:15 2020 (r362672) +++ stable/12/lib/libutil/gr_util.c Sat Jun 27 09:01:30 2020 (r362673) @@ -108,11 +108,11 @@ gr_lock(void) if (errno == EWOULDBLOCK) { errx(1, "the group file is busy"); } else { - err(1, "could not lock the group file: "); + err(1, "could not lock the group file"); } } if (fstat(lockfd, &st) == -1) - err(1, "fstat() failed: "); + err(1, "fstat() failed"); if (st.st_nlink != 0) break; close(lockfd); Modified: stable/12/lib/libutil/pw_util.c ============================================================================== --- stable/12/lib/libutil/pw_util.c Sat Jun 27 07:34:15 2020 (r362672) +++ stable/12/lib/libutil/pw_util.c Sat Jun 27 09:01:30 2020 (r362673) @@ -181,7 +181,7 @@ pw_lock(void) if (errno == EWOULDBLOCK) { errx(1, "the password db file is busy"); } else { - err(1, "could not lock the passwd file: "); + err(1, "could not lock the passwd file"); } } @@ -191,7 +191,7 @@ pw_lock(void) * close and retry. */ if (fstat(lockfd, &st) == -1) - err(1, "fstat() failed: "); + err(1, "fstat() failed"); if (st.st_nlink != 0) break; close(lockfd); @@ -308,12 +308,13 @@ pw_edit(int notsetuid) sigaction(SIGQUIT, &sa_quit, NULL); sigprocmask(SIG_SETMASK, &oldsigset, NULL); if (notsetuid) { - (void)setgid(getgid()); - (void)setuid(getuid()); + if (setgid(getgid()) == -1) + err(1, "setgid"); + if (setuid(getuid()) == -1) + err(1, "setuid"); } - errno = 0; execlp(editor, editor, tempname, (char *)NULL); - _exit(errno); + err(1, "%s", editor); default: /* parent */ break; @@ -327,7 +328,9 @@ pw_edit(int notsetuid) break; } else if (WIFSTOPPED(pstat)) { raise(WSTOPSIG(pstat)); - } else if (WIFEXITED(pstat) && WEXITSTATUS(pstat) == 0) { + } else if (WIFEXITED(pstat)) { + if (WEXITSTATUS(pstat) != 0) + errx(1, "\"%s\" exited with status %d", editor, WEXITSTATUS(pstat)); editpid = -1; break; } else {