added token T_HASH, for '#'. Enabled the pairread() function

	to skip it (i.e. treat is EOS, essentially.)

	This allows us to sprinkle comments in more places in the 'users'
	file, and not just at the start of a line.

diff --git a/src/include/token.h b/src/include/token.h
index dcdff5a..9844bba 100644 (file)
--- a/src/include/token.h
+++ b/src/include/token.h
@@ -26,7 +26,7 @@
 #define T_OP_REG_NE            17
 #define T_OP_CMP_EQ     18
 #define T_EQEND                19
+#define T_HASH         20
 
 int    getword (char **ptr, char *buf, int buflen);
 int    gettoken(char **ptr, char *buf, int buflen);
-

diff --git a/src/lib/token.c b/src/lib/token.c
index 21b30a9..9f8e579 100644 (file)
--- a/src/lib/token.c
+++ b/src/lib/token.c
@@ -37,6 +37,7 @@ static const TOKEN tokens[] = {
        { ">",  T_OP_GT,        },
        { "<=", T_OP_LE,        },
        { "<",  T_OP_LT,        },
+       { "#",  T_HASH,         },
        { NULL, 0,              },
 };
 

diff --git a/src/lib/valuepair.c b/src/lib/valuepair.c
index 479d3e3..5b46402 100644 (file)
--- a/src/lib/valuepair.c
+++ b/src/lib/valuepair.c
@@ -584,7 +584,7 @@ VALUE_PAIR *pairmake(const char *attribute, const char *value, int operator)
 
 /*
  *     Read a valuepair from a buffer, and advance pointer.
- *     Sets *eol to 1 if end of line was encountered.
+ *     Sets *eol to T_EOL if end of line was encountered.
  */
 VALUE_PAIR *pairread(char **ptr, int *eol)
 {
@@ -597,7 +597,15 @@ VALUE_PAIR *pairread(char **ptr, int *eol)
        *eol = 0;
 
        /* Get attribute. */
-       gettoken(ptr, attr, sizeof(attr));
+       token = gettoken(ptr, attr, sizeof(attr));
+
+       /*  If it's a comment, then exit, as we haven't read a pair */
+       if (token == T_HASH) {
+               *eol = token;
+               return NULL;
+       }
+
+       /*  It's not a comment, so it MUST be an attribute */
        if (attr[0] == 0) {
                librad_log("No token read");
                return NULL;
@@ -618,11 +626,11 @@ VALUE_PAIR *pairread(char **ptr, int *eol)
        }
 
        /*
-        *      Peek at the next token. Must be T_EOL or T_COMMA.
+        *      Peek at the next token. Must be T_EOL, T_COMMA, or T_HASH
         */
        p = *ptr;
        t = gettoken(&p, buf, sizeof(buf));
-       if (t != T_EOL && t != T_COMMA) {
+       if (t != T_EOL && t != T_COMMA && t != T_HASH) {
                librad_log("Expected end of line or comma");
                return NULL;
        }
@@ -644,6 +652,7 @@ int userparse(char *buffer, VALUE_PAIR **first_pair)
        VALUE_PAIR      *vp;
        char            *p;
        int             last_token = 0;
+       int             previous_token;
 
        /*
         *      We allow an empty line.
@@ -653,12 +662,21 @@ int userparse(char *buffer, VALUE_PAIR **first_pair)
 
        p = buffer;
        do {
-               if ((vp = pairread(&p, &last_token)) == NULL)
+               previous_token = last_token;
+               if ((vp = pairread(&p, &last_token)) == NULL) {
                        return -1;
+               }
                pairadd(first_pair, vp);
        } while (*p && (last_token == T_COMMA));
 
        /*
+        *      Don't tell the caller that there was a comment.
+        */
+       if (last_token == T_HASH) {
+               return previous_token;
+       }
+
+       /*
         *      And return the last token which we read.
         */
        return last_token;