Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into HEAD

Conflicts:

	source/lib/basic.mk
	source/libcli/config.mk
	source/librpc/config.mk
	source/param/loadparm.c
	source/script/mkrelease.sh
	source/smb_server/smb/receive.c

diff --cc source/configure.ac
index 4b6e8de4a78f27d346262458077a4bbc68cc4211,66fb69694e30c9d1cedea0b1548a6a3db022970d..c59f2d9b5098c8fad9c23f5f055fb9cfe6d9fac1
--- 1/source/configure.ac
--- 2/source/configure.ac
+++ b/source/configure.ac
@@@ -25,9 -25,8 +25,10 @@@ m4_include(lib/util/time.m4
  m4_include(lib/popt/samba.m4)
  m4_include(lib/charset/config.m4)
  m4_include(lib/socket/config.m4)
 +m4_include(lib/compress/config.m4)
 +m4_include(lib/cache/config.m4)
  m4_include(nsswitch/nsstest.m4)
+ m4_include(pidl/config.m4)
  
  AC_CONFIG_FILES(lib/registry/registry.pc)
  AC_CONFIG_FILES(librpc/dcerpc.pc)

diff --cc source/lib/basic.mk
index e8ae95db949a06794639f2907d1338731e7fc2f8,71acb944923e5f6cf09879683a3a78c2ff4e1f8a..50b0f79a10315e4663d9802e55ec68621ad20a45
--- 1/source/lib/basic.mk
--- 2/source/lib/basic.mk
+++ b/source/lib/basic.mk
@@@ -1,40 -1,34 +1,36 @@@
  # LIB BASIC subsystem
- include samba3/config.mk
- include socket/config.mk
- include charset/config.mk
- include ldb-samba/config.mk
- include tls/config.mk
- include registry/config.mk
- include policy/config.mk
- include messaging/config.mk
- include events/config.mk
- include cmdline/config.mk
- include socket_wrapper/config.mk
- include nss_wrapper/config.mk
- include appweb/config.mk
- include stream/config.mk
- include util/config.mk
- include tdr/config.mk
- include dbwrap/config.mk
- include crypto/config.mk
- include compress/config.mk
- include cache/config.mk
- 
- ################################################
- # Start SUBSYSTEM LIBCOMPRESSION
++
+ mkinclude samba3/config.mk
+ mkinclude socket/config.mk
+ mkinclude charset/config.mk
+ mkinclude ldb-samba/config.mk
+ mkinclude tls/config.mk
+ mkinclude registry/config.mk
+ mkinclude messaging/config.mk
+ mkinclude events/config.mk
+ mkinclude cmdline/config.mk
+ mkinclude socket_wrapper/config.mk
+ mkinclude nss_wrapper/config.mk
+ mkinclude appweb/config.mk
+ mkinclude stream/config.mk
+ mkinclude util/config.mk
+ mkinclude tdr/config.mk
+ mkinclude dbwrap/config.mk
+ mkinclude crypto/config.mk
++mkinclude cache/config.mk
+ 
  [SUBSYSTEM::LIBCOMPRESSION]
- OBJ_FILES = compression/mszip.o
- # End SUBSYSTEM LIBCOMPRESION
- ################################################
+ 
+ LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
  
  [SUBSYSTEM::GENCACHE]
- PRIVATE_PROTO_HEADER = gencache/gencache.h
- OBJ_FILES = gencache/gencache.o
  PRIVATE_DEPENDENCIES = TDB_WRAP
  
+ GENCACHE_OBJ_FILES = gencache/gencache.o
+ 
+ # PUBLIC_HEADERS += lib/gencache/gencache.h
+ 
  [SUBSYSTEM::LDB_WRAP]
- PUBLIC_HEADERS = ldb_wrap.h
- OBJ_FILES = ldb_wrap.o
  PUBLIC_DEPENDENCIES = LIBLDB
  PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
  

diff --cc source/lib/talloc/talloc.h
Simple merge

diff --cc source/libcli/config.mk
index 45d286623f9b66b6ffbc85ad31d3f583d28efe73,95b45003bec8b655c109a6f6a66ff107ae018c37..6b7d6607dc03f85df614fd84246812afed923ee7
--- 1/source/libcli/config.mk
--- 2/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@@ -97,24 -105,27 +105,26 @@@ LP_RESOLVE_OBJ_FILES = $(addprefix libc
  
  [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]
- PUBLIC_HEADERS = libcli.h
- PUBLIC_PROTO_HEADER = libcli_proto.h
- OBJ_FILES = clireadwrite.o \
+ PRIVATE_PROTO_HEADER = libcli_proto.h
+ 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_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba-socket \
++      SMBREAD_COMPRESS SMB_PROXY_CACHE
+ 
+ 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 SMBREAD_COMPRESS SMB_PROXY_CACHE
+               clideltree.o)
  
 -# PUBLIC_HEADERS += libcli/libcli.h
 -
  [SUBSYSTEM::LIBCLI_RAW]
  PRIVATE_PROTO_HEADER = raw/raw_proto.h
  PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR

diff --cc source/libcli/raw/interfaces.h
Simple merge

diff --cc source/libcli/raw/rawrequest.c
Simple merge

diff --cc source/libcli/raw/rawtrans.c
Simple merge

diff --cc source/librpc/config.mk
index a9eb0fcce5991d4e5d3c053bcd774a2c46a416aa,11a320a583bf2ac737dde45bba2103b536970c9b..0858b3d9e0f4c425dcb42d47b43535e0f84ed841
--- 1/source/librpc/config.mk
--- 2/source/librpc/config.mk
+++ b/source/librpc/config.mk
@@@ -44,255 -43,322 +43,326 @@@ PUBLIC_DEPENDENCIES = LIBCOMPRESSION LI
  # End SUBSYSTEM NDR_COMPRESSION
  ################################################
  
+ NDR_COMPRESSION_OBJ_FILES = librpc/ndr/ndr_compression.o
+ 
  [SUBSYSTEM::NDR_SECURITY]
- OBJ_FILES = gen_ndr/ndr_security.o ndr/ndr_sec_helper.o 
- PUBLIC_HEADERS = gen_ndr/security.h
  PUBLIC_DEPENDENCIES = NDR_MISC LIBSECURITY
  
+ NDR_SECURITY_OBJ_FILES = librpc/gen_ndr/ndr_security.o librpc/ndr/ndr_sec_helper.o 
+ 
+ PUBLIC_HEADERS += librpc/gen_ndr/security.h
+ 
  [SUBSYSTEM::NDR_AUDIOSRV]
- OBJ_FILES = gen_ndr/ndr_audiosrv.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_AUDIOSRV_OBJ_FILES = librpc/gen_ndr/ndr_audiosrv.o
+ 
  [SUBSYSTEM::NDR_DNSSERVER]
- OBJ_FILES = gen_ndr/ndr_dnsserver.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_DNSSERVER_OBJ_FILES = librpc/gen_ndr/ndr_dnsserver.o
+ 
  [SUBSYSTEM::NDR_WINSTATION]
- OBJ_FILES = gen_ndr/ndr_winstation.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_WINSTATION_OBJ_FILES = librpc/gen_ndr/ndr_winstation.o
+ 
  [SUBSYSTEM::NDR_ECHO]
- OBJ_FILES = gen_ndr/ndr_echo.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_ECHO_OBJ_FILES = librpc/gen_ndr/ndr_echo.o
+ 
 +[SUBSYSTEM::NDR_PROXY]
 +OBJ_FILES = gen_ndr/ndr_proxy.o
 +PUBLIC_DEPENDENCIES = LIBNDR
 +
  [SUBSYSTEM::NDR_IRPC]
- OBJ_FILES = gen_ndr/ndr_irpc.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT
  
+ NDR_IRPC_OBJ_FILES = librpc/gen_ndr/ndr_irpc.o
+ 
  [SUBSYSTEM::NDR_DSBACKUP]
- OBJ_FILES = gen_ndr/ndr_dsbackup.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_DSBACKUP_OBJ_FILES = librpc/gen_ndr/ndr_dsbackup.o
+ 
  [SUBSYSTEM::NDR_EFS]
- OBJ_FILES = gen_ndr/ndr_efs.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
  
+ NDR_EFS_OBJ_FILES = librpc/gen_ndr/ndr_efs.o
+ 
  [SUBSYSTEM::NDR_MISC]
- OBJ_FILES = gen_ndr/ndr_misc.o ndr/ndr_misc.o
- PUBLIC_HEADERS = gen_ndr/misc.h gen_ndr/ndr_misc.h
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_MISC_OBJ_FILES = librpc/gen_ndr/ndr_misc.o librpc/ndr/ndr_misc.o
+ 
+ PUBLIC_HEADERS += librpc/gen_ndr/misc.h librpc/gen_ndr/ndr_misc.h
+ 
  [SUBSYSTEM::NDR_ROT]
- OBJ_FILES = gen_ndr/ndr_rot.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
  
+ NDR_ROT_OBJ_FILES = librpc/gen_ndr/ndr_rot.o
+ 
  [SUBSYSTEM::NDR_LSA]
- OBJ_FILES = gen_ndr/ndr_lsa.o
- PUBLIC_HEADERS = gen_ndr/lsa.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
  
+ NDR_LSA_OBJ_FILES = librpc/gen_ndr/ndr_lsa.o
+ 
+ PUBLIC_HEADERS += librpc/gen_ndr/lsa.h
+ 
  [SUBSYSTEM::NDR_DFS]
- OBJ_FILES = gen_ndr/ndr_dfs.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
  
+ NDR_DFS_OBJ_FILES = librpc/gen_ndr/ndr_dfs.o
+ 
  [SUBSYSTEM::NDR_FRSRPC]
- OBJ_FILES = gen_ndr/ndr_frsrpc.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_FRSRPC_OBJ_FILES = librpc/gen_ndr/ndr_frsrpc.o
+ 
  [SUBSYSTEM::NDR_FRSAPI]
- OBJ_FILES = gen_ndr/ndr_frsapi.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_FRSAPI_OBJ_FILES = librpc/gen_ndr/ndr_frsapi.o
+ 
  [SUBSYSTEM::NDR_DRSUAPI]
- OBJ_FILES = gen_ndr/ndr_drsuapi.o ndr/ndr_drsuapi.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR ASN1_UTIL
  
+ NDR_DRSUAPI_OBJ_FILES = librpc/gen_ndr/ndr_drsuapi.o librpc/ndr/ndr_drsuapi.o
+ 
  [SUBSYSTEM::NDR_DRSBLOBS]
- OBJ_FILES = gen_ndr/ndr_drsblobs.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI
  
+ NDR_DRSBLOBS_OBJ_FILES = librpc/gen_ndr/ndr_drsblobs.o
+ 
  [SUBSYSTEM::NDR_SASL_HELPERS]
- OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_SASL_HELPERS_OBJ_FILES = librpc/gen_ndr/ndr_sasl_helpers.o
+ 
  [SUBSYSTEM::NDR_POLICYAGENT]
- OBJ_FILES = gen_ndr/ndr_policyagent.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_POLICYAGENT_OBJ_FILES = librpc/gen_ndr/ndr_policyagent.o
+ 
  [SUBSYSTEM::NDR_UNIXINFO]
- OBJ_FILES = gen_ndr/ndr_unixinfo.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
  
+ NDR_UNIXINFO_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo.o
+ 
  [SUBSYSTEM::NDR_SAMR]
- OBJ_FILES = gen_ndr/ndr_samr.o
- PUBLIC_HEADERS = gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/ndr_samr_c.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
  
+ NDR_SAMR_OBJ_FILES = librpc/gen_ndr/ndr_samr.o
+ 
+ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/samr.h gen_ndr/ndr_samr.h gen_ndr/ndr_samr_c.h)
+ 
  [SUBSYSTEM::NDR_NFS4ACL]
