From: Stelian Pop <stelian@popies.net>
Date: Mon, 8 Mar 2010 10:40:52 +0000 (+0000)
Subject: Don't attempt to extract EA in 'restore -N' mode.
X-Git-Tag: release_0_4b43~10
X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=commitdiff_plain;h=15508d36add49ba67db4b0c64637dae09c2249f2;hp=e41c1b45b971b6495b393ef39848ff2ed487e101

Don't attempt to extract EA in 'restore -N' mode.
---

diff --git a/CHANGES b/CHANGES
index e41a1be..9d72214 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.306 2009/12/03 12:46:29 stelian Exp $
+$Id: CHANGES,v 1.307 2010/03/08 10:40:52 stelian Exp $
 
 Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 ===================================================================
@@ -21,6 +21,10 @@ Changes between versions 0.4b42 and 0.4b43 (released ?????????????)
 4.	Fix restoration of extended attributes of fifos and device nodes.
 	Thanks to Igor Zhbanov <izh1979@gmail.com> for the bug report.
 
+5.	Don't attempt to set extended attributes on files that were not
+	extracted in 'restore -N' mode. Thanks to Jan Görig
+	<jgorig@users.sourceforge.net> for the patch.
+
 Changes between versions 0.4b41 and 0.4b42 (released June 18, 2009)
 ===================================================================
 
diff --git a/restore/xattr.c b/restore/xattr.c
index 4d24a6f..ccc01c1 100644
--- a/restore/xattr.c
+++ b/restore/xattr.c
@@ -29,7 +29,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: xattr.c,v 1.5 2008/06/09 13:25:40 stelian Exp $";
+	"$Id: xattr.c,v 1.6 2010/03/08 10:40:52 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -423,7 +423,10 @@ xattr_cb_set(char *name, char *value, int valuelen, int isSELinux, void *private
 {
 	char *path = (char *)private;
 	int err;
-	
+
+	if (Nflag)
+		return GOOD;
+
 	isSELinux;
 #ifdef TRANSSELINUX			/*GAN6May06 SELinux MLS */
 	if (isSELinux)