[dovecot-cvs] dovecot/src/login-common main.c,1.23,1.24

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/login-common
In directory talvi:/tmp/cvs-serv13430

Modified Files:
	main.c 
Log Message:
inetd startup wasn't working. Patch by Magnus Holmgren.



Index: main.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/login-common/main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- main.c	18 Oct 2004 19:21:47 -0000	1.23
+++ main.c	30 Jan 2005 08:58:19 -0000	1.24
@@ -235,7 +235,7 @@
 	struct ip_addr ip, local_ip;
 	struct ssl_proxy *proxy = NULL;
 	struct client *client;
-	int i, fd = -1, master_fd = -1;
+	int i, fd = -1, master_fd = -1, ssl = FALSE;
 
 	is_inetd = getenv("DOVECOT_MASTER") == NULL;
 
@@ -285,6 +285,7 @@
 				fd = ssl_proxy_new(fd, &ip, &proxy);
 				if (fd == -1)
 					return 1;
+				ssl = TRUE;
 			} else if (strncmp(argv[i], "--group=", 8) != 0)
 				i_fatal("Unknown parameter: %s", argv[i]);
 		}
@@ -293,7 +294,7 @@
 		closing_down = TRUE;
 
 		if (fd != -1) {
-			client = client_create(fd, TRUE, &local_ip, &ip);
+			client = client_create(fd, ssl, &local_ip, &ip);
 			client->proxy = proxy;
 		}
 	}