From a1240a5417d5da73cf2331dd78af2de8dcab4ba7 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Mon, 31 Mar 2014 15:58:24 -0600
Subject: [PATCH] Use common printf format when warning of buffer overflow
 prevention.

---
 plugins/sudoers/toke_util.c |  2 +-
 src/net_ifs.c               | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/plugins/sudoers/toke_util.c b/plugins/sudoers/toke_util.c
index 60236af03..c874ed770 100644
--- a/plugins/sudoers/toke_util.c
+++ b/plugins/sudoers/toke_util.c
@@ -171,7 +171,7 @@ fill_args(const char *s, int len, int addspace)
     if (addspace)
 	*p++ = ' ';
     if (strlcpy(p, s, arg_size - (p - sudoerslval.command.args)) != (size_t)len) {
-	warningx(U_("fill_args: buffer overflow"));	/* paranoia */
+	warningx(U_("internal error, %s overflow"), __func__);
 	sudoerserror(NULL);
 	debug_return_bool(false);
     }
diff --git a/src/net_ifs.c b/src/net_ifs.c
index 1a6238f98..919c744ca 100644
--- a/src/net_ifs.c
+++ b/src/net_ifs.c
@@ -159,7 +159,7 @@ get_net_ifs(char **addrinfo)
 		    "%s%s/", cp == *addrinfo ? "" : " ",
 		    inet_ntoa(sin->sin_addr));
 		if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
-		    warningx(U_("load_interfaces: overflow detected"));
+		    warningx(U_("internal error, %s overflow"), __func__);
 		    goto done;
 		}
 		cp += len;
@@ -168,7 +168,7 @@ get_net_ifs(char **addrinfo)
 		len = snprintf(cp, ailen - (*addrinfo - cp),
 		    "%s", inet_ntoa(sin->sin_addr));
 		if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
-		    warningx(U_("load_interfaces: overflow detected"));
+		    warningx(U_("internal error, %s overflow"), __func__);
 		    goto done;
 		}
 		cp += len;
@@ -180,7 +180,7 @@ get_net_ifs(char **addrinfo)
 		len = snprintf(cp, ailen - (*addrinfo - cp),
 		    "%s%s/", cp == *addrinfo ? "" : " ", addrbuf);
 		if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
-		    warningx(U_("load_interfaces: overflow detected"));
+		    warningx(U_("internal error, %s overflow"), __func__);
 		    goto done;
 		}
 		cp += len;
@@ -189,7 +189,7 @@ get_net_ifs(char **addrinfo)
 		inet_ntop(AF_INET6, &sin6->sin6_addr, addrbuf, sizeof(addrbuf));
 		len = snprintf(cp, ailen - (*addrinfo - cp), "%s", addrbuf);
 		if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
-		    warningx(U_("load_interfaces: overflow detected"));
+		    warningx(U_("internal error, %s overflow"), __func__);
 		    goto done;
 		}
 		cp += len;
@@ -304,7 +304,7 @@ get_net_ifs(char **addrinfo)
 	    "%s%s/", cp == *addrinfo ? "" : " ",
 	    inet_ntoa(sin->sin_addr));
 	if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
-	    warningx(U_("load_interfaces: overflow detected"));
+	    warningx(U_("internal error, %s overflow"), __func__);
 	    goto done;
 	}
 	cp += len;
@@ -326,7 +326,7 @@ get_net_ifs(char **addrinfo)
 	len = snprintf(cp, ailen - (*addrinfo - cp),
 	    "%s", inet_ntoa(sin->sin_addr));
 	if (len <= 0 || len >= ailen - (*addrinfo - cp)) {
-	    warningx(U_("load_interfaces: overflow detected"));
+	    warningx(U_("internal error, %s overflow"), __func__);
 	    goto done;
 	}
 	cp += len;