diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index f502027f04353e115dd427cdd429816569a16116..b45ef878873b1b0dc943dbe38efa0555d6d042d2 100644 (file)
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
} /* exit_version */
static int
-execute_commands(sdb_client_t *client, sdb_llist_t *commands)
+execute_commands(sdb_input_t *input, sdb_llist_t *commands)
{
sdb_llist_iter_t *iter;
int status = 0;
while (sdb_llist_iter_has_next(iter)) {
sdb_object_t *obj = sdb_llist_iter_get_next(iter);
- if (sdb_client_send(client, SDB_CONNECTION_QUERY,
+ if (sdb_client_send(input->client, SDB_CONNECTION_QUERY,
(uint32_t)strlen(obj->name), obj->name) <= 0) {
sdb_log(SDB_LOG_ERR, "Failed to send command '%s' to server",
obj->name);
* but eventually see the reply to the query, which is either DATA or
* ERROR. */
while (42) {
- status = sdb_command_print_reply(client);
+ status = sdb_command_print_reply(input);
if (status < 0) {
sdb_log(SDB_LOG_ERR, "Failed to read reply from server");
break;
sdb_input_reset(&input);
exit(1);
}
+ input.input = sdb_strbuf_create(2048);
+ sdb_input_init(&input);
+
canonicalize_ssl_options();
if (sdb_client_set_ssl_options(input.client, &ssl_options)) {
sdb_log(SDB_LOG_ERR, "Failed to apply SSL options");
}
if (commands) {
- int status = execute_commands(input.client, commands);
+ int status;
+ input.interactive = 0;
+ status = execute_commands(&input, commands);
sdb_llist_destroy(commands);
sdb_input_reset(&input);
if ((status != SDB_CONNECTION_OK) && (status != SDB_CONNECTION_DATA))
}
}
- input.input = sdb_strbuf_create(2048);
- sdb_input_init(&input);
sdb_input_mainloop();
sdb_client_shutdown(input.client, SHUT_WR);
while (! sdb_client_eof(input.client)) {
/* wait for remaining data to arrive */
- sdb_command_print_reply(input.client);
+ sdb_command_print_reply(&input);
}
if (hist_file[0] != '\0') {