From 58e70aa0cf3dab97d9cd5cf2324f68562a222982 Mon Sep 17 00:00:00 2001
From: Ed Maste <emaste@FreeBSD.org>
Date: Thu, 21 Nov 2019 13:57:30 +0000
Subject: revert contrib/amd changes accidentally committed with r354950

---
 contrib/amd/amd/amd.8 | 3 +--
 contrib/amd/amd/amd.c | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'contrib/amd')

diff --git a/contrib/amd/amd/amd.8 b/contrib/amd/amd/amd.8
index 04463512298a..d31e88bf9435 100644
--- a/contrib/amd/amd/amd.8
+++ b/contrib/amd/amd/amd.8
@@ -72,8 +72,7 @@
 .Ar ...
 .Sh DESCRIPTION
 .Bf -symbolic
-This daemon is deprecated and will be removed before
-.Fx 13.0 .
+This daemon is obsolete.
 Users are advised to use
 .Xr autofs 5
 instead.
diff --git a/contrib/amd/amd/amd.c b/contrib/amd/amd/amd.c
index 5efe0d81be99..7ec49ce1cec5 100644
--- a/contrib/amd/amd/amd.c
+++ b/contrib/amd/amd/amd.c
@@ -414,8 +414,6 @@ main(int argc, char *argv[])
     progname = "amd";
   am_set_progname(progname);
 
-  plog(XLOG_WARNING, "built-in amd in FreeBSD is deprecated and will be removed before FreeBSD 13");
-
   /*
    * Initialize process id.  This is kept
    * cached since it is used for generating
-- 
cgit v1.2.3