Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 600212 | Differences between
and this patch

Collapse All | Expand All

(-)a/lib/dns/dyndb.c (-2 / +6 lines)
Lines 80-86 impfind(const char *name) { Link Here
80
	return (NULL);
80
	return (NULL);
81
}
81
}
82
82
83
#if HAVE_DLFCN_H
83
#if HAVE_DLFCN_H && HAVE_DLOPEN
84
static isc_result_t
84
static isc_result_t
85
load_symbol(void *handle, const char *filename,
85
load_symbol(void *handle, const char *filename,
86
	    const char *symbol_name, void **symbolp)
86
	    const char *symbol_name, void **symbolp)
87
-- a/bin/named/server.c
87
++ b/bin/named/server.c
Lines 1496-1501 configure_peer(const cfg_obj_t *cpeer, isc_mem_t *mctx, dns_peer_t **peerp) { Link Here
1496
	return (result);
1496
	return (result);
1497
}
1497
}
1498
1498
1499
#ifdef HAVE_DLOPEN
1499
static isc_result_t
1500
static isc_result_t
1500
configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
1501
configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx,
1501
		const dns_dyndbctx_t *dctx)
1502
		const dns_dyndbctx_t *dctx)
Lines 1521-1526 configure_dyndb(const cfg_obj_t *dyndb, isc_mem_t *mctx, Link Here
1521
			      name, isc_result_totext(result));
1522
			      name, isc_result_totext(result));
1522
	return (result);
1523
	return (result);
1523
}
1524
}
1525
#endif
1524
1526
1525
1527
1526
static isc_result_t
1528
static isc_result_t
Lines 4669-4674 configure_view(dns_view_t *view, dns_viewlist_t *viewlist, Link Here
4669
	else
4671
	else
4670
		(void)cfg_map_get(config, "dyndb", &dyndb_list);
4672
		(void)cfg_map_get(config, "dyndb", &dyndb_list);
4671
4673
4674
#ifdef HAVE_DLOPEN
4672
	for (element = cfg_list_first(dyndb_list);
4675
	for (element = cfg_list_first(dyndb_list);
4673
	     element != NULL;
4676
	     element != NULL;
4674
	     element = cfg_list_next(element))
4677
	     element = cfg_list_next(element))
Lines 4686-4691 configure_view(dns_view_t *view, dns_viewlist_t *viewlist, Link Here
4686
4689
4687
		CHECK(configure_dyndb(dyndb, mctx, dctx));
4690
		CHECK(configure_dyndb(dyndb, mctx, dctx));
4688
	}
4691
	}
4692
#endif
4689
4693
4690
	/*
4694
	/*
4691
	 * Setup automatic empty zones.  If recursion is off then
4695
	 * Setup automatic empty zones.  If recursion is off then
(-)a/lib/bind9/check.c (-1 / +17 lines)
Lines 2988-2993 check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, Link Here
2988
{
2988
{
2989
	const cfg_obj_t *zones = NULL;
2989
	const cfg_obj_t *zones = NULL;
2990
	const cfg_obj_t *keys = NULL;
2990
	const cfg_obj_t *keys = NULL;
2991
#ifndef HAVE_DLOPEN
2992
	const cfg_obj_t *dyndb = NULL;
2993
#endif
2991
	const cfg_listelt_t *element, *element2;
2994
	const cfg_listelt_t *element, *element2;
2992
	isc_symtab_t *symtab = NULL;
2995
	isc_symtab_t *symtab = NULL;
2993
	isc_result_t result = ISC_R_SUCCESS;
2996
	isc_result_t result = ISC_R_SUCCESS;
Lines 3041-3046 check_viewconf(const cfg_obj_t *config, const cfg_obj_t *voptions, Link Here
3041
			result = ISC_R_FAILURE;
3044
			result = ISC_R_FAILURE;
3042
	}
3045
	}
3043
3046
3047
#ifndef HAVE_DLOPEN
3048
	if (voptions != NULL)
3049
		(void)cfg_map_get(voptions, "dyndb", &dyndb);
3050
	else
3051
		(void)cfg_map_get(config, "dyndb", &dyndb);
3052
3053
	if (dyndb != NULL) {
3054
		cfg_obj_log(dyndb, logctx, ISC_LOG_ERROR,
3055
			    "dynamic loading of databases is not supported");
3056
		if (tresult != ISC_R_SUCCESS)
3057
			result = ISC_R_NOTIMPLEMENTED;
3058
	}
3059
#endif
3060
3044
	/*
3061
	/*
3045
	 * Check that the response-policy and catalog-zones options
3062
	 * Check that the response-policy and catalog-zones options
3046
	 * refer to zones that exist.
3063
	 * refer to zones that exist.
3047
- 

Return to bug 600212