From owner-freebsd-bugs@FreeBSD.ORG Thu May 1 09:10:01 2014 Return-Path: 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 2C50FBFA for ; Thu, 1 May 2014 09:10: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 07C4B1214 for ; Thu, 1 May 2014 09:10: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 s419A0Hv049467 for ; Thu, 1 May 2014 09:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s419A0d8049466; Thu, 1 May 2014 09:10:00 GMT (envelope-from gnats) Resent-Date: Thu, 1 May 2014 09:10:00 GMT Resent-Message-Id: <201405010910.s419A0d8049466@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Matthew D.Fuller" 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 2CD3CBD6 for ; Thu, 1 May 2014 09:08:21 +0000 (UTC) Received: from thyme.infocus-llc.com (server.infocus-llc.com [206.156.254.44]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client CN "*.infocus-llc.com", Issuer "*.infocus-llc.com" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 077C61205 for ; Thu, 1 May 2014 09:08:20 +0000 (UTC) Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net [75.65.60.66]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by thyme.infocus-llc.com (Postfix) with ESMTPSA id 04B9537B515 for ; Thu, 1 May 2014 04:08:20 -0500 (CDT) Received: by draco.over-yonder.net (Postfix, from userid 100) id 3gK9jv42Tnz2VT; Thu, 1 May 2014 04:08:19 -0500 (CDT) Message-Id: <3gK9jv42Tnz2VT@draco.over-yonder.net> Date: Thu, 1 May 2014 04:08:19 -0500 (CDT) From: "Matthew D.Fuller" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: 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" List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2014 09:10:01 -0000 >Number: 189173 >Category: bin >Synopsis: [PATCH] Minor cosmetic cleanup of usr.sbin/pw/pwupd.c >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu May 01 09:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Matthew D. Fuller >Release: FreeBSD 9.1-STABLE amd64 >Organization: >Environment: System: FreeBSD draco.over-yonder.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r251584: Sun Jun 9 14:23:33 CDT 2013 root@draco.over-yonder.net:/usr/obj/usr/src/sys/DRACO amd64 >Description: - I don't think we care about portability of this code to versions prior to 2.2 anymore. - Fix some broken indentation. >How-To-Repeat: >Fix: Index: pwupd.c =================================================================== --- pwupd.c (revision 264991) +++ pwupd.c (working copy) @@ -114,20 +114,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); >Release-Note: >Audit-Trail: >Unformatted: