[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  d32b66b dns_server: Only build common library if AD DC is enabled.
       via  c0f3921 dfs_server: Only build in case we build an AD DC too.
      from  3ac4355 s4-rpc: dnsserver: Fix enumeration of IPv4 and IPv6 addresses

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


- Log -----------------------------------------------------------------
commit d32b66b40c931fe8214faa2e1d40b34b86667d4c
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Nov 19 10:31:45 2014 +0100

    dns_server: Only build common library if AD DC is enabled.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Wed Nov 26 12:11:18 CET 2014 on sn-devel-104

commit c0f3921234963a66b9018d94c794d8579ee41f99
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Nov 19 10:30:23 2014 +0100

    dfs_server: Only build in case we build an AD DC too.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>

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

Summary of changes:
 dfs_server/wscript_build         | 4 ++--
 source4/dns_server/wscript_build | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/dfs_server/wscript_build b/dfs_server/wscript_build
index 294eccf..743b990 100644
--- a/dfs_server/wscript_build
+++ b/dfs_server/wscript_build
@@ -3,5 +3,5 @@
 bld.SAMBA_LIBRARY('dfs_server_ad',
                   source='dfs_server_ad.c',
                   deps='talloc samdb samba-util LIBTSOCKET',
-                  private_library=True
-                  )
+                  private_library=True,
+                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
diff --git a/source4/dns_server/wscript_build b/source4/dns_server/wscript_build
index 803ca62..a4f0f0c 100644
--- a/source4/dns_server/wscript_build
+++ b/source4/dns_server/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('dnsserver_common',
         source='dnsserver_common.c',
         deps='samba-util errors ldbsamba clidns',
         private_library=True,
-        )
+        enabled=bld.AD_DC_BUILD_IS_ENABLED())
 
 bld.SAMBA_MODULE('service_dns',
         source='dns_server.c dns_query.c dns_update.c dns_utils.c dns_crypto.c',


-- 
Samba Shared Repository