sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-25 06:04:04 +03:00
Code

r21673: Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled.

Browse Source 
(This used to be commit ef794f03d50022a77303c77045a04d9407d07cbc)
This commit is contained in:
Jelmer Vernooij 2007-03-03 02:06:54 +00:00 committed by Gerald (Jerry) Carter
parent 1cc7b6e739
commit 99fb785ea1
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source4/script/tests/tests_all.sh
View File

@ -12,3 +12,4 @@
$SRCDIR/script/tests/test_pidl.sh $SRCDIR/script/tests/test_pidl.sh
$SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX $SRCDIR/script/tests/test_blackbox.sh $SERVER $USERNAME $PASSWORD $DOMAIN $PREFIX
$SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD "" $SRCDIR/script/tests/test_simple.sh //$SERVER/simple $USERNAME $PASSWORD ""
$SRCDIR/script/tests/test_s3upgrade.sh $PREFIX/upgrade

22
source4/scripting/libjs/upgrade.js
View File

@ -357,7 +357,6 @@ function upgrade_provision(samba3)
subobj.NTTIME = nttime; subobj.NTTIME = nttime;
subobj.LDAPTIME = ldaptime; subobj.LDAPTIME = ldaptime;
subobj.DATESTRING = datestring; subobj.DATESTRING = datestring;
subobj.USN = nextusn;
subobj.ROOT = findnss(nss.getpwnam, "root"); subobj.ROOT = findnss(nss.getpwnam, "root");
subobj.NOBODY = findnss(nss.getpwnam, "nobody"); subobj.NOBODY = findnss(nss.getpwnam, "nobody");
subobj.NOGROUP = findnss(nss.getgrnam, "nogroup", "nobody"); subobj.NOGROUP = findnss(nss.getgrnam, "nogroup", "nobody");
@ -368,7 +367,26 @@ function upgrade_provision(samba3)
strlower(subobj.HOSTNAME), strlower(subobj.HOSTNAME),
subobj.DNSDOMAIN); subobj.DNSDOMAIN);
subobj.BASEDN = "DC=" + join(",DC=", split(".", subobj.REALM)); subobj.BASEDN = "DC=" + join(",DC=", split(".", subobj.REALM));
rdn_list = split(".", subobj.REALM); rdn_list = split(".", subobj.DNSDOMAIN);
subobj.DOMAINDN = "DC=" + join(",DC=", rdn_list);
subobj.DOMAINDN_LDB = "users.ldb";
subobj.ROOTDN = subobj.DOMAINDN;
modules_list = new Array("rootdse",
"kludge_acl",
"paged_results",
"server_sort",
"extended_dn",
"asq",
"samldb",
"password_hash",
"operational",
"objectclass",
"rdn_name",
"show_deleted",
"partition");
subobj.MODULES_LIST = join(",", modules_list);
return subobj; return subobj;
} }

2
source4/setup/upgrade
View File

@ -95,7 +95,7 @@ if (options.realm != undefined) {
subobj.REALM = options.realm; subobj.REALM = options.realm;
} }
provision(subobj, message, options.blank, paths, system_session, creds); provision(subobj, message, options.blank, paths, system_session, creds, undefined);
var ret = upgrade(subobj,samba3,message,paths, system_session, creds); var ret = upgrade(subobj,samba3,message,paths, system_session, creds);
if (ret > 0) { if (ret > 0) {

8
testdata/samba3/verify vendored
View File

@ -5,6 +5,13 @@
Written by Jelmer Vernooij, 2005. Written by Jelmer Vernooij, 2005.
*/ */
var sys;
var options = GetOptions(ARGV, "POPT_AUTOHELP", "POPT_COMMON_SAMBA");
if (options == undefined) {
println("Failed to parse options");
return -1;
}
libinclude("base.js"); libinclude("base.js");
var path = substr(ARGV[0], 0, -strlen("verify")); var path = substr(ARGV[0], 0, -strlen("verify"));
@ -49,3 +56,4 @@ assert(s.policy.bad_lockout_minutes == 0);
println("account policies ok"); println("account policies ok");
exit(0);