nss-pam-ldapd branch master updated. 0.9.11-3-g548efe5

[Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".

The branch, master has been updated
       via  548efe5333b56a0a042843a044e0348317f80065 (commit)
      from  fea0f5ed287b04406afca0835b1a333bd1fe617b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=548efe5333b56a0a042843a044e0348317f80065

commit 548efe5333b56a0a042843a044e0348317f80065
Author: Arthur de Jong <arthur@arthurdejong.org>
Date:   Mon Nov 11 23:06:20 2019 +0100

    Log the correct timeout value
    
    This fixes logging of the LDAP_OPT_TIMEOUT, LDAP_OPT_NETWORK_TIMEOUT and
    LDAP_X_OPT_CONNECT_TIMEOUT options to actually log the value of the
    bind_timelimit option instead of the timelimit option.

diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 02b9719..0ee1be8 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -911,17 +911,17 @@ static int do_set_options(MYLDAP_SESSION *session)
   tv.tv_usec = 0;
 #ifdef LDAP_OPT_TIMEOUT
   log_log(LOG_DEBUG, "ldap_set_option(LDAP_OPT_TIMEOUT,%d)",
-          nslcd_cfg->timelimit);
+          nslcd_cfg->bind_timelimit);
   LDAP_SET_OPTION(session->ld, LDAP_OPT_TIMEOUT, &tv);
 #endif /* LDAP_OPT_TIMEOUT */
 #ifdef LDAP_OPT_NETWORK_TIMEOUT
   log_log(LOG_DEBUG, "ldap_set_option(LDAP_OPT_NETWORK_TIMEOUT,%d)",
-          nslcd_cfg->timelimit);
+          nslcd_cfg->bind_timelimit);
   LDAP_SET_OPTION(session->ld, LDAP_OPT_NETWORK_TIMEOUT, &tv);
 #endif /* LDAP_OPT_NETWORK_TIMEOUT */
 #ifdef LDAP_X_OPT_CONNECT_TIMEOUT
   log_log(LOG_DEBUG, "ldap_set_option(LDAP_X_OPT_CONNECT_TIMEOUT,%d)",
-          nslcd_cfg->timelimit);
+          nslcd_cfg->bind_timelimit);
   LDAP_SET_OPTION(session->ld, LDAP_X_OPT_CONNECT_TIMEOUT, &tv);
 #endif /* LDAP_X_OPT_CONNECT_TIMEOUT */
   log_log(LOG_DEBUG, "ldap_set_option(LDAP_OPT_REFERRALS,%s)",

-----------------------------------------------------------------------

Summary of changes:
 nslcd/myldap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
nss-pam-ldapd