- OBJ_FILES = gen_ndr/ndr_nfs4acl.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_SECURITY
  
+ NDR_NFS4ACL_OBJ_FILES = librpc/gen_ndr/ndr_nfs4acl.o
+ 
  [SUBSYSTEM::NDR_SPOOLSS]
- OBJ_FILES = gen_ndr/ndr_spoolss.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY
  
+ NDR_SPOOLSS_OBJ_FILES = librpc/gen_ndr/ndr_spoolss.o
+ 
  [SUBSYSTEM::NDR_SPOOLSS_BUF]
  PRIVATE_PROTO_HEADER = ndr/ndr_spoolss_buf.h
- OBJ_FILES = ndr/ndr_spoolss_buf.o
+ 
+ NDR_SPOOLSS_BUF_OBJ_FILES = librpc/ndr/ndr_spoolss_buf.o
  
  [SUBSYSTEM::NDR_WKSSVC]
- OBJ_FILES = gen_ndr/ndr_wkssvc.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SRVSVC NDR_MISC NDR_SECURITY
  
+ NDR_WKSSVC_OBJ_FILES = librpc/gen_ndr/ndr_wkssvc.o
+ 
  [SUBSYSTEM::NDR_SRVSVC]
- OBJ_FILES = gen_ndr/ndr_srvsvc.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL NDR_SECURITY
  
