svn commit: samba r15304 - in branches/SAMBA_4_0/source: auth
auth/credentials auth/gensec build/m4 build/smb_build librpc
smb_server smb_server/smb smb_server/smb2 smbd
jelmer at samba.org
jelmer at samba.org
Fri Apr 28 01:55:26 GMT 2006
Author: jelmer
Date: 2006-04-28 01:55:17 +0000 (Fri, 28 Apr 2006)
New Revision: 15304
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15304
Log:
Fix smbd build, more updates on getting --enable-dso to build again
Modified:
branches/SAMBA_4_0/source/auth/config.mk
branches/SAMBA_4_0/source/auth/credentials/config.mk
branches/SAMBA_4_0/source/auth/gensec/config.mk
branches/SAMBA_4_0/source/build/m4/rewrite.m4
branches/SAMBA_4_0/source/build/smb_build/TODO
branches/SAMBA_4_0/source/build/smb_build/header.pm
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/build/smb_build/main.pl
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/build/smb_build/output.pm
branches/SAMBA_4_0/source/librpc/config.mk
branches/SAMBA_4_0/source/smb_server/config.mk
branches/SAMBA_4_0/source/smb_server/smb/negprot.c
branches/SAMBA_4_0/source/smb_server/smb/receive.c
branches/SAMBA_4_0/source/smb_server/smb/request.c
branches/SAMBA_4_0/source/smb_server/smb2/keepalive.c
branches/SAMBA_4_0/source/smb_server/smb2/negprot.c
branches/SAMBA_4_0/source/smb_server/smb2/receive.c
branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c
branches/SAMBA_4_0/source/smb_server/smb2/tcon.c
branches/SAMBA_4_0/source/smb_server/smb_server.c
branches/SAMBA_4_0/source/smbd/
Changeset:
Modified: branches/SAMBA_4_0/source/auth/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/config.mk 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/auth/config.mk 2006-04-28 01:55:17 UTC (rev 15304)
@@ -6,11 +6,8 @@
[SUBSYSTEM::auth_sam]
PRIVATE_PROTO_HEADER = auth_sam.h
-OBJ_FILES = \
- sam.o \
- auth_sam_reply.o
-PUBLIC_DEPENDENCIES = \
- SAMDB
+OBJ_FILES = sam.o auth_sam_reply.o
+PUBLIC_DEPENDENCIES = SAMDB
#######################
# Start MODULE auth_sam
@@ -39,9 +36,7 @@
INIT_FUNCTION = auth_winbind_init
SUBSYSTEM = auth
OBJ_FILES = auth_winbind.o
-PUBLIC_DEPENDENCIES = \
- LIBWINBIND-CLIENT \
- NDR_NETLOGON LIBNDR
+PUBLIC_DEPENDENCIES = LIBWINBIND-CLIENT NDR_NETLOGON LIBNDR
# End MODULE auth_winbind
#######################
Modified: branches/SAMBA_4_0/source/auth/credentials/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/config.mk 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/auth/credentials/config.mk 2006-04-28 01:55:17 UTC (rev 15304)
@@ -8,7 +8,7 @@
credentials_krb5.o \
credentials_ntlm.o
PUBLIC_DEPENDENCIES = \
- HEIMDAL LIBCLI_AUTH SECRETS
+ LIBCLI_AUTH SECRETS LIBCRYPTO HEIMDAL_GSSAPI
# End SUBSYSTEM CREDENTIALS
#################################
Modified: branches/SAMBA_4_0/source/auth/gensec/config.mk
===================================================================
--- branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/auth/gensec/config.mk 2006-04-28 01:55:17 UTC (rev 15304)
@@ -8,7 +8,7 @@
PUBLIC_PROTO_HEADER = gensec_proto.h
OBJ_FILES = gensec.o
PUBLIC_DEPENDENCIES = \
- CREDENTIALS LIBSAMBA-UTIL
+ CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO
# End SUBSYSTEM gensec
#################################
Modified: branches/SAMBA_4_0/source/build/m4/rewrite.m4
===================================================================
--- branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/m4/rewrite.m4 2006-04-28 01:55:17 UTC (rev 15304)
@@ -1,11 +1,10 @@
dnl Checks for programs.
dnl Unique-to-Samba variables we'll be playing with.
-DYNEXP=
-
AC_SUBST(SHLIBEXT)
AC_SUBST(LDSHFLAGS)
AC_SUBST(SONAMEFLAG)
+AC_SUBST(DYNEXP)
AC_SUBST(PICFLAG)
AC_SYS_LARGEFILE
@@ -103,6 +102,7 @@
BLDSHARED="false"
# these are the defaults, good for lots of systems
+DYNEXP=
HOST_OS="$host_os"
LDSHFLAGS="-shared"
SONAMEFLAG=""
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO 2006-04-28 01:55:17 UTC (rev 15304)
@@ -1,8 +1,8 @@
+- replace StrnCpy() with strlcpy()
+- Add --export-dynamic for each subsystem that has modules
- let the build system implement some make functions($(patsubst),$(wildcard),...) and use our own implementations where `make' does not support them
- include extra_flags.txt using Makefile construction if
supported by current make
-- change default subsystem/library build type to STATIC_LIBRARY
- - fix order of UNIQUE_DEPENDENCIES
- make --enable-dso the default
- fix module loading for selftest during non-developer builds
- clearer distinction between dcerpc and ndr. seperate interface tables?
Modified: branches/SAMBA_4_0/source/build/smb_build/header.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/header.pm 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/smb_build/header.pm 2006-04-28 01:55:17 UTC (rev 15304)
@@ -27,7 +27,7 @@
my @defines = ();
my $output = "";
- foreach my $key (values %{$depend}) {
+ foreach my $key (values %$depend) {
my $DEFINE = ();
next if ($key->{TYPE} ne "LIBRARY" and
$key->{TYPE} ne "MODULE" and
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-28 01:55:17 UTC (rev 15304)
@@ -71,8 +71,6 @@
if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
$mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
- push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM}) unless
- $INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "BINARY";
} else {
push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
}
@@ -114,7 +112,6 @@
$bin->{OUTPUT_TYPE} = "BINARY";
}
-
sub import_integrated($$)
{
my ($lib, $depend) = @_;
@@ -200,6 +197,7 @@
foreach my $k (keys %$INPUT) {
my $part = $INPUT->{$k};
+ $part->{LINK_FLAGS} = [];
$part->{FULL_OBJ_LIST} = ["\$($part->{TYPE}_$part->{NAME}_OBJ_LIST)"];
check_subsystem($INPUT, $part, $subsys_ot) if ($part->{TYPE} eq "SUBSYSTEM");
@@ -209,6 +207,9 @@
}
foreach my $part (values %$INPUT) {
+ if (defined($part->{INIT_FUNCTIONS})) {
+ push (@{$part->{LINK_FLAGS}}, "\$(DYNEXP)");
+ }
import_integrated($part, $INPUT);
}
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl 2006-04-28 01:55:17 UTC (rev 15304)
@@ -19,14 +19,6 @@
my $INPUT = {};
my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
-my $subsystem_output_type;
-
-if (defined($ENV{"SUBSYSTEM_OUTPUT_TYPE"})) {
- $subsystem_output_type = $ENV{SUBSYSTEM_OUTPUT_TYPE};
-} else {
- $subsystem_output_type = "STATIC_LIBRARY";
-}
-
my $library_output_type;
if (defined($ENV{"LIBRARY_OUTPUT_TYPE"})) {
$library_output_type = $ENV{LIBRARY_OUTPUT_TYPE};
@@ -46,9 +38,9 @@
}
my $DEPEND = smb_build::input::check($INPUT, \%config::enabled,
- $subsystem_output_type, $library_output_type, $module_output_type);
+ "STATIC_LIBRARY", $library_output_type, $module_output_type);
my $OUTPUT = output::create_output($DEPEND, \%config::config);
-$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsystem_output_type;
+$config::config{SUBSYSTEM_OUTPUT_TYPE} = "STATIC_LIBRARY";
$config::config{LIBRARY_OUTPUT_TYPE} = $library_output_type;
$config::config{MODULE_OUTPUT_TYPE} = $module_output_type;
my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-28 01:55:17 UTC (rev 15304)
@@ -144,6 +144,7 @@
SHLD=$self->{config}->{CC}
SHLD_FLAGS=$self->{config}->{LDSHFLAGS} $self->{config}->{LDFLAGS} -L\$(builddir)/bin
SHLIBEXT=$self->{config}->{SHLIBEXT}
+DYNEXP=$self->{config}->{DYNEXP}
XSLTPROC=$self->{config}->{XSLTPROC}
Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-04-28 01:55:17 UTC (rev 15304)
@@ -33,7 +33,7 @@
my $lib_name;
$lib->{DEPEND_LIST} = [];
- $lib->{LINK_FLAGS} = ["\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"];
+ push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)");
$link_name = lc($lib->{NAME});
$lib_name = $link_name;
@@ -83,7 +83,7 @@
$link_name =~ s/^LIB//;
$lib->{LIBRARY_NAME} = "lib".lc($link_name).".a";
- $lib->{LINK_FLAGS} = ["\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)"];
+ push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)");
$lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}";
$lib->{OUTPUT} = "-l".lc($link_name);
@@ -94,7 +94,7 @@
my $bin = shift;
$bin->{DEPEND_LIST} = [];
- $bin->{LINK_FLAGS} = ["\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)"];
+ push(@{$bin->{LINK_FLAGS}}, "\$($bin->{TYPE}_$bin->{NAME}\_OBJ_LIST)");
$bin->{RELEASEDIR} = "bin/install";
$bin->{DEBUGDIR} = "bin/";
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2006-04-28 01:55:17 UTC (rev 15304)
@@ -294,7 +294,7 @@
SO_VERSION = 0
OBJ_FILES = gen_ndr/ndr_netlogon.o
PUBLIC_HEADERS = gen_ndr/netlogon.h
-PUBLIC_DEPENDENCIES = LIBNDR NDR_SAMR NDR_LSA
+PUBLIC_DEPENDENCIES = LIBNDR NDR_SAMR NDR_LSA NDR_SECURITY
[LIBRARY::NDR_TRKWKS]
VERSION = 0.0.1
@@ -605,11 +605,11 @@
rpc/dcerpc_sock.o \
rpc/dcerpc_connect.o
PUBLIC_DEPENDENCIES = \
- SOCKET LIBSMB \
+ SOCKET LIBSMB LIBCLI_SMB2 \
LIBNDR NDR_DCERPC \
RPC_NDR_EPMAPPER \
NDR_SCHANNEL RPC_NDR_NETLOGON \
- gensec
+ gensec LIBCLI_AUTH
# End SUBSYSTEM dcerpc
################################################
Modified: branches/SAMBA_4_0/source/smb_server/config.mk
===================================================================
--- branches/SAMBA_4_0/source/smb_server/config.mk 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/config.mk 2006-04-28 01:55:17 UTC (rev 15304)
@@ -1,12 +1,16 @@
# SMB server subsystem
+#
+[MODULE::SERVICE_SMB]
+INIT_FUNCTION = server_service_smb_init
+SUBSYSTEM = service
+OBJ_FILES = smb_server.o
+PRIVATE_PROTO_HEADER = service_smb_proto.h
+PRIVATE_DEPENDENCIES = SMB_SERVER
#######################
# Start SUBSYSTEM SMB
-[MODULE::SMB_SERVER]
-INIT_FUNCTION = server_service_smb_init
-SUBSYSTEM = service
+[SUBSYSTEM::SMB_SERVER]
OBJ_FILES = \
- smb_server.o \
tcon.o \
session.o \
management.o
Modified: branches/SAMBA_4_0/source/smb_server/smb/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/negprot.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb/negprot.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -23,6 +23,7 @@
#include "smb_server/smb_server.h"
#include "libcli/smb2/smb2.h"
#include "smb_server/smb2/smb2_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smbd/service_stream.h"
#include "lib/stream/packet.h"
Modified: branches/SAMBA_4_0/source/smb_server/smb/receive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/receive.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb/receive.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -24,6 +24,7 @@
#include "system/time.h"
#include "smbd/service_stream.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "ntvfs/ntvfs.h"
Modified: branches/SAMBA_4_0/source/smb_server/smb/request.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/request.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb/request.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -24,6 +24,7 @@
#include "includes.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smbd/service_stream.h"
#include "lib/stream/packet.h"
#include "ntvfs/ntvfs.h"
Modified: branches/SAMBA_4_0/source/smb_server/smb2/keepalive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/keepalive.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb2/keepalive.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -21,6 +21,7 @@
#include "includes.h"
#include "libcli/smb2/smb2.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smb_server/smb2/smb2_server.h"
static NTSTATUS smb2srv_keepalive_backend(struct smb2srv_request *req)
Modified: branches/SAMBA_4_0/source/smb_server/smb2/negprot.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/negprot.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb2/negprot.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -24,6 +24,7 @@
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smb_server/smb2/smb2_server.h"
#include "smbd/service_stream.h"
Modified: branches/SAMBA_4_0/source/smb_server/smb2/receive.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/receive.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb2/receive.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -24,6 +24,7 @@
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smb_server/smb2/smb2_server.h"
#include "lib/stream/packet.h"
Modified: branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb2/sesssetup.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -24,6 +24,7 @@
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smb_server/smb2/smb2_server.h"
#include "smbd/service_stream.h"
Modified: branches/SAMBA_4_0/source/smb_server/smb2/tcon.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb2/tcon.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb2/tcon.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -22,6 +22,7 @@
#include "libcli/smb2/smb2.h"
#include "libcli/smb2/smb2_calls.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "smb_server/smb2/smb2_server.h"
static NTSTATUS smb2srv_tcon_backend(struct smb2srv_request *req, struct smb2_tree_connect *io)
Modified: branches/SAMBA_4_0/source/smb_server/smb_server.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb_server.c 2006-04-28 00:03:52 UTC (rev 15303)
+++ branches/SAMBA_4_0/source/smb_server/smb_server.c 2006-04-28 01:55:17 UTC (rev 15304)
@@ -24,6 +24,7 @@
#include "smbd/service_stream.h"
#include "smbd/service.h"
#include "smb_server/smb_server.h"
+#include "smb_server/service_smb_proto.h"
#include "lib/messaging/irpc.h"
#include "lib/stream/packet.h"
#include "libcli/smb2/smb2.h"
Property changes on: branches/SAMBA_4_0/source/smbd
___________________________________________________________________
Name: svn:ignore
- service_proto.h
process_model_proto.h
*.8
*.d
*.po
*.po32
+ service_smb_proto.h
service_proto.h
process_model_proto.h
*.8
*.d
*.po
*.po32
More information about the samba-cvs
mailing list