Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade

[freeradius.git] / src / main / auth.c

diff --git a/src/main/auth.c b/src/main/auth.c
index a05fd6a..e07d54b 100644 (file)
--- a/src/main/auth.c
+++ b/src/main/auth.c
@@ -310,7 +310,7 @@ int rad_postauth(REQUEST *request)
                case RLM_MODULE_REJECT:
                case RLM_MODULE_USERLOCK:
                default:
-                       request->reply->code = PW_CODE_AUTHENTICATION_REJECT;
+                       request->reply->code = PW_CODE_ACCESS_REJECT;
                        result = RLM_MODULE_REJECT;
                        break;
                /*
@@ -368,7 +368,7 @@ int rad_authenticate(REQUEST *request)
                 *      Reply of ACCEPT means accept, thus set Auth-Type
                 *      accordingly.
                 */
-               case PW_CODE_AUTHENTICATION_ACK:
+               case PW_CODE_ACCESS_ACCEPT:
                        tmp = radius_paircreate(request,
                                                &request->config_items,
                                                PW_AUTH_TYPE, 0);
@@ -390,10 +390,10 @@ int rad_authenticate(REQUEST *request)
                 *      are being rejected, so we minimize the amount of work
                 *      done by the server, by rejecting them here.
                 */
-               case PW_CODE_AUTHENTICATION_REJECT:
+               case PW_CODE_ACCESS_REJECT:
                        rad_authlog("Login incorrect (Home Server says so)",
                                    request, 0);
-                       request->reply->code = PW_CODE_AUTHENTICATION_REJECT;
+                       request->reply->code = PW_CODE_ACCESS_REJECT;
                        return RLM_MODULE_REJECT;
 
                default:
@@ -439,7 +439,7 @@ autz_redo:
                        } else {
                                rad_authlog("Invalid user", request, 0);
                        }
-                       request->reply->code = PW_CODE_AUTHENTICATION_REJECT;
+                       request->reply->code = PW_CODE_ACCESS_REJECT;
                        return result;
        }
        if (!autz_retry) {
@@ -514,7 +514,7 @@ autz_redo:
         */
        if (result < 0) {
                RDEBUG2("Failed to authenticate the user");
-               request->reply->code = PW_CODE_AUTHENTICATION_REJECT;
+               request->reply->code = PW_CODE_ACCESS_REJECT;
 
                if ((module_msg = pairfind(request->packet->vps, PW_MODULE_FAILURE_MESSAGE, 0, TAG_ANY)) != NULL){
                        char msg[MAX_STRING_LEN+19];
@@ -592,7 +592,7 @@ autz_redo:
                                                 main_config.denied_msg);
                                }
 
-                               request->reply->code = PW_CODE_AUTHENTICATION_REJECT;
+                               request->reply->code = PW_CODE_ACCESS_REJECT;
 
                                /*
                                 *      They're trying to log in too many times.
@@ -626,7 +626,7 @@ autz_redo:
         *      been set to something.  (i.e. Access-Challenge)
         */
        if (request->reply->code == 0)
-         request->reply->code = PW_CODE_AUTHENTICATION_ACK;
+         request->reply->code = PW_CODE_ACCESS_ACCEPT;
 
        if ((module_msg = pairfind(request->packet->vps, PW_MODULE_SUCCESS_MESSAGE, 0, TAG_ANY)) != NULL){
                char msg[MAX_STRING_LEN+12];
@@ -650,24 +650,31 @@ int rad_virtual_server(REQUEST *request)
        VALUE_PAIR *vp;
        int result;
 
+       RDEBUG("server %s {", request->server);
+       RDEBUG("  Request:");
+       debug_pair_list(request->packet->vps);
+
        /*
         *      We currently only handle AUTH packets here.
         *      This could be expanded to handle other packets as well if required.
         */
-       rad_assert(request->packet->code == PW_CODE_AUTHENTICATION_REQUEST);
+       rad_assert(request->packet->code == PW_CODE_ACCESS_REQUEST);
 
        result = rad_authenticate(request);
 
-       if (request->reply->code == PW_CODE_AUTHENTICATION_REJECT) {
+       if (request->reply->code == PW_CODE_ACCESS_REJECT) {
                pairdelete(&request->config_items, PW_POST_AUTH_TYPE, 0, TAG_ANY);
                vp = pairmake_config("Post-Auth-Type", "Reject", T_OP_SET);
                if (vp) rad_postauth(request);
        }
 
-       if (request->reply->code == PW_CODE_AUTHENTICATION_ACK) {
+       if (request->reply->code == PW_CODE_ACCESS_ACCEPT) {
                rad_postauth(request);
        }
 
+       RDEBUG("  Reply:");
+       debug_pair_list(request->reply->vps);
+       RDEBUG("} # server %s", request->server);
+
        return result;
 }
-