docs: fix a typo in history file

[bbaumbach/samba-autobuild/.git] / source3 / passdb / wscript_build

diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 2a39b10eeac5a8031c2fd8824c9b1b085ac2936a..7facc1fed79ab2beb913c4f4199315f3414beb9c 100644 (file)
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -1,53 +1,42 @@
 #!/usr/bin/env python
 
-PDB_TDBSAM_SRC =    'pdb_tdb.c'
-PDB_LDAP_SRC =      'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c'
-PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
-PDB_WBC_SAM_SRC =   'pdb_wbc_sam.c'
-
 bld.SAMBA3_MODULE('pdb_tdbsam',
                  subsystem='pdb',
-                 source=PDB_TDBSAM_SRC,
-                 deps='samba-util tdb_compat dbwrap tdb-wrap3',
+                 source='pdb_tdb.c',
+                 deps='samba-util dbwrap tdb-wrap3',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
 
-bld.SAMBA3_MODULE('pdb_ldap',
+bld.SAMBA3_MODULE('pdb_ldapsam',
                  subsystem='pdb',
-                 deps='smbldap',
-                 source=PDB_LDAP_SRC,
+                 deps='smbldap smbldaphelper LIBCLI_AUTH',
+                 source='pdb_ldap.c pdb_nds.c',
                  init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP)
+                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldapsam'),
+                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldapsam') and bld.CONFIG_SET('HAVE_LDAP'))
 
 bld.SAMBA3_MODULE('pdb_smbpasswd',
                  subsystem='pdb',
-                 source=PDB_SMBPASSWD_SRC,
+                 source='pdb_smbpasswd.c',
                  deps='samba-util',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd'))
 
-bld.SAMBA3_MODULE('pdb_wbc_sam',
-                 subsystem='pdb',
-                 source=PDB_WBC_SAM_SRC,
-                 deps='samba-util wbclient',
-                 init_function='',
-                 internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_wbc_sam'),
-                 enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam'))
-
-bld.SAMBA3_MODULE('pdb_samba4',
+bld.SAMBA3_MODULE('pdb_samba_dsdb',
                   subsystem='pdb',
-                  source='pdb_samba4.c',
+                  source='pdb_samba_dsdb.c',
                   init_function='',
                   deps='IDMAP samdb',
-                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_samba4') and bld.AD_DC_BUILD_IS_ENABLED(),
-                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_samba4') and bld.AD_DC_BUILD_IS_ENABLED())
+                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED(),
+                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_samba_dsdb') and bld.AD_DC_BUILD_IS_ENABLED())
 
+pyrpc_util = bld.pyembed_libname('pyrpc_util')
+pytalloc_util = bld.pyembed_libname('pytalloc-util')
 bld.SAMBA3_PYTHON('pypassdb',
                   source='py_passdb.c',
                   deps='pdb',
-                  public_deps='samba-util tdb_compat talloc pyrpc_util',
+                  public_deps=' '.join(['samba-util', 'tdb', 'talloc', pyrpc_util, pytalloc_util]),
                   realname='samba/samba3/passdb.so'
                   )