[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Wed Jun 29 16:43:02 MDT 2011
The branch, master has been updated
via 44a434a s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs
via 5586095 s3-waf: lowercase libcli_lsa3 library name.
via e9bc093 s3-waf: lowercase libsmb library name.
via 8996d77 s3-waf: lowercase util_cmdline library name.
via f124c63 s3-waf: lowercase popt_samba3 library name.
from 5882c75 Second part of fix for bug #8219 - SMB Panic from Windows 7 Client.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 44a434a3019de2f9e807ba819b9cb6b47b4815df
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 28 23:59:11 2011 +0200
s3-winbind: Fix bug 7888 -- deal with buggy 3.0 based PDCs
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Thu Jun 30 00:42:23 CEST 2011 on sn-devel-104
commit 55860955126af0a67f5c41f95cd849c92136eb06
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 28 18:15:23 2011 +0200
s3-waf: lowercase libcli_lsa3 library name.
Guenther
commit e9bc0933ef4f9c7dcaad42b799464e4b82c6bb3f
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 28 18:03:03 2011 +0200
s3-waf: lowercase libsmb library name.
Guenther
commit 8996d7737ed6adfefcb23d19e8d4d27c0221e2b9
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 28 18:00:45 2011 +0200
s3-waf: lowercase util_cmdline library name.
Guenther
commit f124c638e82f33413f6ae18533d628fcba699fef
Author: Günther Deschner <gd at samba.org>
Date: Tue Jun 28 17:58:25 2011 +0200
s3-waf: lowercase popt_samba3 library name.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_pam.c | 26 ++++++--
source3/wscript_build | 130 +++++++++++++++++++-------------------
2 files changed, 84 insertions(+), 72 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 910e429..21b237a 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1250,18 +1250,30 @@ static NTSTATUS winbind_samlogon_retry_loop(struct winbindd_domain *domain,
info3);
}
- if (NT_STATUS_EQUAL(result, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)
- && domain->can_do_samlogon_ex) {
- DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
- "retrying with NetSamLogon\n"));
- domain->can_do_samlogon_ex = false;
+ if (NT_STATUS_EQUAL(result, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
+
/*
* It's likely that the server also does not support
* validation level 6
*/
domain->can_do_validation6 = false;
- retry = true;
- continue;
+
+ if (domain->can_do_samlogon_ex) {
+ DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+ "retrying with NetSamLogon\n"));
+ domain->can_do_samlogon_ex = false;
+ retry = true;
+ continue;
+ }
+
+
+ /* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+ * (no Ex). This happens against old Samba
+ * DCs. Drop the connection.
+ */
+ invalidate_cm_connection(&domain->conn);
+ result = NT_STATUS_LOGON_FAILURE;
+ break;
}
if (domain->can_do_validation6 &&
diff --git a/source3/wscript_build b/source3/wscript_build
index 974749a..e27f178 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -653,21 +653,21 @@ if not bld.env.toplevel_build:
bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
- public_deps='''talloc tdb_compat cap wbclient smbd_shim LIBSMB KRBCLIENT
+ public_deps='''talloc tdb_compat cap wbclient smbd_shim libsmb KRBCLIENT
passdb 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
+ LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_INITSHUTDOWN
- INIT_NETLOGON INIT_SAMR POPT_SAMBA3''',
+ INIT_NETLOGON INIT_SAMR popt_samba3''',
public_headers='../source3/lib/netapi/netapi.h',
vnum='0',
vars=locals())
bld.SAMBA3_LIBRARY('libsmb/smbclient',
source=LIBSMBCLIENT_SRC,
- public_deps='''talloc tdb_compat wbclient cap param smbd_shim LIBSMB KRBCLIENT passdb SMBLDAP
- LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC POPT_SAMBA3''',
+ public_deps='''talloc tdb_compat wbclient cap param smbd_shim libsmb KRBCLIENT passdb SMBLDAP
+ LIBMSRPC_GEN msrpc3 libcli_lsa3 RPC_NDR_SRVSVC popt_samba3''',
public_headers='include/libsmbclient.h',
vnum='0',
vars=locals())
@@ -682,7 +682,7 @@ bld.SAMBA3_LIBRARY('smbsharemodes',
bld.SAMBA3_LIBRARY('nss_wins',
source=WINBIND_WINS_NSS_SRC,
- deps='''winbind-client param LIBSMB smbd_shim LIBTSOCKET KRBCLIENT
+ deps='''winbind-client param libsmb smbd_shim LIBTSOCKET KRBCLIENT
cap wbclient''',
realname='libnss_wins.so.2',
vnum='2')
@@ -692,7 +692,7 @@ bld.SAMBA3_LIBRARY('msrpc3',
deps='''ndr ndr-standard
RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
LIBTSOCKET KRB5_WRAP rpccommon
- LIBSMB''',
+ libsmb''',
vars=locals(),
private_library=True)
@@ -772,13 +772,13 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
deps='REG_SMBCONF',
vars=locals())
-bld.SAMBA3_LIBRARY('POPT_SAMBA3',
+bld.SAMBA3_LIBRARY('popt_samba3',
source=POPT_LIB_SRC,
- deps='popt samba-util UTIL_CMDLINE',
+ deps='popt samba-util util_cmdline',
vars=locals(),
private_library=True)
-bld.SAMBA3_LIBRARY('UTIL_CMDLINE',
+bld.SAMBA3_LIBRARY('util_cmdline',
source='lib/util_cmdline.c',
deps='SECRETS3 popt',
private_library=True)
@@ -807,9 +807,9 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
deps='LIBSMB_ERR NDR_NTLMSSP NTLMSSP_COMMON',
vars=locals())
-bld.SAMBA3_LIBRARY('LIBSMB',
+bld.SAMBA3_LIBRARY('libsmb',
source=LIBSMB_SRC,
- deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON UTIL_CMDLINE',
+ deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT LIBCLI_SMB_COMMON util_cmdline',
vars=locals(),
private_library=True)
@@ -836,7 +836,7 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
bld.SAMBA3_LIBRARY('ads',
source=LIBADS_SRC,
- deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNTLMSSP LIBNMB LIBSMB DCUTIL',
+ deps='cli-ldap-common KRB5_WRAP ldap lber KRBCLIENT param LIBNTLMSSP LIBNMB libsmb DCUTIL',
private_library=True,
vars=locals())
@@ -876,12 +876,12 @@ 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
- param samba3core LIBSMB POPT_SAMBA3 KRBCLIENT AVAHI
+ 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
PRINTING PRINTBACKEND NDR_XATTR NDR_NOTIFY REGFIO
smbconf REG_FULL FNAME_UTIL
- LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC npa_tstream INIT_NETLOGON INIT_SAMR
LIBCLI_SMB_COMMON RPC_SERVER smbd_conn param_service
smbd_shim
@@ -981,7 +981,7 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE',
bld.SAMBA3_SUBSYSTEM('DCUTIL',
source=DCUTIL_SRC,
- deps='ads LIBRPCCLI_NETLOGON msrpc3 LIBCLI_LSA3 INIT_NETLOGON',
+ deps='ads LIBRPCCLI_NETLOGON msrpc3 libcli_lsa3 INIT_NETLOGON',
vars=locals())
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
@@ -1052,7 +1052,7 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
source=LIBCLI_SAMR_SRC,
deps='RPC_NDR_SAMR')
-bld.SAMBA3_LIBRARY('LIBCLI_LSA3',
+bld.SAMBA3_LIBRARY('libcli_lsa3',
source=LIBCLI_LSA_SRC,
deps='RPC_NDR_LSA INIT_LSA',
private_library=True)
@@ -1097,20 +1097,20 @@ 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
- POPT_SAMBA3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''',
+ passdb param ldap smbd_shim libsmb
+ popt_samba3 KRBCLIENT NDR_SAMR NDR_LSA PROFILE''',
install_path='${SBINDIR}',
vars=locals())
bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''talloc tdb_compat tevent cap dl z
- wbclient passdb ldap param smbd_shim LIBSMB
- POPT_SAMBA3 KRBCLIENT LIBMSRPC_GEN msrpc3 ads LIBADS_SERVER
+ wbclient passdb 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
TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
+ LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON
RPC_NDR_DSSETUP npa_tstream INIT_NETLOGON
RPC_NCACN_NP RPC_PIPE_REGISTER RPC_SAMR RPC_LSARPC
PAM_ERRORS WB_REQTRANS AUTH_COMMON
@@ -1121,8 +1121,8 @@ 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
+ deps='''talloc tevent cap samba3core libsmb wbclient param
+ smbd_shim passdb popt_samba3 KRBCLIENT cups
LIBMSRPC_GEN msrpc3 LOCKING PLAINTEXT_AUTH PRINTBASE PRINTING FNAME_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
enabled=bld.env.build_swat,
@@ -1131,11 +1131,11 @@ 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 passdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN msrpc3
ads SMBREADLINE DCUTIL RPC_NDR_WINREG RPC_NDR_ECHO
RPC_CLIENT_SCHANNEL
- LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_DSSETUP RPC_NDR_DFS
RPC_NDR_DRSUAPI RPC_NDR_NTSVCS RPC_NDR_EVENTLOG INIT_NETLOGON
INIT_SAMR
@@ -1144,7 +1144,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 passdb libsmb smbd_shim
param wbclient param KRBCLIENT LIBMSRPC_GEN
msrpc3 SMBREADLINE libsmb/smbclient RPC_NDR_SRVSVC INIT_LSA
LIBCLI_SMB_COMMON''',
@@ -1152,13 +1152,13 @@ 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 passdb 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
REGFIO NDR_NTPRINTING RPC_NDR_WINREG
RPC_CLIENT_SCHANNEL TOKEN_UTIL
- LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
+ LIBCLI_SAMR libcli_lsa3 LIBRPCCLI_NETLOGON LIBCLI_SPOOLSS
RPC_NDR_SRVSVC RPC_NDR_WKSSVC RPC_NDR_SVCCTL RPC_NDR_DSSETUP
RPC_NDR_INITSHUTDOWN RPC_NDR_DRSUAPI INIT_NETLOGON INIT_SAMR
''',
@@ -1166,12 +1166,12 @@ bld.SAMBA3_BINARY('net',
bld.SAMBA3_BINARY('profiles',
source=PROFILES_SRC,
- deps='''talloc tdb_compat cap tevent POPT_SAMBA3 param samba3core LIBSMB_ERR smbd_shim REGFIO''',
+ deps='''talloc tdb_compat cap tevent popt_samba3 param samba3core LIBSMB_ERR smbd_shim REGFIO''',
vars=locals())
bld.SAMBA3_BINARY('smbspool',
source=CUPS_SRC,
- deps='''talloc tdb_compat tevent cap wbclient POPT_SAMBA3 param LIBSMB smbd_shim samba3core
+ deps='''talloc tdb_compat tevent cap wbclient popt_samba3 param libsmb smbd_shim samba3core
KRBCLIENT asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
@@ -1179,66 +1179,66 @@ bld.SAMBA3_BINARY('testparm',
source=TESTPARM_SRC,
deps='''talloc tevent ldap cap
wbclient asn1util LIBTSOCKET passdb param smbd_shim
- LIBSMB_ERR POPT_SAMBA3''',
+ LIBSMB_ERR popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('smbta-util',
source=SMBTA_UTIL_SRC,
- deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 smbd_shim
+ deps='''talloc tdb_compat tevent cap param popt_samba3 smbd_shim
LIBSMB_ERR''',
vars=locals())
bld.SAMBA3_BINARY('smbstatus',
source=STATUS_SRC,
- deps='''talloc tdb_compat tevent cap param POPT_SAMBA3 smbd_shim
+ deps='''talloc tdb_compat tevent cap param popt_samba3 smbd_shim
LIBSMB_ERR LOCKING PROFILE FNAME_UTIL''',
vars=locals())
bld.SAMBA3_BINARY('smbcontrol',
source=SMBCONTROL_SRC,
- deps='''talloc tdb_compat tevent cap param smbd_shim LIBSMB_ERR POPT_SAMBA3 PRINTBASE''',
+ deps='''talloc tdb_compat tevent cap param smbd_shim LIBSMB_ERR popt_samba3 PRINTBASE''',
vars=locals())
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 passdb 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 passdb 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 passdb SMBLDAP
PASSWD_UTIL cli-ldap-common''',
vars=locals())
bld.SAMBA3_BINARY('smbget',
source=SMBGET_SRC,
- deps='''talloc tdb_compat libsmb/smbclient POPT_SAMBA3''',
+ deps='''talloc tdb_compat libsmb/smbclient popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('nmblookup' + bld.env.suffix3,
source=NMBLOOKUP_SRC,
- deps='''talloc tdb_compat tevent cap param smbd_shim POPT_SAMBA3 LIBSMB_ERR LIBNMB''',
+ deps='''talloc tdb_compat tevent cap param smbd_shim popt_samba3 LIBSMB_ERR LIBNMB''',
vars=locals())
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source=SMBTORTURE_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param LIBSMB KRBCLIENT TLDAP
- smbd_shim POPT_SAMBA3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
+ deps='''talloc tdb_compat tevent cap wbclient param libsmb KRBCLIENT TLDAP
+ smbd_shim popt_samba3 asn1util LIBTSOCKET NDR_LSA msrpc3 LIBMSRPC_GEN RPC_NDR_ECHO WB_REQTRANS''',
vars=locals())
bld.SAMBA3_BINARY('smbconftort',
source=SMBCONFTORT_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB_ERR POPT_SAMBA3''',
+ deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB_ERR popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('replacetort',
@@ -1248,7 +1248,7 @@ bld.SAMBA3_BINARY('replacetort',
bld.SAMBA3_BINARY('masktest' + bld.env.suffix3,
source=MASKTEST_SRC,
- deps='''talloc tdb_compat cap wbclient param smbd_shim LIBSMB KRBCLIENT
+ deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT
asn1util LIBTSOCKET NDR_SAMR NDR_LSA''',
vars=locals())
@@ -1259,39 +1259,39 @@ 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
- msrpc3 LIBCLI_LSA3''',
+ deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT
+ smbd_shim passdb 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
- LIBCLI_LSA3''',
+ deps='''talloc tdb_compat cap wbclient param smbd_shim libsmb KRBCLIENT
+ popt_samba3 passdb SMBLDAP LIBMSRPC_GEN msrpc3
+ libcli_lsa3''',
vars=locals())
bld.SAMBA3_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
- deps='''talloc tevent cap POPT_SAMBA3 samba3core param
+ deps='''talloc tevent cap popt_samba3 samba3core param
smbd_shim LIBSMB_ERR passdb wbclient LIBEVENTLOG''',
vars=locals())
bld.SAMBA3_BINARY('sharesec',
source=SHARESEC_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB_ERR POPT_SAMBA3''',
+ deps='''talloc tdb_compat tevent cap wbclient param smbd_shim LIBSMB_ERR popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
source=LOCKTEST_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB smbd_shim
+ deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT libsmb smbd_shim
asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
bld.SAMBA3_BINARY('pdbtest',
source=PDBTEST_SRC,
- deps='''talloc tdb_compat cap wbclient param LIBSMB KRBCLIENT smbd_shim passdb
- SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''',
+ deps='''talloc tdb_compat cap wbclient param libsmb KRBCLIENT smbd_shim passdb
+ SMBLDAP popt_samba3 NDR_SAMR NDR_LSA''',
vars=locals())
bld.SAMBA3_BINARY('vfstest',
@@ -1301,7 +1301,7 @@ bld.SAMBA3_BINARY('vfstest',
bld.SAMBA3_BINARY('smbiconv',
source=SMBICONV_SRC,
- deps='''talloc tdb_compat tevent cap param smbd_shim POPT_SAMBA3 LIBSMB_ERR''',
+ deps='''talloc tdb_compat tevent cap param smbd_shim popt_samba3 LIBSMB_ERR''',
vars=locals())
bld.SAMBA3_BINARY('log2pcap',
@@ -1311,7 +1311,7 @@ bld.SAMBA3_BINARY('log2pcap',
bld.SAMBA3_BINARY('locktest2',
source=LOCKTEST2_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT LIBSMB smbd_shim
+ deps='''talloc tdb_compat tevent cap wbclient param KRBCLIENT libsmb smbd_shim
asn1util LIBTSOCKET NDR_SAMR NDR_LSA LOCKING FNAME_UTIL''',
vars=locals())
@@ -1322,7 +1322,7 @@ bld.SAMBA3_BINARY('debug2html',
bld.SAMBA3_BINARY('smbfilter',
source=SMBFILTER_SRC,
- deps='''talloc tevent cap wbclient param LIBSMB smbd_shim KRBCLIENT asn1util LIBTSOCKET
+ deps='''talloc tevent cap wbclient param libsmb smbd_shim KRBCLIENT asn1util LIBTSOCKET
NDR_SAMR NDR_LSA''',
vars=locals())
@@ -1335,13 +1335,13 @@ bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
asn1util LIBTSOCKET passdb ldap param smbd_shim
- LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''',
+ LIBNTLMSSP popt_samba3 LIBAFS_SETTOKEN''',
vars=locals())
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
+ samba3core LIBNTLMSSP popt_samba3 asn1util LIBTSOCKET
passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
NDR_SAMR NDR_LSA NDR_NETLOGON cli-ldap-common LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())
@@ -1352,13 +1352,13 @@ bld.SAMBA3_BINARY('timelimit',
bld.SAMBA3_BINARY('rpc_open_tcp',
source=RPC_OPEN_TCP_SRC,
- deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core LIBSMB smbd_shim
+ deps='''talloc tdb_compat tevent cap wbclient KRBCLIENT param samba3core libsmb smbd_shim
LIBSMB_ERR asn1util LIBTSOCKET LIBMSRPC_GEN msrpc3''',
vars=locals())
bld.SAMBA3_BINARY('test_lp_load',
source=TEST_LP_LOAD_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim POPT_SAMBA3 LIBNTLMSSP''',
+ deps='''talloc tdb_compat tevent cap wbclient param smbd_shim popt_samba3 LIBNTLMSSP''',
vars=locals())
bld.SAMBA3_BINARY('dbwrap_tool',
@@ -1369,12 +1369,12 @@ bld.SAMBA3_BINARY('dbwrap_tool',
bld.SAMBA3_BINARY('dbwrap_torture',
source=DBWRAP_TORTURE_SRC,
deps='''talloc tdb_compat tevent cap param smbd_shim LIBSMB_ERR
- POPT_SAMBA3''',
+ popt_samba3''',
vars=locals())
bld.SAMBA3_BINARY('split_tokens',
source=SPLIT_TOKENS_SRC,
- deps='''talloc tdb_compat tevent cap wbclient param smbd_shim POPT_SAMBA3
+ deps='''talloc tdb_compat tevent cap wbclient param smbd_shim popt_samba3
LIBNTLMSSP''',
vars=locals())
@@ -1392,7 +1392,7 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
# builds. Effectively these are build rule aliases
if not bld.env.toplevel_build:
- bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
+ bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='popt_samba3')
bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')
--
Samba Shared Repository
More information about the samba-cvs
mailing list