The branch, master has been updated via 9cddf89... Choose between local tevent_status.h header file and installed one via 693995c... Install util/tevent_* public headers. Required by OpenChange for compiling IDL via e8139ac... s4:librpc: remove explicit ../librpc/gen_ndr/ndr_drsblobs.o from python_drsblobs from da64913... s3-docs: Unify capitalization.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 9cddf891ad2a09ed1de83f3b51b4f2fc3e6855e8 Author: Julien Kerihuel <j.kerih...@openchange.org> Date: Wed May 12 12:55:56 2010 +0200 Choose between local tevent_status.h header file and installed one Signed-off-by: Stefan Metzmacher <me...@samba.org> commit 693995c1c4d36e03537d66db9fa3823baf3e6002 Author: Julien Kerihuel <j.kerih...@openchange.org> Date: Wed May 12 12:34:54 2010 +0200 Install util/tevent_* public headers. Required by OpenChange for compiling IDL Signed-off-by: Stefan Metzmacher <me...@samba.org> commit e8139ac14ab3041109cc593a4fa32ea39a330901 Author: Stefan Metzmacher <me...@samba.org> Date: Wed May 12 19:18:36 2010 +0200 s4:librpc: remove explicit ../librpc/gen_ndr/ndr_drsblobs.o from python_drsblobs It already comes via RPC_NDR_DRSBLOBS. metze ----------------------------------------------------------------------- Summary of changes: lib/util/config.mk | 2 ++ lib/util/wscript_build | 2 +- pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm | 2 +- source4/headermap.txt | 3 +++ source4/librpc/config.mk | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/config.mk b/lib/util/config.mk index 7df5227..0a5d62f 100644 --- a/lib/util/config.mk +++ b/lib/util/config.mk @@ -49,6 +49,8 @@ PUBLIC_HEADERS += $(addprefix $(libutilsrcdir)/, util.h \ time.h \ util_ldb.h \ talloc_stack.h \ + tevent_ntstatus.h \ + tevent_unix.h \ xfile.h) [SUBSYSTEM::ASN1_UTIL] diff --git a/lib/util/wscript_build b/lib/util/wscript_build index debc701..a606058 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-UTIL', source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c', public_deps='talloc LIBCRYPTO CHARSET execinfo UID_WRAPPER tevent', - public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h', + public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h tevent_ntstatus.h tevent_unix.h', header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ], local_include=False, vnum='0.0.1' diff --git a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm index 189eb9e..81f8477 100644 --- a/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm +++ b/pidl/lib/Parse/Pidl/Samba4/NDR/Client.pm @@ -377,7 +377,7 @@ sub Parse($$$$) $res .= "#include <core/ntstatus.h>\n"; } $res .= "#include <tevent.h>\n"; - $res .= "#include \"lib/util/tevent_ntstatus.h\"\n"; + $res .= choose_header("lib/util/tevent_ntstatus.h", "util/tevent_ntstatus.h")."\n"; $res .= "#include \"$ndr_header\"\n"; $res .= "#include \"$client_header\"\n"; $res .= "\n"; diff --git a/source4/headermap.txt b/source4/headermap.txt index fb6be56..a998ff9 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -40,6 +40,8 @@ lib/cmdline/popt_common.h: samba/popt.h ../lib/util/dlinklist.h: dlinklist.h ../lib/util/data_blob.h: util/data_blob.h ../lib/util/time.h: util/time.h +../lib/util/tevent_ntstatus.h: util/tevent_ntstatus.h +../lib/util/tevent_unix.h: util/tevent_unix.h version.h: samba/version.h param/param.h: param.h ../lib/util/asn1.h: samba/asn1.h @@ -54,6 +56,7 @@ param/share.h: share.h ../libcli/ldap/ldap_message.h: ldap_message.h ../libcli/ldap/ldap_errors.h: ldap_errors.h ../libcli/ldap/ldap_ndr.h: ldap_ndr.h +../tevent/tevent.h: tevent.h ../lib/tevent/tevent.h: tevent.h ../lib/tevent/tevent_internal.h: tevent_internal.h auth/session.h: samba/session.h diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index aa065a0..5985e92 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -726,7 +726,7 @@ python_drsuapi_OBJ_FILES = ../librpc/gen_ndr/py_drsuapi.o LIBRARY_REALNAME = samba/dcerpc/drsblobs.$(SHLIBEXT) PRIVATE_DEPENDENCIES = RPC_NDR_DRSBLOBS PYTALLOC pyparam_util pycredentials python_dcerpc -python_drsblobs_OBJ_FILES = ../librpc/gen_ndr/py_drsblobs.o ../librpc/gen_ndr/ndr_drsblobs.o +python_drsblobs_OBJ_FILES = ../librpc/gen_ndr/py_drsblobs.o [PYTHON::python_dcerpc_security] LIBRARY_REALNAME = samba/dcerpc/security.$(SHLIBEXT) -- Samba Shared Repository