Merge branch 'master' of ssh://git.samba.org/data/git/samba into extended-dn

Conflicts:

	source4/torture/config.mk

diff --cc source4/torture/config.mk
index c1f26bd12ab703d2fc61235c019589c6dbf8212f,eaff5d5fdab3c710acdd828dbcd16538cc6fe23f..71fa391003d7c5c611f194164c5b940bd03783d7
--- 1/source4/torture/config.mk
--- 2/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@@ -107,8 -107,8 +107,8 @@@ PRIVATE_DEPENDENCIES = 
                RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_FRSAPI RPC_NDR_SPOOLSS \
                RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_ROT RPC_NDR_DSSETUP \
                RPC_NDR_REMACT RPC_NDR_OXIDRESOLVER RPC_NDR_NTSVCS WB_HELPER LIBSAMBA-NET \
 -              LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_UTIL TORTURE_RAP \
 +              LIBCLI_AUTH POPT_CREDENTIALS TORTURE_LDAP TORTURE_LDB TORTURE_UTIL TORTURE_RAP \
-               dcerpc_server service process_model ntvfs SERVICE_SMB
+               dcerpc_server service process_model ntvfs SERVICE_SMB RPC_NDR_BROWSER
  
  torture_rpc_OBJ_FILES = $(addprefix $(torturesrcdir)/rpc/, \
                join.o lsa.o lsa_lookup.o session_key.o echo.o dfs.o drsuapi.o \