bin/189173: [PATCH] Minor cosmetic cleanup of usr.sbin/pw/pwupd.c

[Matthew D.Fuller]

>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 at 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: