Revert "authd: change to lists instead of dictionaries for various things"

[solanum.git] / authd / providers / opm.c

diff --git a/authd/providers/opm.c b/authd/providers/opm.c
index 3fbc53a65a06cc3bfa36eeb723e4c23ca586a511..560eecee09f121df929b1b4994f5bd642b1ed17b 100644 (file)
--- a/authd/providers/opm.c
+++ b/authd/providers/opm.c
@@ -303,7 +303,7 @@ opm_connected(rb_fde_t *F, int error, void *data)
 
 end:
        rb_close(scan->F);
-       rb_dlinkFindDelete(scan, &lookup->scans);
+       rb_dlinkDelete(&scan->node, &lookup->scans);
        rb_free(scan);
 }
 
@@ -456,13 +456,11 @@ establish_connection(struct auth_client *auth, struct opm_proxy *proxy)
                rb_connect_tcp(scan->F,
                                (struct sockaddr *)&c_a,
                                (struct sockaddr *)&l_a,
-                               GET_SS_LEN(&l_a),
                                opm_connected, scan, opm_timeout);
        else
                rb_connect_tcp_ssl(scan->F,
                                (struct sockaddr *)&c_a,
                                (struct sockaddr *)&l_a,
-                               GET_SS_LEN(&l_a),
                                opm_connected, scan, opm_timeout);
 }
 
@@ -856,7 +854,7 @@ delete_opm_scanner(const char *key __unused, int parc __unused, const char **par
                        if(scan->proxy->port == proxy->port && scan->proxy->proto == proxy->proto)
                        {
                                /* Match */
-                               rb_dlinkFindDelete(scan, &lookup->scans);
+                               rb_dlinkDelete(&scan->node, &lookup->scans);
                                rb_free(scan);
 
                                if(rb_dlink_list_length(&lookup->scans) == 0)
@@ -867,7 +865,7 @@ delete_opm_scanner(const char *key __unused, int parc __unused, const char **par
                }
        }
 
-       rb_dlinkFindDelete(proxy, &proxy_scanners);
+       rb_dlinkDelete(&proxy->node, &proxy_scanners);
        rb_free(proxy);
 
        if(rb_dlink_list_length(&proxy_scanners) == 0)