fix for 596493 from upstream

[debian/sudo] / auth / sia.c

diff --git a/auth/sia.c b/auth/sia.c
index 2f6b3b584e793fc8e296f332182b096a55e54dba..188676a7abe15d9e04b7cfc29d67d488cfca37f1 100644 (file)
--- a/auth/sia.c
+++ b/auth/sia.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
@@ -20,7 +21,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>
@@ -35,11 +36,10 @@
 #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 */
@@ -49,10 +49,6 @@
 #include "sudo.h"
 #include "sudo_auth.h"
 
-#ifndef lint
-static const char rcsid[] = "$Sudo: sia.c,v 1.14 2004/02/13 21:36:47 millert Exp $";
-#endif /* lint */
-
 static int sudo_collect        __P((int, int, uchar_t *, int, prompt_t *));
 
 static char *def_prompt;
@@ -108,7 +104,7 @@ sia_setup(pw, promptp, auth)
        return(AUTH_FATAL);
     }
 
-    auth->data = (VOID *) siah;
+    auth->data = (void *) siah;
     return(AUTH_SUCCESS);
 }