--- source3/wscript_build.orig	2017-07-25 13:09:58 UTC
+++ source3/wscript_build
@@ -124,7 +124,6 @@ ldapsam_pdb_match = ['!priv2ld', '!smbldap_search_doma
                      '!get_attr_list']
 private_pdb_match.append('!pdb_nds_*')
 private_pdb_match.append('!pdb_ldapsam_init*')
-private_pdb_match.append('!pdb_*_init')
 private_pdb_match = private_pdb_match + ldapsam_pdb_match
 
 bld.SAMBA3_LIBRARY('samba-passdb',
@@ -221,11 +221,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
                         talloc
                         replace
                         util_reg
-                        samba-util
-                        samba-security
                         errors3
                         dbwrap
-                        samba3-util
+                        samba3util
                         ''')
 
 # Do not link against this use 'smbconf'
@@ -488,7 +486,7 @@ bld.SAMBA3_LIBRARY('secrets3',
 
 bld.SAMBA3_LIBRARY('smbldap',
                     source='lib/smbldap.c',
-                    deps='ldap lber samba-util smbconf',
+                    deps='ldap lber samba3util smbd_shim samba-debug smbconf',
                     enabled=bld.CONFIG_SET("HAVE_LDAP"),
                     private_library=False,
                     abi_directory='lib/ABI',
@@ -713,6 +711,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                         smbd_conn
                         param_service
                         AVAHI
+                        dns_sd
                         PRINTBASE
                         PROFILE
                         LOCKING
@@ -1089,6 +1088,7 @@ bld.SAMBA3_BINARY('client/smbclient',
                       msrpc3
                       RPC_NDR_SRVSVC
                       cli_smb_common
+                      dns_sd
                       archive
                       ''')
 
@@ -1254,8 +1254,7 @@ bld.SAMBA3_BINARY('vfstest',
                       popt_samba3
                       smbconf
                       SMBREADLINE
-                      ''',
-                 install=False)
+                      ''')
 
 bld.SAMBA3_BINARY('versiontest',
                  source='lib/version_test.c',