From owner-freebsd-bugs@FreeBSD.ORG  Thu May  1 09:30:01 2014
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@smarthost.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 84EEC135
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Thu,  1 May 2014 09:30:01 +0000 (UTC)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2001:1900:2254:206c::16:87])
 (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 72AE413B3
 for <freebsd-bugs@smarthost.ysv.freebsd.org>;
 Thu,  1 May 2014 09:30:01 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
 by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s419U1c8057098
 for <freebsd-bugs@freefall.freebsd.org>; Thu, 1 May 2014 09:30:01 GMT
 (envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
 by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s419U1ko057097;
 Thu, 1 May 2014 09:30:01 GMT (envelope-from gnats)
Date: Thu, 1 May 2014 09:30:01 GMT
Message-Id: <201405010930.s419U1ko057097@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
Cc: 
From: "Matthew D.Fuller" <fullermd@over-yonder.net>
Subject: Re: bin/189173: [PATCH] Minor cosmetic cleanup of usr.sbin/pw/pwupd.c
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: "Matthew D.Fuller" <fullermd@over-yonder.net>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs/>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
 <mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 May 2014 09:30:01 -0000

The following reply was made to PR bin/189173; it has been noted by GNATS.

From: "Matthew D.Fuller" <fullermd@over-yonder.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:  
Subject: Re: bin/189173: [PATCH] Minor cosmetic cleanup of usr.sbin/pw/pwupd.c
Date: Thu, 1 May 2014 04:19:51 -0500

 Actually the #define's related to this can go away too; use of
 HAVE_PWDB_C is removed by this, and HAVE_PWDB_U is unused since
 r242349.
 
 
 Index: pwupd.c
 ===================================================================
 --- pwupd.c	(revision 264991)
 +++ pwupd.c	(working copy)
 @@ -45,9 +45,6 @@
  
  #include "pwupd.h"
  
 -#define HAVE_PWDB_C	1
 -#define	HAVE_PWDB_U	1
 -
  static char pathpwd[] = _PATH_PWD;
  static char * pwpath = pathpwd;
   
 @@ -114,20 +111,15 @@
  
  	/*
  	 * First, let's check the see if the database is alright
 -	 * Note: -C is only available in FreeBSD 2.2 and above
  	 */
 -#ifdef HAVE_PWDB_C
  	rc = pwdb("-C", (char *)NULL);	/* Check only */
  	if (rc == 0) {
 -#else
 -	{				/* No -C */
 -#endif
  		int pfd, tfd;
  		struct passwd *pw = NULL;
  		struct passwd *old_pw = NULL;
  
 -	       	if (pwd != NULL)
 -		       pw = pw_dup(pwd);
 +		if (pwd != NULL)
 +			pw = pw_dup(pwd);
  
  		if (user != NULL)
  			old_pw = GETPWNAM(user);