X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftools%2Fsysdb%2Fcommand.c;h=be41b15f9d92557588df6b9fefc326a261a80844;hb=56b97a180a53aecbfe9f7162b8ece3faae973cf9;hp=77f3c8346498c430be10fcbafcf1ab9a06ee5cc2;hpb=2b9b5d989993f6f9fe925da883757e92a8f00b9b;p=sysdb.git

diff --git a/src/tools/sysdb/command.c b/src/tools/sysdb/command.c
index 77f3c83..be41b15 100644
--- a/src/tools/sysdb/command.c
+++ b/src/tools/sysdb/command.c
@@ -58,19 +58,19 @@ sdb_command_print_reply(sdb_client_t *client)
 	if (! recv_buf)
 		return -1;
 
-	if (sdb_client_recv(client, &rcode, recv_buf) < 0) {
+	if (sdb_client_recv(client, &rcode, recv_buf) < 0)
 		rcode = UINT32_MAX;
-		status = -1;
-	}
 
 	if (sdb_client_eof(client))
 		return -1;
 
-	if (rcode == CONNECTION_ERROR)
-		status = 1;
-
-	if (rcode == UINT32_MAX)
+	if (rcode == UINT32_MAX) {
 		printf("ERROR: ");
+		status = -1;
+	}
+	else
+		status = (int)rcode;
+
 	result = sdb_strbuf_string(recv_buf);
 	if (result && *result)
 		printf("%s\n", result);
@@ -109,6 +109,12 @@ sdb_command_exec(sdb_input_t *input)
 		/* ignore errors; we'll only hide the command from the caller */
 
 		sdb_client_send(input->client, CONNECTION_QUERY, query_len, query);
+
+		/* The server will send back *something*, either error/log messages
+		 * and/or the reply to the query. Here, we don't care about what it
+		 * sends back. We'll wait for the first reply and then return to the
+		 * main loop which will handle any subsequent replies, including
+		 * eventually the reply to the query (if it's not the first reply). */
 		if (sdb_command_print_reply(input->client) < 0)
 			return NULL;
 	}