From: Timo Sirainen <tss@iki.fi>
Date: Thu, 6 Mar 2003 21:44:31 +0000 (+0200)
Subject: We didn't work at all in non-inetd mode. Also fix crash when quitting.
X-Git-Tag: 1.1.alpha1~4825
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f966ee38d124336a224184482e2549e46bbb8c9;p=thirdparty%2Fdovecot%2Fcore.git

We didn't work at all in non-inetd mode. Also fix crash when quitting.

--HG--
branch : HEAD
---

diff --git a/src/imap-login/client.c b/src/imap-login/client.c
index 254ec881fa..02fa27c038 100644
--- a/src/imap-login/client.c
+++ b/src/imap-login/client.c
@@ -385,9 +385,6 @@ void client_destroy(struct imap_client *client, const char *reason)
 
 	hash_remove(clients, client);
 
-	imap_parser_destroy(client->parser);
-	client->parser = NULL;
-
 	i_stream_close(client->input);
 	o_stream_close(client->output);
 
@@ -414,6 +411,8 @@ int client_unref(struct imap_client *client)
 	if (--client->refcount > 0)
 		return TRUE;
 
+	imap_parser_destroy(client->parser);
+
 	i_stream_unref(client->input);
 	o_stream_unref(client->output);
 
diff --git a/src/login-common/main.c b/src/login-common/main.c
index 7d324a1d01..fffdc2c96f 100644
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -64,8 +64,7 @@ void main_close_listen(void)
 	}
 
 	closing_down = TRUE;
-	if (!is_inetd)
-		master_notify_finished();
+	master_notify_finished();
 }
 
 static void sig_quit(int signo __attr_unused__)
@@ -206,9 +205,9 @@ static void main_deinit(void)
 
 	ssl_proxy_deinit();
 
+	auth_connection_deinit();
 	clients_deinit();
 	master_deinit();
-	auth_connection_deinit();
 
 	closelog();
 }
@@ -270,10 +269,9 @@ int main(int argc __attr_unused__, char *argv[], char *envp[])
 		}
 
 		master_init(master_fd, FALSE);
+		closing_down = TRUE;
 	}
 
-	main_close_listen();
-
 	if (fd != -1)
 		(void)client_create(fd, &ip, TRUE);