[Asterisk-cvs] asterisk dnsmgr.c,1.2,1.3

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv2943

Modified Files:
	dnsmgr.c 
Log Message:
correct portability problem (don't look inside regex_t)
correct enable/disable option name to match sample config file


Index: dnsmgr.c
===================================================================
RCS file: /usr/cvsroot/asterisk/dnsmgr.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dnsmgr.c	7 Apr 2005 07:41:06 -0000	1.2
+++ dnsmgr.c	12 Apr 2005 14:11:59 -0000	1.3
@@ -55,6 +55,7 @@
 struct refresh_info {
 	struct entry_list *entries;
 	int verbose;
+	unsigned int regex_present:1;
 	regex_t filter;
 };
 
@@ -157,7 +158,7 @@
 		ast_verbose(VERBOSE_PREFIX_2 "Refreshing DNS lookups.\n");
 	AST_LIST_LOCK(info->entries);
 	AST_LIST_TRAVERSE(info->entries, entry, list) {
-		if (info->filter.used && regexec(&info->filter, entry->name, 0, NULL, 0))
+		if (info->regex_present && regexec(&info->filter, entry->name, 0, NULL, 0))
 		    continue;
 
 		if (info->verbose && (option_verbose > 2))
@@ -200,11 +201,13 @@
 	if (argc == 3) {
 		if (regcomp(&info.filter, argv[2], REG_EXTENDED | REG_NOSUB))
 			return RESULT_SHOWUSAGE;
+		else
+			info.regex_present = 1;
 	}
 
 	refresh_list(&info);
 
-	if (info.filter.used)
+	if (info.regex_present)
 		regfree(&info.filter);
 
 	return 0;
@@ -297,7 +300,7 @@
 		ast_sched_del(sched, refresh_sched);
 
 	if ((config = ast_config_load("dnsmgr.conf"))) {
-		if ((enabled_value = ast_variable_retrieve(config, "general", "enabled"))) {
+		if ((enabled_value = ast_variable_retrieve(config, "general", "enable"))) {
 			enabled = ast_true(enabled_value);
 		}
 		if ((interval_value = ast_variable_retrieve(config, "general", "refreshinterval"))) {