o Allow rarpd to accept an additional '-t directory' argument, specifying

  an alternative to /tftpboot.  This is useful it you're using tftpd
  with an alternative root (using -s), and would like rarpd to respond
  selectively to RARP requests using the same criteria as tftp.

Obtained from:	TrustedBSD Project
Sponsored by:	DARPA, NAI Labs

2 files changed, 17 insertions, 1 deletions

diff --git a/usr.sbin/rarpd/rarpd.8 b/usr.sbin/rarpd/rarpd.8
index 6c36057..07c393b 100644
--- a/usr.sbin/rarpd/rarpd.8
+++ b/usr.sbin/rarpd/rarpd.8
@@ -28,6 +28,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl adfsv
+.Op Fl t Ar directory
 .Op Ar interface
 .Sh DESCRIPTION
 .Nm
@@ -93,6 +94,17 @@ Run in the foreground.
 Supply a response to any RARP request for which an ethernet to IP address
 mapping exists; do not depend on the existence of
 .Pa /tftpboot/\fIipaddr\fP* .
+.It Fl t
+Supple an alternative tftp root directory to
+.Pa /tftpboot ,
+matching similar behavior of the
+.Fl s
+flag on
+.Xr tftpd 8 .
+This permits
+.Nm
+to selectively respond to RARP requests, but use an alternative directory
+for IP checking.
 .It Fl v
 Enable verbose sysloging.
 .El
diff --git a/usr.sbin/rarpd/rarpd.c b/usr.sbin/rarpd/rarpd.c
index b0d999e..67e2dee 100644
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@@ -177,7 +177,7 @@ main(int argc, char *argv[])
 	openlog(name, LOG_PID | LOG_CONS, LOG_DAEMON);
 
 	opterr = 0;
-	while ((op = getopt(argc, argv, "adfsv")) != -1) {
+	while ((op = getopt(argc, argv, "adfst:v")) != -1) {
 		switch (op) {
 		case 'a':
 			++aflag;
@@ -195,6 +195,10 @@ main(int argc, char *argv[])
 			++sflag;
 			break;
 
+		case 't':
+			tftp_dir = optarg;
+			break;
+
 		case 'v':
 			++verbose;
 			break;