From owner-svn-src-head@freebsd.org  Wed Oct  4 01:12:27 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0F63E2A02B;
 Wed,  4 Oct 2017 01:12:27 +0000 (UTC) (envelope-from cem@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 mx1.freebsd.org (Postfix) with ESMTPS id 7EACE6BC02;
 Wed,  4 Oct 2017 01:12:27 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v941CQ2H042710;
 Wed, 4 Oct 2017 01:12:26 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v941CQxp042709;
 Wed, 4 Oct 2017 01:12:26 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201710040112.v941CQxp042709@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: Conrad Meyer <cem@FreeBSD.org>
Date: Wed, 4 Oct 2017 01:12:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324244 - head/usr.bin/chpass
X-SVN-Group: head
X-SVN-Commit-Author: cem
X-SVN-Commit-Paths: head/usr.bin/chpass
X-SVN-Commit-Revision: 324244
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Oct 2017 01:12:27 -0000

Author: cem
Date: Wed Oct  4 01:12:26 2017
New Revision: 324244
URL: https://svnweb.freebsd.org/changeset/base/324244

Log:
  chpass(1): Check crypt(3) return and handle error appropriately
  
  This change is spiritually similar to the earlier r231994.
  
  PR:		222756
  Submitted by:	Lubos Boucek <bouceklubos AT gmail.com>
  Obtained from:	DragonflyBSD 2020c8fec4168a5020f984a093224fade3074b25

Modified:
  head/usr.bin/chpass/chpass.c

Modified: head/usr.bin/chpass/chpass.c
==============================================================================
--- head/usr.bin/chpass/chpass.c	Tue Oct  3 22:57:19 2017	(r324243)
+++ head/usr.bin/chpass/chpass.c	Wed Oct  4 01:12:26 2017	(r324244)
@@ -82,7 +82,7 @@ main(int argc, char *argv[])
 	struct passwd lpw, *old_pw, *pw;
 	int ch, pfd, tfd;
 	const char *password;
-	char *arg = NULL;
+	char *arg = NULL, *cryptpw;
 	uid_t uid;
 #ifdef YP
 	struct ypclnt *ypclnt;
@@ -228,8 +228,8 @@ main(int argc, char *argv[])
 
 	if (old_pw && !master_mode) {
 		password = getpass("Password: ");
-		if (strcmp(crypt(password, old_pw->pw_passwd),
-		    old_pw->pw_passwd) != 0)
+		cryptpw = crypt(password, old_pw->pw_passwd);
+		if (cryptpw == NULL || strcmp(cryptpw, old_pw->pw_passwd) != 0)
 			baduser();
 	} else {
 		password = "";