From: Nick Porter Date: Thu, 18 Jul 2024 09:52:41 +0000 (+0100) Subject: Make SQL map return code consistent with LDAP map X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=396fc23775ef375ca1a9d3d41ef511e7c6f0c635;p=thirdparty%2Ffreeradius-server.git Make SQL map return code consistent with LDAP map No results == notfound --- diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c index b1846521e71..b78500894e3 100644 --- a/src/modules/rlm_sql/rlm_sql.c +++ b/src/modules/rlm_sql/rlm_sql.c @@ -696,7 +696,7 @@ static unlang_action_t mod_map_resume(rlm_rcode_t *p_result, UNUSED int *priorit ret = inst->driver->sql_num_rows(query_ctx, &inst->config); if (ret == 0) { RDEBUG2("Server returned an empty result"); - rcode = RLM_MODULE_NOOP; + rcode = RLM_MODULE_NOTFOUND; goto finish; } @@ -780,7 +780,7 @@ static unlang_action_t mod_map_resume(rlm_rcode_t *p_result, UNUSED int *priorit if (rows == 0) { RDEBUG2("SQL query returned no results"); - rcode = RLM_MODULE_NOOP; + rcode = RLM_MODULE_NOTFOUND; } finish: diff --git a/src/tests/modules/sql/map.unlang b/src/tests/modules/sql/map.unlang index 6c93782a802..210b33de6be 100644 --- a/src/tests/modules/sql/map.unlang +++ b/src/tests/modules/sql/map.unlang @@ -12,7 +12,7 @@ map sql 'SELECT * FROM radusergroup WHERE priority <= 1' { &control.Filter-Id := 'groupname' &control.NAS-Port := 'priority' } -if (!noop) { +if (!notfound) { test_fail }