rename ldap_pvt_init_utils() to ldap_int_utils_init() and provide

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 9e34bd530369c7fe93c4639a8fc0a7b53c2c9514..8c22855fd85f97472ec2463001687bb3ad8f8dbc 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -172,6 +172,8 @@ static void openldap_ldap_init_w_conf(const char *file)
                        }
                }
        }
+
+       fclose(fp);
 }
 
 static void openldap_ldap_init_w_userconf(const char *file)
@@ -288,7 +290,7 @@ void openldap_ldap_initialize( void )
                return;
        }
 
-       ldap_pvt_init_utils();
+       ldap_int_utils_init();
 
        gopts.ldo_version =     LDAP_VERSION2;
        gopts.ldo_deref =       LDAP_DEREF_NEVER;
@@ -304,10 +306,7 @@ void openldap_ldap_initialize( void )
 
        LDAP_BOOL_ZERO(&gopts);
 
-#if defined( LDAP_API_FEATURE_X_OPENLDAP_V2_REFERRALS ) || \
-       LDAP_VERSION_MAX > LDAP_VERSION2
        LDAP_BOOL_SET(&gopts, LDAP_BOOL_REFERRALS);
-#endif
 
        openldap_ldap_initialized = 1;