Merge branch 'maint'

[paraslash.git] / client.c

diff --git a/client.c b/client.c
index fdd07b247e617c86d3f38ff059d8bb8672356a9c..ebe33898bc0154665f7ae037e0102f163903b4ba 100644 (file)
--- a/client.c
+++ b/client.c
@@ -6,9 +6,13 @@
 
 /** \file client.c the client program used to connect to para_server */
 
+#include <regex.h>
+#include <openssl/rc4.h>
+
 #include "para.h"
 #include "list.h"
 #include "sched.h"
+#include "crypt.h"
 #include "client.cmdline.h"
 #include "string.h"
 #include "stdin.h"
@@ -40,7 +44,7 @@ static void supervisor_post_select(__a_unused struct sched *s, struct task *t)
        }
        if (ct->status == CL_RECEIVING) {
                stdout_set_defaults(&sot);
-               sot.buf = ct->buf;
+               sot.bufp = &ct->buf;
                sot.loaded = &ct->loaded;
                sot.input_error = &ct->task.error;
                register_task(&sot.task);
@@ -78,12 +82,12 @@ int main(int argc, char *argv[])
        int ret;
        static struct sched s;
 
+       init_random_seed_or_die();
        s.default_timeout.tv_sec = 1;
        s.default_timeout.tv_usec = 0;
-       ret = client_open(argc, argv, &ct);
+       ret = client_open(argc, argv, &ct, &client_loglevel);
        if (ret < 0) /* can not use PARA_LOG here because ct is NULL */
                exit(EXIT_FAILURE);
-       client_loglevel = get_loglevel_by_name(ct->conf.loglevel_arg);
        register_task(&svt);
        ret = schedule(&s);
        if (ret < 0)