selftest: Add DOMAIN_ADMIN and DOMAIN_USER variables

We should start using those in future. So we can distinguish which
privileges we want. Currently DC_USERNAME is the Administrator. Whatever
possible should use DOMIAN_USER instead.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15532

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/selftest/target/Samba.pm b/selftest/target/Samba.pm
index dbb07604af5e9f85f30997635e69113857f18ba6..187e4007ee7d588f1210a93881227d1b2e54db28 100644 (file)
--- a/selftest/target/Samba.pm
+++ b/selftest/target/Samba.pm
@@ -949,6 +949,10 @@ my @exported_envvars = (
        "PASSWORD",
        "DC_USERNAME",
        "DC_PASSWORD",
+       "DOMAIN_ADMIN",
+       "DOMAIN_ADMIN_PASSWORD",
+       "DOMAIN_USER",
+       "DOMAIN_USER_PASSWORD",
 
        # UID/GID for rfc2307 mapping tests
        "UID_RFC2307TEST",

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index ba7c5b90a173da9ecc367e940931e1def58ed37f..01b6c5fc38eb6a6bace761ae21c65f757188812d 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -1009,6 +1009,10 @@ sub provision_ad_member
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $ret->{DOMAIN_ADMIN} = $dcvars->{DOMAIN_ADMIN};
+       $ret->{DOMAIN_ADMIN_PASSWORD} = $dcvars->{DOMAIN_ADMIN_PASSWORD};
+       $ret->{DOMAIN_USER} = $dcvars->{DOMAIN_USER};
+       $ret->{DOMAIN_USER_PASSWORD} = $dcvars->{DOMAIN_USER_PASSWORD};
 
        # forest trust
        $ret->{TRUST_F_BOTH_SERVER} = $trustvars_f->{SERVER};
@@ -1174,6 +1178,10 @@ sub setup_ad_member_rfc2307
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $ret->{DOMAIN_ADMIN} = $dcvars->{DOMAIN_ADMIN};
+       $ret->{DOMAIN_ADMIN_PASSWORD} = $dcvars->{DOMAIN_ADMIN_PASSWORD};
+       $ret->{DOMAIN_USER} = $dcvars->{DOMAIN_USER};
+       $ret->{DOMAIN_USER_PASSWORD} = $dcvars->{DOMAIN_USER_PASSWORD};
 
        return $ret;
 }
@@ -1270,6 +1278,10 @@ sub setup_admem_idmap_autorid
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $ret->{DOMAIN_ADMIN} = $dcvars->{DOMAIN_ADMIN};
+       $ret->{DOMAIN_ADMIN_PASSWORD} = $dcvars->{DOMAIN_ADMIN_PASSWORD};
+       $ret->{DOMAIN_USER} = $dcvars->{DOMAIN_USER};
+       $ret->{DOMAIN_USER_PASSWORD} = $dcvars->{DOMAIN_USER_PASSWORD};
 
        return $ret;
 }
@@ -1369,6 +1381,10 @@ sub setup_ad_member_idmap_rid
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $ret->{DOMAIN_ADMIN} = $dcvars->{DOMAIN_ADMIN};
+       $ret->{DOMAIN_ADMIN_PASSWORD} = $dcvars->{DOMAIN_ADMIN_PASSWORD};
+       $ret->{DOMAIN_USER} = $dcvars->{DOMAIN_USER};
+       $ret->{DOMAIN_USER_PASSWORD} = $dcvars->{DOMAIN_USER_PASSWORD};
 
        return $ret;
 }
@@ -1469,6 +1485,10 @@ sub setup_ad_member_idmap_ad
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $ret->{DOMAIN_ADMIN} = $dcvars->{DOMAIN_ADMIN};
+       $ret->{DOMAIN_ADMIN_PASSWORD} = $dcvars->{DOMAIN_ADMIN_PASSWORD};
+       $ret->{DOMAIN_USER} = $dcvars->{DOMAIN_USER};
+       $ret->{DOMAIN_USER_PASSWORD} = $dcvars->{DOMAIN_USER_PASSWORD};
 
        $ret->{TRUST_SERVER} = $dcvars->{TRUST_SERVER};
        $ret->{TRUST_USERNAME} = $dcvars->{TRUST_USERNAME};
@@ -1561,6 +1581,10 @@ sub setup_ad_member_oneway
        $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
        $ret->{DC_USERNAME} = $dcvars->{USERNAME};
        $ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
+       $ret->{DOMAIN_ADMIN} = $dcvars->{DOMAIN_ADMIN};
+       $ret->{DOMAIN_ADMIN_PASSWORD} = $dcvars->{DOMAIN_ADMIN_PASSWORD};
+       $ret->{DOMAIN_USER} = $dcvars->{DOMAIN_USER};
+       $ret->{DOMAIN_USER_PASSWORD} = $dcvars->{DOMAIN_USER_PASSWORD};
 
        $ret->{TRUST_SERVER} = $dcvars->{TRUST_SERVER};
        $ret->{TRUST_USERNAME} = $dcvars->{TRUST_USERNAME};

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index c98c00c034c53110bec892fc6f305cf8036a5f8f..dd1400633e83ed15d129cc2e0f701c4b1fc2dc36 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -587,6 +587,10 @@ sub provision_raw_prepare($$$$$$$$$$$$$$)
        $ctx->{realm} = uc($realm);
        $ctx->{dnsname} = lc($realm);
        $ctx->{samsid} = $samsid;
+       $ctx->{domain_admin} = "Administrator";
+       $ctx->{domain_admin_password} = $password;
+       $ctx->{domain_user} = "alice";
+       $ctx->{domain_user_password} = "Secret007";
 
        $ctx->{functional_level} = $functional_level;
 
@@ -906,6 +910,10 @@ nogroup:x:65534:nobody
                DOMAIN => $ctx->{domain},
                USERNAME => $ctx->{username},
                DC_USERNAME => $ctx->{username},
+               DOMAIN_ADMIN => $ctx->{domain_admin},
+               DOMAIN_ADMIN_PASSWORD => $ctx->{domain_admin_password},
+               DOMAIN_USER => $ctx->{domain_user},
+               DOMAIN_USER_PASSWORD => $ctx->{domain_user_password},
                REALM => $ctx->{realm},
                DNSNAME => $ctx->{dnsname},
                SAMSID => $ctx->{samsid},