Replace direct use of RC4 by stream cipher abstraction.

[paraslash.git] / afs.c

diff --git a/afs.c b/afs.c
index 2b748f255fb0f494bfac0eb786e756b7d9509123..c5a088cb00dd1c340563b79beecd80d5d8504a2b 100644 (file)
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -9,7 +9,6 @@
 #include <regex.h>
 #include <signal.h>
 #include <fnmatch.h>
-#include <openssl/rc4.h>
 #include <osl.h>
 
 #include "server.cmdline.h"
@@ -233,7 +232,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
        *(uint32_t *) buf = afs_socket_cookie;
        *(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
 
-       ret = create_remote_socket(conf.afs_socket_arg);
+       ret = connect_local_socket(conf.afs_socket_arg);
        if (ret < 0)
                goto out;
        fd = ret;
@@ -468,7 +467,6 @@ again:
        }
        ret = open_and_update_audio_file(aft_row, score, &afd);
        if (ret < 0) {
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
                ret = score_delete(aft_row);
                if (ret < 0) {
                        PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -951,7 +949,7 @@ static void register_command_task(uint32_t cookie)
 
        ct->task.pre_select = command_pre_select;
        ct->task.post_select = command_post_select;
-       sprintf(ct->task.status, "command task");
+       sprintf(ct->task.status, "afs command task");
        register_task(&ct->task);
 }