]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
doveadm: client - Cleanup: Remove unnecessary code indentation
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 9 Nov 2017 14:17:26 +0000 (16:17 +0200)
committerTimo Sirainen <tss@dovecot.fi>
Wed, 15 Nov 2017 20:24:08 +0000 (22:24 +0200)
src/doveadm/server-connection.c

index 7cc62b57182d28d4cd7e0ca380fd11acc154b6d0..13c1d5b95a52f1270739ba4c9bb3eef2a7896067 100644 (file)
@@ -360,45 +360,44 @@ static void server_connection_input(struct server_connection *conn)
                                server_connection_destroy(&conn);
                        }
                        return;
-               } else {
-                       /* Allow VERSION before or after the "+" or "-" line,
-                          because v2.2.33 sent the version after and newer
-                          versions send before. */
-                       if (!conn->version_received &&
-                           strncmp(line, "VERSION\t", 8) == 0) {
-                               if (!version_string_verify_full(line, "doveadm-client",
-                                                               DOVEADM_SERVER_PROTOCOL_VERSION_MAJOR,
-                                                               &conn->minor)) {
-                                       i_error("doveadm server not compatible with this client"
-                                               "(mixed old and new binaries?)");
-                                       server_connection_destroy(&conn);
-                                       return;
-                               }
-                               conn->version_received = TRUE;
-                               continue;
+               }
+               /* Allow VERSION before or after the "+" or "-" line,
+                  because v2.2.33 sent the version after and newer
+                  versions send before. */
+               if (!conn->version_received &&
+                   strncmp(line, "VERSION\t", 8) == 0) {
+                       if (!version_string_verify_full(line, "doveadm-client",
+                                                       DOVEADM_SERVER_PROTOCOL_VERSION_MAJOR,
+                                                       &conn->minor)) {
+                               i_error("doveadm server not compatible with this client"
+                                       "(mixed old and new binaries?)");
+                               server_connection_destroy(&conn);
+                               return;
                        }
-                       if (strcmp(line, "+") == 0) {
-                               if (conn->minor > 0)
-                                       server_connection_start_multiplex(conn);
-                               server_connection_authenticated(conn);
-                               break;
-                       } else if (strcmp(line, "-") == 0) {
-                               if (conn->authenticate_sent) {
-                                       i_error("doveadm authentication failed (%s)",
-                                               line+1);
-                                       server_connection_destroy(&conn);
-                                       return;
-                               }
-                               if (server_connection_authenticate(conn) < 0) {
-                                       server_connection_destroy(&conn);
-                                       return;
-                               }
-                       } else {
-                               i_error("doveadm server sent invalid handshake: %s",
-                                       line);
+                       conn->version_received = TRUE;
+                       continue;
+               }
+               if (strcmp(line, "+") == 0) {
+                       if (conn->minor > 0)
+                               server_connection_start_multiplex(conn);
+                       server_connection_authenticated(conn);
+                       break;
+               } else if (strcmp(line, "-") == 0) {
+                       if (conn->authenticate_sent) {
+                               i_error("doveadm authentication failed (%s)",
+                                       line+1);
                                server_connection_destroy(&conn);
                                return;
                        }
+                       if (server_connection_authenticate(conn) < 0) {
+                               server_connection_destroy(&conn);
+                               return;
+                       }
+               } else {
+                       i_error("doveadm server sent invalid handshake: %s",
+                               line);
+                       server_connection_destroy(&conn);
+                       return;
                }
        }