+ NDR_SRVSVC_OBJ_FILES = librpc/gen_ndr/ndr_srvsvc.o
+ 
  [SUBSYSTEM::NDR_SVCCTL]
- OBJ_FILES = gen_ndr/ndr_svcctl.o
- PUBLIC_HEADERS = gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
  
+ NDR_SVCCTL_OBJ_FILES = librpc/gen_ndr/ndr_svcctl.o
+ 
+ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/ndr_svcctl.h gen_ndr/svcctl.h)
+ 
  [SUBSYSTEM::NDR_ATSVC]
- OBJ_FILES = gen_ndr/ndr_atsvc.o
- PUBLIC_HEADERS = gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_ATSVC_OBJ_FILES = librpc/gen_ndr/ndr_atsvc.o
+ 
+ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/atsvc.h gen_ndr/ndr_atsvc.h)
+ 
  [SUBSYSTEM::NDR_EVENTLOG]
- OBJ_FILES = gen_ndr/ndr_eventlog.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA
  
+ NDR_EVENTLOG_OBJ_FILES = librpc/gen_ndr/ndr_eventlog.o
+ 
  [SUBSYSTEM::NDR_EPMAPPER]
- OBJ_FILES = gen_ndr/ndr_epmapper.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
  
+ NDR_EPMAPPER_OBJ_FILES = librpc/gen_ndr/ndr_epmapper.o
+ 
  [SUBSYSTEM::NDR_DBGIDL]
