sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

selftest: Add DOMAIN_ADMIN and DOMAIN_USER variables

Browse Source 
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>
This commit is contained in:
Andreas Schneider 2023-12-08 13:07:19 +01:00 committed by Andrew Bartlett
parent a2af6946f5
commit 56d0c3a026
3 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
selftest/target/Samba.pm
View File

@ -949,6 +949,10 @@ my @exported_envvars = (
"PASSWORD", "PASSWORD",
"DC_USERNAME", "DC_USERNAME",
"DC_PASSWORD", "DC_PASSWORD",
"DOMAIN_ADMIN",
"DOMAIN_ADMIN_PASSWORD",
"DOMAIN_USER",
"DOMAIN_USER_PASSWORD",
# UID/GID for rfc2307 mapping tests # UID/GID for rfc2307 mapping tests
"UID_RFC2307TEST", "UID_RFC2307TEST",

24
selftest/target/Samba3.pm
View File

@ -1009,6 +1009,10 @@ sub provision_ad_member
$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $dcvars->{USERNAME}; $ret->{DC_USERNAME} = $dcvars->{USERNAME};
$ret->{DC_PASSWORD} = $dcvars->{PASSWORD}; $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 # forest trust
$ret->{TRUST_F_BOTH_SERVER} = $trustvars_f->{SERVER}; $ret->{TRUST_F_BOTH_SERVER} = $trustvars_f->{SERVER};
@ -1174,6 +1178,10 @@ sub setup_ad_member_rfc2307
$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $dcvars->{USERNAME}; $ret->{DC_USERNAME} = $dcvars->{USERNAME};
$ret->{DC_PASSWORD} = $dcvars->{PASSWORD}; $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; return $ret;
} }
@ -1270,6 +1278,10 @@ sub setup_admem_idmap_autorid
$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $dcvars->{USERNAME}; $ret->{DC_USERNAME} = $dcvars->{USERNAME};
$ret->{DC_PASSWORD} = $dcvars->{PASSWORD}; $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; return $ret;
} }
@ -1369,6 +1381,10 @@ sub setup_ad_member_idmap_rid
$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $dcvars->{USERNAME}; $ret->{DC_USERNAME} = $dcvars->{USERNAME};
$ret->{DC_PASSWORD} = $dcvars->{PASSWORD}; $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; return $ret;
} }
@ -1469,6 +1485,10 @@ sub setup_ad_member_idmap_ad
$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $dcvars->{USERNAME}; $ret->{DC_USERNAME} = $dcvars->{USERNAME};
$ret->{DC_PASSWORD} = $dcvars->{PASSWORD}; $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_SERVER} = $dcvars->{TRUST_SERVER};
$ret->{TRUST_USERNAME} = $dcvars->{TRUST_USERNAME}; $ret->{TRUST_USERNAME} = $dcvars->{TRUST_USERNAME};
@ -1561,6 +1581,10 @@ sub setup_ad_member_oneway
$ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME}; $ret->{DC_NETBIOSNAME} = $dcvars->{NETBIOSNAME};
$ret->{DC_USERNAME} = $dcvars->{USERNAME}; $ret->{DC_USERNAME} = $dcvars->{USERNAME};
$ret->{DC_PASSWORD} = $dcvars->{PASSWORD}; $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_SERVER} = $dcvars->{TRUST_SERVER};
$ret->{TRUST_USERNAME} = $dcvars->{TRUST_USERNAME}; $ret->{TRUST_USERNAME} = $dcvars->{TRUST_USERNAME};

8
selftest/target/Samba4.pm
View File

@ -587,6 +587,10 @@ sub provision_raw_prepare($$$$$$$$$$$$$$)
$ctx->{realm} = uc($realm); $ctx->{realm} = uc($realm);
$ctx->{dnsname} = lc($realm); $ctx->{dnsname} = lc($realm);
$ctx->{samsid} = $samsid; $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; $ctx->{functional_level} = $functional_level;
@ -906,6 +910,10 @@ nogroup:x:65534:nobody
DOMAIN => $ctx->{domain}, DOMAIN => $ctx->{domain},
USERNAME => $ctx->{username}, USERNAME => $ctx->{username},
DC_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}, REALM => $ctx->{realm},
DNSNAME => $ctx->{dnsname}, DNSNAME => $ctx->{dnsname},
SAMSID => $ctx->{samsid}, SAMSID => $ctx->{samsid},