krb5 commit: Remove unused async binding code in LDAP

Greg Hudson <[email protected]>
Newsgroups gmane.comp.encryption.kerberos.cvs
Message-ID <[email protected]>
https://github.com/krb5/krb5/commit/6649761a19ed4c727bcc50073b8d6452b3ccdbb2
commit 6649761a19ed4c727bcc50073b8d6452b3ccdbb2
Author: Greg Hudson <[email protected]>
Date:   Mon Jun 26 17:52:10 2017 -0400

    Remove unused async binding code in LDAP
    
    The server_info_update_pending field of krb5_ldap_server_handle was
    never set to true, and we never define ASYNC_BIND.  Noted by Will
    Fiveash.

 src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h      |    1 -
 src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c |    1 -
 src/plugins/kdb/ldap/libkdb_ldap/ldap_handle.c   |   68 ----------------------
 3 files changed, 0 insertions(+), 70 deletions(-)

diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
index 5c8539a..535a1f3 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap.h
@@ -171,7 +171,6 @@ typedef struct _krb5_ldap_server_info krb5_ldap_server_info;
 typedef struct  _krb5_ldap_server_handle {
     int                              msgid;
     LDAP                             *ldap_handle;
-    krb5_boolean                     server_info_update_pending;
     krb5_ldap_server_info            *server_info;
     struct _krb5_ldap_server_handle  *next;
 } krb5_ldap_server_handle;
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
index d904c99..cee4b7b 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/kdb_ldap_conn.c
@@ -193,7 +193,6 @@ initialize_server(krb5_ldap_context *ldap_context, krb5_ldap_server_info *info)
         return ret;
     }
 
-    server->server_info_update_pending = FALSE;
     server->next = info->ldap_server_handles;
     info->ldap_server_handles = server;
     info->num_conns++;
diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_handle.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_handle.c
index 77d8f81..2f5d3d9 100644
--- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_handle.c
+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_handle.c
@@ -30,62 +30,6 @@
 
 #include "ldap_main.h"
 
-
-#ifdef ASYNC_BIND
-
-/*
- * Update the server info structure. In case of an asynchronous bind,
- * this function is called to check the bind status. A flag
- * server_info_upate_pending is refered before calling this function.
- * This function sets the server_status to either ON or OFF and
- * sets the server_info_udpate_pending to OFF.
- * Do not lock the mutex here. The caller should lock it
- */
-
-static krb5_error_code
-krb5_update_server_info(krb5_ldap_server_handle *ldap_server_handle,
-                        krb5_ldap_server_info *server_info)
-{
-    krb5_error_code            st=0;
-    struct timeval             ztime={0, 0};
-    LDAPMessage                *result=NULL;
-
-    if (ldap_server_handle == NULL || server_info == NULL)
-        return -1;
-
-    while (st == 0) {
-        st = ldap_result(ldap_server_handle->ldap_handle, ldap_server_handle->msgid,
-                         LDAP_MSG_ALL, &ztime, &result);
-        switch (st) {
-        case -1:
-            server_info->server_status = OFF;
-            time(&server_info->downtime);
-            break;
-
-        case 0:
-            continue;
-            break;
-
-        case LDAP_RES_BIND:
-            if ((st=ldap_result2error(ldap_server_handle->ldap_handle, result, 1)) == LDAP_SUCCESS) {
-                server_info->server_status = ON;
-            } else {
-                server_info->server_status = OFF;
-                time(&server_info->downtime);
-            }
-            ldap_msgfree(result);
-            break;
-        default:
-            ldap_msgfree(result);
-            continue;
-            break;
-        }
-    }
-    ldap_server_handle->server_info_update_pending = FALSE;
-    return 0;
-}
-#endif
-
 /*
  * Return ldap server handle from the pool. If the pool is exhausted return NULL.
  * Do not lock the mutex, caller should lock it
@@ -105,18 +49,6 @@ krb5_get_ldap_handle(krb5_ldap_context *ldap_context)
                 ldap_server_handle = ldap_server_info->ldap_server_handles;
                 ldap_server_info->ldap_server_handles = ldap_server_handle->next;
                 break;
-#ifdef ASYNC_BIND
-                if (ldap_server_handle->server_info_update_pending == TRUE) {
-                    krb5_update_server_info(context, ldap_server_handle,
-                                            ldap_server_info);
-                }
-
-                if (ldap_server_info->server_status == ON) {
-                    ldap_server_info->ldap_server_handles = ldap_server_handle->next;
-                    break;
-                } else
-                    ldap_server_handle = NULL;
-#endif
             }
         }
         ++cnt;
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.