Add increment operator for LDAP

diff --git a/raddb/mods-available/ldap b/raddb/mods-available/ldap
index ca2772ba9089b834afde0f678d7344b0690441a4..74abddec77de17ae717e24828b7c1a98f0ce1ef6 100644 (file)
--- a/raddb/mods-available/ldap
+++ b/raddb/mods-available/ldap
@@ -126,7 +126,8 @@ ldap {
        # 
        #  Where:
        #       <ldap attr>:    The LDAP attribute to add modify or delete.
-       #       <op>:           One of the assignment operators (:=, +=, -=).
+       #       <op>:           One of the assignment operators
+       #                       (:=, +=, -=, ++).
        #                       Note: '=' is *not* supported.
        #       <value>:        The value to add modify or delete.
        # 

diff --git a/src/include/token.h b/src/include/token.h
index b6097430e9e3799101c61d510650dcd1d03c850d..f7d81f4a3de1e32f5542e78d11e83b6f28272dd4 100644 (file)
--- a/src/include/token.h
+++ b/src/include/token.h
@@ -41,24 +41,25 @@ typedef enum fr_token_t {
   T_COMMA,                     /* , */
   T_SEMICOLON,                 /* ; */
 
+  T_OP_INCRM,                  /* ++ */
   T_OP_ADD,                    /* += */
-  T_OP_SUB,                    /* -= */
-  T_OP_SET,                    /* :=           10 */
+  T_OP_SUB,                    /* -=           10 */
+  T_OP_SET,                    /* := */
   T_OP_EQ,                     /* = */
   T_OP_NE,                     /* != */
   T_OP_GE,                     /* >= */
-  T_OP_GT,                     /* > */
-  T_OP_LE,                     /* <=           15 */
+  T_OP_GT,                     /* >            15 */
+  T_OP_LE,                     /* <= */
   T_OP_LT,                     /* < */
   T_OP_REG_EQ,                 /* =~ */
   T_OP_REG_NE,                 /* !~ */
-  T_OP_CMP_TRUE,                /* =* */
-  T_OP_CMP_FALSE,               /* !*          20 */
+  T_OP_CMP_TRUE,                /* =*          20 */
+  T_OP_CMP_FALSE,               /* !* */
   T_OP_CMP_EQ,                 /* == */
   T_HASH,                      /* # */
   T_BARE_WORD,                 /* bare word */
-  T_DOUBLE_QUOTED_STRING,      /* "foo" */
-  T_SINGLE_QUOTED_STRING,      /* 'foo'        25 */
+  T_DOUBLE_QUOTED_STRING,      /* "foo"        25 */
+  T_SINGLE_QUOTED_STRING,      /* 'foo' */
   T_BACK_QUOTED_STRING,                /* `foo` */
   T_TOKEN_LAST
 } FR_TOKEN;

diff --git a/src/lib/token.c b/src/lib/token.c
index 14355e92723cd3e4bce1c76e281d31befa8eb264..6333347184214df4ebb5f7b686da1ace5bd074bd 100644 (file)
--- a/src/lib/token.c
+++ b/src/lib/token.c
@@ -37,6 +37,7 @@ const FR_NAME_NUMBER fr_tokens[] = {
        { "(",  T_LBRACE,       },
        { ")",  T_RBRACE,       },
        { ",",  T_COMMA,        },
+       { "++", T_OP_INCRM,     },
        { "+=", T_OP_ADD,       },
        { "-=", T_OP_SUB,       },
        { ":=", T_OP_SET,       },

diff --git a/src/main/conffile.c b/src/main/conffile.c
index b7f2f17ffd7eadd2481e70b9d80927dc475f68f8..219d95ad7ac1d9a2a4a27d0fe60b37205e305297 100644 (file)
--- a/src/main/conffile.c
+++ b/src/main/conffile.c
@@ -1703,6 +1703,7 @@ static int cf_section_read(const char *filename, int *lineno, FILE *fp,
                        value = NULL;
                        goto do_set;
 
+               case T_OP_INCRM:
                case T_OP_ADD:
                case T_OP_CMP_EQ:
                case T_OP_SUB:

diff --git a/src/modules/rlm_ldap/rlm_ldap.c b/src/modules/rlm_ldap/rlm_ldap.c
index b063e3e26a4344797d74b44079a2120cc056c9bd..abed6dc4d249f18b29853bf480d5d7ab1a0bf307 100644 (file)
--- a/src/modules/rlm_ldap/rlm_ldap.c
+++ b/src/modules/rlm_ldap/rlm_ldap.c
@@ -2266,7 +2266,7 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
                 *      Now we know the value is ok, copy the pointers into
                 *      the ldapmod struct.
                 */
-               memcpy(&(mod_s[total].mod_type), &(attr),
+               memcpy(&(mod_s[total].mod_type), &(attr), 
                       sizeof(mod_s[total].mod_type));
 
                op = cf_pair_operator(cp);
@@ -2285,6 +2285,11 @@ static int user_modify(ldap_instance *inst, REQUEST *request,
                        case T_OP_SUB:
                                mod_s[total].mod_op = LDAP_MOD_DELETE;
                        break;
+#ifdef LDAP_MOD_INCREMENT
+                       case T_OP_INCRM:
+                               mod_s[total].mod_op = LDAP_MOD_INCREMENT;
+                       break;
+#endif
                        default:
                                radlog(L_ERR, "rlm_ldap (%s): Operator '%s' "
                                       "is not supported for LDAP modify "