From: Pascal Volk <user@localhost.localdomain.org>
Date: Wed, 30 Jun 2010 18:49:23 +0000 (+0000)
Subject: imap, pop3: Added an assert to client_connected().
X-Git-Tag: 2.0.rc1~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6469403946bdf147886daba5ee8de07516c32238;p=thirdparty%2Fdovecot%2Fcore.git

imap, pop3: Added an assert to client_connected().

--HG--
branch : HEAD
---

diff --git a/src/imap/main.c b/src/imap/main.c
index bf9f084fa0..149518778c 100644
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -278,12 +278,11 @@ static void login_client_failed(const struct master_login_client *client,
 
 static void client_connected(struct master_service_connection *conn)
 {
-	if (master_login == NULL) {
-		/* running standalone, we shouldn't even get here */
-	} else {
-		master_service_client_connection_accept(conn);
-		master_login_add(master_login, conn->fd);
-	}
+	/* when running standalone, we shouldn't even get here */
+	i_assert(master_login != NULL);
+
+	master_service_client_connection_accept(conn);
+	master_login_add(master_login, conn->fd);
 }
 
 int main(int argc, char *argv[])
diff --git a/src/pop3/main.c b/src/pop3/main.c
index a9f7d43e48..1cb55b065a 100644
--- a/src/pop3/main.c
+++ b/src/pop3/main.c
@@ -174,12 +174,11 @@ static void login_client_failed(const struct master_login_client *client,
 
 static void client_connected(struct master_service_connection *conn)
 {
-	if (master_login == NULL) {
-		/* running standalone, we shouldn't even get here */
-	} else {
-		master_service_client_connection_accept(conn);
-		master_login_add(master_login, conn->fd);
-	}
+	/* when running standalone, we shouldn't even get here */
+	i_assert(master_login != NULL);
+
+	master_service_client_connection_accept(conn);
+	master_login_add(master_login, conn->fd);
 }
 
 int main(int argc, char *argv[])