[kbd] [PATCH 1/2] vlock: move some code around
Dmitry V. Levin
ldv at altlinux.org
Fri Jan 23 20:47:55 MSK 2015
Move the code that handles PAM_MAXTRIES and PAM_ABORT cases before the
code that handles PAM_INCOMPLETE case. This no-op change is only needed
to make the next change easier to read.
---
src/vlock/auth.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/vlock/auth.c b/src/vlock/auth.c
index da135ce..dc47ee8 100644
--- a/src/vlock/auth.c
+++ b/src/vlock/auth.c
@@ -130,6 +130,19 @@ get_password (pam_handle_t * pamh, const char *username, const char *tty)
locked_name (), tty, username, uid);
return EXIT_SUCCESS;
+ case PAM_MAXTRIES:
+ case PAM_ABORT:
+ msg = pam_strerror (pamh, rc);
+ /* Log the fact of failure. */
+ syslog (LOG_WARNING, "%s", msg);
+ printf ("%s.\n\n\n", msg);
+ fflush (stdout);
+ msg = 0;
+ pam_end (pamh, rc);
+ pamh = 0;
+ sleep (LONG_DELAY);
+ break;
+
case PAM_INCOMPLETE:
/*
* EOF encountered on read?
@@ -149,19 +162,6 @@ get_password (pam_handle_t * pamh, const char *username, const char *tty)
locked_name (), tty, username, uid);
return EXIT_FAILURE;
- case PAM_MAXTRIES:
- case PAM_ABORT:
- msg = pam_strerror (pamh, rc);
- /* Log the fact of failure. */
- syslog (LOG_WARNING, "%s", msg);
- printf ("%s.\n\n\n", msg);
- fflush (stdout);
- msg = 0;
- pam_end (pamh, rc);
- pamh = 0;
- sleep (LONG_DELAY);
- break;
-
default:
printf ("%s.\n\n\n", pam_strerror (pamh, rc));
fflush (stdout);
--
ldv
More information about the kbd
mailing list