minor cleanup

[openldap] / servers / slapd / back-meta / config.c

diff --git a/servers/slapd/back-meta/config.c b/servers/slapd/back-meta/config.c
index 41b9adfabed27abc38df58bfac2af6781ff51e02..9e50749618c5d1796644f16412aa800e5f576a50 100644 (file)
--- a/servers/slapd/back-meta/config.c
+++ b/servers/slapd/back-meta/config.c
@@ -35,7 +35,7 @@
 #include "back-meta.h"
 
 static int
-new_target( 
+meta_back_new_target( 
        metatarget_t    *mt )
 {
         struct ldapmapping     *mapping;
@@ -146,7 +146,7 @@ meta_back_db_config(
                        return 1;
                }
 
-               if ( new_target( &mi->mi_targets[ i ] ) != 0 ) {
+               if ( meta_back_new_target( &mi->mi_targets[ i ] ) != 0 ) {
                        Debug( LDAP_DEBUG_ANY,
        "%s: line %d: unable to init server"
        " in \"uri <protocol>://<server>[:port]/<naming context>\" line\n",
@@ -157,6 +157,8 @@ meta_back_db_config(
                mi->mi_targets[ i ].mt_nretries = mi->mi_nretries;
                mi->mi_targets[ i ].mt_flags = mi->mi_flags;
                mi->mi_targets[ i ].mt_version = mi->mi_version;
+               mi->mi_targets[ i ].mt_idle_timeout = mi->mi_idle_timeout;
+               mi->mi_targets[ i ].mt_network_timeout = mi->mi_network_timeout;
 
                for ( c = 0; c < LDAP_BACK_OP_LAST; c++ ) {
                        mi->mi_targets[ i ].mt_timeout[ c ] = mi->mi_timeout[ c ];
@@ -222,9 +224,7 @@ meta_back_db_config(
                        break;
 
                case LDAP_SCOPE_SUBTREE:
-#ifdef LDAP_SCOPE_SUBORDINATE
                case LDAP_SCOPE_SUBORDINATE:
-#endif /* LDAP_SCOPE_SUBORDINATE */
                        mi->mi_targets[ i ].mt_scope = ludp->lud_scope;
                        break;
 
@@ -346,6 +346,12 @@ meta_back_db_config(
 
        /* network timeout when connecting to ldap servers */
        } else if ( strcasecmp( argv[ 0 ], "network-timeout" ) == 0 ) {
+               int             i = mi->mi_ntargets - 1;
+               unsigned long   t;
+               time_t          *tp = mi->mi_ntargets ?
+                               &mi->mi_targets[ mi->mi_ntargets - 1 ].mt_network_timeout
+                               : &mi->mi_network_timeout;
+
                if ( argc != 2 ) {
                        Debug( LDAP_DEBUG_ANY,
        "%s: line %d: missing network timeout in \"network-timeout <seconds>\" line\n",
@@ -353,19 +359,49 @@ meta_back_db_config(
                        return 1;
                }
 
-               if ( lutil_atoi( &mi->mi_network_timeout, argv[ 1 ] ) ) {
+               if ( lutil_parse_time( argv[ 1 ], &t ) ) {
                        Debug( LDAP_DEBUG_ANY,
        "%s: line %d: unable to parse timeout \"%s\" in \"network-timeout <seconds>\" line\n",
                                fname, lineno, argv[ 1 ] );
                        return 1;
 
-               } else if ( mi->mi_network_timeout < 0 ) {
+               }
+
+               *tp = (time_t)t;
+
+       /* idle timeout when connecting to ldap servers */
+       } else if ( strcasecmp( argv[ 0 ], "idle-timeout" ) == 0 ) {
+               int             i = mi->mi_ntargets - 1;
+               unsigned long   t;
+               time_t          *tp = mi->mi_ntargets ?
+                               &mi->mi_targets[ mi->mi_ntargets - 1 ].mt_idle_timeout
+                               : &mi->mi_idle_timeout;
+
+               switch ( argc ) {
+               case 1:
+                       Debug( LDAP_DEBUG_ANY,
+       "%s: line %d: missing timeout value in \"idle-timeout <seconds>\" line\n",
+                               fname, lineno, 0 );
+                       return 1;
+               case 2:
+                       break;
+               default:
+                       Debug( LDAP_DEBUG_ANY,
+       "%s: line %d: extra cruft after timeout value in \"idle-timeout <seconds>\" line\n",
+                               fname, lineno, 0 );
+                       return 1;
+               }
+
+               if ( lutil_parse_time( argv[ 1 ], &t ) ) {
                        Debug( LDAP_DEBUG_ANY,
-       "%s: line %d: ilegal negative timeout in \"network-timeout <seconds>\" line\n",
+       "%s: line %d: unable to parse timeout \"%s\" in \"idle-timeout <seconds>\" line\n",
                                fname, lineno, argv[ 1 ] );
                        return 1;
+
                }
 
+               *tp = (time_t)t;
+
        /* name to use for meta_back_group */
        } else if ( strcasecmp( argv[ 0 ], "acl-authcDN" ) == 0
                        || strcasecmp( argv[ 0 ], "binddn" ) == 0 )