new queries to support hosttable in moira

[moira.git] / update / client.c

diff --git a/update/client.c b/update/client.c
index b0ed64e4cad1491e88955fd54a88f31b9c3a0304..29b9925bcae18a0faee48159fd10329ce14d17b5 100644 (file)
--- a/update/client.c
+++ b/update/client.c
@@ -145,14 +145,13 @@ char *instructions;
     com_err(whoami, 0, "starting update for %s", service_updated);
     
     /* open connection */
-    conn = start_server_connection(service_address, 0);
+    gdb_Options |= GDB_OPT_KEEPALIVE;
+    conn = start_server_connection(service_address, "");
     if (!conn || (connection_status(conn) == CON_STOPPED)) {
        com_err(whoami, connection_errno(conn),
                " can't connect to update %s", service_address);
        return(MR_CANT_CONNECT);
     }
-    on = 1;
-    setsockopt(conn->in.fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on));
     
     /* send authenticators */
     code = send_auth(machine);
@@ -162,14 +161,14 @@ char *instructions;
        goto update_failed;
     }
     
-    code = send_file(pathname, target_path);
+    code = send_file(pathname, target_path, 0);
     if (code)
       goto update_failed;
 
     /* send instructions for installation */
     strcpy(buf, "/tmp/moira-update.XXXXXX");
     mktemp(buf);
-    code = send_file(instructions, buf);
+    code = send_file(instructions, buf, 0);
     if (code)
       goto update_failed;