[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  a252ded wafsamba: add -Wcast-qual only to the toplevel (s4) build.
       via  33b8d0a s3-waf: use HAVE_ADS env to decide whether to build libads.so
       via  c53e7f8 s3-build: use HAVE_ADS define in some more places.
      from  89b6af0 SMB2 renames return SHARING_VIOLATION if there is any existing oplock on a file.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a252ded937db2e8e4c81b608fbbf18714a900032
Author: Günther Deschner <gd at samba.org>
Date:   Sat Mar 19 00:10:08 2011 +0100

    wafsamba: add -Wcast-qual only to the toplevel (s4) build.
    
    In samba3 there are a lot of warnings generated that make it a bit hard to track
    and monitor other build warnings.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Sat Mar 19 00:58:25 CET 2011 on sn-devel-104

commit 33b8d0a6ff51800bfadf47286584b0895b6b3e65
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 18 15:19:25 2011 +0100

    s3-waf: use HAVE_ADS env to decide whether to build libads.so
    
    Guenther

commit c53e7f8d58c9a38aad3890df7f54da8996a95ce4
Author: Günther Deschner <gd at samba.org>
Date:   Fri Mar 18 15:18:29 2011 +0100

    s3-build: use HAVE_ADS define in some more places.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_autoconf.py |    4 +++-
 source3/lib/netapi/joindomain.c       |    2 +-
 source3/winbindd/winbindd_cm.c        |    2 +-
 source3/wscript                       |    2 ++
 source3/wscript_build                 |    5 +++--
 5 files changed, 10 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 02b52df..174ca14 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -597,8 +597,10 @@ def SAMBA_CONFIG_H(conf, path=None):
 
     if Options.options.developer:
         # we add these here to ensure that -Wstrict-prototypes is not set during configure
-        conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes',
+        conf.ADD_CFLAGS('-Wall -g -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-align -Wwrite-strings -Werror-implicit-function-declaration -Wformat=2 -Wno-format-y2k -Wmissing-prototypes',
                         testflags=True)
+        if os.getenv('TOPLEVEL_BUILD'):
+            conf.ADD_CFLAGS('-Wcast-qual', testflags=True)
         conf.env.DEVELOPER_MODE = True
 
     if Options.options.picky_developer:
diff --git a/source3/lib/netapi/joindomain.c b/source3/lib/netapi/joindomain.c
index d6fa5d6..6bae363 100644
--- a/source3/lib/netapi/joindomain.c
+++ b/source3/lib/netapi/joindomain.c
@@ -362,7 +362,7 @@ WERROR NetGetJoinInformation_l(struct libnetapi_ctx *ctx,
 WERROR NetGetJoinableOUs_l(struct libnetapi_ctx *ctx,
 			   struct NetGetJoinableOUs *r)
 {
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
 	NTSTATUS status;
 	ADS_STATUS ads_status;
 	ADS_STRUCT *ads = NULL;
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 55e9266..cfd60aa 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -1117,7 +1117,7 @@ static bool dcip_to_name(TALLOC_CTX *mem_ctx,
 	ip_list.ss = *pss;
 	ip_list.port = 0;
 
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
 	/* For active directory servers, try to get the ldap server name.
 	   None of these failures should be considered critical for now */
 
diff --git a/source3/wscript b/source3/wscript
index c9ee928..9fcf173 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -910,6 +910,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab);
             conf.DEFINE('HAVE_KRB5', '1')
             if have_gssapi:
                 conf.DEFINE('HAVE_GSSAPI', '1')
+            if conf.CONFIG_SET('HAVE_LDAP'):
+                conf.env['HAVE_ADS'] = '1'
         else:
             Logs.warn("krb5 libs don't have all features required for Active Directory support")
             conf.undefine('HAVE_KRB5_H')
diff --git a/source3/wscript_build b/source3/wscript_build
index dbfb465..e02593d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -819,9 +819,10 @@ bld.SAMBA3_SUBSYSTEM('SMBLDAP',
 
 bld.SAMBA3_LIBRARY('ads',
                    source=LIBADS_SRC,
-                   deps='LIBCLI_LDAP_NDR krb5',
+                   deps='LIBCLI_LDAP_NDR krb5 gssapi gssapi_krb5 ldap lber',
                    private_library=True,
-                   vars=locals())
+                   vars=locals(),
+                   enabled=bld.env.HAVE_ADS)
 
 bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,


-- 
Samba Shared Repository