sysdb: Do an attempt to reconnect on all user input.

[sysdb.git] / src / tools / sysdb / main.c

diff --git a/src/tools/sysdb/main.c b/src/tools/sysdb/main.c
index 331cfa25e640912ac79ac6b37c44d3a91f374323..6e10e8d9fd87d937a3d668566f9f4fccf7bbcd7d 100644 (file)
--- a/src/tools/sysdb/main.c
+++ b/src/tools/sysdb/main.c
@@ -185,7 +185,7 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
        while (sdb_llist_iter_has_next(iter)) {
                sdb_object_t *obj = sdb_llist_iter_get_next(iter);
 
-               if (sdb_client_send(client, CONNECTION_QUERY,
+               if (sdb_client_send(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);
@@ -203,9 +203,10 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
                                break;
                        }
 
-                       if ((status == CONNECTION_DATA) || (status == CONNECTION_ERROR))
+                       if ((status == SDB_CONNECTION_DATA)
+                                       || (status == SDB_CONNECTION_ERROR))
                                break;
-                       if (status == CONNECTION_OK) {
+                       if (status == SDB_CONNECTION_OK) {
                                /* pre 0.4 versions used OK instead of DATA */
                                sdb_log(SDB_LOG_WARNING, "Received unexpected OK status from "
                                                "server in response to a QUERY (expected DATA); "
@@ -214,7 +215,7 @@ execute_commands(sdb_client_t *client, sdb_llist_t *commands)
                        }
                }
 
-               if ((status != CONNECTION_OK) && (status != CONNECTION_DATA))
+               if ((status != SDB_CONNECTION_OK) && (status != SDB_CONNECTION_DATA))
                        break; /* error */
        }
 
@@ -226,7 +227,6 @@ int
 main(int argc, char **argv)
 {
        const char *host = NULL;
-       const char *user = NULL;
 
        const char *homedir;
        char hist_file[1024] = "";
@@ -245,7 +245,7 @@ main(int argc, char **argv)
                                host = optarg;
                                break;
                        case 'U':
-                               user = optarg;
+                               input.user = optarg;
                                break;
 
                        case 'c':
@@ -288,9 +288,9 @@ main(int argc, char **argv)
 
        if (! host)
                host = DEFAULT_SOCKET;
-       if (! user) {
-               user = get_current_user();
-               if (! user)
+       if (! input.user) {
+               input.user = get_current_user();
+               if (! input.user)
                        exit(1);
        }
 
@@ -299,7 +299,7 @@ main(int argc, char **argv)
                sdb_log(SDB_LOG_ERR, "Failed to create client object");
                exit(1);
        }
-       if (sdb_client_connect(input.client, user)) {
+       if (sdb_client_connect(input.client, input.user)) {
                sdb_log(SDB_LOG_ERR, "Failed to connect to SysDBd");
                sdb_client_destroy(input.client);
                exit(1);
@@ -309,7 +309,7 @@ main(int argc, char **argv)
                int status = execute_commands(input.client, commands);
                sdb_llist_destroy(commands);
                sdb_client_destroy(input.client);
-               if ((status != CONNECTION_OK) && (status != CONNECTION_DATA))
+               if ((status != SDB_CONNECTION_OK) && (status != SDB_CONNECTION_DATA))
                        exit(1);
                exit(0);
        }
@@ -320,7 +320,7 @@ main(int argc, char **argv)
 
        using_history();
 
-       if ((homedir = get_homedir(user))) {
+       if ((homedir = get_homedir(input.user))) {
                snprintf(hist_file, sizeof(hist_file) - 1,
                                "%s/.sysdb_history", homedir);
                hist_file[sizeof(hist_file) - 1] = '\0';