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 b1846521e71de4cd205ccbf4ecbbc0900ff14554..b78500894e3becddd389b129fac86ed7b664911a 100644 (file)
--- 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 6c93782a80264c2de8c38ed91ba0844a3fa5c1da..210b33de6beaa6a8559b8631c8ce1b361dc05182 100644 (file)
--- 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
 }