From 1814aec611a5f9e03eceee81237ad3a3f51c954a Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Wed, 26 Oct 2011 23:56:54 +0000 Subject: Fix whitespace issues Cleanup trailing whitespaces, indentation that uses spaces before tabs, and blank lines at EOF. Make the project free of warnings reported by git diff --check 4b825dc642cb6eb9a060e54bf8d69288fbee4904 HEAD --- modules/pam_userdb/Makefile.am | 1 - modules/pam_userdb/create.pl | 4 +--- modules/pam_userdb/pam_userdb.c | 10 +++++----- modules/pam_userdb/pam_userdb.h | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) (limited to 'modules/pam_userdb') diff --git a/modules/pam_userdb/Makefile.am b/modules/pam_userdb/Makefile.am index b05cc6c6..77cc9608 100644 --- a/modules/pam_userdb/Makefile.am +++ b/modules/pam_userdb/Makefile.am @@ -35,4 +35,3 @@ noinst_DATA = README pam_userdb.8 README: pam_userdb.8.xml -include $(top_srcdir)/Make.xml.rules endif - diff --git a/modules/pam_userdb/create.pl b/modules/pam_userdb/create.pl index 224204b7..06915c92 100644 --- a/modules/pam_userdb/create.pl +++ b/modules/pam_userdb/create.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -# this program creates a database in ARGV[1] from pairs given on +# this program creates a database in ARGV[1] from pairs given on # stdandard input # # $Id$ @@ -19,5 +19,3 @@ while () { $lusers{$user} = $pass; } untie %lusers; - - diff --git a/modules/pam_userdb/pam_userdb.c b/modules/pam_userdb/pam_userdb.c index 11b0d6bd..c075c4b5 100644 --- a/modules/pam_userdb/pam_userdb.c +++ b/modules/pam_userdb/pam_userdb.c @@ -145,7 +145,7 @@ _pam_parse (pam_handle_t *pamh, int argc, const char **argv, * return values: * 1 = User not found * 0 = OK - * -1 = Password incorrect + * -1 = Password incorrect * -2 = System error */ static int @@ -362,12 +362,12 @@ pam_sm_authenticate(pam_handle_t *pamh, int flags UNUSED, retval = pam_get_item(pamh, PAM_AUTHTOK, &password); if (retval != PAM_SUCCESS || password == NULL) { if ((ctrl & PAM_TRY_FPASS_ARG) != 0) { - /* Converse to obtain a password */ - retval = obtain_authtok(pamh); - if (retval != PAM_SUCCESS) { + /* Converse to obtain a password */ + retval = obtain_authtok(pamh); + if (retval != PAM_SUCCESS) { pam_syslog(pamh, LOG_ERR, "can not obtain password from user"); return retval; - } + } retval = pam_get_item(pamh, PAM_AUTHTOK, &password); } if (retval != PAM_SUCCESS || password == NULL) { diff --git a/modules/pam_userdb/pam_userdb.h b/modules/pam_userdb/pam_userdb.h index 4cd81baf..3cd8fee0 100644 --- a/modules/pam_userdb/pam_userdb.h +++ b/modules/pam_userdb/pam_userdb.h @@ -2,7 +2,7 @@ #ifndef _PAM_USERSDB_H #define _PAM_USERSDB_H /* $Id$ */ - + /* Header files */ #include -- cgit v1.2.3