s3compat: it is now possible to connect to s3 shares in a s4 server

Right now it needs a passdb.tdb from s3.

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

diff --git a/source4/s3compat/compat/includes.h b/source4/s3compat/compat/includes.h
index 38076e55c9dcb18d07e67df5e9b9bacef4000cb3..24d8bef287d023bdf7e01892bd0141c36acf71be 100644 (file)
--- a/source4/s3compat/compat/includes.h
+++ b/source4/s3compat/compat/includes.h
@@ -2,3 +2,4 @@
    to override some defines if need be */
 #include "source3/include/includes.h"
 
+#define USE_SETRESUID 1

diff --git a/source4/s3compat/s3_smbd.c b/source4/s3compat/s3_smbd.c
new file mode 100644 (file)
index 0000000..5d893b2
--- /dev/null
+++ b/source4/s3compat/s3_smbd.c
@@ -0,0 +1,137 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   use s3compat to run s3 smbd within Samba4
+
+   based on smb_samba3 by Metze
+
+   Copyright (C) Andrew Tridgell       2010
+   Copyright (C) Stefan Metzmacher     2008
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "smbd/service.h"
+#include "libcli/smb2/smb2.h"
+#include "system/network.h"
+#include "lib/socket/netif.h"
+#include "param/param.h"
+#include "dynconfig/dynconfig.h"
+#include "smbd/process_model.h"
+#include "tevent/tevent.h"
+#include "s3compat.h"
+
+/*
+  initialise a server_context from a open socket and register a event handler
+  for reading from that socket
+*/
+static void s3compat_smb_accept(struct stream_connection *conn)
+{
+       int fd = socket_get_fd(conn->socket);
+#if 0
+       char *cmd = talloc_asprintf(conn, "xterm -e gdb --pid %u &", getpid());
+       DEBUG(0,(__location__ ": NEW CONNECTION\n"));
+       system(cmd);
+       sleep(2);
+#endif
+       s3compat_set_server_fd(fd);
+       s3compat_set_event_ctx(conn->event.ctx);
+       tevent_re_initialise(conn->event.ctx);
+       s3compat_smbd_process();
+       _exit(1);
+}
+
+static const struct stream_server_ops s3compat_smb_stream_ops = {
+       .name                   = "s3compat",
+       .accept_connection      = s3compat_smb_accept,
+};
+
+/*
+  setup a listening socket on all the SMB ports for a particular address
+*/
+static NTSTATUS s3compat_add_socket(struct tevent_context *event_context,
+                                 struct loadparm_context *lp_ctx,
+                                 const struct model_ops *model_ops,
+                                 const char *address)
+{
+       const char **ports = lp_smb_ports(lp_ctx);
+       int i;
+       NTSTATUS status;
+
+       for (i=0;ports[i];i++) {
+               uint16_t port = atoi(ports[i]);
+               if (port == 0) continue;
+               status = stream_setup_socket(event_context, lp_ctx,
+                                            model_ops, &s3compat_smb_stream_ops,
+                                            "ip", address, &port,
+                                            lp_socket_options(lp_ctx),
+                                            NULL);
+               NT_STATUS_NOT_OK_RETURN(status);
+       }
+
+       return NT_STATUS_OK;
+}
+
+
+/*
+  open the smb server sockets
+*/
+_PUBLIC_ void s3_smbd_task_init(struct task_server *task)
+{
+       NTSTATUS status;
+       const struct model_ops *model_ops;
+
+       model_ops = process_model_startup(task->event_ctx, "standard");
+
+       if (model_ops == NULL) {
+               goto failed;
+       }
+
+       task_server_set_title(task, "task[s3compat_smb]");
+
+       if (lp_interfaces(task->lp_ctx)
+           && lp_bind_interfaces_only(task->lp_ctx)) {
+               int num_interfaces;
+               int i;
+               struct interface *ifaces;
+
+               load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces);
+
+               num_interfaces = iface_count(ifaces);
+
+               /* We have been given an interfaces line, and been
+                  told to only bind to those interfaces. Create a
+                  socket per interface and bind to only these.
+               */
+               for(i = 0; i < num_interfaces; i++) {
+                       const char *address = iface_n_ip(ifaces, i);
+                       status = s3compat_add_socket(task->event_ctx,
+                                                  task->lp_ctx,
+                                                  model_ops, address);
+                       if (!NT_STATUS_IS_OK(status)) goto failed;
+               }
+       } else {
+               /* Just bind to lp_socket_address() (usually 0.0.0.0) */
+               status = s3compat_add_socket(task->event_ctx, task->lp_ctx,
+                                          model_ops,
+                                          lp_socket_address(task->lp_ctx));
+               if (!NT_STATUS_IS_OK(status)) goto failed;
+       }
+
+       return;
+failed:
+       task_server_terminate(task, "Failed to startup s3compat smb task", true);
+}
+

diff --git a/source4/s3compat/s3compat.c b/source4/s3compat/s3compat.c
index 6a8c705013ba3b92a40f2276b67e6a75de0244f1..b97ad3b91c2a4595bd375050f03a4985e08b21a9 100644 (file)
--- a/source4/s3compat/s3compat.c
+++ b/source4/s3compat/s3compat.c
@@ -20,8 +20,7 @@
 */
 
 #include "includes.h"
-#include "lib/util/talloc_stack.h"
-#include "s3compat.h"
+#include "source3/smbd/globals.h"
 
 
 _PUBLIC_ const char *s3compat_samba_version_string(void)
@@ -31,11 +30,59 @@ _PUBLIC_ const char *s3compat_samba_version_string(void)
 }
 
 _PUBLIC_
