sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

build: Remove _SAMBA_WAF_BUILD_

Browse Source 
The _SAMBA_BUILD_ macro can pick the difference between autoconf and waf builds now

Andrew Bartlett
This commit is contained in:
Andrew Bartlett
2011-09-08 08:46:42 +10:00
parent 1da89da251
commit 4980cd772a
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/passdb/machine_account_secrets.c
View File

@ -57,7 +57,7 @@ bool secrets_store_domain_sid(const char *domain, const struct dom_sid *sid)
{
bool ret;
#ifdef _SAMBA_WAF_BUILD_
#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
/* If we have a ADS-capable passdb backend, we
@ -81,7 +81,7 @@ bool secrets_fetch_domain_sid(const char *domain, struct dom_sid *sid)
struct dom_sid *dyn_sid;
size_t size = 0;
#ifdef _SAMBA_WAF_BUILD_
#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
struct pdb_domain_info *domain_info;
@ -118,7 +118,7 @@ bool secrets_store_domain_guid(const char *domain, struct GUID *guid)
{
fstring key;
#ifdef _SAMBA_WAF_BUILD_
#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
/* If we have a ADS-capable passdb backend, we
@ -141,7 +141,7 @@ bool secrets_fetch_domain_guid(const char *domain, struct GUID *guid)
size_t size = 0;
struct GUID new_guid;
#ifdef _SAMBA_WAF_BUILD_
#if _SAMBA_BUILD_ == 4
if (strequal(domain, get_global_sam_name()) &&
(pdb_capabilities() & PDB_CAP_ADS)) {
struct pdb_domain_info *domain_info;

1
wscript
View File

@ -43,7 +43,6 @@ def configure(conf):
version = samba_version.load_version(env=conf.env)
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
conf.DEFINE('_SAMBA_WAF_BUILD_', version.MAJOR)
conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)