#include "ldap-int.h"
#include "ldapconfig.h"
-struct ldapoptions openldap_ldap_global_options;
+struct ldapoptions openldap_ldap_global_options = { LDAP_DEBUG_NONE };
#undef gopts
#define gopts openldap_ldap_global_options
case ATTR_STRING:
if (* (char**) p != NULL) free(* (char**) p);
- * (char**) p = ldap_strdup(opt);
+ * (char**) p = strdup(opt);
break;
}
}
if (*value == '\0') {
* (char**) p = NULL;
} else {
- * (char**) p = ldap_strdup(value);
+ * (char**) p = strdup(value);
}
break;
}
return;
}
+ ldap_pvt_init_utils();
+
gopts.ldo_version = LDAP_VERSION2;
gopts.ldo_deref = LDAP_DEREF_NEVER;
gopts.ldo_timelimit = LDAP_NO_LIMIT;
gopts.ldo_debug = 0;
- gopts.ldo_defhost = ldap_strdup("localhost");
+ gopts.ldo_defhost = strdup("localhost");
gopts.ldo_defport = LDAP_PORT;
gopts.ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
openldap_ldap_init_w_userconf(DEFAULT_LDAP_USERRC_FILE);
{
- char *altfile = getenv("LDAPRC");
+ char *altfile = getenv("LDAPCONF");
if( altfile != NULL ) {
openldap_ldap_init_w_conf( altfile );
}
}
+ {
+ char *altfile = getenv("LDAPRC");
+
+ if( altfile != NULL ) {
+ openldap_ldap_init_w_userconf( altfile );
+ }
+ }
+
openldap_ldap_init_w_env(NULL);
}