- OBJ_FILES = gen_ndr/ndr_dbgidl.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_DBGIDL_OBJ_FILES = librpc/gen_ndr/ndr_dbgidl.o
+ 
  [SUBSYSTEM::NDR_DSSETUP]
- OBJ_FILES = gen_ndr/ndr_dssetup.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
  
+ NDR_DSSETUP_OBJ_FILES = librpc/gen_ndr/ndr_dssetup.o
+ 
  [SUBSYSTEM::NDR_MSGSVC]
- OBJ_FILES = gen_ndr/ndr_msgsvc.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_MSGSVC_OBJ_FILES = librpc/gen_ndr/ndr_msgsvc.o
+ 
  [SUBSYSTEM::NDR_WINS]
- OBJ_FILES = gen_ndr/ndr_wins.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_WINS_OBJ_FILES = librpc/gen_ndr/ndr_wins.o
+ 
  [SUBSYSTEM::NDR_WINREG]
- OBJ_FILES = gen_ndr/ndr_winreg.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN NDR_SECURITY NDR_MISC
  
+ NDR_WINREG_OBJ_FILES = librpc/gen_ndr/ndr_winreg.o
+ 
  [SUBSYSTEM::NDR_INITSHUTDOWN]
- OBJ_FILES = gen_ndr/ndr_initshutdown.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_INITSHUTDOWN_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown.o
+ 
  [SUBSYSTEM::NDR_MGMT]
- OBJ_FILES = gen_ndr/ndr_mgmt.o
  PUBLIC_DEPENDENCIES = LIBNDR 
  
+ NDR_MGMT_OBJ_FILES = librpc/gen_ndr/ndr_mgmt.o
+ 
  [SUBSYSTEM::NDR_PROTECTED_STORAGE]
- OBJ_FILES = gen_ndr/ndr_protected_storage.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_PROTECTED_STORAGE_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage.o
+ 
  [SUBSYSTEM::NDR_ORPC]
- OBJ_FILES = gen_ndr/ndr_orpc.o ndr/ndr_orpc.o 
  PUBLIC_DEPENDENCIES = LIBNDR 
  
+ NDR_ORPC_OBJ_FILES = librpc/gen_ndr/ndr_orpc.o librpc/ndr/ndr_orpc.o 
+ 
  [SUBSYSTEM::NDR_OXIDRESOLVER]
- OBJ_FILES = gen_ndr/ndr_oxidresolver.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
  
+ NDR_OXIDRESOLVER_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver.o
+ 
  [SUBSYSTEM::NDR_REMACT]
- OBJ_FILES = gen_ndr/ndr_remact.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
  
+ NDR_REMACT_OBJ_FILES = librpc/gen_ndr/ndr_remact.o
+ 
  [SUBSYSTEM::NDR_WZCSVC]
- OBJ_FILES = gen_ndr/ndr_wzcsvc.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_WZCSVC_OBJ_FILES = librpc/gen_ndr/ndr_wzcsvc.o
+ 
  [SUBSYSTEM::NDR_BROWSER]
- OBJ_FILES = gen_ndr/ndr_browser.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_BROWSER_OBJ_FILES = librpc/gen_ndr/ndr_browser.o
+ 
  [SUBSYSTEM::NDR_W32TIME]
- OBJ_FILES = gen_ndr/ndr_w32time.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_W32TIME_OBJ_FILES = librpc/gen_ndr/ndr_w32time.o
+ 
  [SUBSYSTEM::NDR_SCERPC]
- OBJ_FILES = gen_ndr/ndr_scerpc.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_SCERPC_OBJ_FILES = librpc/gen_ndr/ndr_scerpc.o
+ 
  [SUBSYSTEM::NDR_NTSVCS]
- OBJ_FILES = gen_ndr/ndr_ntsvcs.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_NTSVCS_OBJ_FILES = librpc/gen_ndr/ndr_ntsvcs.o
+ 
  [SUBSYSTEM::NDR_NETLOGON]
- OBJ_FILES = gen_ndr/ndr_netlogon.o
- PUBLIC_HEADERS = gen_ndr/netlogon.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SAMR NDR_LSA NDR_SECURITY
  
+ NDR_NETLOGON_OBJ_FILES = librpc/gen_ndr/ndr_netlogon.o
+ 
+ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/netlogon.h)
+ 
  [SUBSYSTEM::NDR_TRKWKS]
- OBJ_FILES = gen_ndr/ndr_trkwks.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_TRKWKS_OBJ_FILES = librpc/gen_ndr/ndr_trkwks.o
+ 
  [SUBSYSTEM::NDR_KEYSVC]
