Timeouts should not be malloc'd

[openldap] / libraries / libldap / init.c

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 2aa88936e06ed8d19e93e0df51be2ed1fe2d431b..345eb823d3f7bf4827086a384f214ff99bcbca88 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -259,7 +259,6 @@ static void openldap_ldap_init_w_conf(
                        case ATTR_OPT_TV: {
                                struct timeval tv;
                                char *next;
-                               tv.tv_sec = -1;
                                tv.tv_usec = 0;
                                tv.tv_sec = strtol( opt, &next, 10 );
                                if ( next != opt && next[ 0 ] == '\0' && tv.tv_sec > 0 ) {
@@ -476,8 +475,8 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
        gopts->ldo_timelimit = LDAP_NO_LIMIT;
        gopts->ldo_sizelimit = LDAP_NO_LIMIT;
 
-       gopts->ldo_tm_api = (struct timeval *)NULL;
-       gopts->ldo_tm_net = (struct timeval *)NULL;
+       gopts->ldo_tm_api.tv_sec = -1;
+       gopts->ldo_tm_net.tv_sec = -1;
 
        /* ldo_defludp will be freed by the termination handler
         */