equal
deleted
inserted
replaced
2406 if ( $conf->{'configfile'} ) { |
2406 if ( $conf->{'configfile'} ) { |
2407 my $more_conf = load_config( $conf->{'configfile'} ); |
2407 my $more_conf = load_config( $conf->{'configfile'} ); |
2408 while ( my ($k, $v) = each %{$conf} ) { $conf->{ $k } = $v } |
2408 while ( my ($k, $v) = each %{$conf} ) { $conf->{ $k } = $v } |
2409 } |
2409 } |
2410 |
2410 |
|
2411 |
2411 # defaults |
2412 # defaults |
2412 $conf->{'configfile'} ||= "$ENV{'HOME'}/.shelldap.rc"; |
2413 $conf->{'configfile'} ||= "$ENV{'HOME'}/.shelldap.rc"; |
2413 $conf->{'cacheage'} ||= 300; |
2414 $conf->{'cacheage'} ||= 300; |
2414 $conf->{'timeout'} ||= 10; |
2415 $conf->{'timeout'} ||= 10; |
2415 |
2416 |