From 2aafc4d48c094496bd4cbfe13b42f44eca1d7f23 Mon Sep 17 00:00:00 2001
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 7 Aug 2008 07:29:26 +0000
Subject: [PATCH] Fix ACL preservation, apparently broken in 1.47.

Approved by:	rwatson
MFC after:	3 weeks
---
 bin/cp/utils.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/cp/utils.c b/bin/cp/utils.c
index a128188ebcd..b8f340a49bc 100644
--- a/bin/cp/utils.c
+++ b/bin/cp/utils.c
@@ -211,7 +211,6 @@ copy_file(const FTSENT *entp, int dne)
 			rval = 1;
 		}
 	}
-	(void)close(from_fd);
 	
 	/*
 	 * Don't remove the target even after an error.  The target might
@@ -231,6 +230,9 @@ copy_file(const FTSENT *entp, int dne)
 			rval = 1;
 		}
 	}
+
+	(void)close(from_fd);
+
 	return (rval);
 }