import from HEAD:

	s/bad state/bad radstate/ to be clear that it's not token state

diff --combined src/modules/rlm_otp/otp_rlm.c
index 06987b8,60d2c78..4574004
--- 1/src/modules/rlm_otp/otp_rlm.c
--- 2/src/modules/rlm_otp/otp_rlm.c
+++ b/src/modules/rlm_otp/otp_rlm.c
@@@ -20,11 -20,12 +20,11 @@@
   * Copyright 2005,2006 TRI-D Systems, Inc.
   */
  
 -#include "ident.h"
 -RCSID("$Id$")
 +static const char rcsid[] = "$Id$";
  
 -#include <freeradius-devel/autoconf.h>
 -#include <freeradius-devel/radiusd.h>
 -#include <freeradius-devel/modules.h>
 +#include <autoconf.h>
 +#include <radiusd.h>
 +#include <modules.h>
  
  #include "extern.h"
  #include "otp.h"
@@@ -191,7 -192,7 +191,7 @@@ otp_authorize(void *instance, REQUEST *
      auth_type_found = 0;
      if ((vp = pairfind(request->config_items, PW_AUTHTYPE)) != NULL) {
        auth_type_found = 1;
 -      if (strcmp(vp->vp_strvalue, inst->name))
 +      if (strcmp(vp->strvalue, inst->name))
          return RLM_MODULE_NOOP;
      }
    }
@@@ -252,7 -253,7 +252,7 @@@
  
      if (otp_gen_state(state, NULL, challenge, inst->challenge_len, 0,
                        now, hmac_key) != 0) {
-       (void) radlog(L_ERR, "rlm_otp: %s: failed to generate state", __func__);
+       (void) radlog(L_ERR, "rlm_otp: %s: failed to generate radstate",__func__);
        return RLM_MODULE_FAIL;
      }
      pairadd(&request->reply->vps, pairmake("State", state, T_OP_EQ));
@@@ -305,7 -306,7 +305,7 @@@ otp_authenticate(void *instance, REQUES
                    __func__);
      return RLM_MODULE_INVALID;
    }
 -  username = request->username->vp_strvalue;
 +  username = request->username->strvalue;
  
    if ((pwe = otp_pwe_present(request)) == 0) {
      (void) radlog(L_AUTH, "rlm_otp: %s: Attribute \"User-Password\" "
@@@ -332,7 -333,7 +332,7 @@@
      e_length = inst->challenge_len * 2 + 8 + 8 + 32; /* see otp_gen_state() */
  
      if (vp->length != e_length) {
-       (void) radlog(L_AUTH, "rlm_otp: %s: bad state for [%s]: length",
+       (void) radlog(L_AUTH, "rlm_otp: %s: bad radstate for [%s]: length",
                      __func__, username);
        return RLM_MODULE_INVALID;
      }
@@@ -342,10 -343,10 +342,10 @@@
       */
  
      /* ASCII decode; this is why OTP_MAX_RADSTATE_LEN has +1 */
 -    (void) memcpy(rad_state, vp->vp_strvalue, vp->length);
 +    (void) memcpy(rad_state, vp->strvalue, vp->length);
      rad_state[e_length] = '\0';
      if (otp_a2x(rad_state, raw_state) == -1) {
-       (void) radlog(L_AUTH, "rlm_otp: %s: bad state for [%s]: not hex",
+       (void) radlog(L_AUTH, "rlm_otp: %s: bad radstate for [%s]: not hex",
                      __func__, username);
        return RLM_MODULE_INVALID;
      }
@@@ -358,13 -359,13 +358,13 @@@
      /* generate new state from returned input data */
      if (otp_gen_state(NULL, state, challenge, inst->challenge_len, 0,
                        then, hmac_key) != 0) {
-       (void) radlog(L_ERR, "rlm_otp: %s: failed to generate state",
+       (void) radlog(L_ERR, "rlm_otp: %s: failed to generate radstate",
                      __func__);
        return RLM_MODULE_FAIL;
      }
      /* compare generated state against returned state to verify hmac */
 -    if (memcmp(state, vp->vp_strvalue, vp->length)) {
 +    if (memcmp(state, vp->strvalue, vp->length)) {
-       (void) radlog(L_AUTH, "rlm_otp: %s: bad state for [%s]: hmac",
+       (void) radlog(L_AUTH, "rlm_otp: %s: bad radstate for [%s]: hmac",
                      __func__, username);
        return RLM_MODULE_REJECT;
      }
@@@ -372,7 -373,7 +372,7 @@@
      /* State is valid, but check expiry. */
      then = ntohl(then);
      if (time(NULL) - then > inst->challenge_delay) {
-       (void) radlog(L_AUTH, "rlm_otp: %s: bad state for [%s]: expired",
+       (void) radlog(L_AUTH, "rlm_otp: %s: bad radstate for [%s]: expired",
                      __func__, username);
        return RLM_MODULE_REJECT;
      }
@@@ -416,10 -417,11 +416,10 @@@ otp_detach(void *instance
   *    is single-threaded.
   */
  module_t rlm_otp = {
 -  RLM_MODULE_INIT,
    "otp",
    RLM_TYPE_THREAD_SAFE,               /* type */
 +  NULL,
    otp_instantiate,            /* instantiation */
 -  otp_detach,                 /* detach */
    {
      otp_authenticate,         /* authentication */
      otp_authorize,            /* authorization */
@@@ -430,6 -432,4 +430,6 @@@
      NULL,                     /* post-proxy */
      NULL                      /* post-auth */
    },
 +  otp_detach,                 /* detach */
 +  NULL,
  };