From: Karel Zak <kzak@redhat.com>
Date: Wed, 5 Oct 2011 11:38:15 +0000 (+0200)
Subject: login: use LOGIN_TIMEOUT from login.defs
X-Git-Tag: v2.21-rc1~285
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9abd9cded9682414071a8468ff6fbd653edf7829;p=thirdparty%2Futil-linux.git

login: use LOGIN_TIMEOUT from login.defs

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/login-utils/login.1 b/login-utils/login.1
index 8aba16f59d..ef71539c4a 100644
--- a/login-utils/login.1
+++ b/login-utils/login.1
@@ -133,6 +133,11 @@ Note that the same functionality is also provided by
 .BR pam_motd (8)
 PAM module.
 .RE
+.PP
+\fBLOGIN_TIMEOUT\fR (number)
+.RS 4
+Max time in seconds for login. The default value is 60.
+.RE
 
 .SH FILES
 .nf
diff --git a/login-utils/login.c b/login-utils/login.c
index 6e7e4e27c3..eece2e4f98 100644
--- a/login-utils/login.c
+++ b/login-utils/login.c
@@ -1105,6 +1105,8 @@ int main(int argc, char **argv)
 		.conv = { misc_conv, NULL }	/* PAM conversation function */
 	};
 
+	timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
+
 	signal(SIGALRM, timedout);
 	siginterrupt(SIGALRM, 1);	/* we have to interrupt syscalls like ioclt() */
 	alarm((unsigned int)timeout);