http_send.c: Make init_access_control_list() generic.

diff --git a/http_send.c b/http_send.c
index a5c3786..7fe216b 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -474,14 +474,14 @@ static char *http_info(void)
        return ret;
 }
 
        return ret;
 }
 

-static void init_access_control_list(void)
+static void init_acl(struct list_head *acl, char * const *acl_info, int num)

 {
        int i;
        struct sender_command_data scd;
 
 {
        int i;
        struct sender_command_data scd;
 

-       INIT_LIST_HEAD(&http_acl);
-       for (i = 0; i < conf.http_access_given; i++) {
-               char *arg = para_strdup(conf.http_access_arg[i]);
+       INIT_LIST_HEAD(acl);
+       for (i = 0; i < num; i++) {
+               char *arg = para_strdup(acl_info[i]);

                char *p = strchr(arg, '/');
                if (!p)
                        goto err;
                char *p = strchr(arg, '/');
                if (!p)
                        goto err;


@@ -535,7 +535,7 @@ void http_send_init(struct sender *s)
        s->client_cmds[SENDER_ADD] = NULL;
        s->client_cmds[SENDER_DELETE] = NULL;
        self = s;
        s->client_cmds[SENDER_ADD] = NULL;
        s->client_cmds[SENDER_DELETE] = NULL;
        self = s;

-       init_access_control_list();
+       init_acl(&http_acl, conf.http_access_arg, conf.http_access_given);

        if (!conf.http_no_autostart_given)
                open_tcp_port(conf.http_port_arg); /* ignore errors */
        PARA_DEBUG_LOG("%s", "http sender init complete\n");
        if (!conf.http_no_autostart_given)
                open_tcp_port(conf.http_port_arg); /* ignore errors */
        PARA_DEBUG_LOG("%s", "http sender init complete\n");