lib-ldap: Remove callback from connection_connect

diff --git a/src/lib-ldap/ldap-connection.c b/src/lib-ldap/ldap-connection.c
index 9655d88300f6a52675546bdab09d0b2a6363e367..e1349af428e6d46d2ffab8daa8dde2d357022d4c 100644 (file)
--- a/src/lib-ldap/ldap-connection.c
+++ b/src/lib-ldap/ldap-connection.c
@@ -14,6 +14,8 @@ static
 void ldap_connection_abort_request(struct ldap_op_queue_entry *req);
 static
 void ldap_connection_request_destroy(struct ldap_op_queue_entry **req);
+static
+int ldap_connection_connect(struct ldap_connection *conn);
 
 void ldap_connection_deinit(struct ldap_connection **_conn)
 {
@@ -188,7 +190,7 @@ void ldap_connection_send_next(struct ldap_connection *conn)
                timeout_remove(&(conn->to_reconnect));
 
        if (conn->state == LDAP_STATE_DISCONNECT) {
-               if (ldap_connection_connect(conn, NULL, NULL) == -1)
+               if (ldap_connection_connect(conn) == -1)
                        conn->to_reconnect = timeout_add(1000, ldap_connection_send_next, conn);
                return;
        }
@@ -398,7 +400,8 @@ ldap_connect_next_message(struct ldap_connection *conn,
        return LDAP_SUCCESS;
 }
 
-int ldap_connection_connect(struct ldap_connection *conn, ldap_result_callback_t cb, void *ctx)
+static
+int ldap_connection_connect(struct ldap_connection *conn)
 {
        const char *error;
        int fd;
@@ -415,8 +418,6 @@ int ldap_connection_connect(struct ldap_connection *conn, ldap_result_callback_t
        struct ldap_op_queue_entry *req = p_new(pool, struct ldap_op_queue_entry, 1);
        req->pool = pool;
 
-       req->result_callback = cb;
-       req->result_callback_ctx = ctx;
        req->internal_response_cb = ldap_connection_connect_parse;
        req->timeout_secs = conn->set.timeout_secs;
 

diff --git a/src/lib-ldap/ldap-private.h b/src/lib-ldap/ldap-private.h
index abad3103ec13f45fd1fcef980351db7aff9405ae..e6004db8b23a243c6e9a3550ee634b20e2bc9373 100644 (file)
--- a/src/lib-ldap/ldap-private.h
+++ b/src/lib-ldap/ldap-private.h
@@ -118,7 +118,6 @@ void ldap_connection_compare_start(struct ldap_connection *conn,
                                   ldap_result_callback_t *callback,
                                   void *context);
 
-int ldap_connection_connect(struct ldap_connection *conn, ldap_result_callback_t *, void *ctx);
 void ldap_connection_kill(struct ldap_connection *conn);
 int ldap_connection_check(struct ldap_connection *conn);
 void ldap_connection_queue_request(struct ldap_connection *conn, struct ldap_op_queue_entry *req);