Rev 11185: Merge upstream. in
file:///home/jelmer/bzr.samba-old/4.0-regwrite/
Jelmer Vernooij
jelmer at samba.org
Mon Jun 11 13:49:45 GMT 2007
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/
------------------------------------------------------------
revno: 11185
revision-id: jelmer at samba.org-20070611134928-pew4ydd6a0qnh3iv
parent: jelmer at samba.org-20070610234755-tpxetmbupthvqfp8
parent: svn-v2:23418 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-regwrite
timestamp: Mon 2007-06-11 15:49:28 +0200
message:
Merge upstream.
added:
source/torture/nsstest.h svn-v2:23403 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fnsstest.h
source/torture/nsstest.m4 svn-v2:23403 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fnsstest.m4
modified:
WHATSNEW.txt svn-v2:13031 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-WHATSNEW.txt
source/VERSION svn-v2:2 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-trunk-source%2fVERSION
source/auth/auth_winbind.c svn-v2:2 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-trunk-source%2fauth%2fauth_winbind.c
source/configure.ac svn-v2:15565 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fconfigure.ac
source/dsdb/samdb/ldb_modules/password_hash.c svn-v2:12599 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fdsdb%2fsamdb%2fldb_modules%2fpassword_hash.c
source/lib/events/events_aio.c svn-v2:20104 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fevents%2fevents_aio.c
source/lib/events/events_epoll.c svn-v2:20539 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fevents%2fevents_epoll.c
source/lib/events/events_standard.c svn-v2:5373 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fevents%2fevents_standard.c
source/lib/ldb/include/ldb.h svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fldb%2finclude%2fldb.h
source/lib/ldb/ldb_tdb/ldb_tdb.c svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fldb%2fldb_tdb%2fldb_tdb.c
source/lib/ldb/ldb_tdb/ldb_tdb_wrap.c svn-v2:8625 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fldb%2fldb_tdb%2fldb_tdb_wrap.c
source/lib/replace/Makefile.in svn-v2:18031 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2fMakefile.in
source/lib/replace/configure.ac svn-v2:18031 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2fconfigure.ac
source/lib/replace/libreplace_cc.m4 svn-v2:18479 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2flibreplace_cc.m4
source/lib/replace/replace.c svn-v2:7166 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2freplace.c
source/lib/replace/replace.h svn-v2:7352 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2freplace%2freplace.h
source/lib/tdb/common/traverse.c svn-v2:10253 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2ftdb%2fcommon%2ftraverse.c
source/libcli/util/doserr.c svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibcli%2futil%2fdoserr.c
source/libcli/util/doserr.h svn-v2:13652 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibcli%2futil%2fdoserr.h
source/librpc/idl/drsblobs.idl svn-v2:3927 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fidl%2fdrsblobs.idl
source/librpc/idl/lsa.idl svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fidl%2flsa.idl
source/librpc/idl/netlogon.idl svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flibrpc%2fidl%2fnetlogon.idl
source/nsswitch/wb_common.c svn-v2:3170 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fnsswitch%2fwb_common.c
source/nsswitch/winbind_nss_config.h svn-v2:3170 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fnsswitch%2fwinbind_nss_config.h
source/nsswitch/winbindd_nss.h svn-v2:3170 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fnsswitch%2fwinbindd_nss.h
source/rpc_server/lsa/dcesrv_lsa.c svn-v2:917 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2frpc_server%2flsa%2fdcesrv_lsa.c
source/rpc_server/netlogon/dcerpc_netlogon.c svn-v2:743 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2frpc_server%2fnetlogon%2fdcerpc_netlogon.c
source/rpc_server/samr/dcesrv_samr.c svn-v2:458 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2frpc_server%2fsamr%2fdcesrv_samr.c
source/scripting/libjs/provision.js svn-v2:8372 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fscripting%2flibjs%2fprovision.js
source/torture/config.mk svn-v2:860 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fconfig.mk
source/torture/nsstest.c svn-v2:2 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-trunk-source%2ftorture%2fnsstest.c
source/torture/rpc/lsa.c svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2frpc%2flsa.c
source/torture/rpc/netlogon.c svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2frpc%2fnetlogon.c
source/torture/rpc/samr.c svn-v2:6 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2frpc%2fsamr.c
source/winbind/wb_samba3_cmd.c svn-v2:10426 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fwinbind%2fwb_samba3_cmd.c
source/winbind/wb_samba3_protocol.c svn-v2:10426 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fwinbind%2fwb_samba3_protocol.c
source/winbind/wb_server.h svn-v2:10426 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2fwinbind%2fwb_server.h
webapps/install/provision.esp svn-v2:20517 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-webapps%2finstall%2fprovision.esp
webapps/menu.js svn-v2:20517 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-webapps%2fmenu.js
------------------------------------------------------------
revno: 11140.1.1205
merged: svn-v2:23418 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23413 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-06-11 13:02:30 +0000
message:
'S' is 0x53...
metze
------------------------------------------------------------
revno: 11140.1.1204
merged: svn-v2:23413 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23412 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-06-11 09:50:18 +0000
message:
TP5 is releast...
metze
------------------------------------------------------------
revno: 11140.1.1203
merged: svn-v2:23412 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23403 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Mon 2007-06-11 03:45:56 +0000
message:
We don't need hdb.h here any more
------------------------------------------------------------
revno: 11140.1.1202
merged: svn-v2:23403 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23386 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: kai
timestamp: Sat 2007-06-09 07:17:24 +0000
message:
Make nsstest build on Samba4.
For now, only build on Linux systems. If the build farm is happy with this,
I will gradually turn on this feature for other platforms, too.
------------------------------------------------------------
revno: 11140.1.1201
merged: svn-v2:23386 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23385 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: gd
timestamp: Fri 2007-06-08 10:56:46 +0000
message:
Correctly fill in server name in DsrGetDcSiteCoverageW() test.
Guenther
------------------------------------------------------------
revno: 11140.1.1200
merged: svn-v2:23385 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23384 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: gd
timestamp: Fri 2007-06-08 10:53:47 +0000
message:
Adding netr_DsRGetForestTrustInformation() test to query transitive forest
trusts as well as our primary domain.
Guenther
------------------------------------------------------------
revno: 11140.1.1199
merged: svn-v2:23384 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23383 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: gd
timestamp: Fri 2007-06-08 10:49:46 +0000
message:
Fill in NETLOGON netr_DsRGetForestTrustInformation().
Guenther
------------------------------------------------------------
revno: 11140.1.1198
merged: svn-v2:23383 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23382 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: gd
timestamp: Fri 2007-06-08 10:43:42 +0000
message:
Query transitive forest trust info in LSA torture test once we see such trusts.
Guenther
------------------------------------------------------------
revno: 11140.1.1197
merged: svn-v2:23382 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23381 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: gd
timestamp: Fri 2007-06-08 10:42:33 +0000
message:
Fill in lsa_lsaRQueryForestTrustInformation.
Guenther
------------------------------------------------------------
revno: 11140.1.1196
merged: svn-v2:23381 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23373 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: gd
timestamp: Fri 2007-06-08 10:32:29 +0000
message:
Merge netr_GetDcName WERROR return and WERROR_DOMAIN_CONTROLLER_NOT_FOUND from
SAMBA_3_0.
Guenther
------------------------------------------------------------
revno: 11140.1.1195
merged: svn-v2:23373 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23371 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Thu 2007-06-07 05:56:18 +0000
message:
Fix spelling...
------------------------------------------------------------
revno: 11140.1.1194
merged: svn-v2:23371 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23370 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: jra
timestamp: Thu 2007-06-07 00:14:06 +0000
message:
Fix the misleading comment I added - it really *should*
say "locks chain and returned record", not
"and returns record"
Jeremy.
------------------------------------------------------------
revno: 11140.1.1193
merged: svn-v2:23370 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23365 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: jra
timestamp: Thu 2007-06-07 00:00:45 +0000
message:
Traverse in tdb wasn't consistently using the
travlocks.lock_rw for lock read/write types, it
was sometimes using it (tdb_next_lock) and
sometimes explicitly using F_WRLCK instead.
Change this to consistently use travlocks.lock_rw
only.
I'm pretty sure about this fix (else I woudn't
be checking this in :-) but tridge and Volker
please review.
Jeremy.
------------------------------------------------------------
revno: 11140.1.1192
merged: svn-v2:23365 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23364 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Wed 2007-06-06 12:51:45 +0000
message:
Try to make Windows Vista join again. On my new test environment, it
wants to check for an existing domain join account, and fails. This
test shows that we need to return NT_STATUS_NONE_MAPPED when nothing
matches. (not yet tested if this helps vista).
Andrew Bartlett
------------------------------------------------------------
revno: 11140.1.1191
merged: svn-v2:23364 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23363 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: tridge
timestamp: Wed 2007-06-06 12:44:04 +0000
message:
add LDB_FLG_NOMMAP flag
------------------------------------------------------------
revno: 11140.1.1190
merged: svn-v2:23363 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23361 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: obnox
timestamp: Wed 2007-06-06 09:27:43 +0000
message:
Activate rep_pread and rep_pwrite in lib/replace/replace.h.
This fixes the build on a SuSE 6.1. :-)
I guess this had been merely forgotten.
But beware: The implementations of rep_pread and rep_pwrite are
not thread safe.
Michael
------------------------------------------------------------
revno: 11140.1.1189
merged: svn-v2:23361 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23351 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Wed 2007-06-06 01:36:15 +0000
message:
Merge from SAMBA_4_0_RELEASE:
Print the smb.conf path being created in provision.
Andrew Bartlett
------------------------------------------------------------
revno: 11140.1.1188
merged: svn-v2:23351 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23339 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Tue 2007-06-05 05:35:39 +0000
message:
Merge from SAMBA_4_0_RELEASE:
Fix a nasty issue we had with SWAT. We could not provision into a
different domain, as we didn't re-calcuate the DOMAINDN after the user
changed it in the form.
Andrew Bartlett
------------------------------------------------------------
revno: 11140.1.1187
merged: svn-v2:23339 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23325 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Mon 2007-06-04 14:26:37 +0000
message:
merge from SAMBA_3_0:
fix a crash bug...I wonder why only HP-UX 11.00 ans 11.11 noticed
it via a SIGBUS...
I missed to remove the samba3 specifc code path to tdb_open_ex()
when I synced lib/tdb/ with samba4. The explicit cast in on tdb_open_ex()
dropped the compiler warning :-(
metze
------------------------------------------------------------
revno: 11140.1.1186
merged: svn-v2:23325 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23311 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: abartlet
timestamp: Mon 2007-06-04 03:55:36 +0000
message:
Remove items from menu that have been removed from SVN long ago, with
the start of the transition to the new SWAT.
Andrew Bartlett
------------------------------------------------------------
revno: 11140.1.1185
merged: svn-v2:23311 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23306 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: kai
timestamp: Sat 2007-06-02 11:38:27 +0000
message:
Updating the samba4 winbind protocol to version 18.
nsswitch/winbindd_nss.h is just copied from SAMBA_3_0.
nsswitch/winbind_nss_config.h is copied from SAMBA_3_0, too, but I had to
drop some of the defines to make things build again.
Kai
------------------------------------------------------------
revno: 11140.1.1184
merged: svn-v2:23306 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23303 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Sat 2007-06-02 08:16:42 +0000
message:
pass down LDFLAGS to the link command in the libreplace standalone build
metze
------------------------------------------------------------
revno: 11140.1.1183
merged: svn-v2:23303 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23301 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Sat 2007-06-02 08:00:45 +0000
message:
so HP-UX 11.11 also likes the 11.00 workarround for broken
pread/pwrite when using large file support.
metze
------------------------------------------------------------
revno: 11140.1.1182
merged: svn-v2:23301 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23296 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: tridge
timestamp: Sat 2007-06-02 00:32:49 +0000
message:
merged from ctdb
------------------------------------------------------------
revno: 11140.1.1181
merged: svn-v2:23296 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v2:23294 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Fri 2007-06-01 18:36:55 +0000
message:
HP-UX 11.11 also gets sizeof(uint64_t) == 4
so try the same fix as for 11.00
metze
Diff too large for email (2094 lines, the limit is 1000).
More information about the samba-cvs
mailing list