mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

add support for VERSION, TIMEOUT and NETWORK_TIMEOUT in ldap.conf

Browse Source
This commit is contained in:
Pierangelo Masarati 2006-09-26 02:34:36 +00:00
parent a9a4a14d80
commit 2f964def8a
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libraries/libldap/init.c
View File

@ -29,6 +29,7 @@
#include "ldap-int.h"
#include "ldap_defaults.h"
#include "lutil.h"
struct ldapoptions ldap_int_global_options =
{ LDAP_UNINITIALIZED, LDAP_DEBUG_NONE };
@ -43,6 +44,9 @@ struct ldapoptions ldap_int_global_options =
#define ATTR_SASL 6
#define ATTR_TLS 7
#define ATTR_OPT_TV 8
#define ATTR_OPT_INT 9
struct ol_keyvalue {
const char * key;
int value;
@ -63,6 +67,9 @@ static const struct ol_attribute {
const void * data;
size_t offset;
} attrs[] = {
{0, ATTR_OPT_TV, "TIMEOUT", NULL, LDAP_OPT_TIMEOUT},
{0, ATTR_OPT_TV, "NETWORK_TIMEOUT", NULL, LDAP_OPT_NETWORK_TIMEOUT},
{0, ATTR_OPT_INT, "VERSION", NULL, LDAP_OPT_PROTOCOL_VERSION},
{0, ATTR_KV, "DEREF", deref_kv, /* or &deref_kv[0] */
offsetof(struct ldapoptions, ldo_deref)},
{0, ATTR_INT, "SIZELIMIT", NULL,
@ -205,7 +212,7 @@ static void openldap_ldap_init_w_conf(
case ATTR_INT:
p = &((char *) gopts)[attrs[i].offset];
* (int*) p = atoi(opt);
(void)lutil_atoi( (int*) p, opt );
break;
case ATTR_KV: {
@ -241,6 +248,22 @@ static void openldap_ldap_init_w_conf(
ldap_int_tls_config( NULL, attrs[i].offset, opt );
#endif
break;
case ATTR_OPT_TV: {
struct timeval tv;
tv.tv_sec = -1;
tv.tv_usec = 0;
(void)lutil_atol( &tv.tv_sec, opt );
if ( tv.tv_sec > 0 ) {
(void)ldap_set_option( NULL, attrs[i].offset, (const void *)&tv);
}
} break;
case ATTR_OPT_INT: {
int v = -1;
(void)lutil_atoi( &v, opt );
if ( v > 0 ) {
(void)ldap_set_option( NULL, attrs[i].offset, (const void *)&v);
}
} break;
}
break;