removed extraneous 'VALUE_PAIR *reply' from radius_xlat2 function

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index db8fb28..971f016 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -1,3 +1,5 @@
+#ifndef RADIUSD_H
+#define RADIUSD_H
 /*
  * radiusd.h   Structures, prototypes and global variables
  *             for the Cistron Radius server.
@@ -5,9 +7,6 @@
  * Version:    $Id$
  *
  */
-
-#ifndef RADIUSD_H
-#define RADIUSD_H
 #include "libradius.h"
 #include "radpaths.h"
 #include "conf.h"
@@ -114,10 +113,10 @@ typedef struct main_config_t {
        int             do_usercollide;
        int             do_lower_user;
        int             do_lower_pass;
-       char    *lower_time;
+       char            *lower_time;
        int             do_nospace_user;
        int             do_nospace_pass;
-       char    *nospace_time;
+       char            *nospace_time;
 } MAIN_CONFIG_T;
 
 #define DEBUG  if(debug_flag)log_debug
@@ -127,7 +126,6 @@ typedef struct main_config_t {
 #define MAX_REQUEST_TIME       30
 #define CLEANUP_DELAY          5
 #define MAX_REQUESTS           256
-/* FIXME: these two should be command-line options */
 #define RETRY_DELAY             5
 #define RETRY_COUNT             3
 
@@ -280,7 +278,7 @@ void                pair_builtincompare_init(void);
 
 /* xlat.c */
 int            radius_xlat2(char * out, int outlen, const char *fmt,
-                            REQUEST * request, VALUE_PAIR *reply);
+                            REQUEST * request);
 
 #ifdef WITH_THREAD_POOL
 /* threads.c */

diff --git a/src/main/xlat.c b/src/main/xlat.c
index b3f3e7d..8d58896 100644 (file)
--- a/src/main/xlat.c
+++ b/src/main/xlat.c
@@ -98,7 +98,7 @@ static int valuebyname(char * out,int outlen,VALUE_PAIR * request, char * attrna
  *     ${reply:AttributeName}          Corresponding value for AttributeName in reply
  */
 
-int radius_xlat2(char * out,int outlen, const char *fmt, REQUEST * request, VALUE_PAIR *reply)
+int radius_xlat2(char * out,int outlen, const char *fmt, REQUEST * request)
 {
        char attrname[128];
        char *pa;
@@ -144,7 +144,7 @@ int radius_xlat2(char * out,int outlen, const char *fmt, REQUEST * request, VALU
                                }
                                *pa = '\0';
                                if (strncasecmp(attrname,"reply:",6) == 0) {
-                                 q += valuebyname(q,freespace,reply,&attrname[6]);
+                                 q += valuebyname(q,freespace,request->reply->vps,&attrname[6]);
                                } else if (strncasecmp(attrname,"request:",8) == 0) {
                                  q += valuebyname(q,freespace,request->packet->vps,&attrname[8]);
                                } else {
@@ -160,10 +160,10 @@ int radius_xlat2(char * out,int outlen, const char *fmt, REQUEST * request, VALU
                                *q++ = *p;
                                break;
                        case 'a': /* Protocol: */
-                               q += valuepair2str(q,freespace,pairfind(reply,PW_FRAMED_PROTOCOL),PW_TYPE_INTEGER);
+                               q += valuepair2str(q,freespace,pairfind(request->reply->vps,PW_FRAMED_PROTOCOL),PW_TYPE_INTEGER);
                                break;
                        case 'c': /* Callback-Number */
-                               q += valuepair2str(q,freespace,pairfind(reply,PW_CALLBACK_NUMBER),PW_TYPE_STRING);
+                               q += valuepair2str(q,freespace,pairfind(request->reply->vps,PW_CALLBACK_NUMBER),PW_TYPE_STRING);
                                break;
                        case 'd': /* request year */
                                TM = localtime(&request->timestamp);
@@ -172,7 +172,7 @@ int radius_xlat2(char * out,int outlen, const char *fmt, REQUEST * request, VALU
                                q += strlen(q);
                                break;
                        case 'f': /* Framed IP address */
-                               q += valuepair2str(q,freespace,pairfind(reply,PW_FRAMED_IP_ADDRESS),PW_TYPE_IPADDR);
+                               q += valuepair2str(q,freespace,pairfind(request->reply->vps,PW_FRAMED_IP_ADDRESS),PW_TYPE_IPADDR);
                                break;
                        case 'i': /* Calling station ID */
                                q += valuepair2str(q,freespace,pairfind(request->packet->vps,PW_CALLING_STATION_ID),PW_TYPE_STRING);
@@ -198,7 +198,7 @@ int radius_xlat2(char * out,int outlen, const char *fmt, REQUEST * request, VALU
                                q += valuepair2str(q,freespace,pairfind(request->packet->vps,PW_CONNECT_INFO),PW_TYPE_STRING);
                                break;
                        case 't': /* MTU */
-                               q += valuepair2str(q,freespace,pairfind(reply,PW_FRAMED_MTU),PW_TYPE_INTEGER);
+                               q += valuepair2str(q,freespace,pairfind(request->reply->vps,PW_FRAMED_MTU),PW_TYPE_INTEGER);
                                break;
                        case 'u': /* User name */
                                q += valuepair2str(q,freespace,pairfind(request->packet->vps,PW_USER_NAME),PW_TYPE_STRING);

diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 0d58bbd..ecd641c 100644 (file)
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -87,7 +87,7 @@ static int detail_accounting(void *instance, REQUEST *request)
        int             outfd;
        FILE            *outfp;
        char            buffer[DIRLEN];
-       char            *p, *lastdir;
+       char            *p;
        VALUE_PAIR      *pair;
        int             ret = RLM_MODULE_OK;
        struct stat     st;
@@ -102,8 +102,7 @@ static int detail_accounting(void *instance, REQUEST *request)
         *      feed it through radius_xlat2() to expand the
         *      variables.
         */
-       radius_xlat2(buffer, sizeof(buffer), inst->detailfile, request,
-                    request->reply->vps);
+       radius_xlat2(buffer, sizeof(buffer), inst->detailfile, request);
 
        /*
         *      Grab the last directory delimiter.