add Vcs entries to the control file

[debian/sudo] / auth / securid.c

diff --git a/auth/securid.c b/auth/securid.c
index db868d32833aa3b107863da474ecda00b0c64f6f..6aec1098f40844323432c5a9d82ab72e61740532 100644 (file)
--- a/auth/securid.c
+++ b/auth/securid.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1999-2001, 2003 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1999-2005, 2007, 2010
+ *     Todd C. Miller <Todd.Miller@courtesan.com>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -21,7 +22,7 @@
  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
  */
 
-#include "config.h"
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -36,19 +37,13 @@
 #endif /* STDC_HEADERS */
 #ifdef HAVE_STRING_H
 # include <string.h>
-#else
-# ifdef HAVE_STRINGS_H
-#  include <strings.h>
-# endif
 #endif /* HAVE_STRING_H */
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif /* HAVE_STRINGS_H */
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
-#ifdef HAVE_ERR_H
-# include <err.h>
-#else
-# include "emul/err.h"
-#endif /* HAVE_ERR_H */
 #include <pwd.h>
 
 #include <sdi_athd.h>
@@ -58,10 +53,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-static const char rcsid[] = "$Sudo: securid.c,v 1.12 2004/02/13 21:36:47 millert Exp $";
-#endif /* lint */
-
 union config_record configure;
 
 int
@@ -72,7 +63,7 @@ securid_init(pw, promptp, auth)
 {
     static struct SD_CLIENT sd_dat;            /* SecurID data block */
 
-    auth->data = (VOID *) &sd_dat;             /* For method-specific data */
+    auth->data = (void *) &sd_dat;             /* For method-specific data */
 
     if (creadcfg() == 0)
        return(AUTH_SUCCESS);
@@ -94,7 +85,7 @@ securid_setup(pw, promptp, auth)
        strlcpy(sd->username, pw->pw_name, 32);
        return(AUTH_SUCCESS);
     } else {
-       warnx("unable to contact the SecurID server");
+       warningx("unable to contact the SecurID server");
        return(AUTH_FATAL);
     }
 }