From owner-svn-src-head@freebsd.org Mon Jul 23 14:58:46 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id F41B8104D0E1; Mon, 23 Jul 2018 14:58:45 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A3FFD7FCAD; Mon, 23 Jul 2018 14:58:45 +0000 (UTC) (envelope-from ian@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 6B03E1E04E; Mon, 23 Jul 2018 14:58:45 +0000 (UTC) (envelope-from ian@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6NEwjxd035685; Mon, 23 Jul 2018 14:58:45 GMT (envelope-from ian@FreeBSD.org) Received: (from ian@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6NEwjgL035684; Mon, 23 Jul 2018 14:58:45 GMT (envelope-from ian@FreeBSD.org) Message-Id: <201807231458.w6NEwjgL035684@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ian set sender to ian@FreeBSD.org using -f From: Ian Lepore Date: Mon, 23 Jul 2018 14:58:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336638 - head/usr.sbin/pw X-SVN-Group: head X-SVN-Commit-Author: ian X-SVN-Commit-Paths: head/usr.sbin/pw X-SVN-Commit-Revision: 336638 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jul 2018 14:58:46 -0000 Author: ian Date: Mon Jul 23 14:58:44 2018 New Revision: 336638 URL: https://svnweb.freebsd.org/changeset/base/336638 Log: Revert r336625 until I figure out why it worked with simple testing but reportedly fails the kyua tests and causes other real-world problems. Reported by: cy@ asomers@ Modified: head/usr.sbin/pw/pw_vpw.c Modified: head/usr.sbin/pw/pw_vpw.c ============================================================================== --- head/usr.sbin/pw/pw_vpw.c Mon Jul 23 13:36:17 2018 (r336637) +++ head/usr.sbin/pw/pw_vpw.c Mon Jul 23 14:58:44 2018 (r336638) @@ -39,13 +39,10 @@ static const char rcsid[] = #include #include #include -#include #include "pwupd.h" static FILE * pwd_fp = NULL; -static int pwd_scanflag; -static const char *pwd_filename; void vendpwent(void) @@ -74,18 +71,7 @@ vnextpwent(char const *nam, uid_t uid, int doclose) line = NULL; linecap = 0; - if (pwd_fp == NULL) { - if (geteuid() == 0) { - pwd_filename = _MASTERPASSWD; - pwd_scanflag = PWSCAN_MASTER; - } else { - pwd_filename = _PASSWD; - pwd_scanflag = 0; - } - pwd_fp = fopen(getpwpath(pwd_filename), "r"); - } - - if (pwd_fp != NULL) { + if (pwd_fp != NULL || (pwd_fp = fopen(getpwpath(_MASTERPASSWD), "r")) != NULL) { while ((linelen = getline(&line, &linecap, pwd_fp)) > 0) { /* Skip comments and empty lines */ if (*line == '\n' || *line == '#') @@ -93,10 +79,10 @@ vnextpwent(char const *nam, uid_t uid, int doclose) /* trim latest \n */ if (line[linelen - 1 ] == '\n') line[linelen - 1] = '\0'; - pw = pw_scan(line, pwd_scanflag); + pw = pw_scan(line, PWSCAN_MASTER); if (pw == NULL) errx(EXIT_FAILURE, "Invalid user entry in '%s':" - " '%s'", getpwpath(pwd_filename), line); + " '%s'", getpwpath(_MASTERPASSWD), line); if (uid != (uid_t)-1) { if (uid == pw->pw_uid) break; @@ -112,18 +98,6 @@ vnextpwent(char const *nam, uid_t uid, int doclose) vendpwent(); } free(line); - - /* - * If we read the non-master passwd, some fields may not have been - * populated. Clean them up so that the output looks the same as that - * generated using getpwnam() which also inits them to these values. - */ - if (!(pw->pw_fields & _PWF_CLASS)) - pw->pw_class = ""; - if (!(pw->pw_fields & _PWF_CHANGE)) - pw->pw_change = 0; - if (!(pw->pw_fields & _PWF_EXPIRE)) - pw->pw_expire = 0; return (pw); }