- OBJ_FILES = gen_ndr/ndr_keysvc.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_KEYSVC_OBJ_FILES = librpc/gen_ndr/ndr_keysvc.o
+ 
  [SUBSYSTEM::NDR_KRB5PAC]
- OBJ_FILES = gen_ndr/ndr_krb5pac.o ndr/ndr_krb5pac.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON NDR_SECURITY
  
+ NDR_KRB5PAC_OBJ_FILES = librpc/gen_ndr/ndr_krb5pac.o librpc/ndr/ndr_krb5pac.o
+ 
  [SUBSYSTEM::NDR_XATTR]
- OBJ_FILES = gen_ndr/ndr_xattr.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
  
+ NDR_XATTR_OBJ_FILES = librpc/gen_ndr/ndr_xattr.o
+ 
  [SUBSYSTEM::NDR_OPENDB]
- OBJ_FILES = gen_ndr/ndr_opendb.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_OPENDB_OBJ_FILES = librpc/gen_ndr/ndr_opendb.o
+ 
  [SUBSYSTEM::NDR_NOTIFY]
- OBJ_FILES = gen_ndr/ndr_notify.o
  PUBLIC_DEPENDENCIES = LIBNDR
  
+ NDR_NOTIFY_OBJ_FILES = librpc/gen_ndr/ndr_notify.o
+ 
  [SUBSYSTEM::NDR_SCHANNEL]
- OBJ_FILES = gen_ndr/ndr_schannel.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
  
+ NDR_SCHANNEL_OBJ_FILES = librpc/gen_ndr/ndr_schannel.o
+ 
  [SUBSYSTEM::NDR_NBT]
- OBJ_FILES = gen_ndr/ndr_nbt.o
- PUBLIC_HEADERS = gen_ndr/nbt.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY
  
+ NDR_NBT_OBJ_FILES = librpc/gen_ndr/ndr_nbt.o
+ 
+ PUBLIC_HEADERS += librpc/gen_ndr/nbt.h
+ 
  [SUBSYSTEM::NDR_WINSREPL]
- OBJ_FILES = gen_ndr/ndr_winsrepl.o
  PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
  
+ NDR_WINSREPL_OBJ_FILES = librpc/gen_ndr/ndr_winsrepl.o
+ 
  [SUBSYSTEM::NDR_WINBIND]
- OBJ_FILES = gen_ndr/ndr_winbind.o
- PUBLIC_HEADERS = gen_ndr/winbind.h
  PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
  
