3 files changed, 6 insertions, 3 deletions

diff --git a/libexec/rbootd/defs.h b/libexec/rbootd/defs.h
index 6edde9bff8c8..f62c83f88373 100644
--- a/libexec/rbootd/defs.h
+++ b/libexec/rbootd/defs.h
@@ -42,6 +42,8 @@
  *
  * From: Utah Hdr: defs.h 3.1 92/07/06
  * Author: Jeff Forys, University of Utah CSS
+ *
+ * $FreeBSD$
  */
 
 #include "rmp.h"
@@ -56,7 +58,7 @@
  *  This may be defined in <sys/param.h>, if not, it's defined here.
  */
 #ifndef	MAXHOSTNAMELEN
-#define	MAXHOSTNAMELEN 64
+#define	MAXHOSTNAMELEN 256
 #endif
 
 /*
diff --git a/libexec/rbootd/rbootd.c b/libexec/rbootd/rbootd.c
index 2f7c38435364..70bd7912a7f8 100644
--- a/libexec/rbootd/rbootd.c
+++ b/libexec/rbootd/rbootd.c
@@ -154,7 +154,8 @@ main(argc, argv)
 
 		if ((IntfName = BpfGetIntfName(&errmsg)) == NULL) {
 			syslog(LOG_NOTICE, "restarted (??)");
-			syslog(LOG_ERR, errmsg);
+			/* BpfGetIntfName() returns safe names, using %m */
+			syslog(LOG_ERR, "%s", errmsg);
 			Exit(0);
 		}
 	}
diff --git a/libexec/rbootd/rmpproto.c b/libexec/rbootd/rmpproto.c
index 80ce805db586..3619b39ff795 100644
--- a/libexec/rbootd/rmpproto.c
+++ b/libexec/rbootd/rmpproto.c
@@ -458,7 +458,7 @@ SendReadRepl(rconn)
 	 *  Position read head on file according to info in request packet.
 	 */
 	GETWORD(req->r_rrq.rmp_offset, size);
-	if (lseek(oldconn->bootfd, (off_t)size, L_SET) < 0) {
+	if (lseek(oldconn->bootfd, (off_t)size, SEEK_SET) < 0) {
 		syslog(LOG_ERR, "SendReadRepl: lseek: %m (%s)",
 		       EnetStr(rconn));
 		rpl->r_rrpl.rmp_retcode = RMP_E_ABORT;