Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet

(This used to be commit 7355055569654f5d4876034fa86fa70d0417dcf8)

diff --git a/source4/configure.ac b/source4/configure.ac
index 0e264d3474c4b5ec1a7c209e57a57b5449bb8e00..66fb69694e30c9d1cedea0b1548a6a3db022970d 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -26,6 +26,7 @@ m4_include(lib/popt/samba.m4)
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(nsswitch/nsstest.m4)
+m4_include(pidl/config.m4)
 
 AC_CONFIG_FILES(lib/registry/registry.pc)
 AC_CONFIG_FILES(librpc/dcerpc.pc)
@@ -34,6 +35,7 @@ AC_CONFIG_FILES(torture/torture.pc)
 AC_CONFIG_FILES(auth/gensec/gensec.pc)
 AC_CONFIG_FILES(param/samba-hostconfig.pc)
 AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
+AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
        [],

diff --git a/source4/headermap.txt b/source4/headermap.txt
index 670b14c95659caa1e2cb1052db4f93d45e0f7971..fbfc56e127436ac923caf319ff5c105dd6844f8e 100644 (file)
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -69,5 +69,5 @@ lib/util/wrap_xattr.h: wrap_xattr.h
 lib/events/events.h: events/events.h
 lib/events/events_internal.h: events/events_internal.h
 libcli/ldap/ldap_ndr.h: ldap_ndr.h
-libcli/wbclient/wbclient.h: wbclient/wbclient.h
-lib/gencache/gencache.h: gencache.h
+lib/events/events.h: events.h
+lib/events/events_internal.h: events_internal.h

diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 8001699aee32afa04f59d842acbe2249a0be6755..1e402f80d621c47e307feb44da922d36a39aa5cd 100644 (file)
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -30,13 +30,15 @@ INIT_FUNCTION = s4_events_standard_init
 
 ##############################
 # Start SUBSYSTEM LIBEVENTS
-[SUBSYSTEM::LIBEVENTS]
+[LIBRARY::LIBEVENTS]
 OBJ_FILES = events.o events_timed.o events_signal.o
 PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
+SO_VERSION = 0
+VERSION = 0.0.1
 # End SUBSYSTEM LIBEVENTS
 ##############################
 
-# PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
+PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
 
 [PYTHON::swig_events]
 SWIG_FILE = events.i

diff --git a/source4/lib/registry/registry.h b/source4/lib/registry/registry.h
index ff03f71eb2161f48334fd2b4f0a39c5fb2a7efa6..a86294bf4656c1ab996a6c9d027d093c53560089 100644 (file)
--- a/source4/lib/registry/registry.h
+++ b/source4/lib/registry/registry.h
@@ -22,11 +22,15 @@
 #define _REGISTRY_H
 
 struct registry_context;
+struct loadparm_context;
+struct smb_iconv_convenience;
 
 #include <talloc.h>
 #include "libcli/util/werror.h"
 #include "librpc/gen_ndr/security.h"
 #include "libcli/util/ntstatus.h"
