Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
authorJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 01:45:06 +0000 (03:45 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 8 Apr 2008 01:45:06 +0000 (03:45 +0200)
Conflicts:

source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)

43 files changed:
1  2 
source4/Makefile
source4/auth/auth.c
source4/auth/config.mk
source4/auth/credentials/config.mk
source4/auth/gensec/config.mk
source4/auth/gensec/gensec.c
source4/build/make/rules.mk
source4/client/config.mk
source4/dsdb/config.mk
source4/heimdal_build/config.mk
source4/ldap_server/config.mk
source4/lib/basic.mk
source4/lib/events/config.mk
source4/lib/policy/config.mk
source4/lib/registry/config.mk
source4/lib/registry/local.c
source4/lib/socket_wrapper/config.mk
source4/lib/talloc/config.mk
source4/lib/tdb/config.mk
source4/lib/tls/config.mk
source4/lib/util/config.mk
source4/libcli/auth/config.mk
source4/libcli/config.mk
source4/libcli/ldap/config.mk
source4/libnet/config.mk
source4/librpc/config.mk
source4/nbt_server/config.mk
source4/nsswitch/config.mk
source4/ntvfs/config.mk
source4/ntvfs/ntvfs_base.c
source4/param/config.mk
source4/rpc_server/config.mk
source4/rpc_server/dcerpc_server.c
source4/scripting/ejs/config.mk
source4/scripting/python/modules.c
source4/smbd/config.mk
source4/smbd/process_model.c
source4/smbd/process_model.mk
source4/smbd/server.c
source4/torture/config.mk
source4/torture/torture.c
source4/utils/config.mk
source4/utils/net/config.mk

Simple merge
@@@ -21,7 -21,9 +21,8 @@@
  #include "includes.h"
  #include "lib/util/dlinklist.h"
  #include "auth/auth.h"
+ #include "auth/auth_proto.h"
  #include "lib/events/events.h"
 -#include "build.h"
  #include "param/param.h"
  
  /***************************************************************************
@@@ -511,16 -513,11 +512,16 @@@ const struct auth_critical_sizes *auth_
        return &critical_sizes;
  }
  
- NTSTATUS auth_init(void)
_PUBLIC_ NTSTATUS auth_init(void)
  {
        static bool initialized = false;
 +      extern NTSTATUS auth_developer_init(void);
 +      extern NTSTATUS auth_winbind_init(void);
 +      extern NTSTATUS auth_anonymous_init(void);
 +      extern NTSTATUS auth_unix_init(void);
 +      extern NTSTATUS auth_sam_init(void);
  
 -      init_module_fn static_init[] = { STATIC_auth_MODULES };
 +      init_module_fn static_init[] = { STATIC_service_auth_MODULES };
        
        if (initialized) return NT_STATUS_OK;
        initialized = true;
@@@ -8,11 -8,11 +8,11 @@@ mkinclude credentials/config.m
  PRIVATE_PROTO_HEADER = session_proto.h
  PUBLIC_DEPENDENCIES = CREDENTIALS
  
- PUBLIC_HEADERS += auth/session.h
PUBLIC_HEADERS += auth/session.h
  
 +auth_session_OBJ_FILES = $(addprefix auth/, session.o)
 +
  [SUBSYSTEM::auth_system_session]
 -OBJ_FILES = system_session.o
  PRIVATE_PROTO_HEADER = system_session_proto.h
  PUBLIC_DEPENDENCIES = CREDENTIALS
  PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY 
@@@ -73,29 -67,32 +73,29 @@@ SUBSYSTEM = service_aut
  # End MODULE auth_developer
  #######################
  
 +auth_developer_OBJ_FILES = $(addprefix auth/, auth_developer.o)
 +
  [MODULE::auth_unix]
  INIT_FUNCTION = auth_unix_init
 -SUBSYSTEM = auth
 -OBJ_FILES = auth_unix.o
 +SUBSYSTEM = service_auth
  PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
  
 +auth_unix_OBJ_FILES = $(addprefix auth/, auth_unix.o)
 +
  [SUBSYSTEM::PAM_ERRORS]
  PRIVATE_PROTO_HEADER = pam_errors.h
 -OBJ_FILES = pam_errors.o
  
 -#######################
 -# Start SUBSYSTEM auth
 -[SUBSYSTEM::auth]
 -#VERSION = 0.0.1
 -#SO_VERSION = 0
 +PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
 +
 +[MODULE::service_auth]
 +INIT_FUNCTION = server_service_auth_init
 +SUBSYSTEM = smbd
  PRIVATE_PROTO_HEADER = auth_proto.h
 -OBJ_FILES = \
 -              auth.o \
 -              auth_util.o \
 -              auth_simple.o
 -PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
 -PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 -# End SUBSYSTEM auth
 -#######################
 +PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
 +
 +service_auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
  
- PUBLIC_HEADERS += auth/auth.h
PUBLIC_HEADERS += auth/auth.h
  
  [PYTHON::swig_auth]
  PUBLIC_DEPENDENCIES = auth_system_session
@@@ -7,9 -12,7 +7,9 @@@ PUBLIC_DEPENDENCIES = 
  PRIVATE_DEPENDENCIES = \
                SECRETS
  
- PUBLIC_HEADERS += $(addprefix auth/credentials/, credentials.h credentials_krb5.h)
 +CREDENTIALS_OBJ_FILES = $(addprefix auth/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
 +
+ PUBLIC_HEADERS += auth/credentials/credentials.h
  
  [PYTHON::swig_credentials]
  PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
@@@ -7,13 -11,7 +7,13 @@@ PUBLIC_DEPENDENCIES = 
  # End SUBSYSTEM gensec
  #################################
  
- PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
 +PC_FILES += auth/gensec/gensec.pc
 +
 +gensec_VERSION = 0.0.1
 +gensec_SOVERSION = 0
 +gensec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
 +
+ PUBLIC_HEADERS += auth/gensec/gensec.h
  
  ################################################
  # Start MODULE gensec_krb5
@@@ -1263,15 -1265,9 +1264,15 @@@ static int sort_gensec(struct gensec_se
  /*
    initialise the GENSEC subsystem
  */
