From 5c47aa72f200a4f2579f6566f79f16a18e6d9c5c Mon Sep 17 00:00:00 2001
From: Karel Zak
Date: Thu, 27 Oct 2011 15:06:49 +0200
Subject: chfn: remove non-PAM code

Signed-off-by: Karel Zak <kzak@redhat.com>
---
 login-utils/chfn.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'login-utils/chfn.c')

diff --git a/login-utils/chfn.c b/login-utils/chfn.c
index 902fe9c81..03985089c 100644
--- a/login-utils/chfn.c
+++ b/login-utils/chfn.c
@@ -33,10 +33,6 @@
 #include <ctype.h>
 #include <getopt.h>
 
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-
 #include "islocal.h"
 #include "setpwnam.h"
 #include "strutils.h"
@@ -51,7 +47,7 @@
 #include "selinux_utils.h"
 #endif
 
-#if defined(REQUIRE_PASSWORD) && defined(HAVE_SECURITY_PAM_MISC_H)
+#ifdef REQUIRE_PASSWORD
 #include <security/pam_appl.h>
 #include <security/pam_misc.h>
 
@@ -64,7 +60,7 @@
 	} \
     } while(0)
 
-#endif
+#endif /* REQUIRE_PASSWORD */
 
 typedef unsigned char boolean;
 #define false 0
@@ -180,7 +176,6 @@ int main (int argc, char **argv) {
     printf (_("Changing finger information for %s.\n"), oldf.username);
 
 #ifdef REQUIRE_PASSWORD
-#ifdef HAVE_SECURITY_PAM_MISC_H
     if(uid != 0) {
 	pam_handle_t *pamh = NULL;
 	struct pam_conv conv = { misc_conv, NULL };
@@ -206,17 +201,6 @@ int main (int argc, char **argv) {
 	/* no need to establish a session; this isn't a session-oriented
 	 * activity... */
     }
-# else /* HAVE_SECURITY_PAM_MISC_H */
-    /* require password, unless root */
-    if(uid != 0 && oldf.pw->pw_passwd && oldf.pw->pw_passwd[0]) {
-	char *pwdstr = getpass(_("Password: "));
-	if(strncmp(oldf.pw->pw_passwd,
-		   crypt(pwdstr, oldf.pw->pw_passwd), 13)) {
-	    puts(_("Incorrect password."));
-	    exit(EXIT_FAILURE);
-	}
-    }
-# endif /* HAVE_SECURITY_PAM_MISC_H */
 #endif /* REQUIRE_PASSWORD */
 
 
-- 
cgit v1.2.3-55-g7522