Fix changes pulled from v2.1.x for new API

diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 44bf3d5..24e1d24 100644 (file)
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -430,11 +430,11 @@ static int exec_accounting(void *instance, REQUEST *request)
         */
        if (!inst->bare) return exec_dispatch(instance, request);
 
-       vp = pairfind(request->reply->vps, PW_EXEC_PROGRAM);
+       vp = pairfind(request->reply->vps, PW_EXEC_PROGRAM, 0);
        if (vp) {
                exec_wait = 0;
 
-       } else if ((vp = pairfind(request->reply->vps, PW_EXEC_PROGRAM_WAIT)) != NULL) {
+       } else if ((vp = pairfind(request->reply->vps, PW_EXEC_PROGRAM_WAIT, 0)) != NULL) {
                exec_wait = 1;
        }
        if (!vp) return RLM_MODULE_NOOP;

diff --git a/src/modules/rlm_pap/rlm_pap.c b/src/modules/rlm_pap/rlm_pap.c
index 9fa68ea..2088df2 100644 (file)
--- a/src/modules/rlm_pap/rlm_pap.c
+++ b/src/modules/rlm_pap/rlm_pap.c
@@ -327,8 +327,8 @@ static int pap_authorize(void *instance, REQUEST *request)
                                 *      Password already exists: use
                                 *      that instead of this one.
                                 */
-                               if (pairfind(request->config_items, PW_USER_PASSWORD) ||
-                                   pairfind(request->config_items, PW_CLEARTEXT_PASSWORD)) {
+                               if (pairfind(request->config_items, PW_USER_PASSWORD, 0) ||
+                                   pairfind(request->config_items, PW_CLEARTEXT_PASSWORD, 0)) {
                                        RDEBUG("Config already contains \"known good\" password.  Ignoring Password-With-Header");
                                        break;
                                }