From 113f96dd0b474be365581b0637ca15cb2fc850e6 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Fri, 20 Jun 2014 10:34:32 +0000 Subject: [PATCH] Removed compatibility with pre FreeBSD 2.2 pw_mkdb command Fix some broken indentattion PR: 189173 Submitted by: fullermd@over-yonder.net MFC after: 1 week --- usr.sbin/pw/pwupd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/usr.sbin/pw/pwupd.c b/usr.sbin/pw/pwupd.c index 22662dbd0b34..735f3855748b 100644 --- a/usr.sbin/pw/pwupd.c +++ b/usr.sbin/pw/pwupd.c @@ -45,9 +45,6 @@ static const char rcsid[] = #include "pwupd.h" -#define HAVE_PWDB_C 1 -#define HAVE_PWDB_U 1 - static char pathpwd[] = _PATH_PWD; static char * pwpath = pathpwd; @@ -112,22 +109,14 @@ pw_update(struct passwd * pwd, char const * user) { int rc = 0; - /* - * 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);