Merged branch 'master' of git://git.tokkee.org/sysdb.

[sysdb.git] / src / frontend / connection.c

diff --git a/src/frontend/connection.c b/src/frontend/connection.c
index aa0325570171c9f6f0807edc92c953ace241004d..a146e29711c3aa1cc4de78f59672d43ee52091e6 100644 (file)
--- a/src/frontend/connection.c
+++ b/src/frontend/connection.c
@@ -265,14 +265,12 @@ command_handle(sdb_conn_t *conn)
 
        if ((! conn->username) && (conn->cmd != CONNECTION_STARTUP)) {
                const char *errmsg = "Authentication required";
+               sdb_strbuf_sprintf(conn->errbuf, errmsg);
                sdb_connection_send(conn, CONNECTION_ERROR,
                                (uint32_t)strlen(errmsg), errmsg);
                return -1;
        }
 
-       /* reset */
-       sdb_strbuf_sprintf(conn->errbuf, "");
-
        switch (conn->cmd) {
                case CONNECTION_PING:
                        status = sdb_connection_ping(conn);
@@ -359,12 +357,6 @@ command_handle(sdb_conn_t *conn)
                sdb_connection_send(conn, CONNECTION_ERROR,
                                (uint32_t)sdb_strbuf_len(conn->errbuf),
                                sdb_strbuf_string(conn->errbuf));
-
-       /* remove the command from the buffer */
-       if (conn->cmd_len)
-               sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
-       conn->cmd = CONNECTION_IDLE;
-       conn->cmd_len = 0;
        return status;
 } /* command_handle */
 
@@ -376,12 +368,17 @@ command_init(sdb_conn_t *conn)
 
        assert(conn && (conn->cmd == CONNECTION_IDLE) && (! conn->cmd_len));
 
+       /* reset */
+       sdb_strbuf_sprintf(conn->errbuf, "");
+
        conn->cmd = connection_get_int32(conn, 0);
        conn->cmd_len = connection_get_int32(conn, sizeof(uint32_t));
 
        len = 2 * sizeof(uint32_t);
-       if (conn->cmd == CONNECTION_IDLE)
+       if (conn->cmd == CONNECTION_IDLE) {
                len += conn->cmd_len;
+               conn->cmd_len = 0;
+       }
        sdb_strbuf_skip(conn->buf, 0, len);
        return 0;
 } /* command_init */
@@ -468,9 +465,16 @@ sdb_connection_read(sdb_conn_t *conn)
                                && (sdb_strbuf_len(conn->buf) >= 2 * sizeof(int32_t)))
                        command_init(conn);
                if ((conn->cmd != CONNECTION_IDLE)
-                               && (sdb_strbuf_len(conn->buf) >= conn->cmd_len))
+                               && (sdb_strbuf_len(conn->buf) >= conn->cmd_len)) {
                        command_handle(conn);
 
+                       /* remove the command from the buffer */
+                       if (conn->cmd_len)
+                               sdb_strbuf_skip(conn->buf, 0, conn->cmd_len);
+                       conn->cmd = CONNECTION_IDLE;
+                       conn->cmd_len = 0;
+               }
+
                if (status <= 0)
                        break;