From f3e97543a185ca6d4fc09a9a9bc2df394caad69c Mon Sep 17 00:00:00 2001
From: ru <ru@FreeBSD.org>
Date: Thu, 1 May 2003 21:18:36 +0000
Subject: Removed all vestiges of KerberosIV.

---
 sbin/restore/Makefile  |  1 -
 sbin/restore/main.c    | 13 ++++++-------
 sbin/restore/restore.8 | 11 +++++------
 3 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'sbin/restore')

diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile
index 712bf64..5571947 100644
--- a/sbin/restore/Makefile
+++ b/sbin/restore/Makefile
@@ -6,7 +6,6 @@
 PROG=	restore
 LINKS=	${BINDIR}/restore ${BINDIR}/rrestore
 CFLAGS+=-DRRESTORE
-CFLAGS+=-I${.CURDIR}/../../libexec/rlogind
 WARNS=	0
 SRCS=	main.c interactive.c restore.c dirs.c symtab.c tape.c utilities.c \
 	dumprmt.c
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index 17abadb..4fe2be6 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -97,8 +97,7 @@ main(int argc, char *argv[])
 	if ((inputdev = getenv("TAPE")) == NULL)
 		inputdev = _PATH_DEFTAPE;
 	obsolete(&argc, &argv);
-#define	optlist "b:df:himNRrs:tuvxy"
-	while ((ch = getopt(argc, argv, optlist)) != -1)
+	while ((ch = getopt(argc, argv, "b:df:himNRrs:tuvxy")) != -1)
 		switch(ch) {
 		case 'b':
 			/* Change default tape blocksize. */
@@ -280,11 +279,11 @@ static void
 usage()
 {
 	(void)fprintf(stderr, "usage:\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
-	  "restore -i [-cdhkmNuvy] [-b blocksize] [-f file] [-s fileno]",
-	  "restore -r [-cdkNuvy] [-b blocksize] [-f file] [-s fileno]",
-	  "restore -R [-cdkNuvy] [-b blocksize] [-f file] [-s fileno]",
-	  "restore -x [-cdhkmNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
-	  "restore -t [-cdhkNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
+	  "restore -i [-cdhmNuvy] [-b blocksize] [-f file] [-s fileno]",
+	  "restore -r [-cdNuvy] [-b blocksize] [-f file] [-s fileno]",
+	  "restore -R [-cdNuvy] [-b blocksize] [-f file] [-s fileno]",
+	  "restore -x [-cdhmNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]",
+	  "restore -t [-cdhNuvy] [-b blocksize] [-f file] [-s fileno] [file ...]");
 	done(1);
 }
 
diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8
index d357785..6836536 100644
--- a/sbin/restore/restore.8
+++ b/sbin/restore/restore.8
@@ -42,32 +42,32 @@
 .Sh SYNOPSIS
 .Nm
 .Fl i
-.Op Fl cdhkmNuvy
+.Op Fl cdhmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm
 .Fl R
-.Op Fl cdkNuvy
+.Op Fl cdNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm
 .Fl r
-.Op Fl cdkNuvy
+.Op Fl cdNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Nm
 .Fl t
-.Op Fl cdhkNuvy
+.Op Fl cdhNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
 .Op Ar
 .Nm
 .Fl x
-.Op Fl cdhkmNuvy
+.Op Fl cdhmNuvy
 .Op Fl b Ar blocksize
 .Op Fl f Ar file
 .Op Fl s Ar fileno
@@ -308,7 +308,6 @@ or
 .Nm
 reads from the named file on the remote host using
 .Xr rmt 8 .
-.Pp
 .It Fl h
 Extract the actual directory,
 rather than the files that it references.
-- 
cgit v1.1