dovecot-1.2: Reverted previous change, it wasn't correct..

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/f6cff15160d4
changeset: 8072:f6cff15160d4
user:      Timo Sirainen <tss at iki.fi>
date:      Wed Aug 06 12:48:02 2008 -0400
description:
Reverted previous change, it wasn't correct..

diffstat:

1 file changed, 1 insertion(+), 6 deletions(-)
src/login-common/main.c |    7 +------

diffs (27 lines):

diff -r f39a6be7d42a -r f6cff15160d4 src/login-common/main.c
--- a/src/login-common/main.c	Wed Aug 06 12:44:14 2008 -0400
+++ b/src/login-common/main.c	Wed Aug 06 12:48:02 2008 -0400
@@ -252,7 +252,6 @@ static void drop_privileges(void)
 static void drop_privileges(void)
 {
 	const char *value;
-	unsigned int max_fd_per_conn;
 
 	if (!is_inetd)
 		i_set_failure_internal();
@@ -282,14 +281,10 @@ static void drop_privileges(void)
 	value = getenv("MAX_CONNECTIONS");
 	max_connections = value == NULL ? 1 : strtoul(value, NULL, 10);
 
-	/* max fds: connection itself, SSL socketpair, login proxy socketpair */
-	max_fd_per_conn = 1 + (ssl_initialized ? 2 : 0) + 2;
-
 	/* set the number of fds we want to use. it may get increased or
 	   decreased. leave a couple of extra fds for auth sockets and such */
 	restrict_fd_limit(LOGIN_MASTER_SOCKET_FD + 16 +
-			  listen_count + ssl_listen_count +
-			  max_connections * max_fd_per_conn);
+			  listen_count + ssl_listen_count + max_connections);
 
 	/* Refuse to run as root - we should never need it and it's
 	   dangerous with SSL. */