format string audit. From: Gregory Steuck <greg@nest.cx>

2 files changed, 14 insertions, 15 deletions

diff --git a/usr.sbin/dhcp/server/dhcp.c b/usr.sbin/dhcp/server/dhcp.c
index dd87756df9a..487065230ed 100644
--- a/usr.sbin/dhcp/server/dhcp.c
+++ b/usr.sbin/dhcp/server/dhcp.c
@@ -422,8 +422,7 @@ void dhcprelease (packet)
 					     packet -> raw -> chaddr),
 			      packet -> raw -> giaddr.s_addr
 			      ? inet_ntoa (packet -> raw -> giaddr)
-			      : packet -> interface -> name,
-			      lease ? "" : "not ");
+			      : packet -> interface -> name);
 			
 			lease->releasing = 1;
 			add_timeout (cur_time + 1, lease_ping_timeout, lease);
diff --git a/usr.sbin/dhcp/server/dhcpd.c b/usr.sbin/dhcp/server/dhcpd.c
index 01290ce9f8d..1a7582ed528 100644
--- a/usr.sbin/dhcp/server/dhcpd.c
+++ b/usr.sbin/dhcp/server/dhcpd.c
@@ -164,12 +164,12 @@ int main (argc, argv, envp)
 
 	if (!quiet) {
 		note ("%s %s", message, DHCP_VERSION);
-		note (copyright);
-		note (arr);
-		note ("");
-		note (contrib);
-		note (url);
-		note ("");
+		note ("%s", copyright);
+		note ("%s", arr);
+		note ("%s", "");
+		note ("%s", contrib);
+		note ("%s", url);
+		note ("%s", "");
 	} else
 		log_perror = 0;
 
@@ -287,13 +287,13 @@ int main (argc, argv, envp)
 static void usage (appname)
 	char *appname;
 {
-	note (message);
-	note (copyright);
-	note (arr);
-	note ("");
-	note (contrib);
-	note (url);
-	note ("");
+	note ("%s", message);
+	note ("%s", copyright);
+	note ("%s", arr);
+	note ("%s", "");
+	note ("%s", contrib);
+	note ("%s", url);
+	note ("%s", "");
 
 	warn ("Usage: %s [-p <UDP port #>] [-d] [-f] [-cf config-file]",
 	      appname);