- include ../heimdal_build/perl_path_wrapper.sh ../librpc/idl-deps.pl librpc/idl/*.idl|
+ NDR_WINBIND_OBJ_FILES = librpc/gen_ndr/ndr_winbind.o
+ PUBLIC_HEADERS += librpc/gen_ndr/winbind.h
+ 
+ librpc/idl-deps:
+       ./librpc/idl-deps.pl librpc/idl/*.idl >$@
+ 
+ clean:: 
+       rm -f librpc/idl-deps
+ 
+ include librpc/idl-deps
  
  librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES)
-       @echo Generating librpc/gen_ndr/tables.c
-       @$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
-       mv librpc/gen_ndr/tables.x librpc/gen_ndr/tables.c
+       @echo Generating $@
+       @$(PERL) $(srcdir)/librpc/tables.pl --output=$@ $^ > librpc/gen_ndr/tables.x
+       @mv librpc/gen_ndr/tables.x $@
  
  [SUBSYSTEM::NDR_TABLE]
- OBJ_FILES = ndr/ndr_table.o gen_ndr/tables.o
  PRIVATE_PROTO_HEADER = ndr/ndr_table.h
  PUBLIC_DEPENDENCIES = \
 -      NDR_AUDIOSRV NDR_ECHO NDR_DCERPC \
 +      NDR_AUDIOSRV NDR_ECHO NDR_PROXY NDR_DCERPC \
        NDR_DSBACKUP NDR_EFS NDR_MISC NDR_LSA NDR_DFS NDR_DRSUAPI \
        NDR_POLICYAGENT NDR_UNIXINFO NDR_SAMR NDR_SPOOLSS NDR_WKSSVC NDR_SRVSVC NDR_ATSVC \
        NDR_EVENTLOG NDR_EPMAPPER NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINS \
@@@ -303,163 -369,206 +373,210 @@@
        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_PROXY]
 +OBJ_FILES = gen_ndr/ndr_proxy_c.o
 +PUBLIC_DEPENDENCIES = dcerpc NDR_PROXY
 +
  [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
- PC_FILE = dcerpc_samr.pc
  PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR 
- 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_HEADERS = gen_ndr/ndr_svcctl_c.h
  PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
  
- [SUBSYSTEM::dcerpc_atsvc]
- OBJ_FILES = gen_ndr/ndr_atsvc_c.o
- PUBLIC_HEADERS = gen_ndr/ndr_atsvc_c.h
+ RPC_NDR_SVCCTL_OBJ_FILES = librpc/gen_ndr/ndr_svcctl_c.o
+ 
+ PUBLIC_HEADERS += librpc/gen_ndr/ndr_svcctl_c.h
+ 
+ [LIBRARY::dcerpc_atsvc]
  PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
  
+ dcerpc_atsvc_VERSION = 0.0.1
+ dcerpc_atsvc_SOVERSION = 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]
- OBJ_FILES = gen_ndr/ndr_mgmt_c.o
+ RPC_NDR_INITSHUTDOWN_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown_c.o
+ 
+ [SUBSYSTEM::RPC_NDR_MGMT]
  PRIVATE_DEPENDENCIES = NDR_MGMT
  
+ 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
- PUBLIC_HEADERS = gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h
+ 
+ NDR_DCERPC_OBJ_FILES = librpc/gen_ndr/ndr_dcerpc.o
+ 
+ PUBLIC_HEADERS += $(addprefix librpc/, gen_ndr/dcerpc.h gen_ndr/ndr_dcerpc.h)
  
  ################################################
  # Start SUBSYSTEM dcerpc
@@@ -497,16 -604,10 +612,16 @@@ INIT_FUNCTION = ejs_init_rpcech
  SUBSYSTEM = smbcalls
  PRIVATE_DEPENDENCIES = dcerpc NDR_ECHO EJSRPC
  
+ RPC_EJS_ECHO_OBJ_FILES = librpc/gen_ndr/ndr_echo_ejs.o
+ 
 +[MODULE::RPC_EJS_PROXY]
 +INIT_FUNCTION = ejs_init_rpcproxy
 +OBJ_FILES = gen_ndr/ndr_proxy_ejs.o
 +SUBSYSTEM = smbcalls
 +PRIVATE_DEPENDENCIES = dcerpc NDR_PROXY EJSRPC
 +
  [MODULE::RPC_EJS_MISC]
  INIT_FUNCTION = ejs_init_misc
- OBJ_FILES = gen_ndr/ndr_misc_ejs.o
  SUBSYSTEM = smbcalls
  PRIVATE_DEPENDENCIES = dcerpc NDR_MISC EJSRPC
  

diff --cc source/ntvfs/config.mk
index 1d2be62b75f3db400daca82b6d90656db2334280,93cbf64d8f0b4dbed570cf5461a0717888bf8e8c..e070b2185950a05516661f502b1dcea4ffa7de80
--- 1/source/ntvfs/config.mk
--- 2/source/ntvfs/config.mk
+++ b/source/ntvfs/config.mk
@@@ -16,18 -14,8 +14,20 @@@ PRIVATE_DEPENDENCIES = 
  # End MODULE ntvfs_cifs
  ################################################
  
+ ntvfs_cifs_OBJ_FILES = ntvfs/cifs/vfs_cifs.o
+ 
 +################################################
 +# Start MODULE ntvfs_proxy
 +[MODULE::ntvfs_proxy]
 +INIT_FUNCTION = ntvfs_proxy_init 
 +SUBSYSTEM = ntvfs
 +OBJ_FILES = \
 +              proxy/vfs_proxy.o
 +PRIVATE_DEPENDENCIES = \
 +              LIBCLI_SMB LIBCLI_RAW RPC_NDR_PROXY
 +# End MODULE ntvfs_proxy
 +################################################
 +
  ################################################
  # Start MODULE ntvfs_simple
  [MODULE::ntvfs_simple]

diff --cc source/ntvfs/ntvfs.h
Simple merge

diff --cc source/ntvfs/ntvfs_generic.c
Simple merge

diff --cc source/param/loadparm.c
index 12b205b28c410d808837e613645eca2558389a5a,812162e1707381637aef79be14e8a7157a971c4b..a9f1ca376e6335b4f8d6f03b65545f3935525185
--- 1/source/param/loadparm.c
--- 2/source/param/loadparm.c
+++ b/source/param/loadparm.c
@@@ -515,8 -487,7 +489,9 @@@ static struct parm_struct parm_table[] 
        {"winbind sealed pipes", P_BOOL, P_GLOBAL, GLOBAL_VAR(bWinbindSealedPipes), NULL, NULL },
        {"template shell", P_STRING, P_GLOBAL, GLOBAL_VAR(szTemplateShell), NULL, NULL },
        {"template homedir", P_STRING, P_GLOBAL, GLOBAL_VAR(szTemplateHomedir), NULL, NULL },
 +      {"extended share names", P_BOOL, P_GLOBAL, GLOBAL_VAR(bExtendedShareNames), NULL, NULL },
 +      {"proxy cache root", P_STRING, P_GLOBAL, GLOBAL_VAR(szProxyCacheRoot), NULL, NULL },
+       {"idmap trusted only", P_BOOL, P_GLOBAL, GLOBAL_VAR(bIdmapTrustedOnly), NULL, NULL},
  
        {NULL, P_BOOL, P_NONE, 0, NULL, NULL}
  };
@@@ -2412,12 -2405,11 +2412,14 @@@ struct loadparm_context *loadparm_init(
        lp_do_global_parameter(lp_ctx, "tls certfile", "tls/cert.pem");
        lp_do_global_parameter(lp_ctx, "tls cafile", "tls/ca.pem");
        lp_do_global_parameter_var(lp_ctx, "js include", "%s", dyn_JSDIR);
-       lp_do_global_parameter_var(lp_ctx, "setup directory", "%s", 
+       lp_do_global_parameter_var(lp_ctx, "setup directory", "%s",
                                   dyn_SETUPDIR);
  
 +      lp_do_global_parameter(lp_ctx, "extended share names", "No");
 +      lp_do_global_parameter(lp_ctx, "proxy cache root", "/tmp/smb-cache/");
 +      
+       lp_do_global_parameter(lp_ctx, "prefork children:smb", "4");
+ 
        for (i = 0; parm_table[i].label; i++) {
                if (!(lp_ctx->flags[i] & FLAG_CMDLINE)) {
                        lp_ctx->flags[i] |= FLAG_DEFAULT;

diff --cc source/rpc_server/config.mk
index 30e0e81d207251a3c2548082b8330e5abf575094,807853fa165b6998bdb00988c5c72affc009ce31..6d9cb71419d4d364914eb7f9a38b4824a5656f5d
--- 1/source/rpc_server/config.mk
--- 2/source/rpc_server/config.mk
+++ b/source/rpc_server/config.mk
@@@ -23,19 -21,8 +21,21 @@@ PRIVATE_DEPENDENCIES = NDR_ECH
  # End MODULE dcerpc_rpcecho
  ################################################
  
+ dcerpc_rpcecho_OBJ_FILES = rpc_server/echo/rpc_echo.o
+ 
 +################################################
 +# Start MODULE dcerpc_rpcproxy
 +#[MODULE::dcerpc_rpcproxy]
 +#rpc_proxy is currently called by ndr over ntioctl
 +#and not dcerpc
 +#INIT_FUNCTION = dcerpc_server_rpcproxy_init
 +#SUBSYSTEM = dcerpc_server
 +#OBJ_FILES = \
 +#             proxy/rpc_proxy.o
 +#PRIVATE_DEPENDENCIES = NDR_PROXY 
 +# End MODULE dcerpc_rpcproxy
 +################################################
 +
  ################################################
  # Start MODULE dcerpc_epmapper
  [MODULE::dcerpc_epmapper]

diff --cc source/script/mkrelease.sh
index 6259724c4cef9e0d98a256d7e6f5b1bb8be2ff9e,0af738deb52e3a647c4ad634f99e339ef42c8511..97254551f489120573a2f072ef0198270e03fad6
mode 100644,100755..100644
--- 1/source/script/mkrelease.sh
--- 2/source/script/mkrelease.sh
+++ b/source/script/mkrelease.sh
@@@ -1,114 -1,30 +1,139 @@@
 -#!/bin/sh
 +#! /bin/sh
- 
 +# export a samba source tar file suitable for deb or rpm building
 +# invoke the script anywhere inside a samba source directory, it
 +# cd .. until it finds the top-level
 +
 +die() {
 +      echo -- "$@" >&2
 +      exit 1
 +}
 +
 +report() {
 +      echo -- "$@" >&2
 +}
  
+ if [ ! -d ".git" -o `dirname $0` != "./source/script" ]; then
+       echo "Run this script from the top-level directory in the"
+       echo "repository as: ./source/script/mkrelease.sh"
+       exit 1
+ fi
+ 
+ TMPDIR=`mktemp -d samba-XXXXX`
+ (git archive --format=tar HEAD | (cd $TMPDIR/ && tar xf -))
+ 
+ ( cd $TMPDIR/source || exit 1
+  ./autogen.sh || exit 1
+  ./configure || exit 1
+  make dist  || exit 1
+ ) || exit 1
+ 
+ VERSION=`sed -n 's/^SAMBA_VERSION_STRING=//p' $TMPDIR/source/version.h`
+ mv $TMPDIR samba-$VERSION || exit 1
+ tar -cf samba-$VERSION.tar samba-$VERSION || (rm -rf samba-$VERSION; exit 1)
+ rm -rf samba-$VERSION || exit 1
+ echo "Now run: "
+ echo "gpg --detach-sign --armor samba-$VERSION.tar"
+ echo "gzip samba-$VERSION.tar" 
+ echo "And then upload "
+ echo "samba-$VERSION.tar.gz samba-$VERSION.tar.asc" 
+ echo "to pub/samba/samba4/ on samba.org"
+ 
 +make_spec() {
 +      if ! test -r source/samba4.spec.in
 +      then echo "Can't find source/samba4.spec.in" >&2
 +           return
 +      fi
 +      report "Updating source/samba4.spec"
 +      # Maybe automake should be doing this, but its a lot for just the version
 +      # sed the spec file and replace Version and Release with either side
 +      # of the first - in $SAMBA_VERSION
 +      SPEC_VERSION="`echo "$SAMBA_VERSION" | sed -e "s/-.*//"`"
 +      SPEC_RELEASE="`echo "$SAMBA_VERSION" | sed -e "s/^[^-]*-//;s/-/_/g"`"
 +      sed < source/samba4.spec.in > source/samba4.spec \
 +              -e "s/^Version: .*/Version: $SPEC_VERSION/" \
 +              -e "s/^Release: .*/Release: $SPEC_RELEASE/" \
 +              -e "s/^Source: .*/Source: $TAR_NAME/" \
 +              -e "/^%define rpm_git_info .*/{i%define rpm_git_info \"$RPM_GIT_INFO\"
 +d}" \
 +              -e "s/^%define dirname .*/%define dirname %{name}-$SAMBA_VERSION/"
 +}
 +
 +svn_archive() {
 +      mkdir -p "export.$$/$1"
 +      svn export "$2" "export.$$/$1"
 +      ( cd "export.$$" && tar -czf - "$1" ) > "$3"
 +      rm -fr "export.$$"
 +}
 +
 +source_archive() {
 +      mkdir -p "export.$$/$1"
 +      # we want to specify the top-level folder name so we use a ghastly
 +      # cpio hard-link trick to avoid copying the whole tree before tar-ing it
 +      find . -depth -wholename "./export.*" -prune -o -print |\
 +              cpio -p -d -l "export.$$/$1" >/dev/null
 +
 +      (
 +      cd "export.$$/$1/source" || die "Can't find cloned source in export.$$"
 +      test -r Makefile && make clean >&2
 +      )
 +      ( cd "export.$$" && tar -czf - "$1" ) > "$2"
 +
 +      rm -fr "export.$$"
 +}
 +
 +make_tar() {
 +      report "Writing $TAR_NAME"
 +      case "$SOURCE_TYPE" in
 +              git) git-archive --prefix="$SAMBA_NAME/" HEAD | gzip -9 > "../$TAR_NAME" ;;
 +              svn) svn_archive "$SAMBA_NAME" samba4 "../$TAR_NAME" ;;
 +              source) source_archive "$SAMBA_NAME" "../$TAR_NAME" ;;
 +              *) die "Can't export from unknown source type $SOURCE_TYPE";;
 +      esac
 +}
  
 +# get to the top level samba folder
 +BASED="$PWD"
 +while ! test -d source -a -d packaging  -a -r README
 +do
 +      cd .. || die "Can't find Samba top level source directory from $BASED"
 +      echo "Looking for Samba top level source directory in $PWD" >&2
 +done
  
 +if [ "$SOURCE_TYPE" = "" ]
 +then
 +      SOURCE_TYPE="source"
 +      test -d .svn && SOURCE_TYPE="svn"
 +      test -d .git && SOURCE_TYPE="git"
 +fi
 +if [ "$SOURCE_TYPE" = "source" ]
 +then
 +      RELEASE_SUFFIX="_`date +%Y%m%d`"
 +else
 +      RELEASE_SUFFIX=""
 +fi
 +
 +SAMBA_CORE_VERSION="`cd source && script/mkversion.sh VERSION - ./ | \
 +                              sed -e '/^SAMBA_VERSION_STRING=/!d;s/^[^=]*=//;q'`"
 +SAMBA_VERSION="`echo "$SAMBA_CORE_VERSION" | sed -e "s/-/$RELEASE_SUFFIX-/"`"
 +SAMBA_NAME="samba-$SAMBA_VERSION"
 +TAR_NAME="$SAMBA_NAME.tar.gz"
 +
 +# do the same for debs if needed
 +if test -d .git
 +then RPM_GIT_INFO="${RPM_GIT_INFO:-`git show --pretty=format:"%h %ct %H %cd" --stat HEAD 2>/dev/null | head -1`}"
 +else RPM_GIT_INFO=""
 +fi
 +
 +# make-dist had better not destroy the spec file
 +if make_spec && make_tar
 +then FINAL_TAR="`(cd .. && echo "$PWD/$TAR_NAME")`"
 +      echo "$FINAL_TAR"
 +      cat >&2 <<MESSAGE
 +Now run: 
 +gpg --detach-sign --armor $FINAL_TAR
 +And then upload
 +$FINAL_TAR $FINAL_TAR.asc
 +to pub/samba/samba4/ on samba.org
 +MESSAGE
 +else die "Error writing $TAR_NAME"
 +fi

diff --cc source/smb_server/smb/negprot.c
Simple merge

diff --cc source/smb_server/smb/service.c
Simple merge