diff options
| -rw-r--r-- | source4/configure.ac | 1 | ||||
| -rw-r--r-- | source4/headermap.txt | 4 | ||||
| -rw-r--r-- | source4/lib/events/config.mk | 6 | ||||
| -rw-r--r-- | source4/lib/registry/registry.h | 4 | ||||
| -rw-r--r-- | source4/lib/registry/registry.pc.in | 4 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 7 | ||||
| -rw-r--r-- | source4/librpc/dcerpc_atsvc.pc.in | 11 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc.h | 4 | ||||
| -rw-r--r-- | source4/librpc/rpc/dcerpc_util.c | 2 | ||||
| -rw-r--r-- | source4/pidl/config.m4 | 9 |
10 files changed, 43 insertions, 9 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 0e264d3474..01f514e859 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -34,6 +34,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 670b14c956..fbfc56e127 100644 --- 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 8001699aee..1e402f80d6 100644 --- 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 ff03f71eb2..a86294bf46 100644 --- 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 98943a0736..d981a45b2c 100644 --- 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/librpc/config.mk b/source4/librpc/config.mk index 9b91ba1115..e53e512bc6 100644 --- 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 index 0000000000..060485c3fc --- /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 c4a48a1119..805f5463a9 100644 --- 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 dc57735713..3b8768ccc2 100644 --- 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 index 0000000000..8b8bc5acf0 --- /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) |