rlm_sql should return noop if we can't find a matching query section

FreeRADIUS · Mar 5, 2015 · fc294bc · fc294bc
1 parent 0fc782a
commit fc294bc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/main/conffile.c b/src/main/conffile.c
@@ -778,7 +778,6 @@ CONF_ITEM *cf_reference_item(CONF_SECTION const *parentcs,
 	}
 
 no_such_item:
-	WARN("No such configuration item %s", ptr);
 	return NULL;
 }
 

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
@@ -1308,16 +1308,20 @@ static int acct_redundant(rlm_sql_t *inst, REQUEST *request, sql_acct_section_t
 		goto finish;
 	}
 
+	/*
+	 *	If we can't find a matching config item we do
+	 *	nothing so return RLM_MODULE_NOOP.
+	 */
 	item = cf_reference_item(NULL, section->cs, path);
 	if (!item) {
-		rcode = RLM_MODULE_FAIL;
+		RWDEBUG("No such item %s", path);
+		rcode = RLM_MODULE_NOOP;
 
 		goto finish;
 	}
-
 	if (cf_item_is_section(item)){
-		REDEBUG("Sections are not supported as references");
-		rcode = RLM_MODULE_FAIL;
+		RWDEBUG("Sections are not supported as references");
+		rcode = RLM_MODULE_NOOP;
 
 		goto finish;
 	}