summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm4
-rw-r--r--source4/lib/ldb/common/ldb.c2
-rw-r--r--source4/lib/ldb/config.mk9
-rw-r--r--source4/librpc/config.mk18
-rw-r--r--source4/pidl/TODO2
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm2
-rw-r--r--source4/scripting/ejs/config.mk1
7 files changed, 21 insertions, 17 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 3d7412f5f3..bc4cb17d1d 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -505,8 +505,8 @@ sub write($$)
# nasty hack to allow running locally
if ($self->{duplicate_build}) {
- $self->output("bin/libdynconfig.\$(SHLIBEXT): dynconfig-devel.o\n");
- $self->output("bin/libdynconfig.\$(SHLIBEXT): LIBRARY_DYNCONFIG_OBJ_LIST=dynconfig-devel.o\n");
+ $self->output("bin/libdynconfig.\$(SHLIBEXT).0.0.1: dynconfig-devel.o\n");
+ $self->output("bin/libdynconfig.\$(SHLIBEXT).0.0.1: LIBRARY_DYNCONFIG_OBJ_LIST=dynconfig-devel.o\n");
}
$self->_prepare_mk_files();
diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 0d424ad601..6e1f6f5cde 100644
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -106,7 +106,7 @@ int ldb_connect(struct ldb_context *ldb, const char *url, unsigned int flags, co
ldb_connect_fn fn;
if (strchr(url, ':') != NULL) {
- backend = talloc_strndup(ldb, url, strchr(url, ':')-url);
+ backend = talloc_strndup(ldb, url, strchr(url, ':')-url-1);
} else {
/* Default to tdb */
backend = talloc_strdup(ldb, "tdb");
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 20d1437288..2f36042ab9 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -82,8 +82,8 @@ REQUIRED_SUBSYSTEMS = \
################################################
# Start MODULE ldb_map
-[MODULE::ldb_map]
-SUBSYSTEM = ldb
+[SUBSYSTEM::ldb_map]
+REQUIRED_SUBSYSTEMS = ldb
OBJ_FILES = modules/ldb_map.o
# End MODULE ldb_map
################################################
@@ -126,13 +126,16 @@ REQUIRED_SUBSYSTEMS = \
# End MODULE ldb_tdb
################################################
+./lib/ldb/common/ldb_modules.o: lib/ldb/common/ldb_modules.c Makefile
+ @echo Compiling $<
+ @$(CC) $(CFLAGS) $(PICFLAG) -DMODULESDIR=\"$(MODULESDIR)/ldb\" -DSHLIBEXT=\"$(SHLIBEXT)\" -c $< -o $@
+
################################################
# Start SUBSYSTEM ldb
[LIBRARY::ldb]
VERSION = 0.0.1
SO_VERSION = 0
DESCRIPTION = LDAP-like embedded database library
-EXTRA_CFLAGS = -DMODULESDIR="$(MODULESDIR)/ldb" -DSHLIBEXT="$(SHLIBEXT)"
INIT_FUNCTION_TYPE = int (*) (void)
OBJ_FILES = \
common/ldb.o \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 44bc09d3a4..0f9f808aa8 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -627,7 +627,7 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC EJSRPC
INIT_FUNCTION = ejs_init_samr
OBJ_FILES = gen_ndr/ndr_samr_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR EJSRPC RPC_EJS_LSA RPC_EJS_SECURITY RPC_EJS_MISC
[MODULE::RPC_EJS_SECURITY]
INIT_FUNCTION = ejs_init_security
@@ -639,7 +639,7 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY EJSRPC
INIT_FUNCTION = ejs_init_lsarpc
OBJ_FILES = gen_ndr/ndr_lsa_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA EJSRPC RPC_EJS_SECURITY
[MODULE::RPC_EJS_DFS]
INIT_FUNCTION = ejs_init_netdfs
@@ -651,7 +651,7 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS EJSRPC
INIT_FUNCTION = ejs_init_drsuapi
OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_SPOOLSS]
INIT_FUNCTION = ejs_init_spoolss
@@ -664,25 +664,25 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS EJSRPC
INIT_FUNCTION = ejs_init_wkssvc
OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC EJSRPC RPC_EJS_SRVSVC RPC_EJS_MISC
[MODULE::RPC_EJS_SRVSVC]
INIT_FUNCTION = ejs_init_srvsvc
OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_EVENTLOG]
INIT_FUNCTION = ejs_init_eventlog
OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_WINREG]
INIT_FUNCTION = ejs_init_winreg
OBJ_FILES = gen_ndr/ndr_winreg_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG EJSRPC RPC_EJS_INITSHUTDOWN
[MODULE::RPC_EJS_INITSHUTDOWN]
INIT_FUNCTION = ejs_init_initshutdown
@@ -694,13 +694,13 @@ REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN EJSRPC
INIT_FUNCTION = ejs_init_netlogon
OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR
+REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC RPC_EJS_SAMR RPC_EJS_SECURITY RPC_EJS_MISC
[MODULE::RPC_EJS_SVCCTL]
INIT_FUNCTION = ejs_init_svcctl
OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o
SUBSYSTEM = smbcalls
-REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL EJSRPC
+REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL EJSRPC RPC_EJS_MISC
[MODULE::RPC_EJS_IRPC]
INIT_FUNCTION = ejs_init_irpc
diff --git a/source4/pidl/TODO b/source4/pidl/TODO
index a99a4f3f5f..db64df3dd9 100644
--- a/source4/pidl/TODO
+++ b/source4/pidl/TODO
@@ -14,3 +14,5 @@
- replace subcontext() with represent_as()
- --explain-ndr option that dumps out parse tree ?
+
+- seperate tables for NDR and DCE/RPC
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
index e24fb54b96..41ea1e8eaa 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/EJS.pm
@@ -124,7 +124,7 @@ sub fn_declare($$)
if (has_property($fn, "public")) {
pidl_hdr "$decl;\n";
- pidl "$decl";
+ pidl "_PUBLIC_ $decl";
} else {
pidl "static $decl";
}
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e5a20d20e1..ac24b58359 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -27,7 +27,6 @@ SUBSYSTEM = smbcalls
INIT_FUNCTION = smb_setup_ejs_samba3
REQUIRED_SUBSYSTEMS = LIBSAMBA3
-
[MODULE::smbcalls_rand]
OBJ_FILES = smbcalls_rand.o
SUBSYSTEM = smbcalls
generated by cgit (git 2.34.1) at 2024-10-31 17:49:19 +0000