selftest: Split out a provision_ad_member() function

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index cdf4af01d5725dcb39aba75be823bb4682db0997..e28db09b998d1165890ddced4ef2f139828937d1 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -643,20 +643,17 @@ sub setup_clusteredmember_smb1
        return $ret;
 }
 
-sub setup_ad_member
+sub provision_ad_member
 {
-       my ($self, $prefix, $dcvars, $trustvars_f, $trustvars_e) = @_;
+       my ($self,
+           $prefix,
+           $dcvars,
+           $trustvars_f,
+           $trustvars_e) = @_;
 
        my $prefix_abs = abs_path($prefix);
        my @dirs = ();
 
-       # If we didn't build with ADS, pretend this env was never available
-       if (not $self->have_ads()) {
-               return "UNKNOWN";
-       }
-
-       print "PROVISIONING S3 AD MEMBER...";
-
        mkdir($prefix_abs, 0777);
 
        my $share_dir="$prefix_abs/share";
@@ -811,6 +808,24 @@ sub setup_ad_member
        return $ret;
 }
 
+sub setup_ad_member
+{
+       my ($self,
+           $prefix,
+           $dcvars,
+           $trustvars_f,
+           $trustvars_e) = @_;
+
+       # If we didn't build with ADS, pretend this env was never available
+       if (not $self->have_ads()) {
+               return "UNKNOWN";
+       }
+
+       print "PROVISIONING AD MEMBER...";
+
+       return $self->provision_ad_member($prefix, $dcvars, $trustvars_f, $trustvars_e);
+}
+
 sub setup_ad_member_rfc2307
 {
        my ($self, $prefix, $dcvars) = @_;