[asterisk-commits] file: branch group/dns r433171 - in /team/group/dns: configs/samples/ res/

[SVN commits to the Asterisk project]

Author: file
Date: Thu Mar 19 13:34:33 2015
New Revision: 433171

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433171
Log:
Incorporate review feedback.

Modified:
    team/group/dns/configs/samples/resolver_unbound.conf.sample
    team/group/dns/res/res_resolver_unbound.c

Modified: team/group/dns/configs/samples/resolver_unbound.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/group/dns/configs/samples/resolver_unbound.conf.sample?view=diff&rev=433171&r1=433170&r2=433171
==============================================================================
--- team/group/dns/configs/samples/resolver_unbound.conf.sample (original)
+++ team/group/dns/configs/samples/resolver_unbound.conf.sample Thu Mar 19 13:34:33 2015
@@ -6,10 +6,10 @@
 [general]
 ;hosts = /etc/hosts        ; Full path to a hosts file which contains a mapping of
 ;                          ; hostnames to addresses. If "system" is specified then
-;                          ; the system specific hosts file will be used.
+;                          ; the system specific hosts file will be used. (default: system)
 ;resolv = /etc/resolv.conf ; Full path to a resolv.conf which contains the nameservers
 ;                          ; to use for resolution. If "system" is specified then the
-;                          ; system specific resolv.conf file will be used.
+;                          ; system specific resolv.conf file will be used. (default: system)
 ;nameserver = 127.0.0.1    ; An explicit nameserver to use for queries. If this option
 ;                          ; is specified multiple times the first configured one will
 ;                          ; be treated as the primary with each subsequent one being
@@ -19,6 +19,6 @@
 ;debug = 99                ; The debug level to run the unbound resolver at. While
 ;                          ; there is no explicit range the higher the number the more
 ;                          ; debug is output.
-;ta_file = keys            ; Full path to a trusted anchors key file. These keys are
-;                          ; used to verify DNSSEC signed results.
+;ta_file = /etc/asterisk/dnssec_keys ; Full path to a trusted anchors key file. These keys are
+;                                    ; used to verify DNSSEC signed results.
 

Modified: team/group/dns/res/res_resolver_unbound.c
URL: http://svnview.digium.com/svn/asterisk/team/group/dns/res/res_resolver_unbound.c?view=diff&rev=433171&r1=433170&r2=433171
==============================================================================
--- team/group/dns/res/res_resolver_unbound.c (original)
+++ team/group/dns/res/res_resolver_unbound.c Thu Mar 19 13:34:33 2015
@@ -470,6 +470,7 @@
 	aco_set_defaults(&global_option, "general", cfg->global);
 
 	if (unbound_config_preapply(cfg)) {
+		ao2_ref(cfg, -1);
 		return -1;
 	}
 
@@ -1227,8 +1228,8 @@
 		return AST_MODULE_LOAD_DECLINE;
 	}
 
-	aco_option_register(&cfg_info, "hosts", ACO_EXACT, global_options, "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct unbound_global_config, hosts));
-	aco_option_register(&cfg_info, "resolv", ACO_EXACT, global_options, "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct unbound_global_config, resolv));
+	aco_option_register(&cfg_info, "hosts", ACO_EXACT, global_options, "system", OPT_STRINGFIELD_T, 0, STRFLDSET(struct unbound_global_config, hosts));
+	aco_option_register(&cfg_info, "resolv", ACO_EXACT, global_options, "system", OPT_STRINGFIELD_T, 0, STRFLDSET(struct unbound_global_config, resolv));
 	aco_option_register_custom(&cfg_info, "nameserver", ACO_EXACT, global_options, "", custom_nameserver_handler, 0);
 	aco_option_register(&cfg_info, "debug", ACO_EXACT, global_options, "0", OPT_UINT_T, 0, FLDSET(struct unbound_global_config, debug));
 	aco_option_register(&cfg_info, "ta_file", ACO_EXACT, global_options, "", OPT_STRINGFIELD_T, 0, STRFLDSET(struct unbound_global_config, ta_file));