shelldap
changeset 95 c527f97c28f1
parent 94 4464f9984530
parent 89 aa4172c204d4
child 99 2a7a3072d76c
equal deleted inserted replaced
94:4464f9984530 95:c527f97c28f1
  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