+#include "util/time.h"
+#include "util/data_blob.h"
 
 /**
  * The hive API. This API is generally used for

diff --git a/source4/lib/registry/registry.pc.in b/source4/lib/registry/registry.pc.in
index 98943a073642d077aee77c24e05a87effbc58ded..d981a45b2c28d105281bbd7f37084e2c3abbe26a 100644 (file)
--- a/source4/lib/registry/registry.pc.in
+++ b/source4/lib/registry/registry.pc.in
@@ -5,8 +5,8 @@ includedir=@includedir@
 
 Name: registry
 Description: Windows-style registry library
-Requires: ldb
-Requires.private: 
+Requires: talloc
+Requires.private: ldb
 Version: 0.0.1
 Libs: -L${libdir} -lregistry 
 Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/libcli/wbclient/config.mk b/source4/libcli/wbclient/config.mk
index 32f2f5aeed676b39b613b2db1379715cdb391895..9384a172ff879bb7ef0233a6d4fa819bb066b8a8 100644 (file)
--- a/source4/libcli/wbclient/config.mk
+++ b/source4/libcli/wbclient/config.mk
@@ -2,5 +2,3 @@
 OBJ_FILES = wbclient.o
 PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBEVENTS
 PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING
-
-PUBLIC_HEADERS += libcli/wbclient/wbclient.h

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 9b91ba11154c07b23249b9ef17c730e8ad8263d8..e53e512bc6b9a3d33207aee78c46dc140ddf61e6 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -362,8 +362,8 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
 
 [LIBRARY::dcerpc_samr]
 OBJ_FILES = gen_ndr/ndr_samr_c.o
-PC_FILE = dcerpc_samr.pc
 PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR 
+PC_FILE = dcerpc_samr.pc
 VERSION = 0.0.1
 SO_VERSION = 0
 
@@ -385,9 +385,12 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
 
 PUBLIC_HEADERS += librpc/gen_ndr/ndr_svcctl_c.h
 
-[SUBSYSTEM::dcerpc_atsvc]
+[LIBRARY::dcerpc_atsvc]
 OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
+PC_FILE = dcerpc_atsvc.pc
+VERSION = 0.0.1
+SO_VERSION = 0
 
 PUBLIC_HEADERS += librpc/gen_ndr/ndr_atsvc_c.h
 

diff --git a/source4/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in
new file mode 100644 (file)
index 0000000..060485c
--- /dev/null
+++ b/source4/librpc/dcerpc_atsvc.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: dcerpc_atsvc
+Description: DCE/RPC client library - ATSVC
+Requires.private: dcerpc ndr
+Version: 0.0.1
+Libs: -L${libdir} -ldcerpc_atsvc
+Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h
index c4a48a1119d26244f4304f14a6c8a6b8f3bfa887..805f5463a90b95db99555a21cf80af47e4d61128 100644 (file)
--- a/source4/librpc/rpc/dcerpc.h
+++ b/source4/librpc/rpc/dcerpc.h
@@ -358,5 +358,9 @@ NTSTATUS dcerpc_ndr_request(struct dcerpc_pipe *p,
                            TALLOC_CTX *mem_ctx, 
                            void *r);
 
+NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 
+                                  struct epm_tower *tower, 
+                                  struct dcerpc_binding **b_out);
+
 
 #endif /* __DCERPC_H__ */

diff --git a/source4/librpc/rpc/dcerpc_util.c b/source4/librpc/rpc/dcerpc_util.c
index dc5773571351203b0fdadf41ccefb0b4e2b6d010..3b8768ccc21452b51bcfdf7f2f8cdad4783bca67 100644 (file)
--- a/source4/librpc/rpc/dcerpc_util.c
+++ b/source4/librpc/rpc/dcerpc_util.c
@@ -660,7 +660,7 @@ _PUBLIC_ enum dcerpc_transport_t dcerpc_transport_by_tower(struct epm_tower *tow
        return (unsigned int)-1;
 }
 
-NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 
+_PUBLIC_ NTSTATUS dcerpc_binding_from_tower(TALLOC_CTX *mem_ctx, 
                                   struct epm_tower *tower, 
                                   struct dcerpc_binding **b_out)
 {

diff --git a/source4/pidl/config.m4 b/source4/pidl/config.m4
new file mode 100644 (file)
index 0000000..8b8bc5a
--- /dev/null
+++ b/source4/pidl/config.m4
@@ -0,0 +1,9 @@
+# Check whether ExtUtils::ExtMaker is available
+
+if perl -e "use ExtUtils::MakeMaker" 2>/dev/null; then
+       HAVE_PERL_EXTUTILS_MAKEMAKER=1
+else
+       HAVE_PERL_EXTUTILS_MAKEMAKER=0
+fi
+
+AC_SUBST(HAVE_PERL_EXTUTILS_MAKEMAKER)

diff --git a/source4/pidl/config.mk b/source4/pidl/config.mk
index c469afa1f54d685e3ccc998a6c8bfcdafa4868c3..0d36473ade2c31c2cfcb409aec6a50f63e3a2ed4 100644 (file)
--- a/source4/pidl/config.mk
+++ b/source4/pidl/config.mk
@@ -7,6 +7,10 @@ pidl-testcov: pidl/Makefile
 installpidl:: pidl/Makefile
        $(MAKE) -C pidl install_vendor PREFIX=$(prefix)
 
+ifeq ($(HAVE_PERL_EXTUTILS_MAKEMAKER),1)
+install:: installpidl
+endif
+
 idl_full:: pidl/lib/Parse/Pidl/IDL.pm pidl/lib/Parse/Pidl/Expr.pm 
        @CPP="$(CPP)" PERL="$(PERL)" srcdir=$(srcdir) $(srcdir)/script/build_idl.sh FULL