1 files changed, 12 insertions, 19 deletions

diff --git a/server/providers/ldap/ldap_auth.c b/server/providers/ldap/ldap_auth.c
index 365b7d0b9..6a4dc895f 100644
--- a/server/providers/ldap/ldap_auth.c
+++ b/server/providers/ldap/ldap_auth.c
@@ -53,15 +53,9 @@ struct sdap_ctx {
     int opt_timeout;
 };
 
-struct sdap_ops;
 struct sdap_req;
 
-struct sdap_ops {
-    void (*op)(struct sdap_req *);
-    struct sdap_ops *next;
-};
-
-enum sdap_int_ops {
+enum sdap_auth_steps {
     SDAP_NOOP = 0x0000,
     SDAP_OP_INIT = 0x0001,
     SDAP_CHECK_INIT_RESULT,
@@ -75,10 +69,9 @@ struct sdap_req {
     struct pam_data *pd;
     struct sdap_ctx *sdap_ctx;
     LDAP *ldap;
-    struct sdap_ops *ops;
     char *user_dn;
     tevent_fd_handler_t next_task;
-    enum sdap_int_ops next_op;
+    enum sdap_auth_steps next_step;
     int msgid;
 };
 
@@ -309,7 +302,7 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
 
     lr = talloc_get_type(pvt, struct sdap_req);
 
-    switch (lr->next_op) {
+    switch (lr->next_step) {
         case SDAP_OP_INIT:
             ret = sdap_init(lr);
             if (ret != EOK) {
@@ -332,7 +325,7 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
             if (ret == 0) {
                 DEBUG(1, ("ldap_result not ready yet, waiting.\n"));
                 lr->next_task = sdap_pam_loop;
-                lr->next_op = SDAP_CHECK_INIT_RESULT;
+                lr->next_step = SDAP_CHECK_INIT_RESULT;
                 ret = wait_for_fd(lr);
                 if (ret != EOK) {
                     DEBUG(1, ("schedule_next_task failed.\n"));
@@ -380,7 +373,7 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
             if (ret == 0) {
                 DEBUG(1, ("ldap_result not ready yet, waiting.\n"));
                 lr->next_task = sdap_pam_loop;
-                lr->next_op = SDAP_CHECK_STD_BIND;
+                lr->next_step = SDAP_CHECK_STD_BIND;
                 ret = wait_for_fd(lr);
                 if (ret != EOK) {
                     DEBUG(1, ("schedule_next_task failed.\n"));
@@ -438,7 +431,7 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
             if (ret == 0) {
                 DEBUG(1, ("ldap_result not ready yet, waiting.\n"));
                 lr->next_task = sdap_pam_loop;
-                lr->next_op = SDAP_CHECK_SEARCH_DN_RESULT;
+                lr->next_step = SDAP_CHECK_SEARCH_DN_RESULT;
                 ret = wait_for_fd(lr);
                 if (ret != EOK) {
                     DEBUG(1, ("schedule_next_task failed.\n"));
@@ -519,7 +512,7 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
             if (ret == 0) {
                 DEBUG(1, ("ldap_result not ready yet, waiting.\n"));
                 lr->next_task = sdap_pam_loop;
-                lr->next_op = SDAP_CHECK_USER_BIND;
+                lr->next_step = SDAP_CHECK_USER_BIND;
                 ret = wait_for_fd(lr);
                 if (ret != EOK) {
                     DEBUG(1, ("schedule_next_task failed.\n"));
@@ -570,7 +563,7 @@ static void sdap_pam_loop(struct tevent_context *ev, struct tevent_fd *te,
             }
             break;
         default:
-            DEBUG(1, ("Unknown ldap backend operation %d.\n", lr->next_op));
+            DEBUG(1, ("Unknown ldap backend operation %d.\n", lr->next_step));
             pam_status = PAM_SYSTEM_ERR;
     }
 
@@ -612,7 +605,7 @@ static void sdap_start(struct tevent_context *ev, struct tevent_timer *te,
     }
 
     lr->next_task = sdap_pam_loop;
-    lr->next_op = SDAP_CHECK_INIT_RESULT;
+    lr->next_step = SDAP_CHECK_INIT_RESULT;
     ret = wait_for_fd(lr);
     if (ret != EOK) {
         DEBUG(1, ("schedule_next_task failed.\n"));
@@ -653,7 +646,7 @@ static void sdap_pam_handler(struct be_req *req)
     lr->sdap_ctx = sdap_ctx;
     lr->user_dn = NULL;
     lr->next_task = NULL;
-    lr->next_op = SDAP_NOOP;
+    lr->next_step = SDAP_NOOP;
 
     timeout.tv_sec=0;
     timeout.tv_usec=0;
@@ -679,7 +672,7 @@ static void sdap_shutdown(struct be_req *req)
     req->fn(req, EOK, NULL);
 }
 
-struct be_auth_ops sdap_mod_ops = {
+struct be_auth_ops sdap_auth_ops = {
     .pam_handler = sdap_pam_handler,
     .finalize = sdap_shutdown
 };
@@ -761,7 +754,7 @@ int sssm_ldap_auth_init(struct be_ctx *bectx,
     if (ret != EOK) goto done;
     ctx->network_timeout = opt_timeout;
 
-    *ops = &sdap_mod_ops;
+    *ops = &sdap_auth_ops;
     *pvt_data = ctx;
     ret = EOK;