selftest: Add check customdc has valid realm/domain
authorTim Beale <timbeale@catalyst.net.nz>
Thu, 30 May 2019 02:46:35 +0000 (14:46 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 31 May 2019 05:18:21 +0000 (05:18 +0000)
If we couldn't determine the realm/domain from the backup file, it's a
lot nicer to fail early with a clear error message (rather than failing
later on with a really obscure message).

Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
selftest/target/Samba4.pm

index b1c6aa459c19502021702ff607aa91ed14062c68..d647a5c29a000ce451aacb68efb3973fa5b0b528 100755 (executable)
@@ -3310,6 +3310,10 @@ sub setup_customdc
 
        # work out the correct domain/realm env values from the backup-file
        my ($domain, $realm) = $self->get_backup_domain_realm($backup_file);
+       if ($domain eq '' or $realm eq '') {
+               warn("Could not determine domain or realm");
+               return undef;
+       }
 
        # create a placeholder directory and smb.conf, as well as the env vars.
        my ($env, $ctx) = $self->prepare_dc_testenv($prefix, $dc_name,