Author: jelmer Date: 2006-03-17 00:45:52 +0000 (Fri, 17 Mar 2006) New Revision: 14497
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14497 Log: Fix build with shared libraries Modified: branches/SAMBA_4_0/source/auth/config.mk branches/SAMBA_4_0/source/auth/gensec/config.mk branches/SAMBA_4_0/source/build/smb_build/TODO branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/lib/tdr/config.mk branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c branches/SAMBA_4_0/source/torture/config.mk branches/SAMBA_4_0/source/torture/local/config.mk branches/SAMBA_4_0/source/torture/rpc/rpc.c branches/SAMBA_4_0/source/torture/torture.c Changeset: Modified: branches/SAMBA_4_0/source/auth/config.mk =================================================================== --- branches/SAMBA_4_0/source/auth/config.mk 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/auth/config.mk 2006-03-17 00:45:52 UTC (rev 14497) @@ -7,6 +7,8 @@ ####################### # Start MODULE auth_sam [MODULE::auth_sam] +# gensec_krb5 and gensec_gssapi depend on it +OUTPUT_TYPE = MERGEDOBJ PRIVATE_PROTO_HEADER = auth_sam.h INIT_FUNCTION = auth_sam_init SUBSYSTEM = auth Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk =================================================================== --- branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-03-17 00:45:52 UTC (rev 14497) @@ -8,7 +8,7 @@ PUBLIC_PROTO_HEADER = gensec_proto.h OBJ_FILES = gensec.o REQUIRED_SUBSYSTEMS = \ - CREDENTIALS + CREDENTIALS LIBBASIC # End SUBSYSTEM gensec ################################# @@ -18,7 +18,7 @@ SUBSYSTEM = gensec INIT_FUNCTION = gensec_krb5_init OBJ_FILES = gensec_krb5.o -REQUIRED_SUBSYSTEMS = KERBEROS auth +REQUIRED_SUBSYSTEMS = KERBEROS auth auth_sam # End MODULE gensec_krb5 ################################################ Modified: branches/SAMBA_4_0/source/build/smb_build/TODO =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/TODO 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/build/smb_build/TODO 2006-03-17 00:45:52 UTC (rev 14497) @@ -5,6 +5,7 @@ - include line in Makefile - rule in Makefile - generate headermap.txt +- fix handling of dynconfig.o (causes too much recompiles for asn1_compile) set of test scripts that check the code: - configure_check_unused.pl Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-03-17 00:45:52 UTC (rev 14497) @@ -256,11 +256,16 @@ } my $soarg = ""; + my $soargdebug = ""; if ($self->{config}->{SONAMEFLAG} ne "" and defined($ctx->{LIBRARY_SONAME})) { $soarg = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_SONAME} "; } + if ($self->{config}->{SONAMEFLAG} ne "") { + $soargdebug = "$self->{config}->{SONAMEFLAG}$ctx->{LIBRARY_REALNAME} "; + } + if ($self->{duplicate_build}) { $self->output(<< "__EOD__" # @@ -269,7 +274,7 @@ [EMAIL PROTECTED] Linking \$\@ [EMAIL PROTECTED] -p $ctx->{DEBUGDIR} [EMAIL PROTECTED](SHLD) \$(SHLD_FLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ - \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soarg \\ + \$($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) $soargdebug \\ $init_obj \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) __EOD__ @@ -393,7 +398,7 @@ # bin/$ctx->{BINARY}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) \$(builddir)/dynconfig-devel.o [EMAIL PROTECTED] Linking \$\@ - [EMAIL PROTECTED](CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \\ + [EMAIL PROTECTED](CC) \$(LDFLAGS) -o \$\@ \$(LOCAL_LINK_FLAGS) \$(INSTALL_LINK_FLAGS) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) \\ \$\($ctx->{TYPE}_$ctx->{NAME}_LINK_FLAGS) \$(builddir)/dynconfig-devel.o Modified: branches/SAMBA_4_0/source/lib/tdr/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/tdr/config.mk 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/lib/tdr/config.mk 2006-03-17 00:45:52 UTC (rev 14497) @@ -4,4 +4,5 @@ SO_VERSION = 0 DESCRIPTION = Simple marshall/unmarshall library PUBLIC_PROTO_HEADER = tdr_proto.h +REQUIRED_SUBSYSTEMS = LIBTALLOC LIBBASIC OBJ_FILES = tdr.o Modified: branches/SAMBA_4_0/source/librpc/config.mk =================================================================== --- branches/SAMBA_4_0/source/librpc/config.mk 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/librpc/config.mk 2006-03-17 00:45:52 UTC (rev 14497) @@ -12,7 +12,7 @@ ndr/ndr_string.o \ ndr/ndr_obfuscate.o \ ndr/ndr_misc.o -REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC +REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC LIBBASIC # End SUBSYSTEM LIBNDR ################################################ @@ -738,95 +738,95 @@ INIT_FUNCTION = ejs_init_rpcecho OBJ_FILES = gen_ndr/ndr_echo_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO +REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO EJSRPC [MODULE::RPC_EJS_MISC] INIT_FUNCTION = ejs_init_misc OBJ_FILES = gen_ndr/ndr_misc_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC +REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC EJSRPC [MODULE::RPC_EJS_SAMR] INIT_FUNCTION = ejs_init_samr OBJ_FILES = gen_ndr/ndr_samr_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR +REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR EJSRPC [MODULE::RPC_EJS_SECURITY] INIT_FUNCTION = ejs_init_security OBJ_FILES = gen_ndr/ndr_security_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY +REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY EJSRPC [MODULE::RPC_EJS_LSA] INIT_FUNCTION = ejs_init_lsarpc OBJ_FILES = gen_ndr/ndr_lsa_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA +REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA EJSRPC [MODULE::RPC_EJS_DFS] INIT_FUNCTION = ejs_init_netdfs OBJ_FILES = gen_ndr/ndr_dfs_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS +REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS EJSRPC [MODULE::RPC_EJS_DRSUAPI] INIT_FUNCTION = ejs_init_drsuapi OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI +REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI EJSRPC [MODULE::RPC_EJS_SPOOLSS] INIT_FUNCTION = ejs_init_spoolss OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o SUBSYSTEM = smbcalls ENABLE = NO -REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS +REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS EJSRPC [MODULE::RPC_EJS_WKSSVC] INIT_FUNCTION = ejs_init_wkssvc OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC EJSRPC [MODULE::RPC_EJS_SRVSVC] INIT_FUNCTION = ejs_init_srvsvc OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC +REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC EJSRPC [MODULE::RPC_EJS_EVENTLOG] INIT_FUNCTION = ejs_init_eventlog OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG +REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG EJSRPC [MODULE::RPC_EJS_WINREG] INIT_FUNCTION = ejs_init_winreg OBJ_FILES = gen_ndr/ndr_winreg_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG +REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG EJSRPC [MODULE::RPC_EJS_INITSHUTDOWN] INIT_FUNCTION = ejs_init_initshutdown OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN +REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN EJSRPC [MODULE::RPC_EJS_NETLOGON] INIT_FUNCTION = ejs_init_netlogon OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON +REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON EJSRPC [MODULE::RPC_EJS_SVCCTL] INIT_FUNCTION = ejs_init_svcctl OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL +REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL EJSRPC [MODULE::RPC_EJS_IRPC] INIT_FUNCTION = ejs_init_irpc OBJ_FILES = gen_ndr/ndr_irpc_ejs.o SUBSYSTEM = smbcalls -REQUIRED_SUBSYSTEMS = dcerpc NDR_IRPC +REQUIRED_SUBSYSTEMS = dcerpc NDR_IRPC EJSRPC Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c =================================================================== --- branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls.c 2006-03-17 00:45:52 UTC (rev 14497) @@ -137,7 +137,7 @@ ejsnet_setup(); - shared_init = load_samba_modules(NULL, "ejs"); + shared_init = load_samba_modules(NULL, "smbcalls"); run_init_functions(static_init); run_init_functions(shared_init); Modified: branches/SAMBA_4_0/source/torture/config.mk =================================================================== --- branches/SAMBA_4_0/source/torture/config.mk 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/torture/config.mk 2006-03-17 00:45:52 UTC (rev 14497) @@ -74,6 +74,8 @@ com dcom [MODULE::torture_rpc] +# TORTURE_NET and TORTURE_NBT use functions from torture_rpc... +OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = smbtorture INIT_FUNCTION = torture_rpc_init PRIVATE_PROTO_HEADER = \ Modified: branches/SAMBA_4_0/source/torture/local/config.mk =================================================================== --- branches/SAMBA_4_0/source/torture/local/config.mk 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/torture/local/config.mk 2006-03-17 00:45:52 UTC (rev 14497) @@ -18,6 +18,7 @@ sddl.o \ ndr.o REQUIRED_SUBSYSTEMS = \ + RPC_NDR_ECHO \ LIBSMB \ MESSAGING \ registry Modified: branches/SAMBA_4_0/source/torture/rpc/rpc.c =================================================================== --- branches/SAMBA_4_0/source/torture/rpc/rpc.c 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/torture/rpc/rpc.c 2006-03-17 00:45:52 UTC (rev 14497) @@ -24,6 +24,7 @@ #include "lib/cmdline/popt_common.h" #include "torture/rpc/rpc.h" #include "torture/torture.h" +#include "librpc/rpc/dcerpc_table.h" /* open a rpc connection to the chosen binding string */ NTSTATUS torture_rpc_connection(TALLOC_CTX *parent_ctx, @@ -85,6 +86,10 @@ NTSTATUS torture_rpc_init(void) { + dcerpc_init(); + + dcerpc_table_init(); + register_torture_op("RPC-LSA", torture_rpc_lsa, 0); register_torture_op("RPC-LSALOOKUP", torture_rpc_lsa_lookup, 0); register_torture_op("RPC-SECRETS", torture_rpc_lsa_secrets, 0); Modified: branches/SAMBA_4_0/source/torture/torture.c =================================================================== --- branches/SAMBA_4_0/source/torture/torture.c 2006-03-16 23:54:05 UTC (rev 14496) +++ branches/SAMBA_4_0/source/torture/torture.c 2006-03-17 00:45:52 UTC (rev 14497) @@ -31,7 +31,6 @@ #include "lib/events/events.h" #include "libcli/resolve/resolve.h" #include "auth/credentials/credentials.h" -#include "librpc/rpc/dcerpc_table.h" #include "libcli/ldap/ldap_client.h" #include "librpc/gen_ndr/ndr_nbt.h" @@ -2615,10 +2614,6 @@ ldb_global_init(); - dcerpc_init(); - - dcerpc_table_init(); - if (torture_seed == 0) { torture_seed = time(NULL); }