Skip to content

Commit

Permalink
Fix argument names in radius_callback_compare
Browse files Browse the repository at this point in the history
  • Loading branch information
arr2036 committed Jul 26, 2013
1 parent bd9bf4f commit b02e1f3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/include/radiusd.h
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ int paircompare(REQUEST *request, VALUE_PAIR *req_list,
int radius_xlat_do(REQUEST *request, VALUE_PAIR *vp);
void radius_xlat_move(REQUEST *, VALUE_PAIR **to, VALUE_PAIR **from);
int radius_compare_vps(REQUEST *request, VALUE_PAIR *check, VALUE_PAIR *vp);
int radius_callback_compare(REQUEST *req, VALUE_PAIR *request,
int radius_callback_compare(REQUEST *request, VALUE_PAIR *req,
VALUE_PAIR *check, VALUE_PAIR *check_pairs,
VALUE_PAIR **reply_pairs);
int radius_find_compare(unsigned int attribute);
Expand Down
12 changes: 6 additions & 6 deletions src/main/valuepair.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,15 +236,15 @@ int radius_compare_vps(REQUEST *request, VALUE_PAIR *check, VALUE_PAIR *vp)
* Unlike radius_compare_vps() this function will call any attribute-specific
* comparison functions registered.
*
* @param req Current request.
* @param request list pairs.
* @param request Current request.
* @param req list pairs.
* @param check item to compare.
* @param check_pairs list.
* @param reply_pairs list.
* @return 0 if check and vp are equal, -1 if vp value is less than check value, 1 is vp value is more than check
* value.
*/
int radius_callback_compare(REQUEST *req, VALUE_PAIR *request,
int radius_callback_compare(REQUEST *request, VALUE_PAIR *req,
VALUE_PAIR *check, VALUE_PAIR *check_pairs,
VALUE_PAIR **reply_pairs)
{
Expand All @@ -263,14 +263,14 @@ int radius_callback_compare(REQUEST *req, VALUE_PAIR *request,
*/
for (c = cmp; c; c = c->next) {
if (!check->da->vendor && (c->attribute == check->da->attr)) {
return (c->compare)(c->instance, req, request, check,
return (c->compare)(c->instance, request, req, check,
check_pairs, reply_pairs);
}
}

if (!request) return -1; /* doesn't exist, don't compare it */
if (!req) return -1; /* doesn't exist, don't compare it */

return radius_compare_vps(req, check, request);
return radius_compare_vps(request, check, req);
}


Expand Down

0 comments on commit b02e1f3

Please sign in to comment.