summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-04-03 02:28:31 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-04-03 02:28:31 +0200
commitadc09857420c4a9306148e8d15ff5faf633ba7a5 (patch)
tree4e0112436d3decb1aaaac5217d39af10f35b721d
parent8495d17c1a97489a75b777d79e69f9680267fd28 (diff)
downloadsamba-adc09857420c4a9306148e8d15ff5faf633ba7a5.tar.gz
samba-adc09857420c4a9306148e8d15ff5faf633ba7a5.tar.bz2
samba-adc09857420c4a9306148e8d15ff5faf633ba7a5.zip
Install libevents since it's required by samba-gtk.
(This used to be commit 2073346828ffa1d9c35105eadd7afddd3a76a045)
-rw-r--r--source4/headermap.txt2
-rw-r--r--source4/lib/events/config.mk6
-rw-r--r--source4/lib/registry/registry.h4
-rw-r--r--source4/librpc/dcerpc_atsvc.pc.in6
-rw-r--r--source4/librpc/rpc/dcerpc.h4
-rw-r--r--source4/librpc/rpc/dcerpc_util.c2
6 files changed, 18 insertions, 6 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt
index 8d4d78bd35..7984149837 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -67,3 +67,5 @@ lib/util/util_tdb.h: util_tdb.h
lib/util/util_ldb.h: util_ldb.h
lib/util/wrap_xattr.h: wrap_xattr.h
libcli/ldap/ldap_ndr.h: ldap_ndr.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/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in
index c4102237d3..060485c3fc 100644
--- a/source4/librpc/dcerpc_atsvc.pc.in
+++ b/source4/librpc/dcerpc_atsvc.pc.in
@@ -3,9 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: dcerpc_samr
-Description: DCE/RPC client library - SAMR
+Name: dcerpc_atsvc
+Description: DCE/RPC client library - ATSVC
Requires.private: dcerpc ndr
Version: 0.0.1
-Libs: -L${libdir} -ldcerpc_samr
+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)
{