- NTSTATUS gensec_init(struct loadparm_context *lp_ctx)
_PUBLIC_ NTSTATUS gensec_init(struct loadparm_context *lp_ctx)
  {
        static bool initialized = false;
 +      extern NTSTATUS gensec_sasl_init(void);
 +      extern NTSTATUS gensec_krb5_init(void);
 +      extern NTSTATUS gensec_schannel_init(void);
 +      extern NTSTATUS gensec_spnego_init(void);
 +      extern NTSTATUS gensec_gssapi_init(void);
 +      extern NTSTATUS gensec_ntlmssp_init(void);
  
        init_module_fn static_init[] = { STATIC_gensec_MODULES };
        init_module_fn *shared_init;
@@@ -88,103 -93,6 +88,103 @@@ unused_macros
        @mkdir -p $(@D)
        @$(STLD) $(STLD_FLAGS) $@ $^
  
-       @$$(PERL) $$(srcdir)/script/mkproto.pl --srcdir=$$(srcdir) --builddir=$$(builddir) --all=$$@ $$^
 +###############################################################################
 +# Templates
 +###############################################################################
 +
 +# Partially link
 +# Arguments: target object file, source object files
 +define partial_link_template 
 +$(1): $(2) ;
 +      @echo Partially linking $$@
 +      @mkdir -p $$(@D)
 +      $$(PARTLINK) -o $$@ $$^
 +endef
 +
 +# Link a binary
 +# Arguments: target file, depends, flags
 +define binary_link_template
 +$(1): $(2) ;
 +      @echo Linking $$@
 +      @$$(BNLD) $$(BNLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
 +endef
 +
 +# Link a host-machine binary
 +# Arguments: target file, depends, flags
 +define host_binary_link_template
 +$(1): $(2) ;
 +      @echo Linking $$@
 +      @$$(HOSTLD) $$(HOSTLD_FLAGS) -L$${builddir}/bin/static -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
 +endef
 +
 +# Create a prototype header
 +# Arguments: header file, c files
 +define proto_header_template
 +$(1): $(2) ;
 +      @echo "Creating $$@"
++      @$$(PERL) $$(srcdir)/script/mkproto.pl --srcdir=$$(srcdir) --builddir=$$(builddir) --public=/dev/null --private=$$@ $$^
 +endef
 +
 +# Shared module
 +# Arguments: Target, dependencies, objects
 +define shared_module_template
 +
 +$(1): $(2) ;
 +      @echo Linking $$@
 +      @mkdir -p $$(@D)
 +      @$$(MDLD) $$(LDFLAGS) $$(MDLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) $(3)
 +
 +endef
 +
 +# Shared library
 +# Arguments: Target, dependencies, link flags, soname
 +define shared_library_template
 +$(1): $(2)
 +      @echo Linking $$@
 +      @mkdir -p $$(@D)
 +      @$$(SHLD) $$(LDFLAGS) $$(SHLD_FLAGS) $$(INTERN_LDFLAGS) -o $$@ $$(INSTALL_LINK_FLAGS) \
 +              $(3) \
 +              $$(if $$(SONAMEFLAG), $$(SONAMEFLAG)$(notdir $(4)))
 +
 +ifneq ($(notdir $(1)),$(notdir $(4)))
 +$(4): $(1)
 +      @echo "Creating symbolic link for $$@"
 +      @ln -fs $$(<F) $$@
 +endif
 +
 +ifneq ($(notdir $(1)),$(notdir $(5)))
 +$(5): $(1)
 +      @echo "Creating symbolic link for $$@"
 +      @ln -fs $$(<F) $$@
 +endif
 +endef
 +
 +# Shared alias
 +# Arguments: Target, subsystem name, alias name
 +define shared_module_alias_template
 +bin/modules/$(2)/$(3).$$(SHLIBEXT): $(1)
 +      @ln -fs $$(<F) $$@
 +
 +PLUGINS += bin/modules/$(2)/$(3).$$(SHLIBEXT)
 +
 +uninstallplugins::
 +      @-rm $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
 +installplugins::
 +      @ln -fs $(1) $$(DESTDIR)$$(modulesdir)/$(2)/$(3).$$(SHLIBEXT)
 +
 +endef
 +
 +define shared_module_install_template
 +installplugins:: bin/modules/$(1)/$(2)
 +      @echo Installing$(2) as $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
 +      @mkdir -p $$(DESTDIR)$$(modulesdir)/$(1)/
 +      @cp bin/modules/$(1)/$(2) $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
 +uninstallplugins::
 +      @echo Uninstalling $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
 +      @-rm $$(DESTDIR)$$(modulesdir)/$(1)/$(2)
 +
 +endef
 +
  ###############################################################################
  # File types
  ###############################################################################
@@@ -4,8 -4,10 +4,8 @@@
  # Start BINARY smbclient
  [BINARY::smbclient]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              client.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                SMBREADLINE \
                LIBSAMBA-UTIL \
                LIBCLI_SMB \
@@@ -24,8 -24,11 +24,8 @@@ smbclient_OBJ_FILES = client/client.
  # Start BINARY cifsdd
  [BINARY::cifsdd]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              cifsdd.o \
 -              cifsddio.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBCLI_SMB \
                LIBPOPT \
                POPT_SAMBA \
@@@ -16,9 -14,10 +16,9 @@@ SAMDB_OBJ_FILES = $(addprefix dsdb/, 
                samdb/samdb.o \
                samdb/samdb_privilege.o \
                samdb/cracknames.o \
 -              repl/replicated_objects.o
 -
 +              repl/replicated_objects.o)
  
- PUBLIC_HEADERS += dsdb/samdb/samdb.h
PUBLIC_HEADERS += dsdb/samdb/samdb.h
  
  [SUBSYSTEM::SAMDB_COMMON]
  PRIVATE_PROTO_HEADER = common/proto.h
@@@ -32,13 -30,13 +32,13 @@@ SAMDB_COMMON_OBJ_FILES = $(addprefix ds
  [SUBSYSTEM::SAMDB_SCHEMA]
  PRIVATE_PROTO_HEADER = schema/proto.h
  PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
 -OBJ_FILES = \
 -              schema/schema_init.o \
 -              schema/schema_syntax.o \
 -              schema/schema_constructed.o \
  
 +SAMDB_SCHEMA_OBJ_FILES = $(addprefix dsdb/schema/, \
 +              schema_init.o \
 +              schema_syntax.o \
 +              schema_constructed.o)
  
- PUBLIC_HEADERS += dsdb/schema/schema.h
PUBLIC_HEADERS += dsdb/schema/schema.h
  
  #######################
  # Start SUBSYSTEM DREPL_SRV
@@@ -466,7 -451,8 +466,7 @@@ HEIMDAL_ROKEN_OBJ_FILES = 
  # Start SUBSYSTEM HEIMDAL_GLUE
  [SUBSYSTEM::HEIMDAL_GLUE]
  CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err 
- PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-CONFIG
 -OBJ_FILES = glue.o
+ PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
  # End SUBSYSTEM HEIMDAL_GLUE
  #######################
  
@@@ -10,13 -15,6 +10,13 @@@ PRIVATE_DEPENDENCIES = CREDENTIALS 
                LIBCLI_LDAP SAMDB \
                process_model \
                gensec \
-               LIBSAMBA-CONFIG
+               LIBSAMBA-HOSTCONFIG
  # End SUBSYSTEM SMB
  #######################
 +
 +LDAP_OBJ_FILES = $(addprefix ldap_server/, \
 +              ldap_server.o \
 +              ldap_backend.o \
 +              ldap_bind.o \
 +              ldap_extended.o)
 +
@@@ -19,17 -19,17 +19,17 @@@ mkinclude dbwrap/config.m
  mkinclude crypto/config.mk
  
  [SUBSYSTEM::LIBCOMPRESSION]
 -OBJ_FILES = compression/mszip.o
 +
 +LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
  
  [SUBSYSTEM::GENCACHE]
 -OBJ_FILES = gencache/gencache.o
  PRIVATE_DEPENDENCIES = TDB_WRAP
  
 +GENCACHE_OBJ_FILES = gencache/gencache.o
  
- PUBLIC_HEADERS += lib/gencache/gencache.h
PUBLIC_HEADERS += lib/gencache/gencache.h
  
  [SUBSYSTEM::LDB_WRAP]
 -OBJ_FILES = ldb_wrap.o
  PUBLIC_DEPENDENCIES = LIBLDB
  PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
  
@@@ -33,8 -30,11 +33,10 @@@ EVENTS_STANDARD_OBJ_FILES = lib/events/
  
  ##############################
  # 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
  ##############################
  
@@@ -1,14 -1,12 +1,14 @@@
  [SUBSYSTEM::LIBPOLICY]
  CFLAGS = -Iheimdal/lib/roken
- PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG LIBTALLOC CHARSET 
 -OBJ_FILES = lex.o parse_adm.o 
+ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBTALLOC CHARSET 
  
 +LIBPOLICY_OBJ_FILES = lib/policy/lex.o lib/policy/parse_adm.o 
 +
  lib/policy/lex.l: lib/policy/parse_adm.h
  
  lib/policy/parse_adm.h: lib/policy/parse_adm.c
  
  [BINARY::dumpadm]
- PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-CONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
 -OBJ_FILES = dumpadm.o
+ PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-HOSTCONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
 +
 +dumpadm_OBJ_FILES = lib/policy/dumpadm.o
@@@ -24,16 -39,7 +24,16 @@@ PUBLIC_DEPENDENCIES = 
  # End MODULE registry_ldb
  ################################################
  
- PUBLIC_HEADERS += $(addprefix lib/registry/, registry.h hive.h patchfile.h)
 +PC_FILES += lib/registry/registry.pc
 +
 +registry_VERSION = 0.0.1
 +registry_SOVERSION = 0
 +
 +registry_OBJ_FILES = $(addprefix lib/registry/, interface.o util.o samba.o \
 +                                      patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
 +                                      hive.o local.o ldb.o dir.o rpc.o)
 +
+ PUBLIC_HEADERS += lib/registry/registry.h
  
  [SUBSYSTEM::registry_common]
  PUBLIC_DEPENDENCIES = registry
@@@ -45,8 -50,9 +45,8 @@@ registry_common_OBJ_FILES = lib/registr
  # Start BINARY regdiff
  [BINARY::regdiff]
  INSTALLDIR = BINDIR
 -OBJ_FILES = tools/regdiff.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+               LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
  # End BINARY regdiff
  ################################################
  
@@@ -58,8 -62,9 +58,8 @@@ MANPAGES += lib/registry/man/regdiff.
  # Start BINARY regpatch
  [BINARY::regpatch]
  INSTALLDIR = BINDIR
 -OBJ_FILES = tools/regpatch.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
+               LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
                registry_common
  # End BINARY regpatch
  ################################################
@@@ -72,8 -75,9 +72,8 @@@ MANPAGES += lib/registry/man/regpatch.
  # Start BINARY regshell
  [BINARY::regshell]
  INSTALLDIR = BINDIR
 -OBJ_FILES = tools/regshell.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
                SMBREADLINE registry_common
  # End BINARY regshell
  ################################################
@@@ -86,8 -88,9 +86,8 @@@ MANPAGES += lib/registry/man/regshell.
  # Start BINARY regtree
  [BINARY::regtree]
  INSTALLDIR = BINDIR
 -OBJ_FILES = tools/regtree.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
+               LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
                registry_common
  # End BINARY regtree
  ################################################
Simple merge
@@@ -4,7 -4,4 +4,5 @@@
  PRIVATE_DEPENDENCIES = LIBREPLACE_NETWORK
  # End SUBSYSTEM SOCKET_WRAPPER
  ##############################
- PUBLIC_HEADERS += lib/socket_wrapper/socket_wrapper.h
 +
 +SOCKET_WRAPPER_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o
@@@ -1,8 -1,7 +1,7 @@@
  [LIBRARY::LIBTALLOC]
  OUTPUT_TYPE = STATIC_LIBRARY
 -OBJ_FILES = talloc.o
  CFLAGS = -Ilib/talloc
  
 +LIBTALLOC_OBJ_FILES = lib/talloc/talloc.o
  
  MANPAGES += $(tallocdir)/talloc.3
- PUBLIC_HEADERS += $(tallocdir)/talloc.h
@@@ -7,13 -11,6 +7,11 @@@ CFLAGS = -Ilib/tdb/includ
  # End SUBSYSTEM ldb
  ################################################
  
- PUBLIC_HEADERS += $(tdbdir)/include/tdb.h
 +LIBTDB_OBJ_FILES = $(addprefix lib/tdb/common/, \
 +      tdb.o dump.o io.o lock.o \
 +      open.o traverse.o freelist.o \
 +      error.o transaction.o)
 +
  ################################################
  # Start BINARY tdbtool
  [BINARY::tdbtool]
@@@ -1,7 -1,11 +1,5 @@@
--################################################
--# Start SUBSYSTEM LIBTLS
  [SUBSYSTEM::LIBTLS]
 -OBJ_FILES = \
 -              tls.o \
 -              tlscert.o
  PUBLIC_DEPENDENCIES = \
-               LIBTALLOC GNUTLS LIBSAMBA-CONFIG samba-socket
+               LIBTALLOC GNUTLS LIBSAMBA-HOSTCONFIG samba-socket
 -#
 -# End SUBSYSTEM LIBTLS
 -################################################
 +
 +LIBTLS_OBJ_FILES = lib/tls/tls.o lib/tls/tlscert.o
@@@ -1,12 -1,7 +1,11 @@@
  [SUBSYSTEM::LIBSAMBA-UTIL]
 -#VERSION = 0.0.1
 -#SO_VERSION = 0
 -OBJ_FILES = xfile.o \
 +PUBLIC_DEPENDENCIES = \
 +              LIBTALLOC LIBCRYPTO \
-               SOCKET_WRAPPER EXT_NSL \
-               CHARSET EXECINFO DYNCONFIG \
-               LIBREPLACE_NETWORK
++              SOCKET_WRAPPER LIBREPLACE_NETWORK \
++              CHARSET EXECINFO
 +
 +LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
 +      xfile.o \
                debug.o \
                fault.o \
                signal.o \
                ms_fnmatch.o \
                mutex.o \
                idtree.o \
-               become_daemon.o)
+               become_daemon.o \
+               params.o
 -PUBLIC_DEPENDENCIES = \
 -              LIBTALLOC LIBCRYPTO \
 -              SOCKET_WRAPPER LIBREPLACE_NETWORK \
 -              CHARSET EXECINFO
  
  PUBLIC_HEADERS += $(addprefix lib/util/, util.h \
                                 attr.h \
@@@ -37,9 -38,9 +38,8 @@@
  
  [SUBSYSTEM::ASN1_UTIL]
  PRIVATE_PROTO_HEADER = asn1_proto.h
 -OBJ_FILES = asn1.o
  
 -# PUBLIC_HEADERS += lib/util/asn1.h
 +ASN1_UTIL_OBJ_FILES = lib/util/asn1.o
- PUBLIC_HEADERS += lib/util/asn1.h
  
  [SUBSYSTEM::UNIX_PRIVS]
  PRIVATE_PROTO_HEADER = unix_privs.h
@@@ -49,22 -49,20 +49,20 @@@ UNIX_PRIVS_OBJ_FILES = lib/util/unix_pr
  ################################################
  # Start SUBSYSTEM WRAP_XATTR
  [SUBSYSTEM::WRAP_XATTR]
- PRIVATE_PROTO_HEADER = wrap_xattr.h
 -OBJ_FILES = \
 -              wrap_xattr.o
  PUBLIC_DEPENDENCIES = XATTR
  #
  # End SUBSYSTEM WRAP_XATTR
  ################################################
  
 +WRAP_XATTR_OBJ_FILES = lib/util/wrap_xattr.o
 +
  [SUBSYSTEM::UTIL_TDB]
  PRIVATE_PROTO_HEADER = util_tdb.h
 -OBJ_FILES = \
 -              util_tdb.o
  PUBLIC_DEPENDENCIES = LIBTDB
  
 +UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o
 +
  [SUBSYSTEM::UTIL_LDB]
- PRIVATE_PROTO_HEADER = util_ldb.h
 -OBJ_FILES = \
 -                      util_ldb.o
  PUBLIC_DEPENDENCIES = LIBLDB
 +
 +UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o
@@@ -2,9 -2,13 +2,9 @@@
  # Start SUBSYSTEM LIBCLI_AUTH
  [SUBSYSTEM::LIBCLI_AUTH]
  PRIVATE_PROTO_HEADER = proto.h
 -OBJ_FILES = credentials.o \
 -              session.o \
 -              smbencrypt.o \
 -              smbdes.o
  PUBLIC_DEPENDENCIES = \
                MSRPC_PARSE \
-               LIBSAMBA-CONFIG
+               LIBSAMBA-HOSTCONFIG
  # End SUBSYSTEM LIBCLI_AUTH
  #################################
  
@@@ -1,10 -1,13 +1,11 @@@
  mkinclude auth/config.mk
  mkinclude ldap/config.mk
  mkinclude security/config.mk
+ mkinclude wbclient/config.mk
  
  [SUBSYSTEM::LIBSAMBA-ERRORS]
 -OBJ_FILES = util/doserr.o \
 -                  util/errormap.o \
 -                  util/nterr.o \
  
 +LIBSAMBA-ERRORS_OBJ_FILES = $(addprefix libcli/util/, doserr.o errormap.o nterr.o)
  
  PUBLIC_HEADERS += $(addprefix libcli/, util/error.h util/ntstatus.h util/doserr.h util/werror.h)
  
@@@ -45,85 -46,80 +46,85 @@@ PRIVATE_PROTO_HEADER = nbt/nbt_proto.
  PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT LIBCLI_COMPOSITE LIBEVENTS \
        NDR_SECURITY samba-socket LIBSAMBA-UTIL
  
 +LIBCLI_NBT_OBJ_FILES = $(addprefix libcli/nbt/, \
 +      nbtsocket.o \
 +      namequery.o \
 +      nameregister.o \
 +      namerefresh.o \
 +      namerelease.o)
 +
  [PYTHON::python_libcli_nbt]
  SWIG_FILE = swig/libcli_nbt.i
- PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-CONFIG
+ PUBLIC_DEPENDENCIES = LIBCLI_NBT DYNCONFIG LIBSAMBA-HOSTCONFIG
  
 +python_libcli_nbt_OBJ_FILES = libcli/swig/libcli_nbt_wrap.o
 +
  [PYTHON::python_libcli_smb]
  SWIG_FILE = swig/libcli_smb.i
- PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-CONFIG
+ PUBLIC_DEPENDENCIES = LIBCLI_SMB DYNCONFIG LIBSAMBA-HOSTCONFIG
  
 +python_libcli_smb_OBJ_FILES = libcli/swig/libcli_smb_wrap.o
 +
  [SUBSYSTEM::LIBCLI_DGRAM]
 -OBJ_FILES = \
 -      dgram/dgramsocket.o \
 -      dgram/mailslot.o \
 -      dgram/netlogon.o \
 -      dgram/ntlogon.o \
 -      dgram/browse.o
  PUBLIC_DEPENDENCIES = LIBCLI_NBT LIBNDR LIBCLI_RESOLVE
  
 +LIBCLI_DGRAM_OBJ_FILES = $(addprefix libcli/dgram/, \
 +      dgramsocket.o \
 +      mailslot.o \
 +      netlogon.o \
 +      ntlogon.o \
 +      browse.o)
 +
  [SUBSYSTEM::LIBCLI_CLDAP]
 -OBJ_FILES = cldap/cldap.o
  PUBLIC_DEPENDENCIES = LIBCLI_LDAP
  PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBLDB
  
- PUBLIC_HEADERS += libcli/cldap/cldap.h
 +LIBCLI_CLDAP_OBJ_FILES = libcli/cldap/cldap.o
+ # PUBLIC_HEADERS += libcli/cldap/cldap.h
  
  [SUBSYSTEM::LIBCLI_WREPL]
  PRIVATE_PROTO_HEADER = wrepl/winsrepl_proto.h
  PUBLIC_DEPENDENCIES = NDR_WINSREPL samba-socket LIBCLI_RESOLVE LIBEVENTS \
                                          LIBPACKET LIBNDR
  
 +LIBCLI_WREPL_OBJ_FILES = libcli/wrepl/winsrepl.o
 +
  [SUBSYSTEM::LIBCLI_RESOLVE]
  PRIVATE_PROTO_HEADER = resolve/proto.h
 -OBJ_FILES = \
 -      resolve/resolve.o
  PUBLIC_DEPENDENCIES = NDR_NBT
  
 +LIBCLI_RESOLVE_OBJ_FILES = libcli/resolve/resolve.o
 +
  [SUBSYSTEM::LP_RESOLVE]
  PRIVATE_PROTO_HEADER = resolve/lp_proto.h
- PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-CONFIG LIBNETIF 
 -OBJ_FILES = \
 -      resolve/bcast.o \
 -      resolve/nbtlist.o \
 -      resolve/wins.o \
 -      resolve/host.o \
 -      resolve/resolve_lp.o
+ PRIVATE_DEPENDENCIES = LIBCLI_NBT LIBSAMBA-HOSTCONFIG LIBNETIF 
  
 +LP_RESOLVE_OBJ_FILES = $(addprefix libcli/resolve/, \
 +                                        bcast.o nbtlist.o wins.o \
 +                                        host.o resolve_lp.o)
 +
  [SUBSYSTEM::LIBCLI_FINDDCS]
  PRIVATE_PROTO_HEADER = finddcs.h
 -OBJ_FILES = \
 -      finddcs.o
  PUBLIC_DEPENDENCIES = LIBCLI_NBT MESSAGING
  
 +LIBCLI_FINDDCS_OBJ_FILES = libcli/finddcs.o
 +
  [SUBSYSTEM::LIBCLI_SMB]
  PRIVATE_PROTO_HEADER = libcli_proto.h
 -OBJ_FILES = clireadwrite.o \
 +PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
 +      LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
 +      LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
 +
 +LIBCLI_SMB_OBJ_FILES = $(addprefix libcli/, \
 +              clireadwrite.o \
                cliconnect.o \
                clifile.o \
                clilist.o \
                clitrans2.o \
                climessage.o \
 -              clideltree.o
 -PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
 -      LIBCLI_SMB_COMPOSITE LIBCLI_NBT LIBSECURITY LIBCLI_RESOLVE \
 -      LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket
 -
 +              clideltree.o)
  
- PUBLIC_HEADERS += libcli/libcli.h
PUBLIC_HEADERS += libcli/libcli.h
  
  [SUBSYSTEM::LIBCLI_RAW]
  PRIVATE_PROTO_HEADER = raw/raw_proto.h
@@@ -4,15 -10,8 +4,14 @@@ PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS L
  PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE samba-socket NDR_SAMR LIBTLS ASN1_UTIL \
                                           LDAP_ENCODE LIBNDR LP_RESOLVE gensec
  
- PUBLIC_HEADERS += libcli/ldap/ldap.h
 +LIBCLI_LDAP_OBJ_FILES = $(addprefix libcli/ldap/, \
 +                                         ldap.o ldap_client.o ldap_bind.o \
 +                                         ldap_msg.o ldap_ildap.o ldap_controls.o)
 +
 +
+ PUBLIC_HEADERS += libcli/ldap/ldap.h libcli/ldap/ldap_ndr.h
  
  [SUBSYSTEM::LDAP_ENCODE]
- PRIVATE_PROTO_HEADER = ldap_ndr.h
 -OBJ_FILES = ldap_ndr.o
  # FIXME PRIVATE_DEPENDENCIES = LIBLDB
 +
 +LDAP_ENCODE_OBJ_FILES = libcli/ldap/ldap_ndr.o
@@@ -1,21 -1,36 +1,15 @@@
  [SUBSYSTEM::LIBSAMBA-NET]
  PRIVATE_PROTO_HEADER = libnet_proto.h
 -OBJ_FILES = \
 -              libnet.o \
 -              libnet_passwd.o \
 -              libnet_time.o \
 -              libnet_rpc.o \
 -              libnet_join.o \
 -              libnet_site.o \
 -              libnet_become_dc.o \
 -              libnet_unbecome_dc.o \
 -              libnet_vampire.o \
 -              libnet_samdump.o \
 -              libnet_samdump_keytab.o \
 -              libnet_samsync_ldb.o \
 -              libnet_user.o \
 -              libnet_group.o \
 -              libnet_share.o \
 -              libnet_lookup.o \
 -              libnet_domain.o \
 -              userinfo.o \
 -              groupinfo.o \
 -              userman.o \
 -              groupman.o \
 -              prereq_domain.o
  PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD
  
 -#PUBLIC_HEADERS += $(addprefix libnet/, libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
 -#                              libnet_rpc.h libnet_share.h libnet_time.h \
 -#                              libnet_user.h libnet_site.h libnet_vampire.h \
 -#                              userinfo.h userman.h)
 -
 +LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \
 +      libnet.o libnet_passwd.o libnet_time.o libnet_rpc.o \
 +      libnet_join.o libnet_site.o libnet_become_dc.o libnet_unbecome_dc.o \
 +      libnet_vampire.o libnet_samdump.o libnet_samdump_keytab.o \
 +      libnet_samsync_ldb.o libnet_user.o libnet_group.o libnet_share.o \
 +      libnet_lookup.o libnet_domain.o userinfo.o groupinfo.o userman.o \
 +      groupman.o prereq_domain.o)
  
- PUBLIC_HEADERS += $(addprefix libnet/, libnet.h libnet_join.h libnet_lookup.h libnet_passwd.h \
-                                libnet_rpc.h libnet_share.h libnet_time.h \
-                                libnet_user.h libnet_site.h libnet_vampire.h \
-                                userinfo.h userman.h)
  [PYTHON::swig_net]
  PRIVATE_DEPENDENCIES = LIBSAMBA-NET
  SWIG_FILE = net.i
@@@ -1,16 -1,17 +1,16 @@@
  ################################################
  # Start SUBSYSTEM LIBNDR
  [LIBRARY::LIBNDR]
 -VERSION = 0.0.1
 -SO_VERSION = 0
 -PC_FILE = ndr.pc
  PRIVATE_PROTO_HEADER = ndr/libndr_proto.h
 -OBJ_FILES = \
 -              ndr/ndr.o \
 -              ndr/ndr_basic.o \
 -              ndr/ndr_string.o \
 -              ndr/uuid.o
  PUBLIC_DEPENDENCIES = LIBSAMBA-ERRORS LIBTALLOC LIBSAMBA-UTIL CHARSET \
-                                         LIBSAMBA-CONFIG
+                                         LIBSAMBA-HOSTCONFIG
 +
 +LIBNDR_OBJ_FILES = $(addprefix librpc/ndr/, ndr.o ndr_basic.o ndr_string.o uuid.o)
 +
 +PC_FILES += librpc/ndr.pc
 +LIBNDR_VERSION = 0.0.1
 +LIBNDR_SOVERSION = 0
 +
  # End SUBSYSTEM LIBNDR
  ################################################
  
@@@ -20,8 -21,10 +20,8 @@@ PUBLIC_HEADERS += librpc/ndr/libndr.
  # Start BINARY ndrdump
  [BINARY::ndrdump]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              tools/ndrdump.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@@ -369,201 -316,164 +369,204 @@@ PUBLIC_DEPENDENCIES = 
        NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB \
        NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI NDR_NFS4ACL
  
 +NDR_TABLE_OBJ_FILES = librpc/ndr/ndr_table.o librpc/gen_ndr/tables.o
 +
  [SUBSYSTEM::RPC_NDR_ROT]
 -OBJ_FILES = gen_ndr/ndr_rot_c.o
  PUBLIC_DEPENDENCIES = NDR_ROT dcerpc
  
 +RPC_NDR_ROT_OBJ_FILES = librpc/gen_ndr/ndr_rot_c.o
 +
  [SUBSYSTEM::RPC_NDR_AUDIOSRV]
 -OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
  PUBLIC_DEPENDENCIES = NDR_AUDIOSRV dcerpc
  
 +RPC_NDR_AUDIOSRV_OBJ_FILES = librpc/gen_ndr/ndr_audiosrv_c.o
 +
  [SUBSYSTEM::RPC_NDR_ECHO]
 -OBJ_FILES = gen_ndr/ndr_echo_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_ECHO
  
 +RPC_NDR_ECHO_OBJ_FILES = librpc/gen_ndr/ndr_echo_c.o
 +
  [SUBSYSTEM::RPC_NDR_DSBACKUP]
 -OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_DSBACKUP
  
 +RPC_NDR_DSBACKUP_OBJ_FILES = librpc/gen_ndr/ndr_dsbackup_c.o
 +
  [SUBSYSTEM::RPC_NDR_EFS]
 -OBJ_FILES = gen_ndr/ndr_efs_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_EFS
  
 +RPC_NDR_EFS_OBJ_FILES = librpc/gen_ndr/ndr_efs_c.o
 +
  [SUBSYSTEM::RPC_NDR_LSA]
 -OBJ_FILES = gen_ndr/ndr_lsa_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_LSA
  
 +RPC_NDR_LSA_OBJ_FILES = librpc/gen_ndr/ndr_lsa_c.o
 +
  [SUBSYSTEM::RPC_NDR_DFS]
 -OBJ_FILES = gen_ndr/ndr_dfs_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_DFS
  
 +RPC_NDR_DFS_OBJ_FILES = librpc/gen_ndr/ndr_dfs_c.o
 +
  [SUBSYSTEM::RPC_NDR_FRSAPI]
 -OBJ_FILES = gen_ndr/ndr_frsapi_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_FRSAPI
  
 +RPC_NDR_FRSAPI_OBJ_FILES = librpc/gen_ndr/ndr_frsapi_c.o
 +
  [SUBSYSTEM::RPC_NDR_DRSUAPI]
 -OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_DRSUAPI
  
 +RPC_NDR_DRSUAPI_OBJ_FILES = librpc/gen_ndr/ndr_drsuapi_c.o
 +
  [SUBSYSTEM::RPC_NDR_POLICYAGENT]
 -OBJ_FILES = gen_ndr/ndr_policyagent_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_POLICYAGENT
  
 +RPC_NDR_POLICYAGENT_OBJ_FILES = librpc/gen_ndr/ndr_policyagent_c.o
 +
  [SUBSYSTEM::RPC_NDR_UNIXINFO]
 -OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
  
 +RPC_NDR_UNIXINFO_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo_c.o
 +
  [LIBRARY::dcerpc_samr]
 -OBJ_FILES = gen_ndr/ndr_samr_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR 
 -PC_FILE = dcerpc_samr.pc
 -VERSION = 0.0.1
 -SO_VERSION = 0
 +
 +PC_FILES += librpc/dcerpc_samr.pc
 +
 +dcerpc_samr_VERSION = 0.0.1
 +dcerpc_samr_SOVERSION = 0
 +dcerpc_samr_OBJ_FILES = librpc/gen_ndr/ndr_samr_c.o
  
  [SUBSYSTEM::RPC_NDR_SPOOLSS]
 -OBJ_FILES = gen_ndr/ndr_spoolss_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS
  
 +RPC_NDR_SPOOLSS_OBJ_FILES = librpc/gen_ndr/ndr_spoolss_c.o
 +
  [SUBSYSTEM::RPC_NDR_WKSSVC]
 -OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_WKSSVC
  
 +RPC_NDR_WKSSVC_OBJ_FILES = librpc/gen_ndr/ndr_wkssvc_c.o
 +
  [SUBSYSTEM::RPC_NDR_SRVSVC]
 -OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC
  
 +RPC_NDR_SRVSVC_OBJ_FILES = librpc/gen_ndr/ndr_srvsvc_c.o
 +
  [SUBSYSTEM::RPC_NDR_SVCCTL]
 -OBJ_FILES = gen_ndr/ndr_svcctl_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
  
 +RPC_NDR_SVCCTL_OBJ_FILES = librpc/gen_ndr/ndr_svcctl_c.o
 +
  PUBLIC_HEADERS += librpc/gen_ndr/ndr_svcctl_c.h
  
- [SUBSYSTEM::dcerpc_atsvc]
+ [LIBRARY::dcerpc_atsvc]
 -OBJ_FILES = gen_ndr/ndr_atsvc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
 -PC_FILE = dcerpc_atsvc.pc
+ VERSION = 0.0.1
+ SO_VERSION = 0
  
 +dcerpc_atsvc_OBJ_FILES = librpc/gen_ndr/ndr_atsvc_c.o
++PC_FILES += librpc/dcerpc_atsvc.pc
 +
  PUBLIC_HEADERS += librpc/gen_ndr/ndr_atsvc_c.h
  
  [SUBSYSTEM::RPC_NDR_EVENTLOG]
 -OBJ_FILES = gen_ndr/ndr_eventlog_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
  
 +RPC_NDR_EVENTLOG_OBJ_FILES = librpc/gen_ndr/ndr_eventlog_c.o
 +
  [SUBSYSTEM::RPC_NDR_EPMAPPER]
 -OBJ_FILES = gen_ndr/ndr_epmapper_c.o
  PUBLIC_DEPENDENCIES = NDR_EPMAPPER 
  
 +RPC_NDR_EPMAPPER_OBJ_FILES = librpc/gen_ndr/ndr_epmapper_c.o
 +
  [SUBSYSTEM::RPC_NDR_DBGIDL]
 -OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_DBGIDL
  
 +RPC_NDR_DBGIDL_OBJ_FILES = librpc/gen_ndr/ndr_dbgidl_c.o
 +
  [SUBSYSTEM::RPC_NDR_DSSETUP]
 -OBJ_FILES = gen_ndr/ndr_dssetup_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_DSSETUP
  
 +RPC_NDR_DSSETUP_OBJ_FILES = librpc/gen_ndr/ndr_dssetup_c.o
 +
  [SUBSYSTEM::RPC_NDR_MSGSVC]
 -OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_MSGSVC
  
 +RPC_NDR_MSGSVC_OBJ_FILES = librpc/gen_ndr/ndr_msgsvc_c.o
 +
  [SUBSYSTEM::RPC_NDR_WINS]
 -OBJ_FILES = gen_ndr/ndr_wins_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_WINS
  
 +RPC_NDR_WINS_OBJ_FILES = librpc/gen_ndr/ndr_wins_c.o
 +
  [SUBSYSTEM::RPC_NDR_WINREG]
 -OBJ_FILES = gen_ndr/ndr_winreg_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG
  
 +RPC_NDR_WINREG_OBJ_FILES = librpc/gen_ndr/ndr_winreg_c.o
 +
  [SUBSYSTEM::RPC_NDR_INITSHUTDOWN]
 -OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
  
- [SUBSYSTEM::dcerpc_mgmt]
 +RPC_NDR_INITSHUTDOWN_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown_c.o
 +
 -OBJ_FILES = gen_ndr/ndr_mgmt_c.o
+ [SUBSYSTEM::RPC_NDR_MGMT]
  PRIVATE_DEPENDENCIES = NDR_MGMT
  
- dcerpc_mgmt_OBJ_FILES = librpc/gen_ndr/ndr_mgmt_c.o
++RPC_NDR_MGMT_OBJ_FILES = librpc/gen_ndr/ndr_mgmt_c.o
 +
  [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 -OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_PROTECTED_STORAGE
  
 +RPC_NDR_PROTECTED_STORAGE_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage_c.o
 +
  [SUBSYSTEM::RPC_NDR_OXIDRESOLVER]
 -OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_OXIDRESOLVER
  
 +RPC_NDR_OXIDRESOLVER_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver_c.o
 +
  [SUBSYSTEM::RPC_NDR_REMACT]
 -OBJ_FILES = gen_ndr/ndr_remact_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_REMACT
  
 +RPC_NDR_REMACT_OBJ_FILES = librpc/gen_ndr/ndr_remact_c.o
 +
  [SUBSYSTEM::RPC_NDR_WZCSVC]
 -OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_WZCSVC
  
 +RPC_NDR_WZCSVC_OBJ_FILES = librpc/gen_ndr/ndr_wzcsvc_c.o
 +
  [SUBSYSTEM::RPC_NDR_W32TIME]
 -OBJ_FILES = gen_ndr/ndr_w32time_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_W32TIME
  
 +RPC_NDR_W32TIME_OBJ_FILES = librpc/gen_ndr/ndr_w32time_c.o
 +
  [SUBSYSTEM::RPC_NDR_SCERPC]
 -OBJ_FILES = gen_ndr/ndr_scerpc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_SCERPC
  
 +RPC_NDR_SCERPC_OBJ_FILES = librpc/gen_ndr/ndr_scerpc_c.o
 +
  [SUBSYSTEM::RPC_NDR_NTSVCS]
 -OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_NTSVCS
  
 +RPC_NDR_NTSVCS_OBJ_FILES = librpc/gen_ndr/ndr_ntsvcs_c.o
 +
  [SUBSYSTEM::RPC_NDR_NETLOGON]
 -OBJ_FILES = gen_ndr/ndr_netlogon_c.o
  PUBLIC_DEPENDENCIES = NDR_NETLOGON
  
 +RPC_NDR_NETLOGON_OBJ_FILES = librpc/gen_ndr/ndr_netlogon_c.o
 +
  [SUBSYSTEM::RPC_NDR_TRKWKS]
 -OBJ_FILES = gen_ndr/ndr_trkwks_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_TRKWKS
  
 +RPC_NDR_TRKWKS_OBJ_FILES = librpc/gen_ndr/ndr_trkwks_c.o
 +
  [SUBSYSTEM::RPC_NDR_KEYSVC]
 -OBJ_FILES = gen_ndr/ndr_keysvc_c.o
  PUBLIC_DEPENDENCIES = dcerpc NDR_KEYSVC
  
 +RPC_NDR_KEYSVC_OBJ_FILES = librpc/gen_ndr/ndr_keysvc_c.o
 +
  [SUBSYSTEM::NDR_DCERPC]
 -OBJ_FILES = gen_ndr/ndr_dcerpc.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
  
 +NDR_DCERPC_OBJ_FILES = librpc/gen_ndr/ndr_dcerpc.o
 +
  PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h)
  
  ################################################
@@@ -705,67 -607,64 +709,82 @@@ INIT_FUNCTION = ejs_init_irp
  SUBSYSTEM = smbcalls
  PRIVATE_DEPENDENCIES = dcerpc NDR_IRPC EJSRPC
  
 +RPC_EJS_IRPC_OBJ_FILES = librpc/gen_ndr/ndr_irpc_ejs.o
 +
  [PYTHON::swig_dcerpc]
  SWIG_FILE = rpc/dcerpc.i
- PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-CONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
+ PUBLIC_DEPENDENCIES = LIBCLI_SMB NDR_MISC LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG dcerpc_samr RPC_NDR_LSA DYNCONFIG
  
 +swig_dcerpc_OBJ_FILES = librpc/rpc/dcerpc_wrap.o
 +
  [PYTHON::python_echo]
 -OBJ_FILES = gen_ndr/py_echo.o
  PRIVATE_DEPENDENCIES = RPC_NDR_ECHO
  
 +python_echo_OBJ_FILES = librpc/gen_ndr/py_echo.o
 +
  [PYTHON::python_winreg]
 -OBJ_FILES = gen_ndr/py_winreg.o
  PRIVATE_DEPENDENCIES = RPC_NDR_WINREG python_misc
  
 +python_winreg_OBJ_FILES = librpc/gen_ndr/py_winreg.o
 +
  [PYTHON::python_dcerpc_misc]
 -OBJ_FILES = gen_ndr/py_misc.o
 +
 +python_dcerpc_misc_OBJ_FILES = librpc/gen_ndr/py_misc.o
  
  [PYTHON::python_initshutdown]
 -OBJ_FILES = gen_ndr/py_initshutdown.o
  PRIVATE_DEPENDENCIES = RPC_NDR_INITSHUTDOWN
  
 +python_initshutdown_OBJ_FILES = librpc/gen_ndr/py_initshutdown.o
 +
  [PYTHON::python_epmapper]
 -OBJ_FILES = gen_ndr/py_epmapper.o
 +
 +python_epmapper_OBJ_FILES = librpc/gen_ndr/py_epmapper.o
  
  [PYTHON::python_mgmt]
 -OBJ_FILES = gen_ndr/py_mgmt.o
  PRIVATE_DEPENDENCIES = dcerpc_mgmt
  
 +python_mgmt_OBJ_FILES = librpc/gen_ndr/py_mgmt.o
 +
  [PYTHON::python_atsvc]
 -OBJ_FILES = gen_ndr/py_atsvc.o
  PRIVATE_DEPENDENCIES = dcerpc_atsvc
  
 +python_atsvc_OBJ_FILES = librpc/gen_ndr/py_atsvc.o
 +
  [PYTHON::python_samr]
 -OBJ_FILES = gen_ndr/py_samr.o
  PRIVATE_DEPENDENCIES = dcerpc_samr
  
 +python_samr_OBJ_FILES = librpc/gen_ndr/py_samr.o
 +
  [PYTHON::python_svcctl]
 -OBJ_FILES = gen_ndr/py_svcctl.o
  PRIVATE_DEPENDENCIES = RPC_NDR_SVCCTL
  
 +python_svcctl_OBJ_FILES = librpc/gen_ndr/py_svcctl.o
 +
  [PYTHON::python_lsa]
 -OBJ_FILES = gen_ndr/py_lsa.o
  PRIVATE_DEPENDENCIES = RPC_NDR_LSA
  
 +python_lsa_OBJ_FILES = librpc/gen_ndr/py_lsa.o
 +
  [PYTHON::python_wkssvc]
 -OBJ_FILES = gen_ndr/py_wkssvc.o
  PRIVATE_DEPENDENCIES = RPC_NDR_WKSSVC
  
 -OBJ_FILES = gen_ndr/py_dfs.o
 +python_wkssvc_OBJ_FILES = librpc/gen_ndr/py_wkssvc.o
 +
+ [PYTHON::python_dfs]
 -OBJ_FILES = gen_ndr/py_unixinfo.o
+ PRIVATE_DEPENDENCIES = RPC_NDR_DFS
++python_dfs_OBJ_FILES = gen_ndr/py_dfs.o
++
+ [PYTHON::python_unixinfo]
 -OBJ_FILES = gen_ndr/py_drsuapi.o
+ PRIVATE_DEPENDENCIES = RPC_NDR_UNIXINFO
++python_unixinfo_OBJ_FILES = gen_ndr/py_unixinfo.o
++
+ [PYTHON::python_drsuapi]
+ PRIVATE_DEPENDENCIES = RPC_NDR_DRSUAPI
++python_drsuapi_OBJ_FILES = gen_ndr/py_drsuapi.o
++
  [PYTHON::python_dcerpc_security]
 -OBJ_FILES = gen_ndr/py_security.o
 +
 +python_dcerpc_security_OBJ_FILES = librpc/gen_ndr/py_security.o
@@@ -16,9 -17,11 +16,9 @@@ WINSDB_OBJ_FILES = $(addprefix nbt_serv
  [MODULE::ldb_wins_ldb]
  SUBSYSTEM = LIBLDB
  OUTPUT_TYPE = SHARED_LIBRARY
 -INIT_FUNCTION = &ldb_wins_ldb_module_ops
 -OBJ_FILES = \
 -              wins/wins_ldb.o
 +INIT_FUNCTION = LDB_MODULE(wins_ldb)
  PRIVATE_DEPENDENCIES = \
-               LIBNETIF LIBSAMBA-CONFIG LIBSAMBA-UTIL
+               LIBNETIF LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL
  # End MODULE ldb_wins_ldb
  #######################
  
Simple merge
@@@ -76,10 -81,13 +76,10 @@@ ntvfs_nbench_OBJ_FILES = ntvfs/nbench/v
  # Start SUBSYSTEM NTVFS
  [SUBSYSTEM::ntvfs]
  PRIVATE_PROTO_HEADER = ntvfs_proto.h
 -OBJ_FILES = \
 -              ntvfs_base.o \
 -              ntvfs_generic.o \
 -              ntvfs_interface.o \
 -              ntvfs_util.o
 +
 +ntvfs_OBJ_FILES = $(addprefix ntvfs/, ntvfs_base.o ntvfs_generic.o ntvfs_interface.o ntvfs_util.o)
  
- PUBLIC_HEADERS += ntvfs/ntvfs.h
PUBLIC_HEADERS += ntvfs/ntvfs.h
  #
  # End SUBSYSTEM NTVFS
  ################################################
Simple merge
@@@ -1,16 -1,17 +1,20 @@@
- [SUBSYSTEM::LIBSAMBA-CONFIG]
+ [LIBRARY::LIBSAMBA-HOSTCONFIG]
+ VERSION = 0.0.1
+ SO_VERSION = 1
 -OBJ_FILES = loadparm.o \
 -                      generic.o \
 -                      util.o \
 -                      ../lib/version.o
 -PC_FILE = samba-hostconfig.pc
  PUBLIC_DEPENDENCIES = LIBSAMBA-UTIL 
  PRIVATE_DEPENDENCIES = DYNCONFIG LIBREPLACE_EXT CHARSET
  PRIVATE_PROTO_HEADER = proto.h
  
 +LIBSAMBA-CONFIG_OBJ_FILES = param/loadparm.o \
 +                      param/params.o \
 +                      param/generic.o \
 +                      param/util.o \
 +                      lib/version.o
 +
  PUBLIC_HEADERS += param/param.h
  
++PC_FILES += param/samba-hostconfig.pc
++
  #################################
  # Start SUBSYSTEM share
  [SUBSYSTEM::share]
@@@ -43,15 -43,10 +47,15 @@@ PRIVATE_DEPENDENCIES = LIBLDB LDB_WRA
  # End MODULE share_ldb
  ################################################
  
 +share_ldb_OBJ_FILES = param/share_ldb.o 
 +
  [SUBSYSTEM::SECRETS]
 -OBJ_FILES = secrets.o
  PRIVATE_DEPENDENCIES = LIBLDB TDB_WRAP UTIL_TDB NDR_SECURITY
  
 +SECRETS_OBJ_FILES = param/secrets.o
 +
  [PYTHON::param]
  SWIG_FILE = param.i
- PRIVATE_DEPENDENCIES = LIBSAMBA-CONFIG
+ PRIVATE_DEPENDENCIES = LIBSAMBA-HOSTCONFIG
 +
 +param_OBJ_FILES = param/param_wrap.o
Simple merge
Simple merge
@@@ -102,8 -91,8 +102,8 @@@ smbcalls_OBJ_FILES = $(addprefix script
  # Start BINARY SMBSCRIPT
  [BINARY::smbscript]
  INSTALLDIR = BINDIR
- PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-CONFIG
 -OBJ_FILES = \
 -              smbscript.o
+ PRIVATE_DEPENDENCIES = EJS LIBSAMBA-UTIL smbcalls LIBSAMBA-HOSTCONFIG
  # End BINARY SMBSCRIPT
  #######################
 +
 +smbscript_OBJ_FILES = scripting/ejs/smbscript.o
Simple merge
Simple merge
@@@ -79,11 -80,8 +79,11 @@@ _PUBLIC_ NTSTATUS register_process_mode
        return NT_STATUS_OK;
  }
  
- NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
_PUBLIC_ NTSTATUS process_model_init(struct loadparm_context *lp_ctx)
  {
 +      extern NTSTATUS process_model_standard_init(void);
 +      extern NTSTATUS process_model_prefork_init(void);
 +      extern NTSTATUS process_model_single_init(void);
        init_module_fn static_init[] = { STATIC_process_model_MODULES };
        init_module_fn *shared_init = load_samba_modules(NULL, lp_ctx, "process_model");
  
@@@ -40,10 -40,10 +40,10 @@@ SUBSYSTEM = process_mode
  # End MODULE process_model_thread
  ################################################
  
 +process_model_prefork_OBJ_FILES = smbd/process_prefork.o
 +
  [SUBSYSTEM::process_model]
  PRIVATE_PROTO_HEADER = process_model_proto.h
- PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-CONFIG
 -OBJ_FILES = \
 -              process_model.o
+ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG
 +
 +process_model_OBJ_FILES = smbd/process_model.o
Simple merge
@@@ -1,8 -1,14 +1,8 @@@
  # TORTURE subsystem
  [LIBRARY::torture]
 -SO_VERSION = 0
 -VERSION = 0.0.1
 -PC_FILE = torture.pc
  PRIVATE_PROTO_HEADER = proto.h
 -OBJ_FILES = \
 -              torture.o \
 -              ui.o
  PUBLIC_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBTALLOC \
                LIBPOPT
@@@ -262,8 -324,10 +262,8 @@@ MANPAGES += torture/man/smbtorture.
  # Start BINARY gentest
  [BINARY::gentest]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              gentest.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@@ -281,8 -343,10 +281,8 @@@ MANPAGES += torture/man/gentest.
  # Start BINARY masktest
  [BINARY::masktest]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              masktest.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@@ -45,20 -46,8 +45,20 @@@ bool torture_register_suite(struct tort
  }
  
  
- int torture_init(void)
_PUBLIC_ int torture_init(void)
  {
 +      extern NTSTATUS torture_base_init(void);
 +      extern NTSTATUS torture_ldap_init(void);
 +      extern NTSTATUS torture_local_init(void);
 +      extern NTSTATUS torture_nbt_init(void);
 +      extern NTSTATUS torture_nbench_init(void);
 +      extern NTSTATUS torture_rap_init(void);
 +      extern NTSTATUS torture_rpc_init(void);
 +      extern NTSTATUS torture_smb2_init(void);
 +      extern NTSTATUS torture_net_init(void);
 +      extern NTSTATUS torture_raw_init(void);
 +      extern NTSTATUS torture_unix_init(void);
 +      extern NTSTATUS torture_winbind_init(void);
        init_module_fn static_init[] = { STATIC_torture_MODULES };
        init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "torture");
  
@@@ -4,8 -4,10 +4,8 @@@
  # Start BINARY ntlm_auth
  [BINARY::ntlm_auth]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              ntlm_auth.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                POPT_SAMBA \
@@@ -26,8 -26,10 +26,8 @@@ MANPAGES += utils/man/ntlm_auth.
  # Start BINARY getntacl
  [BINARY::getntacl]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              getntacl.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                NDR_XATTR \
                WRAP_XATTR \
@@@ -64,8 -64,10 +64,8 @@@ setnttoken_OBJ_FILES = utils/setnttoken
  # Start BINARY nmblookup
  [BINARY::nmblookup]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              nmblookup.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBCLI_NBT \
                LIBPOPT \
@@@ -81,8 -81,10 +81,8 @@@ nmblookup_OBJ_FILES = utils/nmblookup.
  # Start BINARY testparm
  [BINARY::testparm]
  INSTALLDIR = BINDIR
 -OBJ_FILES = \
 -              testparm.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBPOPT \
                samba-socket \
@@@ -5,8 -5,15 +5,8 @@@
  [BINARY::net]
  INSTALLDIR = BINDIR
  PRIVATE_PROTO_HEADER = net_proto.h
 -OBJ_FILES = \
 -              net.o \
 -              net_password.o \
 -              net_time.o \
 -              net_join.o \
 -              net_vampire.o \
 -              net_user.o
  PRIVATE_DEPENDENCIES = \
-               LIBSAMBA-CONFIG \
+               LIBSAMBA-HOSTCONFIG \
                LIBSAMBA-UTIL \
                LIBSAMBA-NET \
                LIBPOPT \