Add vp_listdebug function that prints a list of value pairs to the DEBUG

function.  Used this in rlm_sql.c.

diff --git a/src/include/radiusd.h b/src/include/radiusd.h
index 991adcc..ae80d63 100644 (file)
--- a/src/include/radiusd.h
+++ b/src/include/radiusd.h
@@ -261,7 +261,7 @@ NAS         *nas_findbyname(char *nasname);
 void           version(void);
 
 /* log.c */
-int radlogdir_iswritable(const char *);
+int            radlogdir_iswritable(const char *);
 int            vradlog(int, const char *, va_list ap);
 int            radlog(int, const char *, ...)
 #ifdef __GNUC__
@@ -273,6 +273,7 @@ int         log_debug(const char *, ...)
                __attribute__ ((format (printf, 1, 2)))
 #endif
 ;
+void           vp_listdebug(VALUE_PAIR *vp);
 
 /* proxy.c */
 int proxy_receive(REQUEST *request);

diff --git a/src/main/log.c b/src/main/log.c
index 7330fa9..641dd54 100644 (file)
--- a/src/main/log.c
+++ b/src/main/log.c
@@ -281,3 +281,20 @@ int radlog(int lvl, const char *msg, ...)
 
        return r;
 }
+
+
+/*
+ *      Dump a whole list of attributes to DEBUG2
+ */                     
+void vp_listdebug(VALUE_PAIR *vp)
+{       
+        char tmpPair[70];  
+        for (; vp; vp = vp->next) {
+                vp_prints(tmpPair, sizeof(tmpPair), vp);
+                DEBUG2("     %s", tmpPair);
+        }               
+}
+   
+
+ 
+        

diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index e4c177d..67bd5da 100644 (file)
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -426,21 +426,19 @@ static int rlm_sql_authorize(void *instance, REQUEST * request) {
                pairdelete(&request->packet->vps, PW_SQL_USER_NAME);
                return RLM_MODULE_NOTFOUND;
        }
-#if 0 /* FIXME: Debug being printed elsewhere? */
+
        /*
         * Uncomment these lines for debugging
         * Recompile, and run 'radiusd -X'
-        *
-        DEBUG2("rlm_sql:  check items");
-        vp_printlist(stderr, check_tmp);
-        DEBUG2("rlm_sql:  reply items");
-        vp_printlist(stderr, reply_tmp);
         */
-#endif
 
-#if 0 /* FIXME: this is the *real* authorizing */
-       vp_printlist(stderr, check_tmp);
-#endif
+       /* 
+       DEBUG2("rlm_sql:  check items");
+       vp_listdebug(check_tmp);
+       DEBUG2("rlm_sql:  reply items");
+       vp_listdebug(reply_tmp); 
+       */
+
        if (paircmp(request, request->packet->vps, check_tmp, &reply_tmp) != 0) {
                radlog(L_INFO, "rlm_sql: Pairs do not match [%s]", sqlusername);
                /* Remove the username we (maybe) added above */