-void s3compat_test(void)
+void s3compat_initialise(const char *config_file)
 {
-       TALLOC_CTX *stack = talloc_stackframe();
+
+
+       talloc_stackframe();
        /* use stdout logging for now */
        setup_logging("s3compat", true);
-       DEBUG(0,("s3compat: samba_version_string: %s\n",
+       load_case_tables();
+       sec_init();
+       set_remote_machine_name("smbd", false);
+       init_sec_ctx();
+
+       lp_load_initial_only(config_file);
+       smbd_messaging_context();
+       reload_services(false);
+       smbd_init_globals();
+       TimeInit();
+
+       init_names();
+       file_init();
+       memcache_set_global(smbd_memcache());
+       sessionid_init();
+       connections_init(True);
+       locking_init();
+       messaging_tdb_parent_init();
+       notify_internal_parent_init();
+       serverid_parent_init();
+       namecache_enable();
+       print_backend_init(smbd_messaging_context());
+       init_guest_info();
+       share_info_db_init();
+
+       DEBUG(0,("s3compat: initialised samba3 version: %s\n",
                 s3compat_samba_version_string()));
 }
+
+_PUBLIC_
+void s3compat_set_server_fd(int fd)
+{
+       extern int server_fd;
+       server_fd = fd;
+}
+
+_PUBLIC_
+void s3compat_set_event_ctx(struct tevent_context *ctx)
+{
+       extern struct tevent_context *smbd_event_ctx;
+       smbd_event_ctx = ctx;
+}
+
+_PUBLIC_
+void s3compat_smbd_process(void)
+{
+       void smbd_process(void);
+       smbd_process();
+}

diff --git a/source4/s3compat/wscript b/source4/s3compat/wscript
new file mode 100644 (file)
index 0000000..cbd05d0
--- /dev/null
+++ b/source4/s3compat/wscript
@@ -0,0 +1,15 @@
+#! /usr/bin/env python
+
+import Options
+
+def set_options(opt):
+    gr = opt.option_group('developer options')
+    gr.add_option('--enable-s3compat',
+                   help='enable s3compat modules',
+                   action='store_true', dest='ENABLE_S3COMPAT')
+
+def configure(conf):
+    conf.env.ENABLE_S3COMPAT = Options.options.ENABLE_S3COMPAT
+    if conf.env.ENABLE_S3COMPAT:
+        conf.DEFINE('ENABLE_S3COMPAT', 1)
+

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 1c63be02f5a3aabe22ea9e8e94e2424ec7eba4c8..979d8c09e0ec149605e2c1b51bf707f274a7e89c 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -1,5 +1,673 @@
 #!/usr/bin/env python
 
+
+TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
+          lib/dbwrap.c lib/dbwrap_tdb.c
+          lib/dbwrap_ctdb.c
+          lib/g_lock.c
+          lib/dbwrap_rbt.c'''
+
+TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
+
+SMBLDAP_SRC = '''${SMBLDAP} ${SMBLDAPUTIL}'''
+
+VERSION_SRC = '''lib/version.c'''
+
+WBCOMMON_SRC = '../nsswitch/wb_common.c'
+
+AFS_SRC = 'lib/afs.c'
+
+AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
+
+AVAHI_SRC = '' # TODO: fix
+
+SERVER_MUTEX_SRC = 'lib/server_mutex.c'
+
+PASSCHANGE_SRC = '''libsmb/passchange.c'''
+
+LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
+                     ../librpc/ndr/ndr_compression.c
+                     ../librpc/gen_ndr/ndr_drsuapi.c
+                     ../librpc/ndr/ndr_drsblobs.c
+                     ../librpc/gen_ndr/ndr_drsblobs.c'''
+
+ZLIB_SRC = '''${ZLIB_SRCS}'''
+
+COMPRESSION_SRC = '''../lib/compression/mszip.c
+                                  ../lib/compression/lzxpress.c
+                                  ${ZLIB_SRC}'''
+
+DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
+              ${COMPRESSION_SRC}'''
+
+LIBNDR_NTLMSSP_SRC = '''../librpc/gen_ndr/ndr_ntlmssp.c
+                     ../librpc/ndr/ndr_ntlmssp.c'''
+
+LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
+             ../librpc/ndr/ndr.c
+             ../librpc/ndr/ndr_misc.c
+             ../librpc/gen_ndr/ndr_misc.c
+             ../librpc/gen_ndr/ndr_security.c
+             ../librpc/ndr/ndr_sec_helper.c
+             librpc/ndr/ndr_string.c
+             ../librpc/ndr/uuid.c
+             librpc/ndr/util.c
+             ../librpc/gen_ndr/ndr_dcerpc.c'''
+
+RPCCLIENT_NDR_SRC = '''rpc_client/ndr.c'''
+
+LIBNDR_GEN_SRC0 = '''../librpc/gen_ndr/ndr_samr.c
+                  ../librpc/gen_ndr/ndr_lsa.c'''
+
+LIBNDR_GEN_SRC1 = '''../librpc/gen_ndr/ndr_netlogon.c
+                  ../librpc/ndr/ndr_netlogon.c'''
+
+LIBNDR_GEN_SRC2 = '''../librpc/gen_ndr/ndr_spoolss.c
+                  ../librpc/ndr/ndr_spoolss_buf.c'''
+
+LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
+                 ${LIBNDR_GEN_SRC0}
+                 ../librpc/gen_ndr/ndr_dfs.c
+                 ../librpc/gen_ndr/ndr_echo.c
+                 ../librpc/gen_ndr/ndr_winreg.c
+                 ../librpc/gen_ndr/ndr_initshutdown.c
+                 ../librpc/gen_ndr/ndr_srvsvc.c
+                 ../librpc/gen_ndr/ndr_eventlog.c
+                 ${LIBNDR_GEN_SRC1}
+                 ../librpc/gen_ndr/ndr_dssetup.c
+                 librpc/gen_ndr/ndr_notify.c
+                 ../librpc/gen_ndr/ndr_xattr.c
+                 ../librpc/ndr/ndr_xattr.c
+                 ../librpc/gen_ndr/ndr_epmapper.c
+                 ../librpc/gen_ndr/ndr_named_pipe_auth.c
+                 ../librpc/gen_ndr/ndr_ntsvcs.c
+                 ${LIBNDR_GEN_SRC2}'''
+
+RPC_PARSE_SRC0 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
+
+# this includes only the low level parse code, not stuff
+# that requires knowledge of security contexts
+RPC_PARSE_SRC1 = '''${RPC_PARSE_SRC0}'''
+
+RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
+                 rpc_client/init_netlogon.c
+                 rpc_client/init_lsa.c'''
+
+LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
+
+SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
+NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
+
+LIBSAMBAUTIL_SRC = '''
+                ${LIBREPLACE_SRC}
+                ${SOCKET_WRAPPER_SRC}
+                ${NSS_WRAPPER_SRC}'''
+
+UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
+                   ../lib/util/xfile.c ../lib/util/util_strlist.c
+                   ../lib/util/util_file.c ../lib/util/data_blob.c
+                   ../lib/util/util.c ../lib/util/fsusage.c
+                   ../lib/util/params.c ../lib/util/talloc_stack.c
+                   ../lib/util/genrand.c ../lib/util/util_net.c
+                   ../lib/util/become_daemon.c ../lib/util/system.c
+                   ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
+                   ../lib/util/smb_threads.c ../lib/util/util_id.c
+                   ../lib/util/blocking.c ../lib/util/rfc1738.c '''
+
+CRYPTO_SRC = '''../lib/crypto/crc32.c ../lib/crypto/md5.c
+                         ../lib/crypto/hmacmd5.c ../lib/crypto/arcfour.c
+                         ../lib/crypto/md4.c
+                         ../lib/crypto/sha256.c ../lib/crypto/hmacsha256.c
+                         ../lib/crypto/aes.c ../lib/crypto/rijndael-alg-fst.c'''
+
+LIBTEVENT_SRC0 = ''
+
+CHARSET_STATIC = ''
+
+PTHREADPOOL_SRC = ''
+
+AUTH_STATIC = ''
+
+SMBLDAP = ''
+
+SMBLDAPUTIL = ''
+
+LIBREPLACE_SRCS = ''
+
+SOCKET_WRAPPER_SRCS = ''
+
+NSS_WRAPPER_SRCS = ''
+
+ZLIB_SRCS = ''
+
+LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${CRYPTO_SRC}
+          lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+          lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
+          lib/interfaces.c lib/memcache.c
+          lib/talloc_dict.c
+          lib/serverid.c
+          lib/util_transfer_file.c ../lib/async_req/async_sock.c
+          ${TDB_LIB_SRC}
+          ${VERSION_SRC} lib/charcnv.c lib/debug.c lib/fault.c
+          lib/interface.c lib/pidfile.c
+          lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
+          lib/username.c
+          ../libds/common/flag_mapping.c
+          lib/util_pw.c lib/access.c lib/smbrun.c
+          lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
+          lib/wins_srv.c
+          lib/util_str.c lib/clobber.c lib/util_sid.c lib/util_uuid.c
+          lib/util_unistr.c lib/util_file.c
+          lib/util.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c
+          lib/substitute.c lib/dbwrap_util.c
+          lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
+          lib/tallocmsg.c lib/dmallocmsg.c
+          libsmb/clisigning.c libsmb/smb_signing.c
+          lib/iconv.c lib/pam_errors.c intl/lang_tdb.c
+          lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
+          lib/sessionid_tdb.c
+          lib/module.c lib/events.c ${LIBTEVENT_SRC0}
+          lib/ldap_escape.c ${CHARSET_STATIC}
+          lib/secdesc.c lib/util_seaccess.c
+          ${PTHREADPOOL_SRC}
+          lib/fncall.c
+          libads/krb5_errs.c lib/system_smbd.c lib/audit.c ${LIBNDR_SRC}
+          lib/file_id.c lib/idmap_cache.c
+          '''
+
+LIB_DUMMY_SRC = '''lib/dummysmbd.c lib/dummyroot.c'''
+LIB_NONSMBD_SRC = '''${LIB_DUMMY_SRC}'''
+
+READLINE_SRC = '''lib/readline.c'''
+
+# Also depends on  ${SECRETS_SRC} ${LIBSAMBA_SRC}
+# Be sure to include them into your application
+POPT_LIB_SRC = '''lib/popt_common.c'''
+
+PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c lib/sharesec.c lib/ldap_debug_handler.c'''
+PARAM_REG_ADD_SRC = '''${REG_SMBCONF_SRC} ${LIBSMBCONF_SRC} ${PRIVILEGES_BASIC_SRC}'''
+PARAM_SRC = '''${PARAM_REG_ADD_SRC}'''
+
+KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
+
+LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c  libaddns/dnssock.c
+               libaddns/dnsgss.c libaddns/dnsmarshall.c'''
+LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
+
+GPEXT_SRC = '''../libgpo/gpext/gpext.c ${GPEXT_STATIC}'''
+
+LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
+              ../libgpo/gpo_fetch.c libgpo/gpo_filesync.c ../libgpo/gpo_sec.c
+              libgpo/gpo_reg.c
+              ${GPEXT_SRC}'''
+LIBGPO_SRC = '''${LIBGPO_SRC0}'''
+
+LIBADS_SRC = '''libads/ldap.c libads/ldap_printer.c
+             libads/sasl.c libads/sasl_wrapping.c
+             libads/krb5_setpw.c libads/ldap_user.c
+             libads/ads_struct.c libads/kerberos_keytab.c
+             libads/disp_sec.c libads/ads_utils.c libads/ldap_utils.c
+             libads/ldap_schema.c libads/util.c libads/ndr.c'''
+
+LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
+                    ../librpc/ndr/ndr_krb5pac.c
+                    ../librpc/gen_ndr/ndr_krb5pac.c'''
+
+SECRETS_SRC = '''librpc/gen_ndr/ndr_secrets.c'''
+
+LIBNBT_SRC = '''../libcli/nbt/nbtname.c
+             ../libcli/netlogon.c
+             ../libcli/ndr_netlogon.c
+             ../librpc/gen_ndr/ndr_nbt.c
+             ../librpc/gen_ndr/ndr_svcctl.c
+             ../librpc/ndr/ndr_svcctl.c'''
+
+LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
+             libsmb/namequery.c ../libcli/nbt/lmhosts.c libsmb/conncache.c
+             libads/dns.c libads/sitename_cache.c'''
+
+NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
+DOSERR_SRC = '../libcli/util/doserr.c'
+ERRORMAP_SRC = 'libsmb/errormap.c'
+DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
+
+LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${DOSERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
+
+LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
+
+LIBSMB_ERR_SRC = '''${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}
+                 ${RPC_PARSE_SRC1}
+                 ${SECRETS_SRC}'''
+
+LIBSMB_SRC0 = '''
+               ../libcli/auth/ntlm_check.c
+               libsmb/ntlmssp.c
+               libsmb/ntlmssp_sign.c
+               ${LIBNDR_NTLMSSP_SRC}
+               ../libcli/auth/ntlmssp_ndr.c'''
+
+LIBSAMBA_SRC = '${LIBSMB_SRC0}'
+
+LIBCLI_LDAP_MESSAGE_SRC = '''../libcli/ldap/ldap_message.c'''
+LIBCLI_LDAP_NDR_SRC = '''../libcli/ldap/ldap_ndr.c'''
+
+LIBTSOCKET_SRC = '''../lib/tsocket/tsocket.c
+                ../lib/tsocket/tsocket_helpers.c
+                ../lib/tsocket/tsocket_bsd.c'''
+
+CLDAP_SRC = '''libads/cldap.c
+        ../libcli/cldap/cldap.c
+        ../lib/util/idtree.c
+        ${LIBCLI_LDAP_MESSAGE_SRC} ${LIBCLI_LDAP_NDR_SRC} ${LIBTSOCKET_SRC}'''
+
+TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
+
+LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
+             libsmb/clikrb5.c libsmb/clispnego.c
+             ../libcli/auth/spnego_parse.c
+             ../lib/util/asn1.c
+             libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
+             libsmb/clireadwrite.c libsmb/clilist.c libsmb/cliprint.c
+             libsmb/clitrans.c libsmb/clisecdesc.c libsmb/clidgram.c
+             libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c
+             libsmb/clioplock.c libsmb/clirap2.c
+             libsmb/smb_seal.c libsmb/async_smb.c
+             ${LIBNMB_SRC}
+             ${LIBNBT_SRC}
+             ${CLDAP_SRC}
+             ${DRSUAPI_SRC}'''
+
+RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c'''
+
+
+LIBMSRPC_SRC = '''rpc_client/cli_lsarpc.c rpc_client/cli_samr.c
+               ${RPC_CLIENT_SRC1}
+               ${RPC_CLIENT_SRC}
+               rpc_client/cli_spoolss.c
+               rpc_client/init_spoolss.c
+               rpc_client/init_samr.c
+                   ../librpc/rpc/binding.c'''
+
+LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
+                   ../librpc/gen_ndr/cli_dfs.c
+                   ../librpc/gen_ndr/cli_echo.c
+                   ../librpc/gen_ndr/cli_srvsvc.c
+                   ../librpc/gen_ndr/cli_svcctl.c
+                   ../librpc/gen_ndr/cli_winreg.c
+                   ../librpc/gen_ndr/cli_initshutdown.c
+                   ../librpc/gen_ndr/cli_eventlog.c
+                   ../librpc/gen_ndr/cli_wkssvc.c
+                   ../librpc/gen_ndr/cli_netlogon.c
+                   ../librpc/gen_ndr/cli_samr.c
+                   ../librpc/gen_ndr/cli_dssetup.c
+                   ../librpc/gen_ndr/cli_ntsvcs.c
+                   ../librpc/gen_ndr/cli_epmapper.c
+                   ../librpc/gen_ndr/cli_drsuapi.c
+                   ../librpc/gen_ndr/cli_spoolss.c
+                   ${LIBNDR_GEN_SRC}
+                   ${RPCCLIENT_NDR_SRC}'''
+
+#
+# registry-related objects
+#
+UTIL_REG_SRC = '''lib/util_reg.c'''
+UTIL_REG_API_SRC = '''lib/util_reg_api.c'''
+
+REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
+REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
+REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
+
+REGFIO_SRC = '''registry/regfio.c'''
+
+REGSRCS_SRC = '''registry/reg_objects.c'''
+
+REG_BACKENDS_BASE_SRC = '''registry/reg_backend_db.c'''
+
+REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
+
+REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
+                         registry/reg_backend_shares.c
+                         registry/reg_backend_netlogon_params.c
+                         registry/reg_backend_prod_options.c
+                         registry/reg_backend_tcpip_params.c
+                         registry/reg_backend_hkpt_params.c
+                         registry/reg_backend_current_version.c
+                         registry/reg_backend_perflib.c'''
+
+REG_BASE_SRC = '''registry/reg_api.c
+               registry/reg_dispatcher.c
+               registry/reg_cachehook.c
+               ${REGFIO_SRC}
+               ${REGSRCS_SRC}
+               registry/reg_util.c
+               ${UTIL_REG_API_SRC}
+               lib/util_nttoken.c
+               ${REG_BACKENDS_BASE_SRC}
+               ${REG_INIT_BASIC_SRC}'''
+
+REG_SMBCONF_SRC = '''${REG_BASE_SRC}
+                  ${REG_BACKENDS_SMBCONF_SRC}
+                  ${REG_INIT_SMBCONF_SRC}'''
+
+REG_FULL_SRC = '''${REG_SMBCONF_SRC}
+               ${REG_BACKENDS_EXTRA_SRC}
+               ${REG_INIT_FULL_SRC}
+               registry/reg_eventlog.c
+               registry/reg_perfcount.c
+               librpc/gen_ndr/ndr_perfcount.c
+               registry/reg_util_legacy.c'''
+
+LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
+
+RPC_LSA_SRC = '''rpc_server/srv_lsa_nt.c ../librpc/gen_ndr/srv_lsa.c'''
+
+RPC_NETLOG_SRC = '''rpc_server/srv_netlog_nt.c
+                 ../librpc/gen_ndr/srv_netlogon.c'''
+
+RPC_SAMR_SRC = '''rpc_server/srv_samr_nt.c
+               rpc_server/srv_samr_util.c
+               ../librpc/gen_ndr/srv_samr.c'''
+
+RPC_INITSHUTDOWN_SRC = ''' ../librpc/gen_ndr/srv_initshutdown.c rpc_server/srv_initshutdown_nt.c'''
+
+RPC_REG_SRC = ''' rpc_server/srv_winreg_nt.c
+               ../librpc/gen_ndr/srv_winreg.c'''
+
+RPC_DSSETUP_SRC = ''' rpc_server/srv_dssetup_nt.c ../librpc/gen_ndr/srv_dssetup.c'''
+
+RPC_SVC_SRC = '''rpc_server/srv_srvsvc_nt.c
+              ../librpc/gen_ndr/srv_srvsvc.c'''
+
+RPC_WKS_SRC = ''' ../librpc/gen_ndr/srv_wkssvc.c rpc_server/srv_wkssvc_nt.c'''
+
+RPC_SVCCTL_SRC = ''' rpc_server/srv_svcctl_nt.c
+                  ../librpc/gen_ndr/srv_svcctl.c
+                  services/svc_spoolss.c services/svc_rcinit.c services/services_db.c
+                  services/svc_netlogon.c services/svc_winreg.c
+                  services/svc_wins.c'''
+
+RPC_NTSVCS_SRC = '''rpc_server/srv_ntsvcs_nt.c
+                 ../librpc/gen_ndr/srv_ntsvcs.c'''
+
+RPC_DFS_SRC = ''' ../librpc/gen_ndr/srv_dfs.c rpc_server/srv_dfs_nt.c'''
+
+RPC_SPOOLSS_SRC = '''rpc_server/srv_spoolss_nt.c
+                  ../librpc/gen_ndr/srv_spoolss.c'''
+
+RPC_EVENTLOG_SRC = '''rpc_server/srv_eventlog_nt.c
+                   ${LIB_EVENTLOG_SRC} ../librpc/gen_ndr/srv_eventlog.c'''
+
+RPC_PIPE_SRC = '''rpc_server/srv_pipe_hnd.c
+               rpc_server/srv_pipe.c rpc_server/srv_lsa_hnd.c'''
+
+RPC_ECHO_SRC = '''rpc_server/srv_echo_nt.c ../librpc/gen_ndr/srv_echo.c'''
+
+#TODO: RPC_SERVER_SRC used to include RPC_STATIC modules
+RPC_SERVER_SRC = '''${RPC_PIPE_SRC}'''
+
+RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
+
+RPC_CLIENT_SRC = '''rpc_client/cli_pipe.c rpc_client/rpc_transport_np.c
+        rpc_client/rpc_transport_sock.c rpc_client/rpc_transport_smbd.c'''
+
+LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c'''
+
+PRIVILEGES_BASIC_SRC = '''lib/privileges_basic.c'''
+
+PRIVILEGES_SRC = '''lib/privileges.c'''
+
+PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
+
+#FIXME: Hack around the missing AC_MODULE
+PDB_STATIC = 'passdb/pdb_tdb.c'
+
+PASSDB_MODULES_SRC = '''passdb/pdb_wbc_sam.c passdb/pdb_ads.c
+passdb/pdb_smbpasswd.c passdb/secrets.c passdb/machine_sid.c'''
+#passdb/pdb_ldap.c passdb/pdb_nds.c'''
+
+PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c passdb/pdb_interface.c
+                passdb/util_wellknown.c passdb/util_builtin.c passdb/pdb_compat.c
+                passdb/util_unixsids.c passdb/lookup_sid.c
+                passdb/login_cache.c ${PDB_STATIC}
+                lib/account_pol.c ${PRIVILEGES_SRC} ${PASSDB_MODULES_SRC}
+                lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
+#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
+
+
+
+EXTRA_SRC = ''
+
+AUTH_SRC1 = '''${AUTH_BUILTIN_SRC} ${AUTH_DOMAIN_SRC} ${AUTH_SAM_SRC}
+${AUTH_SERVER_SRC} ${AUTH_UNIX_SRC} ${AUTH_WINBIND_SRC}
+${AUTH_WBC_SRC} ${AUTH_SCRIPT_SRC} ${AUTH_NETLOGOND_SRC}'''
+
+DEVEL_HELP_WEIRD_SRC = '''modules/weird.c'''
+CP850_SRC = '''modules/CP850.c'''
+CP437_SRC = '''modules/CP437.c'''
+CHARSET_MACOSXFS_SRC = '''modules/charset_macosxfs.c'''
+
+GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
+
+PROFILE_SRC = '''profile/profile.c'''
+PROFILES_SRC = '''utils/profiles.c
+               ${LIBSMB_ERR_SRC}
+               ${PARAM_SRC}
+               ${LIB_DUMMY_SRC}
+               ${POPT_LIB_SRC}'''
+
+OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c
+             smbd/oplock_onefs.c'''
+
+NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
+
+FNAME_UTIL_SRC = '''smbd/filename_util.c'''
+
+VFS_DEFAULT_SRC = '''modules/vfs_default.c'''
+VFS_AUDIT_SRC = '''modules/vfs_audit.c'''
+VFS_EXTD_AUDIT_SRC = '''modules/vfs_extd_audit.c'''
+VFS_FULL_AUDIT_SRC = '''modules/vfs_full_audit.c'''
+VFS_FAKE_PERMS_SRC = '''modules/vfs_fake_perms.c'''
+VFS_RECYCLE_SRC = '''modules/vfs_recycle.c'''
+VFS_NETATALK_SRC = '''modules/vfs_netatalk.c'''
+VFS_DEFAULT_QUOTA_SRC = '''modules/vfs_default_quota.c'''
+VFS_READONLY_SRC = '''modules/vfs_readonly.c modules/getdate.c'''
+VFS_CAP_SRC = '''modules/vfs_cap.c'''
+VFS_EXPAND_MSDFS_SRC = '''modules/vfs_expand_msdfs.c'''
+VFS_SHADOW_COPY_SRC = '''modules/vfs_shadow_copy.c'''
+VFS_SHADOW_COPY2_SRC = '''modules/vfs_shadow_copy2.c'''
+VFS_AFSACL_SRC = '''modules/vfs_afsacl.c'''
+VFS_XATTR_TDB_SRC = '''modules/vfs_xattr_tdb.c'''
+VFS_POSIXACL_SRC = '''modules/vfs_posixacl.c'''
+VFS_AIXACL_SRC = '''modules/vfs_aixacl.c modules/vfs_aixacl_util.c'''
+VFS_AIXACL2_SRC = '''modules/vfs_aixacl2.c modules/vfs_aixacl_util.c modules/nfs4_acls.c'''
+VFS_SOLARISACL_SRC = '''modules/vfs_solarisacl.c'''
+VFS_ZFSACL_SRC = '''modules/vfs_zfsacl.c modules/nfs4_acls.c'''
+VFS_HPUXACL_SRC = '''modules/vfs_hpuxacl.c'''
+VFS_IRIXACL_SRC = '''modules/vfs_irixacl.c'''
+VFS_TRU64ACL_SRC = '''modules/vfs_tru64acl.c'''
+VFS_CATIA_SRC = 'modules/vfs_catia.c'
+VFS_STREAMS_XATTR_SRC = 'modules/vfs_streams_xattr.c'
+VFS_STREAMS_DEPOT_SRC = 'modules/vfs_streams_depot.c'
+VFS_CACHEPRIME_SRC = 'modules/vfs_cacheprime.c'
+VFS_PREALLOC_SRC = 'modules/vfs_prealloc.c'
+VFS_COMMIT_SRC = 'modules/vfs_commit.c'
+VFS_GPFS_SRC = 'modules/vfs_gpfs.c modules/gpfs.c modules/nfs4_acls.c'
+VFS_NOTIFY_FAM_SRC = 'modules/vfs_notify_fam.c'
+VFS_READAHEAD_SRC = 'modules/vfs_readahead.c'
+VFS_TSMSM_SRC = 'modules/vfs_tsmsm.c'
+VFS_FILEID_SRC = 'modules/vfs_fileid.c'
+VFS_AIO_FORK_SRC = 'modules/vfs_aio_fork.c'
+VFS_PREOPEN_SRC = 'modules/vfs_preopen.c'
+VFS_SYNCOPS_SRC = 'modules/vfs_syncops.c'
+VFS_ACL_XATTR_SRC = 'modules/vfs_acl_xattr.c'
+VFS_ACL_TDB_SRC = 'modules/vfs_acl_tdb.c'
+VFS_SMB_TRAFFIC_ANALYZER_SRC = 'modules/vfs_smb_traffic_analyzer.c'
+VFS_ONEFS_SRC = '''modules/vfs_onefs.c modules/onefs_acl.c modules/onefs_system.c
+                modules/onefs_open.c modules/onefs_streams.c modules/onefs_dir.c
+                modules/onefs_cbrl.c modules/onefs_notify.c modules/onefs_config.c'''
+VFS_ONEFS_SHADOW_COPY_SRC = 'modules/vfs_onefs_shadow_copy.c modules/onefs_shadow_copy.c'
+PERFCOUNT_ONEFS_SRC = 'modules/perfcount_onefs.c'
+PERFCOUNT_TEST_SRC = 'modules/perfcount_test.c'
+VFS_DIRSORT_SRC = 'modules/vfs_dirsort.c'
+VFS_SCANNEDONLY_SRC = 'modules/vfs_scannedonly.c'
+VFS_CROSSRENAME_SRC = 'modules/vfs_crossrename.c'
+
+PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
+
+SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
+
+DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/trusts_util.c libsmb/dsgetdcname.c'''
+
+AUTH_BUILTIN_SRC = 'auth/auth_builtin.c'
+AUTH_DOMAIN_SRC = 'auth/auth_domain.c'
+AUTH_SAM_SRC = 'auth/auth_sam.c'
+AUTH_SERVER_SRC = 'auth/auth_server.c'
+AUTH_UNIX_SRC = 'auth/auth_unix.c'
+AUTH_WINBIND_SRC = 'auth/auth_winbind.c'
+AUTH_WBC_SRC = 'auth/auth_wbc.c'
+AUTH_SCRIPT_SRC = 'auth/auth_script.c'
+AUTH_NETLOGOND_SRC = 'auth/auth_netlogond.c'
+
+AUTH_SRC = '''${AUTH_SRC1} auth/auth.c ${AUTH_STATIC} auth/auth_util.c auth/token_util.c
+           auth/auth_compat.c auth/auth_ntlmssp.c auth/user_info.c auth/check_samsec.c
+           auth/server_info.c auth/server_info_sam.c
+           ${PLAINTEXT_AUTH_SRC} ${SLCACHE_SRC} ${DCUTIL_SRC}'''
+
+#FIXME: set IDMAP_STATIC during configuration
+IDMAP_STATIC=''
+
+IDMAP_SRC = 'winbindd/idmap.c winbindd/idmap_util.c ${IDMAP_STATIC}'
+
+#FIXME: set NSS_INFO_STATIC during configuration
+NSS_INFO_STATIC = ''
+NSS_INFO_SRC = 'winbindd/nss_info.c ${NSS_INFO_STATIC}'
+
+IDMAP_HASH_SRC = '''winbindd/idmap_hash/idmap_hash.c
+                    winbindd/idmap_hash/mapfile.c'''
+
+IDMAP_ADEX_SRC = '''winbindd/idmap_adex/idmap_adex.c
+                    winbindd/idmap_adex/cell_util.c
+                    winbindd/idmap_adex/likewise_cell.c
+                    winbindd/idmap_adex/provider_unified.c
+                    winbindd/idmap_adex/gc_util.c
+                    winbindd/idmap_adex/domain_util.c'''
+
+WINBINDD_SRC1 = '''winbindd/winbindd.c
+                   winbindd/winbindd_group.c
+                   winbindd/winbindd_util.c
+                   winbindd/winbindd_cache.c
+                   winbindd/winbindd_pam.c
+                   winbindd/winbindd_misc.c
+                   winbindd/winbindd_cm.c
+                   winbindd/winbindd_wins.c
+                   winbindd/winbindd_rpc.c
+                   winbindd/winbindd_reconnect.c
+                   winbindd/winbindd_ads.c
+                   winbindd/winbindd_passdb.c
+                   winbindd/winbindd_dual.c
+                   winbindd/winbindd_dual_ndr.c
+                   winbindd/winbindd_dual_srv.c
+                   librpc/gen_ndr/cli_wbint.c
+                   librpc/gen_ndr/srv_wbint.c
+                   librpc/gen_ndr/ndr_wbint.c
+                   winbindd/winbindd_async.c
+                   winbindd/winbindd_creds.c
+                   winbindd/winbindd_cred_cache.c
+                   winbindd/winbindd_ccache_access.c
+                   winbindd/winbindd_domain.c
+                   winbindd/winbindd_idmap.c
+                   winbindd/winbindd_locator.c
+                   winbindd/winbindd_ndr.c
+                   winbindd/wb_ping.c
+                   winbindd/wb_lookupsid.c
+                   winbindd/wb_lookupname.c
+                   winbindd/wb_sid2uid.c
+                   winbindd/wb_sid2gid.c
+                   winbindd/wb_uid2sid.c
+                   winbindd/wb_gid2sid.c
+                   winbindd/wb_queryuser.c
+                   winbindd/wb_lookupuseraliases.c
+                   winbindd/wb_lookupusergroups.c
+                   winbindd/wb_getpwsid.c
+                   winbindd/wb_gettoken.c
+                   winbindd/wb_seqnum.c
+                   winbindd/wb_seqnums.c
+                   winbindd/wb_group_members.c
+                   winbindd/wb_getgrsid.c
+                   winbindd/wb_query_user_list.c
+                   winbindd/wb_fill_pwent.c
+                   winbindd/wb_next_pwent.c
+                   winbindd/wb_next_grent.c
+                   winbindd/wb_dsgetdcname.c
+                   winbindd/winbindd_lookupsid.c
+                   winbindd/winbindd_lookupname.c
+                   winbindd/winbindd_sid_to_uid.c
+                   winbindd/winbindd_sid_to_gid.c
+                   winbindd/winbindd_uid_to_sid.c
+                   winbindd/winbindd_gid_to_sid.c
+                   winbindd/winbindd_allocate_uid.c
+                   winbindd/winbindd_allocate_gid.c
+                   winbindd/winbindd_getpwsid.c
+                   winbindd/winbindd_getpwnam.c
+                   winbindd/winbindd_getpwuid.c
+                   winbindd/winbindd_getsidaliases.c
+                   winbindd/winbindd_getuserdomgroups.c
+                   winbindd/winbindd_getgroups.c
+                   winbindd/winbindd_show_sequence.c
+                   winbindd/winbindd_getgrgid.c
+                   winbindd/winbindd_getgrnam.c
+                   winbindd/winbindd_getusersids.c
+                   winbindd/winbindd_lookuprids.c
+                   winbindd/winbindd_setpwent.c
+                   winbindd/winbindd_getpwent.c
+                   winbindd/winbindd_endpwent.c
+                   winbindd/winbindd_setgrent.c
+                   winbindd/winbindd_getgrent.c
+                   winbindd/winbindd_endgrent.c
+                   winbindd/winbindd_dsgetdcname.c
+                   winbindd/winbindd_getdcname.c
+                   winbindd/winbindd_list_users.c
+                   winbindd/winbindd_list_groups.c
+                   winbindd/winbindd_check_machine_acct.c
+                   winbindd/winbindd_change_machine_acct.c
+                   winbindd/winbindd_ping_dc.c
+                   winbindd/winbindd_set_mapping.c
+                   winbindd/winbindd_remove_mapping.c
+                   winbindd/winbindd_set_hwm.c
+                   winbindd/winbindd_pam_auth.c
+                   winbindd/winbindd_pam_logoff.c
+                   winbindd/winbindd_pam_chauthtok.c
+                   winbindd/winbindd_pam_auth_crap.c
+                   auth/token_util.c
+                   auth/check_samsec.c
+                   auth/server_info.c
+                   auth/server_info_sam.c
+                   auth/user_info.c
+                   smbd/chgpasswd.c
+                   ../nsswitch/libwbclient/wb_reqtrans.c'''
+
+WINBINDD_SRC = '''${WINBINDD_SRC1}
+                  ${PARAM_SRC}
+                  ${LIBMSRPC_SRC} ${LIBMSRPC_GEN_SRC} ${RPC_PARSE_SRC}
+                  ${PROFILE_SRC} ${SLCACHE_SRC} ${SMBLDAP_SRC}
+                  ${LIBADS_SRC} ${KRBCLIENT_SRC} ${POPT_LIB_SRC}
+                  ${DCUTIL_SRC} ${IDMAP_SRC} ${NSS_INFO_SRC}
+                  ${AFS_SRC} ${AFS_SETTOKEN_SRC}
+                  ${LIBADS_SERVER_SRC}
+                  ${TDB_VALIDATE_SRC}'''
+
+LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
+
+LIBSMBCONF_SRC = '''../lib/smbconf/smbconf.c ../lib/smbconf/smbconf_util.c
+                    ../lib/smbconf/smbconf_txt.c lib/smbconf/smbconf_reg.c
+                    lib/smbconf/smbconf_init.c'''
+
+MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
+
+SMBD_SRC_MAIN = '''smbd/server.c'''
+
+BUILDOPT_SRC = '''smbd/build_options.c'''
+
 PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c lib/sharesec.c lib/ldap_debug_handler.c'''
 
 PRIVILEGES_BASIC_SRC = '''lib/privileges_basic.c'''
@@ -45,25 +713,10 @@ LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
             librpc/ndr/util.c
             ../librpc/gen_ndr/ndr_dcerpc.c'''
 
-S3_SMBCONF_SRC = '''lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'''
-
 REGFIO_SRC = '''registry/regfio.c'''
 
 REGSRCS_SRC = '''registry/reg_objects.c'''
 
-REG_BACKENDS_BASE_SRC = '''registry/reg_backend_db.c'''
-
-REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
-
-REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
-                        registry/reg_backend_shares.c
-                        registry/reg_backend_netlogon_params.c
-                        registry/reg_backend_prod_options.c
-                        registry/reg_backend_tcpip_params.c
-                        registry/reg_backend_hkpt_params.c
-                        registry/reg_backend_current_version.c
-                        registry/reg_backend_perflib.c'''
-
 REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
 REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
 REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
@@ -80,99 +733,180 @@ RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
 
 RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
 
-REG_BASE_SRC = '''registry/reg_api.c
-              registry/reg_dispatcher.c
-              registry/reg_cachehook.c
-              ${REGFIO_SRC}
-              ${REGSRCS_SRC}
-              registry/reg_util.c
-              ${UTIL_REG_API_SRC}
-              lib/util_nttoken.c
-              ${REG_BACKENDS_BASE_SRC}
-              ${REG_INIT_BASIC_SRC}'''
-
 NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
 DOSERR_SRC = '../libcli/util/doserr.c'
 ERRORMAP_SRC = 'libsmb/errormap.c'
 DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
 
-SECRETS_SRC = '''passdb/secrets.c passdb/machine_sid.c
-             librpc/gen_ndr/ndr_secrets.c'''
-
 LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
 
 LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
 
 LIBSMB_ERR_SRC = '''${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}
-                ${RPC_PARSE_SRC1}
-                ${SECRETS_SRC}'''
-
-LIB_SRC = '''
-         lib/messages.c lib/debug.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
-         lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
-         lib/interfaces.c lib/memcache.c
-         lib/talloc_dict.c
-         lib/serverid.c
-         lib/util_transfer_file.c ../lib/async_req/async_sock.c
-         ${TDB_LIB_SRC}
-         ${VERSION_SRC} lib/charcnv.c lib/fault.c
-         lib/interface.c lib/pidfile.c
-         lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c
-         lib/username.c
-         ../libds/common/flag_mapping.c
-         lib/util_pw.c lib/access.c lib/smbrun.c
-         lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC}
-         lib/wins_srv.c
-         lib/util_str.c lib/clobber.c lib/util_sid.c lib/util_uuid.c
-         lib/util_unistr.c lib/util_file.c
-         lib/util.c lib/util_sock.c lib/sock_exec.c lib/util_sec.c
-         lib/substitute.c lib/dbwrap_util.c
-         lib/ms_fnmatch.c lib/select.c lib/errmap_unix.c
-         lib/tallocmsg.c lib/dmallocmsg.c
-         libsmb/clisigning.c libsmb/smb_signing.c
-         lib/iconv.c lib/pam_errors.c intl/lang_tdb.c
-         lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
-         lib/sessionid_tdb.c
-         lib/module.c lib/events.c
-         lib/ldap_escape.c
-         lib/secdesc.c lib/util_seaccess.c
-         lib/fncall.c
-         libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-         lib/file_id.c lib/idmap_cache.c
-          ${PRIVILEGES_BASIC_SRC}
-          librpc/ndr/util.c
-          ${S3_SMBCONF_SRC}
-          ${REG_BASE_SRC}
-          ${RPC_PARSE_SRC}
-          ${LIBSMB_ERR_SRC}
-          ${REG_INIT_SMBCONF_SRC}
-          ${REG_BACKENDS_SMBCONF_SRC}
-         '''
+                ${RPC_PARSE_SRC1}'''
+
+
+SMBD_SRC_SRV = '''smbd/files.c smbd/chgpasswd.c smbd/connection.c
+               smbd/utmp.c smbd/session.c smbd/map_username.c
+               smbd/dfree.c smbd/dir.c smbd/password.c smbd/conn.c
+               smbd/share_access.c smbd/fileio.c
+               smbd/ipc.c smbd/lanman.c smbd/negprot.c
+               smbd/message.c smbd/nttrans.c smbd/pipes.c
+               smbd/reply.c smbd/sesssetup.c smbd/trans2.c smbd/uid.c
+               smbd/dosmode.c smbd/filename.c smbd/open.c smbd/close.c
+               smbd/blocking.c smbd/sec_ctx.c smbd/srvstr.c
+               smbd/vfs.c smbd/perfcount.c smbd/statcache.c smbd/seal.c
+               smbd/posix_acls.c lib/sysacls.c
+               smbd/process.c smbd/service.c smbd/error.c
+               printing/printfsp.c lib/sysquotas.c lib/sysquotas_linux.c
+               lib/sysquotas_xfs.c lib/sysquotas_4A.c
+               smbd/change_trust_pw.c smbd/fake_file.c
+               smbd/quotas.c smbd/ntquotas.c ${AFS_SRC} smbd/msdfs.c
+               ${AFS_SETTOKEN_SRC} smbd/aio.c smbd/statvfs.c
+               smbd/dmapi.c smbd/signing.c
+               smbd/file_access.c
+               smbd/dnsregister.c smbd/globals.c
+               smbd/smb2_server.c
+               smbd/smb2_signing.c
+               smbd/smb2_glue.c
+               smbd/smb2_negprot.c
+               smbd/smb2_sesssetup.c
+               smbd/smb2_tcon.c
+               smbd/smb2_create.c
+               smbd/smb2_close.c
+               smbd/smb2_flush.c
+               smbd/smb2_read.c
+               smbd/smb2_write.c
+               smbd/smb2_lock.c
+               smbd/smb2_ioctl.c
+               smbd/smb2_keepalive.c
+               smbd/smb2_find.c
+               smbd/smb2_notify.c
+               smbd/smb2_getinfo.c
+               smbd/smb2_setinfo.c
+               smbd/smb2_break.c
+               ../libcli/smb/smb2_create_blob.c
+               ${MANGLE_SRC} ${VFS_DEFAULT_SRC}'''
+
+SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
+                ${RPC_SERVER_SRC} ${RPC_PARSE_SRC}
+                ${LOCKING_SRC} ${PRINTING_SRC}
+                ${PROFILE_SRC} ${PRINTBACKEND_SRC}
+                ${OPLOCK_SRC} ${NOTIFY_SRC} ${FNAME_UTIL_SRC}
+                ${LIBMSRPC_SRC}
+                ${LIBMSRPC_GEN_SRC} ${AVAHI_SRC} ${LIBADS_SRC}
+                ${KRBCLIENT_SRC} ${LIBADS_SERVER_SRC} ${REG_FULL_SRC}
+                ${POPT_LIB_SRC} ${BUILDOPT_SRC} ${SMBLDAP_SRC}
+                ${LIBNET_SRC}
+                ${RPC_LSA_SRC}
+                ${RPC_NETLOG_SRC} ${RPC_SAMR_SRC}
+                ${RPC_INITSHUTDOWN_SRC} ${RPC_REG_SRC}
+                ${RPC_DSSETUP_SRC} ${RPC_SVC_SRC} ${RPC_WKS_SRC}
+                ${RPC_SVCCTL_SRC} ${RPC_NTSVCS_SRC} ${RPC_DFS_SRC}
+                ${RPC_SPOOLSS_SRC} ${RPC_EVENTLOG_SRC}
+                ${RPC_ECHO_SRC}
+                ${AUTH_SRC}
+                ${PRIVILEGES_BASIC_SRC}
+
+                ${SECRETS_SRC}
+                ${LIBSMBCONF_SRC}
+                smbd/server.c
+                '''
+
+PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
+               printing/print_cups.c printing/print_generic.c
+               printing/lpq_parse.c printing/load.c
+               printing/print_iprint.c'''
+
+PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c'''
+PRINTBACKEND_SRC = 'printing/printing.c printing/nt_printing.c ${PRINTBASE_SRC}'
+
+
+SMBD_SRC = bld.EXPAND_VARIABLES('${SMBD_SRC_BASE}', vars=locals())
 
 LIB_SRC = bld.EXPAND_VARIABLES(LIB_SRC, vars=locals())
 
 SAMBA3_INCLUDES = '#source4/s3compat/compat #source4/dynconfig #source3 #source3/lib #source3/include #lib/replace #lib/talloc #source3/libaddns #source3/librpc #source3/build'
 
-bld.SAMBA_SUBSYSTEM('s3_lib',
-                    bld.SUBDIR('../../source3', LIB_SRC),
-                    includes=SAMBA3_INCLUDES,
-                    deps='talloc tevent tdb',
-                    hide_symbols=True)
-
-bld.SAMBA_SUBSYSTEM('s3_loadparm',
-                    bld.SUBDIR('../../source3', PARAM_WITHOUT_REG_SRC),
+s3_vars = locals()
+
+def S3_SUBSYSTEM(name, source,
+                 public_deps='', deps='',
+                 includes='',
+                 hide_symbols=True,
+                 vars=None):
+    '''a wrapper for local s3 subsystems'''
+    includes += ' ' + SAMBA3_INCLUDES
+    source = bld.EXPAND_VARIABLES(source, s3_vars)
+
+    bld.SAMBA_SUBSYSTEM(name, source=bld.SUBDIR('../../source3', source),
+                        includes=includes,
+                        deps=deps,
+                        hide_symbols=hide_symbols,
+                        cflags='-D_PUBLIC_= ',
+                        public_deps=public_deps)
+
+
+S3_SUBSYSTEM('GROUPDB',
+                    source=GROUPDB_SRC,
+                    deps='tdb')
+
+S3_SUBSYSTEM('TLDAP',
+                    source=TLDAP_SRC,
+                    deps='tdb')
+
+S3_SUBSYSTEM('PASSDB',
+                    source=PASSDB_SRC,
+                    deps='GROUPDB TLDAP',
+                    vars=locals())
+
+S3_SUBSYSTEM('PARAM_WITHOUT_REG',
+                    source=PARAM_WITHOUT_REG_SRC,
+                    deps='tdb')
+
+S3_SUBSYSTEM('PARAM',
+                    source=PARAM_SRC,
+                    deps='PARAM_WITHOUT_REG',
+                    vars=locals())
+
+S3_SUBSYSTEM('LIBS',
+             source=LIB_SRC,
+             deps='tdb tevent talloc',
+             vars=locals())
+
+S3_SUBSYSTEM('LIB_NONSMBD',
+                    source=LIB_NONSMBD_SRC,
+                    deps='LIBS',
+                    vars=locals())
+
+S3_SUBSYSTEM('LIBSMB_ERR',
+                    source=LIBSMB_ERR_SRC,
+                    deps='tdb',
+                    vars=locals())
+
+S3_SUBSYSTEM('LIBSAMBA',
+                    source=LIBSAMBA_SRC,
+                    deps='LIBSMB_ERR',
+                    vars=locals())
+
+S3_SUBSYSTEM('LIBSMB',
+                    source=LIBSMB_SRC,
+                    deps='LIBSAMBA',
+                    vars=locals())
+
+bld.SAMBA_SUBSYSTEM('s3_smbd',
+                    bld.SUBDIR('../../source3', SMBD_SRC),
                     includes=SAMBA3_INCLUDES,
-                    deps='talloc tevent tdb',
-                    hide_symbols=True)
-
-bld.SAMBA_SUBSYSTEM('s3_lib_dummy',
-                    bld.SUBDIR('../../source3/lib', 'dummysmbd.c dummyroot.c'),
-                    includes=SAMBA3_INCLUDES,
-                    deps='talloc tevent tdb',
+                    deps='''tdb tevent popt dl
+                    crypt nsl resolv z PASSDB
+                    PARAM_WITHOUT_REG LIBS LIBSMB''',
                     hide_symbols=True)
 
 bld.SAMBA_SUBSYSTEM('s3compat_wrapper',
+                    includes=SAMBA3_INCLUDES,
+                    autoproto='s3compat.h',
                     source='s3compat.c',
+                    deps='tdb',
                     hide_symbols=True)
 
 bld.SAMBA_SUBSYSTEM('s3replace',
@@ -185,8 +919,12 @@ bld.SAMBA_SUBSYSTEM('s3dynconfig',
                     source='s3dynconfig.c',
                     hide_symbols=True)
 
-bld.SAMBA_LIBRARY('s3compat',
-                  source='s3compat.c',
-                  autoproto='s3replace.h',
-                  deps='s3replace s3dynconfig s3_lib s3_lib_dummy s3_loadparm LIBSMBCONF LIBSECURITY_COMMON LIBCRYPTO LIBSAMBA-UTIL',
+bld.SAMBA_LIBRARY('s3compatlib',
+                  source=[],
+                  deps='s3replace s3compat_wrapper s3dynconfig LIBSECURITY_COMMON LIBCRYPTO LIBSAMBA-UTIL s3_smbd',
                   hide_symbols=True)
+
+bld.SAMBA_SUBSYSTEM('s3compat',
+                    source='s3_smbd.c',
+                    deps='s3compatlib',
+                    hide_symbols=True)

diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c
index b0a37adba0050c8d17acc86797bb29fb3d69b182..367ed52f3815e9bf82afc42e189cb5ca1e2deddc 100644 (file)
--- a/source4/smb_server/smb_server.c
+++ b/source4/smb_server/smb_server.c
@@ -33,6 +33,7 @@
 #include "param/share.h"
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
+#include "s3compat/s3compat.h"
 
 static NTSTATUS smbsrv_recv_generic_request(void *private_data, DATA_BLOB blob)
 {
@@ -206,6 +207,15 @@ static void smbsrv_task_init(struct task_server *task)
 {      
        NTSTATUS status;
 
+#if ENABLE_S3COMPAT
+       /* this is a hack for now to enable the s3 fileserver backend
+          in s4 */
+       if (lp_parm_bool(task->lp_ctx, NULL, "s3compat", "smbd", false)) {
+               void s3_smbd_task_init(struct task_server *task);
+               return s3_smbd_task_init(task);
+       }
+#endif
+
        task_server_set_title(task, "task[smbsrv]");
 
        if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) {

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 15a276027d1bf1a1f1deb2bcca7b86ad38e95ffb..5350feb169ee6e18cb17cbfe92073ad5dcb0cfe1 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -375,7 +375,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
        DEBUGADD(0,("Copyright Andrew Tridgell and the Samba Team 1992-2010\n"));
 
 #ifdef ENABLE_S3COMPAT
-       s3compat_test();
+       s3compat_initialise(lp_configfile(cmdline_lp_ctx));
 #endif
 
        if (sizeof(uint16_t) < 2 || sizeof(uint32_t) < 4 || sizeof(uint64_t) < 8) {
@@ -398,12 +398,20 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
 
        pidfile_create(lp_piddir(cmdline_lp_ctx), binary_name);
 
+#ifndef ENABLE_S3COMPAT
+       /* this is disabled for s3compat to avoid a conflict opening
+        * secrets.tdb. We need a better fix, or we can possibly
+        * remove the use of secrets.tdb in s4, as it is not really
+        * needed any more */
+
+
        /* Do *not* remove this, until you have removed
         * passdb/secrets.c, and proved that Samba still builds... */
        /* Setup the SECRETS subsystem */
        if (secrets_init(talloc_autofree_context(), cmdline_lp_ctx) == NULL) {
                return 1;
        }
+#endif
 
        gensec_init(cmdline_lp_ctx); /* FIXME: */
 

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 193b4fab5355f1518e54cf64aefceddd0656cc0e..b4139744d4e74d520ea5e6f50fbf086e0a154cdf 100644 (file)
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -19,7 +19,7 @@ bld.SAMBA_BINARY('samba',
        manpages='samba.8',
         subsystem_name='service',
        deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
-                popt gensec registry ntptr ntvfs share CLUSTER DCESRV s3compat''',
+                popt gensec registry ntptr ntvfs share CLUSTER DCESRV s3compat s3compatlib''',
         needs_python=True,
         install_path='${SBINDIR}'
        )

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index a9183623ff633c7b9f3fa2e79616e59110725808..101b2f0573a86c194b4e72dc793adc135cb3ec70 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -11,7 +11,7 @@ bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
 bld.SAMBA_MODULE('TORTURE_BASIC',
        source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
        subsystem='smbtorture',
-       deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL LIBCLI_RAW TORTURE_RAW',
+       deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL LIBCLI_RAW TORTURE_RAW s3compat',
        internal_module=True,
        autoproto='basic/proto.h',
        init_function='torture_base_init'

diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build
index 5056cc02ccf801ca15a1109212366bfee6a6c9c2..4a18b4ff8f09ac34fd634ba7a63294d4a2f4487f 100644 (file)
--- a/source4/utils/wscript_build
+++ b/source4/utils/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_BINARY('ntlm_auth',
        source='ntlm_auth.c',
        manpages='man/ntlm_auth.1',
-       deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS service',
+       deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS service s3compat',
         needs_python=True
        )
 

diff --git a/source4/wscript_build b/source4/wscript_build
index 5a18fb1d120851d93ae7ddf7c8fdd2d9cefede6a..fc56fef05aa0d0de37343a57f6cef884207b29cf 100644 (file)
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -116,8 +116,13 @@ bld.RECURSE('setup')
 bld.RECURSE('scripting')
 bld.RECURSE('../pidl')
 bld.RECURSE('../lib')
+
+# s3compat is currently optional with --enable-s3compat
 if bld.env.ENABLE_S3COMPAT:
     bld.RECURSE('s3compat')
+else:
+    bld.SAMBA_SUBSYSTEM('s3compatlib', '')
+    bld.SAMBA_SUBSYSTEM('s3compat', '')
 
 # install some extra empty directories
 bld.INSTALL_DIRS("", "${LOCKDIR} ${SYSCONFDIR} ${LOCKDIR} ${PIDDIR} ${LOCALSTATEDIR}/lib ${PRIVATEDIR}/smbd.tmp/messaging")