summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-07-28 14:41:56 +1000
committerAndrew Tridgell <tridge@samba.org>2011-07-28 15:20:51 +1000
commit356a2cc0b05e557c63ae180c7432351a950078d4 (patch)
tree4e6225856ff9a22725a6645442568f3a4ec405af
parentd82256ca119eb8315cc69ba725ba71c386caa901 (diff)
downloadsamba-356a2cc0b05e557c63ae180c7432351a950078d4.tar.gz
samba-356a2cc0b05e557c63ae180c7432351a950078d4.tar.bz2
samba-356a2cc0b05e557c63ae180c7432351a950078d4.zip
s3-waf: the passdb subsystem needs to be called pdb
the 'pdb' name is builtin to the passdb module loading code as a fixed string. We need to call the subsystem pdb so that external passdb modules end up in bin/modules/pdb/ where they can be found by the Samba3 module loader Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
-rw-r--r--source3/pam_smbpass/wscript_build2
-rw-r--r--source3/passdb/wscript_build12
-rw-r--r--source3/winbindd/wscript_build2
-rwxr-xr-xsource3/wscript_build44
4 files changed, 30 insertions, 30 deletions
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index e0a710c7e0..c8010e49cd 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -6,7 +6,7 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
pam_smb_passwd.c
pam_smb_acct.c
support.c''',
- deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param passdb SMBLDAP
+ deps='''tdb talloc pam PAM_ERRORS wbclient cap asn1util param pdb SMBLDAP
LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 94510351f8..6e5dabe071 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -7,7 +7,7 @@ PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
bld.SAMBA3_MODULE('pdb_tdbsam',
- subsystem='passdb',
+ subsystem='pdb',
source=PDB_TDBSAM_SRC,
deps='samba-util tdb',
init_function='',
@@ -15,14 +15,14 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
bld.SAMBA3_MODULE('pdb_ldap',
- subsystem='passdb',
+ subsystem='pdb',
source=PDB_LDAP_SRC,
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP)
bld.SAMBA3_MODULE('pdb_ads',
- subsystem='passdb',
+ subsystem='pdb',
source=PDB_ADS_SRC,
deps='cli-ldap-common TLDAP',
init_function='',
@@ -30,7 +30,7 @@ bld.SAMBA3_MODULE('pdb_ads',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads'))
bld.SAMBA3_MODULE('pdb_smbpasswd',
- subsystem='passdb',
+ subsystem='pdb',
source=PDB_SMBPASSWD_SRC,
deps='samba-util',
init_function='',
@@ -38,7 +38,7 @@ bld.SAMBA3_MODULE('pdb_smbpasswd',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd'))
bld.SAMBA3_MODULE('pdb_wbc_sam',
- subsystem='passdb',
+ subsystem='pdb',
source=PDB_WBC_SAM_SRC,
deps='samba-util',
init_function='',
@@ -46,7 +46,7 @@ bld.SAMBA3_MODULE('pdb_wbc_sam',
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam'))
bld.SAMBA3_MODULE('pdb_samba4',
- subsystem='passdb',
+ subsystem='pdb',
source='pdb_samba4.c',
init_function='',
deps='IDMAP samdb',
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 3bd14ee534..3a2e2971b3 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -62,7 +62,7 @@ bld.SAMBA3_MODULE('idmap_rid',
bld.SAMBA3_MODULE('idmap_passdb',
subsystem='idmap',
source=IDMAP_PASSDB_SRC,
- deps='samba-util passdb',
+ deps='samba-util pdb',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
diff --git a/source3/wscript_build b/source3/wscript_build
index 50b21e9efa..3fcd605f19 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -660,7 +660,7 @@ if not bld.env.toplevel_build:
bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb_compat cap wbclient smbd_shim libsmb KRBCLIENT
- passdb SMBLDAP param samba-util
+ pdb SMBLDAP param samba-util
LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
RPC_CLIENT_SCHANNEL smbconf REG_SMBCONF TOKEN_UTIL
LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON
@@ -672,7 +672,7 @@ bld.SAMBA3_LIBRARY('netapi',
bld.SAMBA3_LIBRARY('libsmb/smbclient',
source=LIBSMBCLIENT_SRC,
- public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT passdb SMBLDAP
+ public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT pdb SMBLDAP
LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''',
public_headers='include/libsmbclient.h',
vnum='0',
@@ -725,7 +725,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
source=TLDAP_SRC,
deps='asn1util LIBTSOCKET')
-bld.SAMBA3_LIBRARY('passdb',
+bld.SAMBA3_LIBRARY('pdb',
source=PASSDB_SRC,
deps='SECRETS3 SMBLDAP GROUPDB wbclient LIBCLI_AUTH flag_mapping',
private_library=True,
@@ -810,7 +810,7 @@ bld.SAMBA3_LIBRARY('smbd_shim',
bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
source='',
- deps='errors3 passdb ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
+ deps='errors3 pdb ldap lber MSRPC_PARSE LIBCLI_AUTH rpccommon',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
@@ -836,7 +836,7 @@ bld.SAMBA3_SUBSYSTEM('CLDAP',
bld.SAMBA3_SUBSYSTEM('SECRETS3',
source=SECRETS_SRC,
- deps='NDR_SECRETS param samba3core passdb',
+ deps='NDR_SECRETS param samba3core pdb',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SMBLDAP',
@@ -886,7 +886,7 @@ bld.SAMBA3_LIBRARY('smbd_conn',
bld.SAMBA3_LIBRARY('smbd_base',
source=SMBD_SRC_BASE,
deps='''tdb_compat tevent dl krb5 ldap gssapi gssapi_krb5
- samba-util wbclient crypt nsl cups cap z passdb
+ samba-util wbclient crypt nsl cups cap z pdb
param samba3core libsmb popt_samba3 KRBCLIENT AVAHI
LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER LIBADS_PRINTER
vfs vfs_default vfs_posixacl auth rpc LOCKING LIBAFS LIBAFS_SETTOKEN PROFILE
@@ -1110,7 +1110,7 @@ bld.SAMBA3_BINARY('smbd/smbd',
bld.SAMBA3_BINARY('nmbd/nmbd',
source=NMBD_SRC,
deps='''talloc tdb_compat tevent z cap wbclient dl
- passdb param ldap smbd_shim libsmb
+ pdb param ldap smbd_shim libsmb
popt_samba3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''',
install_path='${SBINDIR}',
vars=locals())
@@ -1118,7 +1118,7 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb_compat tevent cap dl z
- wbclient passdb ldap param smbd_shim libsmb
+ wbclient pdb ldap param smbd_shim libsmb
popt_samba3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER
SRV_NDR_WBINT RPC_NDR_WBINT NDR_WBINT LIBAFS
LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
@@ -1135,7 +1135,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
bld.SAMBA3_BINARY('web/swat',
source=SWAT_SRC,
deps='''talloc tevent cap samba3core libsmb wbclient param
- smbd_shim passdb popt_samba3 KRBCLIENT cups
+ smbd_shim pdb popt_samba3 KRBCLIENT cups
LIBMSRPC_GEN msrpc3 LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
enabled=bld.env.build_swat,
@@ -1144,7 +1144,7 @@ bld.SAMBA3_BINARY('web/swat',
bld.SAMBA3_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
- deps='''talloc tdb_compat cap popt_samba3 passdb libsmb smbd_shim
+ deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3
ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL
@@ -1157,7 +1157,7 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
source=CLIENT_SRC,
- deps='''talloc tdb_compat cap popt_samba3 passdb libsmb smbd_shim
+ deps='''talloc tdb_compat cap popt_samba3 pdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN
msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA
cli_smb_common''',
@@ -1165,7 +1165,7 @@ bld.SAMBA3_BINARY('client/smbclient' + bld.env.suffix3,
bld.SAMBA3_BINARY('net',
source=NET_SRC,
- deps='''talloc tdb_compat netapi addns cap intl popt_samba3 passdb libsmb smbd_shim
+ deps='''talloc tdb_compat netapi addns cap intl popt_samba3 pdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3 LIBGPO ads LIBADS_SERVER LIBADS_PRINTER
LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
@@ -1192,7 +1192,7 @@ bld.SAMBA3_BINARY('smbspool',
bld.SAMBA3_BINARY('testparm',
source=TESTPARM_SRC,
deps='''talloc tevent ldap cap
- wbclient asn1util LIBTSOCKET passdb param smbd_shim
+ wbclient asn1util LIBTSOCKET pdb param smbd_shim
LIBSMB_ERR popt_samba3''',
vars=locals())
@@ -1216,21 +1216,21 @@ bld.SAMBA3_BINARY('smbcontrol',
bld.SAMBA3_BINARY('smbtree',
source=SMBTREE_SRC,
deps='''talloc tdb_compat tevent cap wbclient param smbd_shim
- libsmb LIBSMB_ERR popt_samba3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE
+ libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE
RPC_NDR_SRVSVC''',
vars=locals())
bld.SAMBA3_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
deps='''talloc tdb_compat tevent cap wbclient param smbd_shim
- libsmb LIBSMB_ERR popt_samba3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL
+ libsmb LIBSMB_ERR popt_samba3 KRBCLIENT pdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
vars=locals())
bld.SAMBA3_BINARY('pdbedit',
source=PDBEDIT_SRC,
deps='''talloc tdb_compat tevent cap wbclient param smbd_shim
- LIBNTLMSSP LIBSMB_ERR popt_samba3 passdb SMBLDAP
+ LIBNTLMSSP LIBSMB_ERR popt_samba3 pdb SMBLDAP
PASSWD_UTIL cli-ldap-common''',
vars=locals())
@@ -1274,21 +1274,21 @@ bld.SAMBA3_BINARY('msgtest',
bld.SAMBA3_BINARY('smbcacls',
source=SMBCACLS_SRC,
deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT
- smbd_shim passdb popt_samba3 SMBLDAP LIBMSRPC_GEN
+ smbd_shim pdb popt_samba3 SMBLDAP LIBMSRPC_GEN
msrpc3 libcli_lsa3''',
vars=locals())
bld.SAMBA3_BINARY('smbcquotas',
source=SMBCQUOTAS_SRC,
deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT
- popt_samba3 passdb SMBLDAP LIBMSRPC_GEN msrpc3
+ popt_samba3 pdb SMBLDAP LIBMSRPC_GEN msrpc3
libcli_lsa3''',
vars=locals())
bld.SAMBA3_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
deps='''talloc tevent cap popt_samba3 samba3core param
- smbd_shim LIBSMB_ERR passdb wbclient LIBEVENTLOG''',
+ smbd_shim LIBSMB_ERR pdb wbclient LIBEVENTLOG''',
vars=locals())
bld.SAMBA3_BINARY('sharesec',
@@ -1304,7 +1304,7 @@ bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
bld.SAMBA3_BINARY('pdbtest',
source=PDBTEST_SRC,
- deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim passdb
+ deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim pdb
SMBLDAP popt_samba3 NDR_SAMR NDR_LSA''',
vars=locals())
@@ -1348,7 +1348,7 @@ bld.SAMBA3_BINARY('versiontest',
bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
- asn1util LIBTSOCKET passdb ldap param smbd_shim
+ asn1util LIBTSOCKET pdb ldap param smbd_shim
LIBNTLMSSP popt_samba3 LIBAFS_SETTOKEN''',
vars=locals())
@@ -1356,7 +1356,7 @@ bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim
samba3core LIBNTLMSSP popt_samba3 asn1util LIBTSOCKET
- passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
+ pdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())