--- embedaddon/sudo/plugins/sudoers/prompt.c	2013/07/22 10:46:12	1.1.1.1
+++ embedaddon/sudo/plugins/sudoers/prompt.c	2014/06/15 16:12:54	1.1.1.2
@@ -47,7 +47,7 @@
  * allocated result.  Returns the same string if there are no escapes.
  */
 char *
-expand_prompt(const char *old_prompt, const char *user, const char *host)
+expand_prompt(const char *old_prompt, const char *auth_user)
 {
     size_t len, n;
     int subst;
@@ -72,12 +72,7 @@ expand_prompt(const char *old_prompt, const char *user
 		    break;
 		case 'p':
 		    p++;
-		    if (def_rootpw)
-			    len += 2;
-		    else if (def_targetpw || def_runaspw)
-			    len += strlen(runas_pw->pw_name) - 2;
-		    else
-			    len += strlen(user_name) - 2;
+		    len += strlen(auth_user) - 2;
 		    subst = 1;
 		    break;
 		case 'u':
@@ -110,40 +105,35 @@ expand_prompt(const char *old_prompt, const char *user
 		    case 'h':
 			p++;
 			n = strlcpy(np, user_shost, np - endp);
-			if (n >= np - endp)
+			if (n >= (size_t)(np - endp))
 			    goto oflow;
 			np += n;
 			continue;
 		    case 'H':
 			p++;
 			n = strlcpy(np, user_host, np - endp);
-			if (n >= np - endp)
+			if (n >= (size_t)(np - endp))
 			    goto oflow;
 			np += n;
 			continue;
 		    case 'p':
 			p++;
-			if (def_rootpw)
-				n = strlcpy(np, "root", np - endp);
-			else if (def_targetpw || def_runaspw)
-				n = strlcpy(np, runas_pw->pw_name, np - endp);
-			else
-				n = strlcpy(np, user_name, np - endp);
-			if (n >= np - endp)
+			n = strlcpy(np, auth_user, np - endp);
+			if (n >= (size_t)(np - endp))
 				goto oflow;
 			np += n;
 			continue;
 		    case 'u':
 			p++;
 			n = strlcpy(np, user_name, np - endp);
-			if (n >= np - endp)
+			if (n >= (size_t)(np - endp))
 			    goto oflow;
 			np += n;
 			continue;
 		    case 'U':
 			p++;
 			n = strlcpy(np,  runas_pw->pw_name, np - endp);
-			if (n >= np - endp)
+			if (n >= (size_t)(np - endp))
 			    goto oflow;
 			np += n;
 			continue;
@@ -168,5 +158,5 @@ expand_prompt(const char *old_prompt, const char *user
 
 oflow:
     /* We pre-allocate enough space, so this should never happen. */
-    fatalx(_("internal error, %s overflow"), "expand_prompt()");
+    fatalx(U_("internal error, %s overflow"), "expand_prompt()");
 }