--- embedaddon/sudo/plugins/sudoers/auth/securid5.c	2012/05/29 12:26:49	1.1.1.2
+++ embedaddon/sudo/plugins/sudoers/auth/securid5.c	2014/06/15 16:12:54	1.1.1.4
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2005, 2007, 2010-2011
+ * Copyright (c) 1999-2005, 2007, 2010-2012
  *	Todd C. Miller <Todd.Miller@courtesan.com>
  * Copyright (c) 2002 Michael Stroucken <michael@stroucken.org>
  *
@@ -26,7 +26,6 @@
 #include <config.h>
 
 #include <sys/types.h>
-#include <sys/param.h>
 #include <stdio.h>
 #ifdef STDC_HEADERS
 # include <stdlib.h>
@@ -78,7 +77,7 @@ sudo_securid_init(struct passwd *pw, sudo_auth *auth)
     if (AceInitialize() != SD_FALSE)
 	debug_return_int(AUTH_SUCCESS);
 
-    warningx(_("failed to initialise the ACE API library"));
+    warningx(U_("failed to initialise the ACE API library"));
     debug_return_int(AUTH_FATAL);
 }
 
@@ -104,7 +103,7 @@ sudo_securid_setup(struct passwd *pw, char **promptp, 
 
     /* Re-initialize SecurID every time. */
     if (SD_Init(sd) != ACM_OK) {
-	warningx(_("unable to contact the SecurID server"));
+	warningx(U_("unable to contact the SecurID server"));
 	debug_return_int(AUTH_FATAL);
     }
 
@@ -113,23 +112,23 @@ sudo_securid_setup(struct passwd *pw, char **promptp, 
 
     switch (retval) {
 	case ACM_OK:
-		warningx(_("User ID locked for SecurID Authentication"));
+		warningx(U_("User ID locked for SecurID Authentication"));
 		debug_return_int(AUTH_SUCCESS);
 
         case ACE_UNDEFINED_USERNAME:
-		warningx(_("invalid username length for SecurID"));
+		warningx(U_("invalid username length for SecurID"));
 		debug_return_int(AUTH_FATAL);
 
 	case ACE_ERR_INVALID_HANDLE:
-		warningx(_("invalid Authentication Handle for SecurID"));
+		warningx(U_("invalid Authentication Handle for SecurID"));
 		debug_return_int(AUTH_FATAL);
 
 	case ACM_ACCESS_DENIED:
-		warningx(_("SecurID communication failed"));
+		warningx(U_("SecurID communication failed"));
 		debug_return_int(AUTH_FATAL);
 
 	default:
-		warningx(_("unknown SecurID error"));
+		warningx(U_("unknown SecurID error"));
 		debug_return_int(AUTH_FATAL);
 	}
 }
@@ -163,17 +162,17 @@ sudo_securid_verify(struct passwd *pw, char *pass, sud
 		break;
 
 	case ACE_UNDEFINED_PASSCODE:
-		warningx(_("invalid passcode length for SecurID"));
+		warningx(U_("invalid passcode length for SecurID"));
 		rval = AUTH_FATAL;
 		break;
 
 	case ACE_UNDEFINED_USERNAME:
-		warningx(_("invalid username length for SecurID"));
+		warningx(U_("invalid username length for SecurID"));
 		rval = AUTH_FATAL;
 		break;
 
 	case ACE_ERR_INVALID_HANDLE:
-		warningx(_("invalid Authentication Handle for SecurID"));
+		warningx(U_("invalid Authentication Handle for SecurID"));
 		rval = AUTH_FATAL;
 		break;
 
@@ -212,7 +211,7 @@ then enter the new token code.\n", \
 		break;
 
 	default:
-		warningx(_("unknown SecurID error"));
+		warningx(U_("unknown SecurID error"));
 		rval = AUTH_FATAL;
 		break;
     }