svn commit: samba r21673 - in branches/SAMBA_4_0: .
source/script/tests source/scripting/libjs source/setup
testdata/samba3
jelmer at samba.org
jelmer at samba.org
Sat Mar 3 02:06:56 GMT 2007
Author: jelmer
Date: 2007-03-03 02:06:54 +0000 (Sat, 03 Mar 2007)
New Revision: 21673
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21673
Log:
Fix Samba 3 data read tests. I can't figure out why the upgrade one is broken, so that one is still disabled.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/script/tests/tests_all.sh
branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
branches/SAMBA_4_0/source/setup/upgrade
branches/SAMBA_4_0/testdata/samba3/verify
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
- jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
jelmer at samba.org-20070126133903-onfotbg1051ktojo
jelmer at samba.org-20070126144259-171b4t0744jigs5x
jelmer at samba.org-20070126152205-xj7j1avc7683rjy5
jelmer at samba.org-20070128010235-e8st47gcy00ii8kc
jelmer at samba.org-20070128130853-xjjrlrtf830pwnx6
jelmer at samba.org-20070130120806-gfqshokma9j6j3uv
jelmer at samba.org-20070131002510-55yxynmb1o4zvx0x
jelmer at samba.org-20070131115042-oocen3olfgu53jlm
jelmer at samba.org-20070206235608-980jutwyp43708k6
jelmer at samba.org-20070207185718-i1xx6bvmdeeii72p
jelmer at samba.org-20070208234639-i0h5mfefbn1a1lkl
jelmer at samba.org-20070209001154-lol5huzwdq9jw2e7
jelmer at samba.org-20070209093351-buzkh0t55nt863gw
jelmer at samba.org-20070212120516-lwfxtpxx1lerwro2
jelmer at samba.org-20070212130037-e7t2bh0ufajvi8m6
jelmer at samba.org-20070212173050-hpr37tn9ws2zhfko
jelmer at samba.org-20070214123932-nmsy6lnin8gtzxrn
jelmer at samba.org-20070214141810-0df8ykq1d0dl6yia
jelmer at samba.org-20070214143534-pc63vqrp827s6sdo
jelmer at samba.org-20070214145213-idzserezbwc2alty
jelmer at samba.org-20070214150805-zjdhqbtwy28fac3c
jelmer at samba.org-20070214192135-0yxxt5pto2lv4p4h
jelmer at samba.org-20070214213108-id4l0x9g95v6i060
jelmer at samba.org-20070215192824-a13ptx6qq150shoq
jelmer at samba.org-20070215210330-ve8q1mdkjymv6fr1
jelmer at samba.org-20070215220450-avh0rwc0ce0x7gja
jelmer at samba.org-20070215225539-cy8w0815ygz1wa0c
jelmer at samba.org-20070215234924-5u8bqtdp3ha66015
jelmer at samba.org-20070216003036-0ghop153wj46jjwe
jelmer at samba.org-20070216010504-03udexhmrhje5w5c
jelmer at samba.org-20070216124407-uwk21820sjr6n46p
jelmer at samba.org-20070216141029-nf84hlj2tr39ealw
jelmer at samba.org-20070216151123-m8lw5r1ebhymw8ba
jelmer at samba.org-20070217013108-znc8d1w6rtx0kaqf
jelmer at samba.org-20070217135603-92hi5qaxrxwoqulu
jelmer at samba.org-20070217233534-x58078kx0zci6831
jelmer at samba.org-20070218003055-80z3rswwe279yelu
jelmer at samba.org-20070218003815-07xijfqrcx3tybfi
jelmer at samba.org-20070218010222-fe4oase328jeg840
jelmer at samba.org-20070218115359-jytly04u0aufe8vn
jelmer at samba.org-20070218115806-9h8thqvb95iffgh5
jelmer at samba.org-20070218120236-9q5wvlctgevr438d
jelmer at samba.org-20070218120857-cg7f6ppc1b3jd2nj
jelmer at samba.org-20070218122007-5c147i8tk17nh31s
jelmer at samba.org-20070218125126-mq0gsnn6mdt0dr5p
jelmer at samba.org-20070218133855-zz8l3b16rc7rh5n9
jelmer at samba.org-20070218134908-r7jzuwppx6odzgao
jelmer at samba.org-20070218161231-qs4bbg2mkz3lo6rf
jelmer at samba.org-20070218164355-wcsqzlh7s37se8xk
jelmer at samba.org-20070218165112-edgr3gi0gg7aaqlj
jelmer at samba.org-20070218183655-2qk7xgjc222tls7y
jelmer at samba.org-20070218234351-nxjnkhl4bc4x00df
jelmer at samba.org-20070218235514-ziine4dmb38u0xv3
jelmer at samba.org-20070219004515-smmtdyy6deud4adv
jelmer at samba.org-20070219014759-jv5otc3ij03d89va
jelmer at samba.org-20070219192807-w8shsv06u698i3du
jelmer at samba.org-20070219212917-syg7v8ejwpfa8grh
jelmer at samba.org-20070219220607-f2xy405hjsim9l4p
jelmer at samba.org-20070219230825-to4yp0eswh2gd283
jelmer at samba.org-20070220012443-ky7aj0q1ra0t1ivl
jelmer at samba.org-20070220224521-cwtsy3lkbyppctj6
jelmer at samba.org-20070220231211-pizf7rowfbhdws2n
jelmer at samba.org-20070221102807-1eot92jt41ax1dg5
jelmer at samba.org-20070221103458-93itdwtzjmxk4o41
jelmer at samba.org-20070221105255-dfi4vebkw1x35m8j
jelmer at samba.org-20070221113036-clajwiyqor6weyhh
jelmer at samba.org-20070221114205-6e61yds88np0hzuw
jelmer at samba.org-20070221114904-3wvjhp50c49ad6gj
jelmer at samba.org-20070221123127-0131p4yw87krxoif
jelmer at samba.org-20070221141543-vl5ror4myglk0fer
jelmer at samba.org-20070221205428-1zdem89mxo23fywq
jelmer at samba.org-20070225093009-0ymfldx8sq4dyqlx
jelmer at samba.org-20070225095105-xz76nand5qx31kzq
jelmer at samba.org-20070226010036-ra2i9iwwxgyhf436
jelmer at samba.org-20070226161456-f3ao5hpde0qf6jbr
jelmer at samba.org-20070226165025-2qr2oc1rk9o1u9ba
jelmer at samba.org-20070226174019-kgi3y7tzvwo4j05f
jelmer at samba.org-20070227124322-3lgrgarnqqzbyjbn
jelmer at samba.org-20070227133930-3isrqux11mtqpxkg
jelmer at samba.org-20070227175650-o69jjz1zyqe4zkuu
jelmer at samba.org-20070227203216-ewscmau41yygf7vn
jelmer at samba.org-20070227213357-po1j24g7hxzb0zub
jelmer at samba.org-20070227234431-sph4np74aq8dywrh
jelmer at samba.org-20070228001632-63x0t6c7cyowj18c
jelmer at samba.org-20070228002439-a604a1yg8myq8qlr
jelmer at samba.org-20070228003232-gx98ohwohqa3y0hp
jelmer at samba.org-20070228014756-k9hoae1822hg8fke
jelmer at samba.org-20070228015909-td0bfe324fsicupz
jelmer at samba.org-20070228020348-xip9pfy6ou5otvu9
jelmer at samba.org-20070228104928-qblk4we17a6wyqds
jelmer at samba.org-20070228132131-0pcf9e2ie5xo4hak
jelmer at samba.org-20070228145334-ly9jormrctz49jn4
jelmer at samba.org-20070302124451-iifyah7w73bjwimu
jelmer at samba.org-20070302134225-iu9mwzaaoa6w6v7u
jelmer at samba.org-20070302140325-8r0y5c9gxvhh14h0
jelmer at samba.org-20070302145020-vqd2uje8lieprfy6
jelmer at samba.org-20070302161759-q1mr3ki1s7oneyrh
jelmer at samba.org-20070302175850-jhtkiyk1a3urttvu
jelmer at samba.org-20070302182508-udkpisu7g3orp0k7
jelmer at samba.org-20070302191137-78hcw42xtxf0zf4j
jelmer at samba.org-20070303002438-925hy1uxyetacn9s
jelmer at samba.org-20070303005426-y4mtafvvqvm8qlqi
jelmer at samba.org-20070303011649-elz7bumnf6tbb2t7
+ jelmer at samba.org-20060824212938-5923465160f6ab63
jelmer at samba.org-20060830112659-186f132eebc987cc
jelmer at samba.org-20060904121718-63b73248146c14f8
jelmer at samba.org-20060904124721-5e70ab0bd405f748
metze at samba.org-20061010151401-45a5a2ed52cfe172
jelmer at samba.org-20061016130323-400ce51ee51ab30e
jelmer at samba.org-20061016195822-c7783d3ea1a56a53
jelmer at samba.org-20061016230421-75bca2ad62945ede
jelmer at samba.org-20061017145110-8c83a3dd979f6a6a
jelmer at samba.org-20061029173623-eb0459f1d3eb5720
jelmer at samba.org-20070115022006-h5ef1deqflt940b6
jelmer at samba.org-20070116142934-hv99dpwbnq2znh8f
jelmer at samba.org-20070116144126-70rip3bppmvgs3t6
jelmer at samba.org-20070116151516-imvui4r33cj850j9
jelmer at samba.org-20070116154739-3tji4fft7964qgrj
jelmer at samba.org-20070116173900-iasa25stcfty6pbr
jelmer at samba.org-20070117144550-te3o0iy10y14iyo4
jelmer at samba.org-20070122000024-q911packyrjk69ud
jelmer at samba.org-20070122181120-3n8ah238pjbzylyo
jelmer at samba.org-20070122182054-6b26fqrdqyjhyeuc
jelmer at samba.org-20070122233549-k085tfo2o1eqz7mm
jelmer at samba.org-20070123002251-0smz35eva10x84tc
jelmer at samba.org-20070123003546-p0jl6j9tw79q5j1k
jelmer at samba.org-20070123012404-o9w5pmgkm94zsxlu
jelmer at samba.org-20070123094731-ns7dzzzqtb0dlcod
jelmer at samba.org-20070125123431-g3pqm92r31ez9xyc
jelmer at samba.org-20070126125959-3w3t26aps9hmwukv
jelmer at samba.org-20070126132607-64kt7rc2wtqh0c7u
jelmer at samba.org-20070126133903-onfotbg1051ktojo
jelmer at samba.org-20070126144259-171b4t0744jigs5x
jelmer at samba.org-20070126152205-xj7j1avc7683rjy5
jelmer at samba.org-20070128010235-e8st47gcy00ii8kc
jelmer at samba.org-20070128130853-xjjrlrtf830pwnx6
jelmer at samba.org-20070130120806-gfqshokma9j6j3uv
jelmer at samba.org-20070131002510-55yxynmb1o4zvx0x
jelmer at samba.org-20070131115042-oocen3olfgu53jlm
jelmer at samba.org-20070206235608-980jutwyp43708k6
jelmer at samba.org-20070207185718-i1xx6bvmdeeii72p
jelmer at samba.org-20070208234639-i0h5mfefbn1a1lkl
jelmer at samba.org-20070209001154-lol5huzwdq9jw2e7
jelmer at samba.org-20070209093351-buzkh0t55nt863gw
jelmer at samba.org-20070212120516-lwfxtpxx1lerwro2
jelmer at samba.org-20070212130037-e7t2bh0ufajvi8m6
jelmer at samba.org-20070212173050-hpr37tn9ws2zhfko
jelmer at samba.org-20070214123932-nmsy6lnin8gtzxrn
jelmer at samba.org-20070214141810-0df8ykq1d0dl6yia
jelmer at samba.org-20070214143534-pc63vqrp827s6sdo
jelmer at samba.org-20070214145213-idzserezbwc2alty
jelmer at samba.org-20070214150805-zjdhqbtwy28fac3c
jelmer at samba.org-20070214192135-0yxxt5pto2lv4p4h
jelmer at samba.org-20070214213108-id4l0x9g95v6i060
jelmer at samba.org-20070215192824-a13ptx6qq150shoq
jelmer at samba.org-20070215210330-ve8q1mdkjymv6fr1
jelmer at samba.org-20070215220450-avh0rwc0ce0x7gja
jelmer at samba.org-20070215225539-cy8w0815ygz1wa0c
jelmer at samba.org-20070215234924-5u8bqtdp3ha66015
jelmer at samba.org-20070216003036-0ghop153wj46jjwe
jelmer at samba.org-20070216010504-03udexhmrhje5w5c
jelmer at samba.org-20070216124407-uwk21820sjr6n46p
jelmer at samba.org-20070216141029-nf84hlj2tr39ealw
jelmer at samba.org-20070216151123-m8lw5r1ebhymw8ba
jelmer at samba.org-20070217013108-znc8d1w6rtx0kaqf
jelmer at samba.org-20070217135603-92hi5qaxrxwoqulu
jelmer at samba.org-20070217233534-x58078kx0zci6831
jelmer at samba.org-20070218003055-80z3rswwe279yelu
jelmer at samba.org-20070218003815-07xijfqrcx3tybfi
jelmer at samba.org-20070218010222-fe4oase328jeg840
jelmer at samba.org-20070218115359-jytly04u0aufe8vn
jelmer at samba.org-20070218115806-9h8thqvb95iffgh5
jelmer at samba.org-20070218120236-9q5wvlctgevr438d
jelmer at samba.org-20070218120857-cg7f6ppc1b3jd2nj
jelmer at samba.org-20070218122007-5c147i8tk17nh31s
jelmer at samba.org-20070218125126-mq0gsnn6mdt0dr5p
jelmer at samba.org-20070218133855-zz8l3b16rc7rh5n9
jelmer at samba.org-20070218134908-r7jzuwppx6odzgao
jelmer at samba.org-20070218161231-qs4bbg2mkz3lo6rf
jelmer at samba.org-20070218164355-wcsqzlh7s37se8xk
jelmer at samba.org-20070218165112-edgr3gi0gg7aaqlj
jelmer at samba.org-20070218183655-2qk7xgjc222tls7y
jelmer at samba.org-20070218234351-nxjnkhl4bc4x00df
jelmer at samba.org-20070218235514-ziine4dmb38u0xv3
jelmer at samba.org-20070219004515-smmtdyy6deud4adv
jelmer at samba.org-20070219014759-jv5otc3ij03d89va
jelmer at samba.org-20070219192807-w8shsv06u698i3du
jelmer at samba.org-20070219212917-syg7v8ejwpfa8grh
jelmer at samba.org-20070219220607-f2xy405hjsim9l4p
jelmer at samba.org-20070219230825-to4yp0eswh2gd283
jelmer at samba.org-20070220012443-ky7aj0q1ra0t1ivl
jelmer at samba.org-20070220224521-cwtsy3lkbyppctj6
jelmer at samba.org-20070220231211-pizf7rowfbhdws2n
jelmer at samba.org-20070221102807-1eot92jt41ax1dg5
jelmer at samba.org-20070221103458-93itdwtzjmxk4o41
jelmer at samba.org-20070221105255-dfi4vebkw1x35m8j
jelmer at samba.org-20070221113036-clajwiyqor6weyhh
jelmer at samba.org-20070221114205-6e61yds88np0hzuw
jelmer at samba.org-20070221114904-3wvjhp50c49ad6gj
jelmer at samba.org-20070221123127-0131p4yw87krxoif
jelmer at samba.org-20070221141543-vl5ror4myglk0fer
jelmer at samba.org-20070221205428-1zdem89mxo23fywq
jelmer at samba.org-20070225093009-0ymfldx8sq4dyqlx
jelmer at samba.org-20070225095105-xz76nand5qx31kzq
jelmer at samba.org-20070226010036-ra2i9iwwxgyhf436
jelmer at samba.org-20070226161456-f3ao5hpde0qf6jbr
jelmer at samba.org-20070226165025-2qr2oc1rk9o1u9ba
jelmer at samba.org-20070226174019-kgi3y7tzvwo4j05f
jelmer at samba.org-20070227124322-3lgrgarnqqzbyjbn
jelmer at samba.org-20070227133930-3isrqux11mtqpxkg
jelmer at samba.org-20070227175650-o69jjz1zyqe4zkuu
jelmer at samba.org-20070227203216-ewscmau41yygf7vn
jelmer at samba.org-20070227213357-po1j24g7hxzb0zub
jelmer at samba.org-20070227234431-sph4np74aq8dywrh
jelmer at samba.org-20070228001632-63x0t6c7cyowj18c
jelmer at samba.org-20070228002439-a604a1yg8myq8qlr
jelmer at samba.org-20070228003232-gx98ohwohqa3y0hp
jelmer at samba.org-20070228014756-k9hoae1822hg8fke
jelmer at samba.org-20070228015909-td0bfe324fsicupz
jelmer at samba.org-20070228020348-xip9pfy6ou5otvu9
jelmer at samba.org-20070228104928-qblk4we17a6wyqds
jelmer at samba.org-20070228132131-0pcf9e2ie5xo4hak
jelmer at samba.org-20070228145334-ly9jormrctz49jn4
jelmer at samba.org-20070302124451-iifyah7w73bjwimu
jelmer at samba.org-20070302134225-iu9mwzaaoa6w6v7u
jelmer at samba.org-20070302140325-8r0y5c9gxvhh14h0
jelmer at samba.org-20070302145020-vqd2uje8lieprfy6
jelmer at samba.org-20070302161759-q1mr3ki1s7oneyrh
jelmer at samba.org-20070302175850-jhtkiyk1a3urttvu
jelmer at samba.org-20070302182508-udkpisu7g3orp0k7
jelmer at samba.org-20070302191137-78hcw42xtxf0zf4j
jelmer at samba.org-20070303002438-925hy1uxyetacn9s
jelmer at samba.org-20070303005426-y4mtafvvqvm8qlqi
jelmer at samba.org-20070303011649-elz7bumnf6tbb2t7
jelmer at samba.org-20070303020345-gesw3rzz8mfrmmis
Modified: branches/SAMBA_4_0/source/script/tests/tests_all.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-03-03 01:35:58 UTC (rev 21672)
+++ branches/SAMBA_4_0/source/script/tests/tests_all.sh 2007-03-03 02:06:54 UTC (rev 21673)
@@ -12,3 +12,4 @@
$SRCDIR/script/tests/test_pidl.sh
$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_s3upgrade.sh $PREFIX/upgrade
Modified: branches/SAMBA_4_0/source/scripting/libjs/upgrade.js
===================================================================
--- branches/SAMBA_4_0/source/scripting/libjs/upgrade.js 2007-03-03 01:35:58 UTC (rev 21672)
+++ branches/SAMBA_4_0/source/scripting/libjs/upgrade.js 2007-03-03 02:06:54 UTC (rev 21673)
@@ -357,7 +357,6 @@
subobj.NTTIME = nttime;
subobj.LDAPTIME = ldaptime;
subobj.DATESTRING = datestring;
- subobj.USN = nextusn;
subobj.ROOT = findnss(nss.getpwnam, "root");
subobj.NOBODY = findnss(nss.getpwnam, "nobody");
subobj.NOGROUP = findnss(nss.getgrnam, "nogroup", "nobody");
@@ -368,7 +367,26 @@
strlower(subobj.HOSTNAME),
subobj.DNSDOMAIN);
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;
}
Modified: branches/SAMBA_4_0/source/setup/upgrade
===================================================================
--- branches/SAMBA_4_0/source/setup/upgrade 2007-03-03 01:35:58 UTC (rev 21672)
+++ branches/SAMBA_4_0/source/setup/upgrade 2007-03-03 02:06:54 UTC (rev 21673)
@@ -95,7 +95,7 @@
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);
if (ret > 0) {
Modified: branches/SAMBA_4_0/testdata/samba3/verify
===================================================================
--- branches/SAMBA_4_0/testdata/samba3/verify 2007-03-03 01:35:58 UTC (rev 21672)
+++ branches/SAMBA_4_0/testdata/samba3/verify 2007-03-03 02:06:54 UTC (rev 21673)
@@ -5,6 +5,13 @@
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");
var path = substr(ARGV[0], 0, -strlen("verify"));
@@ -49,3 +56,4 @@
println("account policies ok");
+exit(0);
More information about the samba-cvs
mailing list