summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS1
-rw-r--r--nslcd/myldap.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/AUTHORS b/AUTHORS
index 566bc53..6ec3667 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -110,3 +110,4 @@ Slavko <linux@slavino.sk>
Joe Hansen <joedalton2@yahoo.dk>
Denis Doria <denisdoria@gmail.com>
James M. Leddy <james.leddy@redhat.com>
+Jakub Hrozek <jhrozek@redhat.com>
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 4ed9ae2..2d73c39 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -538,7 +538,8 @@ static int do_set_options(MYLDAP_SESSION *session)
int rc;
struct timeval tv;
#ifdef LDAP_OPT_CONNECT_CB
- struct ldap_conncb cb;
+ /* make this static because OpenLDAP doesn't make it's own copy */
+ static struct ldap_conncb cb;
#endif /* LDAP_OPT_CONNECT_CB */
#ifdef LDAP_OPT_X_TLS
int i;