]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Build fixes for WITHOUT_PROXY
authorAlan T. DeKok <aland@freeradius.org>
Tue, 7 Jan 2014 19:39:56 +0000 (14:39 -0500)
committerAlan T. DeKok <aland@freeradius.org>
Tue, 7 Jan 2014 19:39:56 +0000 (14:39 -0500)
src/main/xlat.c

index 058699f457f2946ab7220d1c9a05d965a6d966bb..e0a15d53ede9389a77a20149ef5a336b1596b143 100644 (file)
@@ -1508,7 +1508,7 @@ static char *xlat_getvp(TALLOC_CTX *ctx, REQUEST *request, pair_lists_t list, DI
                if (packet) vps = packet->vps;
                break;
 
-#if WITH_PROXY
+#ifdef WITH_PROXY
        case PAIR_LIST_PROXY_REQUEST:
                packet = request->proxy;
                if (packet) vps = packet->vps;
@@ -1603,11 +1603,15 @@ static char *xlat_getvp(TALLOC_CTX *ctx, REQUEST *request, pair_lists_t list, DI
        {
                int code = 0;
 
+#ifdef WITH_PROXY
                if (request->proxy_reply && (!request->reply || !request->reply->code)) {
                        code = request->proxy_reply->code;
-               } else if (request->reply) {
-                       code = request->reply->code;
-               }
+               } else
+#endif
+                       if (request->reply) {
+                               code = request->reply->code;
+                       }
+
                return talloc_strdup(ctx, fr_packet_codes[code]);
        }