← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/freeradius/jaunty-updates

« back to all changes in this revision

Viewing changes to src/modules/rlm_expr/rlm_expr.c

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-09-22 08:42:02 UTC
  • mfrom: (1.1.12 upstream)
  • Revision ID: james.westby@ubuntu.com-20080922084202-eyjprg3z55481ha5
Tags: 2.1.0+dfsg-0ubuntu1
https://launchpad.net/bugs/261809
* New upstream release.
* Fixes FTBFS issue with new libtool.
* Fixes listen on random port. (LP: #261809)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/rlm_expr/rlm_expr.c
1
1
/*
2
2
 * rlm_expr.c
3
3
 *
4
 
 * Version:     $Id: rlm_expr.c,v 1.19 2007/11/25 14:02:10 aland Exp $
 
4
 * Version:     $Id$
5
5
 *
6
6
 *   This program is free software; you can redistribute it and/or modify
7
7
 *   it under the terms of the GNU General Public License as published by
22
22
 */
23
23
 
24
24
#include <freeradius-devel/ident.h>
25
 
RCSID("$Id: rlm_expr.c,v 1.19 2007/11/25 14:02:10 aland Exp $")
 
25
RCSID("$Id$")
26
26
 
27
27
#include <freeradius-devel/radiusd.h>
28
28
#include <freeradius-devel/modules.h>
93
93
                for (i = 0; map[i].token != TOKEN_LAST; i++) {
94
94
                        if (*p == map[i].op) {
95
95
                                if (this != TOKEN_NONE) {
96
 
                                        DEBUG2("rlm_expr: Invalid operator at \"%s\"", p);
 
96
                                        RDEBUG2("Invalid operator at \"%s\"", p);
97
97
                                        return -1;
98
98
                                }
99
99
                                this = map[i].token;
115
115
                 */
116
116
                if (*p == ')') {
117
117
                        if (this != TOKEN_NONE) {
118
 
                                DEBUG2("rlm_expr: Trailing operator before end sub-expression at \"%s\"", p);
 
118
                                RDEBUG2("Trailing operator before end sub-expression at \"%s\"", p);
119
119
                                return -1;
120
120
                        }
121
121
                        p++;
140
140
                         *  If it isn't, then we die.
141
141
                         */
142
142
                        if ((*p < '0') || (*p > '9')) {
143
 
                                DEBUG2("rlm_expr: Not a number at \"%s\"", p);
 
143
                                RDEBUG2("Not a number at \"%s\"", p);
144
144
                                return -1;
145
145
                        }
146
146
 
237
237
         *  We MUST have eaten the entire input string.
238
238
         */
239
239
        if (*p != '\0') {
240
 
                DEBUG2("rlm_expr: Failed at %s", p);
 
240
                RDEBUG2("Failed at %s", p);
241
241
                return 0;
242
242
        }
243
243