fleanse out oldrdist support

4 files changed, 5 insertions, 48 deletions

diff --git a/usr.bin/rdist/config.h b/usr.bin/rdist/config.h
index be134e0905e..23f8700cbaa 100644
--- a/usr.bin/rdist/config.h
+++ b/usr.bin/rdist/config.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: config.h,v 1.8 2003/06/03 02:56:14 millert Exp $	*/
+/*	$OpenBSD: config.h,v 1.9 2014/07/10 14:29:27 tedu Exp $	*/
 
 /*
  * Copyright (c) 1993 Michael A. Cooper
@@ -55,19 +55,6 @@
 #endif
 
 /*
- * Define _PATH_OLDRDIST to be the name of the original rdist that
- * was distributed with 4.3BSD.  
- * 
- * If you want to be backwards compability with the old rdist, uncomment
- # the "#define" line.  If you don't want to be backwards compability or 
- * don't have the old rdist, then uncomment the "#undef" line.
- */
-#ifndef _PATH_OLDRDIST
-#define _PATH_OLDRDIST	"/usr/ucb/oldrdist"	/* Enable compat */
-#endif
-/*#undef  _PATH_OLDRDIST*/				/* Disable compat */
-
-/*
  * Check to see if file is on a NFS.  If it is, the file is
  * skipped unless the hostname specified in the Distfile has
  * a trailing "+".  e.g. "foobar+".  This feature is enabled by
diff --git a/usr.bin/rdist/os-openbsd.h b/usr.bin/rdist/os-openbsd.h
index 0bf567cdef9..3b41ec849c2 100644
--- a/usr.bin/rdist/os-openbsd.h
+++ b/usr.bin/rdist/os-openbsd.h
@@ -29,7 +29,7 @@
  */
 
 /*
- * $OpenBSD: os-openbsd.h,v 1.22 2014/07/05 10:21:24 guenther Exp $
+ * $OpenBSD: os-openbsd.h,v 1.23 2014/07/10 14:29:27 tedu Exp $
  */
 
 /*
@@ -67,11 +67,6 @@
 #define HAVE_PATHS_H			/* Have <paths.h> */
 
 /*
- * Path to old-style rdist command
- */
-#define _PATH_OLDRDIST	"/usr/bin/oldrdist"
-
-/*
  * Path to remote shell command
  */
 #define _PATH_REMSH	"/usr/bin/ssh"
diff --git a/usr.bin/rdist/rdist.1 b/usr.bin/rdist/rdist.1
index 6a30dfe5a03..f16add95863 100644
--- a/usr.bin/rdist/rdist.1
+++ b/usr.bin/rdist/rdist.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rdist.1,v 1.44 2014/04/24 14:00:35 jmc Exp $
+.\"	$OpenBSD: rdist.1,v 1.45 2014/07/10 14:29:27 tedu Exp $
 .\"
 .\" Copyright (c) 1983 Regents of the University of California.
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 .\"	$From: rdist.man,v 6.34 1996/01/29 22:37:19 mcooper Exp $
 .\"	@(#)rdist.1	6.6 (Berkeley) 5/13/86
 .\"
-.Dd $Mdocdate: April 24 2014 $
+.Dd $Mdocdate: July 10 2014 $
 .Dt RDIST 1
 .Os
 .Sh NAME
@@ -40,7 +40,6 @@
 .Nm rdist
 .Bk -words
 .Op Fl DFnV
-.Op Fl Server
 .Op Fl A Ar num
 .Op Fl a Ar num
 .Op Fl c Ar mini_distfile
@@ -398,20 +397,6 @@ may be a colon separated list of possible pathnames,
 in which case the first component of the path to exist is used.
 .It Fl p Ar rdistd-path
 Set the path where the rdistd server is searched for on the target host.
-.It Fl Server
-This option is recognized to provide partial backward compatible support
-for older versions of
-.Nm
-which used this option to put
-.Nm
-into server mode.
-If
-.Nm
-is started with the
-.Fl Server
-command line option, it will attempt to exec (run) the old version of
-.Nm rdist ,
-.Pa /usr/bin/oldrdist .
 .It Fl t Ar timeout
 Set the timeout period,
 in seconds,
diff --git a/usr.bin/rdist/rdist.c b/usr.bin/rdist/rdist.c
index 86fc35f2a39..79b113df6f8 100644
--- a/usr.bin/rdist/rdist.c
+++ b/usr.bin/rdist/rdist.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rdist.c,v 1.23 2014/07/05 07:22:18 guenther Exp $	*/
+/*	$OpenBSD: rdist.c,v 1.24 2014/07/10 14:29:27 tedu Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -114,17 +114,7 @@ main(int argc, char **argv, char **envp)
 	for (x = 1; x <= argc && argv[x]; x++) {
 		if (strcmp(argv[x], "-Server") != 0)
 			continue;
-#if	defined(_PATH_OLDRDIST)
-		message(MT_SYSLOG, 
-			"Old rdist (-Server) requested; running %s", 
-			_PATH_OLDRDIST);
-		(void) execl(_PATH_OLDRDIST, xbasename(_PATH_OLDRDIST), 
-			     "-Server", (char *)NULL);
-		fatalerr("Exec old rdist failed: %s: %s.", 
-			 _PATH_OLDRDIST, SYSERR);
-#else	/* !_PATH_OLDRDIST */
 		fatalerr("Old rdist not available.");
-#endif	/* _PATH_OLDRDIST */
 		exit(1);
 	}