Skip to content

Commit

Permalink
wip: checking more config items
Browse files Browse the repository at this point in the history
  • Loading branch information
frankiejol committed May 9, 2023
1 parent 0944519 commit d4b19d8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions lib/Ravada/Auth/LDAP.pm
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,8 @@ sub remove_group {
sub search_group {
my %args = @_;

return if !exists $$CONFIG->{ldap} || !$$CONFIG->{ldap};

my $name = delete $args{name} or confess "Error: missing name";
my $base = ( delete $args{base} or $$CONFIG->{ldap}->{groups_base} or "ou=groups,"._dc_base() );
my $ldap = ( delete $args{ldap} or _init_ldap_admin());
Expand Down
2 changes: 1 addition & 1 deletion script/rvd_back
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ my $RVD_BACK;
#

sub _do_start_logging {
$LOG_FILENAME = $Ravada::CONFIG->{"log"} if (! $LOG_FILENAME);
$LOG_FILENAME = $Ravada::CONFIG->{"log"} if (! $LOG_FILENAME && exists $Ravada::CONFIG->{"log"});
if ($LOG_FILENAME)
{
File::Path::make_path(File::Basename::dirname($LOG_FILENAME));
Expand Down
1 change: 1 addition & 0 deletions t/vm/20_base.t
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ sub test_display {
# only test this for Void, it will fail on real VMs
return if $vm_name ne 'Void';

unlock_hash(%$Ravada::CONFIG);
$Ravada::CONFIG->{display_ip} = $DISPLAY_IP;
eval { $display = $domain->display( user_admin ) };
is($@,'');
Expand Down

0 comments on commit d4b19d8

Please sign in to comment.