import from HEAD

	prevent rcsid from being optimized out

diff --cc src/modules/rlm_otp/extern.h
index 3dc2c1a,94e38ed..4dcd5f6
--- 1/src/modules/rlm_otp/extern.h
--- 2/src/modules/rlm_otp/extern.h
+++ b/src/modules/rlm_otp/extern.h
@@@ -22,9 -22,12 +22,12 @@@
  #ifndef EXTERN_H
  #define EXTERN_H
  
 -#include <freeradius-devel/autoconf.h>
 -#include <freeradius-devel/radiusd.h>
 -#include <freeradius-devel/modules.h>
+ #include "ident.h"
+ RCSIDH(extern_h, "$Id$")
+ 
 +#include <autoconf.h>
 +#include <radiusd.h>
 +#include <modules.h>
  
  #include <sys/types.h>
  #include <pthread.h>

diff --cc src/modules/rlm_otp/otp.h
index bf708b6,c57b368..defe016
--- 1/src/modules/rlm_otp/otp.h
--- 2/src/modules/rlm_otp/otp.h
+++ b/src/modules/rlm_otp/otp.h
@@@ -21,9 -21,8 +21,8 @@@
  #ifndef OTP_H
  #define OTP_H
  
- #ifdef __SUNPRO_C
- #pragma sun ident "$Id$"
- #endif
+ #include "ident.h"
 -RCSIDH(otp_h, "$Id$")
++RCSIDH(otp_h, "$Id$");
  
  #include <sys/types.h>
  

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

diff --cc src/modules/rlm_otp/otp_pw_valid.c
index cc90a1c,d443000..ba6709e
--- 1/src/modules/rlm_otp/otp_pw_valid.c
--- 2/src/modules/rlm_otp/otp_pw_valid.c
+++ b/src/modules/rlm_otp/otp_pw_valid.c
@@@ -21,11 -21,12 +21,12 @@@
   * Copyright 2006 TRI-D Systems, Inc.
   */
  
- static const char rcsid[] = "$Id$";
+ #include "ident.h"
+ 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"

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

diff --cc src/modules/rlm_otp/otp_rlm.c
index 4574004,60d2c78..058ddea
--- 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,12 @@@
   * Copyright 2005,2006 TRI-D Systems, Inc.
   */
  
- static const char rcsid[] = "$Id$";
+ #include "ident.h"
+ 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"