import from HEAD:

	handle OTP_RC_NEXTPASSCODE error from otpd-2.2.1+

diff --cc src/modules/rlm_otp/otp.h
index 0ab269e,995c063..3240d1a
--- 1/src/modules/rlm_otp/otp.h
--- 2/src/modules/rlm_otp/otp.h
+++ b/src/modules/rlm_otp/otp.h
@@@ -44,6 -44,7 +44,7 @@@ RCSIDH(otp_h, "$Id$"
  #define OTP_RC_AUTH_ERR               3
  #define OTP_RC_MAXTRIES               4
  #define OTP_RC_SERVICE_ERR    5
 -#define OTP_RC_NEXTPASSCODE   6
++#define OTP_RC_NEXT_PASSCODE  6
  
  #define OTP_MAX_USERNAME_LEN          31
  /* only needs to be MAX_PIN_LEN (16) + MAX_RESPONSE_LEN (16) */

diff --cc src/modules/rlm_otp/otp_pw_valid.c
Simple merge