Rev 10348: merge upstream in
file:///home/jelmer/bzr.samba/4.0-subunit/
Jelmer Vernooij
jelmer at samba.org
Tue Oct 17 14:07:03 GMT 2006
------------------------------------------------------------
revno: 10348
revision-id: jelmer at samba.org-20061017140655-1129071dc46b23a5
parent: jelmer at samba.org-20061017131303-45812a7f9e4d830d
parent: svn-v1:19372 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-subunit
timestamp: Tue 2006-10-17 16:06:55 +0200
message:
merge upstream
modified:
source/lib/ldb/modules/ldb_map_outbound.c svn-v1:17525 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fldb%2fmodules%2fldb_map_outbound.c
source/lib/socket_wrapper/socket_wrapper.c svn-v1:6139 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fsocket_wrapper%2fsocket_wrapper.c
source/torture/smbtorture.c svn-v1:14520 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fsmbtorture.c
source/torture/ui.c svn-v1:14718 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2ftorture%2fui.c
------------------------------------------------------------
merged: svn-v1:19372 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v1:19370 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: jelmer
timestamp: Tue 2006-10-17 13:19:55 +0000
message:
Fix segfault for ui's that don't support comments.
------------------------------------------------------------
merged: svn-v1:19370 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v1:19369 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: idra
timestamp: Tue 2006-10-17 12:35:33 +0000
message:
Handle errors if talloc_reference fails
------------------------------------------------------------
merged: svn-v1:19369 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v1:19367 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: metze
timestamp: Tue 2006-10-17 12:06:20 +0000
message:
- we need to set the target:samba3 before calling torture_init()
otherwise BASE-DELETE will run all tests
- call ldb_global_init() directly after torture_init()
this isn't strictly needed but looks better
metze
------------------------------------------------------------
merged: svn-v1:19367 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
parent: svn-v1:19366 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0
committer: lha
timestamp: Tue 2006-10-17 09:35:45 +0000
message:
Solaris needs <sys/filio.h> for FIONREAD.
More information about the samba-cvs
mailing list