sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

build: Consolidate --with-dnsupdate with --with-ads (which implied HAVE_KRB5)

Browse Source 
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Mar 26 04:06:41 UTC 2021 on sn-devel-184
This commit is contained in:
Andrew Bartlett 2021-03-25 10:48:28 +13:00 committed by Jeremy Allison
parent ef8623c1d6
commit 5bc1463a5c
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/addns/dnsutils.c
View File

@ -136,7 +136,7 @@ DNS_ERROR dns_domain_name_from_string( TALLOC_CTX *mem_ctx,
char *dns_generate_keyname( TALLOC_CTX *mem_ctx )
{
char *result = NULL;
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
struct GUID guid;

8
source3/utils/net_ads.c
View File

@ -1506,7 +1506,7 @@ static WERROR check_ads_config( void )
Send a DNS update request
*******************************************************************/
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
#include "../lib/addns/dns.h"
static NTSTATUS net_update_dns_internal(struct net_context *c,
@ -1741,7 +1741,7 @@ static int net_ads_join_usage(struct net_context *c, int argc, const char **argv
static void _net_ads_join_dns_updates(struct net_context *c, TALLOC_CTX *ctx, struct libnet_JoinCtx *r)
{
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
ADS_STRUCT *ads_dns = NULL;
int ret;
NTSTATUS status;
@ -2030,7 +2030,7 @@ fail:
static int net_ads_dns_register(struct net_context *c, int argc, const char **argv)
{
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
ADS_STRUCT *ads;
ADS_STATUS status;
NTSTATUS ntstatus;
@ -2129,7 +2129,7 @@ static int net_ads_dns_unregister(struct net_context *c,
int argc,
const char **argv)
{
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
ADS_STRUCT *ads;
ADS_STATUS status;
NTSTATUS ntstatus;

4
source3/utils/net_dns.c
View File

@ -24,7 +24,7 @@
#include "../lib/addns/dns.h"
#include "utils/net_dns.h"
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
/*********************************************************************
*********************************************************************/
@ -207,4 +207,4 @@ int get_my_ip_address( struct sockaddr_storage **pp_ss )
return count;
}
#endif /* defined(WITH_DNS_UPDATES) */
#endif /* defined(HAVE_KRB5) */

4
source3/utils/net_dns.h
View File

@ -28,7 +28,7 @@
#define DNS_UPDATE_PROBE 0x10
#define DNS_UPDATE_PROBE_SUFFICIENT 0x20
#if defined(WITH_DNS_UPDATES)
#if defined(HAVE_KRB5)
#include "../lib/addns/dns.h"
@ -38,4 +38,4 @@ DNS_ERROR DoDNSUpdate(char *pszServerName,
size_t num_addrs,
uint32_t flags, bool remove_host);
#endif /* defined(WITH_DNS_UPDATES) */
#endif /* defined(HAVE_KRB5) */

6
source3/wscript
View File

@ -73,7 +73,6 @@ def options(opt):
opt.samba_add_onoff_option('avahi', with_name="enable", without_name="disable")
opt.samba_add_onoff_option('iconv')
opt.samba_add_onoff_option('acl-support')
opt.samba_add_onoff_option('dnsupdate')
opt.samba_add_onoff_option('syslog')
opt.samba_add_onoff_option('automount')
opt.samba_add_onoff_option('dmapi', default=None) # None means autodetection
@ -1067,11 +1066,6 @@ syscall(SYS_setgroups32, 0, NULL);
execute=True,
mandatory=True,
msg="Checking whether setuidx is available")
if Options.options.with_dnsupdate:
if not conf.CONFIG_SET('HAVE_KRB5'):
Logs.warn("--with-dnsupdate=yes but gssapi support not sufficient")
else:
conf.DEFINE('WITH_DNS_UPDATES', 1)
# valgrind.h or valgrind/valgrind.h is checked in lib/replace/wscript
if Options.options.developer:
if conf.CONFIG_SET('HAVE_VALGRIND_H') or conf.CONFIG_SET('HAVE_VALGRIND_VALGRIND_H'):