diff options
| author | markm <markm@FreeBSD.org> | 2003-05-01 20:09:58 +0000 |
|---|---|---|
| committer | markm <markm@FreeBSD.org> | 2003-05-01 20:09:58 +0000 |
| commit | 4a635f887e72a0ea5eef446a774cacc3f16826b9 (patch) | |
| tree | a5d4c911662afad675e877472c123fda8fe29833 /sbin/restore | |
| parent | 3c131e044ae8a822e5abb96a7883d8e3fddb16a7 (diff) | |
| download | FreeBSD-src-4a635f887e72a0ea5eef446a774cacc3f16826b9.zip FreeBSD-src-4a635f887e72a0ea5eef446a774cacc3f16826b9.tar.gz | |
De-Kerberise (KerberosIV). KerberosIV is no longer present, and
remote backups can still be done with Kerberos authentication using
SSH and Kerberos 5.
Diffstat (limited to 'sbin/restore')
| -rw-r--r-- | sbin/restore/Makefile | 13 | ||||
| -rw-r--r-- | sbin/restore/main.c | 10 | ||||
| -rw-r--r-- | sbin/restore/restore.8 | 6 |
3 files changed, 0 insertions, 29 deletions
diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile index 72043a1..7813606 100644 --- a/sbin/restore/Makefile +++ b/sbin/restore/Makefile @@ -12,17 +12,4 @@ MAN= restore.8 MLINKS+=restore.8 rrestore.8 .PATH: ${.CURDIR}/../dump -.if defined(MAKE_KERBEROS4) && !defined(NO_OPENSSL) && !defined(NOCRYPT) -.PATH: ${.CURDIR}/../../crypto/kerberosIV/appl/bsd -SRCS+= krcmd.c kcmd.c rcmd_util.c -DPADD+= ${LIBKRB} ${LIBCRYPTO} -LDADD+= -lkrb -lcrypto -CFLAGS+=-DKERBEROS -DHAVE_CONFIG_H \ - -I${.CURDIR}/../../kerberosIV/include \ - -I${.CURDIR}/../../crypto/kerberosIV/include \ - -I${.CURDIR}/../../crypto/kerberosIV/lib/roken \ - -I${.CURDIR}/../../crypto/kerberosIV/appl/bsd -DISTRIBUTION= krb4 -.endif - .include <bsd.prog.mk> diff --git a/sbin/restore/main.c b/sbin/restore/main.c index e612436..17abadb 100644 --- a/sbin/restore/main.c +++ b/sbin/restore/main.c @@ -65,7 +65,6 @@ static const char rcsid[] = int bflag = 0, cvtflag = 0, dflag = 0, vflag = 0, yflag = 0; int hflag = 1, mflag = 1, Nflag = 0; int uflag = 0; -int dokerberos = 0; char command = '\0'; long dumpnum = 1; long volno = 0; @@ -98,11 +97,7 @@ main(int argc, char *argv[]) if ((inputdev = getenv("TAPE")) == NULL) inputdev = _PATH_DEFTAPE; obsolete(&argc, &argv); -#ifdef KERBEROS -#define optlist "b:df:hikmNRrs:tuvxy" -#else #define optlist "b:df:himNRrs:tuvxy" -#endif while ((ch = getopt(argc, argv, optlist)) != -1) switch(ch) { case 'b': @@ -123,11 +118,6 @@ main(int argc, char *argv[]) case 'h': hflag = 0; break; -#ifdef KERBEROS - case 'k': - dokerberos = 1; - break; -#endif case 'i': case 'R': case 'r': diff --git a/sbin/restore/restore.8 b/sbin/restore/restore.8 index a20eb52..d357785 100644 --- a/sbin/restore/restore.8 +++ b/sbin/restore/restore.8 @@ -309,12 +309,6 @@ or reads from the named file on the remote host using .Xr rmt 8 . .Pp -.It Fl k -Use Kerberos authentication when contacting the remote tape server. -(Only available if this options was enabled when -.Nm -was compiled.) -.Pp .It Fl h Extract the actual directory, rather than